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 @@
</dependency>
<!-- 核心模块-->
<dependency>
<!-- <dependency>
<groupId>com.scm</groupId>
<artifactId>scm-framework</artifactId>
<version>${fp-scm.version}</version>
</dependency>
-->
<!-- 系统模块-->
<dependency>
<groupId>com.scm</groupId>
... ... @@ -325,6 +325,13 @@
<artifactId>scm-sms</artifactId>
<version>${fp-scm.version}</version>
</dependency>
<!-- SMS短信模块 -->
<dependency>
<groupId>com.scm</groupId>
<artifactId>scm-core</artifactId>
<version>${fp-scm.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
... ... @@ -332,12 +339,7 @@
<module>scm-admin</module>
<module>scm-framework</module>
<module>scm-system</module>
<module>scm-job</module>
<module>scm-generator</module>
<module>scm-common</module>
<module>scm-extend</module>
<module>scm-oss</module>
<module>scm-sms</module>
</modules>
<packaging>pom</packaging>
... ...
... ... @@ -48,7 +48,7 @@
<!-- 核心模块-->
<dependency>
<groupId>com.scm</groupId>
<artifactId>scm-framework</artifactId>
<artifactId>scm-core</artifactId>
</dependency>
<dependency>
... ...
... ... @@ -49,7 +49,7 @@ spring:
driverClassName: com.mysql.cj.jdbc.Driver
# jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
# rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
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
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
username: root
password: root
# 从库数据源
... ... @@ -57,7 +57,7 @@ spring:
lazy: true
type: ${spring.datasource.type}
driverClassName: com.mysql.cj.jdbc.Driver
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
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
username: root
password: root
hikari:
... ... @@ -81,13 +81,13 @@ spring:
ds0:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
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
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
username: root
password: root
ds1:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
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
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
username: root
password: root
rules: # 配置表规则
... ... @@ -125,7 +125,7 @@ spring:
spring:
redis:
# 地址
host: 192.168.1.18
host: 192.168.1.21
# 端口，默认为6379
port: 6379
# 数据库索引
... ...
... ... @@ -8,65 +8,18 @@
<version>4.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>scm-framework</artifactId>
<packaging>pom</packaging>
<modules>
<module>scm-common</module>
<module>scm-generator</module>
<module>scm-job</module>
<module>scm-mybatis</module>
<module>scm-oss</module>
<module>scm-sms</module>
<module>scm-core</module>
</modules>
<description>
framework框架核心
</description>
<dependencies>
<!-- SpringBoot Web容器 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<artifactId>spring-boot-starter-tomcat</artifactId>
<groupId>org.springframework.boot</groupId>
</exclusion>
</exclusions>
</dependency>
<!-- web 容器使用 undertow 性能更强 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-undertow</artifactId>
</dependency>
<!-- SpringBoot 拦截器 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<!-- sql性能分析插件 -->
<dependency>
<groupId>p6spy</groupId>
<artifactId>p6spy</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-client</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>transmittable-thread-local</artifactId>
</dependency>
<!-- 系统模块-->
<dependency>
<groupId>com.scm</groupId>
<artifactId>scm-common</artifactId>
</dependency>
</dependencies>
</project>
... ...
... ... @@ -3,7 +3,7 @@
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>
<artifactId>fp_scm</artifactId>
<artifactId>scm-framework</artifactId>
<groupId>com.scm</groupId>
<version>4.8.2</version>
</parent>
... ...