java110
2022-01-14 c0e1925be3d355c3f1eec92b8aeb8b26824efd3a
优化代码
18个文件已修改
1个文件已添加
83 ■■■■ 已修改文件
java110-bean/src/main/java/com/java110/dto/system/SystemLogDto.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-core/src/main/java/com/java110/core/log/LogAgent.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-core/src/main/java/com/java110/core/log/LoggerFactory.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-interface/src/main/java/com/java110/config/feign/FeignConfiguration.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-service/src/main/java/com/java110/service/init/ServiceStartInit.java 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-acct/src/main/java/com/java110/acct/AcctServiceApplicationStart.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-api/src/main/java/com/java110/api/ApiApplicationStart.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-api/src/main/java/com/java110/api/listener/AbstractServiceApiListener.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-api/src/main/java/com/java110/api/rest/RestApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-common/src/main/java/com/java110/common/CommonServiceApplicationStart.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-community/src/main/java/com/java110/community/CommunityServiceApplicationStart.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-dev/src/main/java/com/java110/dev/DevServiceApplicationStart.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-fee/src/main/java/com/java110/fee/FeeServiceApplicationStart.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-job/src/main/java/com/java110/job/JobServiceApplication.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-oa/src/main/java/com/java110/oa/OaServiceApplicationStart.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-order/src/main/java/com/java110/order/OrderServiceApplicationStart.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-report/src/main/java/com/java110/report/ReportServiceApplicationStart.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-store/src/main/java/com/java110/store/StoreServiceApplicationStart.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-user/src/main/java/com/java110/user/UserServiceApplicationStart.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/dto/system/SystemLogDto.java
New file
@@ -0,0 +1,18 @@
package com.java110.dto.system;
/**
 * 系统日志
 */
public class SystemLogDto {
    private static String logSwatch = "logSwatch";
    private static String LOG_SWATCH_ON = "ON";
    public static boolean getLogSwatch() {
        return logSwatch == LOG_SWATCH_ON ? true : false;
    }
    public static void setLogSwatch(String logSwatch) {
        logSwatch = logSwatch;
    }
}
java110-core/src/main/java/com/java110/core/log/LogAgent.java
@@ -25,8 +25,7 @@
    public static final String LOG_STATUS_S = "S";
    public static final String LOG_STATUS_F = "F";
    private static String logSwatch = "logSwatch";
    private static String LOG_SWATCH_ON = "ON";
    /**
@@ -139,11 +138,5 @@
        return message;
    }
    public static boolean getLogSwatch() {
        return logSwatch == LogAgent.LOG_SWATCH_ON?true:false;
    }
    public static void setLogSwatch(String logSwatch) {
        LogAgent.logSwatch = logSwatch;
    }
}
java110-core/src/main/java/com/java110/core/log/LoggerFactory.java
@@ -1,5 +1,6 @@
package com.java110.core.log;
import com.java110.dto.system.SystemLogDto;
import org.slf4j.Logger;
import org.slf4j.Marker;
@@ -25,23 +26,23 @@
    @Override
    public boolean isTraceEnabled() {
        return LogAgent.getLogSwatch();
        return SystemLogDto.getLogSwatch();
    }
    @Override
    public boolean isDebugEnabled() {
        return LogAgent.getLogSwatch();
        return SystemLogDto.getLogSwatch();
    }
    @Override
    public boolean isInfoEnabled() {
        return LogAgent.getLogSwatch();
        return SystemLogDto.getLogSwatch();
    }
    @Override
    public boolean isErrorEnabled() {
        return LogAgent.getLogSwatch();
        return SystemLogDto.getLogSwatch();
    }
java110-interface/src/main/java/com/java110/config/feign/FeignConfiguration.java
@@ -1,5 +1,6 @@
package com.java110.config.feign;
import com.java110.dto.system.SystemLogDto;
import feign.Logger;
import feign.codec.ErrorDecoder;
import org.springframework.context.annotation.Bean;
@@ -22,7 +23,11 @@
    @Bean
    Logger.Level feignLoggerLevel() {
        //这里记录所有,根据实际情况选择合适的日志level
        return Logger.Level.FULL;
        if (SystemLogDto.getLogSwatch()) {
            return Logger.Level.FULL;
        } else {
            return Logger.Level.NONE;
        }
    }
java110-service/src/main/java/com/java110/service/init/ServiceStartInit.java
@@ -1,6 +1,6 @@
package com.java110.service.init;
import com.java110.core.log.LogAgent;
import com.java110.dto.system.SystemLogDto;
import com.java110.utils.factory.ApplicationContextFactory;
import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
@@ -17,23 +17,31 @@
    private static Environment env;
    public static void initSystemConfig(ApplicationContext context){
    public static void initSystemConfig(ApplicationContext context) {
        //加载配置文件,注册订单处理侦听
        try {
            ApplicationContextFactory.setApplicationContext(context);
            env = context.getEnvironment();
            String logSwitch = env.getProperty("LogSwitch");
            if(!StringUtil.isEmpty(logSwitch)){
            if (!StringUtil.isEmpty(logSwitch)) {
                //设置日志级别
                LogAgent.setLogSwatch(logSwitch);
                SystemLogDto.setLogSwatch(logSwitch);
            }
        }
        catch (Exception ex) {
        } catch (Exception ex) {
            throw new IllegalStateException("系统初始化失败", ex);
        }
    }
    public static void preInitSystemConfig() {
        //加载配置文件,注册订单处理侦听
        String logSwitch = System.getenv("LogSwitch");
        if (!StringUtil.isEmpty(logSwitch)) {
            //设置日志级别
            SystemLogDto.setLogSwatch(logSwitch);
        }
    }
}
service-acct/src/main/java/com/java110/acct/AcctServiceApplicationStart.java
@@ -49,6 +49,7 @@
    public static void main(String[] args) throws Exception {
        try {
            ServiceStartInit.preInitSystemConfig();
            ApplicationContext context = SpringApplication.run(AcctServiceApplicationStart.class, args);
            ServiceStartInit.initSystemConfig(context);
            //加载业务侦听
service-api/src/main/java/com/java110/api/ApiApplicationStart.java
@@ -131,8 +131,8 @@
    public static void main(String[] args) throws Exception {
        try {
            ServiceStartInit.preInitSystemConfig();
            ApplicationContext context = SpringApplication.run(ApiApplicationStart.class, args);
            //服务启动加载
            ServiceStartInit.initSystemConfig(context);
        } catch (Throwable e) {
service-api/src/main/java/com/java110/api/listener/AbstractServiceApiListener.java
@@ -3,8 +3,8 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.context.DataFlowContext;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.core.log.LoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.text.ParseException;
service-api/src/main/java/com/java110/api/rest/RestApi.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.smo.IApiServiceSMO;
import com.java110.core.base.controller.BaseController;
import com.java110.core.log.LoggerFactory;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.utils.constant.CommonConstant;
import com.java110.vo.ResultVo;
@@ -10,7 +11,6 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
service-common/src/main/java/com/java110/common/CommonServiceApplicationStart.java
@@ -103,6 +103,7 @@
    }
    public static void main(String[] args) throws Exception {
        ServiceStartInit.preInitSystemConfig();
        ApplicationContext context = SpringApplication.run(CommonServiceApplicationStart.class, args);
        ServiceStartInit.initSystemConfig(context);
service-community/src/main/java/com/java110/community/CommunityServiceApplicationStart.java
@@ -86,6 +86,7 @@
    public static void main(String[] args) throws Exception {
        try {
            ServiceStartInit.preInitSystemConfig();
            ApplicationContext context = SpringApplication.run(CommunityServiceApplicationStart.class, args);
            ServiceStartInit.initSystemConfig(context);
        } catch (Throwable e) {
service-dev/src/main/java/com/java110/dev/DevServiceApplicationStart.java
@@ -77,6 +77,7 @@
    }
    public static void main(String[] args) throws Exception {
        ServiceStartInit.preInitSystemConfig();
        ApplicationContext context = SpringApplication.run(DevServiceApplicationStart.class, args);
        ServiceStartInit.initSystemConfig(context);
service-fee/src/main/java/com/java110/fee/FeeServiceApplicationStart.java
@@ -64,6 +64,7 @@
    public static void main(String[] args) throws Exception {
        try {
            ServiceStartInit.preInitSystemConfig();
            ApplicationContext context = SpringApplication.run(FeeServiceApplicationStart.class, args);
            ServiceStartInit.initSystemConfig(context);
        } catch (Throwable e) {
service-job/src/main/java/com/java110/job/JobServiceApplication.java
@@ -79,6 +79,7 @@
    }
    public static void main(String[] args) throws Exception {
        ServiceStartInit.preInitSystemConfig();
        ApplicationContext context = SpringApplication.run(JobServiceApplication.class, args);
        ServiceStartInit.initSystemConfig(context);
        //加载业务侦听
service-oa/src/main/java/com/java110/oa/OaServiceApplicationStart.java
@@ -89,6 +89,7 @@
    }
    public static void main(String[] args) throws Exception {
        ServiceStartInit.preInitSystemConfig();
        ApplicationContext context = SpringApplication.run(OaServiceApplicationStart.class, args);
        ServiceStartInit.initSystemConfig(context);
service-order/src/main/java/com/java110/order/OrderServiceApplicationStart.java
@@ -104,6 +104,8 @@
    public static void main(String[] args) throws Exception {
        try {
            ServiceStartInit.preInitSystemConfig();
            ApplicationContext context = SpringApplication.run(OrderServiceApplicationStart.class, args);
            //服务启动加载
service-report/src/main/java/com/java110/report/ReportServiceApplicationStart.java
@@ -77,6 +77,8 @@
    }
    public static void main(String[] args) throws Exception {
        ServiceStartInit.preInitSystemConfig();
        ApplicationContext context = SpringApplication.run(ReportServiceApplicationStart.class, args);
        ServiceStartInit.initSystemConfig(context);
service-store/src/main/java/com/java110/store/StoreServiceApplicationStart.java
@@ -77,6 +77,8 @@
    public static void main(String[] args) throws Exception {
        try {
            ServiceStartInit.preInitSystemConfig();
            ApplicationContext context = SpringApplication.run(StoreServiceApplicationStart.class, args);
            ServiceStartInit.initSystemConfig(context);
            //加载业务侦听
service-user/src/main/java/com/java110/user/UserServiceApplicationStart.java
@@ -49,6 +49,7 @@
    public static void main(String[] args) throws Exception {
        try {
            ServiceStartInit.preInitSystemConfig();
            ApplicationContext context = SpringApplication.run(UserServiceApplicationStart.class, args);
            ServiceStartInit.initSystemConfig(context);
            //加载业务侦听