fp / fp_scm · Commits

Go to a project

Authored by meijiajie
Commit 22535a4b52520eb6906604c9ace9f6eee609e189 1 parent 34d21360

调整结构

Inline Side-by-side
Showing 100 changed files with 27 additions and 72 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 100 of 100+ files are displayed.

@@ -292,12 +292,12 @@ @@ -292,12 +292,12 @@
292 </dependency> 292 </dependency>
293 293
294 <!-- 核心模块--> 294 <!-- 核心模块-->
295 - <dependency> 295 + <!-- <dependency>
296 <groupId>com.scm</groupId> 296 <groupId>com.scm</groupId>
297 <artifactId>scm-framework</artifactId> 297 <artifactId>scm-framework</artifactId>
298 <version>${fp-scm.version}</version> 298 <version>${fp-scm.version}</version>
299 </dependency> 299 </dependency>
300 - 300 +-->
301 <!-- 系统模块--> 301 <!-- 系统模块-->
302 <dependency> 302 <dependency>
303 <groupId>com.scm</groupId> 303 <groupId>com.scm</groupId>
@@ -325,6 +325,13 @@ @@ -325,6 +325,13 @@
325 <artifactId>scm-sms</artifactId> 325 <artifactId>scm-sms</artifactId>
326 <version>${fp-scm.version}</version> 326 <version>${fp-scm.version}</version>
327 </dependency> 327 </dependency>
  328 +
  329 + <!-- SMS短信模块 -->
  330 + <dependency>
  331 + <groupId>com.scm</groupId>
  332 + <artifactId>scm-core</artifactId>
  333 + <version>${fp-scm.version}</version>
  334 + </dependency>
328 </dependencies> 335 </dependencies>
329 </dependencyManagement> 336 </dependencyManagement>
330 337
@@ -332,12 +339,7 @@ @@ -332,12 +339,7 @@
332 <module>scm-admin</module> 339 <module>scm-admin</module>
333 <module>scm-framework</module> 340 <module>scm-framework</module>
334 <module>scm-system</module> 341 <module>scm-system</module>
335 - <module>scm-job</module>  
336 - <module>scm-generator</module>  
337 - <module>scm-common</module>  
338 <module>scm-extend</module> 342 <module>scm-extend</module>
339 - <module>scm-oss</module>  
340 - <module>scm-sms</module>  
341 </modules> 343 </modules>
342 <packaging>pom</packaging> 344 <packaging>pom</packaging>
343 345
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
48 <!-- 核心模块--> 48 <!-- 核心模块-->
49 <dependency> 49 <dependency>
50 <groupId>com.scm</groupId> 50 <groupId>com.scm</groupId>
51 - <artifactId>scm-framework</artifactId> 51 + <artifactId>scm-core</artifactId>
52 </dependency> 52 </dependency>
53 53
54 <dependency> 54 <dependency>
@@ -49,7 +49,7 @@ spring: @@ -49,7 +49,7 @@ spring:
49 driverClassName: com.mysql.cj.jdbc.Driver 49 driverClassName: com.mysql.cj.jdbc.Driver
50 # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 50 # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
51 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) 51 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
52 - url: jdbc:mysql://192.168.1.18:3306/ruoyi-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true 52 + url: jdbc:mysql://192.168.1.21:3306/ruoyi-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
53 username: root 53 username: root
54 password: root 54 password: root
55 # 从库数据源 55 # 从库数据源
@@ -57,7 +57,7 @@ spring: @@ -57,7 +57,7 @@ spring:
57 lazy: true 57 lazy: true
58 type: ${spring.datasource.type} 58 type: ${spring.datasource.type}
59 driverClassName: com.mysql.cj.jdbc.Driver 59 driverClassName: com.mysql.cj.jdbc.Driver
60 - url: jdbc:mysql://192.168.1.18:3306/ruoyi-vue2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true 60 + url: jdbc:mysql://192.168.1.21:3306/ruoyi-vue2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
61 username: root 61 username: root
62 password: root 62 password: root
63 hikari: 63 hikari:
@@ -81,13 +81,13 @@ spring: @@ -81,13 +81,13 @@ spring:
81 ds0: 81 ds0:
82 type: com.zaxxer.hikari.HikariDataSource 82 type: com.zaxxer.hikari.HikariDataSource
83 driver-class-name: com.mysql.cj.jdbc.Driver 83 driver-class-name: com.mysql.cj.jdbc.Driver
84 - url: jdbc:mysql://192.168.1.18:3306/ruoyi-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true 84 + url: jdbc:mysql://192.168.1.21:3306/ruoyi-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
85 username: root 85 username: root
86 password: root 86 password: root
87 ds1: 87 ds1:
88 type: com.zaxxer.hikari.HikariDataSource 88 type: com.zaxxer.hikari.HikariDataSource
89 driver-class-name: com.mysql.cj.jdbc.Driver 89 driver-class-name: com.mysql.cj.jdbc.Driver
90 - url: jdbc:mysql://192.168.1.18:3306/ruoyi-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true 90 + url: jdbc:mysql://192.168.1.21:3306/ruoyi-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
91 username: root 91 username: root
92 password: root 92 password: root
93 rules: # 配置表规则 93 rules: # 配置表规则
@@ -125,7 +125,7 @@ spring: @@ -125,7 +125,7 @@ spring:
125 spring: 125 spring:
126 redis: 126 redis:
127 # 地址 127 # 地址
128 - host: 192.168.1.18 128 + host: 192.168.1.21
129 # 端口，默认为6379 129 # 端口，默认为6379
130 port: 6379 130 port: 6379
131 # 数据库索引 131 # 数据库索引
@@ -8,65 +8,18 @@ @@ -8,65 +8,18 @@
8 <version>4.8.2</version> 8 <version>4.8.2</version>
9 </parent> 9 </parent>
10 <modelVersion>4.0.0</modelVersion> 10 <modelVersion>4.0.0</modelVersion>
11 -  
12 <artifactId>scm-framework</artifactId> 11 <artifactId>scm-framework</artifactId>
  12 + <packaging>pom</packaging>
  13 +
  14 + <modules>
  15 + <module>scm-common</module>
  16 + <module>scm-generator</module>
  17 + <module>scm-job</module>
  18 + <module>scm-mybatis</module>
  19 + <module>scm-oss</module>
  20 + <module>scm-sms</module>
  21 + <module>scm-core</module>
  22 + </modules>
13 23
14 - <description>  
15 - framework框架核心  
16 - </description>  
17 -  
18 - <dependencies>  
19 -  
20 - <!-- SpringBoot Web容器 -->  
21 - <dependency>  
22 - <groupId>org.springframework.boot</groupId>  
23 - <artifactId>spring-boot-starter-web</artifactId>  
24 - <exclusions>  
25 - <exclusion>  
26 - <artifactId>spring-boot-starter-tomcat</artifactId>  
27 - <groupId>org.springframework.boot</groupId>  
28 - </exclusion>  
29 - </exclusions>  
30 - </dependency>  
31 - <!-- web 容器使用 undertow 性能更强 -->  
32 - <dependency>  
33 - <groupId>org.springframework.boot</groupId>  
34 - <artifactId>spring-boot-starter-undertow</artifactId>  
35 - </dependency>  
36 -  
37 - <!-- SpringBoot 拦截器 -->  
38 - <dependency>  
39 - <groupId>org.springframework.boot</groupId>  
40 - <artifactId>spring-boot-starter-aop</artifactId>  
41 - </dependency>  
42 -  
43 - <!-- sql性能分析插件 -->  
44 - <dependency>  
45 - <groupId>p6spy</groupId>  
46 - <artifactId>p6spy</artifactId>  
47 - </dependency>  
48 -  
49 - <dependency>  
50 - <groupId>org.springframework.boot</groupId>  
51 - <artifactId>spring-boot-starter-actuator</artifactId>  
52 - </dependency>  
53 -  
54 - <dependency>  
55 - <groupId>de.codecentric</groupId>  
56 - <artifactId>spring-boot-admin-starter-client</artifactId>  
57 - </dependency>  
58 -  
59 - <dependency>  
60 - <groupId>com.alibaba</groupId>  
61 - <artifactId>transmittable-thread-local</artifactId>  
62 - </dependency>  
63 -  
64 - <!-- 系统模块-->  
65 - <dependency>  
66 - <groupId>com.scm</groupId>  
67 - <artifactId>scm-common</artifactId>  
68 - </dependency>  
69 -  
70 - </dependencies>  
71 24
72 </project> 25 </project>
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5 <parent> 5 <parent>
6 - <artifactId>fp_scm</artifactId> 6 + <artifactId>scm-framework</artifactId>
7 <groupId>com.scm</groupId> 7 <groupId>com.scm</groupId>
8 <version>4.8.2</version> 8 <version>4.8.2</version>
9 </parent> 9 </parent>