Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Application/Callback/Controller/Notify2Controller.class.php

@@ -31,7 +31,6 @@ class Notify2Controller extends BaseController
                 exit('Access Denied');
             }
         }
-        Log::write($notify, Log::DEBUG);
         $pay_way = $apitype;
         if ($apitype == "swiftpass") {
             $apitype = "weixin";
@@ -39,10 +38,9 @@ class Notify2Controller extends BaseController
         Vendor('Alipay.AopSdk');
         $aop = new \AopClient();
         $aop->alipayrsaPublicKey = file_get_contents("./Application/Sdk/SecretKey/alipay/alipay2_public_key.txt");
-        $result2 = $aop->getSignContent($notify);
-
-        Log::write(json_encode($result2),Log::DEBUG);
         $result = $aop->rsaCheckV1($notify,"",'RSA2');
+        Log::write(json_encode($notify),Log::DEBUG);
+        Log::write(file_get_contents("./Application/Sdk/SecretKey/alipay/alipay2_public_key.txt"),Log::DEBUG);
         Log::write(json_encode($result),Log::DEBUG);
         if ($result) {
             //获取回调订单信息

Application/Sdk/SecretKey/alipay/alipay2_public_key.txt

@@ -1 +1 @@
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1xgiAwoD6s2UuB/eWyc1cA1vPxtTBYV2fkyBGWpSd8FHzDDzDE7aiKZ1jwOYTsLultNjG7lpJUQqnXX8B8N/uQsW2LVntM7Ry0NMRtYrQnfkaCucTUyjlHSpn+JlOwMzCWF78+b4UuHarmJgc6yqtljL/Sj0wmA8hGxyam37zAPGNKbCZg1xgbO5zSON3zt9+RXfvkSjQlRzZz2LcuWklaa617DvZWxGP6a43hukqbXA1zOwnA3nCm049u0cyrlh9BM/kudRoJqOblu+Qgr4+CKq4FkYDae3EGACqU1xmamQGFVf1fCz55dn8a5E9K0G/PzPbCsAsh4dr9iGc7gzsQIDAQAB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAj1gR40ZrH2ZoHTmKAhiEcPEsc0vM7Wbeui8SBrjntEVjHCLF4mE9u9V7uYyrs0b/RGlh5Lxqe3AuterzAWOHGTckg2GOXXRagYYekpTl77fTLmm99vI+uTA7mjvs0PLm39/MjuK5hIr39eQgctXM+m4oxSht5hIGahyC9nk5uId0b1oae+tAtT7mBl/9N9rcsDuoNlX447IjDsi/WxKMsI6C2rI+b6p2BBG46550s/9mwrCpWHHeu7jOx9gS8501axUd4cjqOLRlxPuEO4Il6ZCnsI2U91/G4tKgjgXkNdTGXqP+vqvm7MzpYL3SMmqyboEJdKa3vDbQAcfThSPrQwIDAQAB