fix : 오류 수정 - swegger 정상화

(cherry picked from commit e19d7c7508)
This commit is contained in:
2025-07-17 17:39:28 +09:00
committed by 권혁성
parent fbb603f42e
commit 948d3824c7
6 changed files with 17 additions and 27 deletions

View File

@@ -7,7 +7,6 @@
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Models\User;
/** /**
@@ -132,10 +131,10 @@ public function logout(Request $request)
$token = $request->header('X-API-KEY'); // 또는 Authorization 헤더 $token = $request->header('X-API-KEY'); // 또는 Authorization 헤더
// 회원 테이블에서 해당 토큰으로 유저 찾기 // 회원 테이블에서 해당 토큰으로 유저 찾기
$user = User::where('remember_token', $token)->first(); $user = Member::where('remember_token', $token)->first();
if ($user) { if ($user) {
$user->USER_TOKEN = null; $user->remember_token = null;
$user->save(); $user->save();
} }

View File

@@ -5,7 +5,7 @@
use Closure; use Closure;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use App\Models\User; use App\Models\Member;
class ApiKeyMiddleware class ApiKeyMiddleware
{ {
@@ -24,7 +24,7 @@ public function handle(Request $request, Closure $next)
// 2. 회원 인증 (remember_token으로) // 2. 회원 인증 (remember_token으로)
if (!$validApiKey) { if (!$validApiKey) {
$user = User::where('remember_token', $apiKey)->first(); $user = Member::where('remember_token', $apiKey)->first();
if ($user) { if ($user) {
$validApiKey = true; $validApiKey = true;

View File

@@ -11,7 +11,7 @@ class CheckSwaggerAuth
{ {
public function handle(Request $request, Closure $next) public function handle(Request $request, Closure $next)
{ {
$token = Session::get('USER_TOKEN'); $token = Session::get('user_token');
if (!$token) { if (!$token) {
// 원래 URL 저장 후 로그인 페이지로 이동 // 원래 URL 저장 후 로그인 페이지로 이동
@@ -22,8 +22,8 @@ public function handle(Request $request, Closure $next)
$user = Member::where('remember_token', $token)->first(); $user = Member::where('remember_token', $token)->first();
if (!$user) { if (!$user) {
Session::forget('USER_TOKEN'); Session::forget('user_token');
Session::forget('USER_ID'); Session::forget('user_id');
Session::put('redirect_to', $request->fullUrl()); Session::put('redirect_to', $request->fullUrl());
return redirect()->route('login'); return redirect()->route('login');

View File

@@ -1,4 +1,4 @@
<? <?php
/********************************** /**********************************
* *
* Level 등급 * Level 등급
@@ -13,7 +13,7 @@
<div class="logopanel"> <div class="logopanel">
<a href="/"> <a href="/">
<h1>VentureRND : <font color="#1caf9a" size="3"> {{strtoupper(env('app.name', 'DEV'))}}</font></h1> <h1>KD-SAM : <font color="#1caf9a" size="3"> {{strtoupper(env('app.name', 'DEV'))}}</font></h1>
</a> </a>
</div><!-- logopanel --> </div><!-- logopanel -->
@@ -22,7 +22,7 @@
<h5 class="sidebartitle"></h5> <h5 class="sidebartitle"></h5>
<ul class="nav nav-pills nav-stacked nav-bracket"> <ul class="nav nav-pills nav-stacked nav-bracket">
<li class="active"><a href="https://" target="_blank"><i class="fa fa-home"></i> <span>기존사이트</span></a></li> <li class="active"><a href="https://dev.5130.co.kr" target="_blank"><i class="fa fa-home"></i> <span>기존사이트</span></a></li>
</ul> </ul>

View File

@@ -2,20 +2,11 @@
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Route;
use Illuminate\Support\Facades\Auth;
use App\Http\Controllers\Api\CommonController; use App\Http\Controllers\Api\CommonController;
use App\Http\Controllers\Api\ApiController; use App\Http\Controllers\Api\ApiController;
use App\Http\Controllers\Api\MemberController; use App\Http\Controllers\Api\MemberController;
use App\Http\Controllers\Api\BoardController;
use App\Http\Controllers\Api\AdminApiController; use App\Http\Controllers\Api\AdminApiController;
use App\Http\Controllers\Api\CompanyController;
use App\Http\Controllers\Api\PlanController;
use App\Http\Controllers\Api\MeetingController;
use App\Http\Controllers\Api\WorkReportController;
use App\Http\Controllers\Api\WorkListController;
use App\Http\Controllers\Api\ScheduleController;
use App\Http\Controllers\Api\FileController; use App\Http\Controllers\Api\FileController;
use App\Http\Controllers\Api\InsuranceContractController;
# 회원관련 # 회원관련

View File

@@ -50,17 +50,17 @@
"application/json": { "application/json": {
"schema": { "schema": {
"required": [ "required": [
"USER_ID", "user_id",
"USER_PWD" "user_pwd"
], ],
"properties": { "properties": {
"USER_ID": { "user_id": {
"type": "string", "type": "string",
"example": "admin" "example": "test"
}, },
"USER_PWD": { "user_pwd": {
"type": "string", "type": "string",
"example": "1234" "example": "testpass"
} }
}, },
"type": "object" "type": "object"
@@ -78,7 +78,7 @@
"message": { "message": {
"type": "string" "type": "string"
}, },
"USER_TOKEN": { "user_token": {
"type": "string" "type": "string"
} }
}, },