Compare commits

16 Commits
dev ... master

Author SHA1 Message Date
이주일
ab9efc5edb fix: ACI 배송조회 주문번호에 주문배송번호 추가 2026-07-23 00:56:51 +09:00
이주일
d57e2d91e9 fix: ACI POD 배송중 판단 기준 현지출발로 변경 2026-07-10 00:47:16 +09:00
이주일
aaebd9aed7 fix: ACI POD 미래 입고시간 배송중 전환 방지 2026-07-10 00:11:36 +09:00
이주일
40f33b7974 fix: ACI POD 배송중 추적 및 배송완료 전환 보정 2026-07-09 21:59:11 +09:00
이주일
2a3cd31539 fix: ACI 출고 배치 출고고유번호 채번 오류 수정 2026-07-09 16:57:04 +09:00
이대환
303f28b7ed fix : 출고 상태 변경 (배송처리) 2026-07-06 14:12:22 +09:00
이대환
8080bffb56 fix : 출고 상태 변경 (배송처리) 2026-07-06 11:41:44 +09:00
이대환
8c856a53e5 fix : 출고 상태 변경 2026-07-03 10:10:48 +09:00
이대환
6df5f7d280 fix : 출고 상태 변경 2026-07-02 18:18:15 +09:00
이대환
9f365228bd fix : 출고 상태 변경 2026-07-02 17:46:41 +09:00
이대환
11aa9b0882 fix : 출고 상태 변경 2026-07-02 11:42:28 +09:00
이주일
f45722de4d fix: ACI 출고 배치 주문 로그 출고번호 매핑 수정 2026-06-30 13:36:47 +09:00
이주일
3b350f890c fix: 운영 배치 배포 설정 및 ACI 매퍼 경로 수정 2026-06-30 12:11:49 +09:00
이대환
101d01ea2c fix : 출고 상태 변경 2026-06-10 13:37:30 +09:00
이대환
f2049bc49d 출고 상태 변경 2026-06-10 11:36:59 +09:00
이주일
28fb6bca61 add aci.dlivy settings to application-stage.yaml 2026-05-27 12:17:06 +09:00
6 changed files with 38 additions and 103 deletions

8
Jenkinsfile vendored
View File

@@ -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 '❌ 운영 배포 실패 - 롤백 처리됨'
}
}
}

View File

@@ -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");

View File

@@ -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)
}

View File

@@ -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"));

View File

@@ -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.security: debug
org.springframework.security.oauth2: debug
com.wb.domainserver: debug
org.springframework.web: info
org.springframework.security: info
com.wb.domainserver: info
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 요청경로
pos:
syncpos:
url: https://smart.easypos.net
uri: /servlet/EasyPosChannelSVL?cmd=TlxSyncHanamCMD
#kakao REST-API key (뉴트리코어 키)
kakao:
restApi-key: "2d1fa2155bc36878a45c65e45e23a990"
#선물하기 URL
presenturl : svc.gcone.co.kr
acikey:
url: https://acieshop.com/api/kr/token/
userid: UNIHAN
apikey: DC94F29AFD5399F54AAE7FAA46045B65
aci:
dlivy:
api-url: https://acieshop.com/api/kr/delivery/v1.5/detail/index.php
pod:
api-url: https://acieshop.com/api/kr/pod/v1.5/