xxxrrrdddd 3 年之前
父節點
當前提交
fb9b3a1284
共有 2 個文件被更改,包括 51 次插入51 次删除
  1. 50 50
      addons/epay/config.php
  2. 1 1
      application/api/controller/MobileController.php

+ 50 - 50
addons/epay/config.php

@@ -2,66 +2,66 @@
 
 return [
     [
-        'name'    => 'wechat',
-        'title'   => '微信',
-        'type'    => 'array',
+        'name' => 'wechat',
+        'title' => '微信',
+        'type' => 'array',
         'content' => [],
-        'value'   => [
-            'appid'          => '',
-            'app_id'         => '',
-            'app_secret'     => '',
-            'miniapp_id'     => '',
-            'mch_id'         => '',
-            'key'            => '',
-            'mode'           => 'normal',
-            'sub_mch_id'     => '',
-            'sub_appid'      => '',
-            'sub_app_id'     => '',
+        'value' => [
+            'appid' => 'wx799d545a856277fb',
+            'app_id' => 'wx799d545a856277fb',
+            'app_secret' => 'wx799d545a856277fb',
+            'miniapp_id' => 'wx799d545a856277fb',
+            'mch_id' => '1614422722',
+            'key' => 'a792f89843bc2b127ea8ba593ad781ad',
+            'mode' => 'normal',
+            'sub_mch_id' => '',
+            'sub_appid' => '',
+            'sub_app_id' => '',
             'sub_miniapp_id' => '',
-            'notify_url'     => '/addons/epay/api/notifyx/type/wechat',
-            'cert_client'    => '/addons/epay/certs/apiclient_cert.pem',
-            'cert_key'       => '/addons/epay/certs/apiclient_key.pem',
-            'log'            => '1',
+            'notify_url' => '/addons/epay/api/notifyx/type/wechat',
+            'cert_client' => '/addons/epay/certs/apiclient_cert.pem',
+            'cert_key' => '/addons/epay/certs/apiclient_key.pem',
+            'log' => '1',
         ],
-        'rule'    => '',
-        'msg'     => '',
-        'tip'     => '微信参数配置',
-        'ok'      => '',
-        'extend'  => '',
+        'rule' => '',
+        'msg' => '',
+        'tip' => '微信参数配置',
+        'ok' => '',
+        'extend' => '',
     ],
     [
-        'name'    => 'alipay',
-        'title'   => '支付宝',
-        'type'    => 'array',
+        'name' => 'alipay',
+        'title' => '支付宝',
+        'type' => 'array',
         'content' => [],
-        'value'   => [
-            'app_id'              => '',
-            'mode'                => 'normal',
-            'notify_url'          => '/addons/epay/api/notifyx/type/alipay',
-            'return_url'          => '/addons/epay/api/returnx/type/alipay',
-            'private_key'         => '',
-            'ali_public_key'      => '',
+        'value' => [
+            'app_id' => '2021003110600121',
+            'mode' => 'normal',
+            'notify_url' => '/addons/epay/api/notifyx/type/alipay',
+            'return_url' => '/addons/epay/api/returnx/type/alipay',
+            'private_key' => 'MIIEpAIBAAKCAQEAmbszf42fEK3qCKCApbNnGA/q/QjekOulCd3JGkTaCZtCgU5RpEyLmfSJu7erpwxovkbG1FLPaAtqngTF0ggSSBeJYwF/lx67y5uX6cW9/uAAEUqAw1unDHnOaEzQNEhyDZDzuH4yliu2v8XsVWTLGWlboOTYwrrUwr+LfPRuq8KglPyc0d8CfAAPMwwMcqMQ36ioYNMDx2viqkxDmqvTXT8O5ZImztZnTLuXX7gz1/tKSIqKXhIFs3jMmgzyYzC266fTfc5bdBMGYKOQq+nyTkd8favl3I2o2Jq9rkXFaat6cHHY6dMv4/A7giroM96JgaZ4pVAoWTcBslHfosUUtQIDAQABAoIBAE8MXn+xL+CgvN2wwlXx+Qn7bWatP9ye/t8i5vyV+NPFvR3GSt7D6WjBwG0BFcew7s8gj66v4ixq6mjUpW/JbLUbPS7mn1fymrgoiqXPY1IClqZNfAZ4Q15757HkBY9MzTDCnz/3zEVBtxfHSy3hxTmM3mvOINOIxExbt/sJqTqx7KBbHMMZvZFGp+HDrCmbqiqojNtb52nWqy97QRYYl0ZlFJw9N+jR3gUnXKRYr+rHA2XygjvjOzTVrufUfkFMXPv/Zr36pKiHBW1wK+afIrnJxGA5mchC3LaCK/u13IpYaMr6/w2nzGXHPx5YQ2u7DdtbDtC/jSgpMMja2Cdu4KUCgYEA4i0qw6lf6Il30UcLx2vlsOlMzyMSKRz6+wExyZfGLlxe+tBLSNRoon473uobHdpFUx9l5iLyh/5LTjjbglzEHSv6Z6R+b+Pv8swPXTGGokvg35UywhPsQD1Les3U/HHKx37I5B4Bx3aId+rmElXOAtmdadLB3dWtXO1NgMCZy/cCgYEArgCRXexpIHFCEAzOjM4ZrwLCOZUzSsOdokdx6O9mG+I8Odf8/Qh6CeII3VvQFoEM0RoKqsqc5WTjr7s1517KoURGNwiyf0tIhVJektsT+Ge8kWRA4PrNNB5Wd3wJYJibvEUM2DKGqfeNqiFGS7bsRS9qi2q218DRPCnGQp8sgbMCgYEAujdBzFJ5WnVEJxP9iLU3KY8L5EcVvq/TnDGBkl7ZlnYK5Sn1sgLgG1kfZgsNRGjfRu7E8NO5J2qhCcgaQpyqAvKgehCe4PSkLB0CUVJjbOBYRv0KC2xnyQQuTu+E+kueDt49/EMQZ+8ZsNG/lzz6HrKYvfX+E+zHjYj7lJP+jEUCgYBwTrWE5d5ErlVxfpKilzREnYc3G3Hrw66u22ZObpZ9UNyGiT4lI5+BWX9XQLdijxDytdhEvFngReoftrnoCGrJBAQ96UMsni7EvpGEQBr3rh0ryoWFsNtZ1GsC2/BBhL6gGgFcWeBJPBsXwDpbDEobrasbKVmykCV8q4nn3k0fuQKBgQDD3KVczL/xy7ruF0e1kUAFpg5M4AE7m5G9H1mEZXDCCiJHb6W8YZ8Cs9X54bwonGzhbgrd8jCS12PjD3GaFzYDyN5nzCqYFJLrEJqWeiGoEIR1LNhyo5vfNAUYqxD64fDE7LjqRH2kQyo43tKVgUuHRnJ/0CkCQQXYKWxDZuAkIw==',
+            'ali_public_key' => 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl4ngaPi4xQouYpdIs92/MsmUShlXAkXZeDO3YhGFJq/hYHWPOsxyhQFp/O5yHXQrNx5z9hW+JHuOg7R5m5mlcWR+6UZzzFryqM/w2se+ZHWn6viXthG+GV/fw19vKBhNP4FCYXDetb1w8v731klgTqKZPBe4b/xpIl9Seih75QA8eEh4hFPS9iAy9mltjs7h6yuSLB6Ps+exdumzFZEz7Dyz5Nkr7sPBJpZhR+bOOJFRE1SC3FYgA/N45lXc63X0SDhpgcgPLSCozhb3M6NWJ+0qtP4XAOOJkY6485RD++/yrx5tPIsrBIh24WOjgD/T1+SKZidx1q1vx7VgblReEwIDAQAB',
             'app_cert_public_key' => '',
-            'alipay_root_cert'    => '',
-            'log'                 => '1',
-            'scanpay'             => '0',
+            'alipay_root_cert' => '',
+            'log' => '1',
+            'scanpay' => '0',
         ],
-        'rule'    => 'required',
-        'msg'     => '',
-        'tip'     => '支付宝参数配置',
-        'ok'      => '',
-        'extend'  => '',
+        'rule' => 'required',
+        'msg' => '',
+        'tip' => '支付宝参数配置',
+        'ok' => '',
+        'extend' => '',
     ],
     [
-        'name'    => '__tips__',
-        'title'   => '温馨提示',
-        'type'    => 'array',
+        'name' => '__tips__',
+        'title' => '温馨提示',
+        'type' => 'array',
         'content' => [],
-        'value'   => '请注意微信支付证书路径位于/addons/epay/certs目录下,请替换成你自己的证书<br>appid:APP的appid<br>app_id:公众号的appid<br>app_secret:公众号的secret<br>miniapp_id:小程序ID<br>mch_id:微信商户ID<br>key:微信商户支付的密钥',
-        'rule'    => '',
-        'msg'     => '',
-        'tip'     => '微信参数配置',
-        'ok'      => '',
-        'extend'  => '',
+        'value' => '请注意微信支付证书路径位于/addons/epay/certs目录下,请替换成你自己的证书<br>appid:APP的appid<br>app_id:公众号的appid<br>app_secret:公众号的secret<br>miniapp_id:小程序ID<br>mch_id:微信商户ID<br>key:微信商户支付的密钥',
+        'rule' => '',
+        'msg' => '',
+        'tip' => '微信参数配置',
+        'ok' => '',
+        'extend' => '',
     ],
 ];

+ 1 - 1
application/api/controller/MobileController.php

@@ -219,7 +219,7 @@ class MobileController extends UserApi
             'pay_url'=>'',
         ];
         $payment=Payment::create([
-            'order_no'=>session_create_id('payment'),
+            'order_no'=>session_create_id('mo'),
             'amount'=>$mobileOrder['amount'],
             'mobile_order_id'=>$mobileOrder['id'],
         ]);