Merge remote-tracking branch 'origin/master'

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

@@ -15,7 +15,6 @@ import cn.ibizlab.util.security.AuthenticationUser;
 import cn.ibizlab.util.service.AuthenticationUserService;
 import cn.ibizlab.util.service.IBZUSERService;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.ResponseEntity;
@@ -72,8 +71,8 @@ public class UserDingtalkRegisterResource {
      * @return
      */
     @PostMapping(value = "/uaa/queryDingtalkUserByCode")
-    public ResponseEntity<JSONObject> queryDingtalkUserByCode(@RequestParam(value = "id",required = false) String id,@RequestParam(value = "code",required = false) String tmpcode,@RequestBody JSONObject param) {
-
+    public ResponseEntity<AuthenticationInfo> queryDingtalkUserByCode(@RequestParam(value = "id",required = false) String id,@RequestParam(value = "code",required = false) String tmpcode,@RequestBody JSONObject param) {
+        JSONObject object = new JSONObject();
         // 空校验
         String code = param.getString("code");
         if (StringUtils.isEmpty(code))
@@ -81,7 +80,19 @@ public class UserDingtalkRegisterResource {
         if (StringUtils.isEmpty(code))
             throw new BadRequestAlertException("code为空", "UserDingtalkRegisterResource", "");
 
-        return ResponseEntity.ok().body(getUserBySnsCode(id,code));
+        AuthenticationUser ibzuser = userDingtalkRegisterService.getUserByToken(id,code);
+
+        //　生成登录token信息
+        String tokenUsername = ibzuser.getLoginname()+(StringUtils.isEmpty(ibzuser.getDomain())?"":("|"+ibzuser.getDomain()));
+        userDetailsService.resetByUsername(tokenUsername);
+        AuthenticationUser user = userDetailsService.loadUserByUsername(tokenUsername);
+        final String token = jwtTokenUtil.generateToken(user);
+        AuthenticationUser user2 = new AuthenticationUser();
+        CachedBeanCopier.copy(user, user2);
+        user2.setAuthorities(null);
+        user2.setPermissionList(null);
+
+        return ResponseEntity.ok().body(new AuthenticationInfo(token,user2));
     }
 
     @GetMapping(value = "/uaa/open/dingtalk/sns/{code}")