From a24095d096e7ab1f83e44aa8054d0f673db05b38 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期五, 07 三月 2025 09:09:40 +0800
Subject: [PATCH] Merge branch 'dev_dz' into dev
---
ruoyi-admin/src/main/resources/application.yml | 43 ++-----------------------------------------
1 files changed, 2 insertions(+), 41 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 8a825d3..54fd4cb 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -15,8 +15,8 @@
# 寮�鍙戠幆澧冮厤缃�
server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 8002
+ # 鏈嶅姟鍣ㄧ殑HTTP绔彛
+ port: 8001
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path: /
@@ -70,28 +70,6 @@
# restart:
# # 鐑儴缃插紑鍏�
# enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
- host: localhost
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 0
-# # 瀵嗙爜
-# password: root2022!
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
# token閰嶇疆
token:
@@ -108,11 +86,6 @@
supportMethodsArguments: true
params: count=countSql
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
-
# 闃叉XSS鏀诲嚮
xss:
# 杩囨护寮�鍏�
@@ -122,16 +95,4 @@
# 鍖归厤閾炬帴
urlPatterns: /system/*,/monitor/*,/tool/*
-# 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
--
Gitblit v1.9.3