stanley-king 4 年之前
父節點
當前提交
48e945ebc4

+ 2 - 2
data/api/pub_wxpay/lib/WxPay.Config.php

@@ -24,10 +24,10 @@ class WxPayConfig
 	 * 获取地址:https://mp.weixin.qq.com/advanced/advanced?action=dev&t=advanced/dev&token=2005451881&lang=zh_CN
 	 * @var string
 	 */
-	const APPID = MINIPAY_WXPAY_APPID;
+	const APPID = PUB_APPID;
 	const MCHID = MINIPAY_WXPAY_MCHID;
 	const KEY   = MINIPAY_WXPAY_KEY; //'0f86a4a9b1edb51b1a7d110fa223a157';
-	const APPSECRET = MINIPAY_WXPAY_APPSECRET; //'ee64233b3144d76217161666f8cb4c86';
+	const APPSECRET = PUB_APPSECRET; //'ee64233b3144d76217161666f8cb4c86';
 
 	//=======【证书路径设置】=====================================
 	/**

+ 12 - 12
data/config/dev/pay.ini.php

@@ -24,11 +24,11 @@ define('WX_SSLKEY_PATH',  '../cert/panda_key.pem');
 
 //H5端,用户身份信息授权用的,数据来自 公众号->设置->基本配置
 //SIGN_APPID 和 AUTHOR_APPID是相同的.
-define('SIGN_APPID',       'wx38f1d15c5337e89b');
-define('SIGN_APPSECRET',   'fd6436e7427476dbe71a6333b3b02a96');
+define('PUB_APPID',       'wx38f1d15c5337e89b');
+define('PUB_APPSECRET',   'fd6436e7427476dbe71a6333b3b02a96');
 
-define('AUTHOR_APPID',       'wx38f1d15c5337e89b');
-define('AUTHOR_APPSECRET',   'fd6436e7427476dbe71a6333b3b02a96');
+define('PUB_APPID',       'wx38f1d15c5337e89b');
+define('PUB_APPSECRET',   'fd6436e7427476dbe71a6333b3b02a96');
 
 //for panda
 //define(ALIPAY_PATH, BASE_DATA_PATH . '/api/alipay');
@@ -49,10 +49,10 @@ define('AUTHOR_APPSECRET',   'fd6436e7427476dbe71a6333b3b02a96');
 //define(WX_SSLCERT_PATH, '../cert/panda_cert.pem');
 //define(WX_SSLKEY_PATH,  '../cert/panda_key.pem');
 //
-//define(SIGN_APPID,       'wx6b42e00ecaade538');
-//define(SIGN_APPSECRET,   'ee64233b3144d76217161666f8cb4c86');
-//define(AUTHOR_APPID,       'wx6b42e00ecaade538');
-//define(AUTHOR_APPSECRET,   'ee64233b3144d76217161666f8cb4c86');
+//define(PUB_APPID,       'wx6b42e00ecaade538');
+//define(PUB_APPSECRET,   'ee64233b3144d76217161666f8cb4c86');
+//define(PUB_APPID,       'wx6b42e00ecaade538');
+//define(PUB_APPSECRET,   'ee64233b3144d76217161666f8cb4c86');
 
 
 //for car
@@ -75,7 +75,7 @@ define('AUTHOR_APPSECRET',   'fd6436e7427476dbe71a6333b3b02a96');
 //define(WX_SSLCERT_PATH, '../cert/car_cert.pem');
 //define(WX_SSLKEY_PATH,  '../cert/car_key.pem');
 //
-//define(SIGN_APPID,       'wxaf698e1cc5f2073b');
-//define(SIGN_APPSECRET,   'da0547505e7bd29a50cdf662cc7b559a');
-//define(AUTHOR_APPID,       'wxaf698e1cc5f2073b');
-//define(AUTHOR_APPSECRET,   'da0547505e7bd29a50cdf662cc7b559a');
+//define(PUB_APPID,       'wxaf698e1cc5f2073b');
+//define(PUB_APPSECRET,   'da0547505e7bd29a50cdf662cc7b559a');
+//define(PUB_APPID,       'wxaf698e1cc5f2073b');
+//define(PUB_APPSECRET,   'da0547505e7bd29a50cdf662cc7b559a');

+ 2 - 5
data/config/prod/pay.ini.php

@@ -26,8 +26,5 @@ define('WX_SSLKEY_PATH',  '../cert/xyz_key.pem');
 
 //H5端,用户身份信息授权用的,数据来自 公众号->设置->基本配置
 //SIGN_APPID 和 AUTHOR_APPID是相同的.
-define('SIGN_APPID',       'wx38f1d15c5337e89b');
-define('SIGN_APPSECRET',   'fd6436e7427476dbe71a6333b3b02a96');
-
-define('AUTHOR_APPID',       'wx38f1d15c5337e89b');
-define('AUTHOR_APPSECRET',   'fd6436e7427476dbe71a6333b3b02a96');
+define('PUB_APPID',       'wx38f1d15c5337e89b');
+define('PUB_APPSECRET',   'fd6436e7427476dbe71a6333b3b02a96');

+ 4 - 4
data/config/test/pay.ini.php

@@ -20,8 +20,8 @@ define('OPENWX_APPSECRET',   '41f93fef3207e917e742b9ebcd540cb2');
 define('WX_SSLCERT_PATH', '../cert/panda_cert.pem');
 define('WX_SSLKEY_PATH',  '../cert/panda_key.pem');
 
-define('SIGN_APPID',       'wx4139a76ccb1f74b3');
-define('SIGN_APPSECRET',   '708ce8faa4ec48ba689b03e8fa7e592c');
+define('PUB_APPID',       'wx4139a76ccb1f74b3');
+define('PUB_APPSECRET',   '708ce8faa4ec48ba689b03e8fa7e592c');
 
-define('AUTHOR_APPID',       'wx4139a76ccb1f74b3');
-define('AUTHOR_APPSECRET',   '708ce8faa4ec48ba689b03e8fa7e592c');
+define('PUB_APPID',       'wx4139a76ccb1f74b3');
+define('PUB_APPSECRET',   '708ce8faa4ec48ba689b03e8fa7e592c');

+ 2 - 2
helper/third_author/signaturer.php

@@ -17,8 +17,8 @@ use Log;
 
 class signaturer
 {
-    const appid = SIGN_APPID;
-    const appsecret = SIGN_APPSECRET;
+    const appid = PUB_APPID;
+    const appsecret = PUB_APPSECRET;
 
     const access_token_url = "https://api.weixin.qq.com/cgi-bin/token";
     const ticket_url = "https://api.weixin.qq.com/cgi-bin/ticket/getticket";

+ 2 - 2
helper/third_author/wxauthor.php

@@ -18,8 +18,8 @@ use wechat_helper;
 
 class wxauthor
 {
-    const appid = AUTHOR_APPID;
-    const appsecret = AUTHOR_APPSECRET;
+    const appid = PUB_APPID;
+    const appsecret = PUB_APPSECRET;
 
     const authorize_url = 'https://open.weixin.qq.com/connect/oauth2/authorize';
     const access_token_url = 'https://api.weixin.qq.com/sns/oauth2/access_token';