diff --git a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java index 79523aa5..08e75b8d 100644 --- a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java +++ b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java @@ -12,6 +12,7 @@ import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; @@ -152,6 +153,10 @@ public class CrownixAjaxController { //강사MIX 정보 @Resource(name="vEInstrMixService") private VEInstrMixService vEInstrMixService; + + /** 구동 환경 */ + @Value("#{property['Globals.prod.islocal']}") + private String environment; /** * 교육 list select @@ -366,7 +371,11 @@ public class CrownixAjaxController { modelAndView.addObject("data_7", "전문분야"); //modelAndView.addObject("path", "http://119.193.215.98:9989/offedu/visitEdu/usr/publish/images/common/ci.png"); - modelAndView.addObject("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId=FILE_000000000000463"); + if("real".equals(environment)) { + modelAndView.addObject("image", "https://www.edu-copyright.or.kr/offedu/uss/ion/pwm/getImage.do?atchFileId=FILE_000000000000463"); + }else { + modelAndView.addObject("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId=FILE_000000000000463"); + } modelAndView.addObject("data_d", "2023년05월28일"); @@ -396,7 +405,12 @@ public class CrownixAjaxController { //modelAndView.addObject("path", "http://119.193.215.98:9989/offedu/visitEdu/usr/publish/images/common/ci.png"); //modelAndView.addObject("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId=FILE_000000000000463"); - modelAndView.addObject("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+info.getPhtAtchFileId()); + if("real".equals(environment)) { + modelAndView.addObject("image", "https://www.edu-copyright.or.kr/offedu/uss/ion/pwm/getImage.do?atchFileId="+info.getPhtAtchFileId()); + }else { + modelAndView.addObject("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+info.getPhtAtchFileId()); + } + modelAndView.addObject("data_d", "2023년05월28일"); @@ -565,7 +579,12 @@ public class CrownixAjaxController { jsDrtInfo.put("data_6", vEInstrDetailVOList.get(i).getdBirth()); jsDrtInfo.put("data_7", vEInstrDetailVOList.get(i).getPrfsnFld()); //jsDrtInfo.put("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEInstrDetailVOList.get(i).getPhtAtchFileId()); - jsDrtInfo.put("image", "http://192.168.0.59:3080/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEInstrDetailVOList.get(i).getPhtAtchFileId()); + if("real".equals(environment)) { + jsDrtInfo.put("image", "https://www.edu-copyright.or.kr/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEInstrDetailVOList.get(i).getPhtAtchFileId()); + }else { + jsDrtInfo.put("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEInstrDetailVOList.get(i).getPhtAtchFileId()); + } + @@ -603,7 +622,6 @@ public class CrownixAjaxController { , ModelMap model , HttpServletRequest request ) throws Exception { - ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); System.out.println(" vEInstrDetailVO.getUserIdList().toString() :: "+vEInstrDetailVO.getUserIdList().toString()); @@ -625,7 +643,11 @@ public class CrownixAjaxController { jsDrtInfo.put("data_6", vEInstrDetailVOList.get(i).getdBirth()); jsDrtInfo.put("data_7", vEInstrDetailVOList.get(i).getPrfsnFld()); //jsDrtInfo.put("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEInstrDetailVOList.get(i).getPhtAtchFileId()); - jsDrtInfo.put("image", "http://192.168.0.59:3080/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEInstrDetailVOList.get(i).getPhtAtchFileId()); + if("real".equals(environment)) { + jsDrtInfo.put("image", "https://www.edu-copyright.or.kr/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEInstrDetailVOList.get(i).getPhtAtchFileId()); + }else { + jsDrtInfo.put("image", "http://192.168.0.59:3080/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEInstrDetailVOList.get(i).getPhtAtchFileId()); + } jsReqInfo.add(jsDrtInfo); @@ -1006,8 +1028,14 @@ public class CrownixAjaxController { //jsDrtInfo.put("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEInstrDetailVOList.get(i).getPhtAtchFileId()); //jsDrtInfo.put("image", "http://192.168.0.12:8086/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEEduAplctVOList.get(i).getAtchFileId()+"&fileSn=0"); //jsDrtInfo.put("image2", "http://192.168.0.12:8086/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEEduAplctVOList.get(i).getAtchFileId()+"&fileSn=1"); - jsDrtInfo.put("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEEduAplctVOList.get(i).getAtchFileId()+"&fileSn=0"); - jsDrtInfo.put("image2", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEEduAplctVOList.get(i).getAtchFileId()+"&fileSn=1"); + if("real".equals(environment)) { + jsDrtInfo.put("image", "https://www.edu-copyright.or.kr/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEEduAplctVOList.get(i).getAtchFileId()+"&fileSn=0"); + jsDrtInfo.put("image2", "https://www.edu-copyright.or.kr/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEEduAplctVOList.get(i).getAtchFileId()+"&fileSn=1"); + }else { + jsDrtInfo.put("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEEduAplctVOList.get(i).getAtchFileId()+"&fileSn=0"); + jsDrtInfo.put("image2", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEEduAplctVOList.get(i).getAtchFileId()+"&fileSn=1"); + } + jsReqInfo.add(jsDrtInfo); @@ -1051,7 +1079,11 @@ public class CrownixAjaxController { jsDrtInfo.put("data_6", vEEduAplctVOList.get(i).getTrgt()); jsDrtInfo.put("data_7", vEEduAplctVOList.get(i).getEduPrsnl()); jsDrtInfo.put("data_8", vEEduAplctVOList.get(i).getInstrNm()); - jsDrtInfo.put("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEEduAplctVOList.get(i).getAtchFileId()+"&fileSn=0"); + if("real".equals(environment)) { + jsDrtInfo.put("image", "https://www.edu-copyright.or.kr/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEEduAplctVOList.get(i).getAtchFileId()+"&fileSn=0"); + }else { + jsDrtInfo.put("image", "http://119.193.215.98:9989/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEEduAplctVOList.get(i).getAtchFileId()+"&fileSn=0"); + } //jsDrtInfo.put("image", "http://192.168.0.12:8086/offedu/uss/ion/pwm/getImage.do?atchFileId="+vEEduAplctVOList.get(i).getAtchFileId()+"&fileSn=0");