gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

feat: 2.6.0

Browse Source 
1. 修复日志打印参数错误问题
This commit is contained in:
byteblogs168 2024-01-15 09:23:08 +08:00
parent 1e2f4d55bb
commit ba2bd3f6a5
4 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/context/SpringContext.java
View File

@ -32,8 +32,17 @@ public class SpringContext implements ApplicationContextAware {
public static synchronized <T> T getBean(String name) { public static synchronized <T> T getBean(String name) {
try { try {
return (T) CONTEXT.getBean(name); return (T) CONTEXT.getBean(name);
} catch (BeansException var2) { } catch (BeansException | NullPointerException exception) {
log.error(" BeanName:{} not exist，Exception => {}", name, var2.getMessage()); log.error(" BeanName:{} not exist，Exception => {}", name, exception.getMessage());
return null;
}
}
public static synchronized <T> T getBean(Class<T> requiredType) {
try {
return CONTEXT.getBean(requiredType);
} catch (BeansException | NullPointerException exception) {
log.error(" BeanName:{} not exist，Exception => {}", requiredType.getName(), exception.getMessage());
return null; return null;
} }
} }
@ -41,8 +50,8 @@ public class SpringContext implements ApplicationContextAware {
public static synchronized <T> T getBean(String name, Class<T> requiredType) { public static synchronized <T> T getBean(String name, Class<T> requiredType) {
try { try {
return CONTEXT.getBean(name, requiredType); return CONTEXT.getBean(name, requiredType);
} catch (BeansException | NullPointerException var3) { } catch (BeansException | NullPointerException exception) {
log.error(" BeanName:{} not exist，Exception => {}", name, var3.getMessage()); log.error(" BeanName:{} not exist，Exception => {}", name, exception.getMessage());
return null; return null;
} }
} }

19
easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/util/EnvironmentUtils.java
View File

@ -3,6 +3,8 @@ package com.aizuda.easy.retry.common.core.util;
import com.aizuda.easy.retry.common.core.context.SpringContext; import com.aizuda.easy.retry.common.core.context.SpringContext;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import java.util.Objects;
/** /**
* 获取环境信息 * 获取环境信息
* *
@ -10,8 +12,6 @@ import org.springframework.core.env.Environment;
* @date : 2021-12-01 14:27 * @date : 2021-12-01 14:27
*/ */
public class EnvironmentUtils { public class EnvironmentUtils {
private static final Environment environment = SpringContext.CONTEXT.getBean(Environment.class);
public static final String DEFAULT_ENV = "default "; public static final String DEFAULT_ENV = "default ";
/** /**
@ -21,8 +21,12 @@ public class EnvironmentUtils {
*/ */
public static Boolean getLogStatus() { public static Boolean getLogStatus() {
Environment environment = SpringContext.CONTEXT.getBean(Environment.class); Environment environment = SpringContext.getBean(Environment.class);
return environment.getProperty("easy.retry.log.status", Boolean.class, Boolean.TRUE); if (Objects.nonNull(environment)) {
return environment.getProperty("easy.retry.log.status", Boolean.class, Boolean.TRUE);
}
return Boolean.TRUE;
} }
/** /**
@ -32,6 +36,11 @@ public class EnvironmentUtils {
*/ */
public static String getActiveProfile() { public static String getActiveProfile() {
Environment environment = SpringContext.getBean(Environment.class);
if (Objects.isNull(environment)) {
return DEFAULT_ENV;
}
String[] activeProfiles = environment.getActiveProfiles(); String[] activeProfiles = environment.getActiveProfiles();
if (activeProfiles.length == 0) { if (activeProfiles.length == 0) {
return DEFAULT_ENV; return DEFAULT_ENV;
@ -39,7 +48,7 @@ public class EnvironmentUtils {
StringBuilder envs = new StringBuilder(); StringBuilder envs = new StringBuilder();
for (String activeProfile : activeProfiles) { for (String activeProfile : activeProfiles) {
envs.append(activeProfile + " "); envs.append(activeProfile).append(" ");
} }
return envs.toString(); return envs.toString();
} }

9
easy-retry-common/easy-retry-common-log/src/main/java/com/aizuda/easy/retry/common/log/Local.java
View File

@ -1,6 +1,5 @@
package com.aizuda.easy.retry.common.log; package com.aizuda.easy.retry.common.log;
import cn.hutool.core.util.StrUtil;
import com.aizuda.easy.retry.common.core.util.EnvironmentUtils; import com.aizuda.easy.retry.common.core.util.EnvironmentUtils;
import com.aizuda.easy.retry.common.log.lang.LogCaller; import com.aizuda.easy.retry.common.log.lang.LogCaller;
import com.aizuda.easy.retry.common.log.level.Level; import com.aizuda.easy.retry.common.log.level.Level;
@ -63,7 +62,7 @@ public final class Local {
return; return;
} }
debug(LogFactory.get(LogCaller.getCallerCaller()), format, false, arguments); debug(LogFactory.get(LogCaller.getCallerCaller()), format, arguments);
} }
/** /**
@ -127,7 +126,7 @@ public final class Local {
return; return;
} }
warn(LogFactory.get(LogCaller.getCallerCaller()), format, false, arguments); warn(LogFactory.get(LogCaller.getCallerCaller()), format, arguments);
} }
/** /**
@ -143,7 +142,7 @@ public final class Local {
return; return;
} }
warn(LogFactory.get(LogCaller.getCallerCaller()), e, StrUtil.format(format, arguments), false); warn(LogFactory.get(LogCaller.getCallerCaller()), e, format, arguments);
} }
/** /**
@ -235,7 +234,7 @@ public final class Local {
return; return;
} }
error(log, e, e.getMessage(), false); error(log, e, e.getMessage());
} }
/** /**

14
easy-retry-common/easy-retry-common-log/src/main/java/com/aizuda/easy/retry/common/log/Remote.java
View File

@ -127,7 +127,7 @@ public final class Remote {
return; return;
} }
warn(com.aizuda.easy.retry.common.log.LogFactory.get(LogCaller.getCallerCaller()), format, arguments); warn(LogFactory.get(LogCaller.getCallerCaller()), format, arguments);
} }
/** /**
@ -143,7 +143,7 @@ public final class Remote {
return; return;
} }
warn(com.aizuda.easy.retry.common.log.LogFactory.get(LogCaller.getCallerCaller()), e, StrUtil.format(format, arguments)); warn(LogFactory.get(LogCaller.getCallerCaller()), e, StrUtil.format(format, arguments));
} }
/** /**
@ -205,7 +205,7 @@ public final class Remote {
return; return;
} }
error(com.aizuda.easy.retry.common.log.LogFactory.get(LogCaller.getCallerCaller()), format, arguments); error(LogFactory.get(LogCaller.getCallerCaller()), format, arguments);
} }
/** /**
@ -221,7 +221,7 @@ public final class Remote {
return; return;
} }
error(com.aizuda.easy.retry.common.log.LogFactory.get(LogCaller.getCallerCaller()), e, format, arguments); error(LogFactory.get(LogCaller.getCallerCaller()), e, format, arguments);
} }
/** /**
@ -245,7 +245,7 @@ public final class Remote {
* @param format 格式文本，{} 代表变量 * @param format 格式文本，{} 代表变量
* @param arguments 变量对应的参数 * @param arguments 变量对应的参数
*/ */
public void error(com.aizuda.easy.retry.common.log.Log log, String format, Object... arguments) { public void error(Log log, String format, Object... arguments) {
if (!EnvironmentUtils.getLogStatus()) { if (!EnvironmentUtils.getLogStatus()) {
return; return;
} }
@ -261,7 +261,7 @@ public final class Remote {
* @param format 格式文本，{} 代表变量 * @param format 格式文本，{} 代表变量
* @param arguments 变量对应的参数 * @param arguments 变量对应的参数
*/ */
public void error(com.aizuda.easy.retry.common.log.Log log, Throwable e, String format, Object... arguments) { public void error(Log log, Throwable e, String format, Object... arguments) {
if (!EnvironmentUtils.getLogStatus()) { if (!EnvironmentUtils.getLogStatus()) {
return; return;
} }
@ -284,6 +284,6 @@ public final class Remote {
return; return;
} }
com.aizuda.easy.retry.common.log.LogFactory.get(LogCaller.getCallerCaller()).log(FQCN, level, t, format, true, arguments); LogFactory.get(LogCaller.getCallerCaller()).log(FQCN, level, t, format, true, arguments);
} }
} }