AI接入逻辑完善

vetti-framework/src/main/java/com/vetti/framework/web/service/SysLoginService.java

@@ -3,6 +3,7 @@ package com.vetti.framework.web.service;
 import javax.annotation.Resource;
 
 import com.vetti.common.core.domain.AjaxResult;
+import com.vetti.common.core.domain.dto.LoginDto;
 import com.vetti.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -64,9 +65,10 @@ public class SysLoginService
      * @param uuid 唯一标识
      * @return 结果
      */
-    public AjaxResult login(String username, String password, String code, String uuid)
+    public LoginDto login(String username, String password, String code, String uuid)
     {
-        AjaxResult ajax = AjaxResult.success();
+        LoginDto loginDto = new LoginDto();
+
         // 验证码校验
 //        validateCaptcha(username, code, uuid);
         // 登录前置校验
@@ -101,9 +103,12 @@ public class SysLoginService
         LoginUser loginUser = (LoginUser) authentication.getPrincipal();
         recordLoginInfo(loginUser.getUserId());
         // 生成token
-        ajax.put(Constants.TOKEN, tokenService.createToken(loginUser));
-        ajax.put("userId",loginUser.getUserId());
-        return ajax;
+        loginDto.setToken(tokenService.createToken(loginUser));
+        loginDto.setUserId(loginUser.getUserId());
+        SysUser user = userService.selectUserById(loginUser.getUserId());
+        loginDto.setUser(user);
+
+        return loginDto;
 
     }
 

vetti-framework/src/main/java/com/vetti/framework/web/service/SysRegisterService.java

@@ -82,6 +82,8 @@ public class SysRegisterService {
             throw new ServiceException(MessageUtils.messageCustomize("systemSysRegisterService10005"));
         } else {
             sysUser.setUserFlag(UserFlagEnum.FLAG_1.getCode());
+            //操作状态初始化
+            sysUser.setUserOperStatus("1");
             sysUser.setSysUserType(registerBody.getSysUserType());
 //            sysUser.setNickName(username);
             sysUser.setPwdUpdateDate(DateUtils.getNowDate());