Merge branch 'master' of http://git.huxiukeji.com/zhangxiaobin/ggyuyin

application/api/controller/Topicdongtai.php

@@ -5,6 +5,8 @@ namespace app\api\controller;
 use app\common\controller\Api;
 use think\Db;
 use app\common\library\Keyworld;
+use think\Exception;
+
 /**
  * 圈子动态
  */
@@ -92,9 +94,29 @@ class Topicdongtai extends Api
 
     //动态删除
     public function delete(){
-        $id = input('id',0);
-        Db::name('topic_dongtai')->where('id',$id)->where('user_id',$this->auth->id)->delete();
-        $this->success('删除成功');
+        try {
+            $id = input('id',0);
+            $where['id'] = $id;
+            $where['user_id'] = $this->auth->id;
+            $dongtai = Db::name('topic_dongtai')->field('id,topic_id')->where($where)->find();
+            if (empty($dongtai)) {
+                throw new Exception('未找到动态信息');
+            }
+            $delRes = Db::name('topic_dongtai')->where('id',$id)->where('user_id',$this->auth->id)->delete();
+            if (!$delRes) {
+                throw new Exception('动态删除失败');
+            }
+            //圈子新增一个贴
+            if (!empty($dongtai['topic_id'])) {
+                $res = Db::name('topic_hub')->where('id',$dongtai['topic_id'])->setDec('t_number');
+                if (!$res) {
+                    throw new Exception('更新话题数量失败');
+                }
+            }
+            $this->success('删除成功');
+        } catch (Exception $e) {
+            $this->error($e->getMessage());
+        }
     }
 
     //是否点赞

application/common/service/MoneyService.php

@@ -27,6 +27,10 @@ class MoneyService
             $money = isset($params['money']) ? $params['money'] : '';
             $alipayAccount= isset($params['alipay_account']) ? $params['alipay_account'] : '';
             $name= isset($params['name']) ? $params['name'] : '';
+            $payTest = config('pay_test');
+            if ($payTest == 1) {
+                $money = 0.1;
+            }
             $info = [
                 'money' => $money,
                 'alipay_account' => $alipayAccount,

application/config.php

@@ -420,13 +420,6 @@ return [
         'app_secret' => '4yku6nam6YK0TGdlEemkmMbBR4catDVU',
         'app_code' => '3f4fc2408a0143509e5be5c20eb97c5b',
     ],
-    //支付宝 rsa公钥 私钥  支付宝公钥
-    'ali_app_id' => '2021004103620776', //appid
-    'ali_sign_type' => 'RSA2', //签名
-    'notify_url' => 'https://ggyuyin.huxiukeji.cn/api/notify/alipaynotify',
-    'public_key' => 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl0wxorB0arbCOoPzAfGBwF+xZs/J+1ICyusfjBSuPP7+vdKA9Mg6xCQI1uGEQHohBv1IldOQLFKZwiuISY0U9sYJzYLc/cWBihSxTQLAyoY5jA4ZCqJGfujQqk4qqnoMR0MAgL8C9b06NufuroBcfAI+er3epV2+1QZC/h5EgGO/DFJaeptlwn3i9DEeEplyKgPc4vfkku5V45mPK+HuVp9rVEy/5FBHZ3/Y7UMd+axxhXEZLkLuYIXPE97HW6ref4rLtSq5xofUMd2qihgzJWJMB0G4t0FhStCZp3OmFUgvPrqMj5cUz4ZImjgEU0FKn+4jRNDcvCN89j00Nyul5QIDAQAB',
-    'private_key' => 'MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCXTDGisHRqtsI6g/MB8YHAX7Fmz8n7UgLK6x+MFK48/v690oD0yDrEJAjW4YRAeiEG/UiV05AsUpnCK4hJjRT2xgnNgtz9xYGKFLFNAsDKhjmMDhkKokZ+6NCqTiqqegxHQwCAvwL1vTo25+6ugFx8Aj56vd6lXb7VBkL+HkSAY78MUlp6m2XCfeL0MR4SmXIqA9zi9+SS7lXjmY8r4e5Wn2tUTL/kUEdnf9jtQx35rHGFcRkuQu5ghc8T3sdbqt5/isu1KrnGh9Qx3aqKGDMlYkwHQbi3QWFK0Jmnc6YVSC8+uoyPlxTPhkiaOARTQUqf7iNE0Ny8I3z2PTQ3K6XlAgMBAAECggEBAJF/BHyflFTLTB1ZpufHiC+n1sI4MNUvGOBrG/tqJ+Ugk3mYZcsAgwL8ZEPAu54F1J0UFil/OrZk+NhxZK7WrcJi0CqCHmMs/FX9cEPO0ffw/IZjSFGhnImO+pvMb9thY01kcadeCUqonsMOZ8oIRug6gDspPGNqs4nIa8RU9ys/RXie09GDcDwPjDpzE0M1pofNu+3TeGuu/nnII5PwCXkGx3rtachFcKxyherHKqF9Y81Xp9VQBXizq9vaBx83b6k1w+rDic/O8t/JW0NskrgUhKAlbOVPLN0AuT4RnXtGoUg+2MoZsNH3b12bzgPYVp5ygIUedwYIZ/bBFPjO4kECgYEA0/6E6CtKz6PAnkcXXTBuC56HS3ox48h82whyN2CojrPbBoWX1hKDnlvlJf0eMymr+BoR4Fe75ujWixO5pbRGGt6MTdCessG5GmT8nu2sz3hMHpJPLyaOuPWQ707jf9nU85P0gEv7Q1UKZKdXxZmsYfyo/X8CyGn6TbwRMiJvvm8CgYEAtrQ6MO1ooEK+y1y1nIclURuvPvQd6SMw5wfXODlejxuFBn+XtpVcYmRvJTQSX2+3qaoKtmnD8nCg4lIj0c6ncxouNPh4Dnqqcyj8nydnVb/GUR41XDkKc6QHGQfdcR1XsNnC/Tb9hULysFNHA4T6YeI1nm4i1+0Jehm0YHkQiusCgYBFgSo0MJV7lHW/rxFC9XDvEE/NeEfJJd+BtLg13dQFzYQfFEfe4P0UO47asK1pGt2OH4YC5uDtaSOGP7ZbVMqzXonjrWWKuCcnNzr4JHbHIuraDyA1FlAu5hxZyaSfM101ayn7sm2z+rrIm3EUkTjKe5swWacg7FYrjGCa7l1yswKBgH12Te+DWDGVJAfqZhxTAeEsra8BW/jY3aAI1lYZr0F+mF7aB4iuEH7QkTJvC57VzL2Js0mIX7KAfTptRYOx8XMtK0XcyjTHL31dS/zOxjswMjNKF0J5OSAoJ2ec6wfeKnWbVDcmJ/n2+0jyJvXXv0iwWjmtT+gPMk7Sj/cfq6h5AoGAM65IF5cC2LpmTyYhdBnxb8CFV4dwEk12LZrCQTJrzCdGsPDGDdb8+8wVvkUjBS90Iy3Loll48ogvxBUuVku50O60URo+sEQMy72fXHFyE/773cRf+8h69zLXakMUbi7h7hgY6G24mbyWQRdUBcrasIZMk4e+WvtYUndOruEWRIs=',
-    'ali_public_key' => '/addons/epay/certs/alipayCertPublicKey.crt',
     'pay_test' => 1,//支付测试:0=正常,1=支付0.01
 
     //api接口加密

extend/AliPay/AliPay.php

@@ -27,11 +27,13 @@ class AliPay {
      * @param $options ['returnUrl'] 用于web支付返回地址
      */
     public function __construct($options = null) {
-        $this->appId = isset ($options['appId']) ? $options['appId'] : config('ali_app_id');
-        $this->rsaPrivateKey = isset ($options['private_key_path']) ? $options['private_key_path'] : config('private_key');
-        $this->signType = isset ($options['sign_type']) ? $options['sign_type'] : config('ali_sign_type');
-        $this->notifyUrl = isset ($options['notify_url']) ? $options['notify_url'] : config('notify_url');
-        $this->alipayrsaPublicKey = isset ($options['ali_public_key_path']) ? $options['ali_public_key_path'] : config('ali_public_key');
+        $epayConfig = get_addon_config('epay');
+        $alipayConfig = isset($epayConfig['alipay']) ? $epayConfig['alipay'] : [];
+        $this->appId = isset ($options['appId']) ? $options['appId'] : $alipayConfig['app_id'];
+        $this->rsaPrivateKey = isset ($options['private_key_path']) ? $options['private_key_path'] : $alipayConfig['private_key'];
+        $this->signType = isset ($options['sign_type']) ? $options['sign_type'] : 'RSA2';
+        $this->notifyUrl = isset ($options['notify_url']) ? $options['notify_url'] : $alipayConfig['notify_url'];
+        $this->alipayrsaPublicKey = isset ($options['ali_public_key_path']) ? $options['ali_public_key_path'] : $alipayConfig['ali_public_key'];
 //        $this->returnUrl = isset ($options ['returnUrl']) ? $options ['returnUrl'] : C('ALI_PAY')['returnUrl'];
     }
 
@@ -253,9 +255,9 @@ class AliPay {
         $alipayConfig->setSignType("RSA2");
         $alipayConfig->setEncryptKey("");
         $alipayConfig->setFormat("json");
-        $alipayConfig->setAppCertPath('../extend/AliPay/cert/appCertPublicKey.crt');//"<-- 请填写您的应用公钥证书文件路径，例如：/foo/appCertPublicKey_2019051064521003.crt -->"
-        $alipayConfig->setAlipayPublicCertPath('../extend/AliPay/cert/alipayCertPublicKey.crt');//"<-- 请填写您的支付宝公钥证书文件路径，例如：/foo/alipayCertPublicKey_RSA2.crt -->"
-        $alipayConfig->setRootCertPath('../extend/AliPay/cert/alipayRootCert.crt');//"<-- 请填写您的支付宝根证书文件路径，例如：/foo/alipayRootCert.crt -->"
+        $alipayConfig->setAppCertPath('../addons/epay/certs/appCertPublicKey.crt');//"<-- 请填写您的应用公钥证书文件路径，例如：/foo/appCertPublicKey_2019051064521003.crt -->"
+        $alipayConfig->setAlipayPublicCertPath('../addons/epay/certs/alipayCertPublicKey.crt');//"<-- 请填写您的支付宝公钥证书文件路径，例如：/foo/alipayCertPublicKey_RSA2.crt -->"
+        $alipayConfig->setRootCertPath('../addons/epay/certs/alipayRootCert.crt');//"<-- 请填写您的支付宝根证书文件路径，例如：/foo/alipayRootCert.crt -->"
         $alipayClient = new AopCertClient($alipayConfig);
         $alipayClient->isCheckAlipayPublicCert = true;
         $request = new AlipayFundTransUniTransferRequest();
@@ -266,7 +268,7 @@ class AliPay {
         $responsecode = $responseResult->$responseApiName->code;
         $result = [
             'code' => $responsecode,
-            'sub_msg' => $responseResult->$responseApiName->msg,
+            'sub_msg' => $responseResult->$responseApiName->sub_msg,
         ];
         return $result;
         /*if(!empty($responsecode)&&$responsecode==10000){