diff --git a/muyu-auth/src/main/java/com/muyu/auth/service/SysLoginService.java b/muyu-auth/src/main/java/com/muyu/auth/service/SysLoginService.java index ff0af1a..c7f48ce 100644 --- a/muyu-auth/src/main/java/com/muyu/auth/service/SysLoginService.java +++ b/muyu-auth/src/main/java/com/muyu/auth/service/SysLoginService.java @@ -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())) { diff --git a/muyu-auth/src/main/resources/bootstrap.yml b/muyu-auth/src/main/resources/bootstrap.yml index 2384037..6892785 100644 --- a/muyu-auth/src/main/resources/bootstrap.yml +++ b/muyu-auth/src/main/resources/bootstrap.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 # 共享配置 diff --git a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/aspect/LogAspect.java b/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/aspect/LogAspect.java index 4ecefc5..9699489 100644 --- a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/aspect/LogAspect.java +++ b/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/aspect/LogAspect.java @@ -58,7 +58,6 @@ public class LogAspect { public void boBefore (JoinPoint joinPoint, Log controllerLog) { TIME_THREADLOCAL.set(System.currentTimeMillis()); } - /** * 处理完请求后执行 * diff --git a/muyu-gateway/src/main/resources/bootstrap.yml b/muyu-gateway/src/main/resources/bootstrap.yml index a190313..5497192 100644 --- a/muyu-gateway/src/main/resources/bootstrap.yml +++ b/muyu-gateway/src/main/resources/bootstrap.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 # 共享配置 @@ -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 diff --git a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml b/muyu-modules/muyu-file/src/main/resources/bootstrap.yml index 5ff078d..023d6ce 100644 --- a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-file/src/main/resources/bootstrap.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 # 共享配置 diff --git a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml b/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml index 12840fd..4cf0e97 100644 --- a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-gen/src/main/resources/bootstrap.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 # 共享配置 diff --git a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml b/muyu-modules/muyu-job/src/main/resources/bootstrap.yml index ffad819..7478736 100644 --- a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-job/src/main/resources/bootstrap.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 # 共享配置 diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java index a8641a1..35cfb93 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java @@ -30,7 +30,7 @@ public class SysPermissionServiceImpl implements SysPermissionService { /** * 获取角色数据权限 * - * @param userId 用户Id + * @param * * @return 角色权限信息 */ diff --git a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml b/muyu-modules/muyu-system/src/main/resources/bootstrap.yml index 2b76dc1..42d46ce 100644 --- a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-system/src/main/resources/bootstrap.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 # 共享配置 diff --git a/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml b/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml index eef8ce8..3e6d7a1 100644 --- a/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml +++ b/muyu-visual/muyu-monitor/src/main/resources/bootstrap.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 # 共享配置