Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -79,4 +79,24 @@ class RatingController extends BaseController
         $ratingLogic->ratingSave();
         $ratingLogic->ratingSave();
         $this->response('success');
         $this->response('success');
     }
     }
+
+    /**
+     * @remark :问卷调查验证验证码
+     * @name   :VerificationCode
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/22 11:23
+     */
+    public function verificationCode(){
+        $smsModel = new SmsLog();
+        $smsInfo = $smsModel->formatQuery(['mobile'=>$this->param['mobile'],'type'=>$smsModel::TYPE_CORING])->orderBy('id','desc')->first();
+        if(!empty($smsInfo)){
+            if(($this->param['code'] != $smsInfo['code']) || ($smsInfo['created_at']  < date('Y-m-d H:i:s',time() - 300))){
+                $this->response('验证码已过期或验证码错误',Code::SYSTEM_ERROR);
+            }
+        }else{
+            $this->response('验证码错误',Code::SYSTEM_ERROR);
+        }
+        $this->response('success');
+    }
 }
 }

@@ -84,7 +84,7 @@ class LoginLogic extends BaseLogic
      * @time   :2023/9/7 16:30
      * @time   :2023/9/7 16:30
      */
      */
     public function logout(){
     public function logout(){
-        Cache::pull($this->request->header('token'));
+        Cache::pull(Common::MANAGE_TOKEN.$this->request->header('token'));
         return $this->success();
         return $this->success();
     }
     }
 
 

@@ -37,6 +37,7 @@ class RatingLogic extends BaseLogic
             'uptime'=>$this->project['uptime'],
             'uptime'=>$this->project['uptime'],
             'domain'=>$this->user['domain'],
             'domain'=>$this->user['domain'],
             'question'=>$this->model->list(['type'=>$this->param['type']]),
             'question'=>$this->model->list(['type'=>$this->param['type']]),
+            'project_id'=>$this->user['project_id']
         ];
         ];
         return $this->success($data);
         return $this->success($data);
     }
     }

@@ -330,4 +330,5 @@ class UserLoginLogic
         }
         }
         throw new AsideGlobalException($code, $message);
         throw new AsideGlobalException($code, $message);
     }
     }
+
 }
 }

@@ -28,6 +28,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/info', [\App\Http\Controllers\Bside\User\UserController::class, 'info'])->name('user_info');
         Route::any('/info', [\App\Http\Controllers\Bside\User\UserController::class, 'info'])->name('user_info');
         Route::any('/role_list', [\App\Http\Controllers\Bside\User\UserController::class, 'role_list'])->name('user_role_list');
         Route::any('/role_list', [\App\Http\Controllers\Bside\User\UserController::class, 'role_list'])->name('user_role_list');
         Route::any('/del', [\App\Http\Controllers\Bside\User\UserController::class, 'del'])->name('user_del');
         Route::any('/del', [\App\Http\Controllers\Bside\User\UserController::class, 'del'])->name('user_del');
+
     });
     });
     //项目独立头部和底部设置
     //项目独立头部和底部设置
     Route::prefix('pageSetting')->group(function () {
     Route::prefix('pageSetting')->group(function () {
@@ -483,6 +484,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/read', [\App\Http\Controllers\Bside\Scoring\RatingController::class, 'getProjectRead'])->name('rating_getProjectRead');
         Route::any('/read', [\App\Http\Controllers\Bside\Scoring\RatingController::class, 'getProjectRead'])->name('rating_getProjectRead');
         Route::any('/save', [\App\Http\Controllers\Bside\Scoring\RatingController::class, 'save'])->name('rating_save');
         Route::any('/save', [\App\Http\Controllers\Bside\Scoring\RatingController::class, 'save'])->name('rating_save');
         Route::any('/getHistory', [\App\Http\Controllers\Bside\Scoring\RatingController::class, 'getHistory'])->name('rating_getHistory');
         Route::any('/getHistory', [\App\Http\Controllers\Bside\Scoring\RatingController::class, 'getHistory'])->name('rating_getHistory');
+        Route::any('/code', [\App\Http\Controllers\Bside\Scoring\RatingController::class, 'verificationCode'])->name('rating_code');
     });
     });
 });
 });
 //无需登录验证的路由组
 //无需登录验证的路由组