From f4d2b41a462efdef2a0b2766c3b501dee666075c Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 02 七月 2025 21:31:36 +0800
Subject: [PATCH] yxh
---
ruoyi-admin/pom.xml | 4 ++--
ruoyi-admin/src/main/resources/application-druid.yml | 11 ++++++++---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/enums/PersonType.java | 2 --
ruoyi-admin/src/main/resources/application.yml | 27 +--------------------------
4 files changed, 11 insertions(+), 33 deletions(-)
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 4ac2af2..d6d37cc 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -8,8 +8,8 @@
<version>3.7.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>war</packaging>
- <!-- <packaging>jar</packaging>-->
+<!-- <packaging>war</packaging>-->
+ <packaging>jar</packaging>
<artifactId>smartor-opo</artifactId>
<description>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/enums/PersonType.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/enums/PersonType.java
index a88221f..7728d9c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/enums/PersonType.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/enums/PersonType.java
@@ -1,7 +1,5 @@
package com.ruoyi.web.controller.enums;
-import com.ruoyi.common.enums.OrganEnum;
-
/**
* 鐢ㄦ埛绫诲瀷
*
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 511528e..fc5d445 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,10 +6,15 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- # # 寮�鍙戠幆澧�
- url: jdbc:mysql://116.62.18.175:6002/opo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+ # 寮�鍙戠幆澧�-浜戞湇鍔″櫒
+# url: jdbc:mysql://116.62.18.175:6002/opo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+# username: opo
+# password: opo@2022
+
+ # 寮�鍙戠幆澧�-鏈湴
+ url: jdbc:mysql://127.0.0.1:3306/smartor_opo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: opo
- password: opo@2022
+ password: Smartor.2023
# 浠庡簱鏁版嵁婧�
slave:
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index b6f5a84..2ca96de 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -53,7 +53,7 @@
# 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
basename: i18n/messages
profiles:
- active: srm
+ active: druid
# 鏂囦欢涓婁紶
servlet:
multipart:
@@ -70,32 +70,7 @@
output:
ansi:
enabled: ALWAYS
- # redis 閰嶇疆
- redis:
-# # 鍦板潃銆佸瘑鐮併�佺鍙ｏ紙榛樿涓�6379锛夛細鍖婚櫌鐜
-# host: 129.88.242.37
-# password: jqserver
-# port: 6379
- # 鍦板潃銆佸瘑鐮併�佺鍙ｏ紙榛樿涓�6379锛夛細寮�鍙戠幆澧�
- host: 192.168.1.10
- password: Smartor
- port: 6020
-
- # 鏁版嵁搴撶储寮�
- database: 0
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
# token閰嶇疆
token:
--
Gitblit v1.9.3