环境迁移及小bug修正

shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingReservationServiceImpl.java

@@ -142,11 +142,12 @@ public class MeetingReservationServiceImpl implements IMeetingReservationService
                 meetingReservation.getTimeFormat() > 0 ? (Date) meetingReservation.getParams().get("endTime") : meetingReservation.getEnd()
         );
         if (ids.size() > 0) return "会议室已被占用，预约失败";
-        IcsCustomerStaff staff = customerStaffMapper.selectIcsCustomerStaffById(currentUserId);
+//        IcsCustomerStaff staff = customerStaffMapper.selectIcsCustomerStaffById(currentUserId);
-        boolean isAdmin = staff.getRoomRole() == 5;//是否管理员
+//        boolean isAdmin = staff.getRoomRole() == 5;//是否管理员
         Date now = new Date();
         meetingReservation.setSn(snService.generate(Sn.Type.REPAIR));
-        meetingReservation.setStatus(isAdmin ? 7 : 5);
+//        meetingReservation.setStatus(isAdmin ? 7 : 5);
+        meetingReservation.setStatus(5);
         meetingReservation.setDeleteFlag(0);
         meetingReservation.setCreateTime(now);
         meetingReservation.setCreateBy(currentUserId.toString());
@@ -163,7 +164,9 @@ public class MeetingReservationServiceImpl implements IMeetingReservationService
             }
         }
         //提醒--start
-        List<RepairRemind> rList = processRemind(meetingReservation, currentUserId, null, isAdmin ? 7 : 5, null, null);
+//        List<RepairRemind> rList = processRemind(meetingReservation, currentUserId, null, isAdmin ? 7 : 5, null, null);
+        List<RepairRemind> rList = processRemind(meetingReservation, currentUserId, null, 5, null, null);
+
         for (RepairRemind repairRemind : rList) {
             repairRemindMapper.insertRepairRemind(repairRemind);
         }
@@ -302,9 +305,9 @@ public class MeetingReservationServiceImpl implements IMeetingReservationService
      */
     private List<RepairRemind> processRemind(MeetingReservation meetingReservation, Long currentUserId, String content, Integer status, String voiceWaiter, String serveWaiter) {
         MeetingRoomVo meetingRoom = meetingRoomMapper.selectMeetingRoomById(meetingReservation.getRoomId());
-        String remindContent = meetingReservation.getTitle() + "/" +
+        String remindContent = DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", meetingReservation.getStart())
-                DateUtils.parseDateToStr("yyyy-MM-dd HH:mm", meetingReservation.getStart())
                         + " ~ " + DateUtils.parseDateToStr("HH:mm", meetingReservation.getEnd())
+                        + "/" + meetingReservation.getTitle()
                         + "/" + meetingRoom.getRoomNum();
         Date now = new Date();
         List<RepairRemind> list = new ArrayList<>();

shoot-hand/ics-web/src/main/java/com/ics/controller/mobile/WxScanController.java

@@ -117,7 +117,7 @@ public class WxScanController {
                 redis.set("QR:" + unique, token.getAccessToken(), 3600);//存储token值
                 return "扫码成功";
             } else {
-                return "未在公众号绑定手机号";
+                return "未在公众号绑定手机号或者小程序账号与PC账号未关联";
             }
         } else { //未绑定
             return "请先在公众号绑定手机号";

shoot-hand/ics-web/src/main/resources/application-prod.yml

@@ -17,7 +17,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://222.184.49.22:3306/shoot-hand?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://222.184.49.22:3306/shoot-hand-prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
         password: boyue1!Z
       # 从库数据源
@@ -70,7 +70,7 @@ spring:
 # 本地文件上传路径
 dfs:
   path: /file/uploadPath/
-  domain: https://company.haxy.com.cn:4443/shoot-hand
+  domain: https://jgsw.haxy.com.cn/shoot-hand
 #  domain: http://39.165.217.47:81/saas-ics/
 #  domain: https://www.xxxx.com/
 # 公众号配置(必填)
@@ -134,8 +134,8 @@ weixin:
   notify-domain: http://b8pyta.natappfree.cc # 回调，自己的回调地址
 
 webchatGZH: #微信公众号用户绑定及模板消息推送相关配置
-  appid: wxf164eab7ad1d9075
+  appid: wx88c3ba1d01b33b8b
-  secret: 199fc64445882192ae798816d949be0d
+  secret: db375b6db9c7b87b1daa48375b45731e
-  access: https://company.haxy.com.cn:4443/shoot-hand #pc后端访问地址
+  access: https://jgsw.haxy.com.cn/shoot-hand #pc后端访问地址
-  templateRP: 8zU-6KI4gz0NJeTeAjPbzu9eEBlWe18gGa3PW6h7MbM #工单模板消息模板id
+  templateRP: 4jgtzPfyX546n5ZDPHbN69YSSFf8NSOQUDJuPb6bYwA #工单模板消息模板id
-  templateMR: QxM3pMorFhL8Wljouzw3ckLXW8AXCTL3dbOnLumH90I #会议室预约模板消息id
+  templateMR: erLiOoswMLHXknPpd5UVvSC5C8sIUwlfpgqdVPZhwcA #会议室预约模板消息id

shoot-hand/ics-web/src/main/resources/application-server.yml

@@ -3,7 +3,7 @@ spring:
     database: 1
     host: 127.0.0.1
     port: 6378
-    password: ssp0902
+    password: ssp1220
     timeout: 6000ms  # 连接超时时长（毫秒）
     lettuce:
       pool:
@@ -17,7 +17,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://127.0.01:3306/shoot-hand?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://127.0.0.1:3300/shoot-hand?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: shand
         password: shand@0902
       # 从库数据源
@@ -70,7 +70,7 @@ spring:
 # 本地文件上传路径
 dfs:
   path: /opt/web/uploadPath/
-  domain: https://jgsw.haxy.com.cn/shoot-hand
+  domain: https://www.hajgfwzx.cn/shoot-hand
 #  domain: http://39.165.217.47:81/saas-ics/
 #  domain: https://www.xxxx.com/
 # 公众号配置(必填)
@@ -136,6 +136,6 @@ weixin:
 webchatGZH: #微信公众号用户绑定及模板消息推送相关配置
   appid: wx88c3ba1d01b33b8b
   secret: db375b6db9c7b87b1daa48375b45731e
-  access: https://jgsw.haxy.com.cn/shoot-hand #pc后端访问地址
+  access: https://www.hajgfwzx.cn/shoot-hand #pc后端访问地址
   templateRP: 4jgtzPfyX546n5ZDPHbN69YSSFf8NSOQUDJuPb6bYwA #工单模板消息模板id
   templateMR: erLiOoswMLHXknPpd5UVvSC5C8sIUwlfpgqdVPZhwcA #会议室预约模板消息id