Browse Source

修改log配置,修改运单编号查询发票userId限制

xusonglin 5 years ago
parent
commit
6b24a1cede

+ 23 - 20
src/main/resources/logback-spring.xml

@@ -38,19 +38,21 @@
     </appender>
     </appender>
 
 
     <!-- Log file error output -->
     <!-- Log file error output -->
-    <appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <appender name="errorLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
         <file>${log.path}/error.log</file>
         <file>${log.path}/error.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <fileNamePattern>${log.path}/%d{yyyy-MM, aux}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
             <maxFileSize>50MB</maxFileSize>
             <maxFileSize>50MB</maxFileSize>
             <maxHistory>30</maxHistory>
             <maxHistory>30</maxHistory>
         </rollingPolicy>
         </rollingPolicy>
         <encoder>
         <encoder>
             <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
             <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
         </encoder>
         </encoder>
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>ERROR</level>
-        </filter>
     </appender>
     </appender>
 
 
 
 
@@ -61,14 +63,14 @@
             <onMatch>ACCEPT</onMatch>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
             <onMismatch>DENY</onMismatch>
         </filter>
         </filter>
-        <file>${log.path}/charge/charge.log</file>
+        <file>${log.path}/charge.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/charge/%d{yyyy-MM}/charge.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <fileNamePattern>${log.path}/%d{yyyy-MM, aux}/charge.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
             <maxFileSize>50MB</maxFileSize>
             <maxFileSize>50MB</maxFileSize>
             <maxHistory>30</maxHistory>
             <maxHistory>30</maxHistory>
         </rollingPolicy>
         </rollingPolicy>
         <encoder>
         <encoder>
-            <pattern>%date %msg%n</pattern>
+            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
         </encoder>
         </encoder>
     </appender>
     </appender>
 
 
@@ -97,21 +99,22 @@
         <appender-ref ref="debug"/>
         <appender-ref ref="debug"/>
         <appender-ref ref="error"/>
         <appender-ref ref="error"/>
     </root>
     </root>
-    <!--        <logger name="com.jkcredit.invoice.service.impl" level="WARN">-->
-    <!--            <appender-ref ref="chargeLog"/>-->
-    <!--        </logger>-->
+    <root level="WARN">
+        <appender-ref ref="console"/>
+        <appender-ref ref="charge"/>
+    </root>
+    <root level="ERROR">
+        <appender-ref ref="console"/>
+        <appender-ref ref="error"/>
+    </root>
 
 
+    <logger name="com.jkcredit.invoice.hub.service" level="WARN">
+        <appender-ref ref="chargeLog"/>
+    </logger>
     <logger name="com.jkcredit.invoice.hub.service" level="INFO">
     <logger name="com.jkcredit.invoice.hub.service" level="INFO">
         <appender-ref ref="sourceLog"/>
         <appender-ref ref="sourceLog"/>
     </logger>
     </logger>
-    <logger name="com.jkcredit.invoice.hub.consumer.ChargeConsumer" level="INFO">
-        <appender-ref ref="sourceLog"/>-->
+    <logger name="com.jkcredit.invoice.hub.service" level="ERROR">
+        <appender-ref ref="errorLog"/>-->
     </logger>
     </logger>
-    <logger name="com.jkcredit.invoice.hub.consumer.ChargeConsumer" level="ERROR">
-        <appender-ref ref="error"/>-->
-    </logger>
-
-    <!--    <logger name="com.jkcredit.invoice.async" level="INFO">-->
-    <!--        <appender-ref ref="sourceLog"/>-->
-    <!--    </logger>-->
 </configuration>
 </configuration>

+ 1 - 1
src/main/resources/mapper/SearchInvoiceResultMapper.xml

@@ -37,7 +37,7 @@
     </resultMap>
     </resultMap>
 
 
     <select id="getSearchInvoiceResult" resultMap="baseResultMap">
     <select id="getSearchInvoiceResult" resultMap="baseResultMap">
-        select * from h_search_invoice_result where waybill_num = #{num} and user_id = #{userId}
+        select * from h_search_invoice_result where waybill_num = #{num}
     </select>
     </select>
 
 
     <select id="getInvoiceRecords" resultType="com.jkcredit.invoice.hub.model.po.searchInvoiceResult.InvoiceRecordPo">
     <select id="getInvoiceRecords" resultType="com.jkcredit.invoice.hub.model.po.searchInvoiceResult.InvoiceRecordPo">