Merge remote-tracking branch 'origin/master'

increpack.xml

@@ -0,0 +1,25 @@
+<increpack>
+    <!-- 版本服务器接口地址 -->
+    <increApi></increApi>
+    <!-- 应用ID -->
+    <appId>aiccs-api</appId>
+    <!-- 工程ID -->
+    <codeId>aiccs-api</codeId>
+    <!--GIT服务器配置-->
+    <code>
+        <method>git</method> <!--托管的服务器方式 git、svn-->
+        <url>http://47.107.61.133:3000/nm-project/aiccs-api.git</url>
+        <!--默认先从increApi获取打包补丁范围可以不填写，当请求失败则再使用-->
+        <fromCommit>155315d8152df22eca2f749a16828098cb73f3fe</fromCommit> <!-- 起始的版本号, SHA-1码 -->
+        <untilCommit>d93ff733c61d94ec9c41c6c4b48c545cc0b701da</untilCommit> <!-- 截止的版本号, SHA-1码（可以不配置，默认取至最新版本） -->
+    </code>
+    <!-- 本地化配置文件，不用打包，以手工操作的方式进行升级 -->
+    <exclude>
+        <fileDir>src\main\resources\properties</fileDir>
+        <file>src\main\resources\application.yml</file>
+        <file>src\main\resources\application-dev.yml</file>
+        <file>src\main\resources\application-prod.yml</file>
+        <file>src\main\resources\application-test.yml</file>
+    </exclude>
+
+</increpack>

pom.xml

@@ -358,6 +358,12 @@
             <groupId>org.springframework.kafka</groupId>
             <artifactId>spring-kafka</artifactId>
         </dependency>
+        <!-- 增量打包辅助工具 -->
+        <dependency>
+            <groupId>com.chinaweal.youfool</groupId>
+            <artifactId>youfool-increpack-maven-plugin</artifactId>
+            <version>2.2.0</version>
+        </dependency>
     </dependencies>
     <profiles>
         <profile>
@@ -421,6 +427,61 @@
 <!--                    </execution>-->
 <!--                </executions>-->
 <!--            </plugin>-->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.3.0</version>
+                <configuration>
+                    <finalName>${project.artifactId}</finalName>
+                    <descriptors>
+                        <descriptor>target/assembly.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.6.0</version>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                        <configuration>
+                            <mainClass>com.chinaweal.youfool.increpack.maven.IncrePackMain</mainClass>
+                            <arguments>
+                                <argument>${project.artifactId}</argument>
+                                <argument>${project.version}</argument>
+                            </arguments>
+                            <cleanupDaemonThreads>false</cleanupDaemonThreads>
+                        </configuration>
+                    </execution>
+                    <!--<execution>
+                        <id>authMac</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                        <configuration>
+                            <mainClass>com.chinaweal.youfool.increpack.maven.PostPackMain</mainClass>
+                            <arguments>
+                                <argument>${project.artifactId}</argument>
+                                <argument>${project.version}</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>-->
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>

src/main/java/com/chinaweal/aiccs/common/constant/Constant.java

@@ -164,6 +164,7 @@ public abstract class Constant {
     public static final Map<String, String> GZ_LY_DH = new LinkedHashMap<>();
 
     static {
+        GZ_REGION_CODE.put("150000", "内蒙古自治区");
         GZ_REGION_CODE.put("150102", "新城区");
         GZ_REGION_CODE.put("150103", "回民区");
         GZ_REGION_CODE.put("150104", "玉泉区");
@@ -290,6 +291,7 @@ public abstract class Constant {
         GZ_REGION_CODE.put("157992", "");
 
 
+        NM_REGION_CODE.put("150000", "内蒙古自治区");
         NM_REGION_CODE.put("150100", "呼和浩特市");
         NM_REGION_CODE.put("150200", "包头市");
         NM_REGION_CODE.put("150300", "乌海市");
@@ -309,6 +311,7 @@ public abstract class Constant {
         NM_REGION_CODE.put("155900", "乌兰察布市");
         NM_REGION_CODE.put("157900", "阿拉善盟");
 
+        GZ_REGION_CODE_SHORTNAME.put("150000", "蒙");
         GZ_REGION_CODE_SHORTNAME.put("150100", "呼");
         GZ_REGION_CODE_SHORTNAME.put("150200", "包");
         GZ_REGION_CODE_SHORTNAME.put("150300", "乌");
@@ -332,6 +335,7 @@ public abstract class Constant {
 //        GZ_DECORG_CODE.put("44010000", "广州市");
 
 
+        GZ_DECORG_CODE.put("15000000", "内蒙古自治区");
         GZ_DECORG_CODE.put("15010000", "呼和浩特市");
         GZ_DECORG_CODE.put("15020000", "包头市");
         GZ_DECORG_CODE.put("15030000", "乌海市");