From 886c7f7083576ec17815a943733a6344959360a8 Mon Sep 17 00:00:00 2001 From: mjkhan21 Date: Fri, 6 Dec 2024 17:27:43 +0900 Subject: [PATCH] =?UTF-8?q?=EC=8B=9C=EC=8A=A4=ED=85=9C=20=EC=9D=B4?= =?UTF-8?q?=EB=A6=84,=20=EB=A1=9C=EA=B3=A0,=20=EB=A9=94=EB=89=B4=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/deploy.xml | 26 ++++ deploy/launcher.sh | 74 ++++++++++ pom.xml | 12 ++ .../xit/fims/chongno/MainApplication.java | 17 +-- src/main/resources/application.yml | 3 +- src/main/resources/xit-fims.conf | 6 +- .../WEB-INF/jsp/base/menu/menu-info.jsp | 129 ++++++++---------- .../WEB-INF/jsp/fims/sprt/sprt03010-main.jsp | 2 +- .../WEB-INF/jsp/fims/sprt/sprt03020-main.jsp | 2 +- src/main/webapp/WEB-INF/jsp/include/head.jsp | 2 +- src/main/webapp/WEB-INF/jsp/include/tail.jsp | 2 +- .../webapp/WEB-INF/jsp/include/userMenus.jsp | 6 +- src/main/webapp/WEB-INF/jsp/index.jsp | 6 +- src/main/webapp/WEB-INF/jsp/login.jsp | 17 ++- .../resources/img/login/loginDeco_02.png | Bin 40963 -> 40692 bytes 15 files changed, 198 insertions(+), 106 deletions(-) create mode 100644 deploy/deploy.xml create mode 100644 deploy/launcher.sh diff --git a/deploy/deploy.xml b/deploy/deploy.xml new file mode 100644 index 0000000..b31f2fb --- /dev/null +++ b/deploy/deploy.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/deploy/launcher.sh b/deploy/launcher.sh new file mode 100644 index 0000000..b701a94 --- /dev/null +++ b/deploy/launcher.sh @@ -0,0 +1,74 @@ +#!/bin/bash +# 런처용 .sh 파일은 755 권한을 주어야 합니다. (명령어 : chmod) +# java 실행 경로가 맞는지 확인하시기 바랍니다. (명령어 which java) + +APP_NAME="특별관리지역 통행제한 과태료 시스템" +APP_HOME=/applications/fims +APP_WAR=fims-chongno.war + +JAVA_HOME=/usr/local/java/zulu17.54.21 + +if [ $# == 0 ] + then echo "옵션을 지정하세요: 쉘파일명.sh [start | stop | list]"; exit; +fi + +# 쉘이 csh 일 경우 문법 : setenv LANG ko_KR.utf8 +# 쉘이 bash 일 경우 문법 : export LANG=ko_KR.utf8 +# 운영체제가 AIX일 경우 ko_KR.utf8가 아닌 ko_KR.IBM-utf8로 설정 +export LANG=ko_KR.utf8 + +# 위의 LANG을 설정하여도 한글이 셋팅되지 않을 때 아래 LC_ALL 주석을 해제하여 기동하세요 +#export LC_ALL=ko_KR.euckr +#export LC_ALL=ko_KR.utf8 + +# 디렉토리 이동 +cd "$APP_HOME" + +# 커맨드라인 옵션별 분기 +case "$1" in + + [Ss]tart) + echo "$APP_NAME 프로세스를 시작합니다." + + app_process=$(ps -ef | grep "$APP_WAR" | grep -v grep | wc -l) + + if [ "$app_process" -gt 0 ] + + then + echo "$APP_NAME 프로세스가 이미 기동 중입니다." + else + { + cd "$APP_HOME" || exit + rm logs/*.log + nohup "$JAVA_HOME/bin/java" -Dspring.profiles.active=dev -jar "$APP_HOME/$APP_WAR" > /dev/null & + echo "$APP_NAME 프로세스가 시작되었습니다." + } + fi + + cd "$APP_HOME" || exit + ;; + + [Ss]top) + echo "$APP_NAME 프로세스를 종료합니다." + + app_process=$(ps -ef | grep "$APP_HOME/$APP_WAR" | grep -v grep | wc -l) + + if [ "$app_process" -gt 0 ] + then + { + kill_pid=$(ps -ef | grep "$APP_HOME/$APP_WAR" | grep -v grep | awk '{print $2}') + kill "$kill_pid"; + echo "$APP_NAME 프로세스가 종료되었습니다." + } + fi + ;; + + [Ll]ist) + echo "PID PPID STIME COMMAND" + for proc_name in $APP_WAR + do + ps -ef | grep "$proc_name" | grep -v grep | grep -v awk | sort + done + ;; + +esac diff --git a/pom.xml b/pom.xml index 5234f4d..9924ee7 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,10 @@ UTF-8 + 17 + ${java.version} + ${java.version} @@ -59,11 +62,20 @@ + fims-chongno + + + + ${basedir}/src/main/resources + + + org.springframework.boot spring-boot-maven-plugin + deploy org.projectlombok diff --git a/src/main/java/cokr/xit/fims/chongno/MainApplication.java b/src/main/java/cokr/xit/fims/chongno/MainApplication.java index 76ca87e..da22dc8 100644 --- a/src/main/java/cokr/xit/fims/chongno/MainApplication.java +++ b/src/main/java/cokr/xit/fims/chongno/MainApplication.java @@ -1,17 +1,14 @@ package cokr.xit.fims.chongno; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; import java.util.Arrays; import java.util.List; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.context.annotation.ComponentScan; -import org.springframework.core.io.ClassPathResource; import cokr.xit.base.ServletCustomizer; +import cokr.xit.fims.FimsConf; import cokr.xit.fims.SpringBootApplicationBridge; import cokr.xit.fims.task.TaskMvcConfig; @@ -20,18 +17,8 @@ import cokr.xit.fims.task.TaskMvcConfig; public class MainApplication extends SpringBootApplicationBridge { public static void main(String[] args) { - allowRestrictedHeaders(); - - try { - BufferedReader in = new BufferedReader(new InputStreamReader(new ClassPathResource("sgg.txt").getInputStream())); - String sgg = in.readLine(); - System.setProperty("sgg", sgg); - in.close(); - } catch (IOException e) { - e.printStackTrace(); - } - + System.setProperty("sgg", FimsConf.get().getSgg()); SpringApplication.run(MainApplication.class, args); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 087bcc8..3e3ad94 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -30,7 +30,8 @@ spring: hikari: fims: driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - jdbc-url: jdbc:log4jdbc:mariadb://211.119.124.9:4407/fims_chongno?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Seoul&useSSL=false&autocommit=false + jdbc-url: jdbc:log4jdbc:mariadb://211.119.124.3:53306/fims?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Seoul&useSSL=false&autocommit=false +# jdbc-url: jdbc:log4jdbc:mariadb://211.119.124.9:4407/fims_chongno?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Seoul&useSSL=false&autocommit=false username: fimsweb password: xit581!*)& auto-commit: false diff --git a/src/main/resources/xit-fims.conf b/src/main/resources/xit-fims.conf index 33bfdad..c3f372c 100644 --- a/src/main/resources/xit-fims.conf +++ b/src/main/resources/xit-fims.conf @@ -1,4 +1,6 @@ { - "sgg" : "50000", - "tasks": ["PVS", "BPV", "DPV", "ECA", "PES", "DVS"] + "sgg" : "11110", + "tasks": ["PVS", "BPV", "DPV", "ECA", "PES", "DVS"], + "taskUrlNames" : ["주정차위반과태료업무", "전용차로과태료업무", "장애인주차위반과태료업무", "전기차주차위반과태료업무", "밤샘주차위반과태료업무", "미세먼지과태료업무"], + "sggNet" : [] } \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/base/menu/menu-info.jsp b/src/main/webapp/WEB-INF/jsp/base/menu/menu-info.jsp index 1fc77b7..aabbf4b 100644 --- a/src/main/webapp/WEB-INF/jsp/base/menu/menu-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/base/menu/menu-info.jsp @@ -1,75 +1,64 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> -