From d42096fd55c4b0caf84bb4f208b4e17534e158c1 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 21 五月 2026 15:34:49 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/opo-qd

---
 ruoyi-admin/src/main/resources/application.yml |   17 ++++-------------
 1 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 67df68c..74eac1d 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -8,15 +8,6 @@
   copyrightYear: 2021
   # 瀹炰緥婕旂ず寮�鍏�
   demoEnabled: true
-  # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
-  # 寮�鍙戠幆澧� window
-  #  profile: D:/lihusoft/OPO/WEB/Upload
-  # 寮�鍙戠幆澧� linux
-  #  profile: /home/smartor/uploadFile
-  # 鍖婚櫌鐜
-  profile: D:/OPO/WEB/Upload
-  # 褰掓。璺緞
-  archived: D:/OPO/WEB/archived/
   # 鑾峰彇ip鍦板潃寮�鍏�
   addressEnabled: false
   # 楠岃瘉鐮佺被鍨� math 鏁扮粍璁＄畻 char 瀛楃楠岃瘉
@@ -24,8 +15,8 @@
 
 # 寮�鍙戠幆澧冮厤缃�
 server:
-  # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
-  port: 8080
+  # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负9095
+  port: 9095
   servlet:
     # 搴旂敤鐨勮闂矾寰�
     context-path: /
@@ -53,7 +44,7 @@
     # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
     basename: i18n/messages
   profiles:
-    active: druid
+    active: prod
   # 鏂囦欢涓婁紶
   servlet:
     multipart:
@@ -99,7 +90,7 @@
       logic-delete-value: 1 # 閫昏緫宸插垹闄ゅ��(榛樿涓� 1)
       logic-not-delete-value: 0 # 閫昏緫鏈垹闄ゅ��(榛樿涓� 0)
 #      update-strategy: IGNORED  #蹇界暐涓虹┖
-
+    call-setters-on-nulls: true
 
 # PageHelper鍒嗛〉鎻掍欢
 #pagehelper:

--
Gitblit v1.9.3