From a854ee901ec35f92bd02fcfa04bb7146028e98ef Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期六, 05 七月 2025 16:20:34 +0800 Subject: [PATCH] 代码提交 --- ruoyi-admin/src/main/resources/application-druid.yml | 68 +++++++++++++++++++++++++-------- 1 files changed, 51 insertions(+), 17 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index bce7996..ee1857f 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,7 +6,7 @@ druid: # 涓诲簱鏁版嵁婧� master: - # 涔変箤浜岄櫌 + # 涔変箤浜岄櫌 # url: jdbc:mysql://127.0.0.1:3306/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # username: root # password: 123456 @@ -18,10 +18,10 @@ # password: Smartor.2023 # driverClassName: com.mysql.cj.jdbc.Driver # 娌冲崡 -# url: jdbc:mysql://127.0.0.1:3308/smartor_hn?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# username: root -# password: 123456 -# driverClassName: com.mysql.cj.jdbc.Driver + # url: jdbc:mysql://127.0.0.1:3308/smartor_hn?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + # username: root + # password: 123456 + # driverClassName: com.mysql.cj.jdbc.Driver # # 鏂板崕 # url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # username: smartor @@ -33,6 +33,12 @@ username: hxsoft password: Hxerp2000 driverClassName: com.mysql.cj.jdbc.Driver + +# # 楂樻柉鏁版嵁搴撻厤缃� +# url: jdbc:postgresql://127.0.0.1:5432/smartorlishui +# username: gaussdb +# password: Ls@123456 +# driverClassName: org.postgresql.Driver # 浠庡簱鏁版嵁婧� slave: @@ -90,6 +96,27 @@ wall: config: multi-statement-allow: true + # redis 閰嶇疆 + redis: + host: 127.0.0.1 + port: 6020 + + # 鏁版嵁搴撶储寮� + database: 0 + # 瀵嗙爜 + password: Smartor + # 杩炴帴瓒呮椂鏃堕棿 + timeout: 10s + lettuce: + pool: + # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺� + min-idle: 0 + # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺� + max-idle: 8 + # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁� + max-active: 8 + # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級 + max-wait: -1ms magic-api: web: /magic/web @@ -105,6 +132,13 @@ page: page default-page: 1 default-size: 10 + +# Swagger閰嶇疆 +swagger: + # 鏄惁寮�鍚痵wagger + enabled: true + # 璇锋眰鍓嶇紑 + pathMapping: /dev-api #閽夐拤鐨勫瘑閽� dingAppid: dingn8iip5ubj7clrrsv @@ -165,20 +199,20 @@ # 0浠h〃璧伴粯璁ょ殑涓婁紶 1 浠g爜璧版柊鍗庡尰闄㈢殑涓婁紶 uploadSwitch: 1 -## 鎸囧畾asr鍥炶皟鐨剈rl璺緞(鏈湴) -#ASRCallBackPath: http://192.168.2.13:8095/smartor/serviceSubtask/phoneCallBackYQ -##鎸傛柇IP(鏈湴) -#hangup: http://192.168.2.13:8091/hangup -##fs鎵�浣跨敤鐨勯樋閲岀殑app_key(鏈湴) -#app_key_yq: ZurNHpaQLq6P55YS - -# 鎸囧畾asr鍥炶皟鐨剈rl璺緞(鏂板崕) -ASRCallBackPath: http://192.168.101.135:8095/smartor/serviceSubtask/phoneCallBackYQ -#鎸傛柇IP(鏂板崕) -hangup: http://192.16.4.220:8091/hangup -#fs鎵�浣跨敤鐨勯樋閲岀殑app_key(鏂板崕) +# 鎸囧畾asr鍥炶皟鐨剈rl璺緞(鏈湴) +ASRCallBackPath: http://127.0.0.1:8095/smartor/serviceSubtask/phoneCallBackYQ +#鎸傛柇IP(鏈湴) +hangup: http://192.168.100.6:8089/hangup +#fs鎵�浣跨敤鐨勯樋閲岀殑app_key(鏈湴) app_key_yq: ZurNHpaQLq6P55YS +## 鎸囧畾asr鍥炶皟鐨剈rl璺緞(鏂板崕) +#ASRCallBackPath: http://192.168.101.135:8095/smartor/serviceSubtask/phoneCallBackYQ +##鎸傛柇IP(鏂板崕) +#hangup: http://192.16.4.220:8091/hangup +##fs鎵�浣跨敤鐨勯樋閲岀殑app_key(鏂板崕) +#app_key_yq: ZurNHpaQLq6P55YS + #鏈� 鍦� 鐭俊璇锋眰鍦板潃(杩欎釜鏈嶅姟鏄垜浠嚜宸卞啓鐨�) #xhsmsPath: http://192.168.2.13:8092/sendSms #鏂板崕鐭俊璇锋眰鍦板潃(杩欎釜鏈嶅姟鏄垜浠嚜宸卞啓鐨�) -- Gitblit v1.9.3