1

application/api/controller/Certificate.php

@@ -14,6 +14,7 @@ use app\common\controller\Api;
 
 class Certificate extends Api
 {
+    protected $noNeedLogin = [];
     protected $noNeedRight = [];
 
     /**

application/api/controller/Pay.php

@@ -12,6 +12,7 @@ use app\admin\model\order\OrderGoods;
 use app\admin\model\order\UserGoods;
 use app\common\controller\Api;
 use EasyWeChat\Factory;
+use think\Db;
 use Yansongda\Pay\Pay as YansongdaPay;
 use Yansongda\Pay\Log;
 
@@ -21,12 +22,15 @@ class Pay extends Api
      * 微信支付
      *
      */
-    public function wxpay($arr){
+    public function wxpay($arr = ''){
+        $app_id = Db::name('config')->where('name','app_id')->value('value');
+        $mch_id = Db::name('config')->where('name','mch_id')->value('value');
+        $key = Db::name('config')->where('name','key')->value('value');
         $config = [
             // 必要配置
-            'app_id'             => 'xxxx',
-            'mch_id'             => 'your-mch-id',
-            'key'                => 'key-for-signature',   // API v2 密钥 (注意: 是v2密钥 是v2密钥 是v2密钥)
+            'app_id'             => $app_id,
+            'mch_id'             => $mch_id,
+            'key'                => $key,   // API v2 密钥 (注意: 是v2密钥 是v2密钥 是v2密钥)
 
             // 如需使用敏感接口（如退款、发送红包等）需要配置 API 证书路径(登录商户平台下载 API 证书)
             'cert_path'          => 'path/to/your/cert.pem', // XXX: 绝对路径！！！！
@@ -57,11 +61,14 @@ class Pay extends Api
      *
      */
     public function wxnotify(){
+        $app_id = Db::name('config')->where('name','app_id')->value('value');
+        $mch_id = Db::name('config')->where('name','mch_id')->value('value');
+        $key = Db::name('config')->where('name','key')->value('value');
         $config = [
             // 必要配置
-            'app_id'             => 'xxxx',
-            'mch_id'             => 'your-mch-id',
-            'key'                => 'key-for-signature',   // API v2 密钥 (注意: 是v2密钥 是v2密钥 是v2密钥)
+            'app_id'             => $app_id,
+            'mch_id'             => $mch_id,
+            'key'                => $key,   // API v2 密钥 (注意: 是v2密钥 是v2密钥 是v2密钥)
 
             // 如需使用敏感接口（如退款、发送红包等）需要配置 API 证书路径(登录商户平台下载 API 证书)
             'cert_path'          => 'path/to/your/cert.pem', // XXX: 绝对路径！！！！
@@ -90,7 +97,8 @@ class Pay extends Api
                     $OrderModel = new Order();
                     $order = $OrderModel->where('order_on',$message['out_trade_no'])->find();
                     $o_arr = [
-                        'status' => 1
+                        'status' => 1,
+                        'paytime' => date('Y-m-d H:i:s')
                     ];
                     $OrderModel->where('id',$order['id'])->update($o_arr);
 
@@ -127,12 +135,15 @@ class Pay extends Api
      *
      */
     public function alipay($arr){
+        $app_id = Db::name('config')->where('name','ali_app_id')->value('value');
+        $ali_public_key = Db::name('config')->where('name','ali_public_key')->value('value');
+        $private_key = Db::name('config')->where('name','private_key')->value('value');
         $config = [
-            'app_id' => '2016082000295641',
+            'app_id' => $app_id,
             'notify_url' => 'https://'.$_SERVER['HTTP_HOST'].'/api/pay/wxnotify',
             'return_url' => 'http://yansongda.cn/return.php',
-            'ali_public_key' => 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuWJKrQ6SWvS6niI+4vEVZiYfjkCfLQfoFI2nCp9ZLDS42QtiL4Ccyx8scgc3nhVwmVRte8f57TFvGhvJD0upT4O5O/lRxmTjechXAorirVdAODpOu0mFfQV9y/T9o9hHnU+VmO5spoVb3umqpq6D/Pt8p25Yk852/w01VTIczrXC4QlrbOEe3sr1E9auoC7rgYjjCO6lZUIDjX/oBmNXZxhRDrYx4Yf5X7y8FRBFvygIE2FgxV4Yw+SL3QAa2m5MLcbusJpxOml9YVQfP8iSurx41PvvXUMo49JG3BDVernaCYXQCoUJv9fJwbnfZd7J5YByC+5KM4sblJTq7bXZWQIDAQAB',
-            'private_key' => 'MIIEpAIBAAKCAQEAs6+F2leOgOrvj9jTeDhb5q46GewOjqLBlGSs/bVL4Z3fMr3p+Q1Tux/6uogeVi/eHd84xvQdfpZ87A1SfoWnEGH5z15yorccxSOwWUI+q8gz51IWqjgZxhWKe31BxNZ+prnQpyeMBtE25fXp5nQZ/pftgePyUUvUZRcAUisswntobDQKbwx28VCXw5XB2A+lvYEvxmMv/QexYjwKK4M54j435TuC3UctZbnuynSPpOmCu45ZhEYXd4YMsGMdZE5/077ZU1aU7wx/gk07PiHImEOCDkzqsFo0Buc/knGcdOiUDvm2hn2y1XvwjyFOThsqCsQYi4JmwZdRa8kvOf57nwIDAQABAoIBAQCw5QCqln4VTrTvcW+msB1ReX57nJgsNfDLbV2dG8mLYQemBa9833DqDK6iynTLNq69y88ylose33o2TVtEccGp8Dqluv6yUAED14G6LexS43KtrXPgugAtsXE253ZDGUNwUggnN1i0MW2RcMqHdQ9ORDWvJUCeZj/AEafgPN8AyiLrZeL07jJz/uaRfAuNqkImCVIarKUX3HBCjl9TpuoMjcMhz/MsOmQ0agtCatO1eoH1sqv5Odvxb1i59c8Hvq/mGEXyRuoiDo05SE6IyXYXr84/Nf2xvVNHNQA6kTckj8shSi+HGM4mO1Y4Pbb7XcnxNkT0Inn6oJMSiy56P+CpAoGBAO1O+5FE1ZuVGuLb48cY+0lHCD+nhSBd66B5FrxgPYCkFOQWR7pWyfNDBlmO3SSooQ8TQXA25blrkDxzOAEGX57EPiipXr/hy5e+WNoukpy09rsO1TMsvC+v0FXLvZ+TIAkqfnYBgaT56ku7yZ8aFGMwdCPL7WJYAwUIcZX8wZ3dAoGBAMHWplAqhe4bfkGOEEpfs6VvEQxCqYMYVyR65K0rI1LiDZn6Ij8fdVtwMjGKFSZZTspmsqnbbuCE/VTyDzF4NpAxdm3cBtZACv1Lpu2Om+aTzhK2PI6WTDVTKAJBYegXaahBCqVbSxieR62IWtmOMjggTtAKWZ1P5LQcRwdkaB2rAoGAWnAPT318Kp7YcDx8whOzMGnxqtCc24jvk2iSUZgb2Dqv+3zCOTF6JUsV0Guxu5bISoZ8GdfSFKf5gBAo97sGFeuUBMsHYPkcLehM1FmLZk1Q+ljcx3P1A/ds3kWXLolTXCrlpvNMBSN5NwOKAyhdPK/qkvnUrfX8sJ5XK2H4J8ECgYAGIZ0HIiE0Y+g9eJnpUFelXvsCEUW9YNK4065SD/BBGedmPHRC3OLgbo8X5A9BNEf6vP7fwpIiRfKhcjqqzOuk6fueA/yvYD04v+Da2MzzoS8+hkcqF3T3pta4I4tORRdRfCUzD80zTSZlRc/h286Y2eTETd+By1onnFFe2X01mwKBgQDaxo4PBcLL2OyVT5DoXiIdTCJ8KNZL9+kV1aiBuOWxnRgkDjPngslzNa1bK+klGgJNYDbQqohKNn1HeFX3mYNfCUpuSnD2Yag53Dd/1DLO+NxzwvTu4D6DCUnMMMBVaF42ig31Bs0jI3JQZVqeeFzSET8fkoFopJf3G6UXlrIEAQ==',
+            'ali_public_key' => $ali_public_key,
+            'private_key' => $private_key,
             'log' => [ // optional
                 'file' => './logs/alipay.log',
                 'level' => 'info', // 建议生产环境等级调整为 info，开发环境为 debug
@@ -167,12 +178,15 @@ class Pay extends Api
 
     public function alinotify()
     {
+        $app_id = Db::name('config')->where('name','ali_app_id')->value('value');
+        $ali_public_key = Db::name('config')->where('name','ali_public_key')->value('value');
+        $private_key = Db::name('config')->where('name','private_key')->value('value');
         $config = [
-            'app_id' => '2016082000295641',
+            'app_id' => $app_id,
             'notify_url' => 'http://yansongda.cn/notify.php',
             'return_url' => 'http://yansongda.cn/return.php',
-            'ali_public_key' => 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuWJKrQ6SWvS6niI+4vEVZiYfjkCfLQfoFI2nCp9ZLDS42QtiL4Ccyx8scgc3nhVwmVRte8f57TFvGhvJD0upT4O5O/lRxmTjechXAorirVdAODpOu0mFfQV9y/T9o9hHnU+VmO5spoVb3umqpq6D/Pt8p25Yk852/w01VTIczrXC4QlrbOEe3sr1E9auoC7rgYjjCO6lZUIDjX/oBmNXZxhRDrYx4Yf5X7y8FRBFvygIE2FgxV4Yw+SL3QAa2m5MLcbusJpxOml9YVQfP8iSurx41PvvXUMo49JG3BDVernaCYXQCoUJv9fJwbnfZd7J5YByC+5KM4sblJTq7bXZWQIDAQAB',
-            'private_key' => 'MIIEpAIBAAKCAQEAs6+F2leOgOrvj9jTeDhb5q46GewOjqLBlGSs/bVL4Z3fMr3p+Q1Tux/6uogeVi/eHd84xvQdfpZ87A1SfoWnEGH5z15yorccxSOwWUI+q8gz51IWqjgZxhWKe31BxNZ+prnQpyeMBtE25fXp5nQZ/pftgePyUUvUZRcAUisswntobDQKbwx28VCXw5XB2A+lvYEvxmMv/QexYjwKK4M54j435TuC3UctZbnuynSPpOmCu45ZhEYXd4YMsGMdZE5/077ZU1aU7wx/gk07PiHImEOCDkzqsFo0Buc/knGcdOiUDvm2hn2y1XvwjyFOThsqCsQYi4JmwZdRa8kvOf57nwIDAQABAoIBAQCw5QCqln4VTrTvcW+msB1ReX57nJgsNfDLbV2dG8mLYQemBa9833DqDK6iynTLNq69y88ylose33o2TVtEccGp8Dqluv6yUAED14G6LexS43KtrXPgugAtsXE253ZDGUNwUggnN1i0MW2RcMqHdQ9ORDWvJUCeZj/AEafgPN8AyiLrZeL07jJz/uaRfAuNqkImCVIarKUX3HBCjl9TpuoMjcMhz/MsOmQ0agtCatO1eoH1sqv5Odvxb1i59c8Hvq/mGEXyRuoiDo05SE6IyXYXr84/Nf2xvVNHNQA6kTckj8shSi+HGM4mO1Y4Pbb7XcnxNkT0Inn6oJMSiy56P+CpAoGBAO1O+5FE1ZuVGuLb48cY+0lHCD+nhSBd66B5FrxgPYCkFOQWR7pWyfNDBlmO3SSooQ8TQXA25blrkDxzOAEGX57EPiipXr/hy5e+WNoukpy09rsO1TMsvC+v0FXLvZ+TIAkqfnYBgaT56ku7yZ8aFGMwdCPL7WJYAwUIcZX8wZ3dAoGBAMHWplAqhe4bfkGOEEpfs6VvEQxCqYMYVyR65K0rI1LiDZn6Ij8fdVtwMjGKFSZZTspmsqnbbuCE/VTyDzF4NpAxdm3cBtZACv1Lpu2Om+aTzhK2PI6WTDVTKAJBYegXaahBCqVbSxieR62IWtmOMjggTtAKWZ1P5LQcRwdkaB2rAoGAWnAPT318Kp7YcDx8whOzMGnxqtCc24jvk2iSUZgb2Dqv+3zCOTF6JUsV0Guxu5bISoZ8GdfSFKf5gBAo97sGFeuUBMsHYPkcLehM1FmLZk1Q+ljcx3P1A/ds3kWXLolTXCrlpvNMBSN5NwOKAyhdPK/qkvnUrfX8sJ5XK2H4J8ECgYAGIZ0HIiE0Y+g9eJnpUFelXvsCEUW9YNK4065SD/BBGedmPHRC3OLgbo8X5A9BNEf6vP7fwpIiRfKhcjqqzOuk6fueA/yvYD04v+Da2MzzoS8+hkcqF3T3pta4I4tORRdRfCUzD80zTSZlRc/h286Y2eTETd+By1onnFFe2X01mwKBgQDaxo4PBcLL2OyVT5DoXiIdTCJ8KNZL9+kV1aiBuOWxnRgkDjPngslzNa1bK+klGgJNYDbQqohKNn1HeFX3mYNfCUpuSnD2Yag53Dd/1DLO+NxzwvTu4D6DCUnMMMBVaF42ig31Bs0jI3JQZVqeeFzSET8fkoFopJf3G6UXlrIEAQ==',
+            'ali_public_key' => $ali_public_key,
+            'private_key' => $private_key,
             'log' => [ // optional
                 'file' => './logs/alipay.log',
                 'level' => 'info', // 建议生产环境等级调整为 info，开发环境为 debug
@@ -209,7 +223,8 @@ class Pay extends Api
                 $OrderModel = new Order();
                 $order = $OrderModel->where('order_on',$data->out_trade_no)->find();
                 $o_arr = [
-                    'status' => 1
+                    'status' => 1,
+                    'paytime' => date('Y-m-d H:i:s')
                 ];
                 $OrderModel->where('id',$order['id'])->update($o_arr);