From 13cbb37d5a38ae764fbe78063de4af61511b33e2 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 23 Oct 2021 21:25:24 +0800
Subject: [PATCH] 修改log4j配置
---
zq-erp/src/main/resources/log4j.properties | 50 +++++++++++++-----------
zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java | 4 -
zq-erp/src/main/java/com/matrix/system/hive/vo/BjOrderVo.java | 13 ++++++
zq-erp/src/main/resources/config/application.properties | 12 +++---
4 files changed, 47 insertions(+), 32 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java
index 2d79fd3..e2c6ea7 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java
@@ -215,13 +215,11 @@
/**
* 补交
- *
- * @throws GlobleException
* @author jyy
*/
@RequestMapping(value = "/bj")
public @ResponseBody
- AjaxResult bj(@RequestBody SysOrder order) throws GlobleException {
+ AjaxResult bj(@RequestBody SysOrder order){
orderService.updateAfterMoney(order);
return new AjaxResult(AjaxResult.STATUS_SUCCESS, "补交成功");
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/vo/BjOrderVo.java b/zq-erp/src/main/java/com/matrix/system/hive/vo/BjOrderVo.java
new file mode 100644
index 0000000..3128721
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/hive/vo/BjOrderVo.java
@@ -0,0 +1,13 @@
+package com.matrix.system.hive.vo;
+
+import lombok.Data;
+
+/**
+ * 补交订单费用vo
+ */
+@Data
+public class BjOrderVo {
+
+
+
+}
diff --git a/zq-erp/src/main/resources/config/application.properties b/zq-erp/src/main/resources/config/application.properties
index 7e3a818..16d29b9 100644
--- a/zq-erp/src/main/resources/config/application.properties
+++ b/zq-erp/src/main/resources/config/application.properties
@@ -4,9 +4,9 @@
#线上测试环境
#
-#spring.datasource.username=ct_test
-#spring.datasource.password=123456
-#spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test_meidu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+spring.datasource.username=ct_test
+spring.datasource.password=123456
+spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test_meidu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
#spring.datasource.username=xc_shop
#spring.datasource.password=xc_shop123!@#
@@ -22,9 +22,9 @@
#spring.datasource.url=jdbc:mysql://47.111.134.136/db_meidu_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
-spring.datasource.username=root
-spring.datasource.password=root
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/md_test_local?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+#spring.datasource.username=root
+#spring.datasource.password=root
+#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/md_test_local?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
diff --git a/zq-erp/src/main/resources/log4j.properties b/zq-erp/src/main/resources/log4j.properties
index ddcc0ef..bc5c1bb 100644
--- a/zq-erp/src/main/resources/log4j.properties
+++ b/zq-erp/src/main/resources/log4j.properties
@@ -15,39 +15,43 @@
log4j.appender.STDOUT = org.apache.log4j.ConsoleAppender
log4j.appender.STDOUT.Target = System.out
log4j.appender.STDOUT.Threshold = DEBUG
+log4j.appender.STDOUT.MaxFileSize = 100M
log4j.appender.STDOUT.layout = org.apache.log4j.PatternLayout
-log4j.appender.STDOUT.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss.SSS}-[ %X{Tr} ] [ %p ]-[ %t ] %m%n
+log4j.appender.STDOUT.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss.SSS}-[ %X{Tr} ] [ %p ]-[ %t ] %m%n
-### 输出DEBUG 级别以上的日志到=/error.log ###
+# 输出DEBUG 级别以上的日志到=/error.log ###
log4j.appender.DEBUG = com.matrix.core.tools.MatrixFileAppender
log4j.appender.DEBUG.File = /debug.log
log4j.appender.DEBUG.Append = true
-log4j.appender.DEBUG.Threshold = DEBUG
+log4j.appender.DEBUG.Threshold = DEBUG
+log4j.appender.DEBUG.MaxFileSize = 100M
+log4j.appender.DEBUG.MaxBackupIndex = 7
log4j.appender.DEBUG.layout = org.apache.log4j.PatternLayout
log4j.appender.DEBUG.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss.SSS}-[ %X{Tr} ] [ %p ]-[ %t ] %m%n
-log4j.appender.INFO = com.matrix.core.tools.MatrixFileAppender
-log4j.appender.INFO.File = /info.log
-log4j.appender.INFO.Append = true
-log4j.appender.INFO.Threshold = INFO
-log4j.appender.INFO.layout = org.apache.log4j.PatternLayout
-log4j.appender.INFO.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss.SSS}-[ %X{Tr} ] [ %p ]-[ %t ] %m%n
+#log4j.appender.INFO = com.matrix.core.tools.MatrixFileAppender
+#log4j.appender.INFO.File = /info.log
+#log4j.appender.INFO.Append = true
+#log4j.appender.INFO.Threshold = INFO
+#log4j.appender.INFO.MaxBackupIndex = 5
+#log4j.appender.INFO.layout = org.apache.log4j.PatternLayout
+#log4j.appender.INFO.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss.SSS}-[ %X{Tr} ] [ %p ]-[ %t ] %m%n
-log4j.appender.WARN = com.matrix.core.tools.MatrixFileAppender
-log4j.appender.WARN.File = /warn.log
-log4j.appender.WARN.Append = true
-log4j.appender.WARN.Threshold = WARN
-log4j.appender.WARN.layout = org.apache.log4j.PatternLayout
-log4j.appender.WARN.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss.SSS}-[ %X{Tr} ] [ %p ]-[ %t ] %m%n
-
-### 输出ERROR 级别以上的日志到=/error.log ###
-log4j.appender.ERROR = com.matrix.core.tools.MatrixFileAppender
-log4j.appender.ERROR.File =/error.log
-log4j.appender.ERROR.Append = true
-log4j.appender.ERROR.Threshold = ERROR
-log4j.appender.ERROR.layout = org.apache.log4j.PatternLayout
-log4j.appender.ERROR.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss.SSS}-[ %X{Tr} ] [ %p ]-[ %t ] %m%n
+#log4j.appender.WARN = com.matrix.core.tools.MatrixFileAppender
+#log4j.appender.WARN.File = /warn.log
+#log4j.appender.WARN.Append = true
+#log4j.appender.WARN.Threshold = WARN
+#log4j.appender.WARN.layout = org.apache.log4j.PatternLayout
+#log4j.appender.WARN.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss.SSS}-[ %X{Tr} ] [ %p ]-[ %t ] %m%n
+#
+#### 输出ERROR 级别以上的日志到=/error.log ###
+#log4j.appender.ERROR = com.matrix.core.tools.MatrixFileAppender
+#log4j.appender.ERROR.File =/error.log
+#log4j.appender.ERROR.Append = true
+#log4j.appender.ERROR.Threshold = ERROR
+#log4j.appender.ERROR.layout = org.apache.log4j.PatternLayout
+#log4j.appender.ERROR.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss.SSS}-[ %X{Tr} ] [ %p ]-[ %t ] %m%n
#mybatis log
log4j.logger.druid.sql=INFO
--
Gitblit v1.9.1