wangpeng
/
integrated_traffic_admin
forked from integrated_whb/integrated_whb_admin
1
0
Fork 0
Code Pull Requests Activity

Merge remote-tracking branch 'origin/master' into dev

dev
wangpeng 2024-02-20 10:33:24 +08:00
parent c1cf7ea1a7 025da94992
commit 9fec96690b
2 changed files with 29 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@ -5,12 +5,12 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.zcloud</groupId> <groupId>com.zcloud</groupId>
<artifactId>zcloud-admin</artifactId> <artifactId>integrated_traffic_admin</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<packaging>war</packaging><!-- 以war运行是改成war --> <packaging>war</packaging><!-- 以war运行是改成war -->
<name>zcloud-admin</name> <name>integrated_traffic_admin</name>
<description>zcloud-admin for Spring Boot</description> <description>integrated_traffic_admin for Spring Boot</description>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -502,7 +502,7 @@
</dependencies> </dependencies>
<build> <build>
<!-- <finalName>zcloud-admin</finalName> <!-- <finalName>integrated_traffic_admin</finalName>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -529,7 +529,7 @@
</includes> </includes>
</resource> </resource>
</resources> --> </resources> -->
<finalName>zcloud-admin</finalName> <finalName>integrated_traffic_admin</finalName>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>

119
src/main/resources/application.properties
View File

@ -1,107 +1,36 @@
spring.application.name=zcloud-admin spring.application.name=integrated_traffic_admin
server.port=8098 server.port=8098
数据源1 #\u5F00\u53D1\u5E93
#\u6570\u636E\u6E901
datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
datasource.no1.url=jdbc:mysql://192.168.0.42:3306/zcloud_prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no1.url=jdbc:mysql://192.168.0.64:3306/qa-traffic-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
datasource.no1.username=root datasource.no1.username=root
datasource.no1.password=root datasource.no1.password=root
#\u6570\u636E\u6E902(\u9ED8\u8BA4\u6CA1\u7528\uFF0C\u4FE9\u5730\u5740\u5199\u4E00\u6837\u5373\u53EF)
#数据源2(默认没用，俩地址写一样即可)
datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
datasource.no2.url=jdbc:mysql://192.168.0.42:3306/integrated_whb?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no2.url=jdbc:mysql://192.168.0.64:3306/qa-traffic-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
datasource.no2.username=root datasource.no2.username=root
datasource.no2.password=root datasource.no2.password=root
#\u6570\u636E\u6E903(admin\u8D44\u6E90\u5E93)
#数据源3(admin资源库)
datasource.no3.driver-class-name: com.mysql.cj.jdbc.Driver datasource.no3.driver-class-name: com.mysql.cj.jdbc.Driver
datasource.no3.url=jdbc:mysql://192.168.0.42:3306/zcloud-admin?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no3.url=jdbc:mysql://192.168.0.64:3306/qa-traffic-admin?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
datasource.no3.username=root datasource.no3.username=root
datasource.no3.password=root datasource.no3.password=root
#druid\u8FDE\u63A5\u6C60
#数据源1
#datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
#datasource.no1.url=jdbc:mysql://39.103.211.146:33068/zcloud_prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
#datasource.no1.username=root
#datasource.no1.password=Mysqlzcloud88888
#
#
##数据源2(默认没用，俩地址写一样即可)
#datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
#datasource.no2.url=jdbc:mysql://39.103.211.146:33068/zcloud_system?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
#datasource.no2.username=root
#datasource.no2.password=Mysqlzcloud88888
#
#
##数据源3(admin资源库)
#datasource.no3.driver-class-name: com.mysql.cj.jdbc.Driver
#datasource.no3.url=jdbc:mysql://39.103.211.146:33068/zcloud-admin?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
#datasource.no3.username=root
#datasource.no3.password=Mysqlzcloud88888
#
#
##数据源4(other)
#datasource.no4.driver-class-name: com.mysql.cj.jdbc.Driver
#datasource.no4.url=jdbc:mysql://39.103.211.146:33068/zcloud_other?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
#datasource.no4.username=root
#datasource.no4.password=Mysqlzcloud88888
#
##数据源5(small)
#datasource.small.driver-class-name: com.mysql.cj.jdbc.Driver
#datasource.small.url=jdbc:mysql://39.103.211.146:33068/zcloud_small?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
#datasource.small.username=root
#datasource.small.password=Mysqlzcloud88888
#
##数据源edu(education)
#datasource.edu.driver-class-name: com.mysql.cj.jdbc.Driver
#datasource.edu.url=jdbc:mysql://39.103.211.146:33068/zcloud_education?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
#datasource.edu.username=root
#datasource.edu.password=Mysqlzcloud88888
##数据源39.103.211.146 172.24.151.18
#datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
#datasource.no1.url=jdbc:mysql://172.24.151.18:33068/zcloud_prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
#datasource.no1.username=root
#datasource.no1.password=Mysqlzcloud88888
#
#
##数据源2(默认没用，俩地址写一样即可)
#datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
#datasource.no2.url=jdbc:mysql://172.24.151.18:33068/zcloud_system?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
#datasource.no2.username=root
#datasource.no2.password=Mysqlzcloud88888
#
#
#数据源3(admin资源库)
#datasource.no3.driver-class-name: com.mysql.cj.jdbc.Driver
#datasource.no3.url=jdbc:mysql://172.24.151.18:33068/zcloud_admin?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
#datasource.no3.username=root
#datasource.no3.password=Mysqlzcloud88888
#
#
##数据源4(other)
#datasource.no4.driver-class-name: com.mysql.cj.jdbc.Driver
#datasource.no4.url=jdbc:mysql://172.24.151.18:33068/zcloud_other?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
#datasource.no4.username=root
#datasource.no4.password=Mysqlzcloud88888
#druid连接池
spring.datasource.type: com.alibaba.druid.pool.DruidDataSource spring.datasource.type: com.alibaba.druid.pool.DruidDataSource
#最大活跃数 #\u6700\u5927\u6D3B\u8DC3\u6570
spring.datasource.maxActive: 20 spring.datasource.maxActive: 20
#初始化数量 #\u521D\u59CB\u5316\u6570\u91CF
spring.datasource.initialSize: 1 spring.datasource.initialSize: 1
#最大连接等待超时时间 #\u6700\u5927\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u65F6\u95F4
spring.datasource.maxWait: 60000 spring.datasource.maxWait: 60000
#打开PSCache，并且指定每个连接PSCache的大小 #\u6253\u5F00PSCache\uFF0C\u5E76\u4E14\u6307\u5B9A\u6BCF\u4E2A\u8FDE\u63A5PSCache\u7684\u5927\u5C0F
spring.datasource.poolPreparedStatements: true spring.datasource.poolPreparedStatements: true
spring.datasource.maxPoolPreparedStatementPerConnectionSize: 20 spring.datasource.maxPoolPreparedStatementPerConnectionSize: 20
#通过connectionProperties属性来打开mergeSql功能；慢SQL记录 #\u901A\u8FC7connectionProperties\u5C5E\u6027\u6765\u6253\u5F00mergeSql\u529F\u80FD\uFF1B\u6162SQL\u8BB0\u5F55
#connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 #connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
spring.datasource.minIdle: 1 spring.datasource.minIdle: 1
spring.datasource.timeBetweenEvictionRunsMillis: 60000 spring.datasource.timeBetweenEvictionRunsMillis: 60000
@ -110,41 +39,41 @@ spring.datasource.validationQuery: select 1 from dual
spring.datasource.testWhileIdle: true spring.datasource.testWhileIdle: true
spring.datasource.testOnBorrow: false spring.datasource.testOnBorrow: false
spring.datasource.testOnReturn: false spring.datasource.testOnReturn: false
#配置监控统计拦截的filters，去掉后监控界面sql将无法统计,'wall'用于防火墙 #\u914D\u7F6E\u76D1\u63A7\u7EDF\u8BA1\u62E6\u622A\u7684filters\uFF0C\u53BB\u6389\u540E\u76D1\u63A7\u754C\u9762sql\u5C06\u65E0\u6CD5\u7EDF\u8BA1,'wall'\u7528\u4E8E\u9632\u706B\u5899
filters: stat, wall, log4j filters: stat, wall, log4j
#缓存配置文件位置 #\u7F13\u5B58\u914D\u7F6E\u6587\u4EF6\u4F4D\u7F6E
spring.cache.ehcache.cofnig=ehcache.xml spring.cache.ehcache.cofnig=ehcache.xml
#配置这句话,控制台输出sql语句 #\u914D\u7F6E\u8FD9\u53E5\u8BDD,\u63A7\u5236\u53F0\u8F93\u51FAsql\u8BED\u53E5
logging.level.com.zcloud.mapper=debug logging.level.com.zcloud.mapper=debug
#上传文件大小限制 #\u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F\u9650\u5236
spring.servlet.multipart.max-file-size=500MB spring.servlet.multipart.max-file-size=500MB
spring.servlet.multipart.max-request-size=500MB spring.servlet.multipart.max-request-size=500MB
#activiti模型检测 #activiti\u6A21\u578B\u68C0\u6D4B
spring.activiti.check-process-definitions=false spring.activiti.check-process-definitions=false
#字符 #\u5B57\u7B26
spring.http.encoding.charset=UTF-8 spring.http.encoding.charset=UTF-8
spring.http.encoding.force=true spring.http.encoding.force=true
spring.http.encoding.enabled=true spring.http.encoding.enabled=true
# 关闭springboot启动时的banner # \u5173\u95EDspringboot\u542F\u52A8\u65F6\u7684banner
spring.main.banner-mode=off spring.main.banner-mode=off
#jar包部署时去掉注释 #jar\u5305\u90E8\u7F72\u65F6\u53BB\u6389\u6CE8\u91CA
#web.upload-path=h:/ #web.upload-path=h:/
#web.front-path=h:/ #web.front-path=h:/
#spring.resources.static-locations=file:${web.upload-path},file:${web.front-path} #spring.resources.static-locations=file:${web.upload-path},file:${web.front-path}
#正式 #\u6B63\u5F0F
#customer.id=LAZ-20221129-3 #customer.id=LAZ-20221129-3
#customer.SECRET_KEY=a256e8575c3f4240b08f6350f13ce8e2 #customer.SECRET_KEY=a256e8575c3f4240b08f6350f13ce8e2
#customer.url=https://api.qhdsafety.com/sync/ #customer.url=https://api.qhdsafety.com/sync/
#customer.domain=yth.qhdsafety.com #customer.domain=yth.qhdsafety.com
#开发 #\u5F00\u53D1
customer.id=LAZ-20221129-3 customer.id=LAZ-20221129-3
customer.SECRET_KEY=a256e8575c3f4240b08f6350f13ce8e2 customer.SECRET_KEY=a256e8575c3f4240b08f6350f13ce8e2
customer.url=http://192.168.0.18:8997/sync/ customer.url=http://192.168.0.18:8997/sync/