浏览代码

微信配置相关移至Core,因为Admin和Wx都需要用到

Menethil 7 年之前
父节点
当前提交
bb6e42cb35

+ 4 - 0
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>

+ 5 - 0
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>

+ 1 - 1
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/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;

+ 1 - 3
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/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;
 

+ 8 - 0
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 定义邮件接收者,通常为商城运营人员

+ 0 - 8
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