diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/eoss/SSOPluginLogin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/eoss/SSOPluginLogin.java index cc2648a..37c0c6b 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/eoss/SSOPluginLogin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/eoss/SSOPluginLogin.java @@ -1,11 +1,14 @@ package shkd.sys.sys.eoss; +import kd.bos.exception.ErrorCode; +import kd.bos.exception.KDException; import kd.bos.logging.Log; import kd.bos.logging.LogFactory; import kd.bos.login.thirdauth.ThirdSSOAuthHandler; import kd.bos.login.thirdauth.UserAuthResult; import kd.bos.login.thirdauth.UserProperType; import org.apache.commons.lang3.StringUtils; +import shkd.sys.sys.utils.AesUtils; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -64,11 +67,9 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler { UserAuthResult result = new UserAuthResult(); //获取返回的授权码 String code = httpServletRequest.getParameter("code"); - logger.info(String.format("getTrdSSOAuth→授权码code:%s", code)); - if (StringUtils.isEmpty(code)) { - result.setSucess(false); - return result; - } else { + String userName = httpServletRequest.getParameter("userName"); + + if (StringUtils.isNotEmpty(code)) { //调用EOSS获取token接口 String access_token = AuthService.accessToken(code, ip, client, secret); logger.info(String.format("getTrdSSOAuth→accessToken返回数据:%s", access_token)); @@ -81,6 +82,18 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler { result.setUser(user); result.setSucess(true); 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; } diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/midservice/servicehandler/BacklogServiceHandle.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/midservice/servicehandler/BacklogServiceHandle.java index 96484b7..ff5dbdc 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/midservice/servicehandler/BacklogServiceHandle.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/midservice/servicehandler/BacklogServiceHandle.java @@ -493,9 +493,9 @@ public class BacklogServiceHandle extends AbstractServiceHandler { Long taskId = ctx.getTaskId(); for (DynamicObject queryOne : query) { 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 { - 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(); for (DynamicObject queryOne : query) { 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 { - 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()); for (DynamicObject queryOne : query) { 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 { - 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()); for (DynamicObject queryOne : query) { 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 { - deleteToDoHandler.get_deleteToDoHandler().sendDeleteToDoNew(taskId, queryOne.getString("username"), ""); + deleteToDoHandler.get_deleteToDoHandler().sendDeleteToDoNew(taskId, queryOne.getString("phone"), ""); } } }