From 2d747703560cbb783cb3befa6028bb9c03fe808a Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 26 六月 2025 13:37:14 +0800
Subject: [PATCH] art: 配置文件整理，删除无用的配置
---
/dev/null | 239 ---------------------------------------
src/main/resources/application-dev.yml | 29 ----
src/main/resources/application-prod.yml | 28 ++--
src/main/resources/application-test.yml | 11 -
pom.xml | 1
src/main/resources/application.yml | 4
6 files changed, 18 insertions(+), 294 deletions(-)
diff --git a/pom.xml b/pom.xml
index f02efdd..40acc8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,6 @@
<spring-cloud-alibaba.version>2021.0.1.0</spring-cloud-alibaba.version>
<alibaba.nacos.version>2.0.4</alibaba.nacos.version>
- <xxl-job-core.version>2.2.0</xxl-job-core.version>
<fastjson.version>1.2.83</fastjson.version>
<pegdown.version>1.6.0</pegdown.version>
<knife4j-spring-boot-starter.version>3.0.3</knife4j-spring-boot-starter.version>
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 51d32d3..b365287 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -211,17 +211,6 @@
is_verify_token: true
#蹇呴』鏍￠獙鏂规硶
verify_methods: remove,delete,save,add,update
- #xxl-job閰嶇疆
- xxljob:
- enabled: false
- adminAddresses: http://127.0.0.1:9080/xxl-job-admin
- appname: ${spring.application.name}
- accessToken: ''
- address: 127.0.0.1:30007
- ip: 127.0.0.1
- port: 30007
- logPath: logs/jeecg/job/jobhandler/
- logRetentionDays: 30
#鍒嗗竷寮忛攣閰嶇疆
redisson:
address: 127.0.0.1:6379
@@ -298,23 +287,7 @@
namespace: http://service.server.webservice.example.com
statusMethod: equipmentStatus
rateMethod: equipmentRate
-#鏂囦欢涓婁紶鐩綍锛堟敞鎰廘inux鍜學indows涓婄殑鐩綍缁撴瀯涓嶅悓锛�
-#file.uploadFolder=/root/uploadFiles/
-#fileHomePath: ${UPLOAD_FOLDER:/jar/lxzn_storage}
-#fileNCPath: ${NC_FOLDER:/jar/NC} # NC鏂囦欢浣嶇疆
-fileHomePath: ${UPLOAD_FOLDER:d://lxzn_storage}
-fileNCPath: ${NC_FOLDER:D://NC} # NC鏂囦欢浣嶇疆
-ncSend:
- addOrDelete: false #//鏄惁鍒犻櫎seed 涓殑涔嬪墠鏂囦欢
-#staticAccessPath: /api/ffile/** # 褰撳墠椤圭洰鐨勯潤鎬佽祫婧愯闂厤缃湪nginx涓�
-#宸ユ帶缃�/娑夊瘑缃戦儴缃茬浉鍏抽厤缃�------------閫氳繃鍏夌洏鎽嗘浮
-deploy:
- #宸ユ帶缃�/娑夊瘑缃戦儴缃� 0涓烘秹瀵嗙綉 1涓哄伐鎺х綉
- deployType: 0
- #娑夊瘑缃戜紶杈搉c鏂囦欢澶�
- secretFolder: D:\\opt
- #宸ユ帶缃戠洃鎺c鏂囦欢澶�
- workFolder: D:\\opt
+# SAP RFC鏂瑰紡鎺ュ彛闆嗘垚
sap:
rfc:
destination: SAP_RFC_DEST # 鑷畾涔夌殑鐩爣鍦板潃 RFC 鐩爣鍚嶇О
diff --git a/src/main/resources/application-dm8.yml b/src/main/resources/application-dm8.yml
deleted file mode 100644
index 1e77a30..0000000
--- a/src/main/resources/application-dm8.yml
+++ /dev/null
@@ -1,239 +0,0 @@
-server:
- port: 8080
- tomcat:
- max-swallow-size: -1
- error:
- include-exception: true
- include-stacktrace: ALWAYS
- include-message: ALWAYS
- servlet:
- context-path: /
- compression:
- enabled: true
- min-response-size: 1024
- mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
-
-management:
- endpoints:
- web:
- exposure:
- include: metrics,httptrace
-
-spring:
- servlet:
- multipart:
- max-file-size: 10MB
- max-request-size: 10MB
- mail:
- host: smtp.163.com
- username: jeecgos@163.com
- password: ??
- properties:
- mail:
- smtp:
- auth: true
- starttls:
- enable: true
- required: true
- ## quartz瀹氭椂浠诲姟,閲囩敤鏁版嵁搴撴柟寮�
- quartz:
- job-store-type: jdbc
- jdbc:
- initialize-schema: never
- auto-startup: true
- #鍚姩鏃舵洿鏂板繁瀛樺湪鐨凧ob
- overwrite-existing-jobs: true
- #json 鏃堕棿鎴崇粺涓�杞崲
- jackson:
- date-format: yyyy-MM-dd HH:mm:ss
- time-zone: GMT+8
- jpa:
- open-in-view: false
- properties:
- hibernate:
- dialect: org.hibernate.dialect.Oracle8iDialect
- aop:
- proxy-target-class: true
- #閰嶇疆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: /**
- resource:
- static-locations: classpath:/static/,classpath:/public/
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- druid:
- # 鍒濆杩炴帴鏁�
- initialSize: 5
- # 鏈�灏忚繛鎺ユ睜鏁伴噺
- minIdle: 5
- # 鏈�澶ц繛鎺ユ睜鏁伴噺
- maxActive: 10
- stat-view-servlet:
- enabled: true
- loginUsername: admin
- loginPassword: 123456
- allow:
- web-stat-filter:
- enabled: true
- driverClassName: dm.jdbc.driver.DmDriver
- url: jdbc:dm://127.0.0.1:5236/?JEECG&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
- username: ??
- password: ??
- validationQuery: SELECT 1 FROM DUAL
- #redis 閰嶇疆
- redis:
- database: 0
- host: 127.0.0.1
- port: 6379
- password: ''
-#mybatis plus 璁剧疆
-mybatis-plus:
- mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
- global-config:
- # 鍏抽棴MP3.0鑷甫鐨刡anner
- banner: false
- db-config:
- #涓婚敭绫诲瀷 0:"鏁版嵁搴揑D鑷",1:"璇ョ被鍨嬩负鏈缃富閿被鍨�", 2:"鐢ㄦ埛杈撳叆ID",3:"鍏ㄥ眬鍞竴ID (鏁板瓧绫诲瀷鍞竴ID)", 4:"鍏ㄥ眬鍞竴ID UUID",5:"瀛楃涓插叏灞�鍞竴ID (idWorker 鐨勫瓧绗︿覆琛ㄧず)";
- id-type: ASSIGN_ID
- # 榛樿鏁版嵁搴撹〃涓嬪垝绾垮懡鍚�
- table-underline: true
- configuration:
- # 杩欎釜閰嶇疆浼氬皢鎵ц鐨剆ql鎵撳嵃鍑烘潵锛屽湪寮�鍙戞垨娴嬭瘯鐨勬椂鍊欏彲浠ョ敤
- #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
- # 杩斿洖绫诲瀷涓篗ap,鏄剧ずnull瀵瑰簲鐨勫瓧娈�
- call-setters-on-nulls: true
-#jeecg涓撶敤閰嶇疆
-jeecg:
- # 鏄惁鍚敤瀹夊叏妯″紡
- safeMode: false
- # 绛惧悕瀵嗛挜涓�(鍓嶅悗绔涓�鑷达紝姝ｅ紡鍙戝竷璇疯嚜琛屼慨鏀�)
- signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
- # 鏈湴锛歭ocal\Minio锛歮inio\闃块噷浜戯細alioss
- uploadType: alioss
- path:
- #鏂囦欢涓婁紶鏍圭洰褰� 璁剧疆
- upload: D://opt//upFiles
- #webapp鏂囦欢璺緞
- webapp: D://opt//webapp
- shiro:
- excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
- #闃块噷浜憃ss瀛樺偍閰嶇疆
- oss:
- accessKey: ??
- secretKey: ??
- endpoint: oss-cn-beijing.aliyuncs.com
- bucketName: ??
- # ElasticSearch 6璁剧疆
- elasticsearch:
- cluster-name: jeecg-ES
- cluster-nodes: 127.0.0.1:9200
- check-enabled: false
- # 鍦ㄧ嚎棰勮鏂囦欢鏈嶅姟鍣ㄥ湴鍧�閰嶇疆
- 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
- #鏄惁闇�瑕佹牎楠宼oken
- is_verify_token: false
- #蹇呴』鏍￠獙鏂规硶
- verify_methods: remove,delete,save,add,update
- #xxl-job閰嶇疆
- xxljob:
- enabled: false
- adminAddresses: http://127.0.0.1:9080/xxl-job-admin
- appname: ${spring.application.name}
- accessToken: ''
- address: 127.0.0.1:30007
- ip: 127.0.0.1
- port: 30007
- logPath: logs/jeecg/job/jobhandler/
- logRetentionDays: 30
- #鍒嗗竷寮忛攣閰嶇疆
- redisson:
- address: 127.0.0.1:6379
- password:
- type: STANDALONE
- enabled: true
-#cas鍗曠偣鐧诲綍
-cas:
- prefixUrl: http://cas.example.org:8443/cas
-#Mybatis杈撳嚭sql鏃ュ織
-logging:
- level:
- org.jeecg.modules.system.mapper: info
-#enable swagger
-swagger:
- enable: true
- production: false
- basic:
- enable: false
- username: jeecg
- password: jeecg1314
-#绗笁鏂圭櫥褰�
-justauth:
- enabled: true
- type:
- GITHUB:
- client-id: ??
- client-secret: ??
- redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/github/callback
- WECHAT_ENTERPRISE:
- client-id: ??
- client-secret: ??
- redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback
- agent-id: 1000002
- DINGTALK:
- client-id: ??
- client-secret: ??
- redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/dingtalk/callback
- WECHAT_OPEN:
- client-id: ??
- client-secret: ??
- redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_open/callback
- cache:
- type: default
- prefix: 'demo::'
- timeout: 1h
-#绗笁鏂笰PP瀵规帴
-third-app:
- enabled: true
- type:
- #浼佷笟寰俊
- WECHAT_ENTERPRISE:
- enabled: true
- #CORP_ID
- client-id: ??
- #SECRET
- client-secret: ??-ij8
- #鑷缓搴旂敤id
- agent-id: 1000004
- #鑷缓搴旂敤绉橀挜锛堟柊鐗堜紒寰渶瑕侀厤缃級
- agent-app-secret: ??
- #閽夐拤
- DINGTALK:
- enabled: false
- # appKey
- client-id: ??
- # appSecret
- client-secret: ??
- agent-id: ??
\ No newline at end of file
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 424cb23..48063b6 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -132,7 +132,7 @@
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
- url: jdbc:sqlserver://localhost:1433;databasename=LXZN_TEST_COMMON
+ url: jdbc:sqlserver://localhost:1433;databasename=LXZN_TEST_XHJ
username: sa
password: 123
driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
@@ -210,17 +210,6 @@
is_verify_token: true
#蹇呴』鏍￠獙鏂规硶
verify_methods: remove,delete,save,add,update
- #xxl-job閰嶇疆
- xxljob:
- enabled: false
- adminAddresses: http://127.0.0.1:9080/xxl-job-admin
- appname: ${spring.application.name}
- accessToken: ''
- address: 127.0.0.1:30007
- ip: 127.0.0.1
- port: 30007
- logPath: logs/jeecg/job/jobhandler/
- logRetentionDays: 30
#鍒嗗竷寮忛攣閰嶇疆
redisson:
address: 127.0.0.1:6379
@@ -291,4 +280,17 @@
client-id: ??
# appSecret
client-secret: ??
- agent-id: ??
\ No newline at end of file
+ agent-id: ??
+# SAP RFC鏂瑰紡鎺ュ彛闆嗘垚
+sap:
+ rfc:
+ destination: SAP_RFC_DEST # 鑷畾涔夌殑鐩爣鍦板潃 RFC 鐩爣鍚嶇О
+ ashost: 10.101.0.188 # SAP 涓绘満鍦板潃
+ sysnr: '00' # 绯荤粺缂栧彿
+ client: 800 # 瀹㈡埛绔紪鍙�
+ user: SLSAP_JK # 鐢ㄦ埛鍚�
+ passwd: 112233 # 瀵嗙爜
+ lang: ZH # 璇█
+ poolSize: 5 # 绾跨▼姹犳暟閲�
+ expirationTime: 10000 # 杩囨湡鏃堕棿
+ peekLimit: 10 # 宄板��
\ No newline at end of file
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 8556b6f..c674b0f 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -223,17 +223,6 @@
is_verify_token: true
#蹇呴』鏍￠獙鏂规硶
verify_methods: remove,delete,save,add,update
- #xxl-job閰嶇疆
- xxljob:
- enabled: false
- adminAddresses: http://127.0.0.1:9080/xxl-job-admin
- appname: ${spring.application.name}
- accessToken: ''
- address: 127.0.0.1:30007
- ip: 127.0.0.1
- port: 30007
- logPath: logs/jeecg/job/jobhandler/
- logRetentionDays: 30
#鍒嗗竷寮忛攣閰嶇疆
redisson:
address: 127.0.0.1:6379
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b396120..a543aab 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,5 +2,5 @@
application:
name: jeecg-system
profiles:
- # active: '@profile.name@'
- active: dev
+ active: '@profile.name@'
+# active: dev
--
Gitblit v1.9.3