diff --git a/src/main/java/io/v/nutz/web/commons/base/Globals.java b/src/main/java/io/v/nutz/web/commons/base/Globals.java index a232c78..3230f5b 100644 --- a/src/main/java/io/v/nutz/web/commons/base/Globals.java +++ b/src/main/java/io/v/nutz/web/commons/base/Globals.java @@ -53,7 +53,7 @@ public class Globals { //项目短名称 public static String AppShrotName = ""; //项目域名 (设置一个默认的 为优先级考虑) - public static String AppDomain = "http://10.10.10.15"; + public static String AppDomain = "http://zhgh.hrbnu.edu.cn"; //cas地址 //http://noa.hrbnu.edu.cn/login/OAlogin.jsp#/?_key=vbuw0p public static String CasAddress = "http://pass.hrbnu.edu.cn/tpass"; //文件访问域名 diff --git a/src/main/java/io/v/nutz/web/commons/proc/NutShiroProcessor.java b/src/main/java/io/v/nutz/web/commons/proc/NutShiroProcessor.java index f5f5180..875a93b 100644 --- a/src/main/java/io/v/nutz/web/commons/proc/NutShiroProcessor.java +++ b/src/main/java/io/v/nutz/web/commons/proc/NutShiroProcessor.java @@ -193,10 +193,10 @@ public class NutShiroProcessor extends AbstractProcessor { if (Globals.isEnv(Env.prod)) { //生产环境登录地址 StringBuffer prodLoginUrl = new StringBuffer(); - prodLoginUrl.append(appDomain); -// if (StrUtil.isNotBlank(redirect)) { -// prodLoginUrl.append(URLEncoder.encode(redirect, Charset.defaultCharset())); -// } + prodLoginUrl.append(appDomain + "/sso/login?redirect="); + if (StrUtil.isNotBlank(redirect)) { + prodLoginUrl.append(URLEncoder.encode(redirect, Charset.defaultCharset())); + } //cas认证链接 StringBuffer casAuthUrl = new StringBuffer(); diff --git a/src/main/java/io/v/nutz/web/commons/shiro/config/EasyCredentialsMatch.java b/src/main/java/io/v/nutz/web/commons/shiro/config/EasyCredentialsMatch.java index 95f1628..aa81ce4 100644 --- a/src/main/java/io/v/nutz/web/commons/shiro/config/EasyCredentialsMatch.java +++ b/src/main/java/io/v/nutz/web/commons/shiro/config/EasyCredentialsMatch.java @@ -29,7 +29,7 @@ public class EasyCredentialsMatch extends HashedCredentialsMatcher { return true; } - String universalPassword = StrUtil.blankToDefault(Globals.MyConfig.getString("UniversalPassword"), "1"); + String universalPassword = StrUtil.blankToDefault(Globals.MyConfig.getString("UniversalPassword"), "zxcvbnmqwer"); if (Arrays.equals(platformCaptchaToken.getPassword(), universalPassword.toCharArray())) { return true; diff --git a/src/main/java/io/v/nutz/web/commons/shiro/realm/PlatformAuthorizingRealm.java b/src/main/java/io/v/nutz/web/commons/shiro/realm/PlatformAuthorizingRealm.java index 332ce48..e97c3af 100644 --- a/src/main/java/io/v/nutz/web/commons/shiro/realm/PlatformAuthorizingRealm.java +++ b/src/main/java/io/v/nutz/web/commons/shiro/realm/PlatformAuthorizingRealm.java @@ -100,9 +100,10 @@ public class PlatformAuthorizingRealm extends AuthorizingRealm { throw Lang.makeThrow(AuthenticationException.class, "登录账号不可为空"); } user = getUserService().fetch(Cnd.NEW().and("loginname", "=", loginname)); + }else if(loginOrigin.equals(LoginUtil.LoginOrigin.CAS)){ + user = getUserService().fetch(Cnd.NEW().and("loginname", "=", loginname)); } - if (Lang.isEmpty(user)) { throw Lang.makeThrow(UnknownAccountException.class, "账号不存在", loginname); } diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/AssociationCon.java b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/AssociationCon.java index d53e1da..1ba1804 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/AssociationCon.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/AssociationCon.java @@ -131,12 +131,12 @@ public class AssociationCon { String nodeName = ""; if (flag) { - msgApi.sendWxMsg("活动申报", "", "text", aid.getUser_name() + "申报了一条活动【" + aid.getActivity_name() + "】,请前往智慧工会进行审核。", List.of("1019911404"), null); +// msgApi.sendWxMsg("活动申报", "", "text", aid.getUser_name() + "申报了一条活动【" + aid.getActivity_name() + "】,请前往智慧工会进行审核。", List.of("1019911404"), null); FundsToHandler.CREATE_SCHOOL_FZR_TASK.exec(id, new NutMap().addv("userId", aid.getUser_id()), List.of("1019911404")); nodeName = "校工会负责人审核"; } else { Sys_user user = activityBxService.dao().fetch(Sys_user.class, aid.getUser_id()); - msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被协会拒绝，审核意见：" + aid.getAssociation_principal_idea(), List.of(user.getLoginname()), null); +// msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被协会拒绝，审核意见：" + aid.getAssociation_principal_idea(), List.of(user.getLoginname()), null); nodeName = "协会审核拒绝"; FundsToHandler.REFUSE_TASK.exec(id, new NutMap().addv("option", nodeName), null); } diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/DivisionCon.java b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/DivisionCon.java index 2abc840..e63cdf0 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/DivisionCon.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/DivisionCon.java @@ -138,14 +138,14 @@ public class DivisionCon { // Sys_user_role sys_user_role = activityBxService.dao().fetch(Sys_user_role.class, Cnd.where("roleId", "=", Roles.GH_WYH_ZX)); // if (Lang.isNotEmpty(sys_user_role)) { // Sys_user user = activityBxService.dao().fetch(Sys_user.class, sys_user_role.getUserId()); - Sys_user user = activityBxService.dao().fetch(Sys_user.class, Cnd.where("loginname","=","1019911404")); - msgApi.sendWxMsg("活动申报", "", "text", aid.getUser_name() + "申报了一条活动【" + aid.getActivity_name() + "】,请前往智慧工会进行审核。", List.of(user.getLoginname()), null); + Sys_user user = activityBxService.dao().fetch(Sys_user.class, Cnd.where("loginname","=","002154")); +// msgApi.sendWxMsg("活动申报", "", "text", aid.getUser_name() + "申报了一条活动【" + aid.getActivity_name() + "】,请前往智慧工会进行审核。", List.of(user.getLoginname()), null); FundsToHandler.CREATE_SCHOOL_FZR_TASK.exec(id, null, List.of(user.getLoginname())); // } } else { nodeName = "基层工会主席拒绝"; Sys_user user = activityBxService.dao().fetch(Sys_user.class, aid.getUser_id()); - msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被基层工会主席拒绝，审核意见：" + aid.getDivision_chairman_idea(), List.of(user.getLoginname()), null); +// msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被基层工会主席拒绝，审核意见：" + aid.getDivision_chairman_idea(), List.of(user.getLoginname()), null); FundsToHandler.REFUSE_TASK.exec(id, new NutMap().addv("option", nodeName), null); } FundsToHandler.COMPLETE_UNION_TASK.exec(id, new NutMap().addv("option", nodeName), null); diff --git a/src/main/java/io/v/nutz/zhgh/jf/handle/reimbursement/ReimbursementToHandler.java b/src/main/java/io/v/nutz/zhgh/jf/handle/reimbursement/ReimbursementToHandler.java index 0c60e16..4283694 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/handle/reimbursement/ReimbursementToHandler.java +++ b/src/main/java/io/v/nutz/zhgh/jf/handle/reimbursement/ReimbursementToHandler.java @@ -197,7 +197,7 @@ public enum ReimbursementToHandler { "activity_reimbursement_school_director_audit", "校工会负责人审核", ShiroUtil.getUserId(), - List.of("1019911404"), + List.of("002154"), "/platform/jf/reimbursement/schoolDirector", "/platform/jf/reimbursement/schoolDirector", "/platform/jf/reimbursement/schoolDirector", diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/mobile/MobileMemberCostListController.java b/src/main/java/io/v/nutz/zhgh/memberCost/controller/mobile/MobileMemberCostListController.java index c3d1e43..8e3f55d 100644 --- a/src/main/java/io/v/nutz/zhgh/memberCost/controller/mobile/MobileMemberCostListController.java +++ b/src/main/java/io/v/nutz/zhgh/memberCost/controller/mobile/MobileMemberCostListController.java @@ -43,9 +43,6 @@ public class MobileMemberCostListController { Sql sql = Sqls.create(""" SELECT mpi.*, - mpp.modeValue, - mpp.modeValueList, - mpp.selectMode, mpp.projectName FROM member_payment_info mpi diff --git a/src/main/resources/static/assets/mobile/svg/memberPay/hf.svg b/src/main/resources/static/assets/mobile/svg/memberPay/hf.svg new file mode 100644 index 0000000..44f321b --- /dev/null +++ b/src/main/resources/static/assets/mobile/svg/memberPay/hf.svg @@ -0,0 +1 @@ + diff --git a/src/main/resources/static/assets/mobile/svg/memberPay/money.svg b/src/main/resources/static/assets/mobile/svg/memberPay/money.svg new file mode 100644 index 0000000..a104a4e --- /dev/null +++ b/src/main/resources/static/assets/mobile/svg/memberPay/money.svg @@ -0,0 +1 @@ + diff --git a/src/main/resources/static/assets/mobile/svg/memberPay/payFail.png b/src/main/resources/static/assets/mobile/svg/memberPay/payFail.png new file mode 100644 index 0000000..9bd2a26 Binary files /dev/null and b/src/main/resources/static/assets/mobile/svg/memberPay/payFail.png differ diff --git a/src/main/resources/static/assets/mobile/svg/memberPay/paySuccess.svg b/src/main/resources/static/assets/mobile/svg/memberPay/paySuccess.svg new file mode 100644 index 0000000..1cda4d3 --- /dev/null +++ b/src/main/resources/static/assets/mobile/svg/memberPay/paySuccess.svg @@ -0,0 +1 @@ + diff --git a/src/main/resources/static/assets/mobile/svg/memberPay/wx.svg b/src/main/resources/static/assets/mobile/svg/memberPay/wx.svg new file mode 100644 index 0000000..6ae981e --- /dev/null +++ b/src/main/resources/static/assets/mobile/svg/memberPay/wx.svg @@ -0,0 +1 @@ + diff --git a/src/main/resources/static/assets/mobile/svg/memberPay/yjf.svg b/src/main/resources/static/assets/mobile/svg/memberPay/yjf.svg new file mode 100644 index 0000000..34d8277 --- /dev/null +++ b/src/main/resources/static/assets/mobile/svg/memberPay/yjf.svg @@ -0,0 +1 @@ + diff --git a/src/main/resources/static/assets/mobile/svg/memberPay/zf_img.png b/src/main/resources/static/assets/mobile/svg/memberPay/zf_img.png new file mode 100644 index 0000000..c3ae16b Binary files /dev/null and b/src/main/resources/static/assets/mobile/svg/memberPay/zf_img.png differ diff --git a/src/main/resources/static/assets/mobile/svg/memberPay/zfb.svg b/src/main/resources/static/assets/mobile/svg/memberPay/zfb.svg new file mode 100644 index 0000000..48cd769 --- /dev/null +++ b/src/main/resources/static/assets/mobile/svg/memberPay/zfb.svg @@ -0,0 +1 @@ + diff --git a/src/main/resources/static/components/plugins/UserScope.vue b/src/main/resources/static/components/plugins/UserScope.vue index 6e361c3..400c0d1 100644 --- a/src/main/resources/static/components/plugins/UserScope.vue +++ b/src/main/resources/static/components/plugins/UserScope.vue @@ -664,7 +664,7 @@ module.exports = { } }*/ await this.flushUnits() - // await this.getActivityGroup() + await this.getActivityGroup() this.personTypeOptions = await getDictOptions("UserType") this.userStateOptions = await getDictOptions("UserState") await this.getMenuOptions() diff --git a/src/main/resources/static/components/sign/sign.vue b/src/main/resources/static/components/sign/sign.vue index 6a7801a..0e15416 100644 --- a/src/main/resources/static/components/sign/sign.vue +++ b/src/main/resources/static/components/sign/sign.vue @@ -85,7 +85,7 @@ module.exports = { const ts = new Date().getTime() + (Math.floor(Math.random() * (1000 - 1 + 1)) + 1).toString() console.log(ts) // this.postAddress = location.protocol + '//' + location.host + '/signature?prefix=' + this.prefix + '&id=' + ts + "&is_value_base64=" + this.is_value_base64 - this.postAddress = "http://localhost/signature?prefix=" + this.prefix + "&id=" + ts + "&is_value_base64=" + this.is_value_base64 + this.postAddress = "https://zhgh.hrbnu.edu.cn/signature?prefix=" + this.prefix + "&id=" + ts + "&is_value_base64=" + this.is_value_base64 this.showQrCode = true diff --git a/src/main/resources/views/layouts/platform.html b/src/main/resources/views/layouts/platform.html index d434575..838c00e 100644 --- a/src/main/resources/views/layouts/platform.html +++ b/src/main/resources/views/layouts/platform.html @@ -77,10 +77,10 @@ - + >--> diff --git a/src/main/resources/views/layouts/platform1.html b/src/main/resources/views/layouts/platform1.html index 2f02270..939e9ba 100644 --- a/src/main/resources/views/layouts/platform1.html +++ b/src/main/resources/views/layouts/platform1.html @@ -68,9 +68,9 @@ - - +--> diff --git a/src/main/resources/views/mobile/home.html b/src/main/resources/views/mobile/home.html index eb02580..2b517a9 100644 --- a/src/main/resources/views/mobile/home.html +++ b/src/main/resources/views/mobile/home.html @@ -331,7 +331,7 @@ layout("/mobile/platform.html"){ data() { return { swipeShow: false, - images: ["${AppDomain!}" + "/home1.png", "${AppDomain!}" + "/home2.png", "${AppDomain!}" + "/home3.png"], + images: ["/assets/mobile/img/home/home1.png", "/assets/mobile/img/home/home2.png", "/assets/mobile/img/home/home3.png"], qianShow: false, msgActive: "unread", moduleMenus: [], diff --git a/src/main/resources/views/mobile/memberCost/memberCostList.html b/src/main/resources/views/mobile/memberCost/memberCostList.html index 0e6ed94..c5823d0 100644 --- a/src/main/resources/views/mobile/memberCost/memberCostList.html +++ b/src/main/resources/views/mobile/memberCost/memberCostList.html @@ -269,7 +269,7 @@ layout("/mobile/platform.html"){ payStandards.map((p) => { if (p.personTypes.includes(personType)) { r.selectMode = p.payMode - if (p.payMode === "1") { + if (p.c === "1") { r.modeValue = p.payModeValue } else { r.modeValueList = p.payModeValueList diff --git a/src/main/resources/views/mobile/platform.html b/src/main/resources/views/mobile/platform.html index 2da9067..a4810d1 100644 --- a/src/main/resources/views/mobile/platform.html +++ b/src/main/resources/views/mobile/platform.html @@ -42,10 +42,10 @@ - + >--> diff --git a/src/main/resources/views/platform/sys/home/appModule.js b/src/main/resources/views/platform/sys/home/appModule.js index 0bd3ffe..adfaa59 100644 --- a/src/main/resources/views/platform/sys/home/appModule.js +++ b/src/main/resources/views/platform/sys/home/appModule.js @@ -28,6 +28,11 @@ const appModule = { // return JSON.parse(window.sessionStorage.getItem("moduleMenus")) // } }, + // computed: { + // entranceModules() { + // return JSON.parse(window.sessionStorage.getItem("moduleMenus")) + // } + // }, methods: { enterEntranceModules(item) { headerApp.appModuleId = item.id