From 7d8b2307fa1d2e22b3c9d781321cf31fcff7f26a Mon Sep 17 00:00:00 2001 From: minuk926 Date: Fri, 6 May 2022 17:34:57 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat=20:=20=EA=B1=B0=EC=A3=BC=EC=9E=90/?= =?UTF-8?q?=EC=9E=A5=EC=95=A0=EC=9D=B8=20=EC=8B=AC=EC=82=AC=EC=9E=90=20?= =?UTF-8?q?=EC=8B=AC=EC=82=AC=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/config/conf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/config/conf.yml b/src/main/resources/config/conf.yml index 2cb251b..b12a19d 100644 --- a/src/main/resources/config/conf.yml +++ b/src/main/resources/config/conf.yml @@ -17,7 +17,7 @@ api: file: cmm: upload: - root: /data/file/upload + root: c:/data/file/upload # root: /Users/minuk/data/file/upload # 공지사항 path: /kangnamSIM/simUpFile From 8e946374beec778108a8979e08521da7f5922a33 Mon Sep 17 00:00:00 2001 From: minuk926 Date: Fri, 6 May 2022 17:35:45 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat=20:=20=EA=B1=B0=EC=A3=BC=EC=9E=90/?= =?UTF-8?q?=EC=9E=A5=EC=95=A0=EC=9D=B8=20=EC=8B=AC=EC=82=AC=EC=9E=90=20?= =?UTF-8?q?=EC=8B=AC=EC=82=AC=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/config/application-oauth.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/config/application-oauth.yml b/src/main/resources/config/application-oauth.yml index 397d367..7ade61b 100644 --- a/src/main/resources/config/application-oauth.yml +++ b/src/main/resources/config/application-oauth.yml @@ -68,7 +68,7 @@ spring: # Spring Security cors 설정 :: CorsConfiguration 설정 값 cors: - allowed-origins: http://localhost:3000,http://localhost:8080,http://localhost,http://211.119.124.9 + allowed-origins: http://localhost:3000,http://localhost:8080,http://localhost,http://211.119.124.9,http://211.119.124.9:8090 allowed-methods: GET,POST,PUT,DELETE,OPTIONS allowed-headers: '*' max-age: 3600 From 4c72a1a33345c7ce5788856922f9bb9a046484d2 Mon Sep 17 00:00:00 2001 From: Lim Jonguk Date: Fri, 13 May 2022 16:22:02 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=EC=8B=AC=EC=9D=98=EA=B2=B0=EA=B3=BC?= =?UTF-8?q?=20=EC=A1=B0=ED=9A=8C=20=EC=BF=BC=EB=A6=AC=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis-mapper/biz/ctgy/parking-mapper.xml | 12 +++++++----- .../biz/ctgy/residentanddisabled-mapper.xml | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/resources/mybatis-mapper/biz/ctgy/parking-mapper.xml b/src/main/resources/mybatis-mapper/biz/ctgy/parking-mapper.xml index d105988..dbb4f41 100644 --- a/src/main/resources/mybatis-mapper/biz/ctgy/parking-mapper.xml +++ b/src/main/resources/mybatis-mapper/biz/ctgy/parking-mapper.xml @@ -129,12 +129,13 @@ , MS.ms_seq , MS.ms_carnum , MU.name + , MS.ms_result , (SELECT code_nm FROM tb_cmm_code_s WHERE code_grp_id = 'TRAFFIC' AND code_lcd = 'GANGNAM_SIMSA' AND code_mcd = 'RESULT' - AND code_cd = MS.ms_result) as ms_result + AND code_cd = MS.ms_result) as ms_result_nm , (SELECT code_nm FROM tb_cmm_code_s WHERE code_grp_id = 'TRAFFIC' @@ -162,21 +163,21 @@ AND MSU.msu_team = #{msuTeam} AND MSU.msu_userid = MU.userid - ORDER BY MSU.msu_userid, MU.name + ORDER BY MSU.msu_userid, MU.name, MS.ms_seq, MS.ms_carnum - + \ No newline at end of file diff --git a/src/main/resources/mybatis-mapper/biz/ctgy/residentanddisabled-mapper.xml b/src/main/resources/mybatis-mapper/biz/ctgy/residentanddisabled-mapper.xml index 1817f3d..8e96189 100644 --- a/src/main/resources/mybatis-mapper/biz/ctgy/residentanddisabled-mapper.xml +++ b/src/main/resources/mybatis-mapper/biz/ctgy/residentanddisabled-mapper.xml @@ -137,12 +137,13 @@ , MSS.ms_seq , MSS.ms_carnum , MU.name + , MSS.ms_result , (SELECT code_nm FROM tb_cmm_code_s WHERE code_grp_id = 'TRAFFIC' AND code_lcd = 'GANGNAM_SIMSA' AND code_mcd = 'RESULT' - AND code_cd = MSS.ms_result) as ms_result + AND code_cd = MSS.ms_result) as ms_result_nm , (SELECT code_nm FROM tb_cmm_code_s WHERE code_grp_id = 'TRAFFIC'