java
/
bf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. SMS 발송모듈 수정

Browse Source 
2. 로그인 버튼 UI 수정
dev_bert
jonghwan76 3 years ago
parent c3c112ffc8
commit 38bc629a3e
8 changed files with 92 additions and 76 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/com/backoffice/api/APIMemberController.java
Unescape View File

@ -97,7 +97,7 @@ public class APIMemberController extends AbstractControllerManager{
String social_type = RenaStringUtil.getData(rm, "social_type");
if(social_type != null) {
if(RenaStringUtil.isNullOrEmpty(social_type) == false) {
map_json.put("RESULT", "social");
map_json.put("RESULT_MSG", "해당 번호는 " + social_type + " 소셜연동으로 가입된 회원입니다. 해당 소셜계정으로 로그인 하세요.");
json = RenaStringUtil.getJSONFromMap(map_json);

78
src/main/java/com/backoffice/api/ApiSMSController.java
Unescape View File

@ -51,10 +51,11 @@ public class ApiSMSController extends AbstractControllerManager{
arr[0] = "sms"; // SMS/LMS 발송 구분
arr[1] = "테스트"; // 발송 결과 확인을 위한 고객이 생성 관리 하는 Unique Key (MAX 40byte) (해당 키를 이용하여 어떤 발송 건인지에 대한 구분을 해줌. 겹치지 않을만한 무작위 문자열)
arr[2] = "폰 인증"; // LMS 발송 시 제목으로 사용 SMS 발송 시는 수신자에게 내용이 보이지 않습니다.
arr[3] = "[쿨시스템] 테스트"; // 본문 (90byte 제한: SMS의 경우)
arr[3] = "[이유시스템] 테스트"; // 본문 (90byte 제한: SMS의 경우)
// arr[4] = "02-762-8977"; // 발신 번호(010-0000-0000 or 01000000000)
arr[4] = ConstantSystem.API_SENDNUM; // 발신 번호(010-0000-0000 or 01000000000)
arr[5] = "01093386094"; // 수신 번호(010-0000-0000 or 01000000000)
// arr[5] = "01093386094"; // 수신 번호(010-0000-0000 or 01000000000)
arr[5] = "01080335622"; // 수신 번호(010-0000-0000 or 01000000000)
arr[6] = "0"; // 예약 일자 "2013-07-30 12:00:00" 또는 "0" 0 또는 빈값(null)은 즉시 발송
@ -296,9 +297,9 @@ public class ApiSMSController extends AbstractControllerManager{
arr[4] = SEND_PHONE_NUM; // 발신 번호(010-0000-0000 or 01000000000)
arr[5] = phone_num; // 수신 번호(010-0000-0000 or 01000000000)
arr[6] = "0"; // 예약 일자 "2013-07-30 12:00:00" 또는 "0" 0 또는 빈값(null)은 즉시 발송
String api_id = "qoolsystem";
String api_key = "35623e599bfc533c90ebd4d48a800791";
String api_id = ConstantSystem.API_ID;
String api_key = ConstantSystem.API_KEY;
ApiClass api = new ApiClass(api_id, api_key);
String responseXml = null;
@ -369,8 +370,9 @@ public class ApiSMSController extends AbstractControllerManager{
@RequestMapping(value="confirm_sms", produces="text/plain;charset=UTF-8")
@ResponseBody
public String confirm_sms(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response) {
DataMap paramMap = this.getDataMapFromRequest(request);
public String confirm_sms(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response) {
log.info("confirm_sms ---------------------------- ");
DataMap paramMap = this.getDataMapFromRequest(request);
// need params
String[] arrParam = {"s_no", "check_num"};
@ -384,6 +386,7 @@ public class ApiSMSController extends AbstractControllerManager{
map_json.put("RESULT", "false");
map_json.put("RESULT_CODE", "200");
log.info("isValid:" + isValid);
String ip = "";
HttpServletRequest req = ((ServletRequestAttributes)RequestContextHolder.currentRequestAttributes()).getRequest();
@ -396,39 +399,39 @@ public class ApiSMSController extends AbstractControllerManager{
if(isValid == 0){
// check parameter for api
if(checkNeedParam(arrParam, paramMap) == true){
if(checkNeedParam(arrParam, paramMap) == true){
map_json.put("RESULT", "false");
json = RenaStringUtil.getJSONFromMap(map_json);
}else{
try {
json = RenaStringUtil.getJSONFromMap(map_json);
}else{
try {
map_json.put("RESULT", "true");
String is_test = RenaStringUtil.getData(paramMap, "is_test");
String s_no = RenaStringUtil.getData(paramMap, "s_no");
String phone_num = RenaStringUtil.getData(paramMap, "phone_num");
String check_num = RenaStringUtil.getData(paramMap, "check_num");
DataMap rm_check = apiSMSBO.select_sms_log_for_check(paramMap);
if(rm_check == null){
paramMap.put("sms_cd_no", SMS_STATUS_CHECK_FAIL);
apiSMSBO.update_sms_log_by_s_no(paramMap);
map_json.put("check_status", "N");
}else{
paramMap.put("sms_cd_no", SMS_STATUS_CHECK_SUCCESS);
apiSMSBO.update_sms_log_by_s_no(paramMap);
map_json.put("check_status", "Y");
}
//System.out.println(json);
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
map_json.put("RESULT", "false");
map_json.put("RESULT", "false");
map_json.put("MSG", "시스템 장애가 발생하였습니다");
}
json = RenaStringUtil.getJSONFromMap(map_json);
@ -496,8 +499,9 @@ public class ApiSMSController extends AbstractControllerManager{
if(rm != null){
String social_type = RenaStringUtil.getData(rm, "social_type");
if(social_type != null) {
if(RenaStringUtil.isNullOrEmpty(social_type) == false) {
map_json.put("s_no", "");
map_json.put("RESULT_CODE", "500");
map_json.put("RESULT_MSG", "해당 번호는 " + social_type + " 소셜연동으로 가입된 회원입니다. 해당 소셜계정으로 로그인 하세요.");
json = RenaStringUtil.getJSONFromMap(map_json);
return json;
@ -541,8 +545,8 @@ public class ApiSMSController extends AbstractControllerManager{
arr[5] = phone_num; // 수신 번호(010-0000-0000 or 01000000000)
arr[6] = "0"; // 예약 일자 "2013-07-30 12:00:00" 또는 "0" 0 또는 빈값(null)은 즉시 발송
String api_id = "qoolsystem";
String api_key = "35623e599bfc533c90ebd4d48a800791";
String api_id = ConstantSystem.API_ID;
String api_key = ConstantSystem.API_KEY;
ApiClass api = new ApiClass(api_id, api_key);
String responseXml = null;
@ -586,18 +590,21 @@ public class ApiSMSController extends AbstractControllerManager{
paramMap.put("sms_msg", sms_msg);
apiSMSBO.update_sms_log_by_s_no(paramMap);
map_json.put("RESULT_CODE", "300");
map_json.put("s_no", s_no);
map_json.put("sms_code", sms_code);
map_json.put("sms_msg", sms_msg);
//System.out.println(json);
}else{
map_json.put("result_code", "500");
map_json.put("sms_msg", "해당 번호로 가입된 사용자가 없습니다.");
}
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
map_json.put("RESULT_CODE", "500");
map_json.put("RESULT", "false");
map_json.put("MSG", "시스템 장애가 발생하였습니다");
}
@ -666,9 +673,12 @@ public class ApiSMSController extends AbstractControllerManager{
if(rm != null){
String social_type = RenaStringUtil.getData(rm, "social_type");
if(social_type != null) {
map_json.put("s_no", "");
map_json.put("RESULT_MSG", "해당 번호는 " + social_type + " 소셜연동으로 가입된 회원입니다. 해당 소셜계정으로 로그인 하세요.");
log.info("social_type:" + social_type);
if(RenaStringUtil.isNullOrEmpty(social_type) == false) {
// map_json.put("s_no", "");
map_json.put("RESULT_CODE", "500");
map_json.put("MSG", "해당 번호는 " + social_type + " 소셜연동으로 가입된 회원입니다. 해당 소셜계정으로 로그인 하세요.");
json = RenaStringUtil.getJSONFromMap(map_json);
return json;
}
@ -694,7 +704,7 @@ public class ApiSMSController extends AbstractControllerManager{
String s_no = String.valueOf(apiSMSBO.insert_sms_log(paramMap));
String content = to_name + "님 아이디입니다." + email;
System.out.println("content:" + content);
// System.out.println("content:" + content);
paramMap.put("s_no", s_no);
String arr[] = new String[7];
@ -707,8 +717,8 @@ public class ApiSMSController extends AbstractControllerManager{
arr[5] = phone_num; // 수신 번호(010-0000-0000 or 01000000000)
arr[6] = "0"; // 예약 일자 "2013-07-30 12:00:00" 또는 "0" 0 또는 빈값(null)은 즉시 발송
String api_id = "qoolsystem";
String api_key = "35623e599bfc533c90ebd4d48a800791";
String api_id = ConstantSystem.API_ID;
String api_key = ConstantSystem.API_KEY;
ApiClass api = new ApiClass(api_id, api_key);
String responseXml = null;
@ -752,18 +762,18 @@ public class ApiSMSController extends AbstractControllerManager{
paramMap.put("sms_msg", sms_msg);
apiSMSBO.update_sms_log_by_s_no(paramMap);
map_json.put("s_no", s_no);
map_json.put("RESULT_CODE", "300");
map_json.put("sms_code", sms_code);
map_json.put("sms_msg", sms_msg);
map_json.put("MSG", sms_msg);
//System.out.println(json);
}else{
map_json.put("sms_msg", "해당 번호로 가입된 사용자가 없습니다.");
map_json.put("result_code", "500");
map_json.put("MSG", "해당 번호로 가입된 사용자가 없습니다.");
}
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
map_json.put("RESULT_CODE", "500");
map_json.put("RESULT", "false");
map_json.put("MSG", "시스템 장애가 발생하였습니다");
}

14
src/main/resources/bf.properties
Unescape View File

@ -50,13 +50,13 @@ social.callback.kakao=/m/login/kakaoLogin_callback.do
sms.api_id=gaonn0509
sms.api_key=040ec316ad13c59031b5c4c30cdec923
sms.api_sendnum=02-762-8977
sms.api_sendnum=02-363-5123
mysql_driver=net.sf.log4jdbc.DriverSpy
mysql_url=jdbc:log4jdbc:mysql://devops.lookylooks.ai:14236/babyfeed
mysql_username=imcloud
mysql_password=imc1234
#mysql_url=jdbc:log4jdbc:mysql://devops.lookylooks.ai:14236/babyfeed
#mysql_username=imcloud
#mysql_password=imc1234
#mysql_url=jdbc:log4jdbc:mysql://115.85.181.214:3306/babyfeed
#mysql_username=root
#mysql_password=123qwe!@#
mysql_url=jdbc:log4jdbc:mysql://115.85.181.214:3306/babyfeed
mysql_username=root
mysql_password=123qwe!@#

25
src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id.ftl
Unescape View File

@ -10,6 +10,7 @@
<form id="frmJoinMember" name="frmJoinMember" method="post" action="authComplete.do" enctype="multipart/form-data">
<input type="hidden" id="check_status" name="check_status" value="" />
<input type="hidden" id="s_no" name="s_no" value="" />
<main class="m_join_member">
<div class="profile_wrap">
@ -64,17 +65,25 @@
success:function(result){
console.log(result);
var RESULT = result.RESULT;
var RESULT_MSG = result.RESULT_MSG;
var s_no = result.s_no;
// var RESULT = result.RESULT;
var RESULT_MSG = result.MSG;
var RESULT_CODE = result.RESULT_CODE
if(s_no != ''){
$('#s_no').val(s_no);
alert('발송되었습니다');
}else{
alert(RESULT_MSG);
if(RESULT_CODE == "300") {
Swal.fire({ text: "발송 성공하였습니다.", icon: 'success', showConfirmButton: false, timer: 2500 }); // success
} else {
Swal.fire({ text: RESULT_MSG, icon: 'warning', showConfirmButton: false, timer: 2500 }); // success
}
// var s_no = result.s_no;
//
// if(s_no != ''){
// $('#s_no').val(s_no);
// alert('발송되었습니다');
// }else{
// alert(RESULT_MSG);
// }
is_loading = false;
}
});

11
src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_01.ftl
Unescape View File

@ -10,6 +10,7 @@
<form id="frmJoinMember" name="frmJoinMember" method="post" action="authComplete.do" enctype="multipart/form-data">
<input type="hidden" id="check_status" name="check_status" value="" />
<input type="hidden" id="s_no" name="s_no" value="" />
<main class="m_join_member">
<div class="profile_wrap">
@ -197,18 +198,12 @@
}else if(!regPh.test($("#phone").val())){
Swal.fire({ text: "핸드폰번호를 올바르게 입력해주세요", icon: 'warning', showConfirmButton: false, timer: 1500 }); // success
theForm.phone.focus();
}
/*
else if(theForm.check_status.value !="Y") {
} else if(theForm.check_status.value !="Y") {
Swal.fire({text: "휴대폰 인증을 해주세요", icon: 'warning', showConfirmButton: false, timer: 1500}); // success
theForm.phone.focus();
}
*/
else{
} else{
theForm.submit();
}
theForm.submit();
}
</script>

12
src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl
Unescape View File

@ -50,11 +50,15 @@
<#-- <a href="view_join_member.do?JOIN_PATH=E">회원가입</a>-->
<a href="view_join_member_01.do">회원가입</a>
</div>
<div class="m_set_account_btn">
<button type="button" id="" name="" class="btns blue_btn" onclick="javascript:check_onclick();">로그인</button>
<img src="/bf/m/img/naver_btn.png" onclick="fncLogin('N')" style="height:45px">
<img src="/bf/m/img/kakao_btn.png" onclick="fncLogin('K')" style="height:45px">
<div style="text-align:center" class="m_set_account_btn">
<button type="button" style="display: block;margin: auto;width:360px" class="btns blue_btn" onclick="javascript:check_onclick();">로그인</button>
</div>
<div style="padding-top:10px;text-align:center" class="m_set_account_btn">
<img src="/bf/m/img/naver_btn.png" onclick="fncLogin('N')" style="height:45px">
<img src="/bf/m/img/kakao_btn.png" onclick="fncLogin('K')" style="height:45px">
</div>
</main>
<p class="copyright">ⓒ 2021 GaonN, All Rights Reserved</p>
</div>

8
src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_email.ftl
Unescape View File

@ -47,15 +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);
// console.log(RESULT);
if(RESULT == 'false'){
alert("이메일이 발송에 실패했습니다. 잠시 뒤 다시 이용해 주세요.");
Swal.fire({ text: "이메일 발송 실패 하였습니다.", icon: 'warning', showConfirmButton: false, timer: 2500 }); // success
} else {
alert(RESULT_MSG);
Swal.fire({ text: "비밀번호 초기화 링크 발송 성공하였습니다.", icon: 'success', showConfirmButton: false, timer: 2500 }); // success
}
}
});

18
src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone.ftl
Unescape View File

@ -59,16 +59,14 @@
alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
},
success:function(result){
var RESULT = result.RESULT;
var RESULT_MSG = result.RESULT_MSG;
var s_no = result.s_no;
if(s_no != ''){
$('#s_no').val(s_no);
alert('발송되었습니다');
}else{
alert(RESULT_MSG);
}
var RESULT_MSG = result.MSG;
var RESULT_CODE = result.RESULT_CODE
if(RESULT_CODE == "300") {
Swal.fire({ text: "비밀번호 초기화 링크 발송 성공하였습니다.", icon: 'success', showConfirmButton: false, timer: 2500 }); // success
} else {
Swal.fire({ text: RESULT_MSG, icon: 'warning', showConfirmButton: false, timer: 2500 }); // success
}
is_loading = false;
}

Write Preview
Loading…
Cancel
Save