gx

@@ -7,7 +7,7 @@
  * @time   :2023/8/19 9:11
  * @time   :2023/8/19 9:11
  */
  */
 
 
-namespace App\Http\Controllers\Bside\User;
+namespace App\Http\Controllers\Bside;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Events\WebSocketMessage;
 use App\Events\WebSocketMessage;
@@ -15,7 +15,6 @@ use App\Events\WebSocketMessageSent;
 use App\Helper\Common;
 use App\Helper\Common;
 use App\Helper\Translate;
 use App\Helper\Translate;
 use App\Helper\Wechat;
 use App\Helper\Wechat;
-use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\User\UserLoginLogic;
 use App\Http\Logic\Bside\User\UserLoginLogic;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\Service\Service;
 use App\Models\Service\Service;

@@ -42,10 +42,6 @@ class UserLoginLogic
         if($info === false){
         if($info === false){
             $this->fail('当前用户不存在或者被禁用',Code::USER_REGISTER_ERROE);
             $this->fail('当前用户不存在或者被禁用',Code::USER_REGISTER_ERROE);
         }
         }
-        //查看当前账号下有几个项目
-        if($this->param['password'] == '123456' && $this->param['mobile'] != '15680871314'){
-            $this->fail('请使用短信登录，修改初始密码');
-        }
         $password = base64_encode(md5($this->param['password']));
         $password = base64_encode(md5($this->param['password']));
         $list = $this->model->list(['mobile'=>$this->param['mobile'],
         $list = $this->model->list(['mobile'=>$this->param['mobile'],
             'password'=>$password,'status'=>$this->model::STATUS_ZERO],'id',['id','project_id']);
             'password'=>$password,'status'=>$this->model::STATUS_ZERO],'id',['id','project_id']);

@@ -349,13 +349,13 @@ Route::middleware(['bloginauth'])->group(function () {
 });
 });
 //无需登录验证的路由组
 //无需登录验证的路由组
 Route::group([], function () {
 Route::group([], function () {
-    Route::any('/login', [\App\Http\Controllers\Bside\User\LoginController::class, 'login'])->name('login');
-    Route::any('/projectLogin', [\App\Http\Controllers\Bside\User\LoginController::class, 'projectLogin'])->name('projectLogin');
-    Route::any('/ceshi', [\App\Http\Controllers\Bside\User\LoginController::class, 'ceshi'])->name('ceshi');
-    Route::any('/stringTranslation', [\App\Http\Controllers\Bside\User\LoginController::class, 'stringTranslation'])->name('stringTranslation');
-    Route::any('/sendLoginSms', [\App\Http\Controllers\Bside\User\LoginController::class, 'sendLoginSms'])->name('sendLoginSms');
-    Route::any('/autologin', [\App\Http\Controllers\Bside\User\LoginController::class, 'autologin'])->name('autologin');
-    Route::any('/qrcode', [\App\Http\Controllers\Bside\User\LoginController::class, 'qrcode'])->name('qrcode');
-    Route::any('/globalSo_v6_login', [\App\Http\Controllers\Bside\User\LoginController::class, 'globalSo_v6_login'])->name('globalSo_v6_login');
-    Route::any('/getWechatLoginInfo', [\App\Http\Controllers\Bside\User\LoginController::class, 'getWechatLoginInfo'])->name('getWechatLoginInfo');
+    Route::any('/login', [\App\Http\Controllers\Bside\LoginController::class, 'login'])->name('login');
+    Route::any('/projectLogin', [\App\Http\Controllers\Bside\LoginController::class, 'projectLogin'])->name('projectLogin');
+    Route::any('/ceshi', [\App\Http\Controllers\Bside\LoginController::class, 'ceshi'])->name('ceshi');
+    Route::any('/stringTranslation', [\App\Http\Controllers\Bside\LoginController::class, 'stringTranslation'])->name('stringTranslation');
+    Route::any('/sendLoginSms', [\App\Http\Controllers\Bside\LoginController::class, 'sendLoginSms'])->name('sendLoginSms');
+    Route::any('/autologin', [\App\Http\Controllers\Bside\LoginController::class, 'autologin'])->name('autologin');
+    Route::any('/qrcode', [\App\Http\Controllers\Bside\LoginController::class, 'qrcode'])->name('qrcode');
+    Route::any('/globalSo_v6_login', [\App\Http\Controllers\Bside\LoginController::class, 'globalSo_v6_login'])->name('globalSo_v6_login');
+    Route::any('/getWechatLoginInfo', [\App\Http\Controllers\Bside\LoginController::class, 'getWechatLoginInfo'])->name('getWechatLoginInfo');
 });
 });

@@ -9,5 +9,5 @@ use Illuminate\Support\Facades\Route;
  * @method :post
  * @method :post
  * @time   :2023/8/24 10:14
  * @time   :2023/8/24 10:14
  */
  */
-Route::any('/eventmessage', [\App\Http\Controllers\Bside\User\LoginController::class, 'eventMessage'])->name('eventMessage');
+Route::any('/eventmessage', [\App\Http\Controllers\Bside\LoginController::class, 'eventMessage'])->name('eventMessage');