From 3269ec2bce486c05d89b3bf41a22df45256fe477 Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Mon, 21 May 2018 18:50:17 +0800
Subject: [PATCH] =?UTF-8?q?update[project]:=20=E8=BF=9B=E4=B8=80=E6=AD=A5?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=89=80=E6=9C=89=E6=A8=A1=E5=9D=97=E7=9A=84?=
 =?UTF-8?q?pom.xml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 litemall-admin-api/pom.xml      | 16 ++++++++++++++++
 litemall-all/pom.xml            | 15 +++++++++++++++
 litemall-core/pom.xml           | 17 +++++++++++++++++
 litemall-db/pom.xml             | 16 ++++++++++++++++
 litemall-os-api/pom.xml         | 16 ++++++++++++++++
 litemall-wx-api/pom.xml         |  3 ---
 litemall-wx/project.config.json |  4 ++--
 7 files changed, 82 insertions(+), 5 deletions(-)

diff --git a/litemall-admin-api/pom.xml b/litemall-admin-api/pom.xml
index c7f580f1..e9510a83 100644
--- a/litemall-admin-api/pom.xml
+++ b/litemall-admin-api/pom.xml
@@ -25,6 +25,22 @@
     </dependencies>
 
     <build>
+
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                    <include>**/*.xml</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
+
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
diff --git a/litemall-all/pom.xml b/litemall-all/pom.xml
index 7a65d4da..b06c0c11 100644
--- a/litemall-all/pom.xml
+++ b/litemall-all/pom.xml
@@ -47,6 +47,21 @@
 
     <build>
 
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                    <include>**/*.xml</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
+
         <plugins>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
diff --git a/litemall-core/pom.xml b/litemall-core/pom.xml
index 19d19c8e..4792d401 100644
--- a/litemall-core/pom.xml
+++ b/litemall-core/pom.xml
@@ -34,4 +34,21 @@
 
     </dependencies>
 
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                    <include>**/*.xml</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
+    </build>
 </project>
\ No newline at end of file
diff --git a/litemall-db/pom.xml b/litemall-db/pom.xml
index 1b1b63b8..659a5877 100644
--- a/litemall-db/pom.xml
+++ b/litemall-db/pom.xml
@@ -41,6 +41,22 @@
 
 
     <build>
+
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                    <include>**/*.xml</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
+
         <plugins>
             <plugin>
                 <groupId>org.mybatis.generator</groupId>
diff --git a/litemall-os-api/pom.xml b/litemall-os-api/pom.xml
index c4d5f52b..c8c69743 100644
--- a/litemall-os-api/pom.xml
+++ b/litemall-os-api/pom.xml
@@ -25,6 +25,22 @@
     </dependencies>
 
     <build>
+
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                    <include>**/*.xml</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
+
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
diff --git a/litemall-wx-api/pom.xml b/litemall-wx-api/pom.xml
index 17828cad..901bde4d 100644
--- a/litemall-wx-api/pom.xml
+++ b/litemall-wx-api/pom.xml
@@ -11,9 +11,6 @@
     </parent>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
         <docker.image.prefix>litemall</docker.image.prefix>
     </properties>
 
diff --git a/litemall-wx/project.config.json b/litemall-wx/project.config.json
index 1fe9aefb..354012c5 100644
--- a/litemall-wx/project.config.json
+++ b/litemall-wx/project.config.json
@@ -9,8 +9,8 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "1.9.93",
-	"appid": "wx3d9beeb7481eddd3",
-	"projectname": "%E5%BE%AE%E5%A6%9E%E6%89%AB%E7%A0%81%E8%B4%AD",
+  "appid": "wxa5b486c6b918ecfb",
+  "projectname": "litemall-wx",
 	"condition": {
 		"search": {
 			"current": -1,