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

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

@@ -97,7 +97,7 @@ public class LoginController {
     }
     
 
-	private ReginParams getLogin(String userId, String token) throws Exception{
+	private   ReginParams getLogin(String userId, String token) throws Exception{
 		 ReginParams reginParams = new ReginParams();
 		 IdPasswordAuthModel  dPasswordAuthModel = new IdPasswordAuthModel();
          dPasswordAuthModel.setLoginId(userId);
@@ -111,13 +111,15 @@ 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("应用授权开始======================================"+amosToken);
+        RequestContext.setToken(amosToken);
+        RequestContext.setProduct(product);
+        RequestContext.setAppKey(appKey);
 
-        logger.info("应用授权结束======================================"+JSON.toJSONString(fd));
-         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);