'3332200e2-102o'

app/controller/api/Auth.php

@@ -21,11 +21,78 @@ use support\Response;
 class Auth extends Base
 {
 
-    protected array $noNeedLogin = ["log2mobile","log2nickname"];
+    protected array $noNeedLogin = ["log2mobile","log2nickname","loginMobileAuth",'loginNicknameAuth'];
 
     #[Inject]
     protected SaasUserOpen $model;
 
+    /**
+     * 授权获取手机号-非登录
+     * @param Request $request
+     * @return Response
+     */
+    #[PostMapping("mobile/auth")]
+    public function loginMobileAuth(Request $request): Response
+    {
+        try {
+            $param = $this->_valid([
+                "login.require"     => trans("empty.require"),
+                "code.require"      => trans("empty.require"),
+            ],$request->method());
+            if (!is_array($param)) return error($param);
+            $sessionKey = (new Crypt)->config($this->getDyConfig())->getSessionKey($param['login']);
+            if (empty($sessionKey)) return error("授权登录失败");
+            $mobileStr = (new Crypt)->config($this->getDyConfig())->token()->getMobile($param['code']);
+            if (empty($mobileStr)) return error("授权信息获取失败");
+            return $this->encode("success",['mobile' => $mobileStr,'openid' => $sessionKey['openid']]);
+        } catch (\Throwable $throwable) {
+            return error($throwable->getMessage());
+        }
+    }
+
+    /**
+     * 授权昵称等信息-实际登录
+     * @param Request $request
+     * @return Response
+     */
+    #[PostMapping("nickname/auth")]
+    public function loginNicknameAuth(Request $request): Response
+    {
+        try {
+            $param = $this->_valid([
+                "avatar.require"        => trans("empty.require"),
+                "nickname.require"      => trans("empty.require"),
+                "mobile.require"        => trans("empty.require"),
+            ],$request->method());
+            if (!is_array($param)) return error($param);
+            $mobileData = json_decode($param['mobile'],true);
+            $mobile = [];
+            if (!empty($param['mobile'])) {
+                if (!isset($mobileData['openid'])) return error("授权失败");
+                $mobile = $this->decrypt2code(sConf('wechat.min_private_key'), $mobileData['mobile']);
+            }
+            if (empty($mobile)) return error("授权登录失败");
+            $userInfo = [
+                "openid"    => $mobileData['openid'],
+                "nickname"  => $param['nickname'],
+                "avatar"    => $param['avatar']
+            ];
+            $map = ["openid" => $mobileData['openid']];
+            if (!empty($mobile['purePhoneNumber'])) {
+                $userInfo['mobile'] = $mobile['purePhoneNumber'];
+            }
+            $user = $this->model->where($map)->findOrEmpty();
+            if ($user->isEmpty()) {
+                $userInfo["create_ip"] = $request->getRealIp();
+                $user->insertGetId($userInfo);
+            }
+            $userAuth = get_object_vars(AuthFacade::guard("user")->login(['openid' => $mobileData['openid']]));
+            return success("ok",$userAuth);
+
+        } catch (\Throwable $throwable) {
+            return error($throwable->getMessage());
+        }
+    }
 
     #[PostMapping("nickname")]
     public function log2nickname(Request $request): Response

app/controller/merchant/Plan.php

@@ -45,10 +45,10 @@ class Plan extends Base
     /**
      * 发布佣金计划
      * @param Request $request
-     * @return Response|void
+     * @return Response
      */
     #[PostMapping('save')]
-    public function addPlanData(Request $request)
+    public function addPlanData(Request $request): Response
     {
         try {
             $param = $this->_valid([

app/extra/dyLife/BasicLife.php

@@ -57,9 +57,13 @@ class BasicLife
     public function getAccessToken()
     {
         try {
+            echo $this->getPrefix()."\n";
             $accessToken = Cache::get($this->getPrefix());
             if (!empty($accessToken)) return $accessToken;
+            echo "Token:{$accessToken}\n";
+            print_r($this->config);
             $result = (new Token)->config($this->config)->getAccessToken();
+            print_r($result);
             if (empty($result)) return "获取Token失败";
             Cache::set($this->getPrefix(),$result['access_token'],$result['expires_in']);
             return $result['access_token'];
@@ -86,7 +90,7 @@ class BasicLife
     public function curlPostApi(string $url = "", array $data = [], string $field = "data"): array
     {
         $result = Http::asJson()->withHeaders($this->header)->post($this->gateway.$url,$data)->array();
-        if ($result['err_no'] <> 0) return ['msg' => $result['err_msg']];
+        if (isset($result['err_no']) && $result['err_no'] <> 0) return ['msg' => $result['err_msg']];
         if(!empty($result[$field]))
         {
             return $result[$field];