为微信调整return_url规则

testwhite · Mar 22, 2019 · 995eec4 · 995eec4
1 parent 3571f50
commit 995eec4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/application/Bootstrap.php b/application/Bootstrap.php
@@ -39,7 +39,12 @@ public function _initRoute() {
             array(1 => 'zlkbmethod',2 => 'orderid')
         );
         $router->addRoute('order_query', $order_query);	
-
+        $order_notify = new Yaf\Route\Regex(
+            '#notify/([0-9A-Za-z]+).html#',
+            array('module' => 'product', 'controller' => 'notify', 'action' => 'index'),
+            array(1 => 'paymethod')
+        );
+        $router->addRoute('order_notify', $order_notify);			
 	}
 
     public function _initPlugin(\Yaf\Dispatcher $dispatcher)

diff --git a/application/library/Pay/wxf2f/wxf2f.php b/application/library/Pay/wxf2f/wxf2f.php
@@ -30,7 +30,7 @@ public function pay($payconfig,$params)
 			'app_key_pem' => LIB_PATH.'Pay/'.$this->paymethod.'/pem/weixin_app_key.pem',
 			'fee_type'  => 'CNY',
 			'redirect_url' => $params['weburl']. "/query/auto/{$params['orderid']}.html",
-			'notify_url' => $params['weburl'] . '/product/notify/?paymethod='.$this->paymethod,
+			'notify_url' => $params['weburl'] . "/notify/{$this->paymethod}.html",
 			'return_raw' => false
 		];
 

diff --git a/application/library/Pay/wxh5/wxh5.php b/application/library/Pay/wxh5/wxh5.php
@@ -30,7 +30,7 @@ public function pay($payconfig,$params)
 			'app_key_pem' => LIB_PATH.'Pay/'.$this->paymethod.'/pem/weixin_app_key.pem',
 			'fee_type'  => 'CNY',
 			'redirect_url' => $params['weburl']. "/query/auto/{$params['orderid']}.html",
-			'notify_url' => $params['weburl'] . '/product/notify/?paymethod='.$this->paymethod,
+			'notify_url' => $params['weburl'] . "/notify/{$this->paymethod}.html",
 			'return_raw' => false
 		];