From d866e43afbe901bfc640776e02f767b9045acbc2 Mon Sep 17 00:00:00 2001
From: 赵文轩 <1652863494@qq.com>
Date: 星期三, 12 六月 2024 09:04:56 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peis
---
ltkj-admin/src/main/resources/application.yml | 70 +++++++++++++++++++---------------
1 files changed, 39 insertions(+), 31 deletions(-)
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index 8cb4587..7fc75bc 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -11,8 +11,8 @@
# 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ltkj/uploadPath锛孡inux閰嶇疆 /home/ltkj/uploadPath锛�
# 鐢ㄦ埛鎹㈠ご鍍忓悗鐨勫浘鐗囧瓨鍌ㄥ湴鍧� 娴嬭瘯锛欴:\ltkj\uploadPath\avatar\2022\12\14
#profile: D:/ltkj/uploadPath
-# profile: https://ltpeis.xaltjdkj.cn:5502/uploadPath
- profile: http://192.168.0.5:5502/uploadPath
+ profile: https://ltpeis.xaltjdkj.cn:5502/uploadPath
+# profile: http://192.168.0.5:5502/uploadPath
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: true
@@ -70,30 +70,33 @@
restart:
# 鐑儴缃插紑鍏�
enabled: true
+# cache:
+# type: ehcache
+
# redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 101.42.27.146
- host: localhost
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 0
- # 瀵嗙爜
-# password: 654321
- password: 123456
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 120s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
+# redis:
+# # 鍦板潃
+## host: 101.42.27.146
+# host: localhost
+# # 绔彛锛岄粯璁や负6379
+# port: 6379
+# # 鏁版嵁搴撶储寮�
+# database: 0
+# # 瀵嗙爜
+## password: 654321
+# password: 123456
+# # 杩炴帴瓒呮椂鏃堕棿
+# timeout: 120s
+# lettuce:
+# pool:
+# # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+# min-idle: 0
+# # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
+# max-idle: 8
+# # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
+# max-active: 8
+# # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
+# max-wait: -1ms
# 閭欢
mail:
# from 瑕佸拰 username 涓�鑷�, 鍚﹀垯鎶ラ敊
@@ -176,12 +179,17 @@
# 浣撴鎶ュ憡妯℃澘鍜屾姤鍛婁复鏃剁敓鎴愬瓨鍌ㄧ殑鏂囦欢澶硅矾寰�
path:
filePath: D:\Tjreport
+ # nginx鍥剧墖鏈嶅姟鍣�
+ reportServer: https://ltpeis.xaltjdkj.cn:5516/
+
# 浣撴濂楅鍜岃疆鎾浘瀛樺偍璺緞
photoPath: D:\AppPhoto\uploadPath\
# nginx鍥剧墖鏈嶅姟鍣�
-#photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
-photoServer: http://192.168.0.5:5502/uploadPath/
+photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
+#photoServer: http://192.168.0.5:5502/uploadPath/
+
+
# 寰俊灏忕▼搴廰ppid secret
xcx:
@@ -205,8 +213,8 @@
#key-path: E:\mycode\apppwd\1643225121_20230427_cert\apiclient_cert.p12 #鏈湴璇佷功璺緞锛屽湪寰俊鍟嗘埛鍚庡彴涓嬭浇
key-path: D:\WXCertUtil\tjcert\apiclient_cert.p12 #鏈嶅姟鍣ㄨ瘉涔﹁矾寰勶紝鍦ㄥ井淇″晢鎴峰悗鍙颁笅杞�
# pay-score-notify-url: http://192.168.0.101:5011/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
- pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
-# pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
+# pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
+ pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin/cus/order/pay-notify #寰俊鏀粯鍥炶皟鍦板潃
#绉湪鎶ヨ〃璁块棶鍦板潃
jimu:
@@ -215,7 +223,7 @@
path: http://192.168.0.5:5000/ltkj-admin
# path: http://10.168.0.9:5011
# path: http://192.168.0.105:5011
-# path: http://192.168.0.99:8081/ltkj-admin
+# path: http://192.168.1.113:5011
jeecg :
@@ -230,4 +238,4 @@
# prot = 3306
# name = ltkjpeis10
# username = root
-# password = Root_ltkj123
\ No newline at end of file
+# password = Root_ltkj123
--
Gitblit v1.8.0