fix(user):修改名称以避免同名冲突

kt-user/pom.xml

@@ -13,10 +13,25 @@
     <packaging>jar</packaging>
 
     <dependencies>
-
         <dependency>
-            <groupId>org.matrix</groupId>
-            <artifactId>kt-kit</artifactId>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+            <version>3.5.1</version>
+        </dependency>
+        <!--        datasource 相关-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.4.3.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -36,21 +51,18 @@
             <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
             <version>3.5.0</version>
         </dependency>
-
         <!--swagger-->
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
             <version>2.9.2</version>
         </dependency>
-
         <!--swagger ui-->
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
             <version>2.9.2</version>
         </dependency>
-
     </dependencies>
 
     <build>

kt-user/src/main/java/org/matrix/local/mapper/ProjectMapper.java → kt-user/src/main/java/org/matrix/local/mapper/KsProjectMapper.java

@@ -15,6 +15,6 @@ import org.springframework.stereotype.Repository;
  */
 @DS("master")
 @Repository
-public interface ProjectMapper extends BaseMapper<Project> {
+public interface KsProjectMapper extends BaseMapper<Project> {
 
 }

kt-user/src/main/java/org/matrix/local/mapper/UserMapper.java → kt-user/src/main/java/org/matrix/local/mapper/KsUserMapper.java

@@ -15,5 +15,5 @@ import org.springframework.stereotype.Repository;
  */
 @DS("master")
 @Repository
-public interface UserMapper extends BaseMapper<User> {
+public interface KsUserMapper extends BaseMapper<User> {
 }

kt-user/src/main/java/org/matrix/local/mapper/UserProjectMapper.java → kt-user/src/main/java/org/matrix/local/mapper/KsUserProjectMapper.java

@@ -15,5 +15,5 @@ import org.springframework.stereotype.Repository;
  */
 @DS("master")
 @Repository
-public interface UserProjectMapper extends BaseMapper<UserProject> {
+public interface KsUserProjectMapper extends BaseMapper<UserProject> {
 }

kt-user/src/main/java/org/matrix/local/service/UserService.java

@@ -7,9 +7,9 @@ import org.matrix.local.entity.User;
 import org.matrix.local.entity.UserProject;
 import org.matrix.local.entity.vo.LoginInfo;
 import org.matrix.local.entity.vo.UserInfo;
-import org.matrix.local.mapper.ProjectMapper;
-import org.matrix.local.mapper.UserMapper;
-import org.matrix.local.mapper.UserProjectMapper;
+import org.matrix.local.mapper.KsProjectMapper;
+import org.matrix.local.mapper.KsUserMapper;
+import org.matrix.local.mapper.KsUserProjectMapper;
 import org.matrix.local.util.MD5Util;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -31,11 +31,11 @@ import static java.util.Objects.nonNull;
 public class UserService {
 
     @Autowired
-    private UserMapper userMapper;
+    private KsUserMapper ksUserMapper;
     @Autowired
-    private ProjectMapper projectMapper;
+    private KsProjectMapper ksProjectMapper;
     @Autowired
-    private UserProjectMapper userProjectMapper;
+    private KsUserProjectMapper ksUserProjectMapper;
 
     /**
      * 登录信息缓存Map
@@ -55,7 +55,7 @@ public class UserService {
     public boolean login(LoginInfo loginInfo, String sessionId) {
         String account = loginInfo.getAccount();
         String password = MD5Util.encode(loginInfo.getPassword());
-        User user = userMapper.selectOne(Wrappers.<User>lambdaQuery()
+        User user = ksUserMapper.selectOne(Wrappers.<User>lambdaQuery()
                 .eq(User::getAccount, account)
                 .eq(User::getPassword, password));
         if (nonNull(user)) {
@@ -78,7 +78,7 @@ public class UserService {
         boolean hasLogin = sessionMap.containsKey(sessionId);
         if (hasLogin) {
             Long userId = sessionMap.get(sessionId);
-            User user = userMapper.selectById(userId);
+            User user = ksUserMapper.selectById(userId);
             if (nonNull(user)) {
                 return userInfo(user);
             } else {
@@ -102,9 +102,9 @@ public class UserService {
     //-------------------------------private--------------------------------
 
     private UserInfo userInfo(User user) {
-        List<Project> projects = userProjectMapper.selectList(Wrappers.<UserProject>lambdaQuery().eq(UserProject::getUserId, user.getId())).stream()
+        List<Project> projects = ksUserProjectMapper.selectList(Wrappers.<UserProject>lambdaQuery().eq(UserProject::getUserId, user.getId())).stream()
                 .map(UserProject::getProjectId)
-                .map(projectMapper::selectById)
+                .map(ksProjectMapper::selectById)
                 .filter(Objects::nonNull)
                 .collect(Collectors.toList());
         return new UserInfo(

kt-user/src/main/java/org/matrix/remote/service/DataCollector.java

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.matrix.local.entity.Project;
 import org.matrix.local.entity.User;
 import org.matrix.local.entity.UserProject;
-import org.matrix.local.mapper.ProjectMapper;
-import org.matrix.local.mapper.UserMapper;
-import org.matrix.local.mapper.UserProjectMapper;
+import org.matrix.local.mapper.KsProjectMapper;
+import org.matrix.local.mapper.KsUserMapper;
+import org.matrix.local.mapper.KsUserProjectMapper;
 import org.matrix.remote.entity.ZtProject;
 import org.matrix.remote.entity.ZtUser;
 import org.matrix.remote.entity.ZtUserView;
@@ -37,11 +37,11 @@ public class DataCollector {
     @Autowired
     private ZtProjectMapper ztProjectMapper;
     @Autowired
-    private UserMapper userMapper;
+    private KsUserMapper ksUserMapper;
     @Autowired
-    private ProjectMapper projectMapper;
+    private KsProjectMapper ksProjectMapper;
     @Autowired
-    private UserProjectMapper userProjectMapper;
+    private KsUserProjectMapper ksUserProjectMapper;
 
     private List<ZtUser> ztUsers = new ArrayList<>();
     private List<ZtUserView> ztUserViews = new ArrayList<>();
@@ -95,30 +95,30 @@ public class DataCollector {
      * 将用户数据保存到本地
      */
     private void saveUser() {
-        userMapper.delete(Wrappers.lambdaQuery());
+        ksUserMapper.delete(Wrappers.lambdaQuery());
         ztUsers.stream()
                 .map(this::user)
-                .forEach(userMapper::insert);
+                .forEach(ksUserMapper::insert);
     }
 
     /**
      * 将项目数据保存到本地
      */
     private void saveProject() {
-        projectMapper.delete(Wrappers.lambdaQuery());
+        ksProjectMapper.delete(Wrappers.lambdaQuery());
         ztProjects.stream()
                 .map(this::project)
-                .forEach(projectMapper::insert);
+                .forEach(ksProjectMapper::insert);
     }
 
     /**
      * 将用户项目关系数据保存到本地
      */
     private void saveUserProject() {
-        userProjectMapper.delete(Wrappers.lambdaQuery());
+        ksUserProjectMapper.delete(Wrappers.lambdaQuery());
         ztUserViews.stream()
                 .flatMap(ztUserView -> userProjects(ztUserView).stream())
-                .forEach(userProjectMapper::insert);
+                .forEach(ksUserProjectMapper::insert);
     }
 
     //------------------------private------------------------------------//
@@ -132,7 +132,7 @@ public class DataCollector {
     }
 
     private List<UserProject> userProjects(ZtUserView ztUserView) {
-        Long userId = userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getAccount, ztUserView.getAccount())).getId();
+        Long userId = ksUserMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getAccount, ztUserView.getAccount())).getId();
         return toList(ztUserView.getProjects()).stream()
                 .map(Integer::parseInt)
                 .map(id -> ztProjectMapper.selectById(id))