Prechádzať zdrojové kódy

4s按钮调整,需要在用户新建时选填4s密码,通过账号密码进行4s登录

kely 6 mesiacov pred
rodič
commit
c19973f147

+ 0 - 17
app/Http/Controllers/API/ProjectController.php

@@ -654,21 +654,4 @@ class ProjectController extends Controller
             'data' => $projects
         ]);
     }
-
-    public function project4s(Request $request){
-        $key=uniqid();
-        $user=Auth::user();
-        //用户信息放入缓存
-        Cache::put($key, [
-            'user_id' => $user->id,
-            'username' => $user->username,
-            'email' => $user->email,
-            'phone' => $user->phone,
-            //       'token' => $token,
-        ], now()->addHours(2));
-
-        return $this->success([
-            'data' => $key
-        ]);
-    }
 }

+ 1 - 7
app/Http/Controllers/API/UserController.php

@@ -201,13 +201,7 @@ class UserController extends Controller
 
     }
 
-    public function auth4sToken(Request $request){
-        $key=$request->get('key');
-        $user=Cache::get($key);
-        return $this->success([
-           'data'=>$user
-        ]);
-    }
+
 
 //    public function byDepartment(Request $request){
 //        $departmentIds = $request->get("department", []);

+ 1 - 0
app/Http/Resources/API/UserInfoResource.php

@@ -31,6 +31,7 @@ class UserInfoResource extends JsonResource
             'status' =>$this->status,
             'menus' => $this->menus ?: [],
             'super_admin'=>Auth::user()->super_admin,
+            'fs_password'=>$this->fs_password,
         ];
     }
 }

+ 1 - 0
app/Models/User.php

@@ -37,6 +37,7 @@ class User extends Authenticatable
         'address',
         'phone',
         'status',
+        'fs_password',
     ];
 
     /**

+ 30 - 0
database/migrations/2024_09_12_144429_add_fs_password_to_users.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            //
+            $table->string("fs_password")->after("password")->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            //
+            $table->dropColumn("fs_password");
+        });
+    }
+};

+ 0 - 3
routes/api.php

@@ -24,7 +24,6 @@ Route::post("company-file-upload", [API\FileController::class, "companyUpload"])
 //暂时为免登录
 Route::get("file/download/{uuid}/share-file", [API\FileController::class, "downloadShareFile"])
     ->name("file.download-share-file");
-Route::get("auth-4s-token",[API\UserController::class,"auth4sToken"]);
 
 
 
@@ -181,8 +180,6 @@ Route::middleware(['auth:sanctum','account.limit'])->group(function () {
             ->name("project.plan"); //项目关联计划
         Route::get("project/{project}/requirement", [API\ProjectController::class, "requirement"])
             ->name("project.requirement"); //项目需求
-        Route::get("project-4s", [API\ProjectController::class, "project4s"])
-            ->name("project.4s");
 //        Route::get("project/{project}/not-link-asset-requirement", [API\ProjectController::class, "notLinkAssetRequirement"])
 //            ->name("project.not-link-asset-requirement"); //项目未关联的资产需求