rkljw 5 месяцев назад
Родитель
Сommit
7474b5101e

+ 7 - 1
app/Controller/LoginController.php

@@ -193,7 +193,8 @@ class LoginController extends AbstractController
             $createUserData = [
             $createUserData = [
                 'user_name'=>$response['phone_info']['purePhoneNumber'],
                 'user_name'=>$response['phone_info']['purePhoneNumber'],
                 'salt' => $salt,
                 'salt' => $salt,
-                'password'=>$openInfoData['openid']
+                'password'=>$openInfoData['openid'],
+                'type_id'=>20000
             ];
             ];
             $checkUserInfo =  $this->userServiceClient->createUser($createUserData);
             $checkUserInfo =  $this->userServiceClient->createUser($createUserData);
         }
         }
@@ -218,6 +219,11 @@ class LoginController extends AbstractController
         $userData = [
         $userData = [
             'uid' => $checkUserInfo['data']['id'], // 如果使用单点登录,必须存在配置文件中的sso_key的值,一般设置为用户的id
             'uid' => $checkUserInfo['data']['id'], // 如果使用单点登录,必须存在配置文件中的sso_key的值,一般设置为用户的id
             'user_name' => $response['phone_info']['phoneNumber'],
             'user_name' => $response['phone_info']['phoneNumber'],
+            'mobile' => $checkUserInfo['data']['mobile']??'',
+            'email' => $checkUserInfo['data']['email'],
+//            'rong_token' => $userInfos['data']['rong_token'],
+            'level_id' => $checkUserInfo['data']['level_id'],
+            'type_id' => $checkUserInfo['data']['type_id'],
         ];
         ];
         // 使用默认场景登录
         // 使用默认场景登录
         $token = $jwt->getToken('default', $userData);
         $token = $jwt->getToken('default', $userData);

+ 1 - 0
app/Controller/NewsController.php

@@ -77,6 +77,7 @@ class NewsController extends AbstractController
             $errorMessage = $validator->errors()->first();
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
             return Result::error($errorMessage);
         }
         }
+//        $requireData['website_id'] = Context::get("SiteId");
         $result = $this->newsServiceClient->categoryList($requireData);
         $result = $this->newsServiceClient->categoryList($requireData);
         $rep = PublicData::buildMenuTree($result['data']);
         $rep = PublicData::buildMenuTree($result['data']);
         return $result ? Result::success($rep) : Result::error($result['message']);
         return $result ? Result::success($rep) : Result::error($result['message']);

+ 6 - 1
runtime/container/proxy/App_Controller_LoginController.proxy.php

@@ -154,7 +154,7 @@ class LoginController extends AbstractController
         $checkUserInfo = $this->userServiceClient->verifyUserInfo(['user_name' => $response['phone_info']['purePhoneNumber']]);
         $checkUserInfo = $this->userServiceClient->verifyUserInfo(['user_name' => $response['phone_info']['purePhoneNumber']]);
         if ($checkUserInfo['code'] == 0) {
         if ($checkUserInfo['code'] == 0) {
             $salt = rand(1, 999999);
             $salt = rand(1, 999999);
-            $createUserData = ['user_name' => $response['phone_info']['purePhoneNumber'], 'salt' => $salt, 'password' => $openInfoData['openid']];
+            $createUserData = ['user_name' => $response['phone_info']['purePhoneNumber'], 'salt' => $salt, 'password' => $openInfoData['openid'], 'type_id' => 20000];
             $checkUserInfo = $this->userServiceClient->createUser($createUserData);
             $checkUserInfo = $this->userServiceClient->createUser($createUserData);
         }
         }
         //根据openid和手机号判断是否注册,未注册直接注册
         //根据openid和手机号判断是否注册,未注册直接注册
@@ -169,6 +169,11 @@ class LoginController extends AbstractController
             'uid' => $checkUserInfo['data']['id'],
             'uid' => $checkUserInfo['data']['id'],
             // 如果使用单点登录,必须存在配置文件中的sso_key的值,一般设置为用户的id
             // 如果使用单点登录,必须存在配置文件中的sso_key的值,一般设置为用户的id
             'user_name' => $response['phone_info']['phoneNumber'],
             'user_name' => $response['phone_info']['phoneNumber'],
+            'mobile' => $checkUserInfo['data']['mobile'] ?? '',
+            'email' => $checkUserInfo['data']['email'],
+            //            'rong_token' => $userInfos['data']['rong_token'],
+            'level_id' => $checkUserInfo['data']['level_id'],
+            'type_id' => $checkUserInfo['data']['type_id'],
         ];
         ];
         // 使用默认场景登录
         // 使用默认场景登录
         $token = $jwt->getToken('default', $userData);
         $token = $jwt->getToken('default', $userData);

+ 1 - 0
runtime/container/proxy/App_Controller_NewsController.proxy.php

@@ -65,6 +65,7 @@ class NewsController extends AbstractController
             $errorMessage = $validator->errors()->first();
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
             return Result::error($errorMessage);
         }
         }
+        //        $requireData['website_id'] = Context::get("SiteId");
         $result = $this->newsServiceClient->categoryList($requireData);
         $result = $this->newsServiceClient->categoryList($requireData);
         $rep = PublicData::buildMenuTree($result['data']);
         $rep = PublicData::buildMenuTree($result['data']);
         return $result ? Result::success($rep) : Result::error($result['message']);
         return $result ? Result::success($rep) : Result::error($result['message']);

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
runtime/container/scan.cache


Некоторые файлы не были показаны из-за большого количества измененных файлов