wesmiler 6 mēneši atpakaļ
vecāks
revīzija
5b6a8ffe5f

+ 11 - 7
app/Services/Api/MemberService.php

@@ -158,6 +158,11 @@ class MemberService extends BaseService
             $phone = isset($phoneData['phoneNumber'])? $phoneData['phoneNumber'] : '';
         }
 
+        if(empty($phone)){
+            $this->error = 2014;
+            return false;
+        }
+
         $userInfo = MpService::make()->getUserInfo($code);
         $openid = isset($userInfo['openid'])? $userInfo['openid'] : '';
         if(empty($userInfo)){
@@ -170,12 +175,8 @@ class MemberService extends BaseService
             return false;
         }
 
-        $where = ['openid' => $openid, 'mark' => 1];
-        if($phone){
-            $where['mobile'] = $phone;
-        }
-
         // 验证是否注册,没有则注册
+        $where = ['mobile'=>$phone,'mark' => 1];
         $data = $this->model->where($where)
             ->select(['id','openid', 'mobile', 'user_type', 'nickname','entry_type','need_paper', 'code', 'status'])
             ->first();
@@ -198,7 +199,7 @@ class MemberService extends BaseService
         if(empty($data)){
             // 手机号码验证
             if($this->model->where(['mobile'=> $phone,'mark'=>1])->value('id')){
-                $this->error = 2013;
+                $this->error = 2014;
                 return false;
             }
 
@@ -232,10 +233,13 @@ class MemberService extends BaseService
                 'app_version'=> $version,
                 'device'=> $appSources=='ios'? 1 : 2,
             ];
+            if($openid){
+                $updateData['openid'] = $openid;
+            }
             $this->model->where(['id'=> $userId])->update($updateData);
             RedisService::set("caches:members:login_{$userId}",$updateData, rand(180,300));
         }
- 
+
         // 获取登录授权token
         $jwt = new Jwt('jwt_jd_app');
         $token = $jwt->getToken($userId);

+ 2 - 6
config/payment.php

@@ -1,11 +1,7 @@
 <?php
 return [
     'accountTypes'=>[
-        1=>'订单收入',
-        2=>'充值保证金',
-        3=>'退保申请',
-        4=>'收入提现',
-        5=>'提现驳回',
+        1=>'购买VIP',
     ],
     'wechat' => [
         'wechat'=>[
@@ -22,7 +18,7 @@ return [
                 'wechat_public_cert_path' => [
                     //前面是证书***,登录商户平台【API安全】->【API证书】->【查看证书】,可查看商户API证书***
                     //后面是通过前面的配置生成的文件 参考:http://www.liziyu.com/archives/309/
-                    'PUB_KEY_ID_0117250041532025081400112188001803' => base_path().'/resources/certs/wechat/pub_key.pem',
+                    'PUB_KEY_ID_0117065616682025092600111825001600' => base_path().'/resources/certs/wechat/pub_key.pem',
                 ],
                 // 必填
                 'notify_url' => '',

+ 0 - 43
resources/certs/alipay/alipayCertPublicKey_RSA2.crt

@@ -1,43 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDrzCCApegAwIBAgIQICUHEFMvCbLzDUxgQKOpjjANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
-BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs
-YXNzIDIgUjEwHhcNMjUwNzEwMDQ1ODUwWhcNMzAwNzA5MDQ1ODUwWjCBjzELMAkGA1UEBhMCQ04x
-KjAoBgNVBAoMIeS6s+W3nuW4guS4sOiDnOWVhui0uOaciemZkOWFrOWPuDEPMA0GA1UECwwGQWxp
-cGF5MUMwQQYDVQQDDDrmlK/ku5jlrp0o5Lit5Zu9Kee9kee7nOaKgOacr+aciemZkOWFrOWPuC0y
-MDg4NjcwNzMzNjA2NTEwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo7yafbOa6tEq
-j3FCBFPcY4xfQNi6/OcHM6bPRKJTQcEsUXIpLuc31ZwKNTnjD1PUnbasnzWmHRw/28FCnUnyB1IJ
-Tb2/q93HDFNqKyFWaUmxONtASjJtN2YT7og61gzVZVdZOYdtG1aUAIzgIoULaxwZqNk8sRpJd63S
-gTKtVSbSYJCPo092R2G2MUO/1+9rHnSjml0TDnbmlcCmbY1tC2iO4ShBuoCF3Q4gVbLsCk0Ym1KO
-MPFk6QopcjUJVoId+KpyUjL/N/sq0T53NEDHNENTETD/W5HVN52UU15dR6tG0rF8lf4bDrEz0qmT
-7/yiGrhkYrcW2jk57kGmVRQXgQIDAQABoxIwEDAOBgNVHQ8BAf8EBAMCA/gwDQYJKoZIhvcNAQEL
-BQADggEBAGOFbWTnnAZ9sIYhPIWde5u5CKCl4puqgilwjfX/twlxFm29aukWussZobr3pfbFhA7c
-19ci1M7hzyIm3mUCuKKfqZstqlGPjvjoa+5k4KTI5j8WRG9XyfNYZQk2560kOZHg853OtwfT1rs8
-vnDQCgf9ZgD9iFENusffXRryaCwPnUzeU2nLEZVk9kqpcJSHUHDrfIAOwqGQO7cSlUhlboOuY2BV
-VWEeeaaGP0ww6DGLXPqeHG/j939RG2IR/gmNQiWx4/7ZLSnwhg3hq13WclbK3g+hAYJ39EYNZX2S
-/YpLLvGJoRWcvTouEgmeI1I0xetqcmT/uMJzJueFIP3Sw0k=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIE4jCCAsqgAwIBAgIIYsSr5bKAMl8wDQYJKoZIhvcNAQELBQAwejELMAkGA1UEBhMCQ04xFjAU
-BgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MTEw
-LwYDVQQDDChBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFIxMB4XDTE4MDMy
-MjE0MzQxNVoXDTM3MTEyNjE0MzQxNVowgYIxCzAJBgNVBAYTAkNOMRYwFAYDVQQKDA1BbnQgRmlu
-YW5jaWFsMSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTE5MDcGA1UEAwwwQW50IEZp
-bmFuY2lhbCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBDbGFzcyAyIFIxMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAsLMfYaoRoPRbmDcAfXPCmKf43pWRN5yTXa/KJWO0l+mrgQvs89bA
-NEvbDUxlkGwycwtwi5DgBuBgVhLliXu+R9CYgr2dXs8D8Hx/gsggDcyGPLmVrDOnL+dyeauheARZ
-fA3du60fwEwwbGcVIpIxPa/4n3IS/ElxQa6DNgqxh8J9Xwh7qMGl0JK9+bALuxf7B541Gr4p0WEN
-G8fhgjBV4w4ut9eQLOoa1eddOUSZcy46Z7allwowwgt7b5VFfx/P1iKJ3LzBMgkCK7GZ2kiLrL7R
-iqV+h482J7hkJD+ardoc6LnrHO/hIZymDxok+VH9fVeUdQa29IZKrIDVj65THQIDAQABo2MwYTAf
-BgNVHSMEGDAWgBRfdLQEwE8HWurlsdsio4dBspzhATAdBgNVHQ4EFgQUSqHkYINtUSAtDPnS8Xoy
-oP9p7qEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggIB
-AIQ8TzFy4bVIVb8+WhHKCkKNPcJe2EZuIcqvRoi727lZTJOfYy/JzLtckyZYfEI8J0lasZ29wkTt
-a1IjSo+a6XdhudU4ONVBrL70U8Kzntplw/6TBNbLFpp7taRALjUgbCOk4EoBMbeCL0GiYYsTS0mw
-7xdySzmGQku4GTyqutIGPQwKxSj9iSFw1FCZqr4VP4tyXzMUgc52SzagA6i7AyLedd3tbS6lnR5B
-L+W9Kx9hwT8L7WANAxQzv/jGldeuSLN8bsTxlOYlsdjmIGu/C9OWblPYGpjQQIRyvs4Cc/mNhrh+
-14EQgwuemIIFDLOgcD+iISoN8CqegelNcJndFw1PDN6LkVoiHz9p7jzsge8RKay/QW6C03KNDpWZ
-EUCgCUdfHfo8xKeR+LL1cfn24HKJmZt8L/aeRZwZ1jwePXFRVtiXELvgJuM/tJDIFj2KD337iV64
-fWcKQ/ydDVGqfDZAdcU4hQdsrPWENwPTQPfVPq2NNLMyIH9+WKx9Ed6/WzeZmIy5ZWpX1TtTolo6
-OJXQFeItMAjHxW/ZSZTok5IS3FuRhExturaInnzjYpx50a6kS34c5+c8hYq7sAtZ/CNLZmBnBCFD
-aMQqT8xFZJ5uolUaSeXxg7JFY1QsYp5RKvj4SjFwCGKJ2+hPPe9UyyltxOidNtxjaknOCeBHytOr
------END CERTIFICATE-----

+ 0 - 88
resources/certs/alipay/alipayRootCert.crt

@@ -1,88 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBszCCAVegAwIBAgIIaeL+wBcKxnswDAYIKoEcz1UBg3UFADAuMQswCQYDVQQG
-EwJDTjEOMAwGA1UECgwFTlJDQUMxDzANBgNVBAMMBlJPT1RDQTAeFw0xMjA3MTQw
-MzExNTlaFw00MjA3MDcwMzExNTlaMC4xCzAJBgNVBAYTAkNOMQ4wDAYDVQQKDAVO
-UkNBQzEPMA0GA1UEAwwGUk9PVENBMFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAE
-MPCca6pmgcchsTf2UnBeL9rtp4nw+itk1Kzrmbnqo05lUwkwlWK+4OIrtFdAqnRT
-V7Q9v1htkv42TsIutzd126NdMFswHwYDVR0jBBgwFoAUTDKxl9kzG8SmBcHG5Yti
-W/CXdlgwDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFEwysZfZ
-MxvEpgXBxuWLYlvwl3ZYMAwGCCqBHM9VAYN1BQADSAAwRQIgG1bSLeOXp3oB8H7b
-53W+CKOPl2PknmWEq/lMhtn25HkCIQDaHDgWxWFtnCrBjH16/W3Ezn7/U/Vjo5xI
-pDoiVhsLwg==
------END CERTIFICATE-----
-
------BEGIN CERTIFICATE-----
-MIIF0zCCA7ugAwIBAgIIH8+hjWpIDREwDQYJKoZIhvcNAQELBQAwejELMAkGA1UE
-BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5MTEwLwYDVQQDDChBbnQgRmluYW5jaWFsIENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5IFIxMB4XDTE4MDMyMTEzNDg0MFoXDTM4MDIyODEzNDg0
-MFowejELMAkGA1UEBhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNV
-BAsMF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MTEwLwYDVQQDDChBbnQgRmluYW5j
-aWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFIxMIICIjANBgkqhkiG9w0BAQEF
-AAOCAg8AMIICCgKCAgEAtytTRcBNuur5h8xuxnlKJetT65cHGemGi8oD+beHFPTk
-rUTlFt9Xn7fAVGo6QSsPb9uGLpUFGEdGmbsQ2q9cV4P89qkH04VzIPwT7AywJdt2
-xAvMs+MgHFJzOYfL1QkdOOVO7NwKxH8IvlQgFabWomWk2Ei9WfUyxFjVO1LVh0Bp
-dRBeWLMkdudx0tl3+21t1apnReFNQ5nfX29xeSxIhesaMHDZFViO/DXDNW2BcTs6
-vSWKyJ4YIIIzStumD8K1xMsoaZBMDxg4itjWFaKRgNuPiIn4kjDY3kC66Sl/6yTl
-YUz8AybbEsICZzssdZh7jcNb1VRfk79lgAprm/Ktl+mgrU1gaMGP1OE25JCbqli1
-Pbw/BpPynyP9+XulE+2mxFwTYhKAwpDIDKuYsFUXuo8t261pCovI1CXFzAQM2w7H
-DtA2nOXSW6q0jGDJ5+WauH+K8ZSvA6x4sFo4u0KNCx0ROTBpLif6GTngqo3sj+98
-SZiMNLFMQoQkjkdN5Q5g9N6CFZPVZ6QpO0JcIc7S1le/g9z5iBKnifrKxy0TQjtG
-PsDwc8ubPnRm/F82RReCoyNyx63indpgFfhN7+KxUIQ9cOwwTvemmor0A+ZQamRe
-9LMuiEfEaWUDK+6O0Gl8lO571uI5onYdN1VIgOmwFbe+D8TcuzVjIZ/zvHrAGUcC
-AwEAAaNdMFswCwYDVR0PBAQDAgEGMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFF90
-tATATwda6uWx2yKjh0GynOEBMB8GA1UdIwQYMBaAFF90tATATwda6uWx2yKjh0Gy
-nOEBMA0GCSqGSIb3DQEBCwUAA4ICAQCVYaOtqOLIpsrEikE5lb+UARNSFJg6tpkf
-tJ2U8QF/DejemEHx5IClQu6ajxjtu0Aie4/3UnIXop8nH/Q57l+Wyt9T7N2WPiNq
-JSlYKYbJpPF8LXbuKYG3BTFTdOVFIeRe2NUyYh/xs6bXGr4WKTXb3qBmzR02FSy3
-IODQw5Q6zpXj8prYqFHYsOvGCEc1CwJaSaYwRhTkFedJUxiyhyB5GQwoFfExCVHW
-05ZFCAVYFldCJvUzfzrWubN6wX0DD2dwultgmldOn/W/n8at52mpPNvIdbZb2F41
-T0YZeoWnCJrYXjq/32oc1cmifIHqySnyMnavi75DxPCdZsCOpSAT4j4lAQRGsfgI
-kkLPGQieMfNNkMCKh7qjwdXAVtdqhf0RVtFILH3OyEodlk1HYXqX5iE5wlaKzDop
-PKwf2Q3BErq1xChYGGVS+dEvyXc/2nIBlt7uLWKp4XFjqekKbaGaLJdjYP5b2s7N
-1dM0MXQ/f8XoXKBkJNzEiM3hfsU6DOREgMc1DIsFKxfuMwX3EkVQM1If8ghb6x5Y
-jXayv+NLbidOSzk4vl5QwngO/JYFMkoc6i9LNwEaEtR9PhnrdubxmrtM+RjfBm02
-77q3dSWFESFQ4QxYWew4pHE0DpWbWy/iMIKQ6UZ5RLvB8GEcgt8ON7BBJeMc+Dyi
-kT9qhqn+lw==
------END CERTIFICATE-----
-
------BEGIN CERTIFICATE-----
-MIICiDCCAgygAwIBAgIIQX76UsB/30owDAYIKoZIzj0EAwMFADB6MQswCQYDVQQG
-EwJDTjEWMBQGA1UECgwNQW50IEZpbmFuY2lhbDEgMB4GA1UECwwXQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkxMTAvBgNVBAMMKEFudCBGaW5hbmNpYWwgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgRTEwHhcNMTkwNDI4MTYyMDQ0WhcNNDkwNDIwMTYyMDQ0
-WjB6MQswCQYDVQQGEwJDTjEWMBQGA1UECgwNQW50IEZpbmFuY2lhbDEgMB4GA1UE
-CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxMTAvBgNVBAMMKEFudCBGaW5hbmNp
-YWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgRTEwdjAQBgcqhkjOPQIBBgUrgQQA
-IgNiAASCCRa94QI0vR5Up9Yr9HEupz6hSoyjySYqo7v837KnmjveUIUNiuC9pWAU
-WP3jwLX3HkzeiNdeg22a0IZPoSUCpasufiLAnfXh6NInLiWBrjLJXDSGaY7vaokt
-rpZvAdmjXTBbMAsGA1UdDwQEAwIBBjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBRZ
-4ZTgDpksHL2qcpkFkxD2zVd16TAfBgNVHSMEGDAWgBRZ4ZTgDpksHL2qcpkFkxD2
-zVd16TAMBggqhkjOPQQDAwUAA2gAMGUCMQD4IoqT2hTUn0jt7oXLdMJ8q4vLp6sg
-wHfPiOr9gxreb+e6Oidwd2LDnC4OUqCWiF8CMAzwKs4SnDJYcMLf2vpkbuVE4dTH
-Rglz+HGcTLWsFs4KxLsq7MuU+vJTBUeDJeDjdA==
------END CERTIFICATE-----
-
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIUEMdk6dVgOEIS2cCP0Q43P90Ps5YwDQYJKoZIhvcNAQEF
-BQAwajELMAkGA1UEBhMCQ04xEzARBgNVBAoMCmlUcnVzQ2hpbmExHDAaBgNVBAsM
-E0NoaW5hIFRydXN0IE5ldHdvcmsxKDAmBgNVBAMMH2lUcnVzQ2hpbmEgQ2xhc3Mg
-MiBSb290IENBIC0gRzMwHhcNMTMwNDE4MDkzNjU2WhcNMzMwNDE4MDkzNjU2WjBq
-MQswCQYDVQQGEwJDTjETMBEGA1UECgwKaVRydXNDaGluYTEcMBoGA1UECwwTQ2hp
-bmEgVHJ1c3QgTmV0d29yazEoMCYGA1UEAwwfaVRydXNDaGluYSBDbGFzcyAyIFJv
-b3QgQ0EgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOPPShpV
-nJbMqqCw6Bz1kehnoPst9pkr0V9idOwU2oyS47/HjJXk9Rd5a9xfwkPO88trUpz5
-4GmmwspDXjVFu9L0eFaRuH3KMha1Ak01citbF7cQLJlS7XI+tpkTGHEY5pt3EsQg
-wykfZl/A1jrnSkspMS997r2Gim54cwz+mTMgDRhZsKK/lbOeBPpWtcFizjXYCqhw
-WktvQfZBYi6o4sHCshnOswi4yV1p+LuFcQ2ciYdWvULh1eZhLxHbGXyznYHi0dGN
-z+I9H8aXxqAQfHVhbdHNzi77hCxFjOy+hHrGsyzjrd2swVQ2iUWP8BfEQqGLqM1g
-KgWKYfcTGdbPB1MCAwEAAaNjMGEwHQYDVR0OBBYEFG/oAMxTVe7y0+408CTAK8hA
-uTyRMB8GA1UdIwQYMBaAFG/oAMxTVe7y0+408CTAK8hAuTyRMA8GA1UdEwEB/wQF
-MAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBLnUTfW7hp
-emMbuUGCk7RBswzOT83bDM6824EkUnf+X0iKS95SUNGeeSWK2o/3ALJo5hi7GZr3
-U8eLaWAcYizfO99UXMRBPw5PRR+gXGEronGUugLpxsjuynoLQu8GQAeysSXKbN1I
-UugDo9u8igJORYA+5ms0s5sCUySqbQ2R5z/GoceyI9LdxIVa1RjVX8pYOj8JFwtn
-DJN3ftSFvNMYwRuILKuqUYSHc2GPYiHVflDh5nDymCMOQFcFG3WsEuB+EYQPFgIU
-1DHmdZcz7Llx8UOZXX2JupWCYzK1XhJb+r4hK5ncf/w8qGtYlmyJpxk3hr1TfUJX
-Yf4Zr0fJsGuv
------END CERTIFICATE-----

+ 0 - 23
resources/certs/alipay/appCertPublicKey.crt

@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEnjCCA4agAwIBAgIQICUHELeca6vtFdxI7q2BzzANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
-BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs
-YXNzIDEgUjEwHhcNMjUwNzEwMDQ1ODUwWhcNMzAwNzA5MDQ1ODUwWjBlMQswCQYDVQQGEwJDTjEq
-MCgGA1UECgwh5Lqz5bee5biC5Liw6IOc5ZWG6LS45pyJ6ZmQ5YWs5Y+4MQ8wDQYDVQQLDAZBbGlw
-YXkxGTAXBgNVBAMMEDIwODg2NzA3MzM2MDY1MTAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCGgw4NIZDrzfcQKM+I2ZUVIAWMGRguCNV1qEL+tb5fzbLeD5FLtRragKydc2DWlqvbsefI
-YpLWeMgjDU1MJA68pqdCiRsZqYzcuTB+Nw8cKXrroOJztTqtwAEbVlGv7aemNy21AIBWu+tr8pRn
-3xCCrJZxMYJkjLY+jFHKpy2MJi+/cu+HcLs+b4EAgmTeM9Oqvit06iBJW0dNBsOt75mTQ+hlhVSV
-zxTww/bL+QNY3TZGtn4f4LMpTDBFLxsvBAkYNncmsQIj+9TBfpWvc2DPoghkH9qk+WxzQTXqWvLW
-4TPyj82EgHEAAzFjl+t/8I67sZyzLJSnFrz2xTsFkHh3AgMBAAGjggEqMIIBJjAfBgNVHSMEGDAW
-gBRxB+IEYRbk5fJl6zEPyeD0PJrVkTAdBgNVHQ4EFgQUuXdmAKOMxviCdyfuW4/gK1l812gwQAYD
-VR0gBDkwNzA1BgdggRwBbgEBMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9jYS5hbGlwYXkuY29tL2Nw
-cy5wZGYwDgYDVR0PAQH/BAQDAgbAMDAGA1UdHwQpMCcwJaAjoCGGH2h0dHA6Ly9jYS5hbGlwYXku
-Y29tL2NybDEwMy5jcmwwYAYIKwYBBQUHAQEEVDBSMCgGCCsGAQUFBzAChhxodHRwOi8vY2EuYWxp
-cGF5LmNvbS9jYTYuY2VyMCYGCCsGAQUFBzABhhpodHRwOi8vY2EuYWxpcGF5LmNvbTo4MzQwLzAN
-BgkqhkiG9w0BAQsFAAOCAQEADU8X0bDzuAP2iJosVbZD+S9X8sr/qP7IEuht8/20SKx+qQrMQyD7
-FHqcJgbpAv49U5m3s+E+0ItzEiaT4Ldt1AM1A8gffmkhZ0QHYCD7fCqui1GzQ1De6EBMiK1+oq7W
-4u+8aSeYXjJ9VhdEKuz68qRNe+Y7EHYMXYFQoSWtpQAS1V+W8SiI4ACXCda7h1eBxTpA5qFiuvNz
-YVQ+uMgVaVNSwxLcQcOzXokcAEJ+1wkGqtwomfSXb52qGW9NYKqrVKROw6zeSaP+SRj7IBNKla76
-0+fbFsVFeMwEPBeavg6vCYxFPnLEJq+QLB41Q2cL5M/w2Eq4IaqO3RoboDaBhw==
------END CERTIFICATE-----

BIN
resources/certs/wechat/apiclient_cert.p12


+ 21 - 21
resources/certs/wechat/apiclient_cert.pem

@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIEJDCCAwygAwIBAgIUSOv+i4QZUBvc0mKBltA02WiuHFswDQYJKoZIhvcNAQEL
+MIIENDCCAxygAwIBAgIUT7L20Db84HKuuV+FB1Y5s+zvFUUwDQYJKoZIhvcNAQEL
 BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
 FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
-Q0EwHhcNMjUwODE1MTE0NzU1WhcNMzAwODE0MTE0NzU1WjB+MRMwEQYDVQQDDAox
-NzI1MDA0MTUzMRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xKjAoBgNVBAsM
-IeS6s+W3nuW4guS4sOiDnOWVhui0uOaciemZkOWFrOWPuDELMAkGA1UEBhMCQ04x
-ETAPBgNVBAcMCFNoZW5aaGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA1V/u0pTbyBYI+qw7MexFU3ahHvKf3ih0UQ3ue4d0ru/ZZ42qigwC4Tbo+fpJ
-2GNqRiJew8OZY6HWLOBiwBy2aXkxLH2dDcWgDHekhVGZag57kFMiNgvb/LeS0OpC
-bsFj5HgvSU+s9IrgmdImXJlaJSJROb2mFiTmbTy/OzP08GXFpaog/cR59JGTVlLW
-S5C9WhSWiIzpMEqpE7VSM9dffBstvVoXW8jT1NrREnG3Zq6fLwpkVKjXwuQhyJXD
-PZHcghiqr2E1F4R8J/apYd6969KflhMyCn5l/p7kA6clyJml3Ju5i3ZdKAMdMRMt
-RoBrJxdavij9YR7m2Zn1EvItjwIDAQABo4G5MIG2MAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgP4MIGbBgNVHR8EgZMwgZAwgY2ggYqggYeGgYRodHRwOi8vZXZjYS5pdHJ1
-cy5jb20uY24vcHVibGljL2l0cnVzY3JsP0NBPTFCRDQyMjBFNTBEQkMwNEIwNkFE
-Mzk3NTQ5ODQ2QzAxQzNFOEVCRDImc2c9SEFDQzQ3MUI2NTQyMkUxMkIyN0E5RDMz
-QTg3QUQxQ0RGNTkyNkUxNDAzNzEwDQYJKoZIhvcNAQELBQADggEBABcrQNMXiJ36
-qmcdl88RvLlhHU8N/kIxo31MNZDEbCIpS/ncMyJLyoDEMp6LK30IopE5SOT+E9/K
-b3qX0lXJYrNYos0y7xnRssPsM0JtVOHVk/3WcJ5bxz4yeEqoUT02IeLewo3vVGkV
-/liXFr1MDmU2pOzXMVYDOpN/47NtBzWdGEUShuJQUOl5WFw4UiPlObvFUs1LiY1O
-am/l7k6fLAR8giMUlEqoiFgZi/JpzbWkgv6T2VnkzqYJqjYOdZgimoztTYVDkR6D
-IyfHkQ03S8F3PMOegRhrrtXB9njjjSg3RULf/wXtG6KAA7Up3nOQQ2HjdHK0LQlG
-RX2ji/DUFQs=
+Q0EwHhcNMjUwOTI2MTExNTMxWhcNMzAwOTI1MTExNTMxWjCBjTETMBEGA1UEAwwK
+MTcwNjU2MTY2ODEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMTkwNwYDVQQL
+DDDlub/opb/pq5jmoKHogZTnm5/mlZnogrLlkqjor6LmnI3liqHmnInpmZDlhazl
+j7gxCzAJBgNVBAYTAkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAMIoG7N/EBLjCY3kEFlYLRBWmvktruONovMTlK//
+sijkrhTa0caXtpei8IV3mZMMwfZIKhxB5q+9u4b9gs0Za2TcCbQ17jF4ZkC++15R
+58IVurdgCMZMf8F1YzjQqap6/y2Jd2/fe0t/jB3TUrdnTkF0K0v9aAlMAgEEmLcW
+hlWxyOzTLeieXERMZaTjHH2smP+ay5HJ449TxbHLEsCq+pAr3YSriPXTXq+k3/z5
+WKRCSD6hjwBtmeDyUcStsIv3D/BIoYuDX2xV4ijPcRIrS4d8eZcyOCQjOtrmwtV7
+AxLhsNQQGTaRXBkfHPXKmpZpuiryd47kY6VA4kvuyApUOg0CAwEAAaOBuTCBtjAJ
+BgNVHRMEAjAAMAsGA1UdDwQEAwID+DCBmwYDVR0fBIGTMIGQMIGNoIGKoIGHhoGE
+aHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1YmxpYy9pdHJ1c2NybD9DQT0xQkQ0
+MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMwMUMzRThFQkQyJnNnPUhBQ0M0NzFC
+NjU0MjJFMTJCMjdBOUQzM0E4N0FEMUNERjU5MjZFMTQwMzcxMA0GCSqGSIb3DQEB
+CwUAA4IBAQCUlpWceuTjqTQ74EdVFfKR8JfQRKJRjhTiOb9qsa66Fv/zhevFsWwC
+T9fOcoUl6TL5wUdlbgm0COi1aQkoJu1pPfvCmYS+u4mBzQkiwWmDKThviZVv2zvm
+PBejyssbZeZH4c7H9ItTvrna736JXpb2Qb1p6SRjENecVlYHNwoAfr/k74nfWZVn
+fYjEMszt4NbwJsOQa00+SdfTLS0rz/BRNnll7SQRGMr+7Y5NUnxwpLDc4eIH1enn
+LbkEhC4MGUygsQ2bRkCTh4/JBWgVaHZ2YxJwJdh1HVVBFqOThkj8fGqJoaSeSr/v
+mhXA5DqGKa6ai+3oASqMVvZVLhCfDDc1
 -----END CERTIFICATE-----

+ 26 - 26
resources/certs/wechat/apiclient_key.pem

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDVX+7SlNvIFgj6
-rDsx7EVTdqEe8p/eKHRRDe57h3Su79lnjaqKDALhNuj5+knYY2pGIl7Dw5ljodYs
-4GLAHLZpeTEsfZ0NxaAMd6SFUZlqDnuQUyI2C9v8t5LQ6kJuwWPkeC9JT6z0iuCZ
-0iZcmVolIlE5vaYWJOZtPL87M/TwZcWlqiD9xHn0kZNWUtZLkL1aFJaIjOkwSqkT
-tVIz1198Gy29WhdbyNPU2tEScbdmrp8vCmRUqNfC5CHIlcM9kdyCGKqvYTUXhHwn
-9qlh3r3r0p+WEzIKfmX+nuQDpyXImaXcm7mLdl0oAx0xEy1GgGsnF1q+KP1hHubZ
-mfUS8i2PAgMBAAECggEAUReLgTaXrJxLP1Fzkc6Urlq4czWMcnb3ddKQnxvkyZNY
-EZXyiVJ1Sbh/pHlt1TI7Mnpff5D327im2BlTDmYbIUyw1pLKvHAuGm7h9NUFNBxa
-84fUyauKKKpvvrw5ETSoTS0r83W3apzZLTyD3c9eRhybuBEObP4LINrkZpChdzbU
-Jk6U7E81/iOIWKPm2n821I00isN7czJQA3wFiQPA2qBLxpQLBoJyQrZtMZePgmAU
-rW1hHgvonL6ahKO75mHLsQMzUFI9IeUChwa6ouRoOHI+Y/hvAp2paNFcqwPUvj5B
-A543VCfHymh2xQQV5MyK19jHY/y3ygklB2woWrpcoQKBgQD/SpESKjndw2WAZMI0
-5sO7IyCJTlD3F1Wmwsp1nB269W4aTceeNSKfuJmXrZMomU7Y3V+zh7WFW77ihMsQ
-l3RuxttpbtxBAaKtRQVPd1IU8trvgpDYKyyel/jAyqKOzWmhRnoUlAaM5xllR7OJ
-yLvqTS45sHT9191JQWewk2dHnwKBgQDV95OVF4+5v6oJ//EQ6JPOkaXqYnPgrd7e
-GQDjQ0v5qsWN9sYgHX8rT4FZ34BjOSKmRCkbeVjX8Ply6RLQjq8HhC4Mzp7cN9G/
-zDRmTi0KXD1/zrK9vtVUbHgDn6F1bAhHlNA9x49D9CcJWfZ+Q8NV1TJj0sbhsNFj
-Czp7b8IUEQKBgFSPknX93qUCMADTXzC+r16xR/mzI0Z1SD2wj/dc+swOt6Wm1dQl
-rY5SSy3epLvx7BgRW73P2eSOey/05H5ebIa0/8BwpCw0KnpSPmwQDfQ6bSKgkPHJ
-e0Ic/Jx/glDi4XY2LgHa9kB92/+cPHALOZNmdUVOmbHrarT1IS9v4+npAoGAJ/b7
-QODKvqYXC5EbpM3cNbwsok/LVw8Czrca3FgIi9Si27ZZIUyBIUTTY0cEwwO7/hRD
-HVeYCZV/8j+ofP35oUzGESxSrc1bRxjMPMOjVAkQj5u69Qf87qzn6b1aOgV4sm4Q
-S0nH76hd1jhQexsLFDAjHlQTQ7p0EazaOo4QURECgYATk4auSeajv+oI3dgSW80/
-4odNlxYSARLrBv43/0sexF2zxXDgv8gQlhj9LUKZ5iWR3JLuhUmZe7kXau/HiW/e
-2mqMLccJJ0KBgda1q1JprE5A7cp3y4MXmwuiPJC+4lqf1ZU0K4IwaDVS86syvzVU
-sjj0o4D/BdETHnD9mCt9WQ==
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDCKBuzfxAS4wmN
+5BBZWC0QVpr5La7jjaLzE5Sv/7Io5K4U2tHGl7aXovCFd5mTDMH2SCocQeavvbuG
+/YLNGWtk3Am0Ne4xeGZAvvteUefCFbq3YAjGTH/BdWM40Kmqev8tiXdv33tLf4wd
+01K3Z05BdCtL/WgJTAIBBJi3FoZVscjs0y3onlxETGWk4xx9rJj/msuRyeOPU8Wx
+yxLAqvqQK92Eq4j1016vpN/8+VikQkg+oY8AbZng8lHErbCL9w/wSKGLg19sVeIo
+z3ESK0uHfHmXMjgkIzra5sLVewMS4bDUEBk2kVwZHxz1ypqWaboq8neO5GOlQOJL
+7sgKVDoNAgMBAAECggEAQdY15nzsp2rjX4D5ZkJ3LXYgoOQzzKfHnKOEJNYQxLse
+qKW2wp/JY8v1wVxX8DxAPVIlLWXPYsJ0p4apZwD6oL3YcIplFdNc4RGhzU76xp51
+rR7cetmP7LrwhWCEV/HTO87EeGQQu/4pNiflgZl/OMS6tc7dC2IBv/SeEF+L99x1
+MT/zdBB3MsvQe/1RyiwnZ6ULQ8nMQ8Ozf8ePzWxIAECAXUdA93ws+3KnQZeoslVw
+ZJZk9qtXoBpZgX5cmputO58xQgrbHDM86uca6eEoVrF7o3zMugzvmX5R49nlQaeE
+PQ52P00t2Aoulgp2UebeE6KVmmf7EuJjZN+k9iMIAQKBgQDf7b5hdy07XLv79Tbh
+KAcl/Wn/JE1ylY9o5qfz3EkRLvfQ0LSBNMAj0TRYq/0r+3IvW4/bezNzTzJrVSrP
+BVHsKSjMroevi/FhHdVIeT7Dqc5nPLb6aZELoQ3aJMtzuNrjefFOsIN0JjgHpbfD
+AdgbQlDURwytfUFmXxIYGrPKAQKBgQDd9skVbl363SODzawMzR3eU9MoIxp0e48J
+BHgynSTx7sAWFR03BalBfEkIAq0CKelUCjEwgd8VuPlgO+2TCCI1uM/l/XqHDOlt
+Zn0UtvdbTF+zNqOOp9sG5BLEeHj9irMRQ9VTv3CmffGjtylzb7FD69CQ31d1VkdF
+YH7N74L4DQKBgCKIrLKlSYF9JLSPtZ31qVyPf1hMxfDk5c/8umweTdprjuZSOXQv
+qW4cpmECbTHqPkrVaRMlJeMjlJf+83In1OGB23vtcpl9EIW0rx7VK/vK5T0AnQtz
+Wl4bwWIiCIpZONCaDr/e8vbnqf5r7TISx7w0dvi12FutFHfwM38qJw4BAoGAbaVZ
+E+MfPas7vgI9eV1h4c/awTsF+ICI2dWBYs9JztE3xjDL68A6KgUxNmnL+QOnJUKb
+pfChuONVHPq9kyIzdAJFgMFEY643KTm1lCQF8O27YJYfGXtFsRO9SZyRd/2qE19E
+5EfvZ+9TDKKQMVv9XyYAM3CAjY//SQAv457rPYkCgYAQOAYbVOePl3HaYV9GUjpr
+0xb4hXd3c4jxT4nOcWuQ5EgwP3kzn3crr1AXNTdYogqxGtrRlMpLKrzpe2yzO7kA
+VR1lNDsCJHmz2PAE7klnAPlP8cCNhqkqSLBvSRsfFROCpDE/nFQCtTJqm8aCsHTs
+WwSXyuRygAyb1vfQbjtYLg==
 -----END PRIVATE KEY-----

+ 9 - 0
resources/certs/wechat/pub_key.pem

@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq0WpDlvc7TZxSX8SVhOB
+7GouCUdXqZs0S/VbUYXMZcjEKRFej4cVNOhtovmIDSA8AVtwKb4u4N9/TXiutkpL
+wzvX+/D3YqRS4HNsbne6whA8yU7EsUTFuFppmGYENFty5pQlj57k8hPZd/3Tbw2t
+hbyY6ANjURqZJsv7WLR81FBWVOb1MQAeUKP/+P6xYMDfsvX0kaYLNnmbEJYGQgfP
+AJ6bT4+SUplrkvARNjYAqEUPeUeIyxyqKGHQXXS7ZdM89MNaYBwc5P9n0v8joYFn
+NYzizuTUpE8FJWgtmB0J3rdMs+0zkIi9yrighjq47VRrzu6nfhVgqY/TWlcp0o8n
+owIDAQAB
+-----END PUBLIC KEY-----

+ 18 - 0
resources/certs/wechat/证书使用说明.txt

@@ -0,0 +1,18 @@
+欢迎使用微信支付!
+附件中的三份文件(证书pkcs12格式、证书pem格式、证书密钥pem格式),为接口中强制要求时需携带的证书文件。
+证书属于敏感信息,请妥善保管不要泄露和被他人复制。
+不同开发语言下的证书格式不同,以下为说明指引:
+    证书pkcs12格式(apiclient_cert.p12)
+        包含了私钥信息的证书文件,为p12(pfx)格式,由微信支付签发给您用来标识和界定您的身份
+        部分安全性要求较高的API需要使用该证书来确认您的调用身份
+        windows上可以直接双击导入系统,导入过程中会提示输入证书密码,证书密码默认为您的商户号(如:1900006031)
+    证书pem格式(apiclient_cert.pem)
+        从apiclient_cert.p12中导出证书部分的文件,为pem格式,请妥善保管不要泄漏和被他人复制
+        部分开发语言和环境,不能直接使用p12文件,而需要使用pem,所以为了方便您使用,已为您直接提供
+        您也可以使用openssl命令来自己导出:openssl pkcs12 -clcerts -nokeys -in apiclient_cert.p12 -out apiclient_cert.pem
+    证书密钥pem格式(apiclient_key.pem)
+        从apiclient_cert.p12中导出密钥部分的文件,为pem格式
+        部分开发语言和环境,不能直接使用p12文件,而需要使用pem,所以为了方便您使用,已为您直接提供
+        您也可以使用openssl命令来自己导出:openssl pkcs12 -nocerts -in apiclient_cert.p12 -out apiclient_key.pem
+备注说明:  
+        由于绝大部分操作系统已内置了微信支付服务器证书的根CA证书,  2018年3月6日后, 不再提供CA证书文件(rootca.pem)下载 

+ 1 - 0
resources/lang/zh-cn/api.php

@@ -44,4 +44,5 @@ return [
     '2011'=>"授权登录失败,用户账号被冻结",
     '2012'=>"授权登录失败",
     '2013'=>"授权登录成功",
+    '2014'=>"手机号获取失败",
 ];