!30 将 framework 从项目中独立出去

Merge pull request !30 from 芋道源码/feature/framework

README.md

@@ -25,7 +25,6 @@
 
 ### 系统功能
 
-
 |  | 功能 | 描述 |
 | --- | --- | --- |
 |  | 用户管理 | 用户是系统操作者，该功能主要完成系统用户配置 |
@@ -41,10 +40,6 @@
 | 🚀 | 错误码管理 | 系统所有错误码的管理，可在线修改错误提示，无需重启服务 |
 |  | 通知公告 | 系统通知公告信息发布维护 |
 
-计划新增功能：
-* 邮件
-* 钉钉、飞书等通知
-
 ### 基础设施
 
 |  | 功能 | 描述 |
@@ -64,9 +59,6 @@
 | 🚀 | 日志服务 | 轻量级日志中心，查看远程服务器的日志 |
 | 🚀 | 单元测试 |基于 JUnit + Mockito 实现单元测试，保证功能的正确性、代码的质量等 |
 
-计划新增：
-* 工作流
-
 ### 研发工具
 
 |  | 功能 | 描述 |
@@ -88,6 +80,15 @@
 
 ## 技术栈
 
+| 项目 | 说明 |
+| --- | --- |
+| `yudao-dependencies` | Maven 依赖版本管理 |
+| `yudao-framework` | Java 框架拓展 |
+| `yudao-admin-server` | 管理后台的服务端 |
+| `yudao-admin-ui` | 管理后台的 UI 界面 |
+| `yudao-user-server` | 用户前台的服务端 |
+| `yudao-user-ui` | 用户前台的 UI 界面 |
+
 ### 后端
 
 | 框架 | 说明 |  版本 | 学习指南 |

bin/deploy.sh

@@ -8,11 +8,11 @@ set -e
 
 DATE=$(date +%Y%m%d%H%M)
 # 基础路径
-BASE_PATH=/work/projects/dashboard
+BASE_PATH=/work/projects/yudao-admin-server
 # 编译后 jar 的地址。部署时，Jenkins 会上传 jar 包到该目录下
 SOURCE_PATH=$BASE_PATH/build
 # 服务名称。同时约定部署服务的 jar 包名字也为它。
-SERVER_NAME=dashboard
+SERVER_NAME=yudao-admin-server
 # 环境
 PROFILES_ACTIVE=dev
 # 健康检查 URL

pom.xml

@@ -3,365 +3,62 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
-    <groupId>cn.iocoder</groupId>
-    <artifactId>dashboard</artifactId>
-    <version>1.0.0</version>
-
-    <name>dashboard</name>
-    <url>http://www.iocoder.cn</url>
-    <description>芋道管理系统</description>
-    <packaging>jar</packaging>
+    <groupId>cn.iocoder.boot</groupId>
+    <artifactId>yudao</artifactId>
+    <version>${revision}</version>
+    <packaging>pom</packaging>
+    <modules>
+        <module>yudao-dependencies</module>
+        <module>yudao-framework</module>
+        <module>yudao-admin-server</module>
+    </modules>
+
+    <name>${artifactId}</name>
+    <description>芋道项目基础脚手架</description>
+    <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <resource.delimiter>@</resource.delimiter>
+        <revision>1.0.0</revision>
+        <!-- Maven 相关 -->
         <java.version>1.8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
-        <!-- 统一依赖管理 -->
-        <spring.boot.version>2.4.4</spring.boot.version>
-        <!-- Web 相关 -->
-        <knife4j.version>3.0.2</knife4j.version>
-        <swagger-annotations.version>1.5.22</swagger-annotations.version>
-        <!-- DB 相关 -->
-        <mysql-connector-java.version>5.1.46</mysql-connector-java.version>
-        <druid.version>1.2.4</druid.version>
-        <mybatis-plus.version>3.4.2</mybatis-plus.version>
-        <dynamic-datasource.version>3.3.2</dynamic-datasource.version>
-        <redisson.version>3.15.1</redisson.version>
-        <!-- Config 配置中心相关 -->
-        <apollo.version>1.7.0</apollo.version>
-        <!-- 服务保障相关 -->
-        <lock4j.version>2.2.0</lock4j.version>
-        <resilience4j.version>1.7.0</resilience4j.version>
-        <!-- 监控相关 -->
-        <skywalking.version>8.5.0</skywalking.version>
-        <logback.encoder.version>6.1</logback.encoder.version>
-        <spring-boot-admin.version>2.3.1</spring-boot-admin.version>
-        <!-- 工具类相关 -->
-        <lombok.version>1.16.14</lombok.version>
-        <mapstruct.version>1.4.1.Final</mapstruct.version>
-        <hutool.version>5.6.1</hutool.version>
-        <easyexcel.verion>2.2.7</easyexcel.verion>
-        <velocity.version>2.2</velocity.version>
-        <screw.version>1.0.5</screw.version>
-        <podam.version>7.2.6.RELEASE</podam.version>
-        <jedis-mock.version>0.1.16</jedis-mock.version>
-        <!-- 三方云服务相关 -->
-        <aliyun-java-sdk-core.version>4.5.18</aliyun-java-sdk-core.version>
-        <aliyun-java-sdk-dysmsapi.version>2.1.0</aliyun-java-sdk-dysmsapi.version>
-        <yunpian-java-sdk.version>1.2.7</yunpian-java-sdk.version>
+        <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
     </properties>
 
-    <!-- 依赖声明 -->
     <dependencyManagement>
         <dependencies>
-            <!-- 统一依赖管理 -->
             <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring.boot.version}</version>
+                <groupId>cn.iocoder.boot</groupId>
+                <artifactId>yudao-dependencies</artifactId>
+                <version>${revision}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
 
-    <dependencies>
-        <!-- Spring 核心 -->
-        <dependency>
-            <!-- 用于生成自定义的 Spring @ConfigurationProperties 配置类的说明文件 -->
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-configuration-processor</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-        </dependency>
-
-        <!-- Web 相关 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-spring-boot-starter</artifactId>
-            <version>${knife4j.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>mapstruct</artifactId>
-                    <groupId>org.mapstruct</groupId> <!-- 避免冲突 -->
-                </exclusion>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>swagger-annotations</artifactId>
-                    <groupId>io.swagger</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-annotations.version}</version>
-        </dependency>
-
-        <!-- DB 相关 -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>${mysql-connector-java.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-            <version>${druid.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>${mybatis-plus.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot-starter</artifactId> <!-- 多数据源 -->
-            <version>${dynamic-datasource.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.redisson</groupId>
-            <artifactId>redisson-spring-boot-starter</artifactId>
-            <version>${redisson.version}</version>
-        </dependency>
-
-        <!-- Config 配置中心相关 -->
-        <dependency>
-            <groupId>com.ctrip.framework.apollo</groupId>
-            <artifactId>apollo-client</artifactId> <!-- 引入 Apollo Client 库，实现内嵌的配置中心 -->
-            <version>${apollo.version}</version>
-        </dependency>
-
-        <!-- Job 定时任务相关 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-quartz</artifactId>
-        </dependency>
-
-        <!-- 服务保障相关 -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
-            <version>${lock4j.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>redisson-spring-boot-starter</artifactId>
-                    <groupId>org.redisson</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>io.github.resilience4j</groupId>
-            <artifactId>resilience4j-spring-boot2</artifactId>
-            <version>${resilience4j.version}</version>
-        </dependency>
-
-        <!-- 监控相关 -->
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>apm-toolkit-trace</artifactId>
-            <version>${skywalking.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>apm-toolkit-logback-1.x</artifactId>
-            <version>${skywalking.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>apm-toolkit-opentracing</artifactId>
-            <version>${skywalking.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>de.codecentric</groupId>
-            <artifactId>spring-boot-admin-starter-server</artifactId> <!-- 实现 Spring Boot Admin Server 服务端 -->
-            <version>${spring-boot-admin.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>de.codecentric</groupId>
-            <artifactId>spring-boot-admin-starter-client</artifactId> <!-- 实现 Spring Boot Admin Server 服务端 -->
-            <version>${spring-boot-admin.version}</version>
-        </dependency>
-
-        <!-- Test 测试相关 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <artifactId>asm</artifactId>
-                    <groupId>org.ow2.asm</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>com.h2database</groupId> <!-- 单元测试，我们采用 H2 作为数据库 -->
-            <artifactId>h2</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.fppt</groupId> <!-- 单元测试，我们采用内嵌的 Redis 数据库 -->
-            <artifactId>jedis-mock</artifactId>
-            <version>${jedis-mock.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>uk.co.jemos.podam</groupId> <!-- 单元测试，随机生成 POJO 类 -->
-            <artifactId>podam</artifactId>
-            <version>${podam.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- 工具类相关 -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher -->
-            <version>${mapstruct.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct-processor</artifactId>
-            <version>${mapstruct.version}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct-jdk8</artifactId>
-            <version>${mapstruct.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>${hutool.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>easyexcel</artifactId>
-            <version>${easyexcel.verion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-engine-core</artifactId>
-            <version>${velocity.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>cn.smallbun.screw</groupId>
-            <artifactId>screw-core</artifactId> <!-- 实现数据库文档 -->
-            <version>${screw.version}</version>
-        </dependency>
-
-        <!-- 三方云服务相关 -->
-
-        <!-- SMS SDK begin -->
-        <dependency>
-            <groupId>com.yunpian.sdk</groupId>
-            <artifactId>yunpian-java-sdk</artifactId>
-            <version>${yunpian-java-sdk.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>aliyun-java-sdk-core</artifactId>
-            <version>${aliyun-java-sdk-core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
-            <version>${aliyun-java-sdk-dysmsapi.version}</version>
-        </dependency>
-        <!-- SMS SDK end -->
-
-    </dependencies>
-
-
     <build>
-        <!-- 设置构建的 jar 包名 -->
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <!-- 打包 -->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
-                <configuration>
-                    <fork>true</fork>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal> <!-- 将原来的 jar 打入其中 -->
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- 提供给 mapstruct 使用 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>${java.version}</source> <!-- or higher, depending on your project -->
-                    <target>${java.version}</target> <!-- or higher, depending on your project -->
-                    <annotationProcessorPaths>
-                        <path>
-                            <groupId>org.mapstruct</groupId>
-                            <artifactId>mapstruct-processor</artifactId>
-                            <version>${mapstruct.version}</version>
-                        </path>
-                        <path>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok</artifactId>
-                            <version>${lombok.version}</version>
-                        </path>
-                    </annotationProcessorPaths>
-                </configuration>
-            </plugin>
-        </plugins>
+        <pluginManagement>
+            <plugins>
+                <!-- maven-surefire-plugin 插件，用于运行单元测试。 -->
+                <!-- 注意，需要使用 3.0.X+，因为要支持 Junit 5 版本 -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${maven-surefire-plugin.version}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
+    <!-- 使用 aliyun 的 Maven 源，提升下载速度 -->
+    <repositories>
+        <repository>
+            <id>aliyun</id>
+            <name>aliyun</name>
+            <url>http://maven.aliyun.com/nexus/content/groups/public</url>
+        </repository>
+    </repositories>
+
 </project>

src/main/java/cn/iocoder/dashboard/common/enums/DefaultBitFieldEnum.java

@@ -1,27 +0,0 @@
-package cn.iocoder.dashboard.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 通用状态枚举
- *
- * @author 芋道源码
- */
-@Getter
-@AllArgsConstructor
-public enum DefaultBitFieldEnum {
-
-    NO(0, "否"),
-    YES(1, "是");
-
-    /**
-     * 状态值
-     */
-    private final Integer val;
-    /**
-     * 状态名
-     */
-    private final String name;
-
-}

src/main/java/cn/iocoder/dashboard/framework/captcha/package-info.java

@@ -1,4 +0,0 @@
-/**
- * 基于 Hutool captcha 库，实现验证码功能
- */
-package cn.iocoder.dashboard.framework.captcha;

src/main/java/cn/iocoder/dashboard/framework/codegen/package-info.java

@@ -1,4 +0,0 @@
-/**
- * 代码生成器
- */
-package cn.iocoder.dashboard.framework.codegen;

src/main/java/cn/iocoder/dashboard/framework/dict/config/DictConfiguration.java

@@ -1,18 +0,0 @@
-package cn.iocoder.dashboard.framework.dict.config;
-
-import cn.iocoder.dashboard.framework.dict.core.service.DictDataFrameworkService;
-import cn.iocoder.dashboard.framework.dict.core.util.DictUtils;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class DictConfiguration {
-
-    @Bean
-    @SuppressWarnings("InstantiationOfUtilityClass")
-    public DictUtils dictUtils(DictDataFrameworkService service) {
-        DictUtils.init(service);
-        return new DictUtils();
-    }
-
-}

src/main/java/cn/iocoder/dashboard/framework/dict/core/util/DictUtils.java

@@ -1,28 +0,0 @@
-package cn.iocoder.dashboard.framework.dict.core.util;
-
-import cn.iocoder.dashboard.framework.dict.core.service.DictDataFrameworkService;
-import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * 字典工具类
- */
-@Slf4j
-public class DictUtils {
-
-    private static DictDataFrameworkService service;
-
-    public static void init(DictDataFrameworkService service) {
-        DictUtils.service = service;
-        log.info("[init][初始化 DictUtils 成功]");
-    }
-
-    public static SysDictDataDO getDictDataFromCache(String type, String value) {
-        return service.getDictDataFromCache(type, value);
-    }
-
-    public static SysDictDataDO parseDictDataFromCache(String type, String label) {
-        return service.getDictDataFromCache(type, label);
-    }
-
-}

src/main/java/cn/iocoder/dashboard/framework/dict/package-info.java

@@ -1,6 +0,0 @@
-/**
- * 字典数据模块，提供 {@link cn.iocoder.dashboard.framework.dict.core.util.DictUtils} 工具类
- *
- * 通过将字典缓存在内存中，保证性能
- */
-package cn.iocoder.dashboard.framework.dict;

src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/package-info.java

@@ -1 +0,0 @@
-package cn.iocoder.dashboard.framework.logger.operatelog.core;

src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/service/OperateLogFrameworkService.java

@@ -1,17 +0,0 @@
-package cn.iocoder.dashboard.framework.logger.operatelog.core.service;
-
-import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogCreateReqVO;
-
-import java.util.concurrent.Future;
-
-public interface OperateLogFrameworkService {
-
-    /**
-     * 异步记录操作日志
-     *
-     * @param reqVO 操作日志请求
-     * @return true: 记录成功,false: 记录失败
-     */
-    Future<Boolean> createOperateLogAsync(SysOperateLogCreateReqVO reqVO);
-
-}

src/main/java/cn/iocoder/dashboard/framework/logger/package-info.java

@@ -1,10 +0,0 @@
-/**
- * 日志组件，包括：
- *
- * 1. 用户操作日志：记录用户的操作，用于对用户的操作的审计与追溯，永久保存。
- * 2. API 日志：包含两类
- *      2.1 API 访问日志：记录用户访问 API 的访问日志，定期归档历史日志。
- *      2.2 API 异常日志：记录用户访问 API 的系统异常，方便日常排查问题与告警。
- * 3. 通用 Logger 日志：将 {@link org.slf4j.Logger} 打印的日志，只满足大于等于配置的 {@link org.slf4j.event.Level} 进行持久化，可以理解成简易的“日志中心”。
- */
-package cn.iocoder.dashboard.framework.logger;

src/main/java/cn/iocoder/dashboard/framework/package-info.java

@@ -1,10 +0,0 @@
-/**
- * 该包是技术组件，每个子包，代表一个组件。每个组件包括两部分：
- * 1. core 包：是该组件的核心分装
- * 2. config 包：是该组件基于 Spring 的配置
- *
- * 技术组件，也分成两类：
- * 1. 框架组件：和我们熟悉的 MyBatis、Redis 等等的拓展
- * 2. 业务组件：和业务相关的组件的封装，例如说数据字典、操作日志等等。
- */
-package cn.iocoder.dashboard.framework;

src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java

@@ -1,43 +0,0 @@
-package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun;
-
-import cn.iocoder.dashboard.common.exception.ErrorCode;
-import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants;
-import cn.iocoder.dashboard.framework.sms.core.client.SmsCodeMapping;
-
-import static cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants.*;
-
-/**
- * 阿里云的 SmsCodeMapping 实现类
- *
- * 参见 https://help.aliyun.com/document_detail/101346.htm 文档
- *
- * @author 芋道源码
- */
-public class AliyunSmsCodeMapping implements SmsCodeMapping {
-
-    @Override
-    public ErrorCode apply(String apiCode) {
-        switch (apiCode) {
-            case "OK": return GlobalErrorCodeConstants.SUCCESS;
-            case "isv.ACCOUNT_NOT_EXISTS":
-            case "isv.ACCOUNT_ABNORMAL":
-            case "MissingAccessKeyId": return SMS_ACCOUNT_INVALID;
-            case "isp.RAM_PERMISSION_DENY": return SMS_PERMISSION_DENY;
-            case "isv.INVALID_JSON_PARAM":
-            case "isv.INVALID_PARAMETERS": return SMS_API_PARAM_ERROR;
-            case "isv.BUSINESS_LIMIT_CONTROL": return SMS_SEND_BUSINESS_LIMIT_CONTROL;
-            case "isv.DAY_LIMIT_CONTROL": return SMS_SEND_DAY_LIMIT_CONTROL;
-            case "isv.SMS_CONTENT_ILLEGAL": return SMS_SEND_CONTENT_INVALID;
-            case "isv.SMS_TEMPLATE_ILLEGAL": return SMS_TEMPLATE_INVALID;
-            case "isv.SMS_SIGNATURE_ILLEGAL":
-            case "isv.SIGN_NAME_ILLEGAL":
-            case "isv.SMS_SIGN_ILLEGAL": return SMS_SIGN_INVALID;
-            case "isv.AMOUNT_NOT_ENOUGH":
-            case "isv.OUT_OF_SERVICE": return SMS_ACCOUNT_MONEY_NOT_ENOUGH;
-            case "isv.MOBILE_NUMBER_ILLEGAL": return SMS_MOBILE_INVALID;
-            case "isv.TEMPLATE_MISSING_PARAMETERS": return SMS_TEMPLATE_PARAM_ERROR;
-        }
-        return SMS_UNKNOWN;
-    }
-
-}

src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java

@@ -1,23 +0,0 @@
-package cn.iocoder.dashboard.framework.sms.core.client.impl.debug;
-
-import cn.iocoder.dashboard.common.exception.ErrorCode;
-import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants;
-import cn.iocoder.dashboard.framework.sms.core.client.SmsCodeMapping;
-
-import java.util.Objects;
-
-import static cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants.SMS_UNKNOWN;
-
-/**
- * 钉钉的 SmsCodeMapping 实现类
- *
- * @author 芋道源码
- */
-public class DebugDingTalkCodeMapping implements SmsCodeMapping {
-
-    @Override
-    public ErrorCode apply(String apiCode) {
-        return Objects.equals(apiCode, "0") ? GlobalErrorCodeConstants.SUCCESS : SMS_UNKNOWN;
-    }
-
-}

src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMapping.java

@@ -1,45 +0,0 @@
-package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian;
-
-import cn.iocoder.dashboard.common.exception.ErrorCode;
-import cn.iocoder.dashboard.framework.sms.core.client.SmsCodeMapping;
-
-import static cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants.SUCCESS;
-import static cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants.*;
-import static com.yunpian.sdk.constant.Code.*;
-
-/**
- * 云片的 SmsCodeMapping 实现类
- *
- * 参见 https://www.yunpian.com/official/document/sms/zh_CN/returnvalue_common 文档
- *
- * @author 芋道源码
- */
-public class YunpianSmsCodeMapping implements SmsCodeMapping {
-
-    @Override
-    public ErrorCode apply(String apiCode) {
-        int code = Integer.parseInt(apiCode);
-        switch (code) {
-            case OK: return SUCCESS;
-            case ARGUMENT_MISSING: return SMS_API_PARAM_ERROR;
-            case BAD_ARGUMENT_FORMAT: return SMS_TEMPLATE_PARAM_ERROR;
-            case TPL_NOT_FOUND:
-            case TPL_NOT_VALID: return SMS_TEMPLATE_INVALID;
-            case MONEY_NOT_ENOUGH: return SMS_ACCOUNT_MONEY_NOT_ENOUGH;
-            case BLACK_WORD: return SMS_SEND_CONTENT_INVALID;
-            case DUP_IN_SHORT_TIME:
-            case TOO_MANY_TIME_IN_5:
-            case DAY_LIMIT_PER_MOBILE:
-            case HOUR_LIMIT_PER_MOBILE: return SMS_SEND_BUSINESS_LIMIT_CONTROL;
-            case BLACK_PHONE_FILTER: return SMS_MOBILE_BLACK;
-            case SIGN_NOT_MATCH:
-            case BAD_SIGN_FORMAT:
-            case SIGN_NOT_VALID: return SMS_SIGN_INVALID;
-            case BAD_API_KEY: return SMS_ACCOUNT_INVALID;
-            case API_NOT_ALLOWED: return SMS_PERMISSION_DENY;
-            case IP_NOT_ALLOWED: return SMS_IP_DENY;
-        }
-        return SMS_UNKNOWN;
-    }
-
-}

src/main/java/cn/iocoder/dashboard/modules/infra/convert/config/InfConfigConvert.java

@@ -1,29 +0,0 @@
-package cn.iocoder.dashboard.modules.infra.convert.config;
-
-import cn.iocoder.dashboard.common.pojo.PageResult;
-import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigCreateReqVO;
-import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigExcelVO;
-import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigRespVO;
-import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigUpdateReqVO;
-import cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO;
-import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-
-@Mapper
-public interface InfConfigConvert {
-
-    InfConfigConvert INSTANCE = Mappers.getMapper(InfConfigConvert.class);
-
-    PageResult<InfConfigRespVO> convertPage(PageResult<InfConfigDO> page);
-
-    InfConfigRespVO convert(InfConfigDO bean);
-
-    InfConfigDO convert(InfConfigCreateReqVO bean);
-
-    InfConfigDO convert(InfConfigUpdateReqVO bean);
-
-    List<InfConfigExcelVO> convertList(List<InfConfigDO> list);
-
-}

src/main/java/cn/iocoder/dashboard/modules/infra/mq/consumer/package-info.java

@@ -1 +0,0 @@
-package cn.iocoder.dashboard.modules.infra.mq.consumer;

src/main/java/cn/iocoder/dashboard/modules/infra/mq/message/package-info.java

@@ -1 +0,0 @@
-package cn.iocoder.dashboard.modules.infra.mq.message;

src/main/java/cn/iocoder/dashboard/modules/infra/mq/producer/package-info.java

@@ -1 +0,0 @@
-package cn.iocoder.dashboard.modules.infra.mq.producer;

src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogCreateReqVO.java

@@ -1,13 +0,0 @@
-package cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-@ApiModel(value = "操作日志创建 Request VO", description = "暂时提供给前端，仅仅后端切面记录操作日志时，进行使用")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class SysOperateLogCreateReqVO extends SysOperateLogBaseVO {
-}

src/main/java/cn/iocoder/dashboard/modules/system/convert/dept/SysDeptConvert.java

@@ -1,28 +0,0 @@
-package cn.iocoder.dashboard.modules.system.convert.dept;
-
-import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptCreateReqVO;
-import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptRespVO;
-import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptSimpleRespVO;
-import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptUpdateReqVO;
-import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO;
-import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-
-@Mapper
-public interface SysDeptConvert {
-
-    SysDeptConvert INSTANCE = Mappers.getMapper(SysDeptConvert.class);
-
-    List<SysDeptRespVO> convertList(List<SysDeptDO> list);
-
-    List<SysDeptSimpleRespVO> convertList02(List<SysDeptDO> list);
-
-    SysDeptRespVO convert(SysDeptDO bean);
-
-    SysDeptDO convert(SysDeptCreateReqVO bean);
-
-    SysDeptDO convert(SysDeptUpdateReqVO bean);
-
-}

src/main/java/cn/iocoder/dashboard/modules/system/convert/errorcode/SysErrorCodeConvert.java

@@ -1,42 +0,0 @@
-package cn.iocoder.dashboard.modules.system.convert.errorcode;
-
-import cn.iocoder.dashboard.common.pojo.PageResult;
-import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO;
-import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeRespDTO;
-import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeCreateReqVO;
-import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeExcelVO;
-import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeRespVO;
-import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeUpdateReqVO;
-import cn.iocoder.dashboard.modules.system.dal.dataobject.errorcode.SysErrorCodeDO;
-import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-
-/**
- * 错误码 Convert
- *
- * @author 芋道源码
- */
-@Mapper
-public interface SysErrorCodeConvert {
-
-    SysErrorCodeConvert INSTANCE = Mappers.getMapper(SysErrorCodeConvert.class);
-
-    SysErrorCodeDO convert(SysErrorCodeCreateReqVO bean);
-
-    SysErrorCodeDO convert(SysErrorCodeUpdateReqVO bean);
-
-    SysErrorCodeRespVO convert(SysErrorCodeDO bean);
-
-    List<SysErrorCodeRespVO> convertList(List<SysErrorCodeDO> list);
-
-    PageResult<SysErrorCodeRespVO> convertPage(PageResult<SysErrorCodeDO> page);
-
-    List<SysErrorCodeExcelVO> convertList02(List<SysErrorCodeDO> list);
-
-    SysErrorCodeDO convert(ErrorCodeAutoGenerateReqDTO bean);
-
-    List<ErrorCodeRespDTO> convertList03(List<SysErrorCodeDO> list);
-
-}

src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysLoginLogConvert.java

@@ -1,24 +0,0 @@
-package cn.iocoder.dashboard.modules.system.convert.logger;
-
-import cn.iocoder.dashboard.common.pojo.PageResult;
-import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO;
-import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExcelVO;
-import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogRespVO;
-import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysLoginLogDO;
-import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-
-@Mapper
-public interface SysLoginLogConvert {
-
-    SysLoginLogConvert INSTANCE = Mappers.getMapper(SysLoginLogConvert.class);
-
-    SysLoginLogDO convert(SysLoginLogCreateReqVO bean);
-
-    PageResult<SysLoginLogRespVO> convertPage(PageResult<SysLoginLogDO> page);
-
-    List<SysLoginLogExcelVO> convertList(List<SysLoginLogDO> list);
-
-}

src/main/java/cn/iocoder/dashboard/modules/system/convert/notice/SysNoticeConvert.java

@@ -1,24 +0,0 @@
-package cn.iocoder.dashboard.modules.system.convert.notice;
-
-import cn.iocoder.dashboard.common.pojo.PageResult;
-import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeCreateReqVO;
-import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeRespVO;
-import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeUpdateReqVO;
-import cn.iocoder.dashboard.modules.system.dal.dataobject.notice.SysNoticeDO;
-import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
-
-@Mapper
-public interface SysNoticeConvert {
-
-    SysNoticeConvert INSTANCE = Mappers.getMapper(SysNoticeConvert.class);
-
-    PageResult<SysNoticeRespVO> convertPage(PageResult<SysNoticeDO> page);
-
-    SysNoticeRespVO convert(SysNoticeDO bean);
-
-    SysNoticeDO convert(SysNoticeUpdateReqVO bean);
-
-    SysNoticeDO convert(SysNoticeCreateReqVO bean);
-
-}

src/main/java/cn/iocoder/dashboard/modules/system/convert/permission/SysMenuConvert.java

@@ -1,28 +0,0 @@
-package cn.iocoder.dashboard.modules.system.convert.permission;
-
-import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuCreateReqVO;
-import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuRespVO;
-import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuSimpleRespVO;
-import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuUpdateReqVO;
-import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO;
-import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-
-@Mapper
-public interface SysMenuConvert {
-
-    SysMenuConvert INSTANCE = Mappers.getMapper(SysMenuConvert.class);
-
-    List<SysMenuRespVO> convertList(List<SysMenuDO> list);
-
-    SysMenuDO convert(SysMenuCreateReqVO bean);
-
-    SysMenuDO convert(SysMenuUpdateReqVO bean);
-
-    SysMenuRespVO convert(SysMenuDO bean);
-
-    List<SysMenuSimpleRespVO> convertList02(List<SysMenuDO> list);
-
-}

src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/notice/SysNoticeMapper.java

@@ -1,19 +0,0 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.notice;
-
-import cn.iocoder.dashboard.common.pojo.PageResult;
-import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
-import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticePageReqVO;
-import cn.iocoder.dashboard.modules.system.dal.dataobject.notice.SysNoticeDO;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface SysNoticeMapper extends BaseMapperX<SysNoticeDO> {
-
-    default PageResult<SysNoticeDO> selectPage(SysNoticePageReqVO reqVO) {
-        return selectPage(reqVO, new QueryWrapperX<SysNoticeDO>()
-                .likeIfPresent("title", reqVO.getTitle())
-                .eqIfPresent("status", reqVO.getStatus()));
-    }
-
-}

src/main/java/cn/iocoder/dashboard/modules/system/enums/dict/SysDictTypeEnum.java

@@ -1,39 +0,0 @@
-package cn.iocoder.dashboard.modules.system.enums.dict;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 字典类型的类型枚举
- */
-@Getter
-@AllArgsConstructor
-public enum SysDictTypeEnum {
-
-    USER_TYPE("user_type"), // 用户类型
-
-    SYS_USER_SEX("sys_user_sex"), // 用户性别
-    SYS_COMMON_STATUS("sys_common_status"), // 系统状态
-    SYS_OPERATE_TYPE("sys_operate_type"), // 操作类型
-    SYS_LOGIN_RESULT("sys_login_result"), // 登陆结果
-    SYS_CONFIG_TYPE("sys_config_type"), // 参数配置类型
-    SYS_BOOLEAN_STRING("sys_boolean_string"), // Boolean 是否类型
-    SYS_SMS_CHANNEL_CODE("sys_sms_channel_code"), // 短信渠道编码
-    SYS_SMS_TEMPLATE_TYPE("sys_sms_template_type"), // 短信模板类型
-    SYS_SMS_SEND_STATUS("sys_sms_send_status"), // 短信发送状态
-    SYS_SMS_RECEIVE_STATUS("sys_sms_receive_status"), // 短信接收状态
-    SYS_ERROR_CODE_TYPE("inf_error_code_type"), // 错误码的类型枚举
-
-    INF_REDIS_TIMEOUT_TYPE("inf_redis_timeout_type"),  // Redis 超时类型
-    INF_JOB_STATUS("inf_job_status"), // 定时任务状态的枚举
-    INF_JOB_LOG_STATUS("inf_job_log_status"), // 定时任务日志状态的枚举
-    INF_API_ERROR_LOG_PROCESS_STATUS("inf_api_error_log_process_status"), // API 错误日志的处理状态的枚举
-    ;
-
-
-    /**
-     * 值
-     */
-    private final String value;
-
-}

src/main/java/cn/iocoder/dashboard/modules/system/job/package-info.java

@@ -1 +0,0 @@
-package cn.iocoder.dashboard.modules.system.job;

src/main/resources/META-INF/services/com.ctrip.framework.apollo.internals.Injector

@@ -1 +0,0 @@
-cn.iocoder.dashboard.framework.apollo.internals.DefaultXInjector

src/main/resources/META-INF/spring.factories

@@ -1,2 +0,0 @@
-org.springframework.boot.env.EnvironmentPostProcessor=\
-    cn.iocoder.dashboard.framework.apollo.spring.boot.ApolloApplicationContextInitializer

src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/package-info.java

@@ -1 +0,0 @@
-package cn.iocoder.dashboard.framework.sms.core.client;

src/test-integration/java/cn/iocoder/dashboard/modules/system/service/package-info.java

@@ -1 +0,0 @@
-package cn.iocoder.dashboard.modules.system.service;

src/test/java/cn/iocoder/dashboard/framework/package-info.java

@@ -1 +0,0 @@
-package cn.iocoder.dashboard.framework;

yudao-admin-server/pom.xml

@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>cn.iocoder.boot</groupId>
+        <artifactId>yudao</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>yudao-admin-server</artifactId>
+    <packaging>jar</packaging>
+
+    <name>yudao-admin-server</name>
+    <description>管理后台 Server，提供其 API 接口</description>
+    <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
+
+    <dependencies>
+        <!-- 业务组件 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-biz-operatelog</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-biz-dict</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-biz-sms</artifactId>
+        </dependency>
+
+        <!-- Web 相关 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-security</artifactId>
+        </dependency>
+
+        <!-- DB 相关 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-mybatis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-redis</artifactId>
+        </dependency>
+
+        <!-- Config 配置中心相关 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-config</artifactId>
+        </dependency>
+
+        <!-- Job 定时任务相关 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-job</artifactId>
+        </dependency>
+
+        <!-- 消息队列相关 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-mq</artifactId>
+        </dependency>
+
+        <!-- 服务保障相关 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-protection</artifactId>
+        </dependency>
+
+        <!-- 监控相关 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-monitor</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-server</artifactId> <!-- 实现 Spring Boot Admin Server 服务端 -->
+        </dependency>
+
+        <!-- Test 测试相关 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- 工具类相关 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-excel</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-engine-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.smallbun.screw</groupId>
+            <artifactId>screw-core</artifactId> <!-- 实现数据库文档 -->
+        </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-mq</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <!-- 设置构建的 jar 包名 -->
+        <finalName>${artifactId}</finalName>
+        <plugins>
+            <!-- 打包 -->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <fork>true</fork>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

src/main/java/cn/iocoder/dashboard/DashboardApplication.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/AdminServerApplication.java

@@ -1,13 +1,13 @@
-package cn.iocoder.dashboard;
+package cn.iocoder.yudao.adminserver;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class DashboardApplication {
+public class AdminServerApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(DashboardApplication.class, args);
+        SpringApplication.run(AdminServerApplication.class, args);
     }
 
 }

src/main/java/cn/iocoder/dashboard/framework/async/config/AsyncConfiguration.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/framework/async/config/AsyncConfiguration.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.framework.async.config;
+package cn.iocoder.yudao.adminserver.framework.async.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableAsync;

src/main/java/cn/iocoder/dashboard/framework/async/package-info.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/framework/async/package-info.java

@@ -1,4 +1,4 @@
 /**
  * 异步执行，基于 Spring @Async 实现
  */
-package cn.iocoder.dashboard.framework.async;
+package cn.iocoder.yudao.adminserver.framework.async;

src/main/java/cn/iocoder/dashboard/framework/monitor/config/AdminServerConfiguration.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/framework/monitor/config/AdminServerConfiguration.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.framework.monitor.config;
+package cn.iocoder.yudao.adminserver.framework.monitor.config;
 
 import de.codecentric.boot.admin.server.config.EnableAdminServer;
 import org.springframework.context.annotation.Configuration;

src/main/java/cn/iocoder/dashboard/framework/monitor/package-info.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/framework/monitor/package-info.java

@@ -1,4 +1,4 @@
 /**
  * 使用 Spring Boot Admin 实现简单的监控平台
  */
-package cn.iocoder.dashboard.framework.monitor;
+package cn.iocoder.yudao.adminserver.framework.monitor;

yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/framework/package-info.java

@@ -0,0 +1,6 @@
+/**
+ * 属于整个 yudao-admin-server 的 framework 封装
+ *
+ * @author 芋道源码
+ */
+package cn.iocoder.yudao.adminserver.framework;

src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/InfConfigController.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/config/InfConfigController.java

@@ -1,13 +1,13 @@
-package cn.iocoder.dashboard.modules.infra.controller.config;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.config;
 
-import cn.iocoder.dashboard.common.pojo.CommonResult;
-import cn.iocoder.dashboard.common.pojo.PageResult;
-import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog;
-import cn.iocoder.dashboard.modules.infra.controller.config.vo.*;
-import cn.iocoder.dashboard.modules.infra.convert.config.InfConfigConvert;
-import cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO;
-import cn.iocoder.dashboard.modules.infra.service.config.InfConfigService;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.*;
+import cn.iocoder.yudao.adminserver.modules.infra.convert.config.InfConfigConvert;
+import cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.config.InfConfigDO;
+import cn.iocoder.yudao.adminserver.modules.infra.service.config.InfConfigService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -21,10 +21,10 @@ import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
 
-import static cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.dashboard.common.pojo.CommonResult.success;
-import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT;
-import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.CONFIG_GET_VALUE_ERROR_IF_SENSITIVE;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.adminserver.modules.infra.enums.InfErrorCodeConstants.CONFIG_GET_VALUE_ERROR_IF_SENSITIVE;
 
 @Api(tags = "参数配置")
 @RestController

src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigBaseVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/config/vo/InfConfigBaseVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.infra.controller.config.vo;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigCreateReqVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/config/vo/InfConfigCreateReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.infra.controller.config.vo;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExcelVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/config/vo/InfConfigExcelVO.java

@@ -1,8 +1,8 @@
-package cn.iocoder.dashboard.modules.infra.controller.config.vo;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo;
 
-import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;
-import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert;
-import cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum;
+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+import cn.iocoder.yudao.adminserver.modules.system.enums.SysDictTypeConstants;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
@@ -30,11 +30,11 @@ public class InfConfigExcelVO {
     private String value;
 
     @ExcelProperty(value = "参数类型", converter = DictConvert.class)
-    @DictFormat(SysDictTypeEnum.SYS_CONFIG_TYPE)
+    @DictFormat(SysDictTypeConstants.CONFIG_TYPE)
     private Integer type;
 
     @ExcelProperty(value = "是否敏感", converter = DictConvert.class)
-    @DictFormat(SysDictTypeEnum.SYS_BOOLEAN_STRING)
+    @DictFormat(SysDictTypeConstants.BOOLEAN_STRING)
     private Boolean sensitive;
 
     @ExcelProperty("备注")

src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExportReqVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/config/vo/InfConfigExportReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.infra.controller.config.vo;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
-import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @ApiModel("参数配置导出 Request VO")
 @Data

src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigPageReqVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/config/vo/InfConfigPageReqVO.java

@@ -1,6 +1,6 @@
-package cn.iocoder.dashboard.modules.infra.controller.config.vo;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo;
 
-import cn.iocoder.dashboard.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
-import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @ApiModel("参数配置分页 Request VO")
 @Data

src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigRespVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/config/vo/InfConfigRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.infra.controller.config.vo;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigUpdateReqVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/config/vo/InfConfigUpdateReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.infra.controller.config.vo;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/cn/iocoder/dashboard/modules/infra/controller/doc/InfDbDocController.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/doc/InfDbDocController.java

@@ -1,14 +1,16 @@
-package cn.iocoder.dashboard.modules.infra.controller.doc;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.doc;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.IdUtil;
-import cn.iocoder.dashboard.util.servlet.ServletUtils;
+import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
 import cn.smallbun.screw.core.Configuration;
 import cn.smallbun.screw.core.engine.EngineConfig;
 import cn.smallbun.screw.core.engine.EngineFileType;
 import cn.smallbun.screw.core.engine.EngineTemplateType;
 import cn.smallbun.screw.core.execute.DocumentationExecute;
 import cn.smallbun.screw.core.process.ProcessConfig;
+import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty;
+import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 import io.swagger.annotations.Api;
@@ -32,7 +34,7 @@ import java.util.Collections;
 public class InfDbDocController {
 
     @Resource
-    private DataSourceProperties dataSourceProperties;
+    private DynamicDataSourceProperties dynamicDataSourceProperties;
 
     private static final String FILE_OUTPUT_DIR = System.getProperty("java.io.tmpdir") + File.separator
             + "db-doc";
@@ -114,11 +116,14 @@ public class InfDbDocController {
      */
     // TODO 芋艿：screw 暂时不支持 druid，尴尬
     private HikariDataSource buildDataSource() {
+        // 获得 DataSource 数据源，目前只支持首个
+        String primary = dynamicDataSourceProperties.getPrimary();
+        DataSourceProperty dataSourceProperty = dynamicDataSourceProperties.getDatasource().get(primary);
         // 创建 HikariConfig 配置类
         HikariConfig hikariConfig = new HikariConfig();
-        hikariConfig.setJdbcUrl(dataSourceProperties.getUrl());
-        hikariConfig.setUsername(dataSourceProperties.getUsername());
-        hikariConfig.setPassword(dataSourceProperties.getPassword());
+        hikariConfig.setJdbcUrl(dataSourceProperty.getUrl());
+        hikariConfig.setUsername(dataSourceProperty.getUsername());
+        hikariConfig.setPassword(dataSourceProperty.getPassword());
         hikariConfig.addDataSourceProperty("useInformationSchema", "true"); // 设置可以获取 tables remarks 信息
         // 创建数据源
         return new HikariDataSource(hikariConfig);

src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/InfFileController.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/InfFileController.java

@@ -1,14 +1,14 @@
-package cn.iocoder.dashboard.modules.infra.controller.file;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.file;
 
 import cn.hutool.core.io.IoUtil;
-import cn.iocoder.dashboard.common.pojo.CommonResult;
-import cn.iocoder.dashboard.common.pojo.PageResult;
-import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFilePageReqVO;
-import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFileRespVO;
-import cn.iocoder.dashboard.modules.infra.convert.file.InfFileConvert;
-import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO;
-import cn.iocoder.dashboard.modules.infra.service.file.InfFileService;
-import cn.iocoder.dashboard.util.servlet.ServletUtils;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.file.vo.InfFilePageReqVO;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.file.vo.InfFileRespVO;
+import cn.iocoder.yudao.adminserver.modules.infra.convert.file.InfFileConvert;
+import cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.file.InfFileDO;
+import cn.iocoder.yudao.adminserver.modules.infra.service.file.InfFileService;
+import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
 
-import static cn.iocoder.dashboard.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 @Api(tags = "文件存储")
 @RestController

src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/vo/InfFilePageReqVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/vo/InfFilePageReqVO.java

@@ -1,6 +1,6 @@
-package cn.iocoder.dashboard.modules.infra.controller.file.vo;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.file.vo;
 
-import cn.iocoder.dashboard.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
-import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @ApiModel("文件分页 Request VO")
 @Data

src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/vo/InfFileRespVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/file/vo/InfFileRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.infra.controller.file.vo;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.file.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobController.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/InfJobController.java

@@ -1,14 +1,14 @@
-package cn.iocoder.dashboard.modules.infra.controller.job;
-
-import cn.iocoder.dashboard.common.pojo.CommonResult;
-import cn.iocoder.dashboard.common.pojo.PageResult;
-import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog;
-import cn.iocoder.dashboard.framework.quartz.core.util.CronUtils;
-import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.*;
-import cn.iocoder.dashboard.modules.infra.convert.job.InfJobConvert;
-import cn.iocoder.dashboard.modules.infra.dal.dataobject.job.InfJobDO;
-import cn.iocoder.dashboard.modules.infra.service.job.InfJobService;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.job;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
+import cn.iocoder.yudao.framework.quartz.core.util.CronUtils;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job.*;
+import cn.iocoder.yudao.adminserver.modules.infra.convert.job.InfJobConvert;
+import cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.job.InfJobDO;
+import cn.iocoder.yudao.adminserver.modules.infra.service.job.InfJobService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -27,8 +27,8 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
-import static cn.iocoder.dashboard.common.pojo.CommonResult.success;
-import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Api(tags = "定时任务")
 @RestController

src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobLogController.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/InfJobLogController.java

@@ -1,16 +1,16 @@
-package cn.iocoder.dashboard.modules.infra.controller.job;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.job;
 
-import cn.iocoder.dashboard.common.pojo.CommonResult;
-import cn.iocoder.dashboard.common.pojo.PageResult;
-import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog;
-import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExcelVO;
-import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExportReqVO;
-import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogPageReqVO;
-import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogRespVO;
-import cn.iocoder.dashboard.modules.infra.convert.job.InfJobLogConvert;
-import cn.iocoder.dashboard.modules.infra.dal.dataobject.job.InfJobLogDO;
-import cn.iocoder.dashboard.modules.infra.service.job.InfJobLogService;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log.InfJobLogExcelVO;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log.InfJobLogExportReqVO;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log.InfJobLogPageReqVO;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log.InfJobLogRespVO;
+import cn.iocoder.yudao.adminserver.modules.infra.convert.job.InfJobLogConvert;
+import cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.job.InfJobLogDO;
+import cn.iocoder.yudao.adminserver.modules.infra.service.job.InfJobLogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -28,8 +28,8 @@ import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
 
-import static cn.iocoder.dashboard.common.pojo.CommonResult.success;
-import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Api(tags = "定时任务日志")
 @RestController

src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobBaseVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/vo/job/InfJobBaseVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.infra.controller.job.vo.job;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobCreateReqVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/vo/job/InfJobCreateReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.infra.controller.job.vo.job;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobExcelVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/vo/job/InfJobExcelVO.java

@@ -1,14 +1,13 @@
-package cn.iocoder.dashboard.modules.infra.controller.job.vo.job;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job;
 
-import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;
-import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert;
+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+import cn.iocoder.yudao.adminserver.modules.infra.enums.InfDictTypeConstants;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
 import java.util.Date;
 
-import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.INF_JOB_STATUS;
-
 /**
  * 定时任务 Excel VO
  *
@@ -24,7 +23,7 @@ public class InfJobExcelVO {
     private String name;
 
     @ExcelProperty(value = "任务状态", converter = DictConvert.class)
-    @DictFormat(INF_JOB_STATUS)
+    @DictFormat(InfDictTypeConstants.JOB_STATUS)
     private Integer status;
 
     @ExcelProperty("处理器的名字")

src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobExportReqVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/vo/job/InfJobExportReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.infra.controller.job.vo.job;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobPageReqVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/vo/job/InfJobPageReqVO.java

@@ -1,6 +1,6 @@
-package cn.iocoder.dashboard.modules.infra.controller.job.vo.job;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job;
 
-import cn.iocoder.dashboard.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobRespVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/vo/job/InfJobRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.infra.controller.job.vo.job;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobUpdateReqVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/vo/job/InfJobUpdateReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.infra.controller.job.vo.job;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogBaseVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/vo/log/InfJobLogBaseVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.infra.controller.job.vo.log;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
 
-import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
 * 定时任务日志 Base VO，提供给添加、修改、详细的子 VO 使用

src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExcelVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/vo/log/InfJobLogExcelVO.java

@@ -1,8 +1,8 @@
-package cn.iocoder.dashboard.modules.infra.controller.job.vo.log;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log;
 
-import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;
-import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert;
-import cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum;
+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+import cn.iocoder.yudao.adminserver.modules.infra.enums.InfDictTypeConstants;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
@@ -41,7 +41,7 @@ public class InfJobLogExcelVO {
     private Integer duration;
 
     @ExcelProperty(value = "任务状态", converter = DictConvert.class)
-    @DictFormat(SysDictTypeEnum.INF_JOB_STATUS)
+    @DictFormat(InfDictTypeConstants.JOB_STATUS)
     private Integer status;
 
     @ExcelProperty("结果数据")

src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExportReqVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/vo/log/InfJobLogExportReqVO.java

@@ -1,14 +1,13 @@
-package cn.iocoder.dashboard.modules.infra.controller.job.vo.log;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotNull;
 import java.util.Date;
 
-import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @ApiModel(value = "定时任务 Excel 导出 Request VO", description = "参数和 InfJobLogPageReqVO 是一致的")
 @Data

src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogPageReqVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/vo/log/InfJobLogPageReqVO.java

@@ -1,6 +1,6 @@
-package cn.iocoder.dashboard.modules.infra.controller.job.vo.log;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log;
 
-import cn.iocoder.dashboard.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
-import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @ApiModel("定时任务日志分页 Request VO")
 @Data

src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogRespVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/job/vo/log/InfJobLogRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.infra.controller.job.vo.log;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiAccessLogController.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/logger/InfApiAccessLogController.java

@@ -1,24 +1,22 @@
-package cn.iocoder.dashboard.modules.infra.controller.logger;
-
-import cn.iocoder.dashboard.common.pojo.CommonResult;
-import cn.iocoder.dashboard.common.pojo.PageResult;
-import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog;
-import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExcelVO;
-import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO;
-import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO;
-import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogRespVO;
-import cn.iocoder.dashboard.modules.infra.convert.logger.InfApiAccessLogConvert;
-import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiAccessLogDO;
-import cn.iocoder.dashboard.modules.infra.service.logger.InfApiAccessLogService;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.logger;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExcelVO;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExportReqVO;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogPageReqVO;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogRespVO;
+import cn.iocoder.yudao.adminserver.modules.infra.convert.logger.InfApiAccessLogConvert;
+import cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.logger.InfApiAccessLogDO;
+import cn.iocoder.yudao.adminserver.modules.infra.service.logger.InfApiAccessLogService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -27,8 +25,8 @@ import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
 
-import static cn.iocoder.dashboard.common.pojo.CommonResult.success;
-import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Api(tags = "API 访问日志")
 @RestController

src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiErrorLogController.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/logger/InfApiErrorLogController.java

@@ -1,16 +1,16 @@
-package cn.iocoder.dashboard.modules.infra.controller.logger;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.logger;
 
-import cn.iocoder.dashboard.common.pojo.CommonResult;
-import cn.iocoder.dashboard.common.pojo.PageResult;
-import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog;
-import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExcelVO;
-import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO;
-import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO;
-import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogRespVO;
-import cn.iocoder.dashboard.modules.infra.convert.logger.InfApiErrorLogConvert;
-import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiErrorLogDO;
-import cn.iocoder.dashboard.modules.infra.service.logger.InfApiErrorLogService;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExcelVO;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExportReqVO;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogPageReqVO;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogRespVO;
+import cn.iocoder.yudao.adminserver.modules.infra.convert.logger.InfApiErrorLogConvert;
+import cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.logger.InfApiErrorLogDO;
+import cn.iocoder.yudao.adminserver.modules.infra.service.logger.InfApiErrorLogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -25,9 +25,9 @@ import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
 
-import static cn.iocoder.dashboard.common.pojo.CommonResult.success;
-import static cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum.EXPORT;
-import static cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
 @Api(tags = "API 错误日志")
 @RestController

src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogBaseVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogBaseVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
 
-import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
 * API 访问日志 Base VO，提供给添加、修改、详细的子 VO 使用

src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExcelVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExcelVO.java

@@ -1,14 +1,13 @@
-package cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog;
 
-import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;
-import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert;
+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+import cn.iocoder.yudao.adminserver.modules.system.enums.SysDictTypeConstants;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
 import java.util.Date;
 
-import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.USER_TYPE;
-
 /**
  * API 访问日志 Excel VO
  *
@@ -27,7 +26,7 @@ public class InfApiAccessLogExcelVO {
     private Long userId;
 
     @ExcelProperty(value = "用户类型", converter = DictConvert.class)
-    @DictFormat(USER_TYPE)
+    @DictFormat(SysDictTypeConstants.USER_TYPE)
     private Integer userType;
 
     @ExcelProperty("应用名")

src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExportReqVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExportReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
-import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @ApiModel(value = "API 访问日志 Excel 导出 Request VO", description = "参数和 InfApiAccessLogPageReqVO 是一致的")
 @Data

src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogPageReqVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogPageReqVO.java

@@ -1,6 +1,6 @@
-package cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog;
 
-import cn.iocoder.dashboard.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
-import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @ApiModel("API 访问日志分页 Request VO")
 @Data

src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogRespVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogBaseVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogBaseVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
 
-import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
 * API 错误日志 Base VO，提供给添加、修改、详细的子 VO 使用

src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExcelVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExcelVO.java

@@ -1,15 +1,14 @@
-package cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog;
 
-import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;
-import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert;
+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+import cn.iocoder.yudao.adminserver.modules.infra.enums.InfDictTypeConstants;
+import cn.iocoder.yudao.adminserver.modules.system.enums.SysDictTypeConstants;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
 import java.util.Date;
 
-import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.INF_API_ERROR_LOG_PROCESS_STATUS;
-import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.USER_TYPE;
-
 /**
  * API 错误日志 Excel VO
  *
@@ -28,7 +27,7 @@ public class InfApiErrorLogExcelVO {
     private Integer userId;
 
     @ExcelProperty(value = "用户类型", converter = DictConvert.class)
-    @DictFormat(USER_TYPE)
+    @DictFormat(SysDictTypeConstants.USER_TYPE)
     private Integer userType;
 
     @ExcelProperty("应用名")
@@ -80,7 +79,7 @@ public class InfApiErrorLogExcelVO {
     private Date createTime;
 
     @ExcelProperty(value = "处理状态", converter = DictConvert.class)
-    @DictFormat(INF_API_ERROR_LOG_PROCESS_STATUS)
+    @DictFormat(InfDictTypeConstants.API_ERROR_LOG_PROCESS_STATUS)
     private Integer processStatus;
 
     @ExcelProperty("处理时间")

src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExportReqVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExportReqVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
-import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @ApiModel(value = "API 错误日志 Excel 导出 Request VO", description = "参数和 InfApiErrorLogPageReqVO 是一致的")
 @Data

src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogPageReqVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogPageReqVO.java

@@ -1,6 +1,6 @@
-package cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog;
 
-import cn.iocoder.dashboard.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
-import static cn.iocoder.dashboard.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @ApiModel("API 错误日志分页 Request VO")
 @Data

src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogRespVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/RedisController.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/redis/RedisController.java

@@ -1,11 +1,11 @@
-package cn.iocoder.dashboard.modules.infra.controller.redis;
-
-import cn.iocoder.dashboard.common.pojo.CommonResult;
-import cn.iocoder.dashboard.framework.redis.core.RedisKeyDefine;
-import cn.iocoder.dashboard.framework.redis.core.RedisKeyRegistry;
-import cn.iocoder.dashboard.modules.infra.controller.redis.vo.InfRedisKeyRespVO;
-import cn.iocoder.dashboard.modules.infra.controller.redis.vo.InfRedisMonitorRespVO;
-import cn.iocoder.dashboard.modules.infra.convert.redis.RedisConvert;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.redis;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.redis.core.RedisKeyDefine;
+import cn.iocoder.yudao.framework.redis.core.RedisKeyRegistry;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.redis.vo.InfRedisKeyRespVO;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.redis.vo.InfRedisMonitorRespVO;
+import cn.iocoder.yudao.adminserver.modules.infra.convert.redis.RedisConvert;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.redis.connection.RedisServerCommands;
@@ -20,7 +20,7 @@ import javax.annotation.Resource;
 import java.util.List;
 import java.util.Properties;
 
-import static cn.iocoder.dashboard.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 @Api(tags = "Redis 监控")
 @RestController

src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/vo/InfRedisKeyRespVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/redis/vo/InfRedisKeyRespVO.java

@@ -1,6 +1,6 @@
-package cn.iocoder.dashboard.modules.infra.controller.redis.vo;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.redis.vo;
 
-import cn.iocoder.dashboard.framework.redis.core.RedisKeyDefine;
+import cn.iocoder.yudao.framework.redis.core.RedisKeyDefine;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/vo/InfRedisMonitorRespVO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/redis/vo/InfRedisMonitorRespVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.infra.controller.redis.vo;
+package cn.iocoder.yudao.adminserver.modules.infra.controller.redis.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/config/InfConfigConvert.java

@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.adminserver.modules.infra.convert.config;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigCreateReqVO;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigExcelVO;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigRespVO;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigUpdateReqVO;
+import cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.config.InfConfigDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+@Mapper
+public interface InfConfigConvert {
+
+    InfConfigConvert INSTANCE = Mappers.getMapper(InfConfigConvert.class);
+
+    PageResult<InfConfigRespVO> convertPage(PageResult<InfConfigDO> page);
+
+    InfConfigRespVO convert(InfConfigDO bean);
+
+    InfConfigDO convert(InfConfigCreateReqVO bean);
+
+    InfConfigDO convert(InfConfigUpdateReqVO bean);
+
+    List<InfConfigExcelVO> convertList(List<InfConfigDO> list);
+
+}

src/main/java/cn/iocoder/dashboard/modules/infra/convert/file/InfFileConvert.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/file/InfFileConvert.java

@@ -1,8 +1,8 @@
-package cn.iocoder.dashboard.modules.infra.convert.file;
+package cn.iocoder.yudao.adminserver.modules.infra.convert.file;
 
-import cn.iocoder.dashboard.common.pojo.PageResult;
-import cn.iocoder.dashboard.modules.infra.controller.file.vo.InfFileRespVO;
-import cn.iocoder.dashboard.modules.infra.dal.dataobject.file.InfFileDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.file.vo.InfFileRespVO;
+import cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.file.InfFileDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

src/main/java/cn/iocoder/dashboard/modules/infra/convert/job/InfJobConvert.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/job/InfJobConvert.java

@@ -1,11 +1,11 @@
-package cn.iocoder.dashboard.modules.infra.convert.job;
-
-import cn.iocoder.dashboard.common.pojo.PageResult;
-import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobCreateReqVO;
-import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobExcelVO;
-import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobRespVO;
-import cn.iocoder.dashboard.modules.infra.controller.job.vo.job.InfJobUpdateReqVO;
-import cn.iocoder.dashboard.modules.infra.dal.dataobject.job.InfJobDO;
+package cn.iocoder.yudao.adminserver.modules.infra.convert.job;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job.InfJobCreateReqVO;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job.InfJobExcelVO;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job.InfJobRespVO;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.job.InfJobUpdateReqVO;
+import cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.job.InfJobDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

src/main/java/cn/iocoder/dashboard/modules/infra/convert/job/InfJobLogConvert.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/job/InfJobLogConvert.java

@@ -1,9 +1,9 @@
-package cn.iocoder.dashboard.modules.infra.convert.job;
+package cn.iocoder.yudao.adminserver.modules.infra.convert.job;
 
-import cn.iocoder.dashboard.common.pojo.PageResult;
-import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogExcelVO;
-import cn.iocoder.dashboard.modules.infra.controller.job.vo.log.InfJobLogRespVO;
-import cn.iocoder.dashboard.modules.infra.dal.dataobject.job.InfJobLogDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log.InfJobLogExcelVO;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.job.vo.log.InfJobLogRespVO;
+import cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.job.InfJobLogDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

src/main/java/cn/iocoder/dashboard/modules/infra/convert/logger/InfApiAccessLogConvert.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/logger/InfApiAccessLogConvert.java

@@ -1,10 +1,10 @@
-package cn.iocoder.dashboard.modules.infra.convert.logger;
+package cn.iocoder.yudao.adminserver.modules.infra.convert.logger;
 
-import cn.iocoder.dashboard.common.pojo.PageResult;
-import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiAccessLogCreateDTO;
-import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExcelVO;
-import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogRespVO;
-import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiAccessLogDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiAccessLogCreateDTO;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogExcelVO;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiaccesslog.InfApiAccessLogRespVO;
+import cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.logger.InfApiAccessLogDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

src/main/java/cn/iocoder/dashboard/modules/infra/convert/logger/InfApiErrorLogConvert.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/logger/InfApiErrorLogConvert.java

@@ -1,10 +1,10 @@
-package cn.iocoder.dashboard.modules.infra.convert.logger;
+package cn.iocoder.yudao.adminserver.modules.infra.convert.logger;
 
-import cn.iocoder.dashboard.common.pojo.PageResult;
-import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiErrorLogCreateDTO;
-import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExcelVO;
-import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogRespVO;
-import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiErrorLogDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiErrorLogCreateDTO;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogExcelVO;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierrorlog.InfApiErrorLogRespVO;
+import cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.logger.InfApiErrorLogDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

src/main/java/cn/iocoder/dashboard/modules/infra/convert/package-info.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/package-info.java

@@ -3,4 +3,4 @@
  *
  * 目前使用 MapStruct 框架
  */
-package cn.iocoder.dashboard.modules.infra.convert;
+package cn.iocoder.yudao.adminserver.modules.infra.convert;

src/main/java/cn/iocoder/dashboard/modules/infra/convert/redis/RedisConvert.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/redis/RedisConvert.java

@@ -1,9 +1,9 @@
-package cn.iocoder.dashboard.modules.infra.convert.redis;
+package cn.iocoder.yudao.adminserver.modules.infra.convert.redis;
 
 import cn.hutool.core.util.StrUtil;
-import cn.iocoder.dashboard.framework.redis.core.RedisKeyDefine;
-import cn.iocoder.dashboard.modules.infra.controller.redis.vo.InfRedisKeyRespVO;
-import cn.iocoder.dashboard.modules.infra.controller.redis.vo.InfRedisMonitorRespVO;
+import cn.iocoder.yudao.framework.redis.core.RedisKeyDefine;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.redis.vo.InfRedisKeyRespVO;
+import cn.iocoder.yudao.adminserver.modules.infra.controller.redis.vo.InfRedisMonitorRespVO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/config/InfConfigDO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/dal/dataobject/config/InfConfigDO.java

@@ -1,7 +1,7 @@
-package cn.iocoder.dashboard.modules.infra.dal.dataobject.config;
+package cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.config;
 
-import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.dashboard.modules.infra.enums.config.InfConfigTypeEnum;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.adminserver.modules.infra.enums.config.InfConfigTypeEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/file/InfFileDO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/dal/dataobject/file/InfFileDO.java

@@ -1,6 +1,6 @@
-package cn.iocoder.dashboard.modules.infra.dal.dataobject.file;
+package cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.file;
 
-import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/job/InfJobDO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/dal/dataobject/job/InfJobDO.java

@@ -1,7 +1,7 @@
-package cn.iocoder.dashboard.modules.infra.dal.dataobject.job;
+package cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.job;
 
-import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.dashboard.modules.infra.enums.job.InfJobStatusEnum;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.adminserver.modules.infra.enums.job.InfJobStatusEnum;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;

src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/job/InfJobLogDO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/dal/dataobject/job/InfJobLogDO.java

@@ -1,8 +1,8 @@
-package cn.iocoder.dashboard.modules.infra.dal.dataobject.job;
+package cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.job;
 
-import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.dashboard.framework.quartz.core.handler.JobHandler;
-import cn.iocoder.dashboard.modules.infra.enums.job.InfJobLogStatusEnum;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
+import cn.iocoder.yudao.adminserver.modules.infra.enums.job.InfJobLogStatusEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 

src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/logger/InfApiAccessLogDO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/dal/dataobject/logger/InfApiAccessLogDO.java

@@ -1,8 +1,8 @@
-package cn.iocoder.dashboard.modules.infra.dal.dataobject.logger;
+package cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.logger;
 
-import cn.iocoder.dashboard.common.enums.UserTypeEnum;
-import cn.iocoder.dashboard.common.pojo.CommonResult;
-import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;

src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/logger/InfApiErrorLogDO.java → yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/dal/dataobject/logger/InfApiErrorLogDO.java

@@ -1,9 +1,9 @@
-package cn.iocoder.dashboard.modules.infra.dal.dataobject.logger;
+package cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.logger;
 
-import cn.iocoder.dashboard.common.enums.UserTypeEnum;
-import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.dashboard.modules.infra.enums.logger.InfApiErrorLogProcessStatusEnum;
-import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
+import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.adminserver.modules.infra.enums.logger.InfApiErrorLogProcessStatusEnum;
+import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.user.SysUserDO;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;