From 023903c10c548fceb34dec6af6ccca9634b659fa Mon Sep 17 00:00:00 2001 From: jonghwan76 Date: Fri, 18 Mar 2022 23:55:45 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A1=9C=EC=BB=AC=20=ED=94=84=EB=A1=9C?= =?UTF-8?q?=ED=8D=BC=ED=8B=B0=20=EC=88=98=EC=A0=95,=20=EA=B0=9C=EB=B0=9C?= =?UTF-8?q?=EC=84=9C=EB=B2=84=EC=9A=A9=20=ED=94=84=EB=A1=9C=ED=8D=BC?= =?UTF-8?q?=ED=8B=B0=20=EB=93=B1=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backoffice/api/APIMemberController.java | 3 +- .../com/backoffice/api/ApiSMSController.java | 3 +- .../backoffice/constants/ConstantSystem.java | 3 + .../java/com/backoffice/mail/MailForPwd.java | 4 +- src/main/resources/bf.properties | 9 ++- src/main/resources/bf_dev.properties | 59 +++++++++++++++++++ src/main/resources/bf_local.properties | 59 +++++++++++++++++++ src/main/webapp/META-INF/context.xml | 1 + .../views/ftl/m/login/view_pw_reset_email.ftl | 10 +++- 개발참고.txt | 25 ++++++-- 10 files changed, 160 insertions(+), 16 deletions(-) create mode 100644 src/main/resources/bf_dev.properties create mode 100644 src/main/resources/bf_local.properties diff --git a/src/main/java/com/backoffice/api/APIMemberController.java b/src/main/java/com/backoffice/api/APIMemberController.java index 610a469..a2e1461 100644 --- a/src/main/java/com/backoffice/api/APIMemberController.java +++ b/src/main/java/com/backoffice/api/APIMemberController.java @@ -98,8 +98,9 @@ public class APIMemberController extends AbstractControllerManager{ String social_type = RenaStringUtil.getData(rm, "social_type"); if(RenaStringUtil.isNullOrEmpty(social_type) == false) { + map_json.put("RESULT_CODE", "500"); map_json.put("RESULT", "social"); - map_json.put("RESULT_MSG", "해당 번호는 " + social_type + " 소셜연동으로 가입된 회원입니다. 해당 소셜계정으로 로그인 하세요."); + map_json.put("RESULT_MSG", "해당 이메일은 " + social_type + " 소셜연동으로 가입된 회원입니다. 해당 소셜계정으로 로그인 하세요."); json = RenaStringUtil.getJSONFromMap(map_json); return json; } diff --git a/src/main/java/com/backoffice/api/ApiSMSController.java b/src/main/java/com/backoffice/api/ApiSMSController.java index f8850b5..f2cc359 100644 --- a/src/main/java/com/backoffice/api/ApiSMSController.java +++ b/src/main/java/com/backoffice/api/ApiSMSController.java @@ -530,7 +530,8 @@ public class ApiSMSController extends AbstractControllerManager{ ConstantResultCode.putResultCode(map_json, true, ConstantResultCode.RESULT_MEMBER_IS_BEING); // json result code String s_no = String.valueOf(apiSMSBO.insert_sms_log(paramMap)); - String content = to_name + "님 임시비밀번호를 발급하시려면 링크를 클릭해주세요." + "http://dev.bf.co.kr:8080/bf/api/reset_pwd.do?member_id=" + to_member_id + "&enc_word=" + enc_word; +// String content = to_name + "님 임시비밀번호를 발급하시려면 링크를 클릭해주세요." + "http://dev.bf.co.kr:8080/bf/api/reset_pwd.do?member_id=" + to_member_id + "&enc_word=" + enc_word; + String content = to_name + "님 임시비밀번호를 발급하시려면 링크를 클릭해주세요." + ConstantSystem.WEB_URL + "/bf/api/reset_pwd.do?member_id=" + to_member_id + "&enc_word=" + enc_word; System.out.println("content:" + content); diff --git a/src/main/java/com/backoffice/constants/ConstantSystem.java b/src/main/java/com/backoffice/constants/ConstantSystem.java index 298a496..7f81594 100644 --- a/src/main/java/com/backoffice/constants/ConstantSystem.java +++ b/src/main/java/com/backoffice/constants/ConstantSystem.java @@ -97,6 +97,8 @@ public class ConstantSystem { public static String MUSIC_PATH = ""; + public static String WEB_URL = ""; //메일 및 SMS 메시지의 WEB URL + public static final String M_KEY = "376d69737379787568616e6765a65a61"; @@ -135,6 +137,7 @@ public class ConstantSystem { API_SENDNUM = PropertyUtil.getProperty(PROPERTIES_FILE, "sms.api_sendnum"); MUSIC_PATH = PropertyUtil.getProperty(PROPERTIES_FILE, "file.music_path"); + WEB_URL = PropertyUtil.getProperty(PROPERTIES_FILE, "system.weburl"); SERVER_NAME_SHORT_URL = SERVER_NAME + "/c/"; // } diff --git a/src/main/java/com/backoffice/mail/MailForPwd.java b/src/main/java/com/backoffice/mail/MailForPwd.java index 0cf3543..8f38ac9 100644 --- a/src/main/java/com/backoffice/mail/MailForPwd.java +++ b/src/main/java/com/backoffice/mail/MailForPwd.java @@ -1,5 +1,6 @@ package com.backoffice.mail; +import com.backoffice.constants.ConstantSystem; import com.renastudio.creative.web.util.DataMap; import com.renastudio.creative.web.util.RenaStringUtil; import com.renastudio.creative.web.util.sendmail.SendGMail; @@ -27,7 +28,8 @@ public class MailForPwd { String enc_word = RenaStringUtil.getData(rm, "enc_word"); // String url = "http://www.ghealthplaza.com/ghealth/api/sn/reset_pwd.do?member_id=" + member_id + "&enc_word=" + enc_word; - String url = "http://dev.bf.co.kr:8080/bf/api/reset_pwd.do?member_id=" + member_id + "&enc_word=" + enc_word; +// String url = "http://dev.bf.co.kr:8080/bf/api/reset_pwd.do?member_id=" + member_id + "&enc_word=" + enc_word; + String url = ConstantSystem.WEB_URL + "/bf/api/reset_pwd.do?member_id=" + member_id + "&enc_word=" + enc_word; StringBuilder sb = new StringBuilder(); sb.append(" ").append("\n"); diff --git a/src/main/resources/bf.properties b/src/main/resources/bf.properties index c074f58..15d4d7d 100644 --- a/src/main/resources/bf.properties +++ b/src/main/resources/bf.properties @@ -1,10 +1,9 @@ ########## 개발 Environment ########## -#URL_BASE=http://dev.bf.co.kr:8080 -URL_BASE=http://devops.lookylooks.ai:14280 +URL_BASE=http://121.166.66.72:14280 SERVER_TP_KOR=개발 SERVER_TP=DEV -#system.domain=http://dev.bf.co.kr:8080 -system.domain=http://devops.lookylooks.ai:14280 +system.domain=http://121.166.66.72:14280 +system.weburl=http://devops.lookylooks.ai:14288 SERVER_NAME=bf PLATFORM_VERSION = 1.0 PLATFORM_NAME = 백오피스 @@ -55,6 +54,6 @@ sms.api_sendnum=02-363-5123 file.music_path=c:/bf/music/ mysql_driver=net.sf.log4jdbc.DriverSpy -mysql_url=jdbc:log4jdbc:mysql://devops.lookylooks.ai:14236/babyfeed +mysql_url=jdbc:log4jdbc:mysql://121.166.66.72:14236/babyfeed mysql_username=imcloud mysql_password=imc1234 \ No newline at end of file diff --git a/src/main/resources/bf_dev.properties b/src/main/resources/bf_dev.properties new file mode 100644 index 0000000..8022f0d --- /dev/null +++ b/src/main/resources/bf_dev.properties @@ -0,0 +1,59 @@ +########## 개발 Environment ########## +URL_BASE=http://devops.lookylooks.ai:14280 +SERVER_TP_KOR=개발 +SERVER_TP=DEV +system.domain=http://devops.lookylooks.ai:14280 +system.weburl=http://devops.lookylooks.ai:14288 +SERVER_NAME=bf +PLATFORM_VERSION = 1.0 +PLATFORM_NAME = 백오피스 +COMPANY_NAME = 가온앤 +COMPANY_MAIL = renamaestro@gmail.com +system.servername=bf +REAL_BACKOFFICE=bf +AGENT_LOGO_IMG= +AGENT_HOMEPAGE_LINK=http:// +AGENT_HOMEPAGE_NAME=가온앤 + +########## Database Main ########## +maxActCon=10 +maxRequests=10 +maxSessions=10 +maxTransactions=10 + +logAbondoned=false +removeAbondoned=false +abondonedTimeout=60000 + +initialSize=10 +maxTotal=10 +maxIdle=10 +minIdle=10 +maxWaitMillis=3600000 +maxWaitTime=3600000 +poolPreparedStatements=true +validationQuery=select 1 +maximumActiveConnections=10 +maximumIdleConnections=10 +logAbandoned=true +removeAbandoned=true +removeAbandonedTimeout=30000 + +defaultTransactionIsolation=2 +social.url.naverApiUrl=https://openapi.naver.com/v1/nid/me +social.url.kakaoApiUrl=https://kapi.kakao.com/v2/user/me +social.key.naverAppKey=SGrtulQWT7DeFmD3XDNN +social.key.kakaoAppKey=ef79482743cf57124cdf45f88bfbb9fe +social.callback.naver=/m/login/nhnLogin_callback +social.callback.kakao=/m/login/kakaoLogin_callback.do + +sms.api_id=gaonn0509 +sms.api_key=040ec316ad13c59031b5c4c30cdec923 +sms.api_sendnum=02-363-5123 + +file.music_path=/home/imcloud/Music + +mysql_driver=net.sf.log4jdbc.DriverSpy +mysql_url=jdbc:log4jdbc:mysql://121.166.66.72:14236/babyfeed +mysql_username=imcloud +mysql_password=imc1234 \ No newline at end of file diff --git a/src/main/resources/bf_local.properties b/src/main/resources/bf_local.properties new file mode 100644 index 0000000..b5bfebf --- /dev/null +++ b/src/main/resources/bf_local.properties @@ -0,0 +1,59 @@ +########## 개발 Environment ########## +URL_BASE=http://121.166.66.72:14280 +SERVER_TP_KOR=개발 +SERVER_TP=DEV +system.domain=http://121.166.66.72:14280 +system.weburl=http://devops.lookylooks.ai:14288 +SERVER_NAME=bf +PLATFORM_VERSION = 1.0 +PLATFORM_NAME = 백오피스 +COMPANY_NAME = 가온앤 +COMPANY_MAIL = renamaestro@gmail.com +system.servername=bf +REAL_BACKOFFICE=bf +AGENT_LOGO_IMG= +AGENT_HOMEPAGE_LINK=http:// +AGENT_HOMEPAGE_NAME=가온앤 + +########## Database Main ########## +maxActCon=10 +maxRequests=10 +maxSessions=10 +maxTransactions=10 + +logAbondoned=false +removeAbondoned=false +abondonedTimeout=60000 + +initialSize=10 +maxTotal=10 +maxIdle=10 +minIdle=10 +maxWaitMillis=3600000 +maxWaitTime=3600000 +poolPreparedStatements=true +validationQuery=select 1 +maximumActiveConnections=10 +maximumIdleConnections=10 +logAbandoned=true +removeAbandoned=true +removeAbandonedTimeout=30000 + +defaultTransactionIsolation=2 +social.url.naverApiUrl=https://openapi.naver.com/v1/nid/me +social.url.kakaoApiUrl=https://kapi.kakao.com/v2/user/me +social.key.naverAppKey=SGrtulQWT7DeFmD3XDNN +social.key.kakaoAppKey=ef79482743cf57124cdf45f88bfbb9fe +social.callback.naver=/m/login/nhnLogin_callback +social.callback.kakao=/m/login/kakaoLogin_callback.do + +sms.api_id=gaonn0509 +sms.api_key=040ec316ad13c59031b5c4c30cdec923 +sms.api_sendnum=02-363-5123 + +file.music_path=c:/bf/music/ + +mysql_driver=net.sf.log4jdbc.DriverSpy +mysql_url=jdbc:log4jdbc:mysql://121.166.66.72:14236/babyfeed +mysql_username=imcloud +mysql_password=imc1234 \ No newline at end of file diff --git a/src/main/webapp/META-INF/context.xml b/src/main/webapp/META-INF/context.xml index 0bc09c3..15925ed 100644 --- a/src/main/webapp/META-INF/context.xml +++ b/src/main/webapp/META-INF/context.xml @@ -2,5 +2,6 @@ + diff --git a/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_email.ftl b/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_email.ftl index eceddce..8c632a9 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_email.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_email.ftl @@ -47,11 +47,15 @@ alert("이메일이 발송에 실패했습니다. 잠시 뒤 다시 이용해 주세요."); }, success:function(result){ - // console.log(result); + console.log(result); var RESULT = result.RESULT; var RESULT_MSG = result.RESULT_MSG; - - // console.log(RESULT); + + if(result.RESULT_CODE == "500") { + Swal.fire({ text: RESULT_MSG, icon: 'warning', showConfirmButton: false, timer: 2500 }); // success + return; + } + if(RESULT == 'false'){ Swal.fire({ text: "이메일 발송 실패 하였습니다.", icon: 'warning', showConfirmButton: false, timer: 2500 }); // success } else { diff --git a/개발참고.txt b/개발참고.txt index dade374..e84ca7a 100644 --- a/개발참고.txt +++ b/개발참고.txt @@ -8,6 +8,24 @@ - id : imcloud - pw : imc1234 +# 개발 웹주소 + - http://devops.lookylooks.ai:14288/bf/m/ + +# 개발 톰캣경로 + - /opt/tomcat/apache-tomcat-8.5.75 + +# 로컬 개발 URL + - http://dev.bf.co.kr:8080/bf/ + +# 개발서버 SSH 계정 + - imcloud / imc1234 + - root / imc1234 + +# 클라우드 디비정보(로컬 개발용) + mysql_url=jdbc:log4jdbc:mysql://115.85.181.214:3306/babyfeed + mysql_username=root + mysql_password=123qwe!@# + # 기록 카테고리 종류 - 기록 타임라인 노출값 - 103p 1. O 모유(BF_NU_TP_1) : ?? 2. O 간식(BF_NU_TP_3) - O : 간식명 및 섭취량 또는 간식 표시 @@ -34,10 +52,7 @@ DataMap rm_mem = (DataMap) session.getAttribute(ConstantSystem.SESSION_RM_MEMBER); paramMap.put("member_id", rm_mem.get("member_id")); -# 클라우드 디비정보(로컬 개발용) - mysql_url=jdbc:log4jdbc:mysql://115.85.181.214:3306/babyfeed - mysql_username=root - mysql_password=123qwe!@# + # 추천이유식, 추천식재료 ajax 연동 API -http://dev.bf.co.kr:8080/bf/m/bf_food/list_bf_homemade_recommend_ajax?phone_num=01080335621&name=김규민 \ No newline at end of file +http://devops.lookylooks.ai:14288/bf/m/bf_food/list_bf_homemade_recommend_ajax?phone_num=01080335621&name=김규민 \ No newline at end of file