From 898c6142dfff5c0aaf091d1a5f287a427b175e9c Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 17 六月 2024 09:22:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/LoginController.java | 14 ++
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmSessionForLoginImpl.java | 14 ++
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/SessionInfo.java | 13 ++
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/constant/FrameWorkBusLangCodeConstant.java | 5
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/interceptor/VciSecurityInterceptor.java | 3
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/LoginServiceImpl.java | 56 +++++++-
/dev/null | 66 -----------
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/PlatformClientUtil.java | 38 +++---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java | 38 -----
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/interceptor/VciSessionForLoginI.java | 6 +
Source/plt-web/plt-web-parent/plt-web/src/main/resources/i18n/messages_zh_CN.properties | 1
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/RequestClientInfo.java | 70 +++++++++++
Source/plt-web/plt-web-parent/plt-web/src/main/resources/i18n/messages.properties | 1
13 files changed, 194 insertions(+), 131 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/interceptor/VciSecurityInterceptor.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/interceptor/VciSecurityInterceptor.java
index 932537b..1237741 100644
--- a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/interceptor/VciSecurityInterceptor.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/interceptor/VciSecurityInterceptor.java
@@ -128,6 +128,9 @@
sendErrorMsg(response,msg,2);
return false;
}else{
+ //鍒濆鍖栧钩鍙扮殑token
+ sessionForLoginI.initInvocationInfo(sessionInfo);
+
String systemPrivateToken = request.getHeader(TokenKeyConstant.SYSTEM_PRIVATE_KEY);
try {
if (sessionForLoginI.checkRequestRights(request, systemPrivateToken, sessionInfo, handler)) {
diff --git a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/interceptor/VciSessionForLoginI.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/interceptor/VciSessionForLoginI.java
index 96d9b5f..8e42f23 100644
--- a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/interceptor/VciSessionForLoginI.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/interceptor/VciSessionForLoginI.java
@@ -97,4 +97,10 @@
* @param sessionInfo session鐨勪俊鎭�
*/
void refreshToken(String key, SessionInfo sessionInfo);
+
+ /**
+ * 灏唗oken鏀惧叆骞冲彴涓�
+ * @param sessionInfo
+ */
+ void initInvocationInfo(SessionInfo sessionInfo);
}
diff --git a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/RequestClientInfo.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/RequestClientInfo.java
index 3d75a4b..caad8e9 100644
--- a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/RequestClientInfo.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/RequestClientInfo.java
@@ -51,6 +51,31 @@
*/
private String ssoToken;
+ /**
+ * 鎿嶄綔绯荤粺
+ */
+ private String osName;
+
+ /**
+ * 鎿嶄綔绯荤粺鐢ㄦ埛
+ */
+ private String osUser;
+
+ /**
+ * 鏈哄櫒鍚�
+ */
+ private String machine;
+
+ /**
+ * 鎿嶄綔绯荤粺璇█
+ */
+ private String language;
+
+ /**
+ * 鎿嶄綔绯荤粺璁剧疆鐨勫浗瀹�
+ */
+ private String country;
+
public String getRequestType() {
return requestType;
}
@@ -115,6 +140,46 @@
this.ssoToken = ssoToken;
}
+ public String getOsName() {
+ return osName;
+ }
+
+ public void setOsName(String osName) {
+ this.osName = osName;
+ }
+
+ public String getOsUser() {
+ return osUser;
+ }
+
+ public void setOsUser(String osUser) {
+ this.osUser = osUser;
+ }
+
+ public String getMachine() {
+ return machine;
+ }
+
+ public void setMachine(String machine) {
+ this.machine = machine;
+ }
+
+ public String getLanguage() {
+ return language;
+ }
+
+ public void setLanguage(String language) {
+ this.language = language;
+ }
+
+ public String getCountry() {
+ return country;
+ }
+
+ public void setCountry(String country) {
+ this.country = country;
+ }
+
@Override
public String toString() {
return "RequestClientInfo{" +
@@ -126,6 +191,11 @@
", sso=" + sso +
", ssoSystemName='" + ssoSystemName + '\'' +
", ssoToken='" + ssoToken + '\'' +
+ ", osName='" + osName + '\'' +
+ ", osUser='" + osUser + '\'' +
+ ", machine='" + machine + '\'' +
+ ", language='" + language + '\'' +
+ ", country='" + country + '\'' +
'}';
}
}
diff --git a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/SessionInfo.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/SessionInfo.java
index 37c2102..cd72a31 100644
--- a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/SessionInfo.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/SessionInfo.java
@@ -29,6 +29,10 @@
*/
private String deptOid;
/**
+ * 鎵�灞為儴闂ㄧ紪鍙�
+ */
+ private String deptNum;
+ /**
* 鎵�灞為儴闂ㄥ悕绉�
*/
private String deptName;
@@ -624,12 +628,21 @@
this.lastLoginTime = lastLoginTime;
}
+ public String getDeptNum() {
+ return deptNum;
+ }
+
+ public void setDeptNum(String deptNum) {
+ this.deptNum = deptNum;
+ }
+
@Override
public String toString() {
return "SessionInfo{" +
"orgsOid='" + orgsOid + '\'' +
", orgsName='" + orgsName + '\'' +
", deptOid='" + deptOid + '\'' +
+ ", deptNum='" + deptNum + '\'' +
", deptName='" + deptName + '\'' +
", userOid='" + userOid + '\'' +
", userId='" + userId + '\'' +
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmSessionForLoginImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmSessionForLoginImpl.java
index 126723c..1857244 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmSessionForLoginImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmSessionForLoginImpl.java
@@ -1,6 +1,8 @@
package com.vci.frameworkcore.compatibility.impl;
+import com.vci.client.mw.ClientSessionUtility;
import com.vci.corba.common.PLException;
+import com.vci.corba.common.data.InvocationInfo;
import com.vci.corba.omd.data.AttributeValue;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.constant.TokenKeyConstant;
@@ -342,4 +344,16 @@
String userToken = JwtUtils.getUserToken(jwtToken);
return TokenKeyConstant.TOKEN_KEY_PREFIX_IN_REDIS + userToken;
}
+
+ /**
+ * 灏唗oken鏀惧叆骞冲彴涓�
+ *
+ * @param sessionInfo
+ */
+ @Override
+ public void initInvocationInfo(SessionInfo sessionInfo) {
+ InvocationInfo vcii = new InvocationInfo();
+ vcii.setToken(sessionInfo.getToken());
+ ClientSessionUtility.setInvocationInThread(vcii);
+ }
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/constant/FrameWorkBusLangCodeConstant.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/constant/FrameWorkBusLangCodeConstant.java
index 8021cd2..86c4488 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/constant/FrameWorkBusLangCodeConstant.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/constant/FrameWorkBusLangCodeConstant.java
@@ -540,4 +540,9 @@
* 瀵嗙爜绛栫暐宸茬粡淇敼锛岄渶淇敼璐﹀彿瀵嗙爜
*/
public static final String PASSWORD_POLICY_UPDATED = "passwordPolicyUpdated";
+
+ /**
+ * token鍊间负绌�
+ */
+ public static final String TOKEN_EMPTY = "tokenEmpty";
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/LoginController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/LoginController.java
index 8f8310a..9467793 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/LoginController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/LoginController.java
@@ -17,7 +17,6 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -27,7 +26,10 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.security.Principal;
-import java.util.*;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
/**
* 鐧诲綍鎺у埗鍣�
@@ -256,6 +258,14 @@
clientInfo.setRequestType("browser");
}
}
+
+ Locale loc = Locale.getDefault();
+ clientInfo.setCountry(loc.getCountry());
+ clientInfo.setLanguage(loc.toLanguageTag());
+
+ Map<String,String> map = System.getenv();
+ clientInfo.setMachine(map.get("COMPUTERNAME"));
+ clientInfo.setOsUser(map.get("USERNAME"));
}
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java
index f33882e..e2b4b4f 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java
@@ -12,7 +12,6 @@
import com.vci.starter.web.annotation.config.VciConfigModule;
import com.vci.starter.web.enumpck.SessionStorageTypeEnum;
import com.vci.starter.web.enumpck.UserSecretEnum;
-import com.vci.starter.web.interceptor.VciSessionForLoginI;
import com.vci.starter.web.pagemodel.SessionInfo;
import com.vci.starter.web.properties.VciSessionProperties;
import com.vci.starter.web.util.ApplicationContextProvider;
@@ -22,10 +21,7 @@
import com.vci.web.properties.WebProperties;
import com.vci.web.service.OsAttributeServiceI;
import com.vci.web.service.VciMdServiceI;
-import com.vci.web.service.WebSecretServiceI;
import com.vci.web.service.impl.UIEngineServiceImpl;
-import com.vci.web.service.impl.WebContextInfoFetcher;
-import com.vci.web.service.impl.WebInitServiceImpl;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
@@ -37,16 +33,14 @@
import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
-import org.springframework.util.ResourceUtils;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
import java.util.stream.Collectors;
@@ -58,29 +52,16 @@
@Component
public class VciWebInitTaskComponent implements ApplicationRunner {
-
/**
* 鏃ュ織瀵硅薄
*/
private Logger logger = LoggerFactory.getLogger(getClass());
/**
- * 鍒濆鍖栫殑鏈嶅姟
- */
- @Autowired
- private WebInitServiceImpl initService;
-
- /**
* 鏄惁鍏煎
*/
@Value("${user-table-compatibility:}")
private String compatibility;
-
- /**
- * 涓婁笅鏂囨敞鍐�
- */
- @Autowired
- private WebContextInfoFetcher contextInfoFetcher;
/**
* 閰嶇疆瀵硅薄
@@ -101,11 +82,6 @@
private VciSessionProperties sessionProperties;
/**
- * 浼氳瘽澶勭悊
- */
- @Autowired
- private VciSessionForLoginI sessionForLogin;
- /**
* 寮曞叆鍏煎鐨勯厤缃�
*/
@Autowired(required = false)
@@ -122,12 +98,6 @@
*/
@Autowired
private VciMdServiceI mdService;
-
- /**
- * 瀵嗙骇鏈嶅姟
- */
- @Autowired
- private WebSecretServiceI secretService;
/**
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/LoginServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/LoginServiceImpl.java
index 5d8706a..1c81410 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/LoginServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/LoginServiceImpl.java
@@ -1,8 +1,12 @@
package com.vci.web.service.impl;
-import com.vci.client.logon.base.LogonHandler;
+import com.vci.client.mw.ClientSessionUtility;
+import com.vci.corba.common.PLException;
+import com.vci.corba.common.data.InvocationInfo;
+import com.vci.corba.framework.data.DeptInfo;
import com.vci.corba.framework.data.LoginResult;
import com.vci.corba.framework.data.LoginState;
+import com.vci.corba.framework.data.MachineInfo;
import com.vci.frameworkcore.ajaxTask.SmUserUnLockTask;
import com.vci.frameworkcore.ajaxTask.SmUserUnLockTaskManager;
import com.vci.frameworkcore.compatibility.ISmFunctionQueryService;
@@ -13,7 +17,6 @@
import com.vci.starter.web.annotation.bus.VciLoginAfter;
import com.vci.starter.web.annotation.bus.VciLogoutBefore;
import com.vci.starter.web.annotation.bus.VciLogoutPlugin;
-import com.vci.starter.web.constant.TokenKeyConstant;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.interceptor.VciSessionForLoginI;
import com.vci.starter.web.pagemodel.RequestClientInfo;
@@ -30,16 +33,14 @@
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.lang.reflect.Method;
-import java.util.ArrayList;
import java.util.Date;
-import java.util.HashMap;
import java.util.Map;
-import java.util.concurrent.TimeUnit;
import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.*;
@@ -171,16 +172,28 @@
}
//4銆佽皟鐢ㄥ钩鍙扮櫥褰曟帴鍙ｏ紝杩涜鐧诲綍
- LogonHandler handler = new LogonHandler();
+ MachineInfo machine = getMachieInfo(clientInfo);
+ machine.country = clientInfo.getCountry();
+ machine.language = clientInfo.getLanguage();
+ machine.osUser = clientInfo.getOsUser();
+ machine.machine = clientInfo.getMachine();
+
+ String token = null;
try {
- LoginResult chkRes = handler.checkLogin(userDTO.getUserId(), userDTO.getPassword());
+ LoginResult chkRes = platformClientUtil.getFrameworkService().checkLogin(userDTO.getUserId(),userDTO.getPassword(), machine);
loginResult.setFailCode(getErrorCode(chkRes));
loginResult.setFailMsgArray(new String[]{userDTO.getUserId(), String.valueOf(chkRes.auxInfo)});
if(chkRes.state == LoginState.Error || chkRes.state == LoginState.Locked || chkRes.state == LoginState.Freeze){
return loginResult;
}
+ token = chkRes.token;
} catch (Exception e) {
loginResult.setFailCode(SYSTEM_ERROR);
+ loginResult.setFailMsgArray(new String[]{userDTO.getUserId()});
+ return loginResult;
+ }
+ if(StringUtils.isBlank(token)){
+ loginResult.setFailMsg(TOKEN_EMPTY);
loginResult.setFailMsgArray(new String[]{userDTO.getUserId()});
return loginResult;
}
@@ -283,10 +296,25 @@
user.setPwdWrongCount(0);
SessionInfo sessionInfo = new SessionInfo();
+ sessionInfo.setToken(token);
+
+ //鍒濆鍖栧钩鍙扮殑token
+ sessionForLogin.initInvocationInfo(sessionInfo);
+
//鎷疯礉鐢ㄦ埛鐨勬柊鍒皊ession浼氳瘽涓�
copyUser2SessionInfo(user, sessionInfo, userDTO.getLangCode());
//鎷疯礉璇锋眰淇℃伅鍒皊ession浼氳瘽涓�
copyRequest2SessionInfo(clientInfo, sessionInfo);
+
+ //鑾峰彇浜哄憳鎵�灞炵殑閮ㄩ棬淇℃伅
+ try {
+ DeptInfo deptInfo = platformClientUtil.getFrameworkService().fetchDeptByUserId(user.getOid());
+ sessionInfo.setDeptOid(deptInfo.id);
+ sessionInfo.setDeptName(deptInfo.name);
+ sessionInfo.setDeptNum(deptInfo.num);
+ } catch (PLException e) {
+ throw new VciBaseException("鑾峰彇鐢ㄦ埛鎵�灞為儴闂ㄥけ璐�:"+e.getMessage());
+ }
/** //鏌ヨ鎵�鏈夌殑瑙掕壊
List<SmRoleVO> roleVOList = roleQueryService.listRoleByUserOid(user.getOid(), null);
@@ -305,14 +333,21 @@
sessionInfo.setFunctionOids(new ArrayList());
}*/
- loginResult.setSuccess(true);
- sessionInfo.setToken(Md5.md5(VciBaseUtil.getPk() + "_" + user.getId()));
-
//娣诲姞鍒颁細璇濅俊鎭�
TokenVO tokenVO = saveSessionInfo(sessionInfo);
loginResult.setTokenVO(tokenVO);
+ loginResult.setSuccess(true);
return loginResult;
+ }
+
+ private MachineInfo getMachieInfo(RequestClientInfo clientInfo) {
+ MachineInfo machine = new MachineInfo();
+ machine.country = clientInfo.getCountry();
+ machine.language = clientInfo.getLanguage();
+ machine.osUser = clientInfo.getOsUser();
+ machine.machine = clientInfo.getMachine();
+ return machine;
}
/**
@@ -399,6 +434,7 @@
if(sessionForLogin == null){
throw new VciBaseException("娌℃湁閰嶇疆浼氳瘽瀛樺偍鐨勬湇鍔�");
}
+ WebThreadLocalUtil.setCurrentUserSessionInfoInThread(sessionInfo);
return sessionForLogin.createToken(sessionInfo);
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebContextInfoFetcher.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebContextInfoFetcher.java
deleted file mode 100644
index 4e4fe39..0000000
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebContextInfoFetcher.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.vci.web.service.impl;
-
-import com.vci.client.mw.ClientSessionUtility;
-import com.vci.client.mw.IInvocationContext;
-import com.vci.corba.common.data.InvocationInfo;
-import com.vci.starter.web.annotation.log.VciUnLog;
-import com.vci.starter.web.enumpck.DataSecretEnum;
-import com.vci.starter.web.pagemodel.SessionInfo;
-import com.vci.starter.web.util.WebThreadLocalUtil;
-import com.vci.web.constant.CorbaKeyConstant;
-import org.springframework.stereotype.Component;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 鑾峰彇浼氳瘽鐨勪俊鎭�
- * @author weidy
- * @date 2021-2-2
- */
-@Component
-public class WebContextInfoFetcher implements IInvocationContext {
-
- /**
- * 鑾峰彇corba鎵�闇�鐨勪細璇濈殑淇℃伅
- * @return 涓嶅瓨鍦ㄤ細鍒濆鍖�
- */
- @Override
- @VciUnLog
- public InvocationInfo getInvocationInfo() {
- SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
- if(sessionInfo == null){
- return ClientSessionUtility.getInvocation();
- }else {
- InvocationInfo vcii = new InvocationInfo();
- if (sessionInfo != null) {
- vcii.setToken(sessionInfo.getToken());
- Map<String,String> globalAttributeMap = sessionInfo.getGlobalAttributeMap();
- if(globalAttributeMap==null){
- globalAttributeMap = new HashMap<>();
- globalAttributeMap.put(CorbaKeyConstant.CURRENT_USER_ID,sessionInfo.getUserId());
- globalAttributeMap.put(CorbaKeyConstant.CURRENT_USER_NAME,sessionInfo.getUserName());
- globalAttributeMap.put(CorbaKeyConstant.CURRENT_USER_SECRET,sessionInfo.getUserSecret());
- globalAttributeMap.put(CorbaKeyConstant.CURRENT_USER_EMAIL,sessionInfo.getEmail());
- globalAttributeMap.put(CorbaKeyConstant.CURRENT_USER_GROUPNUM,"");
- globalAttributeMap.put(CorbaKeyConstant.CURRENT_MACHINE_SECRET, DataSecretEnum.NONE.getValue()+"");
- globalAttributeMap.put(CorbaKeyConstant.IP_SECRET_SWITCH,"off");
- globalAttributeMap.put(CorbaKeyConstant.CURRENT_USER_GROUPNAME,sessionInfo.getDeptName());
- globalAttributeMap.put(CorbaKeyConstant.USER_SECRET_SWITCH,"off");
- globalAttributeMap.put(CorbaKeyConstant.CURRENTTIME, String.valueOf(System.currentTimeMillis()));
- }
- //鐜板湪涓嶇‘瀹氳�佺殑鏄惁鍙互鎺ュ彈鏁扮粍澶氫釜鐨勬儏鍐�
- vcii.extAttribs = globalAttributeMap;
- }
- return vcii;
- }
- }
-
- /**
- * 鑾峰彇褰撳墠浼氳瘽
- * @return 浼氳瘽鐨勫璞�
- */
- public SessionInfo getSessionInfo() {
- return WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
- }
-}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/PlatformClientUtil.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/PlatformClientUtil.java
index 8dc8bc0..5798c87 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/PlatformClientUtil.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/PlatformClientUtil.java
@@ -1,6 +1,6 @@
package com.vci.web.util;
-import com.vci.client.common.providers.ClientServiceProvider;
+import com.vci.client.common.providers.WebServiceProvider;
import com.vci.corba.bofactory.BOFactoryServicePrx;
import com.vci.corba.common.PLException;
import com.vci.corba.framework.FrameworkServicePrx;
@@ -87,7 +87,7 @@
* @return 鏈嶅姟鐨勫璞�
*/
public BOFactoryServicePrx getBOFactoryService(){
- return ClientServiceProvider.getBOFService();
+ return WebServiceProvider.getBOFService();
}
/**
@@ -95,7 +95,7 @@
* @return 鏈嶅姟鐨勫璞�
*/
public WorkflowServicePrx getWorkflowService(){
- return ClientServiceProvider.getWFService();
+ return WebServiceProvider.getWFService();
}
/**
@@ -103,7 +103,7 @@
* @Return 鏈嶅姟鐨勫璞�
*/
public FrameworkServicePrx getFrameworkService(){
- return ClientServiceProvider.getFrameService();
+ return WebServiceProvider.getFrameService();
}
/**
@@ -111,7 +111,7 @@
* @return 鏈嶅姟鐨勫璞�
*/
public StatePoolServicePrx getStatePoolService() throws PLException {
- return ClientServiceProvider.getOMDService().getStateService();
+ return WebServiceProvider.getOMDService().getStateService();
}
/**
@@ -119,7 +119,7 @@
* @return 鐢熷懡鍛ㄦ湡鐨勬湇鍔″璞�
*/
public LifeCycleServicePrx getLifeCycleService() throws PLException {
- return ClientServiceProvider.getOMDService().getLifeCycleService();
+ return WebServiceProvider.getOMDService().getLifeCycleService();
}
/**
@@ -127,7 +127,7 @@
* @return 鏋氫妇鐨勬湇鍔″璞�
*/
public EnumServicePrx getEnumService() throws PLException {
- return ClientServiceProvider.getOMDService().getEnumService();
+ return WebServiceProvider.getOMDService().getEnumService();
}
/**
@@ -135,7 +135,7 @@
* @return 鐗堟湰瑙勫垯鐨勬湇鍔�
*/
public VersionRuleServicePrx getVersionService() throws PLException {
- return ClientServiceProvider.getOMDService().getVerRuleService();
+ return WebServiceProvider.getOMDService().getVerRuleService();
}
/**
@@ -143,7 +143,7 @@
* @return 鏈嶅姟鐨勫璞�
*/
public AttPoolServicePrx getAttributeService() throws PLException {
- return ClientServiceProvider.getOMDService().getAttributeService();
+ return WebServiceProvider.getOMDService().getAttributeService();
}
/**
@@ -151,7 +151,7 @@
* @return 鏈嶅姟鐨勫璞�
*/
public BTMServicePrx getBtmService() throws PLException {
- return ClientServiceProvider.getOMDService().getBTMService();
+ return WebServiceProvider.getOMDService().getBTMService();
}
/**
@@ -159,7 +159,7 @@
* @return 鏈嶅姟鐨勫璞�
*/
public LinkTypeServicePrx getLinkTypeService() throws PLException {
- return ClientServiceProvider.getOMDService().getLinkTypeService();
+ return WebServiceProvider.getOMDService().getLinkTypeService();
}
/**
@@ -167,7 +167,7 @@
* @return 鏈嶅姟鐨勫璞�
*/
public PortalServicePrx getPortalService(){
- return ClientServiceProvider.getUIService();
+ return WebServiceProvider.getUIService();
}
/**
@@ -175,7 +175,7 @@
* @return 鏈嶅姟鐨勫璞�
*/
public ObjectQueryServicePrx getQueryService(){
- return ClientServiceProvider.getOQService();
+ return WebServiceProvider.getOQService();
}
/**
@@ -184,7 +184,7 @@
* @return 鍗锋湇鍔＄殑鐨勫璞�
*/
public VolumeServicePrx getVolumeService(String volumeName){
- return ClientServiceProvider.getVolumeService(volumeName);
+ return WebServiceProvider.getVolumeService(volumeName);
}
/**
@@ -192,7 +192,7 @@
* @return 鍗锋湇鍔＄殑鐨勫璞�
*/
public QTDServicePrx getQTDService() throws PLException {
- return ClientServiceProvider.getOMDService().getQTDService();
+ return WebServiceProvider.getOMDService().getQTDService();
}
/**
@@ -202,7 +202,7 @@
* @return 鍗锋湇鍔＄殑鐨勫璞�
*/
public String[][] getSqlQueryService(String sql, AttributeValue[] attrVals) throws PLException {
- return ClientServiceProvider.getBOFService().getSqlQueryResult(sql, attrVals);
+ return WebServiceProvider.getBOFService().getSqlQueryResult(sql, attrVals);
}
/**
@@ -210,7 +210,7 @@
* @Return com.vci.corba.log.LogServicePrx
*/
public LogServicePrx getLogService(){
- return ClientServiceProvider.getLogService();
+ return WebServiceProvider.getLogService();
}
/**
@@ -218,7 +218,7 @@
* @return
*/
public PortalServicePrx getUIService(){
- return ClientServiceProvider.getUIService();
+ return WebServiceProvider.getUIService();
}
/**
@@ -226,6 +226,6 @@
* @return
*/
public BOFactoryServicePrx getBOFService() {
- return ClientServiceProvider.getBOFService();
+ return WebServiceProvider.getBOFService();
}
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/resources/i18n/messages.properties b/Source/plt-web/plt-web-parent/plt-web/src/main/resources/i18n/messages.properties
index ebf5c64..8b802df 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/resources/i18n/messages.properties
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/resources/i18n/messages.properties
@@ -76,6 +76,7 @@
passwordInit=\u8D26\u53F7\u5BC6\u7801\u4E3A\u521D\u59CB\u5BC6\u7801\uFF0C\u9700\u8981\u4FEE\u6539\u540E\u624D\u80FD\u767B\u5F55
passwordExpire=\u5BC6\u7801\u5DF2\u8FC7\u671F
passwordPolicyUpdated=\u5BC6\u7801\u7B56\u7565\u5DF2\u7ECF\u4FEE\u6539\uFF0C\u9700\u4FEE\u6539\u8D26\u53F7\u5BC6\u7801
+tokenEmpty=token\u4E3A\u7A7A
#########\u7CFB\u7EDF\u8D44\u6E90\u76F8\u5173######
com.vci.web.menu.noHasFunction= {0}\u6CA1\u6709\u4EFB\u4F55\u7684\u6743\u9650
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/resources/i18n/messages_zh_CN.properties b/Source/plt-web/plt-web-parent/plt-web/src/main/resources/i18n/messages_zh_CN.properties
index 1d24672..f6dc10e 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/resources/i18n/messages_zh_CN.properties
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/resources/i18n/messages_zh_CN.properties
@@ -76,6 +76,7 @@
passwordInit=\u8D26\u53F7\u5BC6\u7801\u4E3A\u521D\u59CB\u5BC6\u7801\uFF0C\u9700\u8981\u4FEE\u6539\u540E\u624D\u80FD\u767B\u5F55
passwordExpire=\u5BC6\u7801\u5DF2\u8FC7\u671F
passwordPolicyUpdated=\u5BC6\u7801\u7B56\u7565\u5DF2\u7ECF\u4FEE\u6539\uFF0C\u9700\u4FEE\u6539\u8D26\u53F7\u5BC6\u7801
+tokenEmpty=token\u4E3A\u7A7A
#########\u7CFB\u7EDF\u8D44\u6E90\u76F8\u5173######
com.vci.web.menu.noHasFunction= {0}\u6CA1\u6709\u4EFB\u4F55\u7684\u6743\u9650
--
Gitblit v1.9.3