031026
/
server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加邮箱登录

main
DongZeLiang 2024-04-12 11:05:02 +08:00 committed by 031026
parent 10341472e9
commit 889a33defc
9 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
muyu-auth/src/main/resources/bootstrap.yml
View File

@ -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
# 共享配置

6
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java
View File

@ -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";
}

10
muyu-gateway/src/main/resources/bootstrap.yml
View File

@ -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

6
muyu-modules/muyu-file/src/main/resources/bootstrap.yml
View File

@ -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
# 共享配置

6
muyu-modules/muyu-gen/src/main/resources/bootstrap.yml
View File

@ -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
# 共享配置

6
muyu-modules/muyu-job/src/main/resources/bootstrap.yml
View File

@ -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
# 共享配置

6
muyu-modules/muyu-system/src/main/resources/bootstrap.yml
View File

@ -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
# 共享配置

2
muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -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">

6
muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml
View File

@ -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
# 共享配置