Merge remote-tracking branch 'origin/forWechatService' into forWechatService

+FROM java:8u111
+VOLUME /tmp
+ADD *.jar app.jar
+EXPOSE 10001
+RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+RUN echo "Asia/Shanghai" > /etc/timezone && dpkg-reconfigure -f noninteractive tzdata
+COPY xsd /xsd
+ENTRYPOINT ["java","-jar","/app.jar"]
+# Ubuntu 时区
+

+version: "2.1"
+
+services:
+  java:
+    build:
+      context: .
+      dockerfile: Dockerfile
+      args:
+        - PINPOINT_VERSION=2.3.1
+        - AGENT_ID=nmms_manage1
+        - APP_NAME=nmms_manage
+        - SPRING_PROFILES=release
+    container_name: "java"
+    image: "wlpt-nmms-manage"
+
+    volumes_from:
+      - container:pinpoint-agent
+
+networks:
+  default:
+    driver: bridge

@@ -459,7 +459,7 @@ public class FFMInfo implements Serializable {
 
     private FFMInfo WayBillParse(String line,String uld) throws FFMResolveException {
         //运单格式适配,这里注意空格字符 与连字符"-"
-        String pattern = "^(\\d{3}-\\d{8})([A-Z]{3})([A-Z]{3})/(T|P|S|M)(\\d+)(K)([0-9\\.]+)(MC)?([0-9\\.]+)?(DG)?([0-9\\.]+)?(T)?([0-9]+)?/";
+        String pattern = "^(\\d{3}-\\d{8})([A-Z]{3})([A-Z]{3})/(T|P|S|M|D)(\\d+)(K)([0-9\\.]+)(MC)?([0-9\\.]+)?(DG)?([0-9\\.]+)?(T)?([0-9]+)?/";
         // 创建 Pattern 对象
         Pattern r = Pattern.compile(pattern);
         // 现在创建 matcher 对象