diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/MessageTypeEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/MessageTypeEnum.java
index 5da4832e..4b9da3dc 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/MessageTypeEnum.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/MessageTypeEnum.java
@@ -14,7 +14,9 @@ public enum MessageTypeEnum {
     CLFYSP("50", "材料封样审批"),
     QYFSSP("60", "取样复试审批"),
     GCSPCSBL("70", "办理工程审批超时提醒"),
-    GCSPCSCS("80", "抄送工程审批超时提醒");
+    GCSPCSCS("80", "抄送工程审批超时提醒"),
+    YHZGCSGZ("90", "隐患整改超时通知"),
+    YHFJCSGZ("100", "隐患复检超时通知");
 
     //工作流审批由ProcDefKey组成
     private final String code;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/TemplateMessageEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/TemplateMessageEnum.java
index 5f4d7450..fc882a5f 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/TemplateMessageEnum.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/TemplateMessageEnum.java
@@ -9,6 +9,8 @@ public enum TemplateMessageEnum {
 
     TROUBLE_SUBMIT("f3saBGJCnUAjXHw1KooxEQOOiKEHlQxLIK-sPDgoL_E", "隐患整改通知"),
     TROUBLE_HANDLE("6mGOWPXS3l5a5fzXd9GIV9_IkEfZmeJ_6G2P_SQkWnU", "隐患处理完成通知"),
+    ROUBLE_EXPIRED_ZG("f3saBGJCnUAjXHw1KooxESpSdHMrh5liznpsbWZV8oA", "隐患整改超时通知"),
+    ROUBLE_EXPIRED_FJ("f3saBGJCnUAjXHw1KooxESpSdHMrh5liznpsbWZV8oA", "隐患复检超时通知"),
     APPLY_DEFAULT("KY7oAHgqFxUSaE3ByxFJfv_0U3LnSWfgUCwV-CZyEdo", "系统流程审批提醒"),
     APPLY_EXPIRED_MY("MUAXGjyaNE-maYn6XSNycRfZfPtdVTxubqlT8lHcYqw", "办理流程审批超时提醒"),
     APPLY_EXPIRED_COPY("MUAXGjyaNE-maYn6XSNyceRFN9h8nfIjKvyZTOLnKDE", "抄送流程审批超时提醒");
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/TaskMapper.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/TaskMapper.java
index d1ed5e05..671c92d3 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/TaskMapper.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/TaskMapper.java
@@ -38,6 +38,16 @@ public interface TaskMapper {
      */
     public List<Map<String, Object>> findDaysAwaitClfyList();
 
+    /**
+     * 查询超时1天未整改的隐患数据
+     */
+    public List<Map<String, Object>> findDaysAwaitYhzgList();
+
+    /**
+     * 查询超时1天未复检的隐患数据
+     */
+    public List<Map<String, Object>> findDaysAwaitYhfjList();
+
     /**
      * 根据条件查询流程用户
      * @param businessKey 流程归属表单
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ITaskService.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ITaskService.java
index 8e41af95..729b8aeb 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ITaskService.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ITaskService.java
@@ -37,6 +37,16 @@ public interface ITaskService {
      */
     public List<Map<String, Object>> findDaysAwaitClfyList();
 
+    /**
+     * 查询超时1天未整改的隐患数据
+     */
+    public List<Map<String, Object>> findDaysAwaitYhzgList();
+
+    /**
+     * 查询超时1天未复检的隐患数据
+     */
+    public List<Map<String, Object>> findDaysAwaitYhfjList();
+
     /**
      * 根据条件查询流程用户
      * @param businessKey 流程归属表单
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/ITaskServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/ITaskServiceImpl.java
index b8dd9b9d..f00913b2 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/ITaskServiceImpl.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/ITaskServiceImpl.java
@@ -61,6 +61,22 @@ public class ITaskServiceImpl implements ITaskService {
         return taskMapper.findDaysAwaitClfyList();
     }
 
+    /**
+     * 查询超时1天未整改的隐患数据
+     */
+    @Override
+    public List<Map<String, Object>> findDaysAwaitYhzgList(){
+        return taskMapper.findDaysAwaitYhzgList();
+    }
+
+    /**
+     * 查询超时1天未复检的隐患数据
+     */
+    @Override
+    public List<Map<String, Object>> findDaysAwaitYhfjList(){
+        return taskMapper.findDaysAwaitYhfjList();
+    }
+
     /**
      * 根据条件查询流程用户
      * @param businessKey 流程归属表单
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/FlowTaskExpiredTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/FlowTaskExpiredTask.java
index 9a3b56d2..2be9ddf1 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/FlowTaskExpiredTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/FlowTaskExpiredTask.java
@@ -20,7 +20,6 @@ import org.springframework.stereotype.Component;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -113,7 +112,7 @@ public class FlowTaskExpiredTask {
          boolean lock = redisLock.tryLock(key, Constants.REDIS_LOCK, TimeUnit.SECONDS);
          if (lock) {*/
         try {
-            log.info("劫持锁...{}...开始执行::工程审批超时提醒定时任务...{}");
+            log.info("劫持锁...{}...开始执行::举牌验收超时提醒定时任务...{}");
             List<WxMpTemplateMessage> list = new ArrayList<>();
             List<Map<String, Object>> flowList = taskService.findDaysAwaitJpysList();
             for(Map<String, Object> dataMap:flowList){
@@ -157,7 +156,7 @@ public class FlowTaskExpiredTask {
          boolean lock = redisLock.tryLock(key, Constants.REDIS_LOCK, TimeUnit.SECONDS);
          if (lock) {*/
         try {
-            log.info("劫持锁...{}...开始执行::工程审批超时提醒定时任务...{}");
+            log.info("劫持锁...{}...开始执行::实测实量超时提醒定时任务...{}");
             List<WxMpTemplateMessage> list = new ArrayList<>();
             List<Map<String, Object>> flowList = taskService.findDaysAwaitScslList();
             for(Map<String, Object> dataMap:flowList){
@@ -201,7 +200,7 @@ public class FlowTaskExpiredTask {
          boolean lock = redisLock.tryLock(key, Constants.REDIS_LOCK, TimeUnit.SECONDS);
          if (lock) {*/
         try {
-            log.info("劫持锁...{}...开始执行::工程审批超时提醒定时任务...{}");
+            log.info("劫持锁...{}...开始执行::取样复试超时提醒定时任务...{}");
             List<WxMpTemplateMessage> list = new ArrayList<>();
             List<Map<String, Object>> flowList = taskService.findDaysAwaitQyfsList();
             for(Map<String, Object> dataMap:flowList){
@@ -245,7 +244,7 @@ public class FlowTaskExpiredTask {
          boolean lock = redisLock.tryLock(key, Constants.REDIS_LOCK, TimeUnit.SECONDS);
          if (lock) {*/
         try {
-            log.info("劫持锁...{}...开始执行::工程审批超时提醒定时任务...{}");
+            log.info("劫持锁...{}...开始执行::材料封样超时提醒定时任务...{}");
             List<WxMpTemplateMessage> list = new ArrayList<>();
             List<Map<String, Object>> flowList = taskService.findDaysAwaitClfyList();
             for(Map<String, Object> dataMap:flowList){
@@ -277,6 +276,104 @@ public class FlowTaskExpiredTask {
          }*/
     }
 
+    /**
+     * 从Flowable中查询超时数据进行消息提醒
+     * 分布式锁::quartz.task.flowTaskExpiredTask.notifyExpiredData
+     * 由程序定时调用 JiangYuQi
+     * @param
+     * @return
+     */
+    public void notifyYhzgExpiredData() {
+        /**String key = "quartz.task.flowTaskExpiredTask.notifyExpiredData";
+         boolean lock = redisLock.tryLock(key, Constants.REDIS_LOCK, TimeUnit.SECONDS);
+         if (lock) {*/
+        try {
+            log.info("劫持锁...{}...开始执行::隐患整改超时提醒定时任务...{}");
+            List<WxMpTemplateMessage> list = new ArrayList<>();
+            List<Map<String, Object>> flowList = taskService.findDaysAwaitYhzgList();
+            for(Map<String, Object> dataMap:flowList){
+                String projectId = Convert.toStr(dataMap.get("projectId"));
+                String projectName = Convert.toStr(dataMap.get("projectName"));
+                String lordsentuser = Convert.toStr(dataMap.get("lordsentuser"));
+                String minNickTime = Convert.toStr(dataMap.get("minNickTime"));
+                Integer infotype = Convert.toInt(dataMap.get("infotype"));
+                String handlePath = infotype==0?"security":"quality";
+                String infoTypeName = infotype==0?"安全隐患":"安全隐患";
+                String total = Convert.toStr(dataMap.get("total"));
+                //模板数据
+                WxMpTemplateMessage templateMessage = WxMpTemplateMessage.builder()
+                        .toUser(this.getMsgId(lordsentuser))
+                        .miniProgram(new WxMpTemplateMessage.MiniProgram(WechatAccountConfig.getWxAppId(), "/pageage/project_problemmodify/"+handlePath+"/list/index?barProId="+projectId))
+                        .templateId(TemplateMessageEnum.ROUBLE_EXPIRED_ZG.getId()).build();
+                templateMessage.addWxMpTemplateData(new WxMpTemplateData("thing7", projectName));
+                templateMessage.addWxMpTemplateData(new WxMpTemplateData("character_string2", total));
+                templateMessage.addWxMpTemplateData(new WxMpTemplateData("const10", infoTypeName));
+                templateMessage.addWxMpTemplateData(new WxMpTemplateData("const9", minNickTime));
+                list.add(templateMessage);
+            }
+            this.send(list,"EXPIRED_"+ MessageTypeEnum.YHZGCSGZ.getCode()+"_"+System.currentTimeMillis());
+        } catch (Exception e) {
+            log.info("任务执行异常...{}...::::结束执行...{}", e.getMessage());
+            throw e;
+        }
+        /**finally {
+         log.info("释放锁...{}", key);
+         redisLock.unlock(key);
+         }
+         }else{
+         log.info("尝试劫持锁失败...{}", key);
+         }*/
+    }
+
+    /**
+     * 从Flowable中查询超时数据进行消息提醒
+     * 分布式锁::quartz.task.flowTaskExpiredTask.notifyExpiredData
+     * 由程序定时调用 JiangYuQi
+     * @param
+     * @return
+     */
+    public void notifyYhfjExpiredData() {
+        /**String key = "quartz.task.flowTaskExpiredTask.notifyExpiredData";
+         boolean lock = redisLock.tryLock(key, Constants.REDIS_LOCK, TimeUnit.SECONDS);
+         if (lock) {*/
+        try {
+            log.info("劫持锁...{}...开始执行::隐患复检超时提醒定时任务...{}");
+            List<WxMpTemplateMessage> list = new ArrayList<>();
+            List<Map<String, Object>> flowList = taskService.findDaysAwaitYhzgList();
+            for(Map<String, Object> dataMap:flowList){
+                String projectId = Convert.toStr(dataMap.get("projectId"));
+                String projectName = Convert.toStr(dataMap.get("projectName"));
+                String rechecksenduser = Convert.toStr(dataMap.get("rechecksenduser"));
+                String minNickTime = Convert.toStr(dataMap.get("minNickTime"));
+                Integer infotype = Convert.toInt(dataMap.get("infotype"));
+                String handlePath = infotype==0?"security":"quality";
+                String infoTypeName = infotype==0?"安全隐患":"安全隐患";
+                String total = Convert.toStr(dataMap.get("total"));
+                //模板数据
+                WxMpTemplateMessage templateMessage = WxMpTemplateMessage.builder()
+                        .toUser(this.getMsgId(rechecksenduser))
+                        .miniProgram(new WxMpTemplateMessage.MiniProgram(WechatAccountConfig.getWxAppId(), "/pageage/project_problemmodify/"+handlePath+"/list/index?barProId="+projectId))
+                        .templateId(TemplateMessageEnum.ROUBLE_EXPIRED_FJ.getId()).build();
+                templateMessage.addWxMpTemplateData(new WxMpTemplateData("thing7", projectName));
+                templateMessage.addWxMpTemplateData(new WxMpTemplateData("character_string2", total));
+                templateMessage.addWxMpTemplateData(new WxMpTemplateData("const10", infoTypeName));
+                templateMessage.addWxMpTemplateData(new WxMpTemplateData("const9", minNickTime));
+                list.add(templateMessage);
+            }
+            this.send(list,"EXPIRED_"+ MessageTypeEnum.YHFJCSGZ.getCode()+"_"+System.currentTimeMillis());
+        } catch (Exception e) {
+            log.info("任务执行异常...{}...::::结束执行...{}", e.getMessage());
+            throw e;
+        }
+        /**finally {
+         log.info("释放锁...{}", key);
+         redisLock.unlock(key);
+         }
+         }else{
+         log.info("尝试劫持锁失败...{}", key);
+         }*/
+    }
+
     /**
      * 查询微信用户列表
      * @param userName
diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/TaskMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/TaskMapper.xml
index 35da5e1a..35c0227d 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/TaskMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/TaskMapper.xml
@@ -41,6 +41,56 @@
         ORDER BY spc.project_id
     </select>
 
+    <!--查询超时未整改的隐患数据-->
+    <select id="findDaysAwaitYhzgList" resultType="Map">
+        SELECT
+            spc.projectid AS projectId,
+            sp.projectName,
+            spc.infotype,
+            spc.lordsentuser,
+            min(date(spc.nickedtime)) as minNickTime,
+            count(1) AS total
+        FROM
+            smz_ssp_problemmodify spc
+            LEFT JOIN sur_project sp ON sp.id = spc.projectid
+        WHERE
+            spc.checkstate in (0, 3)
+            AND spc.isdel = 0
+            AND spc.nickedtime &lt; DATE_SUB(NOW(), INTERVAL 1 DAY)
+        GROUP BY
+            spc.projectid,
+            sp.projectName,
+            spc.infotype,
+            spc.lordsentuser
+        ORDER BY
+            spc.projectid
+    </select>
+
+    <!--查询超时未复检的隐患数据-->
+    <select id="findDaysAwaitYhfjList" resultType="Map">
+        SELECT
+        spc.projectid AS projectId,
+        sp.projectName,
+        spc.infotype,
+        spc.rechecksenduser,
+        min(date(spc.nickedtime)) as minNickTime,
+        count(1) AS total
+        FROM
+        smz_ssp_problemmodify spc
+        LEFT JOIN sur_project sp ON sp.id = spc.projectid
+        WHERE
+        spc.checkstate = 1
+        AND spc.isdel = 0
+        AND spc.nickedtime &lt; DATE_SUB(NOW(), INTERVAL 1 DAY)
+        GROUP BY
+        spc.projectid,
+        sp.projectName,
+        spc.infotype,
+        spc.rechecksenduser
+        ORDER BY
+        spc.projectid
+    </select>
+
     <select id="findFlowTaskUsers" resultType="com.ruoyi.common.core.domain.entity.SysUser">
         select su.* from sys_user su
         left join sur_project_userinfo spu on spu.user_id = su.user_id
diff --git a/ruoyi-ui/src/assets/js/jweixin-1.3.2.js b/ruoyi-ui/src/assets/js/jweixin-1.3.2.js
new file mode 100644
index 00000000..4959fdd0
--- /dev/null
+++ b/ruoyi-ui/src/assets/js/jweixin-1.3.2.js
@@ -0,0 +1 @@
+!function(e,n){"function"==typeof define&&(define.amd||define.cmd)?define(function(){return n(e)}):n(e,!0)}(this,function(r,e){var a,c,n,i,t,s,d,o,l,u,p,f,m,g,h,I,S,y,v,_,w,T;if(!r.jWeixin)return a={config:"preVerifyJSAPI",onMenuShareTimeline:"menu:share:timeline",onMenuShareAppMessage:"menu:share:appmessage",onMenuShareQQ:"menu:share:qq",onMenuShareWeibo:"menu:share:weiboApp",onMenuShareQZone:"menu:share:QZone",previewImage:"imagePreview",getLocation:"geoLocation",openProductSpecificView:"openProductViewWithPid",addCard:"batchAddCard",openCard:"batchViewCard",chooseWXPay:"getBrandWCPayRequest",openEnterpriseRedPacket:"getRecevieBizHongBaoRequest",startSearchBeacons:"startMonitoringBeacons",stopSearchBeacons:"stopMonitoringBeacons",onSearchBeacons:"onBeaconsInRange",consumeAndShareCard:"consumedShareCard",openAddress:"editAddress"},c=function(){var e,n={};for(e in a)n[a[e]]=e;return n}(),n=r.document,i=n.title,t=navigator.userAgent.toLowerCase(),f=navigator.platform.toLowerCase(),s=!(!f.match("mac")&&!f.match("win")),d=-1!=t.indexOf("wxdebugger"),o=-1!=t.indexOf("micromessenger"),l=-1!=t.indexOf("android"),u=-1!=t.indexOf("iphone")||-1!=t.indexOf("ipad"),p=(f=t.match(/micromessenger\/(\d+\.\d+\.\d+)/)||t.match(/micromessenger\/(\d+\.\d+)/))?f[1]:"",m={initStartTime:B(),initEndTime:0,preVerifyStartTime:0,preVerifyEndTime:0},g={version:1,appId:"",initTime:0,preVerifyTime:0,networkType:"",isPreVerifyOk:1,systemType:u?1:l?2:-1,clientVersion:p,url:encodeURIComponent(location.href)},h={},I={_completes:[]},S={state:0,data:{}},L(function(){m.initEndTime=B()}),y=!1,v=[],_={config:function(e){C("config",h=e);var o=!1!==h.check;L(function(){if(o)k(a.config,{verifyJsApiList:V(h.jsApiList)},(I._complete=function(e){m.preVerifyEndTime=B(),S.state=1,S.data=e},I.success=function(e){g.isPreVerifyOk=0},I.fail=function(e){I._fail?I._fail(e):S.state=-1},(t=I._completes).push(function(){var n;s||d||h.debug||p<"6.0.2"||g.systemType<0||(n=new Image,g.appId=h.appId,g.initTime=m.initEndTime-m.initStartTime,g.preVerifyTime=m.preVerifyEndTime-m.preVerifyStartTime,_.getNetworkType({isInnerInvoke:!0,success:function(e){g.networkType=e.networkType,n.src="https://open.weixin.qq.com/sdk/report?v="+g.version+"&o="+g.isPreVerifyOk+"&s="+g.systemType+"&c="+g.clientVersion+"&a="+g.appId+"&n="+g.networkType+"&i="+g.initTime+"&p="+g.preVerifyTime+"&u="+g.url}}))}),I.complete=function(e){for(var n=0,i=t.length;n<i;++n)t[n]();I._completes=[]},I)),m.preVerifyStartTime=B();else{S.state=1;for(var e=I._completes,n=0,i=e.length;n<i;++n)e[n]();I._completes=[]}var t}),_.invoke||(_.invoke=function(e,n,i){r.WeixinJSBridge&&WeixinJSBridge.invoke(e,P(n),i)},_.on=function(e,n){r.WeixinJSBridge&&WeixinJSBridge.on(e,n)})},ready:function(e){(0!=S.state||(I._completes.push(e),!o&&h.debug))&&e()},error:function(e){p<"6.0.2"||(-1==S.state?e(S.data):I._fail=e)},checkJsApi:function(e){k("checkJsApi",{jsApiList:V(e.jsApiList)},(e._complete=function(e){l&&(i=e.checkResult)&&(e.checkResult=JSON.parse(i));var n,i=e,t=i.checkResult;for(n in t){var o=c[n];o&&(t[o]=t[n],delete t[n])}},e))},onMenuShareTimeline:function(e){M(a.onMenuShareTimeline,{complete:function(){k("shareTimeline",{title:e.title||i,desc:e.title||i,img_url:e.imgUrl||"",link:e.link||location.href,type:e.type||"link",data_url:e.dataUrl||""},e)}},e)},onMenuShareAppMessage:function(n){M(a.onMenuShareAppMessage,{complete:function(e){"favorite"===e.scene?k("sendAppMessage",{title:n.title||i,desc:n.desc||"",link:n.link||location.href,img_url:n.imgUrl||"",type:n.type||"link",data_url:n.dataUrl||""}):k("sendAppMessage",{title:n.title||i,desc:n.desc||"",link:n.link||location.href,img_url:n.imgUrl||"",type:n.type||"link",data_url:n.dataUrl||""},n)}},n)},onMenuShareQQ:function(e){M(a.onMenuShareQQ,{complete:function(){k("shareQQ",{title:e.title||i,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},onMenuShareWeibo:function(e){M(a.onMenuShareWeibo,{complete:function(){k("shareWeiboApp",{title:e.title||i,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},onMenuShareQZone:function(e){M(a.onMenuShareQZone,{complete:function(){k("shareQZone",{title:e.title||i,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},startRecord:function(e){k("startRecord",{},e)},stopRecord:function(e){k("stopRecord",{},e)},onVoiceRecordEnd:function(e){M("onVoiceRecordEnd",e)},playVoice:function(e){k("playVoice",{localId:e.localId},e)},pauseVoice:function(e){k("pauseVoice",{localId:e.localId},e)},stopVoice:function(e){k("stopVoice",{localId:e.localId},e)},onVoicePlayEnd:function(e){M("onVoicePlayEnd",e)},uploadVoice:function(e){k("uploadVoice",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},downloadVoice:function(e){k("downloadVoice",{serverId:e.serverId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},translateVoice:function(e){k("translateVoice",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},chooseImage:function(e){k("chooseImage",{scene:"1|2",count:e.count||9,sizeType:e.sizeType||["original","compressed"],sourceType:e.sourceType||["album","camera"]},(e._complete=function(e){if(l){var n=e.localIds;try{n&&(e.localIds=JSON.parse(n))}catch(e){}}},e))},getLocation:function(e){e=e||{},k(a.getLocation,{type:e.type||"wgs84"},(e._complete=function(e){delete e.type},e))},previewImage:function(e){k(a.previewImage,{current:e.current,urls:e.urls},e)},uploadImage:function(e){k("uploadImage",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},downloadImage:function(e){k("downloadImage",{serverId:e.serverId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},getLocalImgData:function(e){!1===y?(y=!0,k("getLocalImgData",{localId:e.localId},(e._complete=function(e){var n;y=!1,0<v.length&&(n=v.shift(),wx.getLocalImgData(n))},e))):v.push(e)},getNetworkType:function(e){k("getNetworkType",{},(e._complete=function(e){var n=e,e=n.errMsg,i=(n.errMsg="getNetworkType:ok",n.subtype);if(delete n.subtype,i)n.networkType=i;else{var i=e.indexOf(":"),t=e.substring(i+1);switch(t){case"wifi":case"edge":case"wwan":n.networkType=t;break;default:n.errMsg="getNetworkType:fail"}}},e))},openLocation:function(e){k("openLocation",{latitude:e.latitude,longitude:e.longitude,name:e.name||"",address:e.address||"",scale:e.scale||28,infoUrl:e.infoUrl||""},e)},hideOptionMenu:function(e){k("hideOptionMenu",{},e)},showOptionMenu:function(e){k("showOptionMenu",{},e)},closeWindow:function(e){k("closeWindow",{},e=e||{})},hideMenuItems:function(e){k("hideMenuItems",{menuList:e.menuList},e)},showMenuItems:function(e){k("showMenuItems",{menuList:e.menuList},e)},hideAllNonBaseMenuItem:function(e){k("hideAllNonBaseMenuItem",{},e)},showAllNonBaseMenuItem:function(e){k("showAllNonBaseMenuItem",{},e)},scanQRCode:function(e){k("scanQRCode",{needResult:(e=e||{}).needResult||0,scanType:e.scanType||["qrCode","barCode"]},(e._complete=function(e){var n;u&&(n=e.resultStr)&&(n=JSON.parse(n),e.resultStr=n&&n.scan_code&&n.scan_code.scan_result)},e))},openAddress:function(e){k(a.openAddress,{},(e._complete=function(e){(e=e).postalCode=e.addressPostalCode,delete e.addressPostalCode,e.provinceName=e.proviceFirstStageName,delete e.proviceFirstStageName,e.cityName=e.addressCitySecondStageName,delete e.addressCitySecondStageName,e.countryName=e.addressCountiesThirdStageName,delete e.addressCountiesThirdStageName,e.detailInfo=e.addressDetailInfo,delete e.addressDetailInfo},e))},openProductSpecificView:function(e){k(a.openProductSpecificView,{pid:e.productId,view_type:e.viewType||0,ext_info:e.extInfo},e)},addCard:function(e){for(var n=e.cardList,i=[],t=0,o=n.length;t<o;++t){var r=n[t],r={card_id:r.cardId,card_ext:r.cardExt};i.push(r)}k(a.addCard,{card_list:i},(e._complete=function(e){if(n=e.card_list){for(var n,i=0,t=(n=JSON.parse(n)).length;i<t;++i){var o=n[i];o.cardId=o.card_id,o.cardExt=o.card_ext,o.isSuccess=!!o.is_succ,delete o.card_id,delete o.card_ext,delete o.is_succ}e.cardList=n,delete e.card_list}},e))},chooseCard:function(e){k("chooseCard",{app_id:h.appId,location_id:e.shopId||"",sign_type:e.signType||"SHA1",card_id:e.cardId||"",card_type:e.cardType||"",card_sign:e.cardSign,time_stamp:e.timestamp+"",nonce_str:e.nonceStr},(e._complete=function(e){e.cardList=e.choose_card_info,delete e.choose_card_info},e))},openCard:function(e){for(var n=e.cardList,i=[],t=0,o=n.length;t<o;++t){var r=n[t],r={card_id:r.cardId,code:r.code};i.push(r)}k(a.openCard,{card_list:i},e)},consumeAndShareCard:function(e){k(a.consumeAndShareCard,{consumedCardId:e.cardId,consumedCode:e.code},e)},chooseWXPay:function(e){k(a.chooseWXPay,x(e),e)},openEnterpriseRedPacket:function(e){k(a.openEnterpriseRedPacket,x(e),e)},startSearchBeacons:function(e){k(a.startSearchBeacons,{ticket:e.ticket},e)},stopSearchBeacons:function(e){k(a.stopSearchBeacons,{},e)},onSearchBeacons:function(e){M(a.onSearchBeacons,e)},openEnterpriseChat:function(e){k("openEnterpriseChat",{useridlist:e.userIds,chatname:e.groupName},e)},launchMiniProgram:function(e){k("launchMiniProgram",{targetAppId:e.targetAppId,path:function(e){var n;if("string"==typeof e&&0<e.length)return n=e.split("?")[0],n+=".html",void 0!==(e=e.split("?")[1])?n+"?"+e:n}(e.path),envVersion:e.envVersion},e)},miniProgram:{navigateBack:function(e){e=e||{},L(function(){k("invokeMiniProgramAPI",{name:"navigateBack",arg:{delta:e.delta||1}},e)})},navigateTo:function(e){L(function(){k("invokeMiniProgramAPI",{name:"navigateTo",arg:{url:e.url}},e)})},redirectTo:function(e){L(function(){k("invokeMiniProgramAPI",{name:"redirectTo",arg:{url:e.url}},e)})},switchTab:function(e){L(function(){k("invokeMiniProgramAPI",{name:"switchTab",arg:{url:e.url}},e)})},reLaunch:function(e){L(function(){k("invokeMiniProgramAPI",{name:"reLaunch",arg:{url:e.url}},e)})},postMessage:function(e){L(function(){k("invokeMiniProgramAPI",{name:"postMessage",arg:e.data||{}},e)})},getEnv:function(e){L(function(){e({miniprogram:"miniprogram"===r.__wxjs_environment})})}}},w=1,T={},n.addEventListener("error",function(e){var n,i,t;l||(t=(n=e.target).tagName,i=n.src,"IMG"!=t&&"VIDEO"!=t&&"AUDIO"!=t&&"SOURCE"!=t)||-1!=i.indexOf("wxlocalresource://")&&(e.preventDefault(),e.stopPropagation(),(t=n["wx-id"])||(t=w++,n["wx-id"]=t),T[t]||(T[t]=!0,wx.ready(function(){wx.getLocalImgData({localId:i,success:function(e){n.src=e.localData}})})))},!0),n.addEventListener("load",function(e){var n;l||(n=(e=e.target).tagName,e.src,"IMG"!=n&&"VIDEO"!=n&&"AUDIO"!=n&&"SOURCE"!=n)||(n=e["wx-id"])&&(T[n]=!1)},!0),e&&(r.wx=r.jWeixin=_),_;function k(n,e,i){r.WeixinJSBridge?WeixinJSBridge.invoke(n,P(e),function(e){A(n,e,i)}):C(n,i)}function M(n,i,t){r.WeixinJSBridge?WeixinJSBridge.on(n,function(e){t&&t.trigger&&t.trigger(e),A(n,e,i)}):C(n,t||i)}function P(e){return(e=e||{}).appId=h.appId,e.verifyAppId=h.appId,e.verifySignType="sha1",e.verifyTimestamp=h.timestamp+"",e.verifyNonceStr=h.nonceStr,e.verifySignature=h.signature,e}function x(e){return{timeStamp:e.timestamp+"",nonceStr:e.nonceStr,package:e.package,paySign:e.paySign,signType:e.signType||"SHA1"}}function A(e,n,i){"openEnterpriseChat"==e&&(n.errCode=n.err_code),delete n.err_code,delete n.err_desc,delete n.err_detail;var t=n.errMsg,e=(t||(t=n.err_msg,delete n.err_msg,t=function(e,n){var i=c[e];i&&(e=i);i="ok";{var t;n&&(t=n.indexOf(":"),"access denied"!=(i=(i=(i=-1!=(i=-1!=(i="failed"==(i="confirm"==(i=n.substring(t+1))?"ok":i)?"fail":i).indexOf("failed_")?i.substring(7):i).indexOf("fail_")?i.substring(5):i).replace(/_/g," ")).toLowerCase())&&"no permission to execute"!=i||(i="permission denied"),""==(i="config"==e&&"function not exist"==i?"ok":i))&&(i="fail")}return n=e+":"+i}(e,t),n.errMsg=t),(i=i||{})._complete&&(i._complete(n),delete i._complete),t=n.errMsg||"",h.debug&&!i.isInnerInvoke&&alert(JSON.stringify(n)),t.indexOf(":"));switch(t.substring(e+1)){case"ok":i.success&&i.success(n);break;case"cancel":i.cancel&&i.cancel(n);break;default:i.fail&&i.fail(n)}i.complete&&i.complete(n)}function V(e){if(e){for(var n=0,i=e.length;n<i;++n){var t=e[n],t=a[t];t&&(e[n]=t)}return e}}function C(e,n){var i;!h.debug||n&&n.isInnerInvoke||((i=c[e])&&(e=i),n&&n._complete&&delete n._complete,console.log('"'+e+'",',n||""))}function B(){return(new Date).getTime()}function L(e){o&&(r.WeixinJSBridge?e():n.addEventListener&&n.addEventListener("WeixinJSBridgeReady",e,!1))}});
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/wxsetting/wxAuth/index.vue b/ruoyi-ui/src/views/wxsetting/wxAuth/index.vue
index ebf98a1b..2ee32ab5 100644
--- a/ruoyi-ui/src/views/wxsetting/wxAuth/index.vue
+++ b/ruoyi-ui/src/views/wxsetting/wxAuth/index.vue
@@ -1,10 +1,12 @@
 <template>
   <div class="app-content">
-    <el-row style="margin-top: 40%" v-if="errorVisible || successVisible">
+    <el-row style="padding-top: 150px">
       <el-col :sm="24" :lg="24" v-if="successVisible">
         <el-result icon="success" title="公众号消息授权成功">
           <template slot="extra">
-            <el-button type="primary" size="medium" round>返回小程序</el-button>
+            <el-button type="primary" size="medium" round @click="colse"
+              >返回小程序</el-button
+            >
           </template>
         </el-result>
       </el-col>
@@ -15,33 +17,47 @@
           subTitle="请关注公众号并进行网页授权"
         >
           <template slot="extra">
-            <el-button type="primary" size="medium" round>返回小程序</el-button>
+            <el-button type="primary" size="medium" round @click="colse"
+              >返回小程序</el-button
+            >
           </template>
         </el-result>
       </el-col>
+      <el-col :sm="24" :lg="24" v-if="!errorVisible && !successVisible">
+        <el-result
+          icon="info"
+          title="公众号消息授权页面"
+        >
+        </el-result>
+      </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
-import Cookies from 'js-cookie'
-import { authorize, wxBinding } from "@/api/wxsetting/wxAuth";
+import Cookies from "js-cookie";
+import { wxBinding } from "@/api/wxsetting/wxAuth";
+import jweixin from "@/assets/js/jweixin-1.3.2";
 
 export default {
   name: "build",
   data() {
     return {
-      uId: null,
+      userOpenId: "",
       errorVisible: false,
       successVisible: false,
     };
   },
   created() {
-    this.uId = Cookies.get("userOpenId") || this.getQueryString("userOpenId");
-    if (!this.uId) {
+    this.userOpenId = this.getQueryString("userOpenId") || "";
+    console.log("userOpenId...1{}", this.userOpenId);
+    if (this.userOpenId == "") {
+      this.userOpenId = Cookies.get("userOpenId") || "";
+      console.log("userOpenId...2{}", this.userOpenId);
+    }
+    if (this.userOpenId == "") {
       this.errorVisible = true;
     } else {
-      Cookies.set("userOpenId",uId);
       this.wechatLogin();
     }
   },
@@ -50,57 +66,79 @@ export default {
       // 处理微信授权登录
       //let rd = this.getQueryString("rd") || "";
       let code = this.getQueryString("code") || "";
+      let state = this.getQueryString("state") || "";
+      console.log("code...{}", code, state);
       // token === '' && openId != '' 只要这种情况，未绑定账号
-      if (code != "") {
-        // 绑定账号
-        console.log("接口返回===>", code, this.uId);
-        this.saveBinding(uId, code);
-      } else {
+      if (code == "" || state == "") {
+        Cookies.set("userOpenId", this.userOpenId);
+        console.log("我要去登录了===>");
         const hrefUrl = window.location.href;
         // 如果绑定了，返回成功
-        console.log("我要去登录了===>");
-        window.location = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxe6fd9ad863ac09bf&response_type=code&scope=snsapi_base&redirect_uri="+encodeURIComponent(hrefUrl)+"&state=STATE#wechat_redirect";
+        window.location =
+          "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxe6fd9ad863ac09bf&response_type=code&scope=snsapi_userinfo&redirect_uri=" +
+          encodeURIComponent(hrefUrl) +
+          "&state=STATE#wechat_redirect";
+      } else {
+        // 绑定账号
+        this.saveBinding(this.userOpenId, code);
       }
     },
-    saveBinding(uId, openId) {
-      /**
-       * uId 小程序openId
-       * openId 公众号openId
-       */
-      wxBinding({ openId: uId, code: code }).then((response) => {
-        if (response.code == 200) {
-          this.successVisible = true;
-        } else {
-          this.errorVisible = true;
-        }
-      });
+    saveBinding(userOpenId, code) {
+      if (!userOpenId || !code) {
+        this.errorVisible = true;
+        this.successVisible = false;
+      } else {
+        /**
+         * uId 小程序openId
+         * openId 公众号openId
+         */
+        wxBinding({ openId: userOpenId, code: code })
+          .then((response) => {
+            if (response.code == 200) {
+              this.successVisible = true;
+            } else {
+              this.errorVisible = true;
+            }
+          })
+          .catch(() => {
+            this.errorVisible = true;
+            this.successVisible = false;
+          });
+      }
     },
     colse() {
-      if (typeof WeixinJSBridge == "undefined") {
-        if (document.addEventListener) {
-          document.addEventListener("WeixinJSBridgeReady", weixin_ClosePage, false);
-        } else if (document.attachEvent) {
-          document.attachEvent("WeixinJSBridgeReady", weixin_ClosePage);
-          document.attachEvent("onWeixinJSBridgeReady", weixin_ClosePage);
-        }
-      } else {
-        WeixinJSBridge.call("closeWindow");
-      }
+      // if (typeof WeixinJSBridge == "undefined") {
+      //   if (document.addEventListener) {
+      //     document.addEventListener("WeixinJSBridgeReady", weixin_ClosePage, false);
+      //   } else if (document.attachEvent) {
+      //     document.attachEvent("WeixinJSBridgeReady", weixin_ClosePage);
+      //     document.attachEvent("onWeixinJSBridgeReady", weixin_ClosePage);
+      //   }
+      // } else {
+      //   WeixinJSBridge.call("closeWindow");
+      // }
+      wx.miniProgram.navigateTo({url: '/pages/xiangmugaikuang/index?showUser=true'})
     },
     weixin_ClosePage() {
       //关闭微信浏览器
-      WeixinJSBridge.call("closeWindow");
+      //WeixinJSBridge.call("closeWindow");
     },
     getQueryString(paramName) {
+      console.log("paramName===>", paramName);
       if (window.location.href.indexOf("?") == -1) return "";
       let searchString = window.location.href.split("?")[1];
       let i,
         val,
         params = searchString.split("&");
+      console.log("window.params===>", params);
       for (i = 0; i < params.length; i++) {
         val = params[i].split("=");
         if (val[0] == paramName) {
-          return val[1];
+          if (val[1] == "undefined" || val[1] == "null") {
+            return "";
+          } else {
+            return val[1];
+          }
         }
       }
       return "";
@@ -120,7 +158,7 @@ export default {
   color: #ffffff !important;
 }
 .el-result__subtitle p {
-  color: red !important;
+  color: #f2777a !important;
   font-weight: 800;
 }
 .el-result__extra {
@@ -129,4 +167,7 @@ export default {
 .el-result__extra button {
   width: 100%;
 }
+.el-result .icon-info{
+  fill: #409eff !important;
+}
 </style>
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/controller/WxAuthController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/controller/WxAuthController.java
index 65d193f8..2d1cbfbc 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/controller/WxAuthController.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/controller/WxAuthController.java
@@ -23,6 +23,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.net.URLEncoder;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 微信openId绑定
@@ -111,6 +113,11 @@ public class WxAuthController extends BaseController {
     @ResponseBody
     @PostMapping("/binding")
     public AjaxResult binding(@Validated @RequestBody WxBindingVo vo) throws Exception {
+        String key="wxAuth_binding_"+vo.getCode();
+        Object obj = redisCache.getCacheObject(key);
+        if(obj!=null){
+            return success();
+        }
         /*当用户同意授权后，会回调所设置的url并把authorization code传过来，
         然后用这个code获得access token，其中也包含用户的openid等信息*/
         WxMpOAuth2AccessToken wxMpOAuth2AccessToken = new WxMpOAuth2AccessToken();
@@ -128,7 +135,9 @@ public class WxAuthController extends BaseController {
             SysUserOpenid sysUserOpenid = sysUserOpenidService.selectSysUserOpenidByOpenId(vo.getOpenId());
             if(sysUserOpenid!=null){
                 sysUserOpenid.setMsgOpenId(openId);
-                return toAjax(sysUserOpenidService.updateSysUserOpenid(sysUserOpenid));
+                sysUserOpenidService.updateSysUserOpenid(sysUserOpenid);
+                redisCache.setCacheObject(key,vo.getCode(),5, TimeUnit.MINUTES);
+                return success();
             }
         } catch (WxErrorException e) {
             log.error("【微信网页授权】{}", e);
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/service/impl/WeChatMessageServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/service/impl/WeChatMessageServiceImpl.java
index 4fa5c7d8..24579df8 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/service/impl/WeChatMessageServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/service/impl/WeChatMessageServiceImpl.java
@@ -643,7 +643,7 @@ public class WeChatMessageServiceImpl {
     /**
      * 模板消息开关
      */
-    private boolean wxSwitch=false;
+    private boolean wxSwitch=true;
 
     /**
      * 推送模板消息
@@ -663,7 +663,7 @@ public class WeChatMessageServiceImpl {
                                 message.setToUser(toUser);
                                 wxMpService.getTemplateMsgService().sendTemplateMsg(message);
                                 //5分钟内不推送相同类型的消息
-                                redisCache.setCacheObject(key,false,1, TimeUnit.MINUTES);
+                                redisCache.setCacheObject(key,false,5, TimeUnit.MINUTES);
                             }
                         }
                     }