From be3650017ea538b01569451a2a59c277e399e0c4 Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期二, 25 八月 2026 09:10:10 +0800 Subject: [PATCH] feat(admin)：删除对接中天相关系统的配置，避免误调用 --- /dev/null | 184 ------------------------------------ ruoyi-admin/src/main/resources/application-test.yml | 36 +++--- ruoyi-admin/src/main/resources/application-druid.yml | 36 +++--- 3 files changed, 36 insertions(+), 220 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 530a2b5..eea7b54 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -135,35 +135,35 @@ # 浜轰簨绯荤粺 personnel: # 姝ｅ紡鍦板潃 - code: https://ztt-sso.ztt.cn/oauth2/token + code: # 瑁呭浜轰簨姝ｅ紡搴� - appId: 6f5f6a0c-2a01-4ef6-9e75-c8a6f0c2f044 - appSecret: 89b9c4735b1e5ee9d6a8544b9b38bb03 - companies: https://ztt-connector.ztt.cn/api/org/v1/companies - simple: https://ztt-connector.ztt.cn/api/org/v1/employees/simple?companyId= + appId: + appSecret: + companies: + simple: # 浜哄憳瀵嗙爜鑾峰彇 - password: https://ztt-connector.ztt.cn/api/org/v1/employees/original_pwd/ - department: https://ztt-connector.ztt.cn/api/org/v1/companies/companyId/departments - person: https://ztt-connector.ztt.cn/api/org/v1/employees/simple/ + password: + department: + person: # 浼佷笟寰俊閫氱煡 wechat: # 璐ㄩ噺鎶ユ閫氱煡 - examiningUrl: #https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=21993616-9966-4fe4-81b0-68e99a40c964 + examiningUrl: mes: ztzb: - ip: http://192.168.7.48:8100 - user: chen - password: u3QMBneOYFqgWoMYdWzjjg== + ip: + user: + password: ifs: - contract: ZTZB - contract-key-get: 4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo= - contract-key-post: 4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo= - custorder: http://192.168.20.47/PurchService.ashx? - custorder-port: http://192.168.20.47:8008/PurchService.ashx? - erp-services: http://192.168.20.47:8081 + contract: + contract-key-get: + contract-key-post: + custorder: + custorder-port: + erp-services: # 澶囨敞 18083瀵嗙爜锛歾ttZTT123!@ mqtt: diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml deleted file mode 100644 index 8830a70..0000000 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ /dev/null @@ -1,158 +0,0 @@ -# 鍏徃娴嬭瘯搴� - -# 鏁版嵁婧愰厤缃� -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.cj.jdbc.Driver - druid: - # 涓诲簱鏁版嵁婧� - master: - url: jdbc:mysql://114.132.189.42:9004/lims-ruoyi-test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: root - password: 123456 - # 浠庡簱鏁版嵁婧� - slave: - # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴 - enabled: false - url: - username: - password: - # 鍒濆杩炴帴鏁� - initialSize: 5 - # 鏈�灏忚繛鎺ユ睜鏁伴噺 - minIdle: 10 - # 鏈�澶ц繛鎺ユ睜鏁伴噺 - maxActive: 20 - # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂� - maxWait: 60000 - # 閰嶇疆杩炴帴瓒呮椂鏃堕棿 - connectTimeout: 30000 - # 閰嶇疆缃戠粶瓒呮椂鏃堕棿 - socketTimeout: 60000 - # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣 - timeBetweenEvictionRunsMillis: 60000 - # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣 - minEvictableIdleTimeMillis: 300000 - # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣 - maxEvictableIdleTimeMillis: 900000 - # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁� - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - webStatFilter: - enabled: true - statViewServlet: - enabled: true - # 璁剧疆鐧藉悕鍗曪紝涓嶅～鍒欏厑璁告墍鏈夎闂� - allow: - url-pattern: /druid/* - # 鎺у埗鍙扮鐞嗙敤鎴峰悕鍜屽瘑鐮� - login-username: ruoyi - login-password: 123456 - filter: - stat: - enabled: true - # 鎱QL璁板綍 - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: true - wall: - config: - multi-statement-allow: true - - # redis 閰嶇疆 - redis: - # 鍦板潃 - host: localhost - # 绔彛锛岄粯璁や负6379 - port: 6379 - # 鏁版嵁搴撶储寮� - database: 1 - # 瀵嗙爜 - password: root2022! - # 杩炴帴瓒呮椂鏃堕棿 - timeout: 10s - lettuce: - pool: - # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺� - min-idle: 0 - # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺� - max-idle: 8 - # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁� - max-active: 8 - # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級 - max-wait: -1ms - -# mybatis-plus閰嶇疆 -mybatis-plus: - mapper-locations: classpath*:mapper/**/*Mapper.xml - type-aliases-package: com.ruoyi.**.domain - global-config: - banner: off - db-config: - id-type: auto - configuration: - map-underscore-to-camel-case: true - cache-enabled: false - log-impl: # org.apache.ibatis.logging.stdout.StdOutImpl - -# 鏃ュ織閰嶇疆 -logging: - file-location: /javaWork/lims-ruoyi - level: - com.ruoyi: info - org.springframework: warn - -# Swagger閰嶇疆 -swagger: - # 鏄惁寮�鍚痵wagger - enabled: true - -minio: - endpoint: http://114.132.189.42/ - port: 7019 - secure: false - accessKey: admin - secretKey: 12345678 - preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂 - -# 鐓х墖瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++ -file: - path: /javaWork/lims-ruoyi/file/img - # 涓婁紶鏂囦欢鍏佽鐨勬墿灞曞悕 - allowed: png,jpg,jpeg,gif - -wordUrl: /javaWork/lims-ruoyi/file/word - - -#oa: -# oaHost: http://192.168.0.49:8000/oa_workflowrequest.asmx?wsdl -# prodIp: http://192.168.21.53:8081 -# unqualifiedProcessId: 41974 - -wechat: - # 璐ㄩ噺鎶ユ閫氱煡 - examiningUrl: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=21993616-9966-4fe4-81b0-68e99a40c964 - -ifs: - contract: ZTZB - contract-key-get: 4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo= - contract-key-post: 4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo= - custorder: http://192.168.20.47/PurchService.ashx? - custorder-port: http://192.168.20.47:8008/PurchService.ashx? - erp-services: http://192.168.20.47:8081 - -# 澶囨敞 18083瀵嗙爜锛歾ttZTT123!@ -mqtt: - url: tcp://mqtt-ztt.zttiot.com:1883 # 鏈嶅姟鍣╥p - username: forwarder # MQTT-鏈嶅姟绔�-鐢ㄦ埛鍚�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍鍚� - password: ZTlink12345 # MQTT-鏈嶅姟绔�-瀵嗙爜锛�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍瀵嗙爜 - timeout: 100 # 瓒呮椂鏃堕棿 锛堝崟浣嶏細绉掞級 - keepalive: 60 # 蹇冭烦 锛堝崟浣嶏細绉掞級 - qos: 1 # 蹇冭烦鍖呯骇鍒� - completion-timeout: 3000 # 杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶏細绉掞級 - clientId: javaPublish # clientId - subscribe: /ztt/v3/2443521/publish # 璁㈤槄涓婚 - client: false # 濡傛灉寮�鍙戦渶瑕佸惎鍔ㄦ祴璇曪紝闇�瑕佹敼涓篺alse涓嶇劧浼氫竴鐩存姤閿� diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml index 15072c7..e5ecbca 100644 --- a/ruoyi-admin/src/main/resources/application-test.yml +++ b/ruoyi-admin/src/main/resources/application-test.yml @@ -135,34 +135,34 @@ # 浜轰簨绯荤粺 personnel: # 姝ｅ紡鍦板潃 - code: https://ztt-sso.ztt.cn/oauth2/token + code: # 瑁呭浜轰簨姝ｅ紡搴� - appId: 6f5f6a0c-2a01-4ef6-9e75-c8a6f0c2f044 - appSecret: 89b9c4735b1e5ee9d6a8544b9b38bb03 - companies: https://ztt-connector.ztt.cn/api/org/v1/companies - simple: https://ztt-connector.ztt.cn/api/org/v1/employees/simple?companyId= + appId: + appSecret: + companies: + simple: # 浜哄憳瀵嗙爜鑾峰彇 - password: https://ztt-connector.ztt.cn/api/org/v1/employees/original_pwd/ - department: https://ztt-connector.ztt.cn/api/org/v1/companies/companyId/departments - person: https://ztt-connector.ztt.cn/api/org/v1/employees/simple/ + password: + department: + person: wechat: # 璐ㄩ噺鎶ユ閫氱煡 - examiningUrl: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=21993616-9966-4fe4-81b0-68e99a40c964 + examiningUrl: mes: ztzb: - ip: http://192.168.7.48:8100 - user: chen - password: u3QMBneOYFqgWoMYdWzjjg== + ip: + user: + password: ifs: - contract: ZTZB - contract-key-get: 4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo= - contract-key-post: 4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo= - custorder: http://192.168.20.47/PurchService.ashx? - custorder-port: http://192.168.20.47:8008/PurchService.ashx? - erp-services: http://192.168.20.47:8081 + contract: + contract-key-get: + contract-key-post: + custorder: + custorder-port: + erp-services: # 澶囨敞 18083瀵嗙爜锛歾ttZTT123!@ mqtt: diff --git a/ruoyi-admin/src/main/resources/application-ztzb.yml b/ruoyi-admin/src/main/resources/application-ztzb.yml deleted file mode 100644 index 59d6c2a..0000000 --- a/ruoyi-admin/src/main/resources/application-ztzb.yml +++ /dev/null @@ -1,184 +0,0 @@ -# 瑁呭姝ｅ紡搴� - -# 鏁版嵁婧愰厤缃� -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.cj.jdbc.Driver - druid: - # 涓诲簱鏁版嵁婧� - master: - url: jdbc:mysql://127.0.0.1:3306/center-lims?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: root - password: ~u8jSK784jMKJur7 -# 鍙鐢ㄦ埛鏉冮檺 -# username: readonly -# password: zttZTT123@@ - - # 浠庡簱鏁版嵁婧� - slave: - # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴 - enabled: false - url: - username: - password: - # 鍒濆杩炴帴鏁� - initialSize: 5 - # 鏈�灏忚繛鎺ユ睜鏁伴噺 - minIdle: 10 - # 鏈�澶ц繛鎺ユ睜鏁伴噺 - maxActive: 200 - # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂� - maxWait: 60000 - # 閰嶇疆杩炴帴瓒呮椂鏃堕棿 - connectTimeout: 30000 - # 閰嶇疆缃戠粶瓒呮椂鏃堕棿 - socketTimeout: 60000 - # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣 - timeBetweenEvictionRunsMillis: 60000 - # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣 - minEvictableIdleTimeMillis: 300000 - # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣 - maxEvictableIdleTimeMillis: 900000 - # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁� - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - webStatFilter: - enabled: true - statViewServlet: - enabled: true - # 璁剧疆鐧藉悕鍗曪紝涓嶅～鍒欏厑璁告墍鏈夎闂� - allow: - url-pattern: /druid/* - # 鎺у埗鍙扮鐞嗙敤鎴峰悕鍜屽瘑鐮� - login-username: ztzb_lims - login-password: ^60RkNBrAH7!6n) - filter: - stat: - enabled: true - # 鎱QL璁板綍 - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: true - wall: - config: - multi-statement-allow: true - - # redis 閰嶇疆 - redis: - # 鍦板潃 - host: localhost - # 绔彛锛岄粯璁や负6379 - port: 6379 - # 鏁版嵁搴撶储寮� - database: 0 - # # 瀵嗙爜 - password: iHDR^6&Z8Oj_2Mx - # 杩炴帴瓒呮椂鏃堕棿 - timeout: 10s - lettuce: - pool: - # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺� - min-idle: 0 - # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺� - max-idle: 8 - # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁� - max-active: 8 - # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級 - max-wait: -1ms - -# mybatis-plus閰嶇疆 -mybatis-plus: - mapper-locations: classpath*:mapper/**/*Mapper.xml - type-aliases-package: com.ruoyi.**.domain - global-config: - banner: off - db-config: - id-type: auto - configuration: - map-underscore-to-camel-case: true - cache-enabled: false - log-impl: # org.apache.ibatis.logging.stdout.StdOutImpl - -# 鏃ュ織閰嶇疆 -logging: - file-location: /center-lims/after/logs - level: - com.ruoyi: info - org.springframework: warn - -# Swagger閰嶇疆 -swagger: - # 鏄惁寮�鍚痵wagger - enabled: false - -# minio瀹瑰櫒绠＄悊 -minio: - endpoint: http://114.132.189.42/ - port: 7019 - secure: false - accessKey: admin - secretKey: 12345678 - preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂 - -# 鐓х墖瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++ -file: - path: /center-lims/after/file/img - # 涓婁紶鏂囦欢鍏佽鐨勬墿灞曞悕 - allowed: png,jpg,jpeg,gif -# 鎶ュ憡鍦板潃 -wordUrl: /center-lims/after/file/word - -# oa娴佺▼ -oa: - oaHost: http://192.168.0.49:8000/oa_workflowrequest.asmx?wsdl - prodIp: http://192.168.21.53:8001/lims - unqualifiedProcessId: 41974 - -# 浼佷笟寰俊鎺ㄩ�� -wechat: - # 璐ㄩ噺鎶ユ閫氱煡 - examiningUrl: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=6e1d2d18-0c60-4889-a05f-b1b5479c9188 - -mes: - ztzb: - ip: http://192.168.7.46 - user: lims - password: qCzOMJlqE8TYOHDWGva/Tw== - -# 浜轰簨绯荤粺 -personnel: - # 姝ｅ紡鍦板潃 - code: https://ztt-sso.ztt.cn/oauth2/token - # 瑁呭浜轰簨姝ｅ紡搴� - appId: 6f5f6a0c-2a01-4ef6-9e75-c8a6f0c2f044 - appSecret: 89b9c4735b1e5ee9d6a8544b9b38bb03 - companies: https://ztt-connector.ztt.cn/api/org/v1/companies - simple: https://ztt-connector.ztt.cn/api/org/v1/employees/simple?companyId= - # 浜哄憳瀵嗙爜鑾峰彇 - password: https://ztt-connector.ztt.cn/api/org/v1/employees/original_pwd/ - department: https://ztt-connector.ztt.cn/api/org/v1/companies/companyId/departments - person: https://ztt-connector.ztt.cn/api/org/v1/employees/simple/ - -ifs: - contract: ZTZB - contract-key-get: x%2bvbGReagnsK%2fDr45xkVcGLOh%2fWWGODQ2inBGeNwbZw%3d - contract-key-post: x+vbGReagnsK/Dr45xkVcGLOh/WWGODQ2inBGeNwbZw= - custorder: http://192.168.20.50/PurchService.ashx? - custorder-port: http://192.168.20.50:8008/PurchService.ashx? - erp-services: http://192.168.20.50:8081 - -# 澶囨敞 18083瀵嗙爜锛歾ttZTT123!@ -mqtt: - url: tcp://mqtt-ztt.zttiot.com:1883 # 鏈嶅姟鍣╥p - username: forwarder # MQTT-鏈嶅姟绔�-鐢ㄦ埛鍚�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍鍚� - password: ZTlink12345 # MQTT-鏈嶅姟绔�-瀵嗙爜锛�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍瀵嗙爜 - timeout: 100 # 瓒呮椂鏃堕棿 锛堝崟浣嶏細绉掞級 - keepalive: 60 # 蹇冭烦 锛堝崟浣嶏細绉掞級 - qos: 1 # 蹇冭烦鍖呯骇鍒� - completion-timeout: 3000 # 杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶏細绉掞級 - clientId: javaPublish # clientId - subscribe: /ztt/v3/2443521/publish # 璁㈤槄涓婚 - client: true # 濡傛灉寮�鍙戦渶瑕佸惎鍔ㄦ祴璇曪紝闇�瑕佹敼涓篺alse涓嶇劧浼氫竴鐩存姤閿� -- Gitblit v1.9.3