|
@@ -1,5 +1,5 @@
|
|
|
server:
|
|
server:
|
|
|
- port: 8080
|
|
|
|
|
|
|
+ port: 8666
|
|
|
tomcat:
|
|
tomcat:
|
|
|
max-swallow-size: -1
|
|
max-swallow-size: -1
|
|
|
error:
|
|
error:
|
|
@@ -26,7 +26,7 @@ spring:
|
|
|
max-request-size: 10MB
|
|
max-request-size: 10MB
|
|
|
mail:
|
|
mail:
|
|
|
host: smtp.163.com
|
|
host: smtp.163.com
|
|
|
- username: ??
|
|
|
|
|
|
|
+ username: jeecgos@163.com
|
|
|
password: ??
|
|
password: ??
|
|
|
properties:
|
|
properties:
|
|
|
mail:
|
|
mail:
|
|
@@ -111,14 +111,14 @@ spring:
|
|
|
# 初始化大小,最小,最大
|
|
# 初始化大小,最小,最大
|
|
|
initial-size: 5
|
|
initial-size: 5
|
|
|
min-idle: 5
|
|
min-idle: 5
|
|
|
- maxActive: 1000
|
|
|
|
|
|
|
+ maxActive: 20
|
|
|
# 配置获取连接等待超时的时间
|
|
# 配置获取连接等待超时的时间
|
|
|
maxWait: 60000
|
|
maxWait: 60000
|
|
|
# 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
|
|
# 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
|
|
|
timeBetweenEvictionRunsMillis: 60000
|
|
timeBetweenEvictionRunsMillis: 60000
|
|
|
# 配置一个连接在池中最小生存的时间,单位是毫秒
|
|
# 配置一个连接在池中最小生存的时间,单位是毫秒
|
|
|
minEvictableIdleTimeMillis: 300000
|
|
minEvictableIdleTimeMillis: 300000
|
|
|
- validationQuery: SELECT 1 FROM DUAL
|
|
|
|
|
|
|
+ validationQuery: SELECT 1
|
|
|
testWhileIdle: true
|
|
testWhileIdle: true
|
|
|
testOnBorrow: false
|
|
testOnBorrow: false
|
|
|
testOnReturn: false
|
|
testOnReturn: false
|
|
@@ -131,9 +131,9 @@ spring:
|
|
|
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
|
|
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
|
|
|
datasource:
|
|
datasource:
|
|
|
master:
|
|
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
|
|
|
|
|
|
|
+ url: jdbc:mysql://49.235.245.113:3306/medical?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
|
|
|
username: root
|
|
username: root
|
|
|
- password: root
|
|
|
|
|
|
|
+ password: G@7NYpxIn%&*sxLOn%l
|
|
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
|
|
# 多数据源配置
|
|
# 多数据源配置
|
|
|
#multi-datasource1:
|
|
#multi-datasource1:
|
|
@@ -143,10 +143,10 @@ spring:
|
|
|
#driver-class-name: com.mysql.cj.jdbc.Driver
|
|
#driver-class-name: com.mysql.cj.jdbc.Driver
|
|
|
#redis 配置
|
|
#redis 配置
|
|
|
redis:
|
|
redis:
|
|
|
- database: 0
|
|
|
|
|
- host: 127.0.0.1
|
|
|
|
|
|
|
+ database: 9
|
|
|
|
|
+ host: 49.235.245.113
|
|
|
port: 6379
|
|
port: 6379
|
|
|
- password: ''
|
|
|
|
|
|
|
+ password: 'v!54GWsBB8yJ'
|
|
|
#mybatis plus 设置
|
|
#mybatis plus 设置
|
|
|
mybatis-plus:
|
|
mybatis-plus:
|
|
|
mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
|
|
mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
|
|
@@ -155,12 +155,12 @@ mybatis-plus:
|
|
|
banner: false
|
|
banner: false
|
|
|
db-config:
|
|
db-config:
|
|
|
#主键类型 0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
|
|
#主键类型 0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
|
|
|
- id-type: ASSIGN_ID
|
|
|
|
|
|
|
+ id-type: AUTO
|
|
|
# 默认数据库表下划线命名
|
|
# 默认数据库表下划线命名
|
|
|
table-underline: true
|
|
table-underline: true
|
|
|
configuration:
|
|
configuration:
|
|
|
# 这个配置会将执行的sql打印出来,在开发或测试的时候可以用
|
|
# 这个配置会将执行的sql打印出来,在开发或测试的时候可以用
|
|
|
- #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
|
|
|
|
|
|
|
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
|
|
|
# 返回类型为Map,显示null对应的字段
|
|
# 返回类型为Map,显示null对应的字段
|
|
|
call-setters-on-nulls: true
|
|
call-setters-on-nulls: true
|
|
|
#jeecg专用配置
|
|
#jeecg专用配置
|
|
@@ -173,31 +173,30 @@ jeecg:
|
|
|
signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
|
|
signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
|
|
|
# 签名拦截接口
|
|
# 签名拦截接口
|
|
|
signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys
|
|
signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys
|
|
|
- #local\minio\alioss
|
|
|
|
|
- uploadType: alioss
|
|
|
|
|
|
|
+ #local、minio、alioss
|
|
|
|
|
+ uploadType: local
|
|
|
# 前端访问地址
|
|
# 前端访问地址
|
|
|
domainUrl:
|
|
domainUrl:
|
|
|
pc: http://localhost:3100
|
|
pc: http://localhost:3100
|
|
|
app: http://localhost:8051
|
|
app: http://localhost:8051
|
|
|
path:
|
|
path:
|
|
|
#文件上传根目录 设置
|
|
#文件上传根目录 设置
|
|
|
- upload: /opt/jeecg-boot/upload
|
|
|
|
|
|
|
+ upload: d:/medical/file
|
|
|
#webapp文件路径
|
|
#webapp文件路径
|
|
|
- webapp: /opt/jeecg-boot/webapp
|
|
|
|
|
|
|
+ webapp: /Users/lanhongjie/Documents/temp/webapp
|
|
|
shiro:
|
|
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/**,/his/check/**
|
|
|
#阿里云oss存储和大鱼短信秘钥配置
|
|
#阿里云oss存储和大鱼短信秘钥配置
|
|
|
oss:
|
|
oss:
|
|
|
accessKey: ??
|
|
accessKey: ??
|
|
|
secretKey: ??
|
|
secretKey: ??
|
|
|
endpoint: oss-cn-beijing.aliyuncs.com
|
|
endpoint: oss-cn-beijing.aliyuncs.com
|
|
|
bucketName: jeecgdev
|
|
bucketName: jeecgdev
|
|
|
- staticDomain: https://static.jeecg.com
|
|
|
|
|
- # ElasticSearch 设置
|
|
|
|
|
|
|
+ # ElasticSearch 6设置
|
|
|
elasticsearch:
|
|
elasticsearch:
|
|
|
cluster-name: jeecg-ES
|
|
cluster-name: jeecg-ES
|
|
|
cluster-nodes: 127.0.0.1:9200
|
|
cluster-nodes: 127.0.0.1:9200
|
|
|
- check-enabled: true
|
|
|
|
|
|
|
+ check-enabled: false
|
|
|
# 在线预览文件服务器地址配置
|
|
# 在线预览文件服务器地址配置
|
|
|
file-view-domain: http://fileview.jeecg.com
|
|
file-view-domain: http://fileview.jeecg.com
|
|
|
# minio文件上传
|
|
# minio文件上传
|
|
@@ -208,17 +207,9 @@ jeecg:
|
|
|
bucketName: otatest
|
|
bucketName: otatest
|
|
|
#大屏报表参数设置
|
|
#大屏报表参数设置
|
|
|
jmreport:
|
|
jmreport:
|
|
|
- mode: prod
|
|
|
|
|
|
|
+ mode: dev
|
|
|
#数据字典是否进行saas数据隔离,自己看自己的字典
|
|
#数据字典是否进行saas数据隔离,自己看自己的字典
|
|
|
saas: false
|
|
saas: false
|
|
|
- #是否开启租户模式 Support By v1.5.5+
|
|
|
|
|
- openTenant: false
|
|
|
|
|
- #安全模式(敏感接口校验、saas模式下不允许使用平台数据源)
|
|
|
|
|
- #safeMode: true
|
|
|
|
|
- #是否需要校验token
|
|
|
|
|
- is_verify_token: true
|
|
|
|
|
- #必须校验方法
|
|
|
|
|
- verify_methods: remove,delete,save,add,update
|
|
|
|
|
#xxl-job配置
|
|
#xxl-job配置
|
|
|
xxljob:
|
|
xxljob:
|
|
|
enabled: false
|
|
enabled: false
|
|
@@ -250,7 +241,7 @@ knife4j:
|
|
|
#开启生产环境屏蔽
|
|
#开启生产环境屏蔽
|
|
|
production: false
|
|
production: false
|
|
|
basic:
|
|
basic:
|
|
|
- enable: true
|
|
|
|
|
|
|
+ enable: false
|
|
|
username: jeecg
|
|
username: jeecg
|
|
|
password: jeecg1314
|
|
password: jeecg1314
|
|
|
#第三方登录
|
|
#第三方登录
|
|
@@ -300,4 +291,4 @@ third-app:
|
|
|
client-id: ??
|
|
client-id: ??
|
|
|
# appSecret
|
|
# appSecret
|
|
|
client-secret: ??
|
|
client-secret: ??
|
|
|
- agent-id: ??
|
|
|
|
|
|
|
+ agent-id: ??
|