From 15f25056f629cc88c52dc5e1f32566409981b40e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A0=EC=A7=80=EC=9D=B8?= Date: Fri, 10 Oct 2025 14:32:35 +0900 Subject: [PATCH 1/2] =?UTF-8?q?API=20=EA=B4=80=EB=A6=AC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admins/mgmtApi/api-request-statistics-index.jsp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/admins/mgmtApi/api-request-statistics-index.jsp b/src/main/webapp/WEB-INF/views/admins/mgmtApi/api-request-statistics-index.jsp index 82c3ba7..55f6ef4 100644 --- a/src/main/webapp/WEB-INF/views/admins/mgmtApi/api-request-statistics-index.jsp +++ b/src/main/webapp/WEB-INF/views/admins/mgmtApi/api-request-statistics-index.jsp @@ -379,7 +379,7 @@ 응답결과 - + /API_CHA_085/request POST @@ -538,16 +538,7 @@ pageData.forEach(row => { const tr = document.createElement("tr"); - tr.innerHTML = ` - ${row.api} - ${row.method} - ${row.params} - ${row.status} - ${row.time} - - ${getResultIcon(row.result)} ${row.result} - - `; + tr.innerHTML += '' + row.api + '' + row.method + '' + row.params + '' + row.status + '' + row.time + '' + getResultIcon(row.result) + ' ' +row.result + ''; tableBody.appendChild(tr); }); } From 99a0f7444fe5c905bb73f290874476a696ea0fe4 Mon Sep 17 00:00:00 2001 From: thkim Date: Fri, 10 Oct 2025 14:36:38 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=EB=B0=9C=EC=A3=BC=EA=B8=B0?= =?UTF-8?q?=EA=B4=80=20=EA=B3=84=EC=A0=95=20=EB=A9=94=EB=89=B4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EA=B1=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 2_apply.bat | 208 +++++++++++------- SUCCESS | 1 + admin_list.txt | 3 + .../constructionProjectManagement/left.jsp | 4 +- 5 files changed, 137 insertions(+), 80 deletions(-) create mode 100644 SUCCESS diff --git a/.gitignore b/.gitignore index ea8c4bf..be237e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /target +path.txt \ No newline at end of file diff --git a/2_apply.bat b/2_apply.bat index dcbc3ae..fed4a40 100644 --- a/2_apply.bat +++ b/2_apply.bat @@ -1,90 +1,140 @@ @echo off setlocal enabledelayedexpansion +rem # ---------------------------------------------------------------------- +rem # ȯ : path.txt Ŭ θ а ũ̽ θ մϴ. +rem # ---------------------------------------------------------------------- -set source_prefix=src\main\webapp\ -set target_prefix=C:\Users\dbnt\eclipse-workspace\.metadata\.plugins\org.eclipse.wst.server.core\tmp0\wtpwebapps\geoinfo_admin\ -set target_directory=C:\Users\dbnt\git\dbnt\geoinfo.or.kr\old-geoinfo-or-kr-admin\ +rem # target_directory ġ Ǵ η մϴ. +set "target_directory=%~dp0" +set "path_file=%target_directory%path.txt" +set "eclipse_path=" -rem For 192.168.10.20 -hostname | find "DESKTOP-9C42CR8" > nul -if %errorlevel% == 0 ( - set target_prefix=D:\app_geoinfo\app\eclipse\workspace\.metadata\.plugins\org.eclipse.wst.server.core\tmp0\wtpwebapps\old-geoinfo-or-kr-admin\ - set target_directory=D:\app_geoinfo\app\eclipse\workspace\old-geoinfo-or-kr-admin\ -) else ( - echo goodbye +rem # path.txt ϴ Ȯմϴ. +if not exist "%path_file%" ( + echo [ERROR] "%path_file%" ã ϴ. ũƮ մϴ. + pause + exit /b ) +rem # path.txt 'eclipse=' ϴ ã Ŭ θ մϴ. +for /f "tokens=1,* delims==" %%a in ('findstr /b "eclipse=" "%path_file%"') do ( + set "eclipse_path=%%b" +) +if not defined eclipse_path ( + echo [ERROR] "%path_file%" Ŭ θ ã ϴ. + pause + exit /b +) + +rem # Ŭ θ ϴ. +set "prefs_file=!eclipse_path!\configuration\.settings\org.eclipse.ui.ide.prefs" + +if not exist "!prefs_file!" ( + echo [ERROR] Eclipse ã ϴ: "!prefs_file!" + pause + exit /b +) + +rem # Ͽ ֱ ũ̽ оɴϴ. +for /f "tokens=1,* delims==" %%a in ('findstr /b "RECENT_WORKSPACES=" "!prefs_file!"') do ( + set "workspaces_line=%%b" +) + +rem # \n ġȯϿ ΰ ù ° θ ɴϴ. +set "workspaces_line_cleaned=!workspaces_line:\n= !" +for /f "tokens=1" %%w in ("!workspaces_line_cleaned!") do ( + set "workspace_path=%%w" +) + +rem # ο Ե ̽ (\\) 齽(\) մϴ. +set "workspace_path=!workspace_path:\\=\!" + +rem # ̺ 'D\:\' ߸ 'D:\' ٷϴ. +set "drive_letter=!workspace_path:~0,1!" +if /i "!workspace_path:~1,2!" == "\:" ( + set "workspace_path=!drive_letter!:!workspace_path:~3!" +) + +rem # target_prefix մϴ. +set "target_prefix=!workspace_path!\.metadata\.plugins\org.eclipse.wst.server.core\tmp0\wtpwebapps\geoinfo_admin\" + +explorer "!target_prefix!" + +echo target_prefix: "!target_prefix!" + +set "source_prefix=src\main\webapp\" + +echo --- File Copy Script Start (Robust Version) --- +echo. + +rem for ƾ ѱ Ҹ for /f "delims=" %%i in (admin_list.txt) do ( - set line=%%i - - if "!line:~-5!" == ".java" ( - echo Skip - ) else if "!line:~-4!" == ".xml" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - :: "src\main\resources\" - set relative_path=!relative_path:*src\main\resources\=! - set target_file=%target_prefix%WEB-INF\classes\!relative_path! - ) else if "!line:~-4!" == ".jsp" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-4!" == ".css" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-4!" == ".png" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-4!" == ".svg" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-3!" == ".js" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-4!" == ".svg" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-4!" == ".reb" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-4!" == ".png" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-6!" == ".woff2" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-5!" == ".woff" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-4!" == ".otf" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-11!" == ".properties" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) else if "!line:~-4!" == ".gif" ( - set source_file=%target_directory%!line! - set relative_path=!line:%source_prefix%=! - set target_file=%target_prefix%!relative_path! - ) - - - rem Copy the source file to the target location, overwriting if necessary - echo Copying "!source_file!" to "!target_file!" - xcopy /i /Y "!source_file!" "!target_file!" + call :processLine "%%i" ) -rem pause \ No newline at end of file +echo. +echo --- All operations completed. --- +pause +goto :eof + + +rem ====================================================== +rem :processLine ƾ - ó +rem ====================================================== +:processLine +set "line=%~1" + +rem ʱȭ +set "source_file=" +set "target_file=" +set "relative_path=" + +rem # ϴ ּ dzʶٱ +if "!line:~0,1!" == "#" ( + echo [SKIP] Comment: !line! + goto :eof +) + +echo [PROCESS] !line! + +rem .java dzʶٱ +if "!line:~-5!" == ".java" ( + echo [SKIP] Java source file. + goto :eof +) + +set "source_file=%target_directory%!line!" +set "relative_path=!line:%source_prefix%=!" + +rem .xml WEB-INF\classes η ó +if "!line:~-4!" == ".xml" ( + set "relative_path=!line:*src\main\resources\=!" + set "target_file=%target_prefix%WEB-INF\classes\!relative_path!" +) else ( + rem ó + set "target_file=%target_prefix%!relative_path!" +) + +rem --- [ κ] --- +if defined source_file ( + if exist "!source_file!" ( + echo [COPY] + echo FROM: "!source_file!" + echo TO: "!target_file!" + xcopy /i /Y "!source_file!" "!target_file!" > nul + + rem xcopy Ȯ (errorlevel 0̸ ) + if !errorlevel! == 0 ( + echo -> SUCCESS + ) else ( + echo -> FAILED (Error Code: !errorlevel!) + ) + ) else ( + echo [ERROR] Source file not found: "!source_file!" + ) +) + +echo. +goto :eof \ No newline at end of file diff --git a/SUCCESS b/SUCCESS new file mode 100644 index 0000000..e3d49c4 --- /dev/null +++ b/SUCCESS @@ -0,0 +1 @@ + - diff --git a/admin_list.txt b/admin_list.txt index b820422..8dbfbdd 100644 --- a/admin_list.txt +++ b/admin_list.txt @@ -9,3 +9,6 @@ src\main\java\geoinfo\admins\chLog\DownloadAppController.java src\main\java\geoinfo\admins\notice\NoticeMngController.java src\main\java\geoinfo\admins\user\GeneralUserMngController.java src\main\java\geoinfo\com\file\FileController.java + + +src\main\webapp\WEB-INF\views\admins\constructionProjectManagement\left.jsp \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/left.jsp b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/left.jsp index 1ac8888..28c43a4 100644 --- a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/left.jsp +++ b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/left.jsp @@ -77,9 +77,11 @@ img { border:0; }
 건설현장 통계
+
+  발주기관 계정 +
-