Explorar o código

修改初始化时候的不能获取账套的BUG.

yangzhijie %!s(int64=6) %!d(string=hai) anos
pai
achega
050e536081

+ 7 - 7
src/main/java/com/leanwo/gateway/service/AccountManagementServiceImpl.java

@@ -29,13 +29,13 @@ public class AccountManagementServiceImpl implements AccountManagementService {
 	public List<AccountManagementDto> loadAccountManagement(boolean force) {
 		try {
 			if (accountManagementDtos == null || force) {
-		        if(accountManagementDtos == null) {
-		        	LoginContextUtil.clear();
-		        	LoginContextUtil.setUseApplicationAccount(0L);
-		        	LoginContext loginContext = LoginContextUtil.getLoginContext();
-			        String tempToken = tokenService.generateTempToken();
-			        loginContext.setToken(tempToken);
-		        }
+				if (accountManagementDtos == null) {
+					LoginContext loginContext = new LoginContext();
+					loginContext.setAccountId(0L);
+					String tempToken = tokenService.generateTempToken();
+					loginContext.setToken(tempToken);
+					LoginContextUtil.setLoginContext(loginContext);
+				}
 				accountManagementDtos = prodogServer.getAccountManagementDtoCache();
 			}
 		}catch(Exception ex) {

+ 0 - 57
src/main/java/com/leanwo/gateway/util/LoginContextUtil.java

@@ -45,63 +45,6 @@ private static ThreadLocal<LoginContext> loginContextHolder = new ThreadLocal<Lo
 		uuidHolder.set(uuid);
 	}
 	
-	
-	/**
-	 * 设置使用测试账户
-	 * Add by jack 20151010
-	 */
-	public static void setUseApplicationAccount(){
-		LoginContext loginContext = new LoginContext();
-		loginContext.setClientId(1L);
-		loginContext.setOrgId(1L);
-		loginContext.setUserId(1L);
-		loginContext.setAccountId(2L);
-		LoginContextUtil.setLoginContext(loginContext);
-	}
-	
-	/**
-	 * 设置使用系统账户
-	 * Add by jack 20160918
-	 */
-	public static void setUseDictionaryAccount(){
-		LoginContext loginContext = new LoginContext();
-		loginContext.setClientId(1L);
-		loginContext.setOrgId(1L);
-		loginContext.setUserId(1L);
-		loginContext.setAccountId(1L);
-		LoginContextUtil.setLoginContext(loginContext);
-	}
-	
-	
-	/**
-	 * 设置当前环境为测试环境
-	 * Add by jack 20151010
-	 */
-	public static void setTestEnvironment(){
-		LoginContext loginContext = new LoginContext();
-		loginContext.setClientId(1L);
-		loginContext.setOrgId(1L);
-		loginContext.setRoleId(2L);
-		loginContext.setUserId(1L);
-		loginContext.setAccountId(2L);
-		LoginContextUtil.setLoginContext(loginContext);
-	}
-	
-	
-	/**
-	 * 设置当前环境为Dic数据库测试环境
-	 * Add by jack 20151010
-	 */
-	public static void setTestDicEnvironment(){
-		LoginContext loginContext = new LoginContext();
-		loginContext.setClientId(1L);
-		loginContext.setOrgId(2L);
-		loginContext.setUserId(1L);
-		loginContext.setAccountId(1L);
-		loginContext.setLanguageId(283020L);
-		LoginContextUtil.setLoginContext(loginContext);
-	}
-	
 	/**
 	 * 设置线程的环境变量
 	 * @param clientId