修改企微登录跳转链接

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/AuthRedirectController.java

@@ -141,9 +141,9 @@ public class AuthRedirectController {
             }
         }
         if (isMobile) {
-            redirecUrl = "http://mobworktime.ttkuaiban.com/#/" + router;
+            redirecUrl = "https://mobworktime.ttkuaiban.com/#/" + router;
         } else {
-            redirecUrl = "http://worktime.ttkuaiban.com/#/" + router;
+            redirecUrl = "https://worktime.ttkuaiban.com/#/" + router;
         }
         ModelAndView modelAndView = new ModelAndView(
                 new RedirectView(redirecUrl), reqParam);
@@ -238,7 +238,7 @@ public class AuthRedirectController {
                         reqParam.put("version", compExpireInfo.get("version"));
                     }
                 }
-                redirecUrl = "http://worktime.ttkuaiban.com/#/" + router;
+                redirecUrl = "https://worktime.ttkuaiban.com/#/" + router;
             }
         }
         ModelAndView modelAndView = new ModelAndView(

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/WxCorpInfoServiceImpl.java

@@ -270,6 +270,14 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
                     } else if (msgType.equals(TEXT_CARD_MSG_BUSTRIP_DENY)) {
                         title = "出差审核驳回";
                     }
+                } else if ("expense".equals(pageRouter)) {
+                    //费用报销
+                    title = "费用报销通知";
+                    if (msgType.equals(TEXT_CARD_MSG_EXPENSE_AGREE)) {
+                        title = "费用报销审核通过";
+                    } else if (msgType.equals(TEXT_CARD_MSG_EXPENSE_DENY)) {
+                        title = "费用报销审核驳回";
+                    }
                 }
             }
             cardJson.put("title", title);

fhKeeper/formulahousekeeper/timesheet/src/views/Login.vue

@@ -222,7 +222,7 @@
                 //     })
                 // })
                 var appId = "wwf11426cf618e1703";//企业微信第三方的SUIT ID
-                var url = "http://worktime.ttkuaiban.com/api/corpWXScanningAuth";//授权回调页面
+                var url = "https://worktime.ttkuaiban.com/api/corpWXScanningAuth";//授权回调页面
                 var weixinUrl=`https://open.work.weixin.qq.com/wwopen/sso/3rd_qrConnect?appid=${appId}&redirect_uri=${url}&state=0&usertype=member`;
                 window.location.href = weixinUrl;
             },
@@ -304,7 +304,7 @@
             },
             tryAutoLogin() {
                 var appId = "ww4e237fd6abb635af";//企业微信第三方的SUIT ID
-                var url = "http://worktime.ttkuaiban.com/api/corpWXAuth";//授权回调页面
+                var url = "https://worktime.ttkuaiban.com/api/corpWXAuth";//授权回调页面
                 var weixinUrl="https://open.weixin.qq.com/connect/oauth2/authorize?appid="+appId+"&redirect_uri="+encodeURI(url)+"&response_type=code&scope=snsapi_base&state=1#wechat_redirect";
                 window.location.href = weixinUrl;
             },
@@ -321,6 +321,14 @@
                                     } else {
                                         this.$router.push({ path: user.moduleList[0].path })
                                     }
+                                    if (!path) {
+                                        path = user.moduleList[0].path;
+                                    }
+                                    //去掉链接上存在的参数
+                                    if (location.href.indexOf("?")>0) {
+                                        var newHref = location.href.split("?")[0] + '#' + (path.indexOf('/')>-1?path:('/'+path));
+                                        location.href = newHref;
+                                    }
                                 }
                             } else {
                                 this.$message({