merge from release_v4.0.1

.gitignore

@@ -1,13 +1,20 @@
 *.class
+
+# Proguard folder generated by ide
 .project
 .classpath
 .settings
+target/
 .idea/
 *.iml
+
+# Log Files
 *.log
+*.class
+
+
+# Package Files #
 *.jar
 *.war
 *.ear
-log/
-logs/
-target/
+

examcloud-core-print-starter/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 spring.profiles.active=test
 
 examcloud.startup.startupCode=8009
-examcloud.startup.configCenterHost=config-host
+examcloud.startup.configCenterHost=192.168.10.39
 examcloud.startup.configCenterPort=9999
 examcloud.startup.appCode=P

examcloud-core-print-starter/src/main/resources/log4j2.xml

@@ -3,22 +3,27 @@
 
     <Properties>
         <Property name="commonLevel" value="${sys:log.commonLevel}"/>
+        <Property name="logPattern">
+            %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="%d{yyyy-MM-dd HH:mm:ss.SSS}| %level | %X{TRACE_ID} - %X{CALLER} | %m | %l%n"/>
+            <PatternLayout pattern="${logPattern}" charset="UTF-8"/>
         </Console>
+
         <!-- debug 日志 -->
-        <RollingFile name="DEBUG_APPENDER" fileName="./logs/debug/debug.log"
+        <RollingFile name="DEBUG_APPENDER"
+                     fileName="./logs/debug/debug.log"
                      filePattern="./logs/debug/debug-%d{yyyy.MM.dd.HH}-%i.log">
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS}| %level | %X{TRACE_ID} - %X{CALLER} | %m | %l%n"/>
+            <PatternLayout pattern="${logPattern}" charset="UTF-8"/>
             <Policies>
-                <TimeBasedTriggeringPolicy interval="1"/>
+                <TimeBasedTriggeringPolicy interval="1" modulate="false"/>
                 <SizeBasedTriggeringPolicy size="100 MB"/>
             </Policies>
-            <DefaultRolloverStrategy max="10000">
+            <DefaultRolloverStrategy max="1000">
                 <Delete basePath="./logs/debug" maxDepth="1">
                     <IfFileName glob="debug-*.log">
                         <IfAccumulatedFileSize exceeds="2 GB"/>
@@ -26,15 +31,16 @@
                 </Delete>
             </DefaultRolloverStrategy>
         </RollingFile>
+
         <!-- 接口日志 -->
         <RollingFile name="INTERFACE_APPENDER" fileName="./logs/interface/interface.log"
                      filePattern="./logs/interface/interface-%d{yyyy.MM.dd.HH}-%i.log">
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS}| %level | %X{TRACE_ID} - %X{CALLER} | %m%n"/>
+            <PatternLayout pattern="${logPattern}" charset="UTF-8"/>
             <Policies>
-                <TimeBasedTriggeringPolicy interval="1"/>
+                <TimeBasedTriggeringPolicy interval="1" modulate="false"/>
                 <SizeBasedTriggeringPolicy size="100 MB"/>
             </Policies>
-            <DefaultRolloverStrategy max="10000">
+            <DefaultRolloverStrategy max="1000">
                 <Delete basePath="./logs/interface" maxDepth="1">
                     <IfFileName glob="interface-*.log">
                         <IfAccumulatedFileSize exceeds="10 GB"/>
@@ -45,38 +51,36 @@
     </Appenders>
 
     <Loggers>
+        <logger name="springfox.documentation" level="ERROR"/>
+        <logger name="org.springframework" level="ERROR"/>
+        <logger name="org.hibernate" level="ERROR"/>
+        <logger name="org.apache" level="ERROR"/>
+        <logger name="org.quartz" level="ERROR"/>
+        <logger name="org.docx4j" level="ERROR"/>
+        <logger name="cn.afterturn" level="ERROR"/>
+        <logger name="com.netflix" level="ERROR"/>
+        <logger name="com.aliyun" level="ERROR"/>
+        <logger name="io.lettuce" level="ERROR"/>
+        <logger name="io.netty" level="ERROR"/>
+
+        <!--<logger name="org.springframework.jdbc.core.JdbcTemplate" level="DEBUG"/>-->
+        <!--<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="INFO" additivity="false">
+        <Logger name="INTERFACE_LOGGER" level="${commonLevel}" additivity="false">
             <AppenderRef ref="INTERFACE_APPENDER"/>
             <AppenderRef ref="Console"/>
         </Logger>
 
-        <Logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="${commonLevel}"/>
-        <Logger name="org.hibernate.type.descriptor.sql.BasicExtractor" level="${commonLevel}"/>
-        <Logger name="org.hibernate.SQL" level="${commonLevel}"/>
-        <Logger name="org.hibernate.type" level="${commonLevel}"/>
-        <Logger name="org.hibernate.engine.QueryParameters" level="${commonLevel}"/>
-        <Logger name="org.hibernate.engine.query.HQLQueryPlan" level="${commonLevel}"/>
-
-        <logger name="org.springframework" level="ERROR"/>
-        <logger name="org.springframework.jdbc.core.JdbcTemplate" level="WARN"/>
-        <logger name="org.springframework.data.mongodb" level="WARN"/>
-        <logger name="org.docx4j" level="ERROR"/>
-        <logger name="org.docx4j.model.properties.run.FontSize" level="OFF"/>
-        <logger name="com.netflix" level="ERROR"/>
-        <logger name="com.netflix.discovery" level="ERROR"/>
-        <logger name="org.apache" level="ERROR"/>
-        <logger name="springfox.documentation" level="ERROR"/>
-        <logger name="cn.afterturn.easypoi" level="ERROR"/>
-
-        <Root level="INFO">
+        <Root level="${commonLevel}">
             <AppenderRef ref="Console"/>
             <AppenderRef ref="DEBUG_APPENDER"/>
         </Root>
     </Loggers>
 
-</Configuration>
+</Configuration>

jenkins-dev.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-pwd
-
-cd examcloud-core-print-starter/target
-cp examcloud-core-print-distribution.zip ~/packages

jenkins-prod.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
 pwd
 
-cd examcloud-core-print-starter/target
-cp examcloud-core-print-distribution.zip ~/packages
+cp examcloud-core-print-starter/target/examcloud-core-print-distribution.zip ~/packages

jenkins-test.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-pwd
-
-cd examcloud-core-print-starter/target
-cp examcloud-core-print-distribution.zip ~/packages