作者 郭盛
1 个管道 的构建 通过 耗费 8 秒

修改

此 diff 太大无法显示。
@@ -257,7 +257,9 @@ return [ @@ -257,7 +257,9 @@ return [
257 'cmf_admin_default_theme' => 'simpleboot3', 257 'cmf_admin_default_theme' => 'simpleboot3',
258 258
259 //小程序配置 259 //小程序配置
260 - 'app_id'=>'wxf35ab92c5bd897b2',  
261 - 'app_secret'=>'18ae3d2d5d18a646a792f4468a3e0e9f', 260 + 'app_id'=>'wxd7010deb3b696146',
  261 + 'app_secret'=>'282f4cc8536523076c9d16af6331ffb6',
  262 + 'wx_mch_id' => '1563087351',
  263 + 'wx_pay_key' => 'P1GSxsjA4Ts3g6V95FVE49bNQLClGckS',
262 264
263 ]; 265 ];
@@ -106,4 +106,5 @@ class OrderController extends RestBaseController @@ -106,4 +106,5 @@ class OrderController extends RestBaseController
106 ->find(); 106 ->find();
107 return $openid; 107 return $openid;
108 } 108 }
  109 +
109 } 110 }
@@ -20,11 +20,11 @@ class PayController extends HomeBaseController @@ -20,11 +20,11 @@ class PayController extends HomeBaseController
20 { 20 {
21 parent::_initialize(); 21 parent::_initialize();
22 $this->options = [ 22 $this->options = [
23 - 'app_id' => 'wxc6ef42cbfc3497cf',  
24 - 'secret' => '752789aeeb5b72a97e733c79d060e1d4', 23 + 'app_id' => 'wxd7010deb3b696146',
  24 + 'secret' => '282f4cc8536523076c9d16af6331ffb6',
25 'payment' => [ 25 'payment' => [
26 - 'merchant_id' => '1549007421',  
27 - 'key' => 'Y9ajUyikFR9QwVuusDwhZXwGy8dqy8gE', 26 + 'merchant_id' => '1563087351',
  27 + 'key' => 'P1GSxsjA4Ts3g6V95FVE49bNQLClGckS',
28 'cert_path' => '../wechat/cert/apiclient_cert.pem', // XXX: 绝对路径!!!! 28 'cert_path' => '../wechat/cert/apiclient_cert.pem', // XXX: 绝对路径!!!!
29 'key_path' => '../wechat/cert/apiclient_key.pem', // XXX: 绝对路径!!!! 29 'key_path' => '../wechat/cert/apiclient_key.pem', // XXX: 绝对路径!!!!
30 ] 30 ]
@@ -191,4 +191,23 @@ class UserController extends RestBaseController @@ -191,4 +191,23 @@ class UserController extends RestBaseController
191 ->select(); 191 ->select();
192 $this->success('SUCCESS',$data); 192 $this->success('SUCCESS',$data);
193 } 193 }
  194 +
  195 + /**
  196 + * @title 提现
  197 + * @author Guosheng
  198 + * @url /index/order/pay
  199 + * @method GET
  200 + *
  201 + * @header name:XX-Token require:1 default: desc:token
  202 + *
  203 + * @param name:order_id type:int require:1 other: desc:订单id
  204 + */
  205 + public function deposit()
  206 + {
  207 + $id = $this->getUserId();
  208 +
  209 + }
  210 +
  211 +
  212 +
194 } 213 }
@@ -234,7 +234,7 @@ $configs = [ @@ -234,7 +234,7 @@ $configs = [
234 'cmf_admin_default_theme' => 'admin_simpleboot3', 234 'cmf_admin_default_theme' => 'admin_simpleboot3',
235 235
236 //公众号配置 236 //公众号配置
237 - 'app_id'=>'wxf35ab92c5bd897b2',  
238 - 'app_secret'=>'18ae3d2d5d18a646a792f4468a3e0e9f', 237 + 'app_id'=>'wxd7010deb3b696146',
  238 + 'app_secret'=>'282f4cc8536523076c9d16af6331ffb6',
239 ]; 239 ];
240 return array_merge($configs, $runtimeConfig,$wechatConfig); 240 return array_merge($configs, $runtimeConfig,$wechatConfig);