小程序支付域名接入

src/main/java/com/izouma/awesomeadmin/dao/WxMiniprogramMapper.xml

@@ -16,12 +16,13 @@
         <result column="mch_secret" property="mchSecret" jdbcType="VARCHAR"/>
         <result column="remark" property="remark" jdbcType="VARCHAR"/>
         <result column="use_flag" property="useFlag" jdbcType="VARCHAR"/>
+        <result column="baseurl" property="baseurl" jdbcType="VARCHAR"/>
         <!--generatedEnd-->
     </resultMap>
 
     <sql id="Base_Column_List">
         <!--generatedStart-->
-        id, del_flag, update_time, update_user, create_time, create_user, name, appid, secret, mch_id, mch_secret, remark, use_flag        <!--generatedEnd-->
+        id, del_flag, update_time, update_user, create_time, create_user, name, appid, secret, mch_id, mch_secret, remark, use_flag , baseurl       <!--generatedEnd-->
     </sql>
 
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
@@ -80,6 +81,9 @@
             <if test="useFlag!= null">
                 use_flag,
             </if>
+            <if test="baseurl!= null">
+                baseurl,
+            </if>
             <!--generatedEnd-->
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -123,6 +127,9 @@
             <if test="useFlag != null">
                 #{useFlag,jdbcType=VARCHAR},
             </if>
+            <if test="baseurl != null">
+                #{baseurl,jdbcType=VARCHAR},
+            </if>
             <!--generatedEnd-->
         </trim>
     </insert>
@@ -170,6 +177,9 @@
             <if test="useFlag != null">
                 use_flag= #{useFlag,jdbcType=VARCHAR},
             </if>
+            <if test="baseurl != null">
+                baseurl= #{baseurl,jdbcType=VARCHAR},
+            </if>
             <!--generatedEnd-->
         </set>
         WHERE

src/main/java/com/izouma/awesomeadmin/model/WxMiniprogram.java

@@ -22,6 +22,7 @@ public class WxMiniprogram{
     private String mchSecret;
     private String remark;
     private String useFlag;
+    private String baseurl;
 
     private String idStr;
 
@@ -164,5 +165,12 @@ public class WxMiniprogram{
     }
     /*generatedEnd*/
 
+    public String getBaseurl() {
+        return baseurl;
+    }
+
+    public void setBaseurl(String baseurl) {
+        this.baseurl = baseurl;
+    }
 }
 

src/main/java/com/izouma/weixin/web/WeiXinController.java

@@ -234,7 +234,7 @@ public class WeiXinController {
             data.setDevice_info(AppConstant.DEVICE_INFO);
             data.setBody("充值");
             data.setOut_trade_no(WeixinUtil.create_out_trade_no());
-            String notify_url = PropertiesFileLoader.getProperties("weixin_notify_url_recharge") + "/" + miniId;
+            String notify_url = config.getBaseurl() + PropertiesFileLoader.getProperties("weixin_notify_url_recharge") + "/" + miniId;
             data.setNotify_url(notify_url);
             data.setTotal_fee(total);
             data.setTrade_type(AppConstant.TRADE_TYPE_JSAPI);
@@ -279,6 +279,7 @@ public class WeiXinController {
         config.setAppID(PropertiesFileLoader.getProperties("weixinappid"));
         config.setMchID(PropertiesFileLoader.getProperties("weixin_mch_id"));
         config.setKey(PropertiesFileLoader.getProperties("weixin_mch_secret"));
+        config.setBaseurl(PropertiesFileLoader.getProperties("weixin_base_url"));
 
         if (miniId != null) {
 
@@ -292,6 +293,7 @@ public class WeiXinController {
                 config.setAppID(wxMiniprogram.getAppid());
                 config.setMchID(wxMiniprogram.getMchId());
                 config.setKey(wxMiniprogram.getMchSecret());
+                config.setBaseurl(wxMiniprogram.getBaseurl());
             }
 
         }
@@ -338,7 +340,7 @@ public class WeiXinController {
             data.setDevice_info(AppConstant.DEVICE_INFO);
             data.setBody("小程序商品");
             data.setOut_trade_no(WeixinUtil.create_out_trade_no());
-            String notify_url = PropertiesFileLoader.getProperties("weixin_notify_url") + "/" + miniId;
+            String notify_url = config.getBaseurl() + PropertiesFileLoader.getProperties("weixin_notify_url") + "/" + miniId;
             data.setNotify_url(notify_url);
             data.setTotal_fee(total);
             data.setTrade_type(AppConstant.TRADE_TYPE_JSAPI);

src/main/java/com/izouma/weixin/wxpay/MyConfig.java

@@ -18,6 +18,8 @@ public class MyConfig extends WXPayConfig implements IWXPayDomain {
 
     private String key;
 
+    private String baseurl;
+
     public MyConfig() throws Exception {
         //String certPath = "/path/to/apiclient_cert.p12";
         String certPath = PropertiesFileLoader.getProperties("weixin_cert_path");
@@ -79,5 +81,13 @@ public class MyConfig extends WXPayConfig implements IWXPayDomain {
     public void setKey(String key) {
         this.key = key;
     }
+
+    public String getBaseurl() {
+        return baseurl;
+    }
+
+    public void setBaseurl(String baseurl) {
+        this.baseurl = baseurl;
+    }
 }
 

src/main/resources/properties/jdbc.properties

@@ -1,7 +1,7 @@
 jdbc.driverClassName=org.gjt.mm.mysql.Driver
 
 #外网地址
-jdbc.url=jdbc:mysql://120.55.131.232:3306/tutuxiang_xiaochengxu?characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
+jdbc.url=jdbc:mysql://rdsave1o67m1ido6gwp6public.mysql.rds.aliyuncs.com:3306/tutuxiang_xiaochengxu?characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
 jdbc.username=microball
 jdbc.password=2wsx@WSX#EDC
 jdbc.databaseName=tutuxiang_xiaochengxu

src/main/resources/properties/outsidews.properties

@@ -21,8 +21,9 @@ ALIPAY_SELLER=2088331233110526
 ALIPAY_GATEWAY=https://openapi.alipay.com/gateway.do
 weixin_mch_id=1326510801
 weixin_mch_secret=aa1b1d19893e48dc6c3c76weiqiuwang
-weixin_notify_url=https://xcx.izouma.com/wx/notify
+weixin_notify_url=notify
 weixin_cert_path=/home/cert/apiclient_cert.p12
-weixin_notify_url_recharge=
+weixin_notify_url_recharge=notifyRecharge
+weixin_base_url=https://xcx.izouma.com/wx/
 
 

src/main/vue/src/pages/WxMiniprogram.vue

@@ -20,6 +20,9 @@
             <el-form-item prop="remark" label="备注">
                 <el-input v-model="formData.remark" :disabled="'remark'==subColumn"></el-input>
             </el-form-item>
+            <el-form-item prop="baseurl" label="域名">
+                <el-input v-model="formData.baseurl" ></el-input>
+            </el-form-item>
             <el-form-item prop="useFlag" label="可用">
                 <el-switch v-model="formData.useFlag" active-color="#13ce66" inactive-color="#ff4949" :disabled="'useFlag'==subColumn">
                 </el-switch>

src/main/vue/src/pages/WxMiniprograms.vue

@@ -85,6 +85,11 @@
                                 label="备注"
                                 min-width="100">
                         </el-table-column>
+                                            <el-table-column
+                                prop="baseurl"
+                                label="域名"
+                                min-width="100">
+                        </el-table-column>
                                                                 
                                             <el-table-column
                                 v-if="isColumnShow('useFlag')"

src/main/webapp/WEB-INF/html/admin.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.cd6b3039b681c7ded8b5aa04417356d3.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.6487ed58e0bc9316c446.js></script><script type=text/javascript src=/static/js/vendor.0466f4552d8d12e32413.js></script><script type=text/javascript src=/static/js/admin.afd98a5fa2f4725f975d.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.cd6b3039b681c7ded8b5aa04417356d3.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.cb0adaa6e1d4441548d7.js></script><script type=text/javascript src=/static/js/vendor.0466f4552d8d12e32413.js></script><script type=text/javascript src=/static/js/admin.33150a8c7a554514e00c.js></script></body></html>

src/main/webapp/WEB-INF/html/loginAdmin.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.e18072aa5535788558fd2cbee27e12dd.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.6487ed58e0bc9316c446.js></script><script type=text/javascript src=/static/js/vendor.0466f4552d8d12e32413.js></script><script type=text/javascript src=/static/js/loginAdmin.2fdd7e73c051c1e22109.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.e18072aa5535788558fd2cbee27e12dd.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.cb0adaa6e1d4441548d7.js></script><script type=text/javascript src=/static/js/vendor.0466f4552d8d12e32413.js></script><script type=text/javascript src=/static/js/loginAdmin.2fdd7e73c051c1e22109.js></script></body></html>