wenlukang1
/
CTSK_DEV
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交人：邹江涛 

时间：2025-12-18 17：50
提交内容：单点（增加如果code没有就用username来验证的逻辑）、待办（已办和撤销也改为手机号）
This commit is contained in:
Tao 2025-12-30 10:10:10 +08:00
parent 90c8796a09
commit 4264e005cf
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/eoss/SSOPluginLogin.java
View File

@ -1,11 +1,14 @@
package shkd.sys.sys.eoss; package shkd.sys.sys.eoss;
import kd.bos.exception.ErrorCode;
import kd.bos.exception.KDException;
import kd.bos.logging.Log; import kd.bos.logging.Log;
import kd.bos.logging.LogFactory; import kd.bos.logging.LogFactory;
import kd.bos.login.thirdauth.ThirdSSOAuthHandler; import kd.bos.login.thirdauth.ThirdSSOAuthHandler;
import kd.bos.login.thirdauth.UserAuthResult; import kd.bos.login.thirdauth.UserAuthResult;
import kd.bos.login.thirdauth.UserProperType; import kd.bos.login.thirdauth.UserProperType;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import shkd.sys.sys.utils.AesUtils;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -64,11 +67,9 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler {
UserAuthResult result = new UserAuthResult(); UserAuthResult result = new UserAuthResult();
//获取返回的授权码 //获取返回的授权码
String code = httpServletRequest.getParameter("code"); String code = httpServletRequest.getParameter("code");
logger.info(String.format("getTrdSSOAuth→授权码code：%s", code)); String userName = httpServletRequest.getParameter("userName");
if (StringUtils.isEmpty(code)) {
result.setSucess(false); if (StringUtils.isNotEmpty(code)) {
return result;
} else {
//调用EOSS获取token接口 //调用EOSS获取token接口
String access_token = AuthService.accessToken(code, ip, client, secret); String access_token = AuthService.accessToken(code, ip, client, secret);
logger.info(String.format("getTrdSSOAuth→accessToken返回数据：%s", access_token)); logger.info(String.format("getTrdSSOAuth→accessToken返回数据：%s", access_token));
@ -81,6 +82,18 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler {
result.setUser(user); result.setUser(user);
result.setSucess(true); result.setSucess(true);
logger.info("SSO用户登录成功，进入苍穹系统"); logger.info("SSO用户登录成功，进入苍穹系统");
} else if (StringUtils.isNotEmpty(userName)) {
logger.info("加密后user：" + userName);
String user = AesUtils.aesDecryptString(userName);
logger.info("SSO用户名：" + user);
result.setUserType(UserProperType.UserName);
result.setUser(user);
result.setSucess(true);
logger.info("SSO用户登录成功，进入苍穹系统");
} else {
result.setSucess(false);
logger.info("SSO用户登录失败");
} }
return result; return result;
} }

16
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/midservice/servicehandler/BacklogServiceHandle.java
View File

@ -493,9 +493,9 @@ public class BacklogServiceHandle extends AbstractServiceHandler {
Long taskId = ctx.getTaskId(); Long taskId = ctx.getTaskId();
for (DynamicObject queryOne : query) { for (DynamicObject queryOne : query) {
if (dynamicObject != null) { if (dynamicObject != null) {
DealToDoHandler.get_DealToDoHandler().sendDealToDo(taskId, queryOne.getString("username"), dynamicObject.getString("billno")); DealToDoHandler.get_DealToDoHandler().sendDealToDo(taskId, queryOne.getString("phone"), dynamicObject.getString("billno"));
} else { } else {
DealToDoHandler.get_DealToDoHandler().sendDealToDo(taskId, queryOne.getString("username"), ""); DealToDoHandler.get_DealToDoHandler().sendDealToDo(taskId, queryOne.getString("phone"), "");
} }
} }
} }
@ -514,9 +514,9 @@ public class BacklogServiceHandle extends AbstractServiceHandler {
Long taskId = ctx.getTaskId(); Long taskId = ctx.getTaskId();
for (DynamicObject queryOne : query) { for (DynamicObject queryOne : query) {
if (dynamicObject != null) { if (dynamicObject != null) {
DealToDoHandler.get_DealToDoHandler().sendDealToDoNew(taskId, queryOne.getString("username"), dynamicObject.getString("billno")); DealToDoHandler.get_DealToDoHandler().sendDealToDoNew(taskId, queryOne.getString("phone"), dynamicObject.getString("billno"));
} else { } else {
DealToDoHandler.get_DealToDoHandler().sendDealToDoNew(taskId, queryOne.getString("username"), ""); DealToDoHandler.get_DealToDoHandler().sendDealToDoNew(taskId, queryOne.getString("phone"), "");
} }
} }
} }
@ -534,9 +534,9 @@ public class BacklogServiceHandle extends AbstractServiceHandler {
logger.info("####撤销taskid:" + info.getTaskId()); logger.info("####撤销taskid:" + info.getTaskId());
for (DynamicObject queryOne : query) { for (DynamicObject queryOne : query) {
if (dynamicObject != null) { if (dynamicObject != null) {
deleteToDoHandler.get_deleteToDoHandler().sendDeleteToDo(taskId, queryOne.getString("username"), dynamicObject.getString("billno")); deleteToDoHandler.get_deleteToDoHandler().sendDeleteToDo(taskId, queryOne.getString("phone"), dynamicObject.getString("billno"));
} else { } else {
deleteToDoHandler.get_deleteToDoHandler().sendDeleteToDo(taskId, queryOne.getString("username"), ""); deleteToDoHandler.get_deleteToDoHandler().sendDeleteToDo(taskId, queryOne.getString("phone"), "");
} }
} }
} }
@ -554,9 +554,9 @@ public class BacklogServiceHandle extends AbstractServiceHandler {
logger.info("####撤销taskid:" + info.getTaskId()); logger.info("####撤销taskid:" + info.getTaskId());
for (DynamicObject queryOne : query) { for (DynamicObject queryOne : query) {
if (dynamicObject != null) { if (dynamicObject != null) {
deleteToDoHandler.get_deleteToDoHandler().sendDeleteToDoNew(taskId, queryOne.getString("username"), dynamicObject.getString("billno")); deleteToDoHandler.get_deleteToDoHandler().sendDeleteToDoNew(taskId, queryOne.getString("phone"), dynamicObject.getString("billno"));
} else { } else {
deleteToDoHandler.get_deleteToDoHandler().sendDeleteToDoNew(taskId, queryOne.getString("username"), ""); deleteToDoHandler.get_deleteToDoHandler().sendDeleteToDoNew(taskId, queryOne.getString("phone"), "");
} }
} }
} }