Browse Source

修改依赖

wanggaokun 1 month ago
parent
commit
e09d5a9af7

+ 1 - 2
eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/domain/dept/Dept.java

@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2025 GaoKunW
- *
  */
 
 package org.eco.vip.auth.domain.dept;
@@ -24,7 +23,7 @@ import java.util.List;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Table(value = "system_dept_t")
+@Table("system_dept_t")
 public class Dept extends BaseEntity {
     /**
      * 部门ID

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

@@ -34,7 +34,7 @@ public class PasswordAuthStrategy implements IAuthStrategy {
     }
 
     private User getUserByUsername(String tenantId, String username) {
-        userService.getUsers();
+        userService.selectTenantUserByUserName(tenantId, username);
         return null;
     }
 }

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

@@ -10,6 +10,7 @@ import com.mybatisflex.core.service.IService;
 import org.eco.vip.auth.domain.user.User;
 import org.eco.vip.auth.domain.user.vo.UserVO;
 import org.eco.vip.orm.pojo.PageResult;
+import org.eco.vip.orm.service.IBaseService;
 
 import java.util.List;
 
@@ -19,7 +20,7 @@ import java.util.List;
  * @author GaoKunW
  * @date 2025/3/9 23:20
  */
-public interface IUserService extends IService<User> {
+public interface IUserService extends IBaseService<User> {
     PageResult<UserVO> selectPage();
 
     List<User> getUsers();

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

@@ -19,6 +19,8 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 
+import static org.eco.vip.auth.domain.user.table.UserTableDef.USER;
+
 /**
  * @description UserService
  *
@@ -35,6 +37,10 @@ public class UserService extends BaseService<UserMapper, User> implements IUserS
         return queryWrapper;
     }
 
+    private QueryWrapper buildOneQueryWrapper() {
+        return QueryWrapper.create().select(USER.USER_ID, USER.USER_NAME);
+    }
+
     @Override
     public PageResult<UserVO> selectPage() {
         QueryWrapper queryWrapper = buildQueryWrapper();
@@ -54,6 +60,7 @@ public class UserService extends BaseService<UserMapper, User> implements IUserS
 
     @Override
     public UserVO selectTenantUserByUserName(String tenantId, String username) {
+//        QueryWrapper queryWrapper = query().where(SYSTEM_USER)
         return null;
     }
 }

+ 6 - 4
pom.xml

@@ -33,6 +33,7 @@
         <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
         <maven-surefire-plugin.version>3.5.0</maven-surefire-plugin.version>
         <mapstruct.version>1.6.3</mapstruct.version>
+        <mybatis-flex.version>1.10.9</mybatis-flex.version>
     </properties>
 
     <!-- 依赖管理 -->
@@ -142,10 +143,11 @@
                                 <artifactId>mapstruct-processor</artifactId>
                                 <version>${mapstruct.version}</version>
                             </path>
-<!--                            <path>-->
-<!--                                <groupId>com.mybatis-flex</groupId>-->
-<!--                                <artifactId>mybatis-flex-processor</artifactId>-->
-<!--                            </path>-->
+                            <path>
+                                <groupId>com.mybatis-flex</groupId>
+                                <artifactId>mybatis-flex-processor</artifactId>
+                                <version>${mybatis-flex.version}</version>
+                            </path>
                         </annotationProcessorPaths>
                         <!-- 编译参数写在 arg 内,解决 Spring Boot 3.2 的 Parameter Name Discovery 问题 -->
                         <debug>false</debug>