Merge branch 'dev' of ssh://ops.weface.com.cn:8022/martin/push-message into rad

 Conflicts:
	src/main/java/com/weface/task/UserTagsTask.java

src/main/resources/application-prod.yml

@@ -3,9 +3,9 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://localhost:3306/renren_fast?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-      username: renren
-      password: 123456
+      url: jdbc:mysql://rm-uf6w14h3ark4z3pwxlo.mysql.rds.aliyuncs.com/kk_demain_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+      username: kk_demain_user
+      password: KkWeface0228
       initial-size: 10
       max-active: 100
       min-idle: 10

src/main/resources/application.yml

@@ -6,15 +6,16 @@ server:
     uri-encoding: UTF-8
     max-threads: 1000
     min-spare-threads: 30
+    connection-timeout: 5000ms
   port: 8080
-  connection-timeout: 5000ms
+
 
 spring:
   application:
     name: service-web
     # 环境 dev|test|prod
   profiles:
-    active: dev
+    active: prod
   # jackson时间格式化
   jackson:
     time-zone: GMT+8
@@ -27,7 +28,7 @@ spring:
   mvc:
     throw-exception-if-no-handler-found: true
   redis:
-    host: localhost
+    host: 172.21.6.6
     database: 0
     port: 6379
     maxTotal: 1000
@@ -63,5 +64,5 @@ mybatis-plus:
     jdbc-type-for-null: 'null'
 
 gexiang:
-  user_tag_id: 400000
-  push_max_size: 30000
+  user_tag_id: 251696
+  push_max_size: 80000

src/test/java/com/weface/PushMessageApplicationTests.java

@@ -88,8 +88,8 @@ class PushMessageApplicationTests {
 
     @Test
     void testConventTemplate() {
-//        String[] alias = {"kksh_10255318"};
-//        String[] alias = {"kksh_10131492"};
+        //String[] alias = {"kksh_10255318"};
+        //String[] alias = {"kksh_10131492"};
         String[] alias = {"kksh_59354"};
         String token = GeTuiUtils.getAuthToken("kk_sh_token_ge_tui");
         MessageTemplate messageTemplate = new MessageTemplate();