update loggers.

src/main/java/cn/com/qmth/examcloud/app/controller/DeviceRecordController.java

@@ -30,7 +30,9 @@ import static cn.com.qmth.examcloud.app.model.Constants.PARAM_TOKEN;
 @Controller
 @RequestMapping("${$rmp}/device/record")
 public class DeviceRecordController {
-    private static Logger log = LoggerFactory.getLogger(DeviceRecordController.class);
+
+    private static final Logger LOG = LoggerFactory.getLogger(DeviceRecordController.class);
+
     @Autowired
     private DeviceRecordService deviceRecordService;
     @Autowired

src/main/java/cn/com/qmth/examcloud/app/controller/OfflineExamController.java

@@ -39,7 +39,8 @@ import static cn.com.qmth.examcloud.app.model.Constants.PARAM_APP_TOKEN;
 @RequestMapping("${$rmp}/v2/exam/offline")
 @Api(tags = "离线考试相关接口")
 public class OfflineExamController {
-    private static Logger log = LoggerFactory.getLogger(OfflineExamController.class);
+    private static final Logger LOG = LoggerFactory.getLogger(OfflineExamController.class);
+
     @Autowired
     private CoreOeService oeService;
     @Autowired
@@ -70,7 +71,7 @@ public class OfflineExamController {
         try {
             multipart = ((MultipartHttpServletRequest) request).getFile("file");
         } catch (Exception e) {
-            log.error(e.getMessage());
+            LOG.error(e.getMessage());
         }
         if (multipart == null) {
             return new Result().error("请选择要上传文件！");
@@ -103,7 +104,7 @@ public class OfflineExamController {
     @RequestMapping(value = "/paper/download", method = {RequestMethod.GET})
     public String downloadPaper(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam String paperId) throws Exception {
         String requestUrl = "redirectPermanent:" + questionService.downloadPaper(key, token, paperId);
-        log.debug(requestUrl);
+        LOG.debug(requestUrl);
         return requestUrl;
     }
 
@@ -111,7 +112,7 @@ public class OfflineExamController {
     @RequestMapping(value = "/paper/answer/download", method = {RequestMethod.GET})
     public String downloadPaperAnswer(@RequestParam String filePath) throws Exception {
         String requestUrl = "redirect:" + upYunService.downloadPaperAnswer(filePath);
-        log.debug(requestUrl);
+        LOG.debug(requestUrl);
         return requestUrl;
     }
 

src/main/java/cn/com/qmth/examcloud/app/controller/RouterController.java

@@ -30,7 +30,7 @@ import static cn.com.qmth.examcloud.app.model.Constants.PARAM_APP_TOKEN;
 @RequestMapping("${$rmp}/")
 @Api(tags = "路由相关接口")
 public class RouterController {
-    private static Logger log = LoggerFactory.getLogger(RouterController.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RouterController.class);
 
     @Autowired
     private RouterService routerService;

src/main/java/cn/com/qmth/examcloud/app/controller/SystemRestController.java

@@ -31,9 +31,11 @@ import static cn.com.qmth.examcloud.app.model.Constants.PARAM_APP_TOKEN;
 @RequestMapping("${$rmp}/v2")
 @Api(tags = "系统服务相关接口")
 public class SystemRestController {
-    private static Logger log = LoggerFactory.getLogger(SystemRestController.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SystemRestController.class);
+
     @Autowired
     private CoreOeService oeService;
+
     @Autowired
     private CoreAuthService authService;
 
@@ -46,7 +48,7 @@ public class SystemRestController {
     @ApiOperation(value = "获取Token接口")
     @RequestMapping(value = "/token", method = {RequestMethod.POST})
     public Result getToken(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token) throws Exception {
-        log.debug("key:" + key);
+        LOG.debug("key:" + key);
         return new Result().success(token);
     }
 

src/main/java/cn/com/qmth/examcloud/app/controller/UserAuthRestController.java

@@ -40,7 +40,7 @@ import io.swagger.annotations.ApiOperation;
 @Api(tags = "认证中心相关接口")
 public class UserAuthRestController {
 
-    private final static Logger log = LoggerFactory.getLogger(UserAuthRestController.class);
+    private static final Logger LOG = LoggerFactory.getLogger(UserAuthRestController.class);
 
     @Autowired
     private CoreAuthService authService;
@@ -71,7 +71,7 @@ public class UserAuthRestController {
             loginInfo.setAppToken(userInfo.getToken());
 
             authService.cacheLoginInfo(loginInfo, userInfo.getKey());
-            log.info(String.format("key:%s token:%s", userInfo.getKey(), userInfo.getToken()));
+            LOG.info(String.format("key:%s token:%s", userInfo.getKey(), userInfo.getToken()));
         }
 
         return result;
@@ -98,7 +98,7 @@ public class UserAuthRestController {
             loginInfo.setAppToken(userInfo.getToken());
 
             authService.cacheLoginInfo(loginInfo, userInfo.getKey());
-            log.info(String.format("key:%s token:%s", userInfo.getKey(), userInfo.getToken()));
+            LOG.info(String.format("key:%s token:%s", userInfo.getKey(), userInfo.getToken()));
         }
 
         return result;

src/main/java/cn/com/qmth/examcloud/app/core/config/AccessInterceptor.java

@@ -31,7 +31,8 @@ import static cn.com.qmth.examcloud.app.model.Constants.*;
  * @since: 2018/7/16
  */
 public class AccessInterceptor extends HandlerInterceptorAdapter {
-    private final static Logger log = LoggerFactory.getLogger(AccessInterceptor.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AccessInterceptor.class);
+
     @Autowired
     private DeviceRecordService deviceRecordService;
 

src/main/java/cn/com/qmth/examcloud/app/core/config/ControllerAdviceHandler.java

@@ -12,26 +12,26 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @ControllerAdvice
 public class ControllerAdviceHandler {
 
-    private final static Logger log = LoggerFactory.getLogger(ControllerAdviceHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ControllerAdviceHandler.class);
 
     @ResponseBody
     @ExceptionHandler(value = RuntimeException.class)
     public Result handle(RuntimeException e) {
-        log.error(e.getMessage(), e);
+        LOG.error(e.getMessage(), e);
         return new Result().error(e.getMessage());
     }
 
     @ResponseBody
     @ExceptionHandler(value = Exception.class)
     public Result handle(Exception e) {
-        log.error(e.getMessage(), e);
+        LOG.error(e.getMessage(), e);
         return new Result().error(e.getMessage());
     }
 
     @ResponseBody
     @ExceptionHandler(value = StatusException.class)
     public Result handle(StatusException e) {
-        log.error(e.getMessage(), e);
+        LOG.error(e.getMessage(), e);
         return new Result().error(e.getMessage());
     }
 

src/main/java/cn/com/qmth/examcloud/app/core/config/TokenFilter.java

@@ -32,18 +32,18 @@ import static cn.com.qmth.examcloud.app.model.Constants.PLATFORM_SESSION_EXPIRE_
  */
 public class TokenFilter implements Filter {
 
-    private final static Logger log = LoggerFactory.getLogger(TokenFilter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TokenFilter.class);
 
     private CoreAuthService authService;
 
     @Override
     public void init(FilterConfig filterConfig) throws ServletException {
-        log.debug("init");
+        LOG.debug("init");
     }
 
     @Override
     public void destroy() {
-        log.debug("destroy");
+        LOG.debug("destroy");
     }
 
     @Override
@@ -99,7 +99,7 @@ public class TokenFilter implements Filter {
             }
 
             boolean isOpen = authService.isOpenApp(rootOrgId);
-            log.info("[Check Open APP] Result is " + isOpen);
+            LOG.info("[Check Open APP] Result is " + isOpen);
             if (!isOpen) {
                 reqContinue.yes = false;
                 this.renderError(response, new Result().error("当前学校尚未开放APP功能！").toString());
@@ -107,7 +107,7 @@ public class TokenFilter implements Filter {
             }
 
             boolean isDoing = authService.isDoingExam(rootOrgId, accountType, account);
-            log.info("[Check Doing Exam] Result is " + isDoing);
+            LOG.info("[Check Doing Exam] Result is " + isDoing);
             if (isDoing) {
                 reqContinue.yes = false;
                 this.renderError(response, new Result().error("尚在考试中不允许登录！").toString());
@@ -141,12 +141,12 @@ public class TokenFilter implements Filter {
         if (!isAllow) {
             if (loginInfo.hasExpired(PLATFORM_SESSION_EXPIRE_TIME)) {
                 if (StringUtils.isBlank(loginInfo.getPassword())) {
-                    log.info("Can't reLogin, no password.");
+                    LOG.info("Can't reLogin, no password.");
                     return null;
                 }
 
                 boolean isDoing = authService.isDoingExam(loginInfo.getRootOrgId(), loginInfo.getAccountType(), loginInfo.getAccount());
-                log.info("[Check Doing Exam] result is " + isDoing);
+                LOG.info("[Check Doing Exam] result is " + isDoing);
                 if (isDoing) {
                     reqContinue.yes = false;
                     this.renderError(response, new Result().error("尚在考试中不允许登录！").toString());
@@ -200,17 +200,17 @@ public class TokenFilter implements Filter {
             Result<UserInfo> result = authService.login(loginInfo);
             UserInfo userInfo = result.getData();
             if (userInfo == null) {
-                log.debug("reLogin failed,Maybe user's password has changed.");
+                LOG.debug("reLogin failed,Maybe user's password has changed.");
                 return;
             }
             //登录成功后缓存新的Token信息
-            log.info(String.format("key:%s newToken:%s", userInfo.getKey(), userInfo.getToken()));
+            LOG.info(String.format("key:%s newToken:%s", userInfo.getKey(), userInfo.getToken()));
             loginInfo.setUserName(userInfo.getDisplayName());
             loginInfo.setToken(userInfo.getToken());
             loginInfo.setCreateTime(new Date());
             authService.cacheLoginInfo(loginInfo, userInfo.getKey());
         } catch (Exception e) {
-            log.error(e.getMessage());
+            LOG.error(e.getMessage());
         }
     }
 
@@ -235,7 +235,7 @@ public class TokenFilter implements Filter {
             out = response.getWriter();
             out.print(json);
         } catch (IOException e) {
-            log.error(e.getMessage(), e);
+            LOG.error(e.getMessage(), e);
         } finally {
             if (out != null) {
                 out.close();

src/main/java/cn/com/qmth/examcloud/app/core/utils/DateUtils.java

@@ -14,7 +14,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 
 public class DateUtils {
-    private static Logger log = LoggerFactory.getLogger(DateUtils.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DateUtils.class);
 
     private static final String fmt = "yyyy-MM-dd HH:mm:ss";
 
@@ -24,7 +24,7 @@ public class DateUtils {
             Date date = new Date(value);
             return new SimpleDateFormat(fmt).format(date);
         } catch (Exception e) {
-            log.error(e.getMessage(), e);
+            LOG.error(e.getMessage(), e);
             return longStr;
         }
     }
@@ -33,7 +33,7 @@ public class DateUtils {
         try {
             return new SimpleDateFormat(fmt).format(date);
         } catch (Exception e) {
-            log.error(e.getMessage(), e);
+            LOG.error(e.getMessage(), e);
             return null;
         }
     }

src/main/java/cn/com/qmth/examcloud/app/core/utils/HttpClientBuilder.java

@@ -17,7 +17,7 @@ import java.util.concurrent.TimeUnit;
  */
 public class HttpClientBuilder {
 
-    private static Logger log = LoggerFactory.getLogger(HttpClientBuilder.class);
+    private static final Logger LOG = LoggerFactory.getLogger(HttpClientBuilder.class);
 
     private static OkHttpClient client;
 
@@ -57,7 +57,7 @@ public class HttpClientBuilder {
                 sslContext.init(null, new TrustManager[]{new TrustAllCert()}, new SecureRandom());
                 return sslContext.getSocketFactory();
             } catch (Exception e) {
-                log.error(e.getMessage());
+                LOG.error(e.getMessage());
                 throw new RuntimeException(e);
             }
         }
@@ -73,7 +73,7 @@ public class HttpClientBuilder {
 
             throw new RuntimeException("download fail, url is " + url);
         } catch (Exception e) {
-            log.error(e.getMessage());
+            LOG.error(e.getMessage());
             throw new RuntimeException(e);
         }
     }

src/main/java/cn/com/qmth/examcloud/app/core/utils/HttpUtils.java

@@ -29,7 +29,7 @@ import static cn.com.qmth.examcloud.app.model.Constants.*;
  * @since: 2018/7/16
  */
 public class HttpUtils {
-    private static Logger log = LoggerFactory.getLogger(HttpUtils.class);
+    private static final Logger log = LoggerFactory.getLogger(HttpUtils.class);
 
     public static String getRandomTraceId() {
         String traceId = ThreadUtils.getTraceID();

src/main/java/cn/com/qmth/examcloud/app/service/RedisService.java

@@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit;
  */
 @Service
 public class RedisService {
-    private static Logger log = LoggerFactory.getLogger(RedisService.class);
+    private static final Logger log = LoggerFactory.getLogger(RedisService.class);
     @Autowired
     private StringRedisTemplate stringRedisTemplate;
     @Autowired

src/main/java/cn/com/qmth/examcloud/app/service/RouterService.java

@@ -26,8 +26,10 @@ import static cn.com.qmth.examcloud.app.model.Constants.*;
 
 @Component
 public class RouterService {
-    private static Logger log = LoggerFactory.getLogger(RouterService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RouterService.class);
+
     private Random random = new Random();
+
     @Autowired
     private SysProperty sysProperty;
 
@@ -60,7 +62,7 @@ public class RouterService {
 
         //处理请求地址
         final String requestUrl = sysProperty.getProxyUrl(router.getServer()) + "/" + router.getUrl() + requestParams;
-        log.info(String.format("[%s][%s][%s]%s ", traceId, router.getServer().getInstanceName(), router.getMethod().name(), requestUrl));
+        LOG.info(String.format("[%s][%s][%s]%s ", traceId, router.getServer().getInstanceName(), router.getMethod().name(), requestUrl));
 
         //封装请求
         Request.Builder request = new Request.Builder()
@@ -92,10 +94,10 @@ public class RouterService {
                 return new Result().success(bodyStr);
             }
 
-            log.warn(String.format("[%s][response] code:%s body:%s", traceId, response.code(), bodyStr));
+            LOG.warn(String.format("[%s][response] code:%s body:%s", traceId, response.code(), bodyStr));
             return new Result().error(bodyStr);
         } catch (Exception e) {
-            log.error(e.getMessage(), e);
+            LOG.error(e.getMessage(), e);
             if (e instanceof ConnectException) {
                 return new Result().error("服务访问失败！");
             }

src/main/java/cn/com/qmth/examcloud/app/service/impl/CoreAuthServiceImpl.java

@@ -59,7 +59,7 @@ import okhttp3.Response;
 @Service
 public class CoreAuthServiceImpl implements CoreAuthService {
 
-    private static Logger log = LoggerFactory.getLogger(CoreAuthServiceImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(CoreAuthServiceImpl.class);
 
     @Autowired
     private SysProperty sysProperty;

src/main/java/cn/com/qmth/examcloud/app/service/impl/CoreBasicServiceImpl.java

@@ -24,7 +24,7 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class CoreBasicServiceImpl implements CoreBasicService {
-    private static Logger log = LoggerFactory.getLogger(CoreBasicServiceImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(CoreBasicServiceImpl.class);
     @Autowired
     private SysProperty sysProperty;
 

src/main/java/cn/com/qmth/examcloud/app/service/impl/CoreExamWorkServiceImpl.java

@@ -25,7 +25,7 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class CoreExamWorkServiceImpl implements CoreExamWorkService {
-    private static Logger log = LoggerFactory.getLogger(CoreExamWorkServiceImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(CoreExamWorkServiceImpl.class);
     @Autowired
     private SysProperty sysProperty;
 

src/main/java/cn/com/qmth/examcloud/app/service/impl/CoreOeServiceImpl.java

@@ -50,7 +50,7 @@ import java.util.Map;
  */
 @Service
 public class CoreOeServiceImpl implements CoreOeService {
-    private static Logger log = LoggerFactory.getLogger(CoreOeServiceImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(CoreOeServiceImpl.class);
     @Autowired
     private SysProperty sysProperty;
 

src/main/java/cn/com/qmth/examcloud/app/service/impl/CoreQuestionServiceImpl.java

@@ -35,7 +35,7 @@ import java.util.Map;
  */
 @Service
 public class CoreQuestionServiceImpl implements CoreQuestionService {
-    private static Logger log = LoggerFactory.getLogger(CoreQuestionServiceImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(CoreQuestionServiceImpl.class);
     @Autowired
     private SysProperty sysProperty;
 

src/main/java/cn/com/qmth/examcloud/app/service/impl/DeviceRecordServiceImpl.java

@@ -37,7 +37,7 @@ import java.util.List;
  */
 @Service
 public class DeviceRecordServiceImpl implements DeviceRecordService {
-    private static Logger log = LoggerFactory.getLogger(DeviceRecordServiceImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(DeviceRecordServiceImpl.class);
     @Autowired
     private DeviceRecordRepository deviceRecordRepository;
 

src/main/java/cn/com/qmth/examcloud/app/service/impl/UpYunServiceImpl.java

@@ -22,7 +22,7 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class UpYunServiceImpl implements UpYunService {
-    private static Logger log = LoggerFactory.getLogger(UpYunServiceImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(UpYunServiceImpl.class);
     @Autowired
     private SysProperty sysProperty;
 

src/main/resources/log4j2.xml

@@ -2,47 +2,31 @@
 <Configuration status="WARN" monitorInterval="30">
 
     <Properties>
-        <Property name="commonLevel" value="${sys:log.commonLevel}"/>
-        <Property name="logPattern">
+        <Property name="LOG_LEVEL" value="${sys:log.commonLevel}"/>
+        <Property name="LOG_DIR" value="./logs/examcloud-app-api"/>
+        <Property name="LOG_PATTERN">
             %d{yyyy-MM-dd HH:mm:ss.SSS} | %clr{%level} | %X{TRACE_ID} %X{CALLER} | %clr{%c{1.1}:%L}{cyan} | %m%n
         </Property>
     </Properties>
 
     <Appenders>
-        <!-- 控制台 日志 -->
-        <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="${logPattern}" charset="UTF-8"/>
+        <Console name="CONSOLE_APPENDER" target="SYSTEM_OUT">
+            <PatternLayout pattern="${LOG_PATTERN}" charset="UTF-8"/>
         </Console>
 
-        <!-- debug 日志 -->
-        <RollingFile name="DEBUG_APPENDER"
-                     fileName="./logs/debug/debug.log"
-                     filePattern="./logs/debug/debug-%d{yyyy.MM.dd.HH}-%i.log">
-            <PatternLayout pattern="${logPattern}" charset="UTF-8"/>
-            <Policies>
-                <TimeBasedTriggeringPolicy interval="1" modulate="false"/>
-                <SizeBasedTriggeringPolicy size="100 MB"/>
-            </Policies>
-            <DefaultRolloverStrategy max="1000">
-                <Delete basePath="./logs/debug" maxDepth="1">
-                    <IfFileName glob="debug-*.log">
-                        <IfAccumulatedFileSize exceeds="2 GB"/>
-                    </IfFileName>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingFile>
+        <RollingFile name="FILE_APPENDER"
+                     fileName="${LOG_DIR}/debug.log"
+                     filePattern="${LOG_DIR}/debug-%d{yyyyMMdd}-%i.log">
+            <PatternLayout pattern="${LOG_PATTERN}" charset="UTF-8"/>
 
-        <!-- 接口日志 -->
-        <RollingFile name="INTERFACE_APPENDER" fileName="./logs/interface/interface.log"
-                     filePattern="./logs/interface/interface-%d{yyyy.MM.dd.HH}-%i.log">
-            <PatternLayout pattern="${logPattern}" charset="UTF-8"/>
             <Policies>
                 <TimeBasedTriggeringPolicy interval="1" modulate="false"/>
                 <SizeBasedTriggeringPolicy size="100 MB"/>
             </Policies>
+
             <DefaultRolloverStrategy max="1000">
-                <Delete basePath="./logs/interface" maxDepth="1">
-                    <IfFileName glob="interface-*.log">
+                <Delete basePath="${LOG_DIR}" maxDepth="1">
+                    <IfFileName glob="debug-*.log">
                         <IfAccumulatedFileSize exceeds="10 GB"/>
                     </IfFileName>
                 </Delete>
@@ -67,19 +51,14 @@
         <!--<logger name="org.springframework.data.mongodb" level="DEBUG"/>-->
         <!--<logger name="org.springframework.data.redis" level="DEBUG"/>-->
 
-        <Logger name="cn.com.qmth" level="${commonLevel}" additivity="false">
-            <AppenderRef ref="DEBUG_APPENDER"/>
-            <AppenderRef ref="Console"/>
-        </Logger>
-
-        <Logger name="INTERFACE_LOGGER" level="${commonLevel}" additivity="false">
-            <AppenderRef ref="INTERFACE_APPENDER"/>
-            <AppenderRef ref="Console"/>
+        <Logger name="cn.com.qmth" level="${LOG_LEVEL}" additivity="false">
+            <AppenderRef ref="CONSOLE_APPENDER"/>
+            <AppenderRef ref="FILE_APPENDER"/>
         </Logger>
 
-        <Root level="${commonLevel}">
-            <AppenderRef ref="Console"/>
-            <AppenderRef ref="DEBUG_APPENDER"/>
+        <Root level="${LOG_LEVEL}">
+            <AppenderRef ref="CONSOLE_APPENDER"/>
+            <AppenderRef ref="FILE_APPENDER"/>
         </Root>
     </Loggers>