diff --git a/huaheng-wms-core/src/main/java/org/jeecg/utils/CustomLogContextListener.java b/huaheng-wms-core/src/main/java/org/jeecg/utils/CustomLogContextListener.java
new file mode 100644
index 0000000..46735d8
--- /dev/null
+++ b/huaheng-wms-core/src/main/java/org/jeecg/utils/CustomLogContextListener.java
@@ -0,0 +1,67 @@
+package org.jeecg.utils;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.spi.LoggerContextListener;
+import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.spi.LifeCycle;
+import ch.qos.logback.core.Context;
+
+/**
+ * @version 1.0
+ * @class: CustomLogContextListener
+ * @author: carlo
+ * @mail: carlo_cwh@qq.com
+ * @date: 2021/8/25 10:01
+ * @description: 定义logback 日志监听器，指定日志文件存放目录
+ */
+public class CustomLogContextListener extends ContextAwareBase implements LoggerContextListener, LifeCycle {
+
+ /** 存储日志路径标识 */
+ public static final String LOG_PAHT_KEY = "LOG_PATH";
+
+ @Override
+ public boolean isResetResistant() {
+ return false;
+ }
+
+ @Override
+ public void onStart(LoggerContext loggerContext) {
+
+ }
+
+ @Override
+ public void onReset(LoggerContext loggerContext) {
+
+ }
+
+ @Override
+ public void onStop(LoggerContext loggerContext) {
+
+ }
+
+ @Override
+ public void onLevelChange(Logger logger, Level level) {
+
+ }
+
+ @Override
+ public void start() {
+ // "user.dir"是指用户当前工作目录
+ String s = System.getProperty("user.dir");
+ System.setProperty(LOG_PAHT_KEY, s);
+ Context context = getContext();
+ context.putProperty(LOG_PAHT_KEY, s);
+ }
+
+ @Override
+ public void stop() {
+
+ }
+
+ @Override
+ public boolean isStarted() {
+ return false;
+ }
+}
\ No newline at end of file
diff --git a/huaheng-wms-core/src/main/resources/application-test.yml b/huaheng-wms-core/src/main/resources/application-test.yml
index 8dd2373..581bfe9 100644
--- a/huaheng-wms-core/src/main/resources/application-test.yml
+++ b/huaheng-wms-core/src/main/resources/application-test.yml
@@ -7,7 +7,7 @@ server:
include-stacktrace: ALWAYS
include-message: ALWAYS
servlet:
- context-path: /jeecg-boot
+ context-path: /wms
compression:
enabled: true
min-response-size: 1024
@@ -131,9 +131,9 @@ spring:
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
- url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://172.16.29.45:3306/wms4?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
username: root
- password: root
+ password: hhsoftware
driver-class-name: com.mysql.cj.jdbc.Driver
# 多数据源配置
#multi-datasource1:
@@ -144,15 +144,15 @@ spring:
#redis 配置
redis:
database: 0
- host: 192.168.1.199
+ host: 172.16.29.77
lettuce:
pool:
max-active: 8 #最大连接数据库连接数,设 -1 为没有限制
max-idle: 8 #最大等待连接中的数量,设 0 为没有限制
- max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
+ max-wait: 100ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
min-idle: 0 #最小等待连接中的数量,设 0 为没有限制
shutdown-timeout: 100ms
- password: ''
+ password: 123456
port: 6379
#mybatis plus 设置
mybatis-plus:
@@ -161,7 +161,7 @@ mybatis-plus:
# 关闭MP3.0自带的banner
banner: false
db-config:
- #主键类型
+ #主键类型 0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
id-type: ASSIGN_ID
# 默认数据库表下划线命名
table-underline: true
@@ -173,20 +173,22 @@ mybatis-plus:
#jeecg专用配置
minidao:
base-package: org.jeecg.modules.jmreport.*
+ #DB类型（mysql | postgresql | oracle | sqlserver| other）
+ db-type: mysql
jeecg:
# 是否启用安全模式
safeMode: false
# 签名密钥串(前后端要一致，正式发布请自行修改)
signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
# 本地：local\Minio：minio\阿里云：alioss
- uploadType: local
+ uploadType: minio
path:
#文件上传根目录 设置
- upload: D://opt//upFiles
+ upload: /opt/upFiles
#webapp文件路径
- webapp: D://opt//webapp
+ webapp: /opt/webapp
shiro:
- excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
+ excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode
#阿里云oss存储和大鱼短信秘钥配置
oss:
accessKey: ??
@@ -209,20 +211,30 @@ jeecg:
# 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
baidu: ??
# 在线预览文件服务器地址配置
- file-view-domain: http://127.0.0.1:8012
+ file-view-domain: 127.0.0.1:8012
# minio文件上传
minio:
minio_url: http://minio.jeecg.com
minio_name: ??
minio_pass: ??
- bucketName: ??
+ bucketName: otatest
#大屏报表参数设置
jmreport:
- mode: prod
+ # 打印纸张配置 title描述 size宽高
+ printPaper:
+ - title: 条码双边打印机纸
+ size:
+ - 60
+ - 80
+ - title: 物料双边打印机纸
+ size:
+ - 85
+ - 60
+ mode: dev
#数据字典是否进行saas数据隔离，自己看自己的字典
saas: false
#是否需要校验token
- is_verify_token: false
+ is_verify_token: true
#必须校验方法
verify_methods: remove,delete,save,add,update
#Wps在线文档
@@ -267,7 +279,7 @@ knife4j:
#开启生产环境屏蔽
production: false
basic:
- enable: true
+ enable: false
username: jeecg
password: jeecg1314
#第三方登录
diff --git a/huaheng-wms-core/src/main/resources/logback-spring.xml b/huaheng-wms-core/src/main/resources/logback-spring.xml
index 1a93234..1f459bb 100644
--- a/huaheng-wms-core/src/main/resources/logback-spring.xml
+++ b/huaheng-wms-core/src/main/resources/logback-spring.xml
@@ -1,14 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="false">
+
+ <!-- 监听器，指定日志文件存放目录 -->
+ <contextListener class="org.jeecg.utils.CustomLogContextListener" />
+
<!--定义日志文件的存储地址 -->
- <property name="LOG_HOME" value="../logs"/>
+ <property name="LOG_HOME" value="${LOG_PATH}/logs" />
- <!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />-->
+ <!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(
+ %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" /> -->
<!-- 控制台输出 -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符
- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>-->
+ <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L
+ - %msg%n</pattern> -->
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %highlight(%-5level) %cyan(%logger{50}:%L) - %msg%n</pattern>
</encoder>
</appender>
@@ -17,10 +22,10 @@
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--日志文件输出的文件名 -->
- <FileNamePattern>${LOG_HOME}/jeecgboot-%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+ <FileNamePattern>${LOG_HOME}/wms-%d{yyyy-MM-dd}.%i.log</FileNamePattern>
<!--日志文件保留天数 -->
<MaxHistory>30</MaxHistory>
- <maxFileSize>10MB</maxFileSize>
+ <maxFileSize>100MB</maxFileSize>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
@@ -31,7 +36,7 @@
<!-- 生成 error html格式日志开始 -->
<appender name="HTML" class="ch.qos.logback.core.FileAppender">
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
- <!--设置日志级别,过滤掉info日志,只输入error日志-->
+ <!--设置日志级别,过滤掉info日志,只输入error日志 -->
<level>ERROR</level>
</filter>
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
@@ -39,7 +44,7 @@
<pattern>%p%d%msg%M%F{32}%L</pattern>
</layout>
</encoder>
- <file>${LOG_HOME}/error-log.html</file>
+ <file>${LOG_HOME}/wms-error-log.html</file>
</appender>
<!-- 生成 error html格式日志结束 -->
@@ -47,10 +52,10 @@
<appender name="FILE_HTML" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--日志文件输出的文件名 -->
- <FileNamePattern>${LOG_HOME}/jeecgboot-%d{yyyy-MM-dd}.%i.html</FileNamePattern>
+ <FileNamePattern>${LOG_HOME}/wms-%d{yyyy-MM-dd}.%i.html</FileNamePattern>
<!--日志文件保留天数 -->
<MaxHistory>30</MaxHistory>
- <MaxFileSize>10MB</MaxFileSize>
+ <MaxFileSize>100MB</MaxFileSize>
</rollingPolicy>
<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
<layout class="ch.qos.logback.classic.html.HTMLLayout">
@@ -61,17 +66,17 @@
<!-- 每天生成一个html格式的日志结束 -->
<!--myibatis log configure -->
- <logger name="com.apache.ibatis" level="TRACE"/>
- <logger name="java.sql.Connection" level="DEBUG"/>
- <logger name="java.sql.Statement" level="DEBUG"/>
- <logger name="java.sql.PreparedStatement" level="DEBUG"/>
+ <logger name="com.apache.ibatis" level="TRACE" />
+ <logger name="java.sql.Connection" level="DEBUG" />
+ <logger name="java.sql.Statement" level="DEBUG" />
+ <logger name="java.sql.PreparedStatement" level="DEBUG" />
<!-- 日志输出级别 -->
<root level="INFO">
- <appender-ref ref="STDOUT"/>
- <appender-ref ref="FILE"/>
- <appender-ref ref="HTML"/>
- <appender-ref ref="FILE_HTML"/>
+ <appender-ref ref="STDOUT" />
+ <appender-ref ref="FILE" />
+ <appender-ref ref="HTML" />
+ <appender-ref ref="FILE_HTML" />
</root>
</configuration>