master
parent
813f5bdef8
commit
fba688b503
|
@ -71,11 +71,9 @@ public class SysLoginService {
|
|||
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在");
|
||||
throw new ServiceException("登录用户:" + username + " 不存在");
|
||||
}
|
||||
|
||||
if (Result.FAIL == userResult.getCode()) {
|
||||
throw new ServiceException(userResult.getMsg());
|
||||
}
|
||||
|
||||
LoginUser userInfo = userResult.getData();
|
||||
SysUser user = userResult.getData().getSysUser();
|
||||
if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
|
||||
|
|
|
@ -14,10 +14,10 @@ spring:
|
|||
nacos:
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 124.221.192.127:8848
|
||||
server-addr: 124.220.234.177:8848
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 124.221.192.127:8848
|
||||
server-addr: 124.220.234.177:8848
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
|
|
|
@ -58,7 +58,6 @@ public class LogAspect {
|
|||
public void boBefore (JoinPoint joinPoint, Log controllerLog) {
|
||||
TIME_THREADLOCAL.set(System.currentTimeMillis());
|
||||
}
|
||||
|
||||
/**
|
||||
* 处理完请求后执行
|
||||
*
|
||||
|
|
|
@ -14,10 +14,10 @@ spring:
|
|||
nacos:
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 124.221.192.127:8848
|
||||
server-addr: 124.220.234.177:8848
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 124.221.192.127:8848
|
||||
server-addr: 124.220.234.177:8848
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
|
@ -28,12 +28,12 @@ spring:
|
|||
eager: true
|
||||
transport:
|
||||
# 控制台地址
|
||||
dashboard: 124.221.192.127:8718
|
||||
dashboard: 124.220.234.177:8848
|
||||
# nacos配置持久化
|
||||
datasource:
|
||||
ds1:
|
||||
nacos:
|
||||
server-addr: 124.221.192.127:8848
|
||||
server-addr: 124.220.234.177:8848
|
||||
dataId: sentinel-muyu-gateway
|
||||
groupId: DEFAULT_GROUP
|
||||
data-type: json
|
||||
|
|
|
@ -14,10 +14,10 @@ spring:
|
|||
nacos:
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 124.221.192.127:8848
|
||||
server-addr: 124.220.234.177:8848
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 124.221.192.127:8848
|
||||
server-addr: 124.220.234.177:8848
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
|
|
|
@ -14,10 +14,10 @@ spring:
|
|||
nacos:
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 124.221.192.127:8848
|
||||
server-addr: 124.220.234.177:8848
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 124.221.192.127:8848
|
||||
server-addr: 124.220.234.177:8848
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
|
|
|
@ -14,10 +14,10 @@ spring:
|
|||
nacos:
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 124.221.192.127:8848
|
||||
server-addr: 124.220.234.177:8848
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 124.221.192.127:8848
|
||||
server-addr: 124.220.234.177:8848
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
|
|
|
@ -30,7 +30,7 @@ public class SysPermissionServiceImpl implements SysPermissionService {
|
|||
/**
|
||||
* 获取角色数据权限
|
||||
*
|
||||
* @param userId 用户Id
|
||||
* @param
|
||||
*
|
||||
* @return 角色权限信息
|
||||
*/
|
||||
|
|
|
@ -14,10 +14,10 @@ spring:
|
|||
nacos:
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 124.221.192.127:8848
|
||||
server-addr: 124.220.234.177:8848
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 124.221.192.127:8848
|
||||
server-addr: 124.220.234.177:8848
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Tomcat
|
||||
server:
|
||||
port: 9100
|
||||
port: 9001
|
||||
|
||||
# Spring
|
||||
spring:
|
||||
|
@ -14,10 +14,10 @@ spring:
|
|||
nacos:
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 124.221.192.127:8848
|
||||
server-addr: 124.220.234.177:8848
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 124.221.192.127:8848
|
||||
server-addr: 124.220.234.177:8848
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
|
|
Loading…
Reference in New Issue