diff --git a/.gitea/workflows/main-build.yml b/.gitea/workflows/main-build.yml index a5506d3..df46e82 100644 --- a/.gitea/workflows/main-build.yml +++ b/.gitea/workflows/main-build.yml @@ -2,13 +2,12 @@ name: Main-Build on: push: - branches: ["main"] + branches: ["master"] jobs: build-and-push: runs-on: ubuntu-latest - container: - image: maven:3.9.9-eclipse-temurin-8 + steps: - name: Checkout uses: actions/checkout@v4 @@ -22,18 +21,33 @@ jobs: - name: Maven Build WAR run: mvn -B clean package -DskipTests - - name: Docker login to Harbor - run: | - echo "${{ secrets.HARBOR_PASSWORD }}" | docker login harbor.sayinfo.co.kr -u ${{ secrets.HARBOR_USERNAME }} --password-stdin + # ------------------------------ + # ๐Ÿ”ป Harbor ๊ด€๋ จ ๊ธฐ๋Šฅ ์ž„์‹œ ๋น„ํ™œ์„ฑํ™” + # ------------------------------ - - name: Build Docker image - run: | - docker build -t sayit-helpdesk:latest . + # - name: Docker login to Harbor + # run: | + # echo "${{ secrets.HARBOR_PASSWORD }}" | docker login harbor.sayinfo.co.kr -u ${{ secrets.HARBOR_USERNAME }} --password-stdin - - name: Tag image for Harbor - run: | - docker tag sayit-helpdesk:latest harbor.sayinfo.co.kr/helpdesk/helpdesk-service:latest + # - name: Build Docker image + # run: | + # docker build -t sayit-helpdesk:latest . - - name: Push image to Harbor + # - name: Tag image for Harbor + # run: | + # docker tag sayit-helpdesk:latest harbor.sayinfo.co.kr/helpdesk/helpdesk-service:latest + + # - name: Push image to Harbor + # run: | + # docker push harbor.sayinfo.co.kr/helpdesk/helpdesk-service:latest + + # ------------------------------ + # ๋ (Harbor ๋น„ํ™œ์„ฑํ™”) + # ------------------------------ + + - name: Build Docker image (local only, no push) run: | - docker push harbor.sayinfo.co.kr/helpdesk/helpdesk-service:latest + docker build -t sayit-helpdesk:local-test . + + - name: Done + run: echo "Main branch build completed (Harbor push disabled)." diff --git a/.gitea/workflows/pr-ci.yml b/.gitea/workflows/pr-ci.yml index d215ccf..d30eae5 100644 --- a/.gitea/workflows/pr-ci.yml +++ b/.gitea/workflows/pr-ci.yml @@ -2,15 +2,16 @@ name: PR-CI on: pull_request: + types: [opened, synchronize] # PR ์ƒ์„ฑ + ์ปค๋ฐ‹ push ๋•Œ๋งŒ ์‹คํ–‰ branches: ["master"] jobs: build-test: runs-on: ubuntu-latest - + container: - image: maven:3.9.9-eclipse-temurin-8 - + image: ci-maven-node:1.0 + steps: - name: Checkout source uses: actions/checkout@v4 @@ -30,4 +31,4 @@ jobs: m2-${{ runner.os }}- - name: Maven Build (compile + dependency check) - run: mvn -B clean package -DskipTests \ No newline at end of file + run: mvn -B clean package -DskipTests diff --git a/src/main/resources/egovframework/egovProps/globals.properties b/src/main/resources/egovframework/egovProps/globals.properties index ec95bf3..14494f5 100644 --- a/src/main/resources/egovframework/egovProps/globals.properties +++ b/src/main/resources/egovframework/egovProps/globals.properties @@ -1,43 +1,43 @@ #----------------------------------------------------------------------- # -# globals.properties : ์‹œ์Šคํ…œ +# globals.properties : \uc2dc\uc2a4\ud15c # #----------------------------------------------------------------------- -# 1. key = value ๊ตฌ์กฐ์ž…๋‹ˆ๋‹ค. -# 2. key๊ฐ’์€ ๊ณต๋ฐฑ๋ฌธ์ž๋ฅผ ํฌํ•จ๋ถˆ๊ฐ€, value๊ฐ’์€ ๊ณต๋ฐฑ๋ฌธ์ž๋ฅผ ๊ฐ€๋Šฅ -# 3. key๊ฐ’์œผ๋กœ ํ•œ๊ธ€์„ ์‚ฌ์šฉ๋ถˆ๊ฐ€, value๊ฐ’์€ ํ•œ๊ธ€์‚ฌ์šฉ์ด ๊ฐ€๋Šฅ -# 4. ์ค„์„ ๋ฐ”๊ฟ€ ํ•„์š”๊ฐ€ ์žˆ์œผ๋ฉด '\'๋ฅผ ๋ผ์ธ์˜ ๋์— ์ถ”๊ฐ€(๋งŒ์•ฝ '\'๋ฌธ์ž๋ฅผ ์‚ฌ์šฉํ•ด์•ผ ํ•˜๋Š” ๊ฒฝ์šฐ๋Š” '\\'๋ฅผ ์‚ฌ์šฉ) -# 5. Windows์—์„œ์˜ ๋””๋ ‰ํ† ๋ฆฌ ํ‘œ์‹œ : '\\' or '/' ('\' ์‚ฌ์šฉํ•˜๋ฉด ์•ˆ๋จ) -# 6. Unix์—์„œ์˜ ๋””๋ ‰ํ† ๋ฆฌ ํ‘œ์‹œ : '/' -# 7. ์ฃผ์„๋ฌธ ์ฒ˜๋ฆฌ๋Š” #์‚ฌ์šฉ -# 8. value๊ฐ’ ๋’ค์— ์ŠคํŽ˜์ด์Šค๊ฐ€ ์กด์žฌํ•˜๋Š” ๊ฒฝ์šฐ ์„œ๋ธ”๋ฆฟ์—์„œ ์ฐธ์กฐํ• ๋•Œ๋Š” ์—๋Ÿฌ๋ฐœ์ƒํ•  ์ˆ˜ ์žˆ์œผ๋ฏ€๋กœ trim()ํ•˜๊ฑฐ๋‚˜ ๋งˆ์ง€๋ง‰ ๊ณต๋ฐฑ์—†์ด properties ๊ฐ’์„ ์„ค์ •ํ• ๊ฒƒ +# 1. key = value \uad6c\uc870\uc785\ub2c8\ub2e4. +# 2. key\uac12\uc740 \uacf5\ubc31\ubb38\uc790\ub97c \ud3ec\ud568\ubd88\uac00, value\uac12\uc740 \uacf5\ubc31\ubb38\uc790\ub97c \uac00\ub2a5 +# 3. key\uac12\uc73c\ub85c \ud55c\uae00\uc744 \uc0ac\uc6a9\ubd88\uac00, value\uac12\uc740 \ud55c\uae00\uc0ac\uc6a9\uc774 \uac00\ub2a5 +# 4. \uc904\uc744 \ubc14\uafc0 \ud544\uc694\uac00 \uc788\uc73c\uba74 '\'\ub97c \ub77c\uc778\uc758 \ub05d\uc5d0 \ucd94\uac00(\ub9cc\uc57d '\'\ubb38\uc790\ub97c \uc0ac\uc6a9\ud574\uc57c \ud558\ub294 \uacbd\uc6b0\ub294 '\\'\ub97c \uc0ac\uc6a9) +# 5. Windows\uc5d0\uc11c\uc758 \ub514\ub809\ud1a0\ub9ac \ud45c\uc2dc : '\\' or '/' ('\' \uc0ac\uc6a9\ud558\uba74 \uc548\ub428) +# 6. Unix\uc5d0\uc11c\uc758 \ub514\ub809\ud1a0\ub9ac \ud45c\uc2dc : '/' +# 7. \uc8fc\uc11d\ubb38 \ucc98\ub9ac\ub294 #\uc0ac\uc6a9 +# 8. value\uac12 \ub4a4\uc5d0 \uc2a4\ud398\uc774\uc2a4\uac00 \uc874\uc7ac\ud558\ub294 \uacbd\uc6b0 \uc11c\ube14\ub9bf\uc5d0\uc11c \ucc38\uc870\ud560\ub54c\ub294 \uc5d0\ub7ec\ubc1c\uc0dd\ud560 \uc218 \uc788\uc73c\ubbc0\ub85c trim()\ud558\uac70\ub098 \ub9c8\uc9c0\ub9c9 \uacf5\ubc31\uc5c6\uc774 properties \uac12\uc744 \uc124\uc815\ud560\uac83 #----------------------------------------------------------------------- -# ์šด์˜์„œ๋ฒ„ ํƒ€์ž…(WINDOWS, UNIX) +# \uc6b4\uc601\uc11c\ubc84 \ud0c0\uc785(WINDOWS, UNIX) Globals.OsType =UNIX -# DB์„œ๋ฒ„ ํƒ€์ž…(ORACLE, MYSQL) - datasource ๋ฐ sqlMap ํŒŒ์ผ ์ง€์ •์— ์‚ฌ์šฉ๋จ +# DB\uc11c\ubc84 \ud0c0\uc785(ORACLE, MYSQL) - datasource \ubc0f sqlMap \ud30c\uc77c \uc9c0\uc815\uc5d0 \uc0ac\uc6a9\ub428 #Globals.DbType =oracle Globals.DbType =mysql -# ์œ„์ €๋“œ ์‚ฌ์šฉ์‹œ ๋ฐ์ดํ„ฐ๋ฒ ์ด์Šค ๊ด€๋ จ ์„ค์ •์„ ๋ถˆ๋Ÿฌ์˜ด +# \uc704\uc800\ub4dc \uc0ac\uc6a9\uc2dc \ub370\uc774\ud130\ubca0\uc774\uc2a4 \uad00\ub828 \uc124\uc815\uc744 \ubd88\ub7ec\uc634 #Globals.DriverClassName=oracle.jdbc.OracleDriver #Globals.Url=jdbc:oracle:thin:@122.199.152.76:1521:oradev #Globals.UserName =say_cms #Globals.Password =sksrhdqnffkr -## ์„ธ์ดํ—ฌํ”„๋ฐ์Šคํฌ +## \uc138\uc774\ud5ec\ud504\ub370\uc2a4\ud06c Globals.DriverClassName=com.mysql.jdbc.Driver -#์šด์˜ -#Globals.Url=jdbc:mysql://192.168.0.217:3306/helpdesk_db?characterEncoding=utf8 -#๊ฐœ๋ฐœ -Globals.Url=jdbc:mysql://192.168.0.114:13314/helpdesk_db?characterEncoding=utf8 +#\uc6b4\uc601 +Globals.Url=jdbc:mysql://192.168.0.217:3306/helpdesk_db?characterEncoding=utf8 +#\uac1c\ubc1c +#Globals.Url=jdbc:mysql://192.168.0.114:13314/helpdesk_db?characterEncoding=utf8 Globals.UserName =helpdesk Globals.Password =helpdesk # MainPage Setting Globals.MainPage =/EgovContent.do -#ํ†ตํ•ฉ๋ฉ”์ธ๋ฉ”๋‰ด +#\ud1b5\ud569\uba54\uc778\uba54\ub274 #Globals.MainPage = /sym/mnu/mpm/EgovMainMenuHome.do SMS.DriverClassName=com.mysql.jdbc.Driver @@ -51,11 +51,11 @@ SMS.guk= Globals.Version=1.0 Globals.OrgKey= -Globals.OrgNm=์„ธ์ด์ •๋ณด๊ธฐ์ˆ  +Globals.OrgNm=\uc138\uc774\uc815\ubcf4\uae30\uc220 Globals.OrgCode=8188 #Globals.AccessIp=10 -Globals.SiteTitle=์„ธ์ด์ •๋ณด๊ธฐ์ˆ  Help-desk +Globals.SiteTitle=\uc138\uc774\uc815\ubcf4\uae30\uc220 Help-desk #Globals.MobileStartPage=/mobile/intro.do Globals.MobileStartPage=/login.do PushUrl=http://www.sejong.go.kr/sotong @@ -64,14 +64,14 @@ PushUrl=http://www.sejong.go.kr/sotong fileLogUseYn=N fileLogPath=/webapps/ -MENU.PRJ = ํ”„๋กœ์ ํŠธ๊ด€๋ฆฌ -MENU.USER = ํšŒ์›๊ด€๋ฆฌ -MENU.HDB = ์š”์ฒญ์ž‘์—…๊ด€๋ฆฌ -MENU.DTB = ์ž๋ฃŒ์‹ค -MENU.MYPAGE = ๋งˆ์ดํŽ˜์ด์ง€ -MENU.BOARD.STT = ๊ฒŒ์‹œํŒ์ด์šฉํ˜„ํ™ฉ +MENU.PRJ = \ud504\ub85c\uc81d\ud2b8\uad00\ub9ac +MENU.USER = \ud68c\uc6d0\uad00\ub9ac +MENU.HDB = \uc694\uccad\uc791\uc5c5\uad00\ub9ac +MENU.DTB = \uc790\ub8cc\uc2e4 +MENU.MYPAGE = \ub9c8\uc774\ud398\uc774\uc9c0 +MENU.BOARD.STT = \uac8c\uc2dc\ud310\uc774\uc6a9\ud604\ud669 -# ํ™˜๊ฒฝํŒŒ์ผ ์œ„์น˜ +# \ud658\uacbd\ud30c\uc77c \uc704\uce58 Globals.ShellFilePath =globals.properties Globals.ServerConfPath =conf/server.properties Globals.ClientConfPath =conf/client.properties @@ -82,7 +82,7 @@ Globals.MailRequestPath =mail/request/ Globals.MailRResponsePath =mail/response/ Globals.SMEConfigPath =conf/SMEConfig.properties -# WINDOWS์šฉ ์‰˜ํŒŒ์ผ ์ •๋ณด +# WINDOWS\uc6a9 \uc258\ud30c\uc77c \uc815\ubcf4 SHELL.WINDOWS.getHostName =prg/sh_001.bat SHELL.WINDOWS.getDrctryByOwner =prg/getDrctryByOwner.bat SHELL.WINDOWS.getDrctryOwner =prg/getDrctryOwner.bat @@ -92,7 +92,7 @@ SHELL.WINDOWS.getDiskAttrb =prg/getDiskAttrb.bat SHELL.WINDOWS.getDiskCpcty =prg/getDiskCpcty.bat SHELL.WINDOWS.getDiskExst =prg/getDiskExst.bat -# UNIX์šฉ ์‰˜ํŒŒ์ผ ์ •๋ณด - ๊ฐœ๋ฐœwas jeus์—์„œ ์‚ฌ์šฉํ• ๋•Œ ๊ธฐ์ค€ +# UNIX\uc6a9 \uc258\ud30c\uc77c \uc815\ubcf4 - \uac1c\ubc1cwas jeus\uc5d0\uc11c \uc0ac\uc6a9\ud560\ub54c \uae30\uc900 SHELL.UNIX.getHostName =prg/sh_001.sh SHELL.UNIX.getDrctryByOwner =prg/getDrctryByOwner.sh SHELL.UNIX.getDrctryOwner =prg/getDrctryOwner.sh @@ -106,10 +106,10 @@ SHELL.UNIX.getDiskCpcty =prg/getDiskCpcty.sh SHELL.UNIX.getDiskExst =prg/getDiskExst.sh SHELL.UNIX.getProcInfo =prg/getProcInfo.sh -# LINUX์šฉ ์‰˜ํŒŒ์ผ ์ •๋ณด +# LINUX\uc6a9 \uc258\ud30c\uc77c \uc815\ubcf4 -# ์—ฐ๊ณ„ -# ๊ธฐ๊ด€์ฝ”๋“œ์ˆ˜์‹ ์šฉ(๊ฒฝ๋กœ ์„ค์ •์€ ๋ฐ˜๋“œ์‹œ ์ ˆ๋Œ€๊ฒฝ๋กœ๋ฅผ ์‚ฌ์šฉํ•ด์•ผํ•จ.) +# \uc5f0\uacc4 +# \uae30\uad00\ucf54\ub4dc\uc218\uc2e0\uc6a9(\uacbd\ub85c \uc124\uc815\uc740 \ubc18\ub4dc\uc2dc \uc808\ub300\uacbd\ub85c\ub97c \uc0ac\uc6a9\ud574\uc57c\ud568.) CNTC.INSTTCODE.DIR.rcv =D:/tmp/test/rcv/ CNTC.INSTTCODE.DIR.rcvold =D:/tmp/test/rcvold/ CNTC.INSTTCODE.DIR.bin =D:/tmp/test/bin/ @@ -120,11 +120,11 @@ CNTC.INSTTCODE.CMD.edircvmsg =gcc_edircvmsg.bat CNTC.INSTTCODE.INFO.userid =USERID CNTC.INSTTCODE.INFO.userpw =****** -# ํŒŒ์ผ ์—…๋กœ๋“œ ๊ฒฝ๋กœ(๊ฒฝ๋กœ ์„ค์ •์€ ๋ฐ˜๋“œ์‹œ ์ ˆ๋Œ€๊ฒฝ๋กœ๋ฅผ ์‚ฌ์šฉํ•ด์•ผํ•จ, ๊ฒฝ๋กœ ๋’ค์— /๋ฅผ ๋ถ™์—ฌ ์ฃผ์–ด์•ผํ•จ.) +# \ud30c\uc77c \uc5c5\ub85c\ub4dc \uacbd\ub85c(\uacbd\ub85c \uc124\uc815\uc740 \ubc18\ub4dc\uc2dc \uc808\ub300\uacbd\ub85c\ub97c \uc0ac\uc6a9\ud574\uc57c\ud568, \uacbd\ub85c \ub4a4\uc5d0 /\ub97c \ubd99\uc5ec \uc8fc\uc5b4\uc57c\ud568.) #Globals.fileStorePath =/webapps/upload/ Globals.fileStorePath =/webapps/proj/help_desk/upload/ -# ํŒŒ์ผ ๋™๊ธฐํ™” ์ปดํฌ๋„ŒํŠธ์—์„œ ์‚ฌ์šฉํ•  ํŒŒ์ผ ์—…๋กœ๋“œ ๊ฒฝ๋กœ(๊ฒฝ๋กœ ์„ค์ •์€ ๋ฐ˜๋“œ์‹œ ์ ˆ๋Œ€๊ฒฝ๋กœ๋ฅผ ์‚ฌ์šฉํ•ด์•ผํ•จ, ๊ฒฝ๋กœ ๋’ค์— /๋ฅผ ๋ถ™์—ฌ ์ฃผ์–ด์•ผํ•จ.) +# \ud30c\uc77c \ub3d9\uae30\ud654 \ucef4\ud3ec\ub10c\ud2b8\uc5d0\uc11c \uc0ac\uc6a9\ud560 \ud30c\uc77c \uc5c5\ub85c\ub4dc \uacbd\ub85c(\uacbd\ub85c \uc124\uc815\uc740 \ubc18\ub4dc\uc2dc \uc808\ub300\uacbd\ub85c\ub97c \uc0ac\uc6a9\ud574\uc57c\ud568, \uacbd\ub85c \ub4a4\uc5d0 /\ub97c \ubd99\uc5ec \uc8fc\uc5b4\uc57c\ud568.) Globals.SynchrnServerPath =C:/egovframework/upload/Synch/ # for JFile properties @@ -134,13 +134,13 @@ ftp.server.ip =127.0.0.1 ftp.user.id =test ftp.user.password =test -# Social(Facebook, Oauth ์ปดํฌ๋„ŒํŠธ ์‚ฌ์šฉ์‹œ ํ™œ์šฉ) +# Social(Facebook, Oauth \ucef4\ud3ec\ub10c\ud2b8 \uc0ac\uc6a9\uc2dc \ud65c\uc6a9) facebook.appId = facebook.appSecret = twitter.consumerKey = twitter.consumerSecret = -#LDAP์กฐ์ง๋„๊ด€๋ฆฌ ์ปดํฌ๋„ŒํŠธ ์‚ฌ์šฉ์‹œ LDAP์„œ๋ฒ„์„ค์ •์ •๋ณด ํ•„์š” +#LDAP\uc870\uc9c1\ub3c4\uad00\ub9ac \ucef4\ud3ec\ub10c\ud2b8 \uc0ac\uc6a9\uc2dc LDAP\uc11c\ubc84\uc124\uc815\uc815\ubcf4 \ud544\uc694 ldap.url =ldap://localhost:10389 ldap.rootDn =c=kr ldap.username =uid=admin,ou=system