wms / wms4_globalaerjiliya · Commits

Commit 5589c463147f93c84bd2a973cc7a1fe5cfb74cc9

Authored by zhangdaiscott
1 parent 9c8f0bef
master ... develop

简化配置文件，删除无用的配置

Inline Side-by-side
Showing 4 changed files with 5 additions and 118 deletions
jeecg-module-system/jeecg-system-biz/src/main/resources/application-dev.yml
  View file @5589c46
... ... @@ -69,12 +69,6 @@ spring:
69 69 time-zone: GMT+8
70 70 jpa:
71 71 open-in-view: false
72   - activiti:
73   - check-process-definitions: false
74   - #启用作业执行器
75   - async-executor-activate: false
76   - #启用异步执行器
77   - job-executor-activate: false
78 72 aop:
79 73 proxy-target-class: true
80 74 #配置freemarker
... ... @@ -136,7 +130,7 @@ spring:
136 130 connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
137 131 datasource:
138 132 master:
139   - url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
  133 + url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
140 134 username: root
141 135 password: root
142 136 driver-class-name: com.mysql.cj.jdbc.Driver
... ... @@ -149,7 +143,7 @@ spring:
149 143 #redis 配置
150 144 redis:
151 145 database: 0
152   - host: jeecg-boot-redis
  146 + host: 127.0.0.1
153 147 port: 6379
154 148 password: ''
155 149 #mybatis plus 设置
... ... @@ -178,7 +172,7 @@ jeecg:
178 172 signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
179 173 # 签名拦截接口
180 174 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
181   - # 本地：local\Minio：minio\阿里云：alioss
  175 + #local、minio、alioss
182 176 uploadType: local
183 177 # 前端访问地址
184 178 domainUrl:
... ... @@ -202,15 +196,6 @@ jeecg:
202 196 cluster-name: jeecg-ES
203 197 cluster-nodes: 127.0.0.1:9200
204 198 check-enabled: false
205   - # 表单设计器配置
206   - desform:
207   - # 主题颜色（仅支持 16进制颜色代码）
208   - theme-color: "#1890ff"
209   - # 文件、图片上传方式，可选项：qiniu（七牛云）、system（跟随系统配置）
210   - upload-type: system
211   - map:
212   - # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
213   - baidu: ??
214 199 # 在线预览文件服务器地址配置
215 200 file-view-domain: 127.0.0.1:8012
216 201 # minio文件上传
... ... @@ -228,18 +213,6 @@ jeecg:
228 213 is_verify_token: true
229 214 #必须校验方法
230 215 verify_methods: remove,delete,save,add,update
231   - #自定义项目前缀
232   - customPrePath:
233   - pageSize:
234   - - 10
235   - - 20
236   - - 30
237   - - 40
238   - #Wps在线文档
239   - wps:
240   - domain: https://wwo.wps.cn/office/
241   - appid: ??
242   - appsecret: ??
243 216 #xxl-job配置
244 217 xxljob:
245 218 enabled: false
... ... @@ -251,12 +224,6 @@ jeecg:
251 224 port: 30007
252 225 logPath: logs/jeecg/job/jobhandler/
253 226 logRetentionDays: 30
254   - route:
255   - config:
256   - data-id: jeecg-gateway-router
257   - group: DEFAULT_GROUP
258   - #自定义路由配置 yml nacos database
259   - data-type: database
260 227 #分布式锁配置
261 228 redisson:
262 229 address: 127.0.0.1:6379
... ...
jeecg-module-system/jeecg-system-biz/src/main/resources/application-dm8.yml
  View file @5589c46
... ... @@ -52,12 +52,6 @@ spring:
52 52 properties:
53 53 hibernate:
54 54 dialect: org.hibernate.dialect.Oracle8iDialect
55   - activiti:
56   - check-process-definitions: false
57   - #启用作业执行器
58   - async-executor-activate: false
59   - #启用异步执行器
60   - job-executor-activate: false
61 55 aop:
62 56 proxy-target-class: true
63 57 #配置freemarker
... ... @@ -79,8 +73,6 @@ spring:
79 73 static-path-pattern: /**
80 74 resource:
81 75 static-locations: classpath:/static/,classpath:/public/
82   - # autoconfigure:
83   - # exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
84 76 datasource:
85 77 type: com.alibaba.druid.pool.DruidDataSource
86 78 druid:
... ... @@ -150,15 +142,6 @@ jeecg:
150 142 cluster-name: jeecg-ES
151 143 cluster-nodes: 127.0.0.1:9200
152 144 check-enabled: false
153   - # 表单设计器配置
154   - desform:
155   - # 主题颜色（仅支持 16进制颜色代码）
156   - theme-color: "#1890ff"
157   - # 文件、图片上传方式，可选项：qiniu（七牛云）、system（跟随系统配置）
158   - upload-type: system
159   - map:
160   - # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
161   - baidu: ??
162 145 # 在线预览文件服务器地址配置
163 146 file-view-domain: 127.0.0.1:8012
164 147 # minio文件上传
... ... @@ -174,11 +157,6 @@ jeecg:
174 157 is_verify_token: false
175 158 #必须校验方法
176 159 verify_methods: remove,delete,save,add,update
177   - #Wps在线文档
178   - wps:
179   - domain: https://wwo.wps.cn/office/
180   - appid: ??
181   - appsecret: ??
182 160 #xxl-job配置
183 161 xxljob:
184 162 enabled: false
... ... @@ -190,12 +168,6 @@ jeecg:
190 168 port: 30007
191 169 logPath: logs/jeecg/job/jobhandler/
192 170 logRetentionDays: 30
193   - #自定义路由配置 yml nacos database
194   - route:
195   - config:
196   - data-id: jeecg-gateway-router
197   - group: DEFAULT_GROUP
198   - data-type: yml
199 171 #分布式锁配置
200 172 redisson:
201 173 address: 127.0.0.1:6379
... ...
jeecg-module-system/jeecg-system-biz/src/main/resources/application-prod.yml
  View file @5589c46
... ... @@ -69,12 +69,6 @@ spring:
69 69 time-zone: GMT+8
70 70 jpa:
71 71 open-in-view: false
72   - activiti:
73   - check-process-definitions: false
74   - #启用作业执行器
75   - async-executor-activate: false
76   - #启用异步执行器
77   - job-executor-activate: false
78 72 aop:
79 73 proxy-target-class: true
80 74 #配置freemarker
... ... @@ -178,7 +172,7 @@ jeecg:
178 172 signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
179 173 # 签名拦截接口
180 174 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
181   - # 本地：local\Minio：minio\阿里云：alioss
  175 + #local\minio\alioss
182 176 uploadType: alioss
183 177 # 前端访问地址
184 178 domainUrl:
... ... @@ -203,15 +197,6 @@ jeecg:
203 197 cluster-name: jeecg-ES
204 198 cluster-nodes: 127.0.0.1:9200
205 199 check-enabled: true
206   - # 表单设计器配置
207   - desform:
208   - # 主题颜色（仅支持 16进制颜色代码）
209   - theme-color: "#1890ff"
210   - # 文件、图片上传方式，可选项：qiniu（七牛云）、system（跟随系统配置）
211   - upload-type: system
212   - map:
213   - # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
214   - baidu: ??
215 200 # 在线预览文件服务器地址配置
216 201 file-view-domain: http://fileview.jeecg.com
217 202 # minio文件上传
... ... @@ -229,11 +214,6 @@ jeecg:
229 214 is_verify_token: true
230 215 #必须校验方法
231 216 verify_methods: remove,delete,save,add,update
232   - #Wps在线文档
233   - wps:
234   - domain: https://wwo.wps.cn/office/
235   - appid: ??
236   - appsecret: ??
237 217 #xxl-job配置
238 218 xxljob:
239 219 enabled: false
... ... @@ -245,12 +225,6 @@ jeecg:
245 225 port: 30007
246 226 logPath: logs/jeecg/job/jobhandler/
247 227 logRetentionDays: 30
248   - route:
249   - config:
250   - data-id: jeecg-gateway-router
251   - group: DEFAULT_GROUP
252   - #自定义路由配置 yml nacos database
253   - data-type: database
254 228 #分布式锁配置
255 229 redisson:
256 230 address: 127.0.0.1:6379
... ...
jeecg-module-system/jeecg-system-biz/src/main/resources/application-test.yml
  View file @5589c46
... ... @@ -69,12 +69,6 @@ spring:
69 69 time-zone: GMT+8
70 70 aop:
71 71 proxy-target-class: true
72   - activiti:
73   - check-process-definitions: false
74   - #启用作业执行器
75   - async-executor-activate: false
76   - #启用异步执行器
77   - job-executor-activate: false
78 72 jpa:
79 73 open-in-view: false
80 74 #配置freemarker
... ... @@ -178,7 +172,7 @@ jeecg:
178 172 signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
179 173 # 签名拦截接口
180 174 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
181   - # 本地：local\Minio：minio\阿里云：alioss
  175 + # local\minio\alioss
182 176 uploadType: local
183 177 # 前端访问地址
184 178 domainUrl:
... ... @@ -203,15 +197,6 @@ jeecg:
203 197 cluster-name: jeecg-ES
204 198 cluster-nodes: 81.70.47.128:9200
205 199 check-enabled: false
206   - # 表单设计器配置
207   - desform:
208   - # 主题颜色（仅支持 16进制颜色代码）
209   - theme-color: "#1890ff"
210   - # 文件、图片上传方式，可选项：qiniu（七牛云）、system（跟随系统配置）
211   - upload-type: system
212   - map:
213   - # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
214   - baidu: ??
215 200 # 在线预览文件服务器地址配置
216 201 file-view-domain: http://127.0.0.1:8012
217 202 # minio文件上传
... ... @@ -229,11 +214,6 @@ jeecg:
229 214 is_verify_token: false
230 215 #必须校验方法
231 216 verify_methods: remove,delete,save,add,update
232   - #Wps在线文档
233   - wps:
234   - domain: https://wwo.wps.cn/office/
235   - appid: ??
236   - appsecret: ??
237 217 #xxl-job配置
238 218 xxljob:
239 219 enabled: false
... ... @@ -245,12 +225,6 @@ jeecg:
245 225 port: 30007
246 226 logPath: logs/jeecg/job/jobhandler/
247 227 logRetentionDays: 30
248   - route:
249   - config:
250   - data-id: jeecg-gateway-router
251   - group: DEFAULT_GROUP
252   - #自定义路由配置 yml nacos database
253   - data-type: database
254 228 #分布式锁配置
255 229 redisson:
256 230 address: 127.0.0.1:6379
... ...