hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-13 04:46:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev0731' into dev0731

Browse Source
This commit is contained in:
lims1@hunktimes.com
2023-08-08 11:41:41 +08:00
parent eeeb17a4ce 76d80bcf1c
commit 23a02a1355
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
servers/boe-server-all/src/main/resources/application-pro.properties
View File

@@ -1,3 +1,4 @@
<<<<<<< HEAD
@@ -5,7 +6,7 @@
# cloud nacos config # cloud nacos config
spring.cloud.nacos.discovery.server-addr=10.251.181.11:8848 spring.cloud.nacos.discovery.server-addr=10.251.129.51:8848
## redis ## redis
spring.redis.database=1 spring.redis.database=1
@@ -14,7 +15,6 @@ spring.redis.password=qwert!W588
spring.redis.port=6379 spring.redis.port=6379
## datasource config ## datasource config
spring.jpa.hibernate.ddl-auto=none spring.jpa.hibernate.ddl-auto=none
spring.datasource.driverClassName=com.mysql.jdbc.Driver spring.datasource.driverClassName=com.mysql.jdbc.Driver
@@ -23,6 +23,7 @@ spring.datasource.driverClassName=com.mysql.jdbc.Driver
spring.datasource.url=jdbc:mysql://10.251.129.126:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull spring.datasource.url=jdbc:mysql://10.251.129.126:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
spring.datasource.username=admin spring.datasource.username=admin
spring.datasource.password=boeRds01 spring.datasource.password=boeRds01
## 使用 hikari 连接池 ## 使用 hikari 连接池
spring.datasource.type=com.zaxxer.hikari.HikariDataSource spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.auto-commit: true spring.datasource.hikari.auto-commit: true
@@ -39,7 +40,7 @@ logging.level.org.hibernate.SQL=ERROR
# 设置logback.xml位置 # 设置logback.xml位置
logging.config=classpath:log/logback-dev.xml logging.config=classpath:log/logback-dev.xml
## 静态文件目录，默认是在static下面，以后独立到nginx下面配置 ## ???????????static????????nginx????
spring.web.resources.static-locations=file:E:/Projects/BOE/java/static spring.web.resources.static-locations=file:E:/Projects/BOE/java/static
## xboe config ## xboe config
@@ -53,14 +54,14 @@ xboe.upload.file.http_path=https://u.boe.com/upload
## 外部接口调用地址 旧系统机构及用户数据接口 ## 外部接口调用地址 旧系统机构及用户数据接口
xboe.externalinterface.url.system=http://127.0.0.1:9091 xboe.externalinterface.url.system=http://127.0.0.1:9091
## 新增加的教师的内部调用接口 ## ?????????????
xboe.old.base.url=https://u.boe.com xboe.old.base.url=https://u.boe.com
## 用户统计接口的api地址 ## ???????api??
xboe.stat.base.url=http://127.0.0.1:9080 xboe.stat.base.url=http://127.0.0.1:9080
xboe.server.userbasic.url=https://u.boe.com/userbasic xboe.server.userbasic.url=https://u.boe.com/userbasic
#加密盐 #???
#jasypt.encryptor.password=jasypt #jasypt.encryptor.password=jasypt
jasypt.encryptor.algorithm=PBEWithMD5AndDES jasypt.encryptor.algorithm=PBEWithMD5AndDES
jasypt.encryptor.iv-generator-classname=org.jasypt.iv.NoIvGenerator jasypt.encryptor.iv-generator-classname=org.jasypt.iv.NoIvGenerator
@@ -71,7 +72,7 @@ xboe.elasticsearch.server.port=9200
xboe.elasticsearch.server.user= xboe.elasticsearch.server.user=
xboe.elasticsearch.server.password= xboe.elasticsearch.server.password=
## 邮件的配置 ## ?????
xboe.email.url=https://u.boe.com/api/b1/email/send xboe.email.url=https://u.boe.com/api/b1/email/send
xboe.email.from=boeu_learning@boe.com.cn xboe.email.from=boeu_learning@boe.com.cn
xboe.email.user= xboe.email.user=