From 3ef1cf899c2bf558b934fd2c5dfdf0a970df8c43 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 29 八月 2025 15:22:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy
---
ruoyi-admin/src/main/resources/application.yml.example | 57 +++++++++++++++++++++++----------------------------------
1 files changed, 23 insertions(+), 34 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml.example b/ruoyi-admin/src/main/resources/application.yml.example
index 4ebf163..33a33b1 100644
--- a/ruoyi-admin/src/main/resources/application.yml.example
+++ b/ruoyi-admin/src/main/resources/application.yml.example
@@ -1,12 +1,3 @@
-minio:
- endpoint: lunor.cn
- port: 9000
- secure: false
- accessKey: admin
- secretKey: Admin123!
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: ruoyi # 榛樿瀛樺偍妗�
-
# 椤圭洰鐩稿叧閰嶇疆
ruoyi:
# 鍚嶇О
@@ -25,7 +16,7 @@
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 8081
+ port: 7016
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path: /
@@ -74,34 +65,13 @@
restart:
# 鐑儴缃插紑鍏�
enabled: false
- data:
- # redis 閰嶇疆
- redis:
- # 鍦板潃
- host: lunor.cn
- # 绔彛锛岄粯璁や负6379
- port: 6380
- # 鏁版嵁搴撶储寮�
- database: 0
- # 瀵嗙爜
- password: 123456
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
+
flyway:
- enabled: true
+ enabled: false
baseline-on-migrate: true
baseline-version: 20230720000000
clean-disabled: true
+ out-of-order: true
#鎸囧畾sql鏂囦欢璺緞
locations:
- classpath:db/migration/postgresql
@@ -130,9 +100,25 @@
supportMethodsArguments: true
params: count=countSql
+knife4j:
+ enable: true
+ setting:
+ language: zh_cn
+
+aixin:
+ swagger:
+ title: fk寮�鍙戝钩鍙�
+ description: 鎻愪緵绠＄悊鍚庡彴銆佺敤鎴� App 鐨勬墍鏈夊姛鑳�
+ version: ${ruoyi.version}
+ url: xxxx
+ email: qq.com
+ license: xxx
+ license-url: xxx
+
# Springdoc閰嶇疆
springdoc:
api-docs:
+ enabled: true
path: /v3/api-docs
swagger-ui:
enabled: true
@@ -152,3 +138,6 @@
excludes: /system/notice
# 鍖归厤閾炬帴
urlPatterns: /system/*,/monitor/*,/tool/*
+file:
+ temp-dir: D:/Backup/妗岄潰/download/temp/uploads
+ upload-dir: D:/Backup/妗岄潰/download/prod/uploads
--
Gitblit v1.9.3