|
|
@@ -1,5 +1,5 @@
|
|
|
server:
|
|
|
- port: 8080
|
|
|
+ port: 7702
|
|
|
tomcat:
|
|
|
max-swallow-size: -1
|
|
|
error:
|
|
|
@@ -25,9 +25,9 @@ spring:
|
|
|
max-file-size: 50MB
|
|
|
max-request-size: 50MB
|
|
|
mail:
|
|
|
- host: smtp.163.com
|
|
|
- username: jeecgos@163.com
|
|
|
- password: ??
|
|
|
+ host: smtp.qq.com
|
|
|
+ username: 1556146884@qq.com
|
|
|
+ password: zaidmiapzmnziejh
|
|
|
properties:
|
|
|
mail:
|
|
|
smtp:
|
|
|
@@ -39,10 +39,10 @@ spring:
|
|
|
quartz:
|
|
|
job-store-type: jdbc
|
|
|
initialize-schema: embedded
|
|
|
- #延迟1秒启动定时任务
|
|
|
- startup-delay: 1s
|
|
|
#定时任务启动开关，true-开 false-关
|
|
|
auto-startup: true
|
|
|
+ #延迟1秒启动定时任务
|
|
|
+ startup-delay: 1s
|
|
|
#启动时更新己存在的Job
|
|
|
overwrite-existing-jobs: true
|
|
|
properties:
|
|
|
@@ -67,16 +67,16 @@ spring:
|
|
|
jackson:
|
|
|
date-format: yyyy-MM-dd HH:mm:ss
|
|
|
time-zone: GMT+8
|
|
|
- jpa:
|
|
|
- open-in-view: false
|
|
|
+ aop:
|
|
|
+ proxy-target-class: true
|
|
|
activiti:
|
|
|
check-process-definitions: false
|
|
|
#启用作业执行器
|
|
|
async-executor-activate: false
|
|
|
#启用异步执行器
|
|
|
job-executor-activate: false
|
|
|
- aop:
|
|
|
- proxy-target-class: true
|
|
|
+ jpa:
|
|
|
+ open-in-view: false
|
|
|
#配置freemarker
|
|
|
freemarker:
|
|
|
# 设置模板后缀名
|
|
|
@@ -116,7 +116,7 @@ spring:
|
|
|
# 初始化大小，最小，最大
|
|
|
initial-size: 5
|
|
|
min-idle: 5
|
|
|
- maxActive: 1000
|
|
|
+ maxActive: 20
|
|
|
# 配置获取连接等待超时的时间
|
|
|
maxWait: 60000
|
|
|
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
|
|
|
@@ -136,22 +136,25 @@ spring:
|
|
|
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
|
|
|
datasource:
|
|
|
master:
|
|
|
- url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
|
|
|
- username: root
|
|
|
- password: root
|
|
|
+ url: jdbc:mysql://172.16.142.20:3306/tnc?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
|
|
|
+ username: tnc
|
|
|
+ password: webyun
|
|
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
|
|
- # 多数据源配置
|
|
|
+ # 多数据源配置`噗；'。
|
|
|
#multi-datasource1:
|
|
|
#url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
|
|
|
#username: root
|
|
|
#password: root
|
|
|
#driver-class-name: com.mysql.cj.jdbc.Driver
|
|
|
#redis 配置
|
|
|
+ #202.85.214.182
|
|
|
+ #liuwm_123
|
|
|
+ #123
|
|
|
redis:
|
|
|
database: 0
|
|
|
- host: 202.85.214.182
|
|
|
+ host: 127.0.0.1
|
|
|
port: 6379
|
|
|
- password: liuwm_123
|
|
|
+ password: 123
|
|
|
lettuce:
|
|
|
pool:
|
|
|
max-active: 8 #最大连接数据库连接数,设 -1 为没有限制
|
|
|
@@ -166,7 +169,7 @@ mybatis-plus:
|
|
|
# 关闭MP3.0自带的banner
|
|
|
banner: false
|
|
|
db-config:
|
|
|
- #主键类型 0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
|
|
|
+ #主键类型
|
|
|
id-type: ASSIGN_ID
|
|
|
# 默认数据库表下划线命名
|
|
|
table-underline: true
|
|
|
@@ -184,14 +187,14 @@ jeecg:
|
|
|
# 签名密钥串(前后端要一致，正式发布请自行修改)
|
|
|
signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
|
|
|
# 本地：local\Minio：minio\阿里云：alioss
|
|
|
- uploadType: alioss
|
|
|
+ uploadType: minio
|
|
|
path:
|
|
|
- #文件上传根目录 设置
|
|
|
- upload: /opt/jeecg-boot/upload
|
|
|
- #webapp文件路径
|
|
|
- webapp: /opt/jeecg-boot/webapp
|
|
|
+ # 文件上传根目录 设置
|
|
|
+ upload: upFiles
|
|
|
+ # webapp文件路径
|
|
|
+ webapp: webapp
|
|
|
shiro:
|
|
|
- excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/api/getUserInfo
|
|
|
+ excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
|
|
|
#阿里云oss存储和大鱼短信秘钥配置
|
|
|
oss:
|
|
|
accessKey: ??
|
|
|
@@ -202,8 +205,8 @@ jeecg:
|
|
|
# ElasticSearch 设置
|
|
|
elasticsearch:
|
|
|
cluster-name: jeecg-ES
|
|
|
- cluster-nodes: 127.0.0.1:9200
|
|
|
- check-enabled: true
|
|
|
+ cluster-nodes: 81.70.47.128:9200
|
|
|
+ check-enabled: false
|
|
|
# 表单设计器配置
|
|
|
desform:
|
|
|
# 主题颜色（仅支持 16进制颜色代码）
|
|
|
@@ -214,20 +217,20 @@ jeecg:
|
|
|
# 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
|
|
|
baidu: ??
|
|
|
# 在线预览文件服务器地址配置
|
|
|
- file-view-domain: http://fileview.jeecg.com
|
|
|
+ file-view-domain: http://172.16.142.20:8012
|
|
|
# minio文件上传
|
|
|
minio:
|
|
|
- minio_url: http://minio.jeecg.com
|
|
|
- minio_name: ??
|
|
|
- minio_pass: ??
|
|
|
- bucketName: otatest
|
|
|
+ minio_url: http://172.16.142.20:9001
|
|
|
+ minio_name: minioadmin
|
|
|
+ minio_pass: minioadmin
|
|
|
+ bucketName: default
|
|
|
#大屏报表参数设置
|
|
|
jmreport:
|
|
|
mode: prod
|
|
|
#数据字典是否进行saas数据隔离，自己看自己的字典
|
|
|
saas: false
|
|
|
#是否需要校验token
|
|
|
- is_verify_token: true
|
|
|
+ is_verify_token: false
|
|
|
#必须校验方法
|
|
|
verify_methods: remove,delete,save,add,update
|
|
|
#Wps在线文档
|
|
|
@@ -247,14 +250,14 @@ jeecg:
|
|
|
password:
|
|
|
type: STANDALONE
|
|
|
enabled: true
|
|
|
-#cas单点登录
|
|
|
-cas:
|
|
|
- prefixUrl: http://cas.example.org:8443/cas
|
|
|
#Mybatis输出sql日志
|
|
|
logging:
|
|
|
level:
|
|
|
org.jeecg.modules.system.mapper: info
|
|
|
- config: classpath:config/logback-prod.xml
|
|
|
+ config: classpath:config/logback-test.xml
|
|
|
+#cas单点登录
|
|
|
+cas:
|
|
|
+ prefixUrl: http://cas.example.org:8443/cas
|
|
|
#swagger
|
|
|
knife4j:
|
|
|
#开启增强配置
|
|
|
@@ -314,4 +317,10 @@ third-app:
|
|
|
client-secret: ??
|
|
|
agent-id: ??
|
|
|
password:
|
|
|
- initial: s@Gr4n5h1P
|
|
|
+ initial: s@Gr4n5h1P
|
|
|
+special:
|
|
|
+ email:
|
|
|
+ audit:
|
|
|
+ account: liutt3.bj@chinatelecom.cn
|
|
|
+ accountDsB: liutt3.bj@chinatelecom.cn
|
|
|
+ accountHdB: wang-pan.bj@chinatelecom.cn
|
“liuhy”