添加用户信息， 登录

eco-common/com-security/src/main/java/org/eco/vip/security/handler/AllUrlHandler.java

@@ -31,7 +31,7 @@ import java.util.regex.Pattern;
 @Data
 public class AllUrlHandler implements InitializingBean {
 
-    private static final Pattern PATTERN = Pattern.compile("\\{(.*?)}");
+    private static final Pattern PATTERN = Pattern.compile("\\{(.*?)\\}");
 
     private List<String> urls = new ArrayList<>();
 

eco-common/com-web/src/main/java/org/eco/vip/web/config/core/handler/GlobalExceptionHandler.java → eco-common/com-web/src/main/java/org/eco/vip/web/core/handler/GlobalExceptionHandler.java

@@ -3,7 +3,7 @@
  *
  */
 
-package org.eco.vip.web.config.core.handler;
+package org.eco.vip.web.core.handler;
 
 
 import cn.hutool.core.collection.CollUtil;

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/controller/auth/AuthController.java

@@ -29,7 +29,7 @@ import static org.eco.vip.orm.pojo.CommonResult.success;
  * @date 2025/7/1 11:08
  */
 @RestController
-@RequestMapping("/system/auth")
+@RequestMapping("/auth")
 @Validated
 public class AuthController {
 

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/controller/user/UserController.java

@@ -8,6 +8,7 @@ package org.eco.vip.auth.controller.user;
 
 import jakarta.annotation.Resource;
 import org.eco.vip.auth.domain.user.User;
+import org.eco.vip.auth.domain.user.vo.UserBO;
 import org.eco.vip.auth.domain.user.vo.UserVO;
 import org.eco.vip.auth.service.user.IUserService;
 import org.eco.vip.orm.pojo.CommonResult;
@@ -45,9 +46,9 @@ public class UserController {
         return success(userService.selectPage());
     }
 
-    @PostMapping
-    public Boolean add(@RequestBody User user) {
-        return userService.insertUser(user);
+    @PostMapping(("/add"))
+    public Boolean add(@RequestBody UserBO userBO) {
+        return userService.insert(userBO);
     }
 
     @PostMapping("/update")

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/domain/auth/vo/AuthQuery.java

@@ -53,7 +53,6 @@ public class AuthQuery {
     /**
      * 授权类型
      */
-    @NotBlank(message = "授权类型不能为空")
     private String grantType;
 
     /**

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/domain/user/User.java

@@ -31,12 +31,12 @@ public class User extends BaseEntity {
      * 用户ID
      */
     @Id
-    private String userId;
+    private String id;
 
     /**
-     * 部门ID
+     * 组织ID
      */
-    private String deptId;
+    private String orgId;
 
     /**
      * 用户账号

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/domain/user/vo/UserBO.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2025 GaoKunW
+ *
+ */
+
+package org.eco.vip.auth.domain.user.vo;
+
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.eco.vip.auth.domain.user.User;
+import org.eco.vip.orm.domain.BaseBO;
+
+/**
+ * @description UserBO
+ *
+ * @author GaoKunW
+ * @date 2025/7/2 18:07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = User.class, reverseConvertGenerate = false)
+public class UserBO extends BaseBO {
+
+    /**
+     * 组织ID
+     */
+    private String orgId;
+
+    /**
+     * 用户账号
+     */
+    private String account;
+
+    /**
+     * 用户姓名
+     */
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+    /**
+     * 用户登录设备类型（pc_user系统用户、app_user App用户）
+     */
+    private String userType;
+
+    /**
+     * 用户邮箱
+     */
+    private String email;
+
+    /**
+     * 手机号码
+     */
+    private String phoneNumber;
+
+    /**
+     * 用户性别
+     */
+    private String gender;
+
+    /**
+     * 密码
+     */
+    private String password;
+}

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/domain/user/vo/UserVO.java

@@ -28,7 +28,7 @@ public class UserVO extends BaseEntity {
      * 用户ID
      */
     @Id
-    private String userId;
+    private String id;
 
     /**
      * 组织ID

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/auth/LoginService.java

@@ -27,7 +27,7 @@ public class LoginService {
     public LoginUser buildLoginUser(UserVO user) {
         LoginUser loginUser = new LoginUser();
         loginUser.setTenantId(user.getTenantId());
-        loginUser.setUserId(user.getUserId());
+        loginUser.setUserId(user.getId());
         loginUser.setOrgId(user.getOrgId());
         loginUser.setUsername(user.getUserName());
         loginUser.setNickname(user.getNickName());

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/auth/PasswordAuthStrategy.java

@@ -47,6 +47,8 @@ public class PasswordAuthStrategy implements IAuthStrategy {
         UserVO userVO = getUserByAccount(tenantId, account);
 
         LoginUser loginUser = new LoginUser();
+        loginUser.setUserId("sdsd");
+        loginUser.setUserType("pc");
         SaLoginParameter loginParameter = new SaLoginParameter();
         loginParameter.setDeviceType("pc");
         loginParameter.setTimeout(10);

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/user/IUserService.java

@@ -8,6 +8,7 @@ package org.eco.vip.auth.service.user;
 
 import com.mybatisflex.core.service.IService;
 import org.eco.vip.auth.domain.user.User;
+import org.eco.vip.auth.domain.user.vo.UserBO;
 import org.eco.vip.auth.domain.user.vo.UserVO;
 import org.eco.vip.orm.pojo.PageResult;
 import org.eco.vip.orm.service.IBaseService;
@@ -25,7 +26,7 @@ public interface IUserService extends IBaseService<User> {
 
     List<User> getUsers();
 
-    boolean insertUser(User user);
+    boolean insert(UserBO userBO);
 
     UserVO selectTenantUserByUserName(String tenantId, String username);
 }

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/user/UserService.java

@@ -10,11 +10,13 @@ import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import jakarta.annotation.Resource;
 import org.eco.vip.auth.domain.user.User;
+import org.eco.vip.auth.domain.user.vo.UserBO;
 import org.eco.vip.auth.domain.user.vo.UserVO;
 import org.eco.vip.auth.mapper.UserMapper;
 import org.eco.vip.orm.domain.PageQuery;
 import org.eco.vip.orm.pojo.PageResult;
 import org.eco.vip.orm.service.BaseService;
+import org.eco.vip.orm.utils.MapstructUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -54,7 +56,8 @@ public class UserService extends BaseService<UserMapper, User> implements IUserS
     }
 
     @Override
-    public boolean insertUser(User user) {
+    public boolean insert(UserBO userBO) {
+        User user = MapstructUtils.convert(userBO, User.class);
         return this.save(user);
     }
 

eco-start/src/main/resources/application.yml

@@ -64,7 +64,7 @@ sa-token:
   # 是否打印log
   is-print: false
   # jwt秘钥
-  jwt-secret-key: uWqxTNKHjmIfDohOgZCGwElMdJ
+  jwt-secret-key: abcdefghijklmnopqrstuvwxyz
 # security配置
 security:
   # 排除路径
@@ -82,7 +82,8 @@ security:
     - /actuator
     - /actuator/**
     # 其它链接
-    - /login
+    - /auth/login
+    - /system/**
 
 # MyBatisFlex公共配置
 mybatis-flex: