From 00b24a98fc12811e457f054ab822271a0c168228 Mon Sep 17 00:00:00 2001 From: urp Date: Fri, 27 Feb 2026 11:12:03 +0900 Subject: [PATCH] =?UTF-8?q?=EB=85=B8=EC=9B=90=EA=B5=AC=EC=B2=AD,=20?= =?UTF-8?q?=EC=96=91=ED=8F=89=EA=B5=B0=EC=B2=AD=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=A5=B8=20AP=20=EB=B3=B4=EC=99=84?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseapi/urpBaseResourceApplication.java | 14 +++++ .../controller/CodeAssetCateController.java | 4 +- src/main/resources/application-nowon.yml | 61 +++++++++++++++++++ src/main/resources/application-yp21.yml | 61 +++++++++++++++++++ .../sqlmap/itms/sys/AuthorGroupMapper.xml | 5 +- .../sqlmap/itms/sys/DeptAuthorMapper.xml | 2 + 6 files changed, 143 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/application-nowon.yml create mode 100644 src/main/resources/application-yp21.yml diff --git a/src/main/java/com/urpsys/baseapi/urpBaseResourceApplication.java b/src/main/java/com/urpsys/baseapi/urpBaseResourceApplication.java index 12996456..3a9579f4 100644 --- a/src/main/java/com/urpsys/baseapi/urpBaseResourceApplication.java +++ b/src/main/java/com/urpsys/baseapi/urpBaseResourceApplication.java @@ -78,6 +78,20 @@ public class urpBaseResourceApplication System.out.println("############# kintex_prod Env ##################"); System.out.println("################################################"); } + // 2026.01.28 나혁제 노원구청 추가 + else if(activeProfile.equals("nowon")) + { + System.out.println("################################################"); + System.out.println("############# nowon Env ########################"); + System.out.println("################################################"); + } + // 2026.02.26 나혁제 양평군청 추가 + else if(activeProfile.equals("yp21")) + { + System.out.println("################################################"); + System.out.println("############# yp21 Env #########################"); + System.out.println("################################################"); + } else { System.out.println("################################################"); diff --git a/src/main/java/com/urpsys/itmsapi/rem/controller/CodeAssetCateController.java b/src/main/java/com/urpsys/itmsapi/rem/controller/CodeAssetCateController.java index 2aeb8bc5..9b073f3f 100644 --- a/src/main/java/com/urpsys/itmsapi/rem/controller/CodeAssetCateController.java +++ b/src/main/java/com/urpsys/itmsapi/rem/controller/CodeAssetCateController.java @@ -56,7 +56,7 @@ public class CodeAssetCateController ) throws Exception { log.info("\n\n\n\n\n"); - log.info(">>>>>>>>>>>>>>>>>>>>>>>>> /sys/AuthorGroupList.do <<<<<<<<<<<<<<<<<<<<<<<<<"); + log.info(">>>>>>>>>>>>>>>>>>>>>>>>> /rem/getCate1List.do <<<<<<<<<<<<<<<<<<<<<<<<<"); log.info("getRequestURI [{}]", request.getRequestURI() ); log.info("입력값 확인 requestMap [{}]", requestMap.toString() ); @@ -66,7 +66,7 @@ public class CodeAssetCateController resBody.put("resultCate1", resultCate1); - log.info("<<<<<<<<<<<<<<<<<<<<<<<<< /sys/AuthorGroupList.do >>>>>>>>>>>>>>>>>>>>>>>>>"); + log.info("<<<<<<<<<<<<<<<<<<<<<<<<< /rem/getCate1List.do >>>>>>>>>>>>>>>>>>>>>>>>>"); return ResultData.ok(resBody); } diff --git a/src/main/resources/application-nowon.yml b/src/main/resources/application-nowon.yml new file mode 100644 index 00000000..a2a40bc1 --- /dev/null +++ b/src/main/resources/application-nowon.yml @@ -0,0 +1,61 @@ + # Service port + server: + port: 11010 + +# JPA 설정, JSP 설정 + spring: + devtools: + livereload: + enabled: true +# 인증서버에서 JWT 보안키 확인 + security: + oauth2: + resourceserver: + jwt: + jwk-set-uri: + http://localhost:11000/oauth/token_key + +# Primary db information + primarydb: + driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + jdbcUrl: jdbc:log4jdbc:mariadb://98.11.2.93:3306/ur_itms_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&rewriteBatchedStatements=true + username: g9IwFesTyIloXVpUnfOX0g== + password: E4SOtjDqqO79BQERc/eaTw== + maximumPoolSize: 35 + minimumIdle: 2 + connectionTimeout: 3000 + idleTimeout: 300000 + testOnBorrow: true + validationQuery: SELECT 1 + +# SQL Log 관련 setting + log4jdbc: + spylogdelegator: + name: net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator + dump: + sql: + maxlinelength: 0 + + logging.level.jdbc.sqlonly: info + logging.level.jdbc.sqltiming: false + logging.level.jdbc.audit: false + logging.level.jdbc.resultset: false + logging.level.jdbc.resultsettable: info + logging.level.jdbc.connection: false + + # custom 설정 + custom: + api_server : null + sendmail: + id: tW9kMpd3SiAnf3RQBOZapw== + password: Tkkj8p2PYfZ+AmpQMPLHF8ksj8vrtJouj6xczU8ShM8= + port: 587 + host: smtp.gmail.com + sendEmail: hhjj0701@gmail.com + senderName: 나혁제 + socketFactory-class: javax.net.ssl.SSLSocketFactory + supplier: gmail.com + front_host_info : http://localhost:11020 + client : + + \ No newline at end of file diff --git a/src/main/resources/application-yp21.yml b/src/main/resources/application-yp21.yml new file mode 100644 index 00000000..abeaa9fe --- /dev/null +++ b/src/main/resources/application-yp21.yml @@ -0,0 +1,61 @@ + # Service port + server: + port: 11010 + +# JPA 설정, JSP 설정 + spring: + devtools: + livereload: + enabled: true +# 인증서버에서 JWT 보안키 확인 + security: + oauth2: + resourceserver: + jwt: + jwk-set-uri: + http://localhost:11000/oauth/token_key + +# Primary db information + primarydb: + driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + jdbcUrl: jdbc:log4jdbc:mariadb://105.29.2.26:3306/ur_itms_db?characterEncoding=UTF-8&serverTimezone=Asia/Seoul&rewriteBatchedStatements=true + username: g9IwFesTyIloXVpUnfOX0g== + password: E4SOtjDqqO79BQERc/eaTw== + maximumPoolSize: 35 + minimumIdle: 2 + connectionTimeout: 3000 + idleTimeout: 300000 + testOnBorrow: true + validationQuery: SELECT 1 + +# SQL Log 관련 setting + log4jdbc: + spylogdelegator: + name: net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator + dump: + sql: + maxlinelength: 0 + + logging.level.jdbc.sqlonly: info + logging.level.jdbc.sqltiming: false + logging.level.jdbc.audit: false + logging.level.jdbc.resultset: false + logging.level.jdbc.resultsettable: info + logging.level.jdbc.connection: false + + # custom 설정 + custom: + api_server : null + sendmail: + id: tW9kMpd3SiAnf3RQBOZapw== + password: Tkkj8p2PYfZ+AmpQMPLHF8ksj8vrtJouj6xczU8ShM8= + port: 587 + host: smtp.gmail.com + sendEmail: hhjj0701@gmail.com + senderName: 나혁제 + socketFactory-class: javax.net.ssl.SSLSocketFactory + supplier: gmail.com + front_host_info : http://localhost:11020 + client : + + \ No newline at end of file diff --git a/src/main/resources/mapper/primarydb/sqlmap/itms/sys/AuthorGroupMapper.xml b/src/main/resources/mapper/primarydb/sqlmap/itms/sys/AuthorGroupMapper.xml index 1147cb60..97d2b61d 100644 --- a/src/main/resources/mapper/primarydb/sqlmap/itms/sys/AuthorGroupMapper.xml +++ b/src/main/resources/mapper/primarydb/sqlmap/itms/sys/AuthorGroupMapper.xml @@ -38,8 +38,9 @@ , GRP_ID , 'USR03' MEM_TYCD , ESNTL_ID - FROM TB_TASK_USER_INFO ) A LEFT OUTER JOIN TB_USER_CRYP_CNF B - ON A.ESNTL_ID = B.CRYP_CNF_TRG_ID + FROM TB_TASK_USER_INFO + WHERE LIST_INQ_YN IS NULL OR LIST_INQ_YN != 'Y' ) A + LEFT OUTER JOIN TB_USER_CRYP_CNF B ON A.ESNTL_ID = B.CRYP_CNF_TRG_ID WHERE 1 = 1 AND diff --git a/src/main/resources/mapper/primarydb/sqlmap/itms/sys/DeptAuthorMapper.xml b/src/main/resources/mapper/primarydb/sqlmap/itms/sys/DeptAuthorMapper.xml index a0010d9c..a0663a6a 100644 --- a/src/main/resources/mapper/primarydb/sqlmap/itms/sys/DeptAuthorMapper.xml +++ b/src/main/resources/mapper/primarydb/sqlmap/itms/sys/DeptAuthorMapper.xml @@ -22,6 +22,8 @@ FROM TB_ORG_INFO A, TB_TASK_USER_INFO B WHERE A.ORG_ID = B.ORG_ID + AND ( B.LIST_INQ_YN IS NULL + OR B.LIST_INQ_YN != 'Y' ) AND A.ORG_ID = #{deptCode}) A LEFT OUTER JOIN TB_USER_CRYP_CNF B ON A.ESNTL_ID = B.CRYP_CNF_TRG_ID WHERE 1 = 1