Bläddra i källkod

推送图片去掉延时,修改正式数据库配置

locky 3 år sedan
förälder
incheckning
57ee9f6b35
2 ändrade filer med 12 tillägg och 15 borttagningar
  1. 11 13
      AnsjerPush/cn_formal_settings.py
  2. 1 2
      Controller/DetectControllerV2.py

+ 11 - 13
AnsjerPush/cn_formal_settings.py

@@ -49,19 +49,17 @@ TEMPLATES = [
 
 WSGI_APPLICATION = 'AnsjerPush.cn_formal_wsgi.application'
 
-
-# Database
-# https://docs.djangoproject.com/en/2.1/ref/settings/#databases
-# 国内数据库
-DATABASE_DATA = 'Ansjer81'
-SERVER_HOST = 'business-server.cvp7gfpnmziz.rds.cn-northwest-1.amazonaws.com.cn'
-DATABASES_USER = 'azrds'
-DATABASES_PASS = 'UKv78ezQhiGMmSef5U5s'
-
-DATABASE_DATA2 = 'Ansjer81'
-SERVER_HOST2 = 'ansjerpush.cvp7gfpnmziz.rds.cn-northwest-1.amazonaws.com.cn'
-DATABASES_USER2 = 'azrds'
-DATABASES_PASS2 = 'azrds.x.x'
+# 业务数据库
+DATABASE_DATA = 'ansjer_server_cn'
+SERVER_HOST = 'server-cn.cvp7gfpnmziz.rds.cn-northwest-1.amazonaws.com.cn'
+DATABASES_USER = 'aws_rds'
+DATABASES_PASS = 'H84NQ8NARr9e39tn6aW5'
+
+# 推送数据库
+DATABASE_DATA2 = 'ansjer_push_cn'
+SERVER_HOST2 = 'push-cn.cvp7gfpnmziz.rds.cn-northwest-1.amazonaws.com.cn'
+DATABASES_USER2 = 'aws_rds'
+DATABASES_PASS2 = 'Dil02uKDyd5Mxv7fhhHJ'
 
 DATABASES = {
     'default': {

+ 1 - 2
Controller/DetectControllerV2.py

@@ -346,10 +346,9 @@ class NotificationView(View):
         logger = logging.getLogger('info')
         logger.info('推送图片测试:{} {} {} {} {} {} {} {}'.format(push_type, uid, appBundleId, token_val, event_type, n_time,
                                                             msg_title, msg_text))
-        time.sleep(3)
         try:
             image_url = aws_s3_client.generate_presigned_url('get_object', Params={'Bucket': bucket, 'Key': key},
-                                                             ExpiresIn=86400)
+                                                             ExpiresIn=300)
             logger.info('推送图片url:{}'.format(image_url))
             if push_type == 0:
                 GatewayPushService.ios_apns_push(uid, appBundleId, token_val, n_time, event_type, msg_title, msg_text,