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

fo bo 머지작업 - 오류수정

Browse Source
This commit is contained in:
jazz
2025-12-02 10:10:09 +09:00
parent 23028a50fe
commit d0ee787a9e
10 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/wb/domainserver/domain/sopmal/csc/controller/CscController.java
View File

@@ -551,7 +551,7 @@ public class CscController {
*/ */
@Policy(AuthPolicy.PUBLIC) @Policy(AuthPolicy.PUBLIC)
@RequestMapping(value = "/selectBbscttCn", produces = MediaType.APPLICATION_JSON_VALUE) @RequestMapping(value = "/selectBbscttCn", produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<?> selectBbscttCn(BOGnrlbbscttVO bbsctt) { public ResponseEntity<?> selectBbscttCn(@RequestBody BOGnrlbbscttVO bbsctt) {
AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
if ("01".equals(user.getSysDvCd())) { if ("01".equals(user.getSysDvCd())) {

15
src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/controller/MyMbrController.java
View File

@@ -529,11 +529,19 @@ public class MyMbrController {
} }
/*4 아이디 비밀번호 동일 확인*/ /*4 아이디 비밀번호 동일 확인*/
if (responseHandler.handleResponseAsMap( // 사용자 정보 추출
sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/mbr/mbr/selectBOIdPasswordDuplicateAt", mymbrVO) AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
).get("idPasswordDuplicateAt").equals("Y")) { vo.setMbrDvCd(user.getMbrDvCd());
vo.setMbrInnb(String.valueOf(user.getUserInnb()));
if("Y".equals(service.selectBOIdSearch(vo).get("idPasswordDuplicateAt"))){
throw new WnbtRestException("비밀번호는 아이디와 동일할 수 없습니다."); throw new WnbtRestException("비밀번호는 아이디와 동일할 수 없습니다.");
} }
// if (responseHandler.handleResponseAsMap(
// sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/mbr/mbr/selectBOIdPasswordDuplicateAt", mymbrVO)
// ).get("idPasswordDuplicateAt").equals("Y")) {
// throw new WnbtRestException("비밀번호는 아이디와 동일할 수 없습니다.");
// }
/*5 기존 비밀번호 동일 확인*/ /*5 기존 비밀번호 동일 확인*/
if (password.equals(mymbrVO.getMbrPassword())) { if (password.equals(mymbrVO.getMbrPassword())) {
@@ -541,7 +549,6 @@ public class MyMbrController {
} }
// 사용자 정보 추출 및 적용 // 사용자 정보 추출 및 적용
AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
vo.setSopmalCd(user.getSopmalCd()); vo.setSopmalCd(user.getSopmalCd());
vo.setUpdusr(user.getUserInnb()); vo.setUpdusr(user.getUserInnb());
vo.setMbrInnb(String.valueOf(user.getUserInnb())); vo.setMbrInnb(String.valueOf(user.getUserInnb()));

4
src/main/webapp/WEB-INF/views/sopmal/csc/BbscttUpdtPopupU.jsp
View File

@@ -376,7 +376,7 @@
let sopmalCd = $("#sopmalCd").val(); let sopmalCd = $("#sopmalCd").val();
$.ajax({ $.ajax({
type: "post", type: "post",
url: "<c:url value ='/mngr/bbs/gnrlsctt/selectBOBbscttCnAjax'/>", url: "<c:url value ='/sopmal/csc/selectBbscttCn'/>",
contentType: 'application/json', contentType: 'application/json',
data: JSON.stringify({ data: JSON.stringify({
bbsId: bbsId, bbsId: bbsId,
@@ -384,7 +384,7 @@
sopmalCd: sopmalCd sopmalCd: sopmalCd
}), }),
success: function (data) { success: function (data) {
let cn = JSON.parse(data.resBody.result).result.cn; let cn = JSON.parse(data.resBody.result).cn;
$("#cnBbsUpdt").val(cn); $("#cnBbsUpdt").val(cn);
} }
}); });

12
src/main/webapp/WEB-INF/views/sopmal/csc/BbscttUpdtU.jsp
View File

@@ -214,17 +214,19 @@
let bbscttInnb = $("#bbscttInnb").val(); let bbscttInnb = $("#bbscttInnb").val();
let bbsId = $("#bbsId").val(); let bbsId = $("#bbsId").val();
let sopmalCd = $("#sopmalCd").val(); let sopmalCd = $("#sopmalCd").val();
console.log(bbscttInnb, bbsId, sopmalCd);
$.ajax({ $.ajax({
type: "post", type: "post",
url: "<c:url value ='/mngr/bbs/gnrlsctt/selectBOBbscttCnAjax'/>", <%--url: "<c:url value ='/mngr/bbs/gnrlsctt/selectBOBbscttCnAjax'/>",--%>
contentType: 'application/json', url: "<c:url value ='/sopmal/csc/selectBbscttCn'/>",
data: JSON.stringify({ data: {
bbsId: bbsId, bbsId: bbsId,
bbscttInnb: bbscttInnb, bbscttInnb: bbscttInnb,
sopmalCd: sopmalCd sopmalCd: sopmalCd
}), },
success: function (data) { success: function (data) {
let cn = JSON.parse(data.resBody.result).result.cn; console.log(data);
let cn = JSON.parse(data.resBody.result).cn;
$("#cnBbsUpdt").val(cn); $("#cnBbsUpdt").val(cn);
$("#cnBbsUpdt").addClass("ck-content"); $("#cnBbsUpdt").addClass("ck-content");
} }

13
src/main/webapp/WEB-INF/views/sopmal/mbr/JoinC.jsp
View File

@@ -287,8 +287,7 @@
data : params, data : params,
dataType: 'json', dataType: 'json',
success : function (Data) { success : function (Data) {
let result = JSON.parse(Data.resBody.result);
let result = Data.resBody.result;
if(result.result == "success"){ if(result.result == "success"){
if (first > 0) { if (first > 0) {
alert('인증번호가 재발송되었습니다.'); alert('인증번호가 재발송되었습니다.');
@@ -359,7 +358,7 @@
dataType: 'json', dataType: 'json',
success : function (Data) { success : function (Data) {
let result = Data.resBody.result; let result = JSON.parse(Data.resBody.result);
if(result.result == "success"){ if(result.result == "success"){
alert('인증되었습니다.'); alert('인증되었습니다.');
$('#phoneAuthOkBtn').show(); $('#phoneAuthOkBtn').show();
@@ -399,7 +398,7 @@
dataType: 'json', dataType: 'json',
success : function(result) { success : function(result) {
let mbrWithDrawalList = result.resBody.result.mbrWithDrawalList; let mbrWithDrawalList = JSON.parse(result.resBody.result).mbrWithDrawalList;
fn_make_rejoinInforList(mbrWithDrawalList); fn_make_rejoinInforList(mbrWithDrawalList);
} }
@@ -543,7 +542,7 @@
dataType: 'json', dataType: 'json',
success : function (result) { success : function (result) {
const response = result.resBody.result; const response = JSON.parse(result.resBody.result);
const errStatus = response.status; const errStatus = response.status;
if(errStatus === 500){ if(errStatus === 500){
@@ -599,13 +598,13 @@
dataType: 'json', dataType: 'json',
success : function(Data) { success : function(Data) {
if (Data.resBody.result.message === 'impossible'){ if (JSON.parse(Data.resBody.result).message === 'impossible'){
alert('\"' + mbrid + '\" 은 이용중인 아이디 입니다.'); alert('\"' + mbrid + '\" 은 이용중인 아이디 입니다.');
dupList.push(mbrid); dupList.push(mbrid);
$("#mbrIdAlert").html('이미 사용중인 아이디입니다.'); $("#mbrIdAlert").html('이미 사용중인 아이디입니다.');
$("#mbrIdAlert").show(); $("#mbrIdAlert").show();
} }
if (Data.resBody.result.message === 'possible'){ if (JSON.parse(Data.resBody.result).message === 'possible'){
isChkd_Dup = true; isChkd_Dup = true;
alert('\"' + mbrid + '\" 은 사용 가능합니다.'); alert('\"' + mbrid + '\" 은 사용 가능합니다.');
} }

4
src/main/webapp/WEB-INF/views/sopmal/mpage/act/MyGoodsQnaDtlUpdtU.jsp
View File

@@ -201,7 +201,7 @@
let sopmalCd = $("#sopmalCd").val(); let sopmalCd = $("#sopmalCd").val();
$.ajax({ $.ajax({
type: "post", type: "post",
url: "<c:url value ='/mngr/bbs/gnrlsctt/selectBOBbscttCnAjax'/>", url: "<c:url value ='/sopmal/csc/selectBbscttCn'/>",
contentType: 'application/json', contentType: 'application/json',
data: JSON.stringify({ data: JSON.stringify({
bbsId: bbsId, bbsId: bbsId,
@@ -209,7 +209,7 @@
sopmalCd: sopmalCd sopmalCd: sopmalCd
}), }),
success: function (data) { success: function (data) {
let cn = JSON.parse(data.resBody.result).result.cn; let cn = JSON.parse(data.resBody.result).cn;
$("#cnBbsUpdt").val(cn); $("#cnBbsUpdt").val(cn);
} }
}); });

4
src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttDtlR.jsp
View File

@@ -105,7 +105,7 @@
let sopmalCd = $("#sopmalCd").val(); let sopmalCd = $("#sopmalCd").val();
$.ajax({ $.ajax({
type: "post", type: "post",
url: "<c:url value ='/mngr/bbs/gnrlsctt/selectBOBbscttCnAjax'/>", url: "<c:url value ='/sopmal/csc/selectBbscttCn'/>",
contentType: 'application/json', contentType: 'application/json',
data: JSON.stringify({ data: JSON.stringify({
bbsId: bbsId, bbsId: bbsId,
@@ -113,7 +113,7 @@
sopmalCd: sopmalCd sopmalCd: sopmalCd
}), }),
success: function (data) { success: function (data) {
let cn = JSON.parse(data.resBody.result).result.cn; let cn = JSON.parse(data.resBody.result).cn;
$("#cnDiv").html(cn); $("#cnDiv").html(cn);
if ($("#regusrDvCd").val() === '01' || $("#regusrDvCd").val() === '99') { if ($("#regusrDvCd").val() === '01' || $("#regusrDvCd").val() === '99') {
$("#cnDiv").css("white-space", "pre-wrap"); $("#cnDiv").css("white-space", "pre-wrap");

4
src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttUpdtPopupU.jsp
View File

@@ -200,7 +200,7 @@
let sopmalCd = $("#sopmalCd").val(); let sopmalCd = $("#sopmalCd").val();
$.ajax({ $.ajax({
type: "post", type: "post",
url: "<c:url value ='/mngr/bbs/gnrlsctt/selectBOBbscttCnAjax'/>", url: "<c:url value ='/sopmal/csc/selectBbscttCn'/>",
contentType: 'application/json', contentType: 'application/json',
data: JSON.stringify({ data: JSON.stringify({
bbsId: bbsId, bbsId: bbsId,
@@ -208,7 +208,7 @@
sopmalCd: sopmalCd sopmalCd: sopmalCd
}), }),
success: function (data) { success: function (data) {
let cn = JSON.parse(data.resBody.result).result.cn; let cn = JSON.parse(data.resBody.result).cn;
$("#cnBbsUpdt").val(cn); $("#cnBbsUpdt").val(cn);
} }
}); });

4
src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttUpdtU.jsp
View File

@@ -251,7 +251,7 @@
let sopmalCd = $("#sopmalCd").val(); let sopmalCd = $("#sopmalCd").val();
$.ajax({ $.ajax({
type: "post", type: "post",
url: "<c:url value ='/mngr/bbs/gnrlsctt/selectBOBbscttCnAjax'/>", url: "<c:url value ='/sopmal/csc/selectBbscttCn'/>",
contentType: 'application/json', contentType: 'application/json',
data: JSON.stringify({ data: JSON.stringify({
bbsId: bbsId, bbsId: bbsId,
@@ -259,7 +259,7 @@
sopmalCd: sopmalCd sopmalCd: sopmalCd
}), }),
success: function (data) { success: function (data) {
let cn = JSON.parse(data.resBody.result).result.cn; let cn = JSON.parse(data.resBody.result).cn;
$("#cnBbsUpdt").val(cn); $("#cnBbsUpdt").val(cn);
$("#cnBbsUpdt").addClass("ck-content"); $("#cnBbsUpdt").addClass("ck-content");
} }

4
src/main/webapp/WEB-INF/views/sopmal_m/mpage/act/MyGoodsQnaDtlUpdtU.jsp
View File

@@ -240,7 +240,7 @@
let sopmalCd = $("#sopmalCd").val(); let sopmalCd = $("#sopmalCd").val();
$.ajax({ $.ajax({
type: "post", type: "post",
url: "<c:url value ='/mngr/bbs/gnrlsctt/selectBOBbscttCnAjax'/>", url: "<c:url value ='/sopmal/csc/selectBbscttCn'/>",
contentType: 'application/json', contentType: 'application/json',
data: JSON.stringify({ data: JSON.stringify({
bbsId: bbsId, bbsId: bbsId,
@@ -248,7 +248,7 @@
sopmalCd: sopmalCd sopmalCd: sopmalCd
}), }),
success: function (data) { success: function (data) {
let cn = JSON.parse(data.resBody.result).result.cn; let cn = JSON.parse(data.resBody.result).cn;
$("#cnBbsUpdt").val(cn); $("#cnBbsUpdt").val(cn);
} }
}); });