refactor(core): 统一实体类引用并优化依赖配置

admin/admin-api/src/main/java/cn/fateverse/admin/vo/DictDataVo.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 
@@ -73,7 +74,7 @@ public class DictDataVo implements Serializable {
 
 
     @ApiModelProperty(value = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
 
 }

admin/admin-api/src/main/java/cn/fateverse/admin/vo/PostVo.java

@@ -8,6 +8,7 @@ import lombok.Builder;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -53,7 +54,7 @@ public class PostVo {
      * 创建时间
      */
     @JsonFormat(locale = "zh",timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     public static PostVo toPostVo(Post post){
         return PostVo.builder()

admin/admin-api/src/main/java/cn/fateverse/admin/vo/RoleVo.java

@@ -8,6 +8,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Set;
 
@@ -60,8 +61,8 @@ public class RoleVo {
     @ApiModelProperty("部门组（数据权限）")
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private Long[] deptIds;
-    private Date createTime;
+    private LocalDateTime createTime;
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     public static RoleVo toRoleVo(Role role){
         return RoleVo.builder()

admin/admin-api/src/main/java/cn/fateverse/admin/vo/UserChooseVo.java

@@ -1,7 +1,7 @@
 package cn.fateverse.admin.vo;
 
-import cn.fateverse.admin.entity.Role;
+import cn.fateverse.common.core.entity.Dept;
-import cn.fateverse.admin.entity.Dept;
+import cn.fateverse.common.core.entity.Role;
 import lombok.Builder;
 import lombok.Data;
 

admin/admin-api/src/main/java/cn/fateverse/admin/vo/UserDetailVo.java

@@ -1,7 +1,7 @@
 package cn.fateverse.admin.vo;
 
-import cn.fateverse.admin.entity.User;
 import cn.fateverse.common.core.entity.Option;
+import cn.fateverse.common.core.entity.User;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Builder;

admin/admin-biz/pom.xml

@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>cn.fateverse</groupId>
-            <artifactId>common-mybatis-puls</artifactId>
+            <artifactId>common-mybatis</artifactId>
         </dependency>
         <dependency>
             <groupId>cn.fateverse</groupId>

admin/admin-biz/src/main/java/cn/fateverse/admin/controller/RoleController.java

@@ -1,8 +1,8 @@
 package cn.fateverse.admin.controller;
 
 import cn.fateverse.admin.dto.RoleDto;
-import cn.fateverse.admin.entity.Role;
+import cn.fateverse.common.core.entity.Role;
-import cn.fateverse.admin.entity.User;
+import cn.fateverse.common.core.entity.User;
 import cn.fateverse.admin.query.RoleQuery;
 import cn.fateverse.admin.vo.RoleVo;
 import cn.fateverse.common.core.entity.IdWrapper;

admin/admin-biz/src/main/java/cn/fateverse/admin/dubbo/DubboRoleServiceImpl.java

@@ -1,6 +1,6 @@
 package cn.fateverse.admin.dubbo;
 
-import cn.fateverse.admin.entity.Role;
+import cn.fateverse.common.core.entity.Role;
 import cn.fateverse.admin.mapper.RoleMapper;
 import cn.fateverse.admin.query.RoleQuery;
 import org.apache.dubbo.config.annotation.DubboService;

admin/admin-biz/src/main/java/cn/fateverse/admin/dubbo/DubboUserServiceImpl.java

@@ -1,9 +1,10 @@
 package cn.fateverse.admin.dubbo;
 
-import cn.fateverse.admin.entity.User;
 import cn.fateverse.admin.service.UserService;
 import cn.fateverse.admin.vo.UserVo;
+import cn.fateverse.common.core.entity.User;
 import cn.fateverse.common.core.exception.CustomException;
+import cn.fateverse.common.security.dubbo.DubboUserSearchService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
 
@@ -15,7 +16,7 @@ import java.util.List;
  */
 @Slf4j
 @DubboService
-public class DubboUserServiceImpl implements DubboUserService {
+public class DubboUserServiceImpl implements DubboUserService, DubboUserSearchService {
 
     private final UserService userService;
 

admin/admin-biz/src/main/java/cn/fateverse/admin/mapper/RoleMapper.java

@@ -1,6 +1,6 @@
 package cn.fateverse.admin.mapper;
 
-import cn.fateverse.admin.entity.Role;
+import cn.fateverse.common.core.entity.Role;
 import cn.fateverse.admin.query.RoleQuery;
 import org.apache.ibatis.annotations.Param;
 

admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/DictDataServiceImpl.java

@@ -9,9 +9,8 @@ import cn.fateverse.admin.mapper.DictDataMapper;
 import cn.fateverse.admin.service.DictCacheService;
 import cn.fateverse.admin.service.DictDataService;
 import cn.fateverse.common.core.entity.Option;
-import cn.fateverse.common.core.exception.CustomException;
 import cn.fateverse.common.core.result.page.TableDataInfo;
-import cn.fateverse.common.mybatis.utils.PageUtils;
+import cn.fateverse.common.mybatisplus.utils.PageUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;

admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/MenuServiceImpl.java

@@ -1,7 +1,7 @@
 package cn.fateverse.admin.service.impl;
 
 import cn.fateverse.admin.dto.MenuDto;
-import cn.fateverse.admin.entity.User;
+import cn.fateverse.common.core.entity.User;
 import cn.fateverse.admin.vo.MenuSimpVo;
 import cn.fateverse.admin.vo.MenuVo;
 import cn.fateverse.admin.vo.OptionMenuVo;

admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/RoleServiceImpl.java

@@ -1,7 +1,7 @@
 package cn.fateverse.admin.service.impl;
 
 import cn.fateverse.admin.dto.RoleDto;
-import cn.fateverse.admin.entity.Role;
+import cn.fateverse.common.core.entity.Role;
 import cn.fateverse.admin.query.RoleQuery;
 import cn.fateverse.admin.vo.RoleVo;
 import cn.fateverse.admin.entity.RoleMenu;

auth/pom.xml

@@ -50,6 +50,11 @@
             <groupId>cn.fateverse</groupId>
             <artifactId>common-file</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.fateverse</groupId>
+            <artifactId>admin-api</artifactId>
+        </dependency>
+
     </dependencies>
 
 

auth/src/main/java/cn/fateverse/auth/entity/UserInfo.java

@@ -1,6 +1,6 @@
 package cn.fateverse.auth.entity;
 
-import cn.fateverse.admin.entity.User;
+import cn.fateverse.common.core.entity.User;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

auth/src/main/java/cn/fateverse/auth/service/UserDetailsServiceImpl.java

@@ -1,11 +1,11 @@
 package cn.fateverse.auth.service;
 
-import cn.fateverse.admin.dubbo.DubboUserService;
+import cn.fateverse.common.core.entity.User;
 import cn.fateverse.common.core.enums.UserState;
 import cn.fateverse.common.core.exception.CustomException;
 import cn.fateverse.common.core.utils.ObjectUtils;
 import cn.fateverse.common.core.entity.LoginUser;
-import cn.fateverse.admin.entity.User;
+import cn.fateverse.common.security.dubbo.DubboUserSearchService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -22,7 +22,7 @@ import org.springframework.stereotype.Component;
 public class UserDetailsServiceImpl implements UserDetailsService {
 
     @DubboReference
-    private DubboUserService userService;
+    private DubboUserSearchService userService;
 
 
     @Override

auth/src/main/java/cn/fateverse/auth/service/impl/LoginServiceImpl.java

@@ -1,14 +1,14 @@
 package cn.fateverse.auth.service.impl;
 
 import cn.fateverse.auth.entity.UserInfo;
+import cn.fateverse.common.core.entity.Role;
+import cn.fateverse.common.core.entity.User;
 import cn.hutool.core.date.DateUtil;
 import cn.fateverse.admin.dubbo.DubboMenuService;
 import cn.fateverse.admin.dubbo.DubboUserService;
 import cn.fateverse.admin.vo.RouterVo;
 import cn.fateverse.auth.entity.LoginBody;
 import cn.fateverse.auth.service.LoginService;
-import cn.fateverse.admin.entity.Role;
-import cn.fateverse.admin.entity.User;
 import cn.fateverse.common.core.constant.CacheConstants;
 import cn.fateverse.common.core.constant.DateConstants;
 import cn.fateverse.common.core.exception.CustomException;

auth/src/main/java/cn/fateverse/auth/service/impl/PermissionService.java

@@ -1,8 +1,8 @@
 package cn.fateverse.auth.service.impl;
 
 import cn.fateverse.admin.dubbo.DubboMenuService;
-import cn.fateverse.admin.entity.User;
 import cn.fateverse.common.core.entity.LoginUser;
+import cn.fateverse.common.core.entity.User;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Component;
 

common/common-core/src/main/java/cn/fateverse/common/core/entity/LoginUser.java

@@ -1,6 +1,5 @@
 package cn.fateverse.common.core.entity;
 
-import cn.fateverse.admin.entity.User;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import lombok.NoArgsConstructor;

common/common-dubbo/pom.xml

@@ -12,7 +12,6 @@
     <artifactId>common-dubbo</artifactId>
 
     <properties>
-        <dubbo.version>3.1.0</dubbo.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
@@ -48,7 +47,6 @@
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-spring-boot-starter</artifactId>
-            <version>${dubbo.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.alibaba.fastjson2</groupId>

common/common-mybatis-puls/pom.xml

@@ -48,6 +48,10 @@
             <groupId>cn.fateverse</groupId>
             <artifactId>common-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.fateverse</groupId>
+            <artifactId>common-security</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

common/common-mybatis-puls/src/main/java/cn/fateverse/common/mybatisplus/handler/AutoSetMetaObjectHandler.java

@@ -4,6 +4,7 @@ import cn.fateverse.common.core.annotaion.EnableAutoField;
 import cn.fateverse.common.core.entity.BaseEntity;
 import cn.fateverse.common.core.enums.MethodEnum;
 import cn.fateverse.common.core.utils.AutoSetValueUtils;
+import cn.fateverse.common.security.utils.SecurityUtils;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import org.apache.ibatis.reflection.MetaObject;
 

common/common-security/src/main/java/cn/fateverse/common/security/dubbo/DubboUserSearchService.java

@@ -0,0 +1,13 @@
+package cn.fateverse.common.security.dubbo;
+
+import cn.fateverse.common.core.entity.User;
+
+public interface DubboUserSearchService {
+    /**
+     * 通过用户名查询用户信息
+     *
+     * @param username 用户名称
+     * @return 用户信息
+     */
+    User getUserByUsername(String username);
+}

notice/notice-biz/pom.xml

@@ -56,6 +56,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-reactor-netty</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.fateverse</groupId>
+            <artifactId>admin-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

notice/notice-biz/src/main/java/cn/fateverse/notice/handler/NoticeSocketServerHandler.java

@@ -1,8 +1,8 @@
 package cn.fateverse.notice.handler;
 
 import cn.hutool.core.util.StrUtil;
-import cn.fateverse.admin.entity.Role;
+import cn.fateverse.common.core.entity.Role;
-import cn.fateverse.admin.entity.User;
+import cn.fateverse.common.core.entity.User;
 import cn.fateverse.common.redis.constant.RedisConstant;
 import cn.fateverse.notice.entity.DelayedTask;
 import cn.fateverse.notice.entity.SocketAuth;

pom.xml

@@ -33,6 +33,7 @@
         <jwt.version>0.9.1</jwt.version>
         <nacos.client>2.0.3</nacos.client>
         <seata.version>1.5.1</seata.version>
+        <dubbo.version>3.1.0</dubbo.version>
         <kaptcha.version>2.3.2</kaptcha.version>
         <swagger.version>3.0.0</swagger.version>
         <redisson.version>3.15.4</redisson.version>
@@ -74,6 +75,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.apache.dubbo</groupId>
+                <artifactId>dubbo-spring-boot-starter</artifactId>
+                <version>${dubbo.version}</version>
+            </dependency>
             <!--Token生成与解析-->
             <dependency>
                 <groupId>io.jsonwebtoken</groupId>
@@ -300,6 +306,11 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-spring-boot-starter</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <repositories>

workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/UserInfo.java

@@ -1,6 +1,6 @@
 package cn.fateverse.workflow.entity.bpmn;
 
-import cn.fateverse.admin.entity.User;
+import cn.fateverse.common.core.entity.User;
 import cn.fateverse.admin.vo.UserVo;
 import cn.fateverse.common.core.entity.LoginUser;
 import cn.fateverse.workflow.enums.OperationStateEnums;

workflow/src/main/java/cn/fateverse/workflow/process/listener/CounterSignListener.java

@@ -3,7 +3,7 @@ package cn.fateverse.workflow.process.listener;
 import cn.fateverse.admin.dubbo.DubboDeptService;
 import cn.fateverse.admin.dubbo.DubboUserService;
 import cn.fateverse.admin.entity.Dept;
-import cn.fateverse.admin.entity.User;
+import cn.fateverse.common.core.entity.User;
 import cn.fateverse.admin.vo.DeptVo;
 import cn.fateverse.admin.vo.UserVo;
 import cn.fateverse.common.core.exception.CustomException;

workflow/src/main/java/cn/fateverse/workflow/process/listener/CreateStartEventListener.java

@@ -1,6 +1,6 @@
 package cn.fateverse.workflow.process.listener;
 
-import cn.fateverse.admin.entity.User;
+import cn.fateverse.common.core.entity.User;
 import cn.fateverse.workflow.constant.ProcessConstant;
 import cn.fateverse.workflow.entity.HistoricalOperation;
 import cn.fateverse.workflow.entity.bpmn.UserInfo;

workflow/src/main/java/cn/fateverse/workflow/service/NotifyService.java

@@ -1,7 +1,7 @@
 package cn.fateverse.workflow.service;
 
 import cn.fateverse.admin.dubbo.DubboUserService;
-import cn.fateverse.admin.entity.User;
+import cn.fateverse.common.core.entity.User;
 import cn.fateverse.admin.vo.UserVo;
 import cn.fateverse.common.core.exception.CustomException;
 import cn.fateverse.common.email.entity.SendEmailInfo;

workflow/src/main/java/cn/fateverse/workflow/service/ProcessNodeService.java

@@ -2,7 +2,7 @@ package cn.fateverse.workflow.service;
 
 import cn.fateverse.admin.dubbo.DubboUserService;
 import cn.fateverse.admin.entity.Dept;
-import cn.fateverse.admin.entity.User;
+import cn.fateverse.common.core.entity.User;
 import cn.fateverse.admin.vo.UserVo;
 import cn.fateverse.common.core.exception.CustomException;
 import cn.fateverse.workflow.constant.ProcessConstant;

workflow/src/main/java/cn/fateverse/workflow/service/impl/ProcessInstanceServiceImpl.java

@@ -1,6 +1,6 @@
 package cn.fateverse.workflow.service.impl;
 
-import cn.fateverse.admin.entity.User;
+import cn.fateverse.common.core.entity.User;
 import cn.fateverse.common.core.exception.CustomException;
 import cn.fateverse.common.core.result.page.TableDataInfo;
 import cn.fateverse.workflow.constant.ProcessConstant;

workflow/src/main/java/cn/fateverse/workflow/service/impl/ProcessTaskServiceImpl.java

@@ -4,7 +4,7 @@ import cn.fateverse.workflow.constant.ProcessConstant;
 import cn.fateverse.workflow.entity.bpmn.*;
 import cn.fateverse.workflow.mapper.*;
 import cn.hutool.core.util.StrUtil;
-import cn.fateverse.admin.entity.User;
+import cn.fateverse.common.core.entity.User;
 import cn.fateverse.common.core.entity.Option;
 import cn.fateverse.common.core.exception.CustomException;
 import cn.fateverse.common.core.result.page.TableDataInfo;