uaa整改

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/rest/extensions/ClientAuthenticationResource.java

@@ -9,6 +9,7 @@ import cn.ibizlab.util.service.AuthenticationUserService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.StringUtils;
@@ -37,6 +38,7 @@ public class ClientAuthenticationResource
     private String OPPriTag="OPPRIV";
 
     @Autowired
+    @Qualifier("IBZUSERService")
     private AuthenticationUserService userDetailsService;
 
     @Autowired
@@ -49,10 +51,26 @@ public class ClientAuthenticationResource
     @PostMapping(value = "uaa/login")
     public ResponseEntity<AuthenticationUser> login(@Validated @RequestBody AuthorizationLogin authorizationLogin){
         userDetailsService.resetByUsername(authorizationLogin.getUsername());
-        AuthenticationUser user = userDetailsService.loadUserByLogin(authorizationLogin.getDomain(),authorizationLogin.getLoginname(),authorizationLogin.getPassword());
-        setUserName(user,authorizationLogin);
-        setUserPermission(user);
-        setUserOrgInfo(user);
+        AuthenticationUser user = userDetailsService.loadUserByLogin(authorizationLogin.getUsername(),authorizationLogin.getPassword());
+        if(user.getPermisionList()==null)
+        {
+            setUserPermission(user);
+            setUserOrgInfo(user);
+        }
+
+        return ResponseEntity.ok().body(user);
+    }
+
+
+    @PostMapping(value = "uaa/loginbyusername")
+    public ResponseEntity<AuthenticationUser> loginByUsername(@Validated @RequestBody String username){
+        //userDetailsService.resetByUsername(authorizationLogin.getUsername());
+        AuthenticationUser user = userDetailsService.loadUserByUsername(username);
+        if(user.getPermisionList()==null)
+        {
+            setUserPermission(user);
+            setUserOrgInfo(user);
+        }
 
         return ResponseEntity.ok().body(user);
     }
@@ -141,19 +159,5 @@ public class ClientAuthenticationResource
         user.setOrgInfo(orgInfo);
     }
 
-    /**
-     * 设置用户信息
-     * @param user
-     * @param authorizationLogin
-     */
-    private void setUserName(AuthenticationUser user, AuthorizationLogin authorizationLogin) {
-
-        String domain=authorizationLogin.getDomain();
-        String username=authorizationLogin.getUsername();
-        String password=authorizationLogin.getPassword();
-        if(!StringUtils.isEmpty(domain))
-            username = username+"|"+domain;
-        username=username+"|"+password;
-        user.setUsername(username);
-    }
+
 }