c-zhangr1/zhgh_hrbnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

server_commit

Browse Source
This commit is contained in:
zhengziru
2025-02-27 16:53:51 +08:00
parent 3d3749b820
commit 33d144027c
16 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/web/commons/base/Globals.java
+1 -1
View File
@@ -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";
//文件访问域名
src/main/java/io/v/nutz/web/commons/proc/NutShiroProcessor.java
+4 -4
View File
@@ -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();
src/main/java/io/v/nutz/web/commons/shiro/config/EasyCredentialsMatch.java
+1 -1
View File
@@ -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;
src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/AssociationCon.java
+2 -2
View File
@@ -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);
}
src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/DivisionCon.java
+3 -3
View File
@@ -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);
src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/UnionCon.java
+2 -2
View File
@@ -151,7 +151,7 @@ public class UnionCon {
String nodeName = "";
if (nutMap.getBoolean("flag")) {
User user = activityBxService.dao().fetch(User.class, Cnd.where("id", "=", aid.getUser_id()));
msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】已审核通过,请前往智慧工会进行查看。", List.of(user.getLoginname()), null);
// msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】已审核通过,请前往智慧工会进行查看。", List.of(user.getLoginname()), null);
if (aid.getActivity_id() == null) {
@@ -179,7 +179,7 @@ public class UnionCon {
nodeName = "审核通过";
} else {
Sys_user user = activityBxService.dao().fetch(Sys_user.class, aid.getUser_id());
msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被校工会主席拒绝，审核意见：" + aid.getUnion_chairman_idea(), List.of(user.getLoginname()), null);
// msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被校工会主席拒绝，审核意见：" + aid.getUnion_chairman_idea(), List.of(user.getLoginname()), null);
FundsToHandler.REFUSE_TASK.exec(aid.getId(), new NutMap().addv("option", nodeName), null);
}
activityBxService.update(aid);
src/main/java/io/v/nutz/zhgh/jf/handle/reimbursement/ReimbursementToHandler.java
+1 -1
View File
@@ -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",