From 5589c463147f93c84bd2a973cc7a1fe5cfb74cc9 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Fri, 12 Aug 2022 13:40:59 +0800
Subject: [PATCH] 简化配置文件，删除无用的配置
---
jeecg-module-system/jeecg-system-biz/src/main/resources/application-dev.yml | 39 +++------------------------------------
jeecg-module-system/jeecg-system-biz/src/main/resources/application-dm8.yml | 28 ----------------------------
jeecg-module-system/jeecg-system-biz/src/main/resources/application-prod.yml | 28 +---------------------------
jeecg-module-system/jeecg-system-biz/src/main/resources/application-test.yml | 28 +---------------------------
4 files changed, 5 insertions(+), 118 deletions(-)
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/application-dev.yml b/jeecg-module-system/jeecg-system-biz/src/main/resources/application-dev.yml
index e376b4d..f132956 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/application-dev.yml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/application-dev.yml
@@ -69,12 +69,6 @@ spring:
time-zone: GMT+8
jpa:
open-in-view: false
- activiti:
- check-process-definitions: false
- #启用作业执行器
- async-executor-activate: false
- #启用异步执行器
- job-executor-activate: false
aop:
proxy-target-class: true
#配置freemarker
@@ -136,7 +130,7 @@ spring:
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
+ 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
driver-class-name: com.mysql.cj.jdbc.Driver
@@ -149,7 +143,7 @@ spring:
#redis 配置
redis:
database: 0
- host: jeecg-boot-redis
+ host: 127.0.0.1
port: 6379
password: ''
#mybatis plus 设置
@@ -178,7 +172,7 @@ jeecg:
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
- # 本地：local\Minio：minio\阿里云：alioss
+ #local、minio、alioss
uploadType: local
# 前端访问地址
domainUrl:
@@ -202,15 +196,6 @@ jeecg:
cluster-name: jeecg-ES
cluster-nodes: 127.0.0.1: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文件上传
@@ -228,18 +213,6 @@ jeecg:
is_verify_token: true
#必须校验方法
verify_methods: remove,delete,save,add,update
- #自定义项目前缀
- customPrePath:
- pageSize:
- - 10
- - 20
- - 30
- - 40
- #Wps在线文档
- wps:
- domain: https://wwo.wps.cn/office/
- appid: ??
- appsecret: ??
#xxl-job配置
xxljob:
enabled: false
@@ -251,12 +224,6 @@ jeecg:
port: 30007
logPath: logs/jeecg/job/jobhandler/
logRetentionDays: 30
- route:
- config:
- data-id: jeecg-gateway-router
- group: DEFAULT_GROUP
- #自定义路由配置 yml nacos database
- data-type: database
#分布式锁配置
redisson:
address: 127.0.0.1:6379
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/application-dm8.yml b/jeecg-module-system/jeecg-system-biz/src/main/resources/application-dm8.yml
index ac0484f..05e2d8d 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/application-dm8.yml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/application-dm8.yml
@@ -52,12 +52,6 @@ spring:
properties:
hibernate:
dialect: org.hibernate.dialect.Oracle8iDialect
- activiti:
- check-process-definitions: false
- #启用作业执行器
- async-executor-activate: false
- #启用异步执行器
- job-executor-activate: false
aop:
proxy-target-class: true
#配置freemarker
@@ -79,8 +73,6 @@ spring:
static-path-pattern: /**
resource:
static-locations: classpath:/static/,classpath:/public/
- # autoconfigure:
- # exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
datasource:
type: com.alibaba.druid.pool.DruidDataSource
druid:
@@ -150,15 +142,6 @@ jeecg:
cluster-name: jeecg-ES
cluster-nodes: 127.0.0.1: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文件上传
@@ -174,11 +157,6 @@ jeecg:
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
@@ -190,12 +168,6 @@ jeecg:
port: 30007
logPath: logs/jeecg/job/jobhandler/
logRetentionDays: 30
- #自定义路由配置 yml nacos database
- route:
- config:
- data-id: jeecg-gateway-router
- group: DEFAULT_GROUP
- data-type: yml
#分布式锁配置
redisson:
address: 127.0.0.1:6379
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/application-prod.yml b/jeecg-module-system/jeecg-system-biz/src/main/resources/application-prod.yml
index 21a0ebc..781d344 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/application-prod.yml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/application-prod.yml
@@ -69,12 +69,6 @@ spring:
time-zone: GMT+8
jpa:
open-in-view: false
- activiti:
- check-process-definitions: false
- #启用作业执行器
- async-executor-activate: false
- #启用异步执行器
- job-executor-activate: false
aop:
proxy-target-class: true
#配置freemarker
@@ -178,7 +172,7 @@ jeecg:
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
- # 本地：local\Minio：minio\阿里云：alioss
+ #local\minio\alioss
uploadType: alioss
# 前端访问地址
domainUrl:
@@ -203,15 +197,6 @@ jeecg:
cluster-name: jeecg-ES
cluster-nodes: 127.0.0.1:9200
check-enabled: true
- # 表单设计器配置
- 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: http://fileview.jeecg.com
# minio文件上传
@@ -229,11 +214,6 @@ jeecg:
is_verify_token: true
#必须校验方法
verify_methods: remove,delete,save,add,update
- #Wps在线文档
- wps:
- domain: https://wwo.wps.cn/office/
- appid: ??
- appsecret: ??
#xxl-job配置
xxljob:
enabled: false
@@ -245,12 +225,6 @@ jeecg:
port: 30007
logPath: logs/jeecg/job/jobhandler/
logRetentionDays: 30
- route:
- config:
- data-id: jeecg-gateway-router
- group: DEFAULT_GROUP
- #自定义路由配置 yml nacos database
- data-type: database
#分布式锁配置
redisson:
address: 127.0.0.1:6379
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/application-test.yml b/jeecg-module-system/jeecg-system-biz/src/main/resources/application-test.yml
index 6ee2e73..9dace5e 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/application-test.yml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/application-test.yml
@@ -69,12 +69,6 @@ spring:
time-zone: GMT+8
aop:
proxy-target-class: true
- activiti:
- check-process-definitions: false
- #启用作业执行器
- async-executor-activate: false
- #启用异步执行器
- job-executor-activate: false
jpa:
open-in-view: false
#配置freemarker
@@ -178,7 +172,7 @@ jeecg:
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
- # 本地：local\Minio：minio\阿里云：alioss
+ # local\minio\alioss
uploadType: local
# 前端访问地址
domainUrl:
@@ -203,15 +197,6 @@ jeecg:
cluster-name: jeecg-ES
cluster-nodes: 81.70.47.128: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: http://127.0.0.1:8012
# minio文件上传
@@ -229,11 +214,6 @@ jeecg:
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
@@ -245,12 +225,6 @@ jeecg:
port: 30007
logPath: logs/jeecg/job/jobhandler/
logRetentionDays: 30
- route:
- config:
- data-id: jeecg-gateway-router
- group: DEFAULT_GROUP
- #自定义路由配置 yml nacos database
- data-type: database
#分布式锁配置
redisson:
address: 127.0.0.1:6379
--
libgit2 0.22.2