BJ_ZTEITS-Developers / parking-cloud-yudao

Commit c37d5d7f1da966eacef0f1f96d588e9bfda80c59

Authored by YunaiV
1 parent c4cbd730

项目结构调整 x 8 : 自闭 1024

Inline Side-by-side
Showing 4 changed files with 43 additions and 183 deletions
@@ -20,14 +20,6 @@ @@ -20,14 +20,6 @@
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>  
31 </properties> 23 </properties>
32 24
33 <dependencyManagement> 25 <dependencyManagement>
@@ -42,50 +34,4 @@ @@ -42,50 +34,4 @@
42 </dependencies> 34 </dependencies>
43 </dependencyManagement> 35 </dependencyManagement>
44 36
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 -  
91 </project> 37 </project>
yudao-admin-server/pom.xml
  View file @c37d5d7
@@ -16,25 +16,17 @@ @@ -16,25 +16,17 @@
16 16
17 <properties> 17 <properties>
18 <revision>1.0.0</revision> 18 <revision>1.0.0</revision>
  19 +
  20 + <java.version>1.8</java.version>
  21 + <maven.compiler.source>${java.version}</maven.compiler.source>
  22 + <maven.compiler.target>${java.version}</maven.compiler.target>
19 </properties> 23 </properties>
20 24
21 <dependencies> 25 <dependencies>
22 <dependency> 26 <dependency>
23 - <groupId>mysql</groupId>  
24 - <artifactId>mysql-connector-java</artifactId>  
25 - <version>5.1.46</version> <!-- TODO 强制版本 -->  
26 - </dependency>  
27 -  
28 - <dependency>  
29 <groupId>cn.iocoder.boot</groupId> 27 <groupId>cn.iocoder.boot</groupId>
30 <artifactId>yudao-framework</artifactId> 28 <artifactId>yudao-framework</artifactId>
31 <version>${revision}</version> 29 <version>${revision}</version>
32 - <exclusions>  
33 - <exclusion>  
34 - <groupId>mysql</groupId>  
35 - <artifactId>mysql-connector-java</artifactId>  
36 - </exclusion>  
37 - </exclusions>  
38 </dependency> 30 </dependency>
39 31
40 <!-- Test 测试相关 --> 32 <!-- Test 测试相关 -->
@@ -62,37 +54,6 @@ @@ -62,37 +54,6 @@
62 <scope>test</scope> 54 <scope>test</scope>
63 </dependency> 55 </dependency>
64 56
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 -  
84 </dependencies> 57 </dependencies>
85 58
86 - <build>  
87 - <!-- 设置构建的 jar 包名 -->  
88 - <finalName>${project.artifactId}</finalName>  
89 - <!-- 使用 spring-boot-maven-plugin 插件打包 -->  
90 - <plugins>  
91 - <plugin>  
92 - <groupId>org.springframework.boot</groupId>  
93 - <artifactId>spring-boot-maven-plugin</artifactId>  
94 - </plugin>  
95 - </plugins>  
96 - </build>  
97 -  
98 </project> 59 </project>
yudao-dependencies/pom.xml
  View file @c37d5d7
@@ -25,6 +25,9 @@ @@ -25,6 +25,9 @@
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 + <!-- Web 相关 -->
  29 + <knife4j.version>3.0.2</knife4j.version>
  30 + <swagger-annotations.version>1.5.22</swagger-annotations.version>
28 <!-- DB 相关 --> 31 <!-- DB 相关 -->
29 <mysql-connector-java.version>5.1.46</mysql-connector-java.version> 32 <mysql-connector-java.version>5.1.46</mysql-connector-java.version>
30 <druid.version>1.2.4</druid.version> 33 <druid.version>1.2.4</druid.version>
@@ -81,6 +84,32 @@ @@ -81,6 +84,32 @@
81 <version>${spring.boot.version}</version> 84 <version>${spring.boot.version}</version>
82 </dependency> 85 </dependency>
83 86
  87 + <!-- Web 相关 -->
  88 + <dependency>
  89 + <groupId>com.github.xiaoymin</groupId>
  90 + <artifactId>knife4j-spring-boot-starter</artifactId>
  91 + <version>${knife4j.version}</version>
  92 + <exclusions>
  93 + <exclusion>
  94 + <artifactId>mapstruct</artifactId>
  95 + <groupId>org.mapstruct</groupId> <!-- 避免冲突 -->
  96 + </exclusion>
  97 + <exclusion>
  98 + <artifactId>guava</artifactId>
  99 + <groupId>com.google.guava</groupId>
  100 + </exclusion>
  101 + <exclusion>
  102 + <artifactId>swagger-annotations</artifactId>
  103 + <groupId>io.swagger</groupId>
  104 + </exclusion>
  105 + </exclusions>
  106 + </dependency>
  107 + <dependency>
  108 + <groupId>io.swagger</groupId>
  109 + <artifactId>swagger-annotations</artifactId>
  110 + <version>${swagger-annotations.version}</version>
  111 + </dependency>
  112 +
84 <!-- DB 相关 --> 113 <!-- DB 相关 -->
85 <dependency> 114 <dependency>
86 <groupId>mysql</groupId> 115 <groupId>mysql</groupId>
@@ -250,6 +279,16 @@ @@ -250,6 +279,16 @@
250 <groupId>com.aliyun</groupId> 279 <groupId>com.aliyun</groupId>
251 <artifactId>aliyun-java-sdk-core</artifactId> 280 <artifactId>aliyun-java-sdk-core</artifactId>
252 <version>${aliyun-java-sdk-core.version}</version> 281 <version>${aliyun-java-sdk-core.version}</version>
  282 + <exclusions>
  283 + <exclusion>
  284 + <artifactId>opentracing-api</artifactId>
  285 + <groupId>io.opentracing</groupId>
  286 + </exclusion>
  287 + <exclusion>
  288 + <artifactId>opentracing-noop</artifactId>
  289 + <groupId>io.opentracing</groupId>
  290 + </exclusion>
  291 + </exclusions>
253 </dependency> 292 </dependency>
254 <dependency> 293 <dependency>
255 <groupId>com.aliyun</groupId> 294 <groupId>com.aliyun</groupId>
@@ -260,50 +299,4 @@ @@ -260,50 +299,4 @@
260 </dependencies> 299 </dependencies>
261 </dependencyManagement> 300 </dependencyManagement>
262 301
263 -<!-- <build>-->  
264 -<!-- <pluginManagement>-->  
265 -<!-- <plugins>-->  
266 -<!-- &lt;!&ndash; 打包 &ndash;&gt;-->  
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> &lt;!&ndash; 将原来的 jar 打入其中 &ndash;&gt;-->  
278 -<!-- </goals>-->  
279 -<!-- </execution>-->  
280 -<!-- </executions>-->  
281 -<!-- </plugin>-->  
282 -  
283 -<!-- &lt;!&ndash; 提供给 mapstruct 使用 &ndash;&gt;-->  
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>-->  
308 -  
309 </project> 302 </project>
yudao-framework/pom.xml
  View file @c37d5d7
@@ -19,12 +19,6 @@ @@ -19,12 +19,6 @@
19 <maven.compiler.source>${java.version}</maven.compiler.source> 19 <maven.compiler.source>${java.version}</maven.compiler.source>
20 <maven.compiler.target>${java.version}</maven.compiler.target> 20 <maven.compiler.target>${java.version}</maven.compiler.target>
21 <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version> 21 <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
22 - <!-- 统一依赖管理 -->  
23 - <spring.boot.version>2.4.4</spring.boot.version>  
24 - <!-- Web 相关 -->  
25 - <knife4j.version>3.0.2</knife4j.version>  
26 - <swagger-annotations.version>1.5.22</swagger-annotations.version>  
27 -  
28 </properties> 22 </properties>
29 23
30 <dependencies> 24 <dependencies>
@@ -60,26 +54,10 @@ @@ -60,26 +54,10 @@
60 <dependency> 54 <dependency>
61 <groupId>com.github.xiaoymin</groupId> 55 <groupId>com.github.xiaoymin</groupId>
62 <artifactId>knife4j-spring-boot-starter</artifactId> 56 <artifactId>knife4j-spring-boot-starter</artifactId>
63 - <version>${knife4j.version}</version>  
64 - <exclusions>  
65 - <exclusion>  
66 - <artifactId>mapstruct</artifactId>  
67 - <groupId>org.mapstruct</groupId> <!-- 避免冲突 -->  
68 - </exclusion>  
69 - <exclusion>  
70 - <artifactId>guava</artifactId>  
71 - <groupId>com.google.guava</groupId>  
72 - </exclusion>  
73 - <exclusion>  
74 - <artifactId>swagger-annotations</artifactId>  
75 - <groupId>io.swagger</groupId>  
76 - </exclusion>  
77 - </exclusions>  
78 </dependency> 57 </dependency>
79 <dependency> 58 <dependency>
80 <groupId>io.swagger</groupId> 59 <groupId>io.swagger</groupId>
81 <artifactId>swagger-annotations</artifactId> 60 <artifactId>swagger-annotations</artifactId>
82 - <version>${swagger-annotations.version}</version>  
83 </dependency> 61 </dependency>
84 62
85 <!-- DB 相关 --> 63 <!-- DB 相关 -->
@@ -239,22 +217,4 @@ @@ -239,22 +217,4 @@
239 217
240 </dependencies> 218 </dependencies>
241 219
242 - <build>  
243 - <!-- 设置构建的 jar 包名 -->  
244 - <finalName>${project.artifactId}</finalName>  
245 - <plugins>  
246 - <!-- 打包 -->  
247 - <plugin>  
248 - <groupId>org.springframework.boot</groupId>  
249 - <artifactId>spring-boot-maven-plugin</artifactId>  
250 - </plugin>  
251 -  
252 - <!-- 提供给 mapstruct 使用 -->  
253 - <plugin>  
254 - <groupId>org.apache.maven.plugins</groupId>  
255 - <artifactId>maven-compiler-plugin</artifactId>  
256 - </plugin>  
257 - </plugins>  
258 - </build>  
259 -  
260 </project> 220 </project>