周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 01b7c452df13dd303ae2470d4633926e44046526 1 个父辈 778b6670

gx

内嵌 并排对比
正在显示 2 个修改的文件 包含 4 行增加 和 5 行删除
@@ -78,14 +78,14 @@ class LoginController extends BaseController @@ -78,14 +78,14 @@ class LoginController extends BaseController
78 * @method :post 78 * @method :post
79 * @time :2023/8/19 9:12 79 * @time :2023/8/19 9:12
80 */ 80 */
81 - public function autologin(UserLoginLogic $logic, EncryptUtils $encrypt) 81 + public function autologin(UserLoginLogic $logic)
82 { 82 {
83 $serviceSettingModel = new Service(); 83 $serviceSettingModel = new Service();
84 $info = $serviceSettingModel->read(['type'=>4]); 84 $info = $serviceSettingModel->read(['type'=>4]);
85 if($info === false){ 85 if($info === false){
86 $this->response('当前访问地址不存在',Code::USER_ERROR); 86 $this->response('当前访问地址不存在',Code::USER_ERROR);
87 } 87 }
88 - $data = $encrypt->unlock_url($this->param['code'], $info['values']); 88 + $data = base64_decode($this->param['code'], $info['values']);
89 $data = json_decode($data, true); 89 $data = json_decode($data, true);
90 if(!isset($data['project_id']) && !isset($data['user_id'])){ 90 if(!isset($data['project_id']) && !isset($data['user_id'])){
91 $this->response('无效Code',Code::USER_ERROR); 91 $this->response('无效Code',Code::USER_ERROR);
@@ -117,7 +117,6 @@ class LoginLogic extends BaseLogic @@ -117,7 +117,6 @@ class LoginLogic extends BaseLogic
117 if($info === false){ 117 if($info === false){
118 $this->fail('当前地址不存在或者已被删除'); 118 $this->fail('当前地址不存在或者已被删除');
119 } 119 }
120 - $encrypt = new EncryptUtils();  
121 $data = [ 120 $data = [
122 'domain'=>$info['values'], 121 'domain'=>$info['values'],
123 'remark'=>'自动登录地址和code', 122 'remark'=>'自动登录地址和code',
@@ -140,11 +139,11 @@ class LoginLogic extends BaseLogic @@ -140,11 +139,11 @@ class LoginLogic extends BaseLogic
140 if($userinfo === false){ 139 if($userinfo === false){
141 $this->fail('未添加超级管理员账号，请添加后在进入账号.'); 140 $this->fail('未添加超级管理员账号，请添加后在进入账号.');
142 } 141 }
143 - $data['autologin_code'] = $encrypt->lock_url(json_encode(['project_id'=>$this->param['project_id'],'manager_id'=>$this->manager['id']]),$info['values']); 142 + $data['autologin_code'] = base64_encode(json_encode(['project_id'=>$this->param['project_id'],'manager_id'=>$this->manager['id']]),$info['values']);
144 } 143 }
145 //使用用户登录 144 //使用用户登录
146 if(isset($this->param['user_id']) && !empty($this->param['user_id'])){ 145 if(isset($this->param['user_id']) && !empty($this->param['user_id'])){
147 - $data['autologin_code'] = $encrypt->lock_url(json_encode(['user_id'=>$this->param['user_id'],'manager_id'=>$this->manager['id']]),$info['values']); 146 + $data['autologin_code'] = base64_encode(json_encode(['user_id'=>$this->param['user_id'],'manager_id'=>$this->manager['id']]),$info['values']);
148 } 147 }
149 //获取当前超级管理员的token 148 //获取当前超级管理员的token
150 return $this->success($data); 149 return $this->success($data);