diff --git a/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml b/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml
index 89cc56c..0085e5a 100644
--- a/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml
+++ b/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml
@@ -20,6 +20,8 @@ management:
include: metrics,jeecghttptrace
spring:
+ application:
+ name: nursing-unit-001
# flyway配置
flyway:
# 是否启用flyway
diff --git a/nursing-unit-system/nu-system-start/src/main/resources/application-prod.yml b/nursing-unit-system/nu-system-start/src/main/resources/application-prod.yml
index d350fc0..439bbd1 100644
--- a/nursing-unit-system/nu-system-start/src/main/resources/application-prod.yml
+++ b/nursing-unit-system/nu-system-start/src/main/resources/application-prod.yml
@@ -1,5 +1,5 @@
server:
- port: 8080
+ port: 8081
tomcat:
max-swallow-size: -1
error:
@@ -7,7 +7,7 @@ server:
include-stacktrace: ALWAYS
include-message: ALWAYS
servlet:
- context-path: /nursing-unit
+ context-path: /nursing-unit_001
compression:
enabled: true
min-response-size: 1024
@@ -45,8 +45,8 @@ spring:
clean-disabled: true
servlet:
multipart:
- max-file-size: 10MB
- max-request-size: 10MB
+ max-file-size: 100MB
+ max-request-size: 100MB
mail:
# 定时任务发送邮件
timeJobSend: false
@@ -64,7 +64,7 @@ spring:
quartz:
job-store-type: jdbc
initialize-schema: embedded
- #定时任务开关，true-开 false-关
+ #定时任务启动开关，true-开 false-关
auto-startup: true
#延迟1秒启动定时任务
startup-delay: 1s
@@ -80,9 +80,10 @@ spring:
class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
tablePrefix: QRTZ_
- isClustered: true
+ isClustered: false
misfireThreshold: 12000
- clusterCheckinInterval: 15000
+ clusterCheckinInterval: 0 #心跳检查 之前是15000
+ acquireTriggersWithinLock: false # 减少锁竞争
threadPool:
class: org.quartz.simpl.SimpleThreadPool
threadCount: 10
@@ -144,8 +145,8 @@ spring:
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
timeBetweenEvictionRunsMillis: 60000
# 配置一个连接在池中最小生存的时间，单位是毫秒
- minEvictableIdleTimeMillis: 300000
- validationQuery: SELECT 1 FROM DUAL
+ minEvictableIdleTimeMillis: 3600000
+ validationQuery: SELECT 1
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
@@ -163,25 +164,26 @@ spring:
slow-sql-millis: 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
+ url: jdbc:mysql://1.92.152.160:33061/nursing_unit_001?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+ # url: jdbc:mysql://localhost:3306/nursing_unit_001?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+ username: root
+ password: root
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ # 多数据源配置-运维系统
+ multi-datasource1:
+ url: jdbc:mysql://1.92.152.160:33061/nursing_unit?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: root
password: root
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 配置
redis:
database: 0
host: 127.0.0.1
port: 6379
- password: ''
+ password:
#mybatis plus 设置
mybatis-plus:
- mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml
+ mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml,classpath*:com/nu/**/xml/*Mapper.xml
global-config:
# 关闭MP3.0自带的banner
banner: false
@@ -192,7 +194,7 @@ mybatis-plus:
table-underline: true
configuration:
# 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
- #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# 返回类型为Map,显示null对应的字段
call-setters-on-nulls: true
#jeecg专用配置
@@ -209,33 +211,32 @@ jeecg:
# 平台上线安全配置
firewall:
# 数据源安全 (开启后，Online报表和图表的数据源为必填)
- dataSourceSafe: true
+ dataSourceSafe: false
# 低代码模式（dev:开发模式，prod:发布模式——关闭所有在线开发配置能力）
- lowCodeMode: prod
+ lowCodeMode: dev
# 签名密钥串(前后端要一致，正式发布请自行修改)
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,/sys/sendChangePwdSms,/sys/user/sendChangePhoneSms,/sys/sms,/desform/api/sendVerifyCode
- # local\minio\alioss
- uploadType: alioss
+ # 本地：local、Minio：minio、阿里云：alioss
+ uploadType: local
# 前端访问地址
domainUrl:
pc: http://localhost:3100
app: http://localhost:8051
path:
#文件上传根目录 设置
- upload: /opt/jeecg-boot/upload
+ upload: /opt/upFiles
#webapp文件路径
- webapp: /opt/jeecg-boot/webapp
+ webapp: /opt/webapp
shiro:
- excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/bigscreen/category/**,/bigscreen/visual/**,/bigscreen/map/**,/jmreport/bigscreen2/**,/api/getUserInfo
+ excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/bigscreen/category/**,/bigscreen/visual/**,/bigscreen/map/**,/jmreport/bigscreen2/**
#阿里云oss存储和大鱼短信秘钥配置
oss:
accessKey: ??
secretKey: ??
endpoint: oss-cn-beijing.aliyuncs.com
bucketName: jeecgdev
- staticDomain: https://static.jeecg.com
# 短信模板
sms-template:
# 签名
@@ -248,11 +249,6 @@ jeecg:
SMS_465391221:
# 注册账号短信模板编码
SMS_175430166:
- # ElasticSearch 设置
- elasticsearch:
- cluster-name: jeecg-ES
- cluster-nodes: 127.0.0.1:9200
- check-enabled: false
# 在线预览文件服务器地址配置
file-view-domain: http://fileview.jeecg.com
# minio文件上传
@@ -268,9 +264,9 @@ jeecg:
# 平台上线安全配置(v1.6.2+ 新增)
firewall:
# 数据源安全 (开启后，不允许使用平台数据源、SQL解析加签并且不允许查询数据库)
- dataSourceSafe: true
+ dataSourceSafe: false
# 低代码开发模式（dev:开发模式，prod:发布模式—关闭在线报表设计功能，分配角色admin、lowdeveloper可以放开限制）
- lowCodeMode: prod
+ lowCodeMode: dev
#xxl-job配置
xxljob:
enabled: false
@@ -293,7 +289,11 @@ jeecg:
app-id: ??
api-key: ??
secret-key: ??
-
+ # ElasticSearch 6设置
+ elasticsearch:
+ cluster-name: jeecg-ES
+ cluster-nodes: 127.0.0.1:9200
+ check-enabled: false
#cas单点登录
cas:
prefixUrl: http://cas.example.org:8443/cas
@@ -302,14 +302,15 @@ logging:
level:
org.flywaydb: debug
org.jeecg.modules.system.mapper: info
+ com.nu.modules.system.mapper: info
#swagger
knife4j:
#开启增强配置
enable: true
#开启生产环境屏蔽
- production: true
+ production: false
basic:
- enable: true
+ enable: false
username: jeecg
password: jeecg1314
#第三方登录
@@ -337,3 +338,15 @@ justauth:
type: default
prefix: 'demo::'
timeout: 1h
+#tplink登录信息
+tplink:
+ tums:
+ url: https://121.36.88.64:8888
+ username: admin
+ password: Bl20230518
+ ftp:
+ ip: 1.92.152.160
+ port: 21
+ username: administrator
+ password: Root@123..
+ uploadpath: /
diff --git a/nursing-unit-system/nu-system-start/src/main/resources/application-uat.yml b/nursing-unit-system/nu-system-start/src/main/resources/application-uat.yml
index 5389374..0b4ceea 100644
--- a/nursing-unit-system/nu-system-start/src/main/resources/application-uat.yml
+++ b/nursing-unit-system/nu-system-start/src/main/resources/application-uat.yml
@@ -20,6 +20,8 @@ management:
include: metrics,jeecghttptrace
spring:
+ application:
+ name: nursing-unit-001
# flyway配置
flyway:
# 是否启用flyway
@@ -164,23 +166,22 @@ spring:
slow-sql-millis: 5000
datasource:
master:
- url: jdbc:mysql://localhost:40521/nursing_unit_001?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
- # url: jdbc:mysql://localhost:3306/nursing_unit_001?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
- username: root
- password: BLXC@123.
+ url: jdbc:mysql://mysql8-prod:3306/nursing_unit_001?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+ username: fw8864sshdang
+ password: uGDBkM25I6nZCNM2
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ # 多数据源配置-运维系统
+ multi-datasource1:
+ url: jdbc:mysql://mysql8-prod:3306/nursing_unit?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+ username: fw8864sshdang
+ password: uGDBkM25I6nZCNM2
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 配置
redis:
database: 0
- host: 127.0.0.1
+ host: redis
port: 6379
- password:
+ password: uUgrUus4JAYuwxzo
#mybatis plus 设置
mybatis-plus:
mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml,classpath*:com/nu/**/xml/*Mapper.xml
@@ -226,9 +227,9 @@ jeecg:
app: http://localhost:8051
path:
#文件上传根目录 设置
- upload: /opt/upFiles
+ upload: /opt/nu001/upFiles
#webapp文件路径
- webapp: /opt/webapp
+ webapp: /opt/nu001/webapp
shiro:
excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/bigscreen/category/**,/bigscreen/visual/**,/bigscreen/map/**,/jmreport/bigscreen2/**
#阿里云oss存储和大鱼短信秘钥配置
diff --git a/nursing-unit-system/nu-system-start/src/main/resources/bootstrap.yml b/nursing-unit-system/nu-system-start/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..a868296
--- /dev/null
+++ b/nursing-unit-system/nu-system-start/src/main/resources/bootstrap.yml
@@ -0,0 +1,16 @@
+spring:
+ cloud:
+ nacos:
+ discovery:
+ server-addr: ${config.server-addr}
+ namespace: ${config.namespace}
+ group: ${config.group}
+ username: ${config.username}
+ password: ${config.password}
+ config:
+ server-addr: ${config.server-addr}
+ namespace: ${config.namespace}
+ group: ${config.group}
+ file-extension: yaml
+ username: ${config.username}
+ password: ${config.password}
diff --git a/pom.xml b/pom.xml
index ccef533..7efb21c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,6 +150,17 @@
commonmark
${commonmark.version}
+
+
+
+
+
+
+
+
+
+
+
@@ -471,7 +482,7 @@
dev
- jeecg-boot-nacos:8848
+ 127.0.0.1:8848
@@ -515,19 +526,23 @@
uat
+
+
+ false
+
uat
- jeecg-boot-nacos:8848
+ nacos:8848
DEFAULT_GROUP
-
+ fw8864nasadn
-
+ JINisgIngV82G2