Merge remote-tracking branch 'origin/master'

litemall-all/pom.xml

@@ -36,6 +36,27 @@
 
     <build>
         <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/classes/static</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>../litemall-admin/dist</directory>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>

litemall-all/src/main/resources/application.yml

 spring:
   profiles:
-    active: db, core, admin, wx, os
+    active: db, core, admin, wx
   message:
     encoding: UTF-8
 
@@ -13,6 +13,5 @@ logging:
     org.springframework:  ERROR
     org.mybatis:  ERROR
     org.linlinjava.litemall.admin:  DEBUG
-    org.linlinjava.litemall.os:  DEBUG
     org.linlinjava.litemall.wx:  DEBUG
     org.linlinjava.litemall:  DEBUG
\ No newline at end of file

litemall-wx/config/api.js

@@ -4,9 +4,9 @@
 // 局域网测试使用
 // var WxApiRoot = 'http://192.168.0.101:8082/wx/';
 // 云平台部署时使用
-// var WxApiRoot = 'http://122.152.206.172:8082/wx/';
+var WxApiRoot = 'http://122.152.206.172:8082/wx/';
 // 云平台上线时使用
-var WxApiRoot = 'https://www.menethil.com.cn/wx/';
+// var WxApiRoot = 'https://www.menethil.com.cn/wx/';
 
 module.exports = {
  IndexUrl: WxApiRoot + 'home/index', //首页数据接口