Browse Source

修改bug

master
王泽彦 9 months ago
parent
commit
31308d0957
  1. 5
      niucloud/app/api/controller/member/Member.php
  2. 5
      niucloud/app/api/route/member.php
  3. 2
      niucloud/app/api/route/route.php
  4. 11
      niucloud/app/service/api/login/LoginService.php

5
niucloud/app/api/controller/member/Member.php

@ -121,6 +121,9 @@ class Member extends BaseApiController
} }
public function list_call_up(){ public function list_call_up(){
return success(( new MemberService() )->list_call_up()); $data = $this->request->params([
[ 'sales_id', '' ],
]);
return success(( new MemberService() )->list_call_up($data['sales_id']));
} }
} }

5
niucloud/app/api/route/member.php

@ -105,11 +105,6 @@ Route::group('member', function () {
//获取签到设置 //获取签到设置
Route::get('sign/config', 'member.MemberSign/signConfig'); Route::get('sign/config', 'member.MemberSign/signConfig');
Route::get('list_call_up', 'member.MemberSign/signConfig');
})->middleware(ApiChannel::class) })->middleware(ApiChannel::class)
->middleware(ApiCheckToken::class, true) ->middleware(ApiCheckToken::class, true)
->middleware(ApiLog::class); ->middleware(ApiLog::class);

2
niucloud/app/api/route/route.php

@ -331,6 +331,8 @@ Route::group(function () {
Route::get('teachingResearch/teachingTestPaper', 'apiController.teachingResearch/teachingTestPaper'); Route::get('teachingResearch/teachingTestPaper', 'apiController.teachingResearch/teachingTestPaper');
//提交试卷 //提交试卷
Route::get('teachingResearch/submitTestPaper', 'apiController.teachingResearch/submitTestPaper'); Route::get('teachingResearch/submitTestPaper', 'apiController.teachingResearch/submitTestPaper');
Route::get('per_list_call_up', 'member.Member/list_call_up');
})->middleware(ApiChannel::class) })->middleware(ApiChannel::class)
->middleware(ApiPersonnelCheckToken::class, true) ->middleware(ApiPersonnelCheckToken::class, true)
->middleware(ApiLog::class); ->middleware(ApiLog::class);

11
niucloud/app/service/api/login/LoginService.php

@ -177,6 +177,7 @@ class LoginService extends BaseApiService
try { try {
$token_info = TokenAuth::parseToken($token, AppTypeDict::API); $token_info = TokenAuth::parseToken($token, AppTypeDict::API);
dd($token_info);
} catch (Throwable $e) { } catch (Throwable $e) {
// if(env('app_debug', false)){ // if(env('app_debug', false)){
// throw new AuthException($e->getMessage(), 401); // throw new AuthException($e->getMessage(), 401);
@ -206,11 +207,7 @@ class LoginService extends BaseApiService
try { try {
$token_info = TokenAuth::parseToken($token, AppTypeDict::PERSONNEL); $token_info = TokenAuth::parseToken($token, AppTypeDict::PERSONNEL);
} catch (Throwable $e) { } catch (Throwable $e) {
// if(env('app_debug', false)){
// throw new AuthException($e->getMessage(), 401);
// }else{
throw new AuthException('LOGIN_EXPIRE', 401); throw new AuthException('LOGIN_EXPIRE', 401);
// }
} }
if (!$token_info) { if (!$token_info) {
throw new AuthException('MUST_LOGIN', 401); throw new AuthException('MUST_LOGIN', 401);
@ -355,7 +352,7 @@ class LoginService extends BaseApiService
//查询员工信息 //查询员工信息
$member_info = (new Personnel())->where('phone', $params['phone'])->find(); $member_info = (new Personnel())->where('phone', $params['phone'])->find();
if(!$member_info){ if (!$member_info) {
throw new ApiException('账号不存在'); throw new ApiException('账号不存在');
} }
@ -371,10 +368,10 @@ class LoginService extends BaseApiService
$user->save(); $user->save();
$expire_time = env('system.api_token_expire_time') ?? 3600; $expire_time = env('system.api_token_expire_time') ?? 3600;
//生成token //生成token
$token_info = TokenAuth::createToken($member_info->id, AppTypeDict::PERSONNEL, ['id' => $member_info->id, 'member_id'=>$member_info->id, 'phone' => $member_info->phone, 'user_type' => $params['login_type']], $expire_time); $token_info = TokenAuth::createToken($member_info->id, AppTypeDict::PERSONNEL, ['id' => $member_info->id, 'member_id' => $member_info->id, 'phone' => $member_info->phone, 'user_type' => $params['login_type']], $expire_time);
//获取用户部门ids(1市场、2教师、3销售) //获取用户部门ids(1市场、2教师、3销售)
$depts = (new CampusPersonRole())->where('person_id', $member_info->id)->column('dept_id'); $depts = (new CampusPersonRole())->where('person_id', $member_info->id)->column('dept_id');
$user_type = in_array($params['login_type'],$depts) ? $params['login_type'] : ''; $user_type = in_array($params['login_type'], $depts) ? $params['login_type'] : '';
return [ return [
'token' => $token_info['token'],//token 'token' => $token_info['token'],//token

Loading…
Cancel
Save