diff --git a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java
index 406aa62..7522e79 100644
--- a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java
+++ b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java
@@ -351,8 +351,12 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService
// 6. 处理其他任务
// 6.1 更新提案的校领导角色,发送订阅
ProposalConfig config = dao.fetch(ProposalConfig.class, Cnd.where("delFlag", "=", false).desc("updatedAt"));
- for (String unitId : config.getSchoolLeaderUnitIds()) {
- RoleEventPublisher.broadcast(new RoleEventMsg(unitId, RoleConstant.PROPOSAL_BRANCH_SCHOOL_LEADER.name(), RoleEventMsg.RENEW_ROLE));
+ if (config == null || config.getSchoolLeaderUnitIds() == null || config.getSchoolLeaderUnitIds().isEmpty()) {
+ log.warn("未配置提案校领导单位,跳过校领导角色刷新,继续完成人员全量更新");
+ } else {
+ for (String unitId : config.getSchoolLeaderUnitIds()) {
+ RoleEventPublisher.broadcast(new RoleEventMsg(unitId, RoleConstant.PROPOSAL_BRANCH_SCHOOL_LEADER.name(), RoleEventMsg.RENEW_ROLE));
+ }
}
/*
diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml
index 9f2f43d..5f69385 100644
--- a/src/main/resources/application-dev.yaml
+++ b/src/main/resources/application-dev.yaml
@@ -34,11 +34,11 @@ sdk:
appSecret: a65cec4fb69980bd88258fc8433a3eef
redirectUri: /platform/wx/oauth2/callback
cas:
- enable: false
- server-url-prefix: https://i.zjnu.njupt.edu.cn/cas
- server-login-url: https://i.zjnu.njupt.edu.cn/cas/login
- qi-wx-server-login-url: httos:/cas.zjnu.whcp.eou.cn/lyuapServer/wechatauz/wxAuthRedirect
- client-host-url: https://zhgh.zjnu.njupt.edu.cn
+ enable: true
+ server-url-prefix: https://authserver.zjnu.edu.cn/authserver
+ server-login-url: https://authserver.zjnu.edu.cn/authserver/login
+ qi-wx-server-login-url: https://authserver.zjnu.edu.cn/authserver/login
+ client-host-url: https://lxy.zjnu.edu.cn
client-call-back-url: /platform/sso/login
validation-type: cas
minio:
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index ffed0d7..53662f2 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -35,10 +35,11 @@
-
+
-
-
+
+
+