Merge branch 'master' into huangfamily

app/controller/api/store/product/Jt.php

@@ -43,10 +43,14 @@ class Jt extends BaseController
     public function __construct(App $app)
     {
         parent::__construct($app);
-        $this->jttAppId = '2012251037214523';
-        $this->jttAppKey = '0800cae09b49da38ef384a8170149d78';
-        $this->unionId = '1003309121';
-        $this->token = '5ce3da55dc739b6e7d9021d59618c5fa70f064fb9156c8a24e932f74f735d92de73585d1d15d82f1';
+//        $this->jttAppId = '2012251037214523';
+//        $this->jttAppKey = '0800cae09b49da38ef384a8170149d78';
+//        $this->unionId = '1003309121';
+//        $this->token = '5ce3da55dc739b6e7d9021d59618c5fa70f064fb9156c8a24e932f74f735d92de73585d1d15d82f1';
+        $this->jttAppId = '2502151659465349';
+        $this->jttAppKey = 'cf212b4cf1c4b3f4ad1ca326f055a196';
+        $this->unionId = '2036254684';
+        $this->token = 'a7c43c21f3e156d2fd41dfbe884b9f620250dae2369a4c989f8cfe7597c3af235d324ef0113c5d60';
         $this->userThird = app()->make(UserThirdRepository::class);
     }
 

app/controller/api/store/product/TaoKe.php

@@ -30,10 +30,10 @@ class TaoKe extends BaseController
     public function __construct(App $app)
     {
         parent::__construct($app);
-//        $this->clientId = '37d1fa73af80497ba17bc39ed832310d';
-//        $this->clientSecret = '0654e9101c6cb9d1cd7379e91f596027b3d4d5d7';
-        $this->clientId = 'e87a7f3bea3d4866be1ebcd6297c236f';
-        $this->clientSecret = 'bc906432b1db7f2c417fa4e7f258d3b29374d464';
+        $this->clientId = '592b62c0ff7346b195e6ccbf20eac831';
+        $this->clientSecret = 'ab956c0a0bde976a264e5597338b0e2920466572';
+//        $this->clientId = 'e87a7f3bea3d4866be1ebcd6297c236f';
+//        $this->clientSecret = 'bc906432b1db7f2c417fa4e7f258d3b29374d464';
         $this->userThird = app()->make(UserThirdRepository::class);
     }
 
@@ -589,7 +589,7 @@ class TaoKe extends BaseController
         $params = [
             'number' => 1,
 //            'p_id_name_list' => json_encode([env("APP_URL")."-".$uid])
-            'p_id_name_list' => json_encode(["https://api.hxxfb.com"."-".$uid])
+            'p_id_name_list' => json_encode(["https://api.hxxfb.com".time()."-".$uid])
         ];
         log::info("=============apiName===+======");
         log::info($apiName);

app/controller/api/user/User.php

@@ -2587,6 +2587,7 @@ class User extends BaseController
                 $check = Db::name("user")->where("ali_user_id", $unionId)->find();
                 if ($check) throw new \Exception("此支付宝号已被绑定");
                 $paramStr = $userRepository->getTokenByCode($alinfo["authCode"], true);
+                $userRepository->getTokenByCodeWithCert($alinfo["authCode"], true);
 //                \think\facade\Db::name('log')->insert(['data'=>'支付宝授权信息'.json_encode($paramStr)]);
                 $nickname = empty($paramStr["nick_name"]) ? "al" . $alinfo["userId"] : $paramStr["nick_name"];
                 $avater = empty($paramStr["avatar"]) ? "https://cdn.bjtdba.com/vod/image/2025-01-21/20250121180855764.png" : $paramStr["avatar"];