From bb6e42cb350778cd221eecc31c72bed15e50e5c8 Mon Sep 17 00:00:00 2001
From: Menethil <shareinto@gmail.com>
Date: Tue, 24 Jul 2018 15:57:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E9=85=8D=E7=BD=AE=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E7=A7=BB=E8=87=B3Core=EF=BC=8C=E5=9B=A0=E4=B8=BAAdmin?=
 =?UTF-8?q?=E5=92=8CWx=E9=83=BD=E9=9C=80=E8=A6=81=E7=94=A8=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 litemall-admin-api/pom.xml                                | 4 ++++
 litemall-core/pom.xml                                     | 5 +++++
 .../org/linlinjava/litemall/core}/config/WxConfig.java    | 2 +-
 .../linlinjava/litemall/core}/config/WxProperties.java    | 4 +---
 litemall-core/src/main/resources/application-core.yml     | 8 ++++++++
 litemall-wx-api/src/main/resources/application-wx.yml     | 8 --------
 6 files changed, 19 insertions(+), 12 deletions(-)
 rename {litemall-wx-api/src/main/java/org/linlinjava/litemall/wx => litemall-core/src/main/java/org/linlinjava/litemall/core}/config/WxConfig.java (97%)
 rename {litemall-wx-api/src/main/java/org/linlinjava/litemall/wx => litemall-core/src/main/java/org/linlinjava/litemall/core}/config/WxProperties.java (87%)

diff --git a/litemall-admin-api/pom.xml b/litemall-admin-api/pom.xml
index e9510a83..0c7a2e6c 100644
--- a/litemall-admin-api/pom.xml
+++ b/litemall-admin-api/pom.xml
@@ -22,6 +22,10 @@
             <artifactId>litemall-db</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-miniapp</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/litemall-core/pom.xml b/litemall-core/pom.xml
index 7edeae2f..c4ece35b 100644
--- a/litemall-core/pom.xml
+++ b/litemall-core/pom.xml
@@ -76,6 +76,11 @@
             <groupId>org.linlinjava</groupId>
             <artifactId>litemall-db</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-pay</artifactId>
+            <version>3.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/config/WxConfig.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/config/WxConfig.java
similarity index 97%
rename from litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/config/WxConfig.java
rename to litemall-core/src/main/java/org/linlinjava/litemall/core/config/WxConfig.java
index c728ccae..4838a825 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/config/WxConfig.java
+++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/config/WxConfig.java
@@ -1,4 +1,4 @@
-package org.linlinjava.litemall.wx.config;
+package org.linlinjava.litemall.core.config;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/config/WxProperties.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/config/WxProperties.java
similarity index 87%
rename from litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/config/WxProperties.java
rename to litemall-core/src/main/java/org/linlinjava/litemall/core/config/WxProperties.java
index 615c698d..54dc682e 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/config/WxProperties.java
+++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/config/WxProperties.java
@@ -1,7 +1,5 @@
-package org.linlinjava.litemall.wx.config;
+package org.linlinjava.litemall.core.config;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/litemall-core/src/main/resources/application-core.yml b/litemall-core/src/main/resources/application-core.yml
index 7ee80e44..f7d2ebaf 100644
--- a/litemall-core/src/main/resources/application-core.yml
+++ b/litemall-core/src/main/resources/application-core.yml
@@ -1,4 +1,12 @@
 litemall:
+  # 开发者应该设置成自己的wx相关信息
+  wx:
+    app-id: wxa5b486c6b918ecfb
+    app-secret: e04004829d4c383b4db7769d88dfbca1
+    mch-id: 111111
+    mch-key: xxxxxx
+    notify-url: http://www.example.com/wx/order/pay-notify
+
   notify:
     mail:
       # 邮件通知配置,邮箱一般用于接收业务通知例如收到新的订单，sendto 定义邮件接收者，通常为商城运营人员
diff --git a/litemall-wx-api/src/main/resources/application-wx.yml b/litemall-wx-api/src/main/resources/application-wx.yml
index d1880265..e69de29b 100644
--- a/litemall-wx-api/src/main/resources/application-wx.yml
+++ b/litemall-wx-api/src/main/resources/application-wx.yml
@@ -1,8 +0,0 @@
-# 开发者应该设置成自己的wx相关信息
-litemall:
-  wx:
-    app-id: wxa5b486c6b918ecfb
-    app-secret: e04004829d4c383b4db7769d88dfbca1
-    mch-id: 111111
-    mch-key: xxxxxx
-    notify-url: http://www.example.com/wx/order/pay-notify
\ No newline at end of file