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

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/LoginController.java

@@ -111,14 +111,16 @@ public class LoginController {
          Map<String ,String > re = (Map<String, String>) feignClientResult.getResult();
          String amosToken = re.get("token");
 
-        logger.info("应用授权开始======================================");
-        FeignClientResult fd= privilegeFeign.warrant(appKey, product, amosToken);
-
-        logger.info("应用授权结束======================================"+JSON.toJSONString(fd));
+        logger.info("应用授权开始======================================"+amosToken);
         RequestContext.setToken(amosToken);
         RequestContext.setProduct(product);
         RequestContext.setAppKey(appKey);
 
+        List<ApplicationModel>  fd = Privilege.applicationClient.queryUserService().getResult();
+//        FeignClientResult fd= privilegeFeign.warrant(appKey, product, amosToken);
+
+        logger.info("应用授权结束======================================"+JSON.toJSONString(fd)+amosToken);
+
          AgencyUserModel userModel  =  (AgencyUserModel) Privilege.agencyUserClient.getme().getResult();
          CompanyModel companyModel = userModel.getCompanys().get(0);
          List<DepartmentModel> deptList = remoteSecurityService.getDepartmentTreeByCompanyId(amosToken, product, appKey, companyModel.getSequenceNbr().toString());