fix: ACI 배송조회 주문번호에 주문배송번호 추가

Jenkinsfile

@@ -11,7 +11,7 @@ pipeline {
 
         // 앱 정보
         APP_NAME       = 'gcone_batch'
-        TOMCAT_HOME    = '/usr/local/tomcat_dev'
+        TOMCAT_HOME    = '/usr/local/tomcat'
         DEPLOY_PATH    = "${TOMCAT_HOME}/webapps"
         BACKUP_PATH    = "${TOMCAT_HOME}/backup"
         DEPLOY_FILE    = "${TOMCAT_HOME}/webapps/${APP_NAME}.war"
@@ -24,7 +24,7 @@ pipeline {
     stages {
         stage('Checkout') {
             steps {
-                git branch: 'dev',
+                git branch: 'master',
                     credentialsId: 'itfirst',
                     url: 'http://115.68.207.90:3000/itfirst/sake_batch.git'
             }
@@ -90,7 +90,7 @@ pipeline {
 
     post {
         success {
-            echo '✅ sake_batch 개발 배포 완료'
+            echo '✅ sake_batch 운영 배포 완료'
         }
         failure {
             script {
@@ -112,7 +112,7 @@ pipeline {
                     fi
                 """
             }
-            echo '❌ 게빌 배포 실패 - 롤백 처리됨'
+            echo '❌ 운영 배포 실패 - 롤백 처리됨'
         }
     }
 }

src/main/java/com/wb/domainserver/acidlivy/tasklet/AciDlivyTasklet.java

@@ -320,6 +320,7 @@ public class AciDlivyTasklet implements Tasklet {
         orderLogMap.put("logDtlCn", "[ACI 배치] 배치 출고처리 완료");
         orderLogMap.put("aditInfoCn", null);
         orderLogMap.put("dlivyInnb", orderVO.getDlivyInnb());
+        orderLogMap.put("dlivyCdNb", dlivyCdNb);
         orderLogMap.put("refundCdNb", null);
         orderLogMap.put("logDvCd", "01");
         orderLogMap.put("dvCd", "BATCH");

src/main/java/com/wb/domainserver/acidlivy/vo/AciDlivyVO.java

@@ -0,0 +1,14 @@
+package com.wb.domainserver.acidlivy.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+// ACI API 응답에서 필요한 Data 항목 (BLNO, OverseaSellerNo)
+@Getter
+@Setter
+@ToString
+public class AciDlivyVO {
+    private String blno;            // ACI 운송장번호
+    private String overseaSellerNo; // 해외판매자 고유번호 (= ORDR_DLVY_INNB)
+}

src/main/java/com/wb/domainserver/common/config/GconeSourceConfig.java

@@ -30,7 +30,8 @@ import java.util.List;
 @EnableTransactionManagement
 @MapperScan(
         basePackages = {
-            "com.wb.domainserver.mapper.gcone"
+            "com.wb.domainserver.mapper.gcone",
+            "com.wb.domainserver.acidlivy.tasklet"
         },
         sqlSessionFactoryRef = "gconeSqlSessionFactory"
 )
@@ -59,6 +60,7 @@ public class GconeSourceConfig {
         PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
         List<Resource> mapperLocations = new ArrayList<>();
         mapperLocations.addAll(Arrays.asList(resolver.getResources("classpath*:mybatis/xml/mapper/gcone/**/*.xml")));
+        mapperLocations.addAll(Arrays.asList(resolver.getResources("classpath*:mybatis/xml/mapper/acidlivy/**/*.xml")));
         sessionFactory.setMapperLocations(mapperLocations.toArray(new Resource[0]));
 
         sessionFactory.setConfigLocation(new PathMatchingResourcePatternResolver().getResource("classpath:mybatis/xml/config/mapper-config.xml"));

src/main/resources/application-stage.yaml

@@ -1,13 +1,6 @@
 server:
   port: 18210
-
-
 spring:
-  security:
-    oauth2:
-      resourceserver:
-        jwt:
-          issuer-uri: http://172.31.21.12:18320/realms/ADMIN
   main:
     allow-bean-definition-overriding: true
   datasource:
@@ -21,112 +14,37 @@ spring:
       driver-class-name: com.mysql.cj.jdbc.Driver
       username: sakeone
       password: dnlfxjtm13@$
-    crmdatasource:
-      jdbc-url: jdbc:mysql://10.2.1.101:3306/sake?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&autoReconnect=true&allowMultiQueries=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=false&verifyServerCertificate=false
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      username: sakeone
-      password: dnlfxjtm13@$
-    mqdatasource:
-      jdbc-url: jdbc:mysql://10.2.1.101:3306/sake?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&autoReconnect=true&allowMultiQueries=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=false&verifyServerCertificate=false
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      username: sakeone
-      password: dnlfxjtm13@$
-    suredatasource:
-      jdbc-url: jdbc:mysql://10.2.1.101:3306/sake?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&autoReconnect=true&allowMultiQueries=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=false&verifyServerCertificate=false
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      username: sakeone
-      password: dnlfxjtm13@$
   batch:
+    jdbc:
+      initialize-schema: never
     job:
-      enabled: true
+      enabled: false
   mybatis:
     mapper-locations: classpath*:mybatis/xml/mapper/**/*.xml
     config-location: classpath:/mybatis/xml/config/mapper-config.xml
-
 logging:
   level:
-    org.springframework.web: debug
+    org.springframework.web: info
-    org.springframework.security: debug
+    org.springframework.security: info
-    org.springframework.security.oauth2: debug
+    com.wb.domainserver: info
-    com.wb.domainserver: debug
     root: info
-
-#Resource-server-url
 url:
   resource:
     server:
-      gconebo: http://10.2.2.148:18500    #내부망 ip
+      gconebo: http://10.2.2.148:18500
       reviewbo: http://127.0.0.1:18220
-
-pagination:
-  page-unit: 10
-  page-size: 10
-
-
-# 스윗트래커 url, api key
-parcel:
-  trackApiUrl: https://info.sweettracker.co.kr
-  trackApiKey: R0sYxkD9vCxSXPKpStOY2w
-    
-smartstore:
-  sopmal:
-    stores:
-      #참다한홍삼
-      CH:
-        clientId: 48f8YgF04wTnge6taw9bsM
-        clientSecret: $2a$04$9Lfn5as5Vv/ZW5PAoKBBr.
-
-#스마트 스토어 api url
-smartstoreurl:
-  tokenurl: https://api.commerce.naver.com/external/v1/oauth2/token
-  orderlisturl: https://api.commerce.naver.com/external/v1/pay-order/seller/product-orders/last-changed-statuses
-  orderdetailurl : https://api.commerce.naver.com/external/v1/pay-order/seller/product-orders/query
-
-
-
-#슈어엠 법인별 정보
-surem:
-  sopmal:
-    #참다한홍삼
-    CH:
-      code: GC
-      data: (주)지씨바이오
-      erpcode: 01
-      userid: gcbio02
-      deptcode: KT-26E-ZS
-      yellowkey: cd51453ccf40ef714cadd5a7dd0506cd7340a986
-
-#GC EP 파일 저장 경로
-ep:
-  common:
-    fileupload:
-      uploaddirs:
-        path: /data/gcone/otrFile
-        naver: naver_third
-        google: googleEpXmlData
-        meta: metaEpXmlData
-        mobion: mobionEpXmlData
-      extensions:
-        xml: .xml
-        txt: .txt
-      cdnurl: https://img.gcone.co.kr
-
 secret:
   key: 1df5be2f7e90ae36
-
 mail:
   host: 10.2.1.76
   port: 25
 
-# SyncPos 요청경로
+acikey:
-pos:
+  url: https://acieshop.com/api/kr/token/
-  syncpos:
+  userid: UNIHAN
-    url: https://smart.easypos.net
+  apikey: DC94F29AFD5399F54AAE7FAA46045B65
-    uri: /servlet/EasyPosChannelSVL?cmd=TlxSyncHanamCMD
+aci:
-
+  dlivy:
-#kakao REST-API key (뉴트리코어 키)
+    api-url: https://acieshop.com/api/kr/delivery/v1.5/detail/index.php
-kakao:
+  pod:
-  restApi-key: "2d1fa2155bc36878a45c65e45e23a990"
+    api-url: https://acieshop.com/api/kr/pod/v1.5/
-
-#선물하기 URL
-presenturl : svc.gcone.co.kr