Commit c4cbd730dbc0198c57668e1b24ca6e64b51a52b0
1 parent
21e3475d
项目结构调整 x 7 : 有点问题
Showing
4 changed files
with
247 additions
and
158 deletions
pom.xml
| @@ -20,6 +20,14 @@ | @@ -20,6 +20,14 @@ | ||
| 20 | 20 | ||
| 21 | <properties> | 21 | <properties> |
| 22 | <revision>1.0.0</revision> | 22 | <revision>1.0.0</revision> |
| 23 | + | ||
| 24 | + <!-- Maven 相关 --> | ||
| 25 | + <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version> | ||
| 26 | + <!-- 统一依赖管理 --> | ||
| 27 | + <spring.boot.version>2.4.4</spring.boot.version> | ||
| 28 | + <!-- 工具类相关 --> | ||
| 29 | + <lombok.version>1.16.14</lombok.version> | ||
| 30 | + <mapstruct.version>1.4.1.Final</mapstruct.version> | ||
| 23 | </properties> | 31 | </properties> |
| 24 | 32 | ||
| 25 | <dependencyManagement> | 33 | <dependencyManagement> |
| @@ -34,4 +42,50 @@ | @@ -34,4 +42,50 @@ | ||
| 34 | </dependencies> | 42 | </dependencies> |
| 35 | </dependencyManagement> | 43 | </dependencyManagement> |
| 36 | 44 | ||
| 45 | + <build> | ||
| 46 | + <pluginManagement> | ||
| 47 | + <plugins> | ||
| 48 | + <!-- 打包 --> | ||
| 49 | + <plugin> | ||
| 50 | + <groupId>org.springframework.boot</groupId> | ||
| 51 | + <artifactId>spring-boot-maven-plugin</artifactId> | ||
| 52 | + <version>${spring.boot.version}</version> | ||
| 53 | + <configuration> | ||
| 54 | + <fork>true</fork> | ||
| 55 | + </configuration> | ||
| 56 | + <executions> | ||
| 57 | + <execution> | ||
| 58 | + <goals> | ||
| 59 | + <goal>repackage</goal> <!-- 将原来的 jar 打入其中 --> | ||
| 60 | + </goals> | ||
| 61 | + </execution> | ||
| 62 | + </executions> | ||
| 63 | + </plugin> | ||
| 64 | + | ||
| 65 | + <!-- 提供给 mapstruct 使用 --> | ||
| 66 | + <plugin> | ||
| 67 | + <groupId>org.apache.maven.plugins</groupId> | ||
| 68 | + <artifactId>maven-compiler-plugin</artifactId> | ||
| 69 | + <version>${maven-compiler-plugin.version}</version> | ||
| 70 | + <configuration> | ||
| 71 | + <source>${java.version}</source> | ||
| 72 | + <target>${java.version}</target> | ||
| 73 | + <annotationProcessorPaths> | ||
| 74 | + <path> | ||
| 75 | + <groupId>org.mapstruct</groupId> | ||
| 76 | + <artifactId>mapstruct-processor</artifactId> | ||
| 77 | + <version>${mapstruct.version}</version> | ||
| 78 | + </path> | ||
| 79 | + <path> | ||
| 80 | + <groupId>org.projectlombok</groupId> | ||
| 81 | + <artifactId>lombok</artifactId> | ||
| 82 | + <version>${lombok.version}</version> | ||
| 83 | + </path> | ||
| 84 | + </annotationProcessorPaths> | ||
| 85 | + </configuration> | ||
| 86 | + </plugin> | ||
| 87 | + </plugins> | ||
| 88 | + </pluginManagement> | ||
| 89 | + </build> | ||
| 90 | + | ||
| 37 | </project> | 91 | </project> |
yudao-admin-server/pom.xml
| @@ -16,46 +16,25 @@ | @@ -16,46 +16,25 @@ | ||
| 16 | 16 | ||
| 17 | <properties> | 17 | <properties> |
| 18 | <revision>1.0.0</revision> | 18 | <revision>1.0.0</revision> |
| 19 | - | ||
| 20 | - <!-- Maven 相关 --> | ||
| 21 | - <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version> | ||
| 22 | - <!-- 统一依赖管理 --> | ||
| 23 | - <spring.boot.version>2.4.4</spring.boot.version> | ||
| 24 | - <!-- 工具类相关 --> | ||
| 25 | - <lombok.version>1.16.14</lombok.version> | ||
| 26 | - <mapstruct.version>1.4.1.Final</mapstruct.version> | ||
| 27 | </properties> | 19 | </properties> |
| 28 | 20 | ||
| 29 | <dependencies> | 21 | <dependencies> |
| 30 | <dependency> | 22 | <dependency> |
| 31 | - <groupId>cn.iocoder.boot</groupId> | ||
| 32 | - <artifactId>yudao-framework</artifactId> | ||
| 33 | - <version>${revision}</version> | 23 | + <groupId>mysql</groupId> |
| 24 | + <artifactId>mysql-connector-java</artifactId> | ||
| 25 | + <version>5.1.46</version> <!-- TODO 强制版本 --> | ||
| 34 | </dependency> | 26 | </dependency> |
| 35 | 27 | ||
| 36 | - <!-- 工具类相关 --> | ||
| 37 | <dependency> | 28 | <dependency> |
| 38 | - <groupId>org.projectlombok</groupId> | ||
| 39 | - <artifactId>lombok</artifactId> | ||
| 40 | - </dependency> | ||
| 41 | - | ||
| 42 | - <dependency> | ||
| 43 | - <groupId>org.mapstruct</groupId> | ||
| 44 | - <artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher --> | ||
| 45 | - </dependency> | ||
| 46 | - <dependency> | ||
| 47 | - <groupId>org.mapstruct</groupId> | ||
| 48 | - <artifactId>mapstruct-jdk8</artifactId> | ||
| 49 | - </dependency> | ||
| 50 | - <dependency> | ||
| 51 | - <groupId>org.mapstruct</groupId> | ||
| 52 | - <artifactId>mapstruct-processor</artifactId> | ||
| 53 | - <optional>true</optional> | ||
| 54 | - </dependency> | ||
| 55 | - | ||
| 56 | - <dependency> | ||
| 57 | - <groupId>cn.hutool</groupId> | ||
| 58 | - <artifactId>hutool-all</artifactId> | 29 | + <groupId>cn.iocoder.boot</groupId> |
| 30 | + <artifactId>yudao-framework</artifactId> | ||
| 31 | + <version>${revision}</version> | ||
| 32 | + <exclusions> | ||
| 33 | + <exclusion> | ||
| 34 | + <groupId>mysql</groupId> | ||
| 35 | + <artifactId>mysql-connector-java</artifactId> | ||
| 36 | + </exclusion> | ||
| 37 | + </exclusions> | ||
| 59 | </dependency> | 38 | </dependency> |
| 60 | 39 | ||
| 61 | <!-- Test 测试相关 --> | 40 | <!-- Test 测试相关 --> |
| @@ -82,48 +61,36 @@ | @@ -82,48 +61,36 @@ | ||
| 82 | <artifactId>podam</artifactId> | 61 | <artifactId>podam</artifactId> |
| 83 | <scope>test</scope> | 62 | <scope>test</scope> |
| 84 | </dependency> | 63 | </dependency> |
| 64 | + | ||
| 65 | + <!-- 工具类相关 --> | ||
| 66 | + <dependency> | ||
| 67 | + <groupId>org.projectlombok</groupId> | ||
| 68 | + <artifactId>lombok</artifactId> | ||
| 69 | + </dependency> | ||
| 70 | + | ||
| 71 | + <dependency> | ||
| 72 | + <groupId>org.mapstruct</groupId> | ||
| 73 | + <artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher --> | ||
| 74 | + </dependency> | ||
| 75 | + <dependency> | ||
| 76 | + <groupId>org.mapstruct</groupId> | ||
| 77 | + <artifactId>mapstruct-jdk8</artifactId> | ||
| 78 | + </dependency> | ||
| 79 | + <dependency> | ||
| 80 | + <groupId>org.mapstruct</groupId> | ||
| 81 | + <artifactId>mapstruct-processor</artifactId> | ||
| 82 | + </dependency> | ||
| 83 | + | ||
| 85 | </dependencies> | 84 | </dependencies> |
| 86 | 85 | ||
| 87 | <build> | 86 | <build> |
| 87 | + <!-- 设置构建的 jar 包名 --> | ||
| 88 | + <finalName>${project.artifactId}</finalName> | ||
| 89 | + <!-- 使用 spring-boot-maven-plugin 插件打包 --> | ||
| 88 | <plugins> | 90 | <plugins> |
| 89 | - <!-- 打包 --> | ||
| 90 | <plugin> | 91 | <plugin> |
| 91 | <groupId>org.springframework.boot</groupId> | 92 | <groupId>org.springframework.boot</groupId> |
| 92 | <artifactId>spring-boot-maven-plugin</artifactId> | 93 | <artifactId>spring-boot-maven-plugin</artifactId> |
| 93 | - <version>${spring.boot.version}</version> | ||
| 94 | - <configuration> | ||
| 95 | - <fork>true</fork> | ||
| 96 | - </configuration> | ||
| 97 | - <executions> | ||
| 98 | - <execution> | ||
| 99 | - <goals> | ||
| 100 | - <goal>repackage</goal> <!-- 将原来的 jar 打入其中 --> | ||
| 101 | - </goals> | ||
| 102 | - </execution> | ||
| 103 | - </executions> | ||
| 104 | - </plugin> | ||
| 105 | - | ||
| 106 | - <!-- 提供给 mapstruct 使用 --> | ||
| 107 | - <plugin> | ||
| 108 | - <groupId>org.apache.maven.plugins</groupId> | ||
| 109 | - <artifactId>maven-compiler-plugin</artifactId> | ||
| 110 | - <version>${maven-compiler-plugin.version}</version> | ||
| 111 | - <configuration> | ||
| 112 | - <source>${java.version}</source> | ||
| 113 | - <target>${java.version}</target> | ||
| 114 | - <annotationProcessorPaths> | ||
| 115 | - <path> | ||
| 116 | - <groupId>org.mapstruct</groupId> | ||
| 117 | - <artifactId>mapstruct-processor</artifactId> | ||
| 118 | - <version>${mapstruct.version}</version> | ||
| 119 | - </path> | ||
| 120 | - <path> | ||
| 121 | - <groupId>org.projectlombok</groupId> | ||
| 122 | - <artifactId>lombok</artifactId> | ||
| 123 | - <version>${lombok.version}</version> | ||
| 124 | - </path> | ||
| 125 | - </annotationProcessorPaths> | ||
| 126 | - </configuration> | ||
| 127 | </plugin> | 94 | </plugin> |
| 128 | </plugins> | 95 | </plugins> |
| 129 | </build> | 96 | </build> |
yudao-dependencies/pom.xml
| @@ -25,6 +25,21 @@ | @@ -25,6 +25,21 @@ | ||
| 25 | <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version> | 25 | <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version> |
| 26 | <!-- 统一依赖管理 --> | 26 | <!-- 统一依赖管理 --> |
| 27 | <spring.boot.version>2.4.4</spring.boot.version> | 27 | <spring.boot.version>2.4.4</spring.boot.version> |
| 28 | + <!-- DB 相关 --> | ||
| 29 | + <mysql-connector-java.version>5.1.46</mysql-connector-java.version> | ||
| 30 | + <druid.version>1.2.4</druid.version> | ||
| 31 | + <mybatis-plus.version>3.4.2</mybatis-plus.version> | ||
| 32 | + <dynamic-datasource.version>3.3.2</dynamic-datasource.version> | ||
| 33 | + <redisson.version>3.15.1</redisson.version> | ||
| 34 | + <!-- Config 配置中心相关 --> | ||
| 35 | + <apollo.version>1.7.0</apollo.version> | ||
| 36 | + <!-- Job 定时任务相关 --> | ||
| 37 | + <!-- 服务保障相关 --> | ||
| 38 | + <lock4j.version>2.2.0</lock4j.version> | ||
| 39 | + <resilience4j.version>1.7.0</resilience4j.version> | ||
| 40 | + <!-- 监控相关 --> | ||
| 41 | + <skywalking.version>8.5.0</skywalking.version> | ||
| 42 | + <spring-boot-admin.version>2.3.1</spring-boot-admin.version> | ||
| 28 | <!-- Test 测试相关 --> | 43 | <!-- Test 测试相关 --> |
| 29 | <podam.version>7.2.6.RELEASE</podam.version> | 44 | <podam.version>7.2.6.RELEASE</podam.version> |
| 30 | <jedis-mock.version>0.1.16</jedis-mock.version> | 45 | <jedis-mock.version>0.1.16</jedis-mock.version> |
| @@ -50,16 +65,111 @@ | @@ -50,16 +65,111 @@ | ||
| 50 | <version>${spring.boot.version}</version> | 65 | <version>${spring.boot.version}</version> |
| 51 | <type>pom</type> | 66 | <type>pom</type> |
| 52 | <scope>import</scope> | 67 | <scope>import</scope> |
| 68 | + <exclusions> | ||
| 69 | + <exclusion> | ||
| 70 | + <groupId>mysql</groupId> | ||
| 71 | + <artifactId>mysql-connector-java</artifactId> | ||
| 72 | + </exclusion> | ||
| 73 | + </exclusions> | ||
| 53 | </dependency> | 74 | </dependency> |
| 54 | 75 | ||
| 55 | <!-- Spring 核心 --> | 76 | <!-- Spring 核心 --> |
| 77 | + <dependency> | ||
| 78 | + <!-- 用于生成自定义的 Spring @ConfigurationProperties 配置类的说明文件 --> | ||
| 79 | + <groupId>org.springframework.boot</groupId> | ||
| 80 | + <artifactId>spring-boot-configuration-processor</artifactId> | ||
| 81 | + <version>${spring.boot.version}</version> | ||
| 82 | + </dependency> | ||
| 83 | + | ||
| 84 | + <!-- DB 相关 --> | ||
| 85 | + <dependency> | ||
| 86 | + <groupId>mysql</groupId> | ||
| 87 | + <artifactId>mysql-connector-java</artifactId> | ||
| 88 | + <version>${mysql-connector-java.version}</version> | ||
| 89 | + </dependency> | ||
| 90 | + <dependency> | ||
| 91 | + <groupId>com.alibaba</groupId> | ||
| 92 | + <artifactId>druid-spring-boot-starter</artifactId> | ||
| 93 | + <version>${druid.version}</version> | ||
| 94 | + </dependency> | ||
| 95 | + <dependency> | ||
| 96 | + <groupId>com.baomidou</groupId> | ||
| 97 | + <artifactId>mybatis-plus-boot-starter</artifactId> | ||
| 98 | + <version>${mybatis-plus.version}</version> | ||
| 99 | + </dependency> | ||
| 100 | + <dependency> | ||
| 101 | + <groupId>com.baomidou</groupId> | ||
| 102 | + <artifactId>dynamic-datasource-spring-boot-starter</artifactId> <!-- 多数据源 --> | ||
| 103 | + <version>${dynamic-datasource.version}</version> | ||
| 104 | + </dependency> | ||
| 105 | + | ||
| 106 | + <dependency> | ||
| 107 | + <groupId>org.redisson</groupId> | ||
| 108 | + <artifactId>redisson-spring-boot-starter</artifactId> | ||
| 109 | + <version>${redisson.version}</version> | ||
| 110 | + </dependency> | ||
| 111 | + | ||
| 112 | + <!-- Config 配置中心相关 --> | ||
| 113 | + <dependency> | ||
| 114 | + <groupId>com.ctrip.framework.apollo</groupId> | ||
| 115 | + <artifactId>apollo-client</artifactId> <!-- 引入 Apollo Client 库，实现内嵌的配置中心 --> | ||
| 116 | + <version>${apollo.version}</version> | ||
| 117 | + </dependency> | ||
| 118 | + | ||
| 119 | + <!-- Job 定时任务相关 --> | ||
| 120 | + | ||
| 121 | + <!-- 服务保障相关 --> | ||
| 122 | + <dependency> | ||
| 123 | + <groupId>com.baomidou</groupId> | ||
| 124 | + <artifactId>lock4j-redisson-spring-boot-starter</artifactId> | ||
| 125 | + <version>${lock4j.version}</version> | ||
| 126 | + <exclusions> | ||
| 127 | + <exclusion> | ||
| 128 | + <artifactId>redisson-spring-boot-starter</artifactId> | ||
| 129 | + <groupId>org.redisson</groupId> | ||
| 130 | + </exclusion> | ||
| 131 | + </exclusions> | ||
| 132 | + </dependency> | ||
| 133 | + | ||
| 134 | + <dependency> | ||
| 135 | + <groupId>io.github.resilience4j</groupId> | ||
| 136 | + <artifactId>resilience4j-spring-boot2</artifactId> | ||
| 137 | + <version>${resilience4j.version}</version> | ||
| 138 | + </dependency> | ||
| 139 | + | ||
| 140 | + <!-- 监控相关 --> | ||
| 141 | + <dependency> | ||
| 142 | + <groupId>org.apache.skywalking</groupId> | ||
| 143 | + <artifactId>apm-toolkit-trace</artifactId> | ||
| 144 | + <version>${skywalking.version}</version> | ||
| 145 | + </dependency> | ||
| 146 | + <dependency> | ||
| 147 | + <groupId>org.apache.skywalking</groupId> | ||
| 148 | + <artifactId>apm-toolkit-logback-1.x</artifactId> | ||
| 149 | + <version>${skywalking.version}</version> | ||
| 150 | + </dependency> | ||
| 151 | + <dependency> | ||
| 152 | + <groupId>org.apache.skywalking</groupId> | ||
| 153 | + <artifactId>apm-toolkit-opentracing</artifactId> | ||
| 154 | + <version>${skywalking.version}</version> | ||
| 155 | + </dependency> | ||
| 156 | + | ||
| 157 | + <dependency> | ||
| 158 | + <groupId>de.codecentric</groupId> | ||
| 159 | + <artifactId>spring-boot-admin-starter-server</artifactId> <!-- 实现 Spring Boot Admin Server 服务端 --> | ||
| 160 | + <version>${spring-boot-admin.version}</version> | ||
| 161 | + </dependency> | ||
| 162 | + <dependency> | ||
| 163 | + <groupId>de.codecentric</groupId> | ||
| 164 | + <artifactId>spring-boot-admin-starter-client</artifactId> <!-- 实现 Spring Boot Admin Server 服务端 --> | ||
| 165 | + <version>${spring-boot-admin.version}</version> | ||
| 166 | + </dependency> | ||
| 56 | 167 | ||
| 57 | <!-- Test 测试相关 --> | 168 | <!-- Test 测试相关 --> |
| 58 | <dependency> | 169 | <dependency> |
| 59 | <groupId>org.springframework.boot</groupId> | 170 | <groupId>org.springframework.boot</groupId> |
| 60 | <artifactId>spring-boot-starter-test</artifactId> | 171 | <artifactId>spring-boot-starter-test</artifactId> |
| 61 | <version>${spring.boot.version}</version> | 172 | <version>${spring.boot.version}</version> |
| 62 | - <scope>test</scope> | ||
| 63 | <exclusions> | 173 | <exclusions> |
| 64 | <exclusion> | 174 | <exclusion> |
| 65 | <artifactId>asm</artifactId> | 175 | <artifactId>asm</artifactId> |
| @@ -72,14 +182,12 @@ | @@ -72,14 +182,12 @@ | ||
| 72 | <groupId>com.github.fppt</groupId> <!-- 单元测试，我们采用内嵌的 Redis 数据库 --> | 182 | <groupId>com.github.fppt</groupId> <!-- 单元测试，我们采用内嵌的 Redis 数据库 --> |
| 73 | <artifactId>jedis-mock</artifactId> | 183 | <artifactId>jedis-mock</artifactId> |
| 74 | <version>${jedis-mock.version}</version> | 184 | <version>${jedis-mock.version}</version> |
| 75 | - <scope>test</scope> | ||
| 76 | </dependency> | 185 | </dependency> |
| 77 | 186 | ||
| 78 | <dependency> | 187 | <dependency> |
| 79 | <groupId>uk.co.jemos.podam</groupId> <!-- 单元测试，随机生成 POJO 类 --> | 188 | <groupId>uk.co.jemos.podam</groupId> <!-- 单元测试，随机生成 POJO 类 --> |
| 80 | <artifactId>podam</artifactId> | 189 | <artifactId>podam</artifactId> |
| 81 | <version>${podam.version}</version> | 190 | <version>${podam.version}</version> |
| 82 | - <scope>test</scope> | ||
| 83 | </dependency> | 191 | </dependency> |
| 84 | 192 | ||
| 85 | <!-- 工具类相关 --> | 193 | <!-- 工具类相关 --> |
| @@ -87,7 +195,6 @@ | @@ -87,7 +195,6 @@ | ||
| 87 | <groupId>org.projectlombok</groupId> | 195 | <groupId>org.projectlombok</groupId> |
| 88 | <artifactId>lombok</artifactId> | 196 | <artifactId>lombok</artifactId> |
| 89 | <version>${lombok.version}</version> | 197 | <version>${lombok.version}</version> |
| 90 | - <optional>true</optional> | ||
| 91 | </dependency> | 198 | </dependency> |
| 92 | 199 | ||
| 93 | <dependency> | 200 | <dependency> |
| @@ -104,7 +211,6 @@ | @@ -104,7 +211,6 @@ | ||
| 104 | <groupId>org.mapstruct</groupId> | 211 | <groupId>org.mapstruct</groupId> |
| 105 | <artifactId>mapstruct-processor</artifactId> | 212 | <artifactId>mapstruct-processor</artifactId> |
| 106 | <version>${mapstruct.version}</version> | 213 | <version>${mapstruct.version}</version> |
| 107 | - <optional>true</optional> | ||
| 108 | </dependency> | 214 | </dependency> |
| 109 | 215 | ||
| 110 | <dependency> | 216 | <dependency> |
| @@ -154,50 +260,50 @@ | @@ -154,50 +260,50 @@ | ||
| 154 | </dependencies> | 260 | </dependencies> |
| 155 | </dependencyManagement> | 261 | </dependencyManagement> |
| 156 | 262 | ||
| 157 | - <build> | ||
| 158 | - <pluginManagement> | ||
| 159 | - <plugins> | ||
| 160 | - <!-- 打包 --> | ||
| 161 | - <plugin> | ||
| 162 | - <groupId>org.springframework.boot</groupId> | ||
| 163 | - <artifactId>spring-boot-maven-plugin</artifactId> | ||
| 164 | - <version>${spring.boot.version}</version> | ||
| 165 | - <configuration> | ||
| 166 | - <fork>true</fork> | ||
| 167 | - </configuration> | ||
| 168 | - <executions> | ||
| 169 | - <execution> | ||
| 170 | - <goals> | ||
| 171 | - <goal>repackage</goal> <!-- 将原来的 jar 打入其中 --> | ||
| 172 | - </goals> | ||
| 173 | - </execution> | ||
| 174 | - </executions> | ||
| 175 | - </plugin> | ||
| 176 | - | ||
| 177 | - <!-- 提供给 mapstruct 使用 --> | ||
| 178 | - <plugin> | ||
| 179 | - <groupId>org.apache.maven.plugins</groupId> | ||
| 180 | - <artifactId>maven-compiler-plugin</artifactId> | ||
| 181 | - <version>${maven-compiler-plugin.version}</version> | ||
| 182 | - <configuration> | ||
| 183 | - <source>${java.version}</source> | ||
| 184 | - <target>${java.version}</target> | ||
| 185 | - <annotationProcessorPaths> | ||
| 186 | - <path> | ||
| 187 | - <groupId>org.mapstruct</groupId> | ||
| 188 | - <artifactId>mapstruct-processor</artifactId> | ||
| 189 | - <version>${mapstruct.version}</version> | ||
| 190 | - </path> | ||
| 191 | - <path> | ||
| 192 | - <groupId>org.projectlombok</groupId> | ||
| 193 | - <artifactId>lombok</artifactId> | ||
| 194 | - <version>${lombok.version}</version> | ||
| 195 | - </path> | ||
| 196 | - </annotationProcessorPaths> | ||
| 197 | - </configuration> | ||
| 198 | - </plugin> | ||
| 199 | - </plugins> | ||
| 200 | - </pluginManagement> | ||
| 201 | - </build> | 263 | +<!-- <build>--> |
| 264 | +<!-- <pluginManagement>--> | ||
| 265 | +<!-- <plugins>--> | ||
| 266 | +<!-- <!– 打包 –>--> | ||
| 267 | +<!-- <plugin>--> | ||
| 268 | +<!-- <groupId>org.springframework.boot</groupId>--> | ||
| 269 | +<!-- <artifactId>spring-boot-maven-plugin</artifactId>--> | ||
| 270 | +<!-- <version>${spring.boot.version}</version>--> | ||
| 271 | +<!-- <configuration>--> | ||
| 272 | +<!-- <fork>true</fork>--> | ||
| 273 | +<!-- </configuration>--> | ||
| 274 | +<!-- <executions>--> | ||
| 275 | +<!-- <execution>--> | ||
| 276 | +<!-- <goals>--> | ||
| 277 | +<!-- <goal>repackage</goal> <!– 将原来的 jar 打入其中 –>--> | ||
| 278 | +<!-- </goals>--> | ||
| 279 | +<!-- </execution>--> | ||
| 280 | +<!-- </executions>--> | ||
| 281 | +<!-- </plugin>--> | ||
| 282 | + | ||
| 283 | +<!-- <!– 提供给 mapstruct 使用 –>--> | ||
| 284 | +<!-- <plugin>--> | ||
| 285 | +<!-- <groupId>org.apache.maven.plugins</groupId>--> | ||
| 286 | +<!-- <artifactId>maven-compiler-plugin</artifactId>--> | ||
| 287 | +<!-- <version>${maven-compiler-plugin.version}</version>--> | ||
| 288 | +<!-- <configuration>--> | ||
| 289 | +<!-- <source>${java.version}</source>--> | ||
| 290 | +<!-- <target>${java.version}</target>--> | ||
| 291 | +<!-- <annotationProcessorPaths>--> | ||
| 292 | +<!-- <path>--> | ||
| 293 | +<!-- <groupId>org.mapstruct</groupId>--> | ||
| 294 | +<!-- <artifactId>mapstruct-processor</artifactId>--> | ||
| 295 | +<!-- <version>${mapstruct.version}</version>--> | ||
| 296 | +<!-- </path>--> | ||
| 297 | +<!-- <path>--> | ||
| 298 | +<!-- <groupId>org.projectlombok</groupId>--> | ||
| 299 | +<!-- <artifactId>lombok</artifactId>--> | ||
| 300 | +<!-- <version>${lombok.version}</version>--> | ||
| 301 | +<!-- </path>--> | ||
| 302 | +<!-- </annotationProcessorPaths>--> | ||
| 303 | +<!-- </configuration>--> | ||
| 304 | +<!-- </plugin>--> | ||
| 305 | +<!-- </plugins>--> | ||
| 306 | +<!-- </pluginManagement>--> | ||
| 307 | +<!-- </build>--> | ||
| 202 | 308 | ||
| 203 | </project> | 309 | </project> |
yudao-framework/pom.xml
| @@ -24,21 +24,7 @@ | @@ -24,21 +24,7 @@ | ||
| 24 | <!-- Web 相关 --> | 24 | <!-- Web 相关 --> |
| 25 | <knife4j.version>3.0.2</knife4j.version> | 25 | <knife4j.version>3.0.2</knife4j.version> |
| 26 | <swagger-annotations.version>1.5.22</swagger-annotations.version> | 26 | <swagger-annotations.version>1.5.22</swagger-annotations.version> |
| 27 | - <!-- DB 相关 --> | ||
| 28 | - <mysql-connector-java.version>5.1.46</mysql-connector-java.version> | ||
| 29 | - <druid.version>1.2.4</druid.version> | ||
| 30 | - <mybatis-plus.version>3.4.2</mybatis-plus.version> | ||
| 31 | - <dynamic-datasource.version>3.3.2</dynamic-datasource.version> | ||
| 32 | - <redisson.version>3.15.1</redisson.version> | ||
| 33 | - <!-- Config 配置中心相关 --> | ||
| 34 | - <apollo.version>1.7.0</apollo.version> | ||
| 35 | - <!-- 服务保障相关 --> | ||
| 36 | - <lock4j.version>2.2.0</lock4j.version> | ||
| 37 | - <resilience4j.version>1.7.0</resilience4j.version> | ||
| 38 | - <!-- 监控相关 --> | ||
| 39 | - <skywalking.version>8.5.0</skywalking.version> | ||
| 40 | - <logback.encoder.version>6.1</logback.encoder.version> | ||
| 41 | - <spring-boot-admin.version>2.3.1</spring-boot-admin.version> | 27 | + |
| 42 | </properties> | 28 | </properties> |
| 43 | 29 | ||
| 44 | <dependencies> | 30 | <dependencies> |
| @@ -100,35 +86,30 @@ | @@ -100,35 +86,30 @@ | ||
| 100 | <dependency> | 86 | <dependency> |
| 101 | <groupId>mysql</groupId> | 87 | <groupId>mysql</groupId> |
| 102 | <artifactId>mysql-connector-java</artifactId> | 88 | <artifactId>mysql-connector-java</artifactId> |
| 103 | - <version>${mysql-connector-java.version}</version> | 89 | + <version>5.1.46</version> <!-- TODO 强制版本 --> |
| 104 | </dependency> | 90 | </dependency> |
| 105 | <dependency> | 91 | <dependency> |
| 106 | <groupId>com.alibaba</groupId> | 92 | <groupId>com.alibaba</groupId> |
| 107 | <artifactId>druid-spring-boot-starter</artifactId> | 93 | <artifactId>druid-spring-boot-starter</artifactId> |
| 108 | - <version>${druid.version}</version> | ||
| 109 | </dependency> | 94 | </dependency> |
| 110 | <dependency> | 95 | <dependency> |
| 111 | <groupId>com.baomidou</groupId> | 96 | <groupId>com.baomidou</groupId> |
| 112 | <artifactId>mybatis-plus-boot-starter</artifactId> | 97 | <artifactId>mybatis-plus-boot-starter</artifactId> |
| 113 | - <version>${mybatis-plus.version}</version> | ||
| 114 | </dependency> | 98 | </dependency> |
| 115 | <dependency> | 99 | <dependency> |
| 116 | <groupId>com.baomidou</groupId> | 100 | <groupId>com.baomidou</groupId> |
| 117 | <artifactId>dynamic-datasource-spring-boot-starter</artifactId> <!-- 多数据源 --> | 101 | <artifactId>dynamic-datasource-spring-boot-starter</artifactId> <!-- 多数据源 --> |
| 118 | - <version>${dynamic-datasource.version}</version> | ||
| 119 | </dependency> | 102 | </dependency> |
| 120 | 103 | ||
| 121 | <dependency> | 104 | <dependency> |
| 122 | <groupId>org.redisson</groupId> | 105 | <groupId>org.redisson</groupId> |
| 123 | <artifactId>redisson-spring-boot-starter</artifactId> | 106 | <artifactId>redisson-spring-boot-starter</artifactId> |
| 124 | - <version>${redisson.version}</version> | ||
| 125 | </dependency> | 107 | </dependency> |
| 126 | 108 | ||
| 127 | <!-- Config 配置中心相关 --> | 109 | <!-- Config 配置中心相关 --> |
| 128 | <dependency> | 110 | <dependency> |
| 129 | <groupId>com.ctrip.framework.apollo</groupId> | 111 | <groupId>com.ctrip.framework.apollo</groupId> |
| 130 | <artifactId>apollo-client</artifactId> <!-- 引入 Apollo Client 库，实现内嵌的配置中心 --> | 112 | <artifactId>apollo-client</artifactId> <!-- 引入 Apollo Client 库，实现内嵌的配置中心 --> |
| 131 | - <version>${apollo.version}</version> | ||
| 132 | </dependency> | 113 | </dependency> |
| 133 | 114 | ||
| 134 | <!-- Job 定时任务相关 --> | 115 | <!-- Job 定时任务相关 --> |
| @@ -141,47 +122,34 @@ | @@ -141,47 +122,34 @@ | ||
| 141 | <dependency> | 122 | <dependency> |
| 142 | <groupId>com.baomidou</groupId> | 123 | <groupId>com.baomidou</groupId> |
| 143 | <artifactId>lock4j-redisson-spring-boot-starter</artifactId> | 124 | <artifactId>lock4j-redisson-spring-boot-starter</artifactId> |
| 144 | - <version>${lock4j.version}</version> | ||
| 145 | - <exclusions> | ||
| 146 | - <exclusion> | ||
| 147 | - <artifactId>redisson-spring-boot-starter</artifactId> | ||
| 148 | - <groupId>org.redisson</groupId> | ||
| 149 | - </exclusion> | ||
| 150 | - </exclusions> | ||
| 151 | </dependency> | 125 | </dependency> |
| 152 | 126 | ||
| 153 | <dependency> | 127 | <dependency> |
| 154 | <groupId>io.github.resilience4j</groupId> | 128 | <groupId>io.github.resilience4j</groupId> |
| 155 | <artifactId>resilience4j-spring-boot2</artifactId> | 129 | <artifactId>resilience4j-spring-boot2</artifactId> |
| 156 | - <version>${resilience4j.version}</version> | ||
| 157 | </dependency> | 130 | </dependency> |
| 158 | 131 | ||
| 159 | <!-- 监控相关 --> | 132 | <!-- 监控相关 --> |
| 160 | <dependency> | 133 | <dependency> |
| 161 | <groupId>org.apache.skywalking</groupId> | 134 | <groupId>org.apache.skywalking</groupId> |
| 162 | <artifactId>apm-toolkit-trace</artifactId> | 135 | <artifactId>apm-toolkit-trace</artifactId> |
| 163 | - <version>${skywalking.version}</version> | ||
| 164 | </dependency> | 136 | </dependency> |
| 165 | <dependency> | 137 | <dependency> |
| 166 | <groupId>org.apache.skywalking</groupId> | 138 | <groupId>org.apache.skywalking</groupId> |
| 167 | <artifactId>apm-toolkit-logback-1.x</artifactId> | 139 | <artifactId>apm-toolkit-logback-1.x</artifactId> |
| 168 | - <version>${skywalking.version}</version> | ||
| 169 | </dependency> | 140 | </dependency> |
| 170 | <dependency> | 141 | <dependency> |
| 171 | <groupId>org.apache.skywalking</groupId> | 142 | <groupId>org.apache.skywalking</groupId> |
| 172 | <artifactId>apm-toolkit-opentracing</artifactId> | 143 | <artifactId>apm-toolkit-opentracing</artifactId> |
| 173 | - <version>${skywalking.version}</version> | ||
| 174 | </dependency> | 144 | </dependency> |
| 175 | 145 | ||
| 176 | <dependency> | 146 | <dependency> |
| 177 | <groupId>de.codecentric</groupId> | 147 | <groupId>de.codecentric</groupId> |
| 178 | <artifactId>spring-boot-admin-starter-server</artifactId> <!-- 实现 Spring Boot Admin Server 服务端 --> | 148 | <artifactId>spring-boot-admin-starter-server</artifactId> <!-- 实现 Spring Boot Admin Server 服务端 --> |
| 179 | - <version>${spring-boot-admin.version}</version> | ||
| 180 | </dependency> | 149 | </dependency> |
| 181 | <dependency> | 150 | <dependency> |
| 182 | <groupId>de.codecentric</groupId> | 151 | <groupId>de.codecentric</groupId> |
| 183 | <artifactId>spring-boot-admin-starter-client</artifactId> <!-- 实现 Spring Boot Admin Server 服务端 --> | 152 | <artifactId>spring-boot-admin-starter-client</artifactId> <!-- 实现 Spring Boot Admin Server 服务端 --> |
| 184 | - <version>${spring-boot-admin.version}</version> | ||
| 185 | </dependency> | 153 | </dependency> |
| 186 | 154 | ||
| 187 | <!-- Test 测试相关 --> | 155 | <!-- Test 测试相关 --> |
| @@ -239,19 +207,16 @@ | @@ -239,19 +207,16 @@ | ||
| 239 | <dependency> | 207 | <dependency> |
| 240 | <groupId>com.alibaba</groupId> | 208 | <groupId>com.alibaba</groupId> |
| 241 | <artifactId>easyexcel</artifactId> | 209 | <artifactId>easyexcel</artifactId> |
| 242 | - <optional>true</optional> | ||
| 243 | </dependency> | 210 | </dependency> |
| 244 | 211 | ||
| 245 | <dependency> | 212 | <dependency> |
| 246 | <groupId>org.apache.velocity</groupId> | 213 | <groupId>org.apache.velocity</groupId> |
| 247 | <artifactId>velocity-engine-core</artifactId> | 214 | <artifactId>velocity-engine-core</artifactId> |
| 248 | - <optional>true</optional> | ||
| 249 | </dependency> | 215 | </dependency> |
| 250 | 216 | ||
| 251 | <dependency> | 217 | <dependency> |
| 252 | <groupId>cn.smallbun.screw</groupId> | 218 | <groupId>cn.smallbun.screw</groupId> |
| 253 | <artifactId>screw-core</artifactId> <!-- 实现数据库文档 --> | 219 | <artifactId>screw-core</artifactId> <!-- 实现数据库文档 --> |
| 254 | - <optional>true</optional> | ||
| 255 | </dependency> | 220 | </dependency> |
| 256 | 221 | ||
| 257 | <!-- 三方云服务相关 --> | 222 | <!-- 三方云服务相关 --> |
| @@ -260,18 +225,15 @@ | @@ -260,18 +225,15 @@ | ||
| 260 | <dependency> | 225 | <dependency> |
| 261 | <groupId>com.yunpian.sdk</groupId> | 226 | <groupId>com.yunpian.sdk</groupId> |
| 262 | <artifactId>yunpian-java-sdk</artifactId> | 227 | <artifactId>yunpian-java-sdk</artifactId> |
| 263 | - <optional>true</optional> | ||
| 264 | </dependency> | 228 | </dependency> |
| 265 | 229 | ||
| 266 | <dependency> | 230 | <dependency> |
| 267 | <groupId>com.aliyun</groupId> | 231 | <groupId>com.aliyun</groupId> |
| 268 | <artifactId>aliyun-java-sdk-core</artifactId> | 232 | <artifactId>aliyun-java-sdk-core</artifactId> |
| 269 | - <optional>true</optional> | ||
| 270 | </dependency> | 233 | </dependency> |
| 271 | <dependency> | 234 | <dependency> |
| 272 | <groupId>com.aliyun</groupId> | 235 | <groupId>com.aliyun</groupId> |
| 273 | <artifactId>aliyun-java-sdk-dysmsapi</artifactId> | 236 | <artifactId>aliyun-java-sdk-dysmsapi</artifactId> |
| 274 | - <optional>true</optional> | ||
| 275 | </dependency> | 237 | </dependency> |
| 276 | <!-- SMS SDK end --> | 238 | <!-- SMS SDK end --> |
| 277 | 239 |