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-16 16:18:54 +09:00
parent c5bb6d324a 92f926ab51
commit 72aebe69f8
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/wb/domainserver/domain/admin/store/mbrgrad/controller/MaMbrgradController.java
View File

@@ -133,7 +133,7 @@ public class MaMbrgradController {
srchData.put("maMbrGradVO", vo); srchData.put("maMbrGradVO", vo);
srchData.put("mbrGradInfo", mbrGradInfo); srchData.put("mbrGradInfo", mbrGradInfo);
model.addAttribute("resultMap", mbrGradInfo); model.addAttribute("resultMap", srchData);
// responseHandler.handleResponse( // responseHandler.handleResponse(
// sendToResrc.ofPost(RESRC.GCONEBO, "/admin/store/mbrgrad/selectBOMbrGradUpdtForm", vo), // sendToResrc.ofPost(RESRC.GCONEBO, "/admin/store/mbrgrad/selectBOMbrGradUpdtForm", vo),
// model, // model,

2
src/main/java/com/wb/domainserver/domain/admin/store/mbrgrad/vo/BOMaMbrgradVO.java
View File

@@ -97,4 +97,6 @@ public class BOMaMbrgradVO extends AbstractVO {
/*서버구분*/ /*서버구분*/
private String serverDv; private String serverDv;
private String pageDv; private String pageDv;
private String srchCalcCndDvCds;
} }

1
src/main/java/com/wb/domainserver/domain/admin/sys/ctgry/controller/MaCtgryController.java
View File

@@ -126,7 +126,6 @@ public class MaCtgryController {
@RequestMapping(value = "/updateCtgryUpdt", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) @RequestMapping(value = "/updateCtgryUpdt", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<WnbtResponse> updateCtgryUpdt(BOMaCtgryVO vo, HttpServletRequest request) { public ResponseEntity<WnbtResponse> updateCtgryUpdt(BOMaCtgryVO vo, HttpServletRequest request) {
request.setAttribute("shopCd", vo.getSopmalCd()); request.setAttribute("shopCd", vo.getSopmalCd());
request.setAttribute("pathGubun", "ETCM"); request.setAttribute("pathGubun", "ETCM");
request.setAttribute("subPathId", ""); request.setAttribute("subPathId", "");

4
src/main/java/com/wb/domainserver/domain/admin/sys/ctgry/vo/BOMaCtgryVO.java
View File

@@ -40,9 +40,9 @@ public class BOMaCtgryVO extends AbstractVO {
/** 노출구분 */ /** 노출구분 */
private String expsrCd; private String expsrCd;
/** 노출구분 시작일자 */ /** 노출구분 시작일자 */
private java.sql.Timestamp expsrBgnDt; private String expsrBgnDt;
/** 노출구분 종료자 */ /** 노출구분 종료자 */
private java.sql.Timestamp expsrEndDt; private String expsrEndDt;
/** url 자동여부 */ /** url 자동여부 */
private String urlDvCd; private String urlDvCd;
/** url */ /** url */

7
src/main/resources/static/ckeditor/uploadAdapter.js
View File

@@ -1,6 +1,7 @@
class UploadAdapter { class UploadAdapter {
constructor(loader) { constructor(loader, url) {
this.loader = loader; this.loader = loader;
this.url = url;
} }
upload() { upload() {
@@ -13,7 +14,7 @@ class UploadAdapter {
_initRequest() { _initRequest() {
const xhr = this.xhr = new XMLHttpRequest(); const xhr = this.xhr = new XMLHttpRequest();
xhr.open('POST', '/comm/ckeditor/image/fileUpload', true); xhr.open('POST', this.url, true);
xhr.responseType = 'json'; xhr.responseType = 'json';
} }
@@ -43,5 +44,5 @@ class UploadAdapter {
} }
} }
function getDownloadUrl(item) { function getDownloadUrl(item) {
return encodeURI(`${API_ROOT_URL}/download/images/${item.linkId}`); return encodeURI(`${API_ROOT_URL}/download/images/${item.linkId}`);
} }