Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/TzsAuthServiceImpl.java

@@ -167,15 +167,17 @@ public class TzsAuthServiceImpl implements TzsAuthService {
         // 需要登录后台账号
         RequestContext.setAppKey("AMOS_STUDIO");
         RequestContext.setProduct("AMOS_STUDIO_WEB");
-        if(redisUtils.hasKey(RedisKey.CTI_USER_TOKEN)) {
-            // 验证token
-            boolean validToken = TokenOperation.refresh(redisUtils.get(RedisKey.CTI_USER_TOKEN).toString());
-            // 登陆
-            if(!validToken) {
+        synchronized (TzsAuthServiceImpl.class) {
+            if (redisUtils.hasKey(RedisKey.CTI_USER_TOKEN)) {
+                // 验证token
+                boolean validToken = TokenOperation.refresh(redisUtils.get(RedisKey.CTI_USER_TOKEN).toString());
+                // 登陆
+                if (!validToken) {
+                    this.loginCtiUser();
+                }
+            } else { // 登陆
                 this.loginCtiUser();
             }
-        } else { // 登陆
-            this.loginCtiUser();
         }
         String ctiToken = redisUtils.get(RedisKey.CTI_USER_TOKEN).toString();
         RequestContext.setToken(ctiToken);

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/RegUnitInfoServiceImpl.java

@@ -321,9 +321,11 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 
 	@Override
 	public RegUnitInfoDto unitCheck(String unitCode, String unitType,String companyName) {
-		
+		tzsAuthServiceImpl.setRequestContext();
+		RequestContext.setToken(RequestContext.getToken());
+		RequestContext.setAppKey(RequestContext.getAppKey());
+		RequestContext.setProduct(RequestContext.getProduct());
         if (!ValidationUtil.isEmpty(companyName)) {
-      	  startPlatformTokenService.getToken();
       	  FeignClientResult<CompanyModel> result =Privilege.companyClient.queryByCompanyName(companyName);
       	  if(result.getResult()!=null) 
       	  {
@@ -332,7 +334,6 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
         }
         
         if (!ValidationUtil.isEmpty(unitCode)) {
-        	  startPlatformTokenService.getToken();
         	  FeignClientResult<CompanyModel> result =Privilege.companyClient.queryByCompanyCode(unitCode);
         	  if(result.getResult()!=null) 
         	  {