From e896f22a36f22cb3d0c02d45a51dc610b059696d Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Sat, 6 Aug 2022 16:52:22 +0800
Subject: [PATCH] 升级Spring Cloud Alibaba 2021.0.1.0，使用 spring.config.import 方式引入nacos配置
---
jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg-dev.yaml | 86 +++++++-------------------------------------------------------------------------------
jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg-gateway-dev.yaml | 13 +++++++++++++
jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg-gateway-router.json | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg.yaml | 28 +++-------------------------
4 files changed, 75 insertions(+), 104 deletions(-)
create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg-gateway-dev.yaml
create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg-gateway-router.json
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg-dev.yaml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg-dev.yaml
index c1b2854..99a0f12 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg-dev.yaml
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg-dev.yaml
@@ -9,56 +9,32 @@ spring:
web-stat-filter:
enabled: true
dynamic:
- druid: # 全局druid参数，绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
- # 连接池的配置信息
- # 初始化大小，最小，最大
+ druid:
initial-size: 5
min-idle: 5
maxActive: 20
- # 配置获取连接等待超时的时间
maxWait: 60000
- # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
timeBetweenEvictionRunsMillis: 60000
- # 配置一个连接在池中最小生存的时间，单位是毫秒
minEvictableIdleTimeMillis: 300000
validationQuery: SELECT 1 FROM DUAL
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
- # 打开PSCache，并且指定每个连接上PSCache的大小
poolPreparedStatements: true
maxPoolPreparedStatementPerConnectionSize: 20
- # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
filters: stat,wall,slf4j
- # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
-
datasource:
master:
url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?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: jeecg-boot-redis
- lettuce:
- pool:
- max-active: 8 #最大连接数据库连接数,设 0 为没有限制
- max-idle: 8 #最大等待连接中的数量,设 0 为没有限制
- max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
- min-idle: 0 #最小等待连接中的数量,设 0 为没有限制
- shutdown-timeout: 100ms
password:
port: 6379
- #rabbitmq配置
rabbitmq:
host: jeecg-boot-rabbitmq
username: guest
@@ -70,74 +46,48 @@ spring:
listener:
simple:
acknowledge-mode: manual
- #消费者的最小数量
concurrency: 1
- #消费者的最大数量
max-concurrency: 1
- #是否支持重试
retry:
enabled: true
-#jeecg专用配置
-minidao :
- base-package: org.jeecg.modules.jmreport.*
-jeecg :
- # 签名密钥串(前后端要一致，正式发布请自行修改)
+minidao:
+ base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*
+jeecg:
signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
- # 本地：local\Minio：minio\阿里云：alioss
+ 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
uploadType: local
- #前端访问地址
domainUrl:
pc: http://localhost:3100
app: http://localhost:8051
- path :
- #文件上传根目录 设置
+ path:
upload: /opt/upFiles
- #webapp文件路径
webapp: /opt/webapp
shiro:
excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
- #阿里云oss存储配置
oss:
endpoint: oss-cn-beijing.aliyuncs.com
accessKey: ??
secretKey: ??
bucketName: jeecgdev
staticDomain: ??
- # ElasticSearch 6设置
elasticsearch:
cluster-name: jeecg-ES
- cluster-nodes: 127.0.0.1:9200
+ cluster-nodes: jeecg-boot-es:9200
check-enabled: false
- # 表单设计器配置
- desform:
- # 主题颜色（仅支持 16进制颜色代码）
- theme-color: "#1890ff"
- # 文件、图片上传方式，可选项：qiniu（七牛云）、system（跟随系统配置）
- upload-type: system
- map:
- # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
- baidu: ??
- # 在线预览文件服务器地址配置
file-view-domain: 127.0.0.1:8012
- # minio文件上传
minio:
minio_url: http://minio.jeecg.com
minio_name: ??
minio_pass: ??
bucketName: otatest
- #大屏报表参数设置
jmreport:
mode: dev
- #是否需要校验token
is_verify_token: false
- #必须校验方法
verify_methods: remove,delete,save,add,update
- #Wps在线文档
wps:
domain: https://wwo.wps.cn/office/
appid: ??
appsecret: ??
- #xxl-job配置
xxljob:
enabled: false
adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin
@@ -145,35 +95,22 @@ jeecg :
accessToken: ''
logPath: logs/jeecg/job/jobhandler/
logRetentionDays: 30
- #自定义路由配置 yml nacos database
- route:
- config:
- data-id: jeecg-gateway-router
- group: DEFAULT_GROUP
- data-type: database
- #分布式锁配置
redisson:
address: jeecg-boot-redis:6379
password:
type: STANDALONE
enabled: true
-#Mybatis输出sql日志
logging:
level:
org.jeecg.modules.system.mapper : info
-#cas单点登录
cas:
prefixUrl: http://localhost:8888/cas
-#swagger
knife4j:
- #开启生产环境屏蔽
production: false
basic:
enable: false
username: jeecg
password: jeecg1314
-
-#第三方登录
justauth:
enabled: true
type:
@@ -194,25 +131,16 @@ justauth:
type: default
prefix: 'demo::'
timeout: 1h
-#第三方APP对接
third-app:
enabled: false
type:
- #企业微信
WECHAT_ENTERPRISE:
enabled: false
- #CORP_ID
client-id: ??
- #SECRET
client-secret: ??
agent-id: ??
- #自建应用秘钥（新版企微需要配置）
- # agent-app-secret: ??
- #钉钉
DINGTALK:
enabled: false
- # appKey
client-id: ??
- # appSecret
client-secret: ??
agent-id: ??
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg-gateway-dev.yaml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg-gateway-dev.yaml
new file mode 100644
index 0000000..0ac5bed
--- /dev/null
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg-gateway-dev.yaml
@@ -0,0 +1,13 @@
+jeecg:
+ route:
+ config:
+ #type:database nacos yml
+ data-type: database
+ group: DEFAULT_GROUP
+ data-id: jeecg-gateway-router
+spring:
+ redis:
+ database: 0
+ host: jeecg-boot-redis
+ port: 6379
+ password:
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg-gateway-router.json b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg-gateway-router.json
new file mode 100644
index 0000000..58f70cf
--- /dev/null
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg-gateway-router.json
@@ -0,0 +1,52 @@
+[{
+ "id": "jeecg-system",
+ "order": 0,
+ "predicates": [{
+ "name": "Path",
+ "args": {
+ "_genkey_0": "/sys/**",
+ "_genkey_1": "/jmreport/**",
+ "_genkey_3": "/online/**",
+ "_genkey_4": "/generic/**"
+ }
+ }],
+ "filters": [],
+ "uri": "lb://jeecg-system"
+}, {
+ "id": "jeecg-demo",
+ "order": 1,
+ "predicates": [{
+ "name": "Path",
+ "args": {
+ "_genkey_0": "/mock/**",
+ "_genkey_1": "/test/**",
+ "_genkey_2": "/bigscreen/template1/**",
+ "_genkey_3": "/bigscreen/template2/**"
+ }
+ }],
+ "filters": [],
+ "uri": "lb://jeecg-demo"
+}, {
+ "id": "jeecg-system-websocket",
+ "order": 2,
+ "predicates": [{
+ "name": "Path",
+ "args": {
+ "_genkey_0": "/websocket/**",
+ "_genkey_1": "/newsWebsocket/**"
+ }
+ }],
+ "filters": [],
+ "uri": "lb:ws://jeecg-system"
+}, {
+ "id": "jeecg-demo-websocket",
+ "order": 3,
+ "predicates": [{
+ "name": "Path",
+ "args": {
+ "_genkey_0": "/vxeSocket/**"
+ }
+ }],
+ "filters": [],
+ "uri": "lb:ws://jeecg-demo"
+}]
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg.yaml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg.yaml
index 02f7e92..5178eba 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg.yaml
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg.yaml
@@ -16,12 +16,12 @@ management:
endpoints:
web:
exposure:
- include: "*" #暴露所有节点
+ include: "*"
health:
- sensitive: true #关闭过滤敏感信息
+ sensitive: true
endpoint:
health:
- show-details: ALWAYS #显示详细信息
+ show-details: ALWAYS
spring:
servlet:
multipart:
@@ -38,15 +38,11 @@ spring:
starttls:
enable: true
required: true
- ## quartz定时任务,采用数据库方式
quartz:
job-store-type: jdbc
initialize-schema: embedded
- #设置自动启动，默认为 true
auto-startup: false
- #延迟1秒启动定时任务
startup-delay: 1s
- #启动时更新己存在的Job
overwrite-existing-jobs: true
properties:
org:
@@ -66,7 +62,6 @@ spring:
threadCount: 10
threadPriority: 5
threadsInheritContextClassLoaderOfInitializingThread: true
- #json 时间戳统一转换
jackson:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
@@ -74,49 +69,32 @@ spring:
proxy-target-class: true
activiti:
check-process-definitions: false
- #启用作业执行器
async-executor-activate: false
- #启用异步执行器
job-executor-activate: false
jpa:
open-in-view: false
- #配置freemarker
freemarker:
- # 设置模板后缀名
suffix: .ftl
- # 设置文档类型
content-type: text/html
- # 设置页面编码格式
charset: UTF-8
- # 设置页面缓存
cache: false
prefer-file-system-access: false
- # 设置ftl文件路径
template-loader-path:
- classpath:/templates
- # 设置静态文件路径，js,css等
mvc:
static-path-pattern: /**
- #Spring Boot 2.6+后需手动指定为ant-path-matcher
pathmatch:
matching-strategy: ant_path_matcher
resource:
static-locations: classpath:/static/,classpath:/public/
autoconfigure:
exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
-#mybatis plus 设置
mybatis-plus:
mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
global-config:
- # 关闭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
configuration:
- # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
- #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
- # 返回类型为Map,显示null对应的字段
call-setters-on-nulls: true
\ No newline at end of file
--
libgit2 0.22.2