From 889a33defcabfad89d23bac95afb6646d6edcc44 Mon Sep 17 00:00:00 2001
From: DongZeLiang <2746733890@qq.com>
Date: Fri, 12 Apr 2024 11:05:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=82=AE=E7=AE=B1=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 muyu-auth/src/main/resources/bootstrap.yml             |  6 +++---
 .../common/core/constant/ServiceNameConstants.java     |  6 +++---
 muyu-gateway/src/main/resources/bootstrap.yml          | 10 +++++-----
 .../muyu-file/src/main/resources/bootstrap.yml         |  6 +++---
 muyu-modules/muyu-gen/src/main/resources/bootstrap.yml |  6 +++---
 muyu-modules/muyu-job/src/main/resources/bootstrap.yml |  6 +++---
 .../muyu-system/src/main/resources/bootstrap.yml       |  6 +++---
 .../src/main/resources/mapper/system/SysUserMapper.xml |  2 +-
 .../muyu-monitor/src/main/resources/bootstrap.yml      |  6 +++---
 9 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/muyu-auth/src/main/resources/bootstrap.yml b/muyu-auth/src/main/resources/bootstrap.yml
index b309a3d..5255175 100644
--- a/muyu-auth/src/main/resources/bootstrap.yml
+++ b/muyu-auth/src/main/resources/bootstrap.yml
@@ -6,7 +6,7 @@ server:
 spring:
   application:
     # 应用名称
-    name: muyu-auth
+    name: ruoyi-auth
   profiles:
     # 环境配置
     active: dev
@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 101.34.243.166:8848
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 101.34.243.166:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java
index 25c918e..dbb4aca 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java
@@ -9,15 +9,15 @@ public class ServiceNameConstants {
     /**
      * 认证服务的serviceid
      */
-    public static final String AUTH_SERVICE = "muyu-auth";
+    public static final String AUTH_SERVICE = "ruoyi-auth";
 
     /**
      * 系统模块的serviceid
      */
-    public static final String SYSTEM_SERVICE = "muyu-system";
+    public static final String SYSTEM_SERVICE = "ruoyi-system";
 
     /**
      * 文件服务的serviceid
      */
-    public static final String FILE_SERVICE = "muyu-file";
+    public static final String FILE_SERVICE = "ruoyi-file";
 }
diff --git a/muyu-gateway/src/main/resources/bootstrap.yml b/muyu-gateway/src/main/resources/bootstrap.yml
index d7367b4..9a9446e 100644
--- a/muyu-gateway/src/main/resources/bootstrap.yml
+++ b/muyu-gateway/src/main/resources/bootstrap.yml
@@ -6,7 +6,7 @@ server:
 spring:
   application:
     # 应用名称
-    name: muyu-gateway
+    name: ruoyi-gateway
   profiles:
     # 环境配置
     active: dev
@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 101.34.243.166:8848
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 101.34.243.166:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -28,12 +28,12 @@ spring:
       eager: true
       transport:
         # 控制台地址
-        dashboard: 127.0.0.1:8718
+        dashboard: 101.34.243.166:8718
       # nacos配置持久化
       datasource:
         ds1:
           nacos:
-            server-addr: 127.0.0.1:8848
+            server-addr: 101.34.243.166:8848
             dataId: sentinel-muyu-gateway
             groupId: DEFAULT_GROUP
             data-type: json
diff --git a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml b/muyu-modules/muyu-file/src/main/resources/bootstrap.yml
index 0cb85bd..c1799b0 100644
--- a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml
+++ b/muyu-modules/muyu-file/src/main/resources/bootstrap.yml
@@ -6,7 +6,7 @@ server:
 spring:
   application:
     # 应用名称
-    name: muyu-file
+    name: ruoyi-file
   profiles:
     # 环境配置
     active: dev
@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 101.34.243.166:8848
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 101.34.243.166:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml b/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml
index b628931..6989895 100644
--- a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml
+++ b/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml
@@ -6,7 +6,7 @@ server:
 spring:
   application:
     # 应用名称
-    name: muyu-gen
+    name: ruoyi-gen
   profiles:
     # 环境配置
     active: dev
@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 101.34.243.166:8848
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 101.34.243.166:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml b/muyu-modules/muyu-job/src/main/resources/bootstrap.yml
index 618f3e8..d996b59 100644
--- a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml
+++ b/muyu-modules/muyu-job/src/main/resources/bootstrap.yml
@@ -6,7 +6,7 @@ server:
 spring:
   application:
     # 应用名称
-    name: muyu-job
+    name: ruoyi-job
   profiles:
     # 环境配置
     active: dev
@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 101.34.243.166:8848
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 101.34.243.166:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml b/muyu-modules/muyu-system/src/main/resources/bootstrap.yml
index a66fd4c..3cb5fbb 100644
--- a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml
+++ b/muyu-modules/muyu-system/src/main/resources/bootstrap.yml
@@ -6,7 +6,7 @@ server:
 spring:
   application:
     # 应用名称
-    name: muyu-system
+    name: ruoyi-system
   profiles:
     # 环境配置
     active: dev
@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 101.34.243.166:8848
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 101.34.243.166:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml
index 6f633b7..3f13290 100644
--- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -152,7 +152,7 @@
 
     <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
         <include refid="selectUserVo"/>
-        where u.user_name = #{userName} and u.del_flag = '0'
+        where u.user_name = #{userName} or u.email=#{userName} and u.del_flag = '0'
     </select>
 
     <select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
diff --git a/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml b/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml
index 1276c8e..62efe1a 100644
--- a/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml
+++ b/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml
@@ -6,7 +6,7 @@ server:
 spring:
   application:
     # 应用名称
-    name: muyu-monitor
+    name: ruoyi-monitor
   profiles:
     # 环境配置
     active: dev
@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 101.34.243.166:8848
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 101.34.243.166:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置