web端新功能发布

whepi-web/src/main/java/com/bofeng/controller/RootController.java

@@ -1,6 +1,9 @@
 package com.bofeng.controller;
 
 import com.bofeng.JwtHelper;
+import com.bofeng.dao.UserOpenMapper;
+import com.bofeng.entity.UserOpen;
+import com.bofeng.service.EpiTemplateMessageService;
 import com.bofeng.service.IdService;
 import com.bofeng.support.BofengProperties;
 import com.yvan.Model;
@@ -28,12 +31,40 @@ public class RootController {
     @Autowired
     private BofengProperties bofengProperties;
 
+    @Autowired
+    private EpiTemplateMessageService epiTemplateMessageService;
+
+    @Autowired
+    private UserOpenMapper userOpenMapper;
+
     @GetMapping("/ok")
     public String ok() {
         return "ok";
     }
 
 
+    @GetMapping("/sendMessage")
+    public void sendMessage() {
+        Long start = 0L, count = 100L;
+        while (true) {
+            List<UserOpen> userOpens = userOpenMapper.getOpenUser(start, count);
+            int re = 0;
+            for (UserOpen userOpen : userOpens) {
+                re += epiTemplateMessageService.systemSendRemindMessageTest(userOpen.getUserId(), userOpen.getOpenId());
+            }
+            start += count;
+            if (userOpens == null || userOpens.size() < count) {
+                break;
+            }
+        }
+    }
+
+    @GetMapping("/sendMessageOne")
+    public void sendMessageOne() {
+        epiTemplateMessageService.systemSendRemindMessageTestOne(1265104020154150913L, "oz8HsvxgAg3ehF9e5Kz1AUBy1pQk");
+    }
+
+
     //    @ApiOperation("获取当前用户信息")
     @GetMapping("/me")
     public Model<ResultModel> me() {

whepi-web/src/main/java/com/bofeng/service/EpiTemplateMessageService.java

@@ -82,6 +82,50 @@ public class EpiTemplateMessageService {
         return re;
     }
 
+
+    public int systemSendRemindMessageTest(Long userId, String openId) {
+        int re = 0;
+        Map<String, String> map = Maps.newHashMap();
+        List<UptownHome> uptownHomeList = uptownHomeMapper.getUptownHomeByUserId(userId);
+        if (uptownHomeList != null && uptownHomeList.size()>0) {
+            map.put("first", "尊敬的 "+uptownHomeList.get(0).getLinkman()+" 先生/女士，");
+            map.put("keyword1", "公众号迁移");
+            map.put("keyword2", "扫码关注新公众号 绑定手机号");
+            SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd" );
+            Date d1= new Date();
+            String str1 = sdf1.format(d1);
+            map.put("keyword3", str1);
+            map.put("keyword4", "无");
+            map.put("keyword5", "系统");
+            map.put("remark", "家园互助平台提醒您，即日起此公众号停用，请尽快扫码关注“凌云互助家园”并绑定原“家园互助平台”的注册手机号"+uptownHomeList.get(0).getPhone()+"。如未及时完成迁移的用户将无法正常复工。");
+            re = 1;
+        }
+        templateMessageService.sendSysRemindMessage(openId, "", map);
+        return re;
+    }
+
+    public int systemSendRemindMessageTestOne(Long userId, String openId) {
+        int re = 0;
+        Map<String, String> map = Maps.newHashMap();
+        List<UptownHome> uptownHomeList = uptownHomeMapper.getUptownHomeByUserId(userId);
+        if (uptownHomeList != null && uptownHomeList.size()>0) {
+            map.put("first", "尊敬的 "+uptownHomeList.get(0).getLinkman()+" 先生/女士，");
+            map.put("keyword1", "公众号迁移");
+            map.put("keyword2", "扫码关注新公众号 绑定手机号");
+            SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd" );
+            Date d1= new Date();
+            String str1 = sdf1.format(d1);
+            map.put("keyword3", str1);
+            map.put("keyword4", "无");
+            map.put("keyword5", "系统");
+            map.put("remark", "家园互助平台提醒您，即日起此公众号停用，请尽快扫码关注“凌云互助家园”并绑定原“家园互助平台”的注册手机号"+uptownHomeList.get(0).getPhone()+"。如未及时完成迁移的用户将无法正常复工。");
+            re = 1;
+        }
+        templateMessageService.sendSysRemindMessage(openId, "", map);
+        return re;
+    }
+
+
     public int tuangouSendRemindMessage(Long userId, String openId, Date endDate) {
         int re = 0;
         Map<String, String> map = Maps.newHashMap();

whepi-web/src/main/resources/application-prod.yml

@@ -6,16 +6,16 @@ logging:
     console: '%d %-5level %logger{32} - %msg%n'
 
 debug: false
-#ui-path: file:/home/www/ws/wuhan_epi/whepi-ui
-ui-path: file:/home/oilschedule/ws/wuhan_epi/whepi-ui
+ui-path: file:/home/www/ws/wuhan_epi/whepi-ui
+#ui-path: file:/home/oilschedule/ws/wuhan_epi/whepi-ui
 secret: hh123 # jwt私钥
 salt: 456 #密码加盐
 token_time_minutes: 720 #12小时有效期
 token_time_minutes_mobile: 525600 #1年有效
 
 server:
-#  port: 8086
-  port: 8888
+  port: 8086
+#  port: 8888
 
 yvan:
   debug: false
@@ -24,12 +24,12 @@ yvan:
   upload_domain: /static
   wechat:
     token: wuhanepi
-    #appID: wx0b7d70ff931c397d
-    #appsecret: 7f6af95b5f6ad1f9d45fc57c1b58f7cf
+    appID: wx0b7d70ff931c397d
+    appsecret: 7f6af95b5f6ad1f9d45fc57c1b58f7cf
     EncodingAESKey: Wpm1KEBmXvVLjeOyqWbn6PJlkW7tlR7MxXmrm4i9zcg
 
-    appID: wx6108f00b10079000
-    appsecret: 96a98a8fb01b170a339e44f00a6a25f4
+#    appID: wx6108f00b10079000
+#    appsecret: 96a98a8fb01b170a339e44f00a6a25f4
 
 #    appID: wx91b94bb5e8334dcd
 #    appsecret: 3b52b8deb374c022437abb03fe13ce4a
@@ -49,8 +49,8 @@ yvan:
     #qrcode_match_cust_expire_second: 10800
 
     #bofeng9999 / 789456hh
-#    domain: http://caller.whyxzz.com.cn
-    domain: http://jy.lingyun.com
+    domain: http://caller.whyxzz.com.cn
+#    domain: http://jy.lingyun.com
     tmpTicketExpireSeconds: 10800
     templates:
       预定信息: 'MLNz8YVi7zofQOBeLS0Ruhr-3fJpTnfsKjyPeDB879s'
@@ -69,14 +69,13 @@ spring:
     driverClassName: net.sf.log4jdbc.DriverSpy
 
 
-#    url: jdbc:log4jdbc:mysql://localhost:3306/whepi?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
+    url: jdbc:log4jdbc:mysql://localhost:3306/whepi?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
+    username: whepi
+    password: hust!2020epi
 
-#    username: whepi
-#    password: hust!2020epi
-
-    url: jdbc:log4jdbc:mysql://rm-8vbjns8g515bo16crvo.mysql.zhangbei.rds.aliyuncs.com:3306/wuhan_epi?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
-    username: vmes
-    password: agrvqL$D
+#    url: jdbc:log4jdbc:mysql://rm-8vbjns8g515bo16crvo.mysql.zhangbei.rds.aliyuncs.com:3306/wuhan_epi?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
+#    username: vmes
+#    password: agrvqL$D
 
   redis:
     database: 8