repair

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

@@ -3,6 +3,8 @@ package cn.ibizlab.api.rest.extensions;
 
 import cn.ibizlab.core.uaa.service.ISYS_PERMISSIONService;
 import cn.ibizlab.util.client.IBZOUFeignClient;
+import cn.ibizlab.util.security.AuthTokenUtil;
+import cn.ibizlab.util.security.AuthenticationInfo;
 import cn.ibizlab.util.security.AuthenticationUser;
 import cn.ibizlab.util.security.AuthorizationLogin;
 import cn.ibizlab.util.service.AuthenticationUserService;
@@ -34,6 +36,10 @@ public class ClientAuthenticationResource
 
     @Value("${ibiz.jwt.header:Authorization}")
     private String tokenHeader;
+
+    @Autowired
+    private AuthTokenUtil jwtTokenUtil;
+
     /**
      * 实体操作标识
      */
@@ -54,8 +60,17 @@ public class ClientAuthenticationResource
     private ISYS_PERMISSIONService permissionService;
 
     @PostMapping(value = "v7/login")
-    public ResponseEntity<AuthenticationUser> login(@Validated @RequestBody AuthorizationLogin authorizationLogin){
-        return uaalogin(authorizationLogin);
+    public ResponseEntity<AuthenticationInfo> login(@Validated @RequestBody AuthorizationLogin authorizationLogin){
+        userDetailsService.resetByUsername(authorizationLogin.getUsername());
+        AuthenticationUser user = userDetailsService.loadUserByLogin(authorizationLogin.getUsername(),authorizationLogin.getPassword());
+        if(user.getPermissionList()==null)
+        {
+            setUserPermission(user);
+            setUserOrgInfo(user);
+        }
+        final String token = jwtTokenUtil.generateToken(user);
+        // 返回 token
+        return ResponseEntity.ok().body(new AuthenticationInfo(token,user));
     }
 
     @PostMapping(value = "uaa/login")