ext合并sys

docker/copy.sh

@@ -50,3 +50,6 @@ cp ../ruoyi-modules/mz-search/target/ruoyi-modules-search.jar ./ruoyi/modules/se
 
 echo "begin copy ruoyi-modules-portal "
 cp ../ruoyi-modules/mz-portal/target/ruoyi-modules-portal.jar ./ruoyi/modules/portal/jar
+
+echo "begin copy ruoyi-modules-datasync "
+cp ../ruoyi-modules/mz-datasync/target/ruoyi-modules-datasync.jar ./ruoyi/modules/datasync/jar

docker/ruoyi/modules/datasync/dockerfile

@@ -0,0 +1,15 @@
+# 基础镜像
+FROM  openjdk:8-jre
+# author
+MAINTAINER ruoyi
+
+# 挂载目录
+VOLUME /home/ruoyi
+# 创建目录
+RUN mkdir -p /home/ruoyi
+# 指定路径
+WORKDIR /home/ruoyi
+# 复制jar文件到路径
+COPY ./jar/ruoyi-modules-datasync.jar /home/ruoyi/ruoyi-modules-datasync.jar
+# 启动系统服务
+ENTRYPOINT ["java","-jar","ruoyi-modules-datasync.jar"]

docker/ruoyi/modules/datasync/jar/readme.txt

@@ -0,0 +1 @@
+存放门数据同步模块打包好的jar文件，用于docker启动应用。

pom.xml

@@ -52,7 +52,7 @@
                 <nacos.server>10.16.4.12:8848</nacos.server>
 <!--                <nacos.server>mz.tshe.cn:848</nacos.server>-->
                 <nacos.discovery.group>MZ</nacos.discovery.group>
-                <nacos.discovery.namespace></nacos.discovery.namespace>
+                <nacos.discovery.namespace>lzm</nacos.discovery.namespace>
                 <nacos.config.group>MZ</nacos.config.group>
                 <nacos.config.namespace></nacos.config.namespace>
             </properties>

ruoyi-api/pom.xml

@@ -10,7 +10,6 @@
 
     <modules>
         <module>ruoyi-api-system</module>
-        <module>ruoyi-api-ext</module>
     </modules>
 
     <artifactId>ruoyi-api</artifactId>

ruoyi-api/ruoyi-api-ext/pom.xml

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.ruoyi</groupId>
-        <artifactId>ruoyi-api</artifactId>
-        <version>3.6.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    
-    <artifactId>ruoyi-api-ext</artifactId>
-
-    <description>
-        ruoyi-api-system扩展接口模块
-    </description>
-
-    <dependencies>
-		
-        <!-- RuoYi Common Core-->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>5.8.5</version>
-        </dependency>
-
-
-        <!-- Druid -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-            <version>${druid.version}</version>
-        </dependency>
-
-
-    </dependencies>
-
-</project>

ruoyi-api/ruoyi-api-ext/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,6 +0,0 @@
-com.ruoyi.ext.api.factory.RemoteDictDataFallbackFactory
-com.ruoyi.ext.api.factory.RemoteDictTypeFallbackFactory
-com.ruoyi.ext.api.factory.RemoteSysConfigFallbackFactory
-com.ruoyi.ext.api.factory.RemoteJobFallbackFactory
-com.ruoyi.ext.api.factory.RemoteJgFallbackFactory
-com.ruoyi.ext.api.factory.RemoteSysDeptJlFallbackFactory

ruoyi-api/ruoyi-api-system/pom.xml

@@ -22,13 +22,19 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.5</version>
+        </dependency>
 
+        <!-- Druid -->
         <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-api-ext</artifactId>
-            <version>${ruoyi.version}</version>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>${druid.version}</version>
         </dependency>
-        
+
     </dependencies>
 
 </project>

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/RemoteDictDataService.java

@@ -1,9 +1,9 @@
-package com.ruoyi.ext.api;
+package com.ruoyi.system.api;
 
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.constant.ServiceNameConstants;
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.ext.api.factory.RemoteDictDataFallbackFactory;
+import com.ruoyi.system.api.factory.RemoteDictDataFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/RemoteDictTypeService.java

@@ -1,10 +1,10 @@
-package com.ruoyi.ext.api;
+package com.ruoyi.system.api;
 
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.constant.ServiceNameConstants;
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.ext.api.domain.SysObjDictType;
-import com.ruoyi.ext.api.factory.RemoteDictTypeFallbackFactory;
+import com.ruoyi.system.api.domain.SysObjDictType;
+import com.ruoyi.system.api.factory.RemoteDictTypeFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestHeader;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/RemoteJgService.java

@@ -1,11 +1,9 @@
-package com.ruoyi.ext.api;
+package com.ruoyi.system.api;
 
 import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.constant.ServiceNameConstants;
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.ext.api.factory.RemoteJgFallbackFactory;
-import com.ruoyi.ext.api.factory.RemoteSysConfigFallbackFactory;
-import com.ruoyi.ext.api.utils.OtherConstants;
+import com.ruoyi.system.api.factory.RemoteJgFallbackFactory;
+import com.ruoyi.system.utils.OtherConstants;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/RemoteJobService.java

@@ -1,9 +1,9 @@
-package com.ruoyi.ext.api;
+package com.ruoyi.system.api;
 
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.ext.api.factory.RemoteJobFallbackFactory;
-import com.ruoyi.ext.api.utils.OtherConstants;
+import com.ruoyi.system.api.factory.RemoteJobFallbackFactory;
+import com.ruoyi.system.utils.OtherConstants;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestHeader;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/RemoteSysConfigService.java

@@ -1,9 +1,9 @@
-package com.ruoyi.ext.api;
+package com.ruoyi.system.api;
 
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.constant.ServiceNameConstants;
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.ext.api.factory.RemoteSysConfigFallbackFactory;
+import com.ruoyi.system.api.factory.RemoteSysConfigFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/RemoteSysDeptJlService.java

@@ -1,7 +1,7 @@
-package com.ruoyi.ext.api;
+package com.ruoyi.system.api;
 
-import com.ruoyi.ext.api.factory.RemoteSysDeptJlFallbackFactory;
-import com.ruoyi.ext.api.utils.OtherConstants;
+import com.ruoyi.system.api.factory.RemoteSysDeptJlFallbackFactory;
+import com.ruoyi.system.utils.OtherConstants;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.web.domain.BaseEntity;
-import com.ruoyi.ext.api.validate.group.AddGroup;
+import com.ruoyi.system.validate.group.AddGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/domain/SysDictData.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.domain;
+package com.ruoyi.system.api.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.annotation.Excel.ColumnType;
 import com.ruoyi.common.core.web.domain.BaseEntity;
-import com.ruoyi.ext.api.validate.group.AddGroup;
+import com.ruoyi.system.validate.group.AddGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.annotation.Excel.ColumnType;
 import com.ruoyi.common.core.web.domain.BaseEntity;
-import com.ruoyi.ext.api.validate.group.AddGroup;
+import com.ruoyi.system.validate.group.AddGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java

@@ -69,4 +69,7 @@ public class SysLogininfor
     @JsonIgnore
     private Map<String, Object> params = new HashMap<>();
 
+    @TableField(exist = false)
+    private Long userId;
+
 }

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/domain/SysObjDictRet.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.domain;
+package com.ruoyi.system.api.domain;
 
 import io.swagger.annotations.ApiModel;
 import lombok.Data;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/domain/SysObjDictType.java

@@ -1,6 +1,6 @@
-package com.ruoyi.ext.api.domain;
+package com.ruoyi.system.api.domain;
 
-import com.ruoyi.ext.api.validate.group.AddGroup;
+import com.ruoyi.system.validate.group.AddGroup;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.NoArgsConstructor;

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java

@@ -7,7 +7,7 @@ import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.annotation.Excel.ColumnType;
 import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.web.domain.BaseEntity;
-import com.ruoyi.ext.api.validate.group.AddGroup;
+import com.ruoyi.system.validate.group.AddGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java

@@ -11,7 +11,7 @@ import com.ruoyi.common.core.annotation.Excels;
 import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import com.ruoyi.common.core.xss.Xss;
-import com.ruoyi.ext.api.validate.group.AddGroup;
+import com.ruoyi.system.validate.group.AddGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/AnnounceStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/ApplicationStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/ChangeAppStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/CheckInStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/ContractStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/CrkStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/DocumentTypeStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/DueDateStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/EstimationStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/ExamineStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/ExpertStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/GradeEvaluationStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/HdlxStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description:

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/JointStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/PortalEnums.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/ProcessStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/PunishmentsStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/RemovalStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/RemoveStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/RemoveTypeStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/ResultStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/RoomManagementStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/RoomStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/SendBackStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/SexStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 public enum SexStatus {
 

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/StateStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/SurvivalStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/SysDeptJlStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/SysRoleStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * 用户角色

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/SysUserTypeStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * 用户类型

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/TopicTypeStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/enums/WhetherStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.enums;
+package com.ruoyi.system.api.enums;
 
 /**
  * @Description: TODO

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/factory/RemoteDictDataFallbackFactory.java

@@ -1,7 +1,7 @@
-package com.ruoyi.ext.api.factory;
+package com.ruoyi.system.api.factory;
 
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.ext.api.RemoteDictDataService;
+import com.ruoyi.system.api.RemoteDictDataService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/factory/RemoteDictTypeFallbackFactory.java

@@ -1,8 +1,8 @@
-package com.ruoyi.ext.api.factory;
+package com.ruoyi.system.api.factory;
 
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.ext.api.RemoteDictTypeService;
-import com.ruoyi.ext.api.domain.SysObjDictType;
+import com.ruoyi.system.api.RemoteDictTypeService;
+import com.ruoyi.system.api.domain.SysObjDictType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/factory/RemoteJgFallbackFactory.java

@@ -1,8 +1,7 @@
-package com.ruoyi.ext.api.factory;
+package com.ruoyi.system.api.factory;
 
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.ext.api.RemoteJgService;
-import com.ruoyi.ext.api.RemoteJobService;
+import com.ruoyi.system.api.RemoteJgService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/factory/RemoteJobFallbackFactory.java

@@ -1,7 +1,7 @@
-package com.ruoyi.ext.api.factory;
+package com.ruoyi.system.api.factory;
 
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.ext.api.RemoteJobService;
+import com.ruoyi.system.api.RemoteJobService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/factory/RemoteSysConfigFallbackFactory.java

@@ -1,7 +1,7 @@
-package com.ruoyi.ext.api.factory;
+package com.ruoyi.system.api.factory;
 
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.ext.api.RemoteSysConfigService;
+import com.ruoyi.system.api.RemoteSysConfigService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/factory/RemoteSysDeptJlFallbackFactory.java

@@ -1,6 +1,6 @@
-package com.ruoyi.ext.api.factory;
+package com.ruoyi.system.api.factory;
 
-import com.ruoyi.ext.api.RemoteSysDeptJlService;
+import com.ruoyi.system.api.RemoteSysDeptJlService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/db/DBException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.db;
+package com.ruoyi.system.db;
 
 import java.io.File;
 import java.io.FileWriter;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/db/DBExecResult.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.db;
+package com.ruoyi.system.db;
 
 import java.io.Serializable;
 

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/db/DBFactory.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.db;
+package com.ruoyi.system.db;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.stat.DruidDataSourceStatManager;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/db/DBImpl.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.db;
+package com.ruoyi.system.db;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import org.slf4j.Logger;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/db/DBResult.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.db;
+package com.ruoyi.system.db;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/db/DBTool.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.db;
+package com.ruoyi.system.db;
 
 public class DBTool {
     public static String getDbSystemDateTime(String dataFormat) {

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/testpoi/DjpdGsA.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.testpoi;
+package com.ruoyi.system.testpoi;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/testpoi/DjpdGsB.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.testpoi;
+package com.ruoyi.system.testpoi;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/testpoi/ExcelUtilMTab.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.testpoi;
+package com.ruoyi.system.testpoi;
 
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.annotation.Excel.ColumnType;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/testpoi/ExcelUtilTest.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.testpoi;
+package com.ruoyi.system.testpoi;
 
 import java.io.File;
 import java.io.FileOutputStream;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/testpoi/ExcelUtilTool.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.testpoi;
+package com.ruoyi.system.testpoi;
 
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.annotation.Excel.Type;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/testpoi/ExeclTempBean.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.testpoi;
+package com.ruoyi.system.testpoi;
 
 import java.util.List;
 

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/utils/Encryption.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.utils;
+package com.ruoyi.system.utils;
 
 import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/utils/GenerateUniqueIdUtil.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.utils;
+package com.ruoyi.system.utils;
 
 import java.text.SimpleDateFormat;
 

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/utils/IDCardUtil.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.utils;
+package com.ruoyi.system.utils;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/utils/NashornBean.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.utils;
+package com.ruoyi.system.utils;
 
 import java.io.Serializable;
 

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/utils/OpenDictUtil.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.utils;
+package com.ruoyi.system.utils;
 
 import java.util.ArrayList;
 import java.util.HashMap;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/utils/OtherConstants.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.utils;
+package com.ruoyi.system.utils;
 
 public class OtherConstants {
 

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/utils/StringUtilsN.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.utils;
+package com.ruoyi.system.utils;
 
 import java.io.*;
 import java.net.URL;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/utils/SubCodeUtil.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.utils;
+package com.ruoyi.system.utils;
 
 import java.util.HashMap;
 import java.util.Map;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/validate/ChineseV.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.validate;
+package com.ruoyi.system.validate;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/validate/ChineseValidator.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.validate;
+package com.ruoyi.system.validate;
 
 import org.apache.commons.lang3.StringUtils;
 

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/validate/DateV.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.validate;
+package com.ruoyi.system.validate;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/validate/DateValidator.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.validate;
+package com.ruoyi.system.validate;
 
 import cn.hutool.core.date.DateUtil;
 import org.apache.commons.lang3.StringUtils;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/validate/DictV.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.validate;
+package com.ruoyi.system.validate;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/validate/DictValidator.java

@@ -1,11 +1,11 @@
-package com.ruoyi.ext.api.validate;
+package com.ruoyi.system.validate;
 
 import com.alibaba.fastjson2.TypeReference;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.ext.api.RemoteDictDataService;
-import com.ruoyi.ext.api.domain.SysDictData;
+import com.ruoyi.system.api.RemoteDictDataService;
+import com.ruoyi.system.api.domain.SysDictData;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.validation.ConstraintValidator;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/validate/EnumV.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.validate;
+package com.ruoyi.system.validate;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/validate/EnumValidator.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.validate;
+package com.ruoyi.system.validate;
 
 import org.apache.commons.lang3.StringUtils;
 

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/validate/IdCardCV.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.validate;
+package com.ruoyi.system.validate;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/validate/IdCardCValidator.java

@@ -1,7 +1,7 @@
-package com.ruoyi.ext.api.validate;
+package com.ruoyi.system.validate;
 
 import cn.hutool.core.bean.DynaBean;
-import com.ruoyi.ext.api.utils.IDCardUtil;
+import com.ruoyi.system.utils.IDCardUtil;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/validate/IdCardV.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.validate;
+package com.ruoyi.system.validate;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/validate/IdCardValidator.java

@@ -1,6 +1,6 @@
-package com.ruoyi.ext.api.validate;
+package com.ruoyi.system.validate;
 
-import com.ruoyi.ext.api.utils.IDCardUtil;
+import com.ruoyi.system.utils.IDCardUtil;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.validation.ConstraintValidator;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/validate/LogicV.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.validate;
+package com.ruoyi.system.validate;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/validate/LogicValidator.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.validate;
+package com.ruoyi.system.validate;
 
 import com.ruoyi.common.core.utils.SpringUtils;
 import org.apache.commons.lang3.StringUtils;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/validate/MobileOrPhoneV.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.validate;
+package com.ruoyi.system.validate;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/validate/MobileOrPhoneValidator.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.validate;
+package com.ruoyi.system.validate;
 
 import org.apache.commons.lang3.StringUtils;
 

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/validate/MobileV.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.validate;
+package com.ruoyi.system.validate;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/validate/MobileValidator.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.validate;
+package com.ruoyi.system.validate;
 
 import org.apache.commons.lang3.StringUtils;
 

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/ext/api/validate/NumberV.java

@@ -1,4 +1,4 @@
-package com.ruoyi.ext.api.validate;
+package com.ruoyi.system.validate;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;