diff --git a/bonus-auth/src/main/java/com/bonus/auth/service/PasswordValidatorService.java b/bonus-auth/src/main/java/com/bonus/auth/service/PasswordValidatorService.java index 749bca6..47fce67 100644 --- a/bonus-auth/src/main/java/com/bonus/auth/service/PasswordValidatorService.java +++ b/bonus-auth/src/main/java/com/bonus/auth/service/PasswordValidatorService.java @@ -286,6 +286,7 @@ public class PasswordValidatorService { } public void processLoginBlackList(SysUser user){ + if (true) {return;} // 获取黑名单列表 List> cacheList = redisService.getCacheObject(CacheConstants.SYS_LOGIN_BLACKIPLIST); diff --git a/bonus-auth/src/main/resources/bootstrap-material_mall_test.yml b/bonus-auth/src/main/resources/bootstrap-material_mall_test.yml index e82a002..4ce7935 100644 --- a/bonus-auth/src/main/resources/bootstrap-material_mall_test.yml +++ b/bonus-auth/src/main/resources/bootstrap-material_mall_test.yml @@ -10,15 +10,13 @@ spring: # 服务注册地址 # server-addr: 192.168.1.2:8848 server-addr: 14.103.246.124:8848 -# namespace: material_mall - namespace: material_mall_shanxi + namespace: material_mall ip: 192.168.0.69 config: # 配置中心地址 # server-addr: 192.168.1.2:8848 server-addr: 14.103.246.124:8848 -# namespace: material_mall - namespace: material_mall_shanxi + namespace: material_mall # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bonus-gateway/src/main/resources/bootstrap-material_mall_test.yml b/bonus-gateway/src/main/resources/bootstrap-material_mall_test.yml index fc15524..9241908 100644 --- a/bonus-gateway/src/main/resources/bootstrap-material_mall_test.yml +++ b/bonus-gateway/src/main/resources/bootstrap-material_mall_test.yml @@ -9,16 +9,14 @@ spring: discovery: # 服务注册地址 server-addr: 14.103.246.124:8848 -# namespace: material_mall - namespace: material_mall_shanxi + namespace: material_mall username: nacos password: nacos123 ip: 192.168.0.69 config: # 配置中心地址 server-addr: 14.103.246.124:8848 -# namespace: material_mall - namespace: material_mall_shanxi + namespace: material_mall username: nacos password: nacos123 # 配置文件格式 diff --git a/bonus-modules/bonus-file/src/main/resources/bootstrap-material_mall_test.yml b/bonus-modules/bonus-file/src/main/resources/bootstrap-material_mall_test.yml index 0262bad..36c8d1f 100644 --- a/bonus-modules/bonus-file/src/main/resources/bootstrap-material_mall_test.yml +++ b/bonus-modules/bonus-file/src/main/resources/bootstrap-material_mall_test.yml @@ -10,13 +10,11 @@ spring: # 服务注册地址 server-addr: 14.103.246.124:8848 namespace: material_mall -# namespace: material_mall_shanxi ip: 192.168.0.69 config: # 配置中心地址 server-addr: 14.103.246.124:8848 namespace: material_mall -# namespace: material_mall_shanxi # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysLogServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysLogServiceImpl.java index 841101a..a2e543c 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysLogServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysLogServiceImpl.java @@ -40,12 +40,11 @@ import java.util.Map; @Slf4j public class SysLogServiceImpl implements ISysLogService { + public final static String SUCCESS="成功"; @Value("${sql.schemaName}") private String schemaName; - @Resource(name = "SysLogMapper") private SysLogMapper mapper; - @Autowired private ApplicationEventPublisher eventPublisher; @@ -207,7 +206,7 @@ public class SysLogServiceImpl implements ISysLogService { } return R.ok("设置成功","设置成功"); } - public final static String SUCCESS="成功"; + /** * @param dto * @return @@ -287,8 +286,8 @@ public class SysLogServiceImpl implements ISysLogService { double bfb=0.9; String rl=mapper.getLogsRl(schemaName); String city=mapper.getLogsSet(); - Double d=Double.parseDouble(rl); - Double max=Double.parseDouble(city)*bfb; + double d=Double.parseDouble(rl); + double max=Double.parseDouble(city)*bfb; if(d>=max){ String warningEvent = "日志容量告警,当日日志内存为" +d+ "GB,日志内存超过总内存的90%,请及时处理!"; eventPublisher.publishEvent(new WaringLogEvent(new SysWarning("0",warningEvent,"",null,null, "1"))); diff --git a/bonus-modules/bonus-system/src/main/resources/bootstrap-material_mall_test.yml b/bonus-modules/bonus-system/src/main/resources/bootstrap-material_mall_test.yml index 26afc7b..452d7ea 100644 --- a/bonus-modules/bonus-system/src/main/resources/bootstrap-material_mall_test.yml +++ b/bonus-modules/bonus-system/src/main/resources/bootstrap-material_mall_test.yml @@ -10,15 +10,13 @@ spring: # 服务注册地址 # server-addr: 192.168.1.2:8848 server-addr: 14.103.246.124:8848 -# namespace: material_mall - namespace: material_mall_shanxi + namespace: material_mall ip: 192.168.0.69 config: # 配置中心地址 #server-addr: 192.168.1.2:8848 server-addr: 14.103.246.124:8848 -# namespace: material_mall - namespace: material_mall_shanxi + namespace: material_mall # 配置文件格式 file-extension: yml # 共享配置