itfirst/sake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
김현욱
2025-12-11 14:21:27 +09:00
parent 6a41d7fa79 5614cd9f85
commit 6111f8ea84
8 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/resources/application-local.yml
View File

@@ -107,7 +107,7 @@ sopmalfo:
rtrn: /data/gcone/rtrnFile rtrn: /data/gcone/rtrnFile
extensions: extensions:
images: .gif,.jpg,.jpeg,.png images: .gif,.jpg,.jpeg,.png
cdnurl: http://dev.soju1sake1.com cdnurl: http://img.soju1sake1.com
pagination: pagination:
@@ -353,7 +353,7 @@ mngrfo:
web: /webFile web: /webFile
extensions: extensions:
images: .gif,.jpg,.jpeg,.png images: .gif,.jpg,.jpeg,.png
cdnurl: http://dev.soju1sake1.com cdnurl: http://img.soju1sake1.com
secret: secret:
@@ -361,7 +361,7 @@ secret:
host: host:
img: http://dev.soju1sake1.com img: http://img.soju1sake1.com
naverpay: naverpay:
order: order:

2
src/main/resources/mybatis/xml/mapper/admin/store/bsnm/BOBsnmMapper.xml
View File

@@ -70,7 +70,7 @@
parameterType="com.wb.domainserver.domain.admin.store.bsnm.vo.BOBsnmVO" parameterType="com.wb.domainserver.domain.admin.store.bsnm.vo.BOBsnmVO"
resultType="datamap"> resultType="datamap">
<![CDATA[ <![CDATA[
SET @ROWNUM = 0; /*SET @ROWNUM = 0;*/
SELECT * SELECT *
FROM ( FROM (

2
src/main/resources/mybatis/xml/mapper/admin/store/sopthema/BOSopthemaMapper.xml
View File

@@ -60,7 +60,7 @@
parameterType="com.wb.domainserver.domain.admin.store.sopthema.vo.BOSopThemaVO" parameterType="com.wb.domainserver.domain.admin.store.sopthema.vo.BOSopThemaVO"
resultType="dataMap"> resultType="dataMap">
<![CDATA[ <![CDATA[
SET @ROWNUM = 0; /*SET @ROWNUM = 0;*/
SELECT * SELECT *
FROM ( FROM (
SELECT CAST(@ROWNUM:=@ROWNUM+1 AS UNSIGNED) AS RNUM SELECT CAST(@ROWNUM:=@ROWNUM+1 AS UNSIGNED) AS RNUM

2
src/main/resources/mybatis/xml/mapper/admin/sys/comncd/BOComncdMapper.xml
View File

@@ -87,7 +87,7 @@
parameterType="com.wb.domainserver.domain.admin.sys.comncd.vo.BOMaComncdVO" parameterType="com.wb.domainserver.domain.admin.sys.comncd.vo.BOMaComncdVO"
resultType="dataMap"> resultType="dataMap">
<![CDATA[ <![CDATA[
SET @ROWNUM = 0; /*SET @ROWNUM = 0;*/
SELECT * SELECT *
FROM ( FROM (
SELECT CAST(@ROWNUM:=@ROWNUM+1 AS UNSIGNED) AS RNUM SELECT CAST(@ROWNUM:=@ROWNUM+1 AS UNSIGNED) AS RNUM

2
src/main/resources/mybatis/xml/mapper/gcone/promtn/coupon/BOCouponMapper.xml
View File

@@ -1293,7 +1293,7 @@
parameterType = "com.wb.domainserver.domain.gcone.promtn.coupon.vo.BOCouponPkSndngVO" parameterType = "com.wb.domainserver.domain.gcone.promtn.coupon.vo.BOCouponPkSndngVO"
resultType = "dataMap"> resultType = "dataMap">
<![CDATA[ <![CDATA[
SET @ROWNUM = 0; /*SET @ROWNUM = 0;*/
SELECT * SELECT *
FROM ( FROM (
SELECT CAST(@ROWNUM:=@ROWNUM+1 AS UNSIGNED) AS RNUM SELECT CAST(@ROWNUM:=@ROWNUM+1 AS UNSIGNED) AS RNUM

2
src/main/resources/static/mobile/js/bnft/common/Common_app.js
View File

@@ -172,7 +172,7 @@ function fn_push_send() {
var pushSj = "테스트 발송"; var pushSj = "테스트 발송";
var pushCn = "테스트 발송입니다."; var pushCn = "테스트 발송입니다.";
var pushType = "notice"; var pushType = "notice";
var imgFilCours = "https://img.gcone.co.kr/NC/goods/1/2017/06/116_tmp_2a6add67ad603d452d32743dac0410112327view.jpg"; var imgFilCours = "https://img.soju1sake1.com/NC/goods/1/2017/06/116_tmp_2a6add67ad603d452d32743dac0410112327view.jpg";
var dataUrl = "/sopmal/goods/selectGoodsDtl?goodsInnb=857"; var dataUrl = "/sopmal/goods/selectGoodsDtl?goodsInnb=857";
var dataKey = ""; var dataKey = "";
var dataExt = ""; var dataExt = "";

6
src/main/webapp/WEB-INF/views/comm/mngr/Header.jsp
View File

@@ -210,11 +210,11 @@
const hostname = window.location.hostname; const hostname = window.location.hostname;
let itrntDomain = null; let itrntDomain = null;
if (hostname.match(/^loc\./)) { // loc.로 시작하는지 검사 if (hostname.match(/^loc\./)) { // loc.로 시작하는지 검사
itrntDomain = 'http://loc.itrnt.gcone.co.kr:18310'; itrntDomain = 'http://loc.itrnt.soju1sake1.com:18310';
} else if (hostname.match(/^dev\./)) { // dev.로 시작하는지 검사 } else if (hostname.match(/^dev\./)) { // dev.로 시작하는지 검사
itrntDomain = 'http://dev.itrnt.gcone.co.kr'; itrntDomain = 'http://dev.itrnt.soju1sake1.com';
} else { } else {
itrntDomain = 'https://itrnt.gcone.co.kr'; itrntDomain = 'https://itrnt.soju1sake1.com';
} }
// 본사 아이디 CH와 NC일 경우 분기 처리 // 본사 아이디 CH와 NC일 경우 분기 처리

4
src/main/webapp/WEB-INF/views/mngr/mngrstr/StoreDtlU.jsp
View File

@@ -459,8 +459,8 @@
} }
//로컬처리(임시) //로컬처리(임시)
if (window.location.hostname === "loc.mngr.gcone.co.kr") { if (window.location.hostname === "loc.mngr.soju1sake1.com") {
sopmalDomain = sopmalDomain.replace("dev.", "loc.") + ":18310"; sopmalDomain = sopmalDomain.replace("dev.", "loc.") + ":18500";
} }
window.open(sopmalDomain+'/sopmal/mbr/selectPosJoinAgreeTermsForm?storeCode='+posCode+'&code=mngr', '_blank'); window.open(sopmalDomain+'/sopmal/mbr/selectPosJoinAgreeTermsForm?storeCode='+posCode+'&code=mngr', '_blank');