회원가입 오류 수정

dev_bert
jonghwan76 3 years ago
parent 36e3bae3bf
commit fe6e7aceb5

@ -9,15 +9,16 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="index_bottom 공유관련 html 스크립트 분리-2">
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_popup_20220411.ftl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04_1_20220411.ftl" afterDir="false" />
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="홈&gt;홈메이드 추천 이유식 퍼블리싱작업-1">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_popup.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_popup.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_ingre_recommend.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_ingre_recommend.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/list_bf_common.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/list_bf_common.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04_1.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04_1.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginBO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginBO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginBOImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginBOImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/util/M_Util.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/util/M_Util.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_02.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_02.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_05.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_05.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -206,6 +207,7 @@
<workItem from="1649160006499" duration="6876000" />
<workItem from="1649290781944" duration="34201000" />
<workItem from="1649570725292" duration="12891000" />
<workItem from="1649642776611" duration="8544000" />
</task>
<task id="LOCAL-00001" summary="최초 커밋">
<created>1645354476031</created>
@ -361,7 +363,14 @@
<option name="project" value="LOCAL" />
<updated>1649519729954</updated>
</task>
<option name="localTasksCounter" value="23" />
<task id="LOCAL-00023" summary="홈&gt;홈메이드 추천 이유식 퍼블리싱작업-1">
<created>1649607799069</created>
<option name="number" value="00023" />
<option name="presentableId" value="LOCAL-00023" />
<option name="project" value="LOCAL" />
<updated>1649607799069</updated>
</task>
<option name="localTasksCounter" value="24" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -403,6 +412,7 @@
<MESSAGE value="index_bottom 공유관련 html 스크립트 분리-2" />
<MESSAGE value="D-Day 관리기능 적용" />
<MESSAGE value="D-Day 관리기능 적용-2" />
<option name="LAST_COMMIT_MESSAGE" value="D-Day 관리기능 적용-2" />
<MESSAGE value="홈&gt;홈메이드 추천 이유식 퍼블리싱작업-1" />
<option name="LAST_COMMIT_MESSAGE" value="홈&gt;홈메이드 추천 이유식 퍼블리싱작업-1" />
</component>
</project>

@ -13,7 +13,8 @@ public interface M_LoginBO {
public abstract DataMap select_member_confirm_for_check_social(DataMap paramMap) throws Exception;
public abstract DataMap select_member_with_pwd(DataMap paramMap) throws Exception;
public abstract DataMap select_member(DataMap paramMap) throws Exception;
public abstract DataMap select_member_with_id(DataMap paramMap) throws Exception;
public abstract DataMap select_member(DataMap paramMap) throws Exception;
int update_member_with_pwd(DataMap paramMap) throws Exception;
int update_member(DataMap paramMap) throws Exception;

@ -59,6 +59,19 @@ public class M_LoginBOImpl extends AbstractBOManager implements M_LoginBO {
return rm;
}
public DataMap select_member_with_id(DataMap paramMap) throws Exception{
DataMap rm = null;
try {
generalDAO.setNamespace(SQLMAP_NAMESPACE);
rm = generalDAO.select_item_to_datamap("select_member_with_id", paramMap);
} catch (SQLException e) {
throw e;
}
return rm;
}
public DataMap select_member(DataMap paramMap) throws Exception{
DataMap rm = null;

@ -347,8 +347,7 @@ public class M_LoginController extends AbstractControllerManager{
* @return
*/
@RequestMapping(value="loginByMemberId")
public String loginByMemberId(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response
, RedirectAttributes ra) {
public String loginByMemberId(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response, RedirectAttributes ra) {
DataMap paramMap = gmUtil.getDataMapFromRequest(request);
DataMap map_json = new DataMap();
@ -397,7 +396,8 @@ public class M_LoginController extends AbstractControllerManager{
gmUtil.redirectParam(model, m_map);
redirect_url = "m/login/native_login";
// redirect_url = "m/login/native_login";
redirect_url = "redirect:/m/index/index.do";
}else{
ConstantResultCode.putResultCode(map_json, true, ConstantResultCode.RESULT_MEMBER_IS_NULL); // json result code
@ -410,6 +410,56 @@ public class M_LoginController extends AbstractControllerManager{
return redirect_url;
}
/**
* URL - snut97
* @param model
* @param request
* @param response
* @param ra
* @return
*/
@RequestMapping(value="loginAuto")
public String loginAuto(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response, RedirectAttributes ra) {
DataMap paramMap = gmUtil.getDataMapFromRequest(request);
DataMap map_json = new DataMap();
ConstantResultCode.putResultCode(map_json, false, ConstantResultCode.RESULT_INIT); // json result code
String action_url = paramMap.getString("action_url"); //로그인 처리 이후 이동될 URL
String redirect_url = "redirect:/m/login/view_login.do";
gmUtil.print_client(request, logAgent, "[M] loginByMemberId", paramMap);
try {
// 현재 로그인된 아이디와 다른 아이디로 로그인 시도했다면
HttpSession session = request.getSession(false);
if(session != null) { session.invalidate(); session = null; }
if(session == null || (session != null && session.getAttribute(M_Util.SESSION_RM_MEMBER) == null)){
//아이디로 로그인처리(소셜 및 직접회원가입 사용자)
DataMap rm_mem = loginBO.select_member_with_id(paramMap);
if(rm_mem != null){
session = request.getSession(false);
if(session == null) session = request.getSession(true);
session.setAttribute(M_Util.SESSION_RM_MEMBER, rm_mem);
String member_id = RenaStringUtil.getData(rm_mem, "member_id");
paramMap.put("member_id", member_id);
// gmUtil.setSessionForMobileMember(request, paramMap);
ConstantResultCode.putResultCode(map_json, true, ConstantResultCode.RESULT_SUCCESS); // json result code
redirect_url = "redirect:" + action_url;
}else{
ConstantResultCode.putResultCode(map_json, true, ConstantResultCode.RESULT_MEMBER_IS_NULL); // json result code
gmUtil.redirectParamFlash(ra, DataMap.fromNameValue(new String[]{"phone_num","script_msg"}, new String[]{RenaStringUtil.getData(paramMap, "member_id"),"로그인에 실패했습니다"}));
}
}
}catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();}
System.out.println("redirect_url:" + redirect_url);
return redirect_url;
}
/**
* 2 [] - ,,,
* @param model

@ -398,6 +398,7 @@ public class M_Util {
paramMap.put("phone", userPhone.replaceAll("-",""));
paramMap.put("userEmail", userEmail);
paramMap.put("userNm", userNm);
paramMap.put("name", userNm);
paramMap.put("social_type", socialType);
log.debug("소셜번호:" + socialNo);

@ -57,7 +57,43 @@
AND x.password = #password#
</isEmpty>
</select>
<select id="select_member_with_id" resultClass="dataMap" parameterClass="dataMap">
SELECT
x.member_id
,x.name
,x.nickname
,x.birthday
,x.gender
,x.password
,x.profile_path
,x.join_path
,x.sns_id
,x.push_key
,x.push_yn
,x.os
,x.version_name
,x.version_code
,x.reg_dt
,x.mod_dt
,x.withdraw_yn
,x.social_type
,mc.email
,mc.phone_num
,CAST(me.sona_light_m AS CHAR(10)) AS sona_light_m
FROM tbl_member x, tbl_member_env me, tbl_member_confirm mc
WHERE 1 =1
AND x.member_id = me.member_id
AND x.member_id = mc.member_id
AND ifnull(x.withdraw_yn,'N') = 'N'
<isNotEmpty property="sns_id">
AND x.sns_id = #sns_id#
</isNotEmpty>
<isEmpty property="sns_id">
AND (x.member_id = #member_id# OR mc.email = #member_id# OR mc.phone_num = #member_id#)
</isEmpty>
</select>
<select id="select_member" resultClass="dataMap" parameterClass="dataMap">
SELECT
x.member_id

@ -135,18 +135,18 @@
var agree_privacy = $('input:checkbox[id="agree_privacy"]').is(":checked");
var agree_other = $('input:checkbox[id="agree_other"]').is(":checked");
if(theForm.name.value==""){
Swal.fire({ text: "이름을 입력해주세요", icon: 'warning', showConfirmButton: false, timer: 1500 }); // success
if(theForm.nickname.value==""){
Swal.fire({ text: "닉네임을 입력해주세요", icon: 'warning', showConfirmButton: false, timer: 1500 }); // success
theForm.center_nm.focus();
/*
}else if(theForm.phone_num.value==""){
/*
}else if(theForm.phone_num.value==""){
Swal.fire({ text: "핸드폰번호를 입력해주세요", icon: 'warning', showConfirmButton: false, timer: 1500 }); // success
theForm.phone_num.focus();
}else if(!regPh.test($("#phone_num").val())){
}else if(!regPh.test($("#phone_num").val())){
Swal.fire({ text: "핸드폰번호를 올바르게 입력해주세요", icon: 'warning', showConfirmButton: false, timer: 1500 }); // success
theForm.phone_num.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_num.focus();
*/

@ -18,8 +18,11 @@
</div>
</div>
<form id="frmJoinMember" name="frmJoinMember" method="post" action="authComplete.do" enctype="multipart/form-data">
<input type="hidden" id="check_status" name="check_status" value="" />
<form id="frmJoinMember" name="frmJoinMember" method="post" action="loginAuto.do" enctype="multipart/form-data">
<input type="hidden" id="check_status" name="check_status" value="" />
<input type="hidden" id="member_id" name="member_id" value="${Session['rm_member']['email']}" />
<input type="hidden" id="action_url" name="action_url" value="/m/bf_family_baby/list_bf_family_baby.do" />
<input type="hidden" id="sns_id" name="sns_id" value="${Session.rm_member['sns_id']!}" /> <!-- 소셜아이디 -->
<main class="m_join_member">
<div class="profile_wrap">
@ -39,7 +42,7 @@
Swal.fire({ text: " 설정에서 다시 동기화를 진행하실 수 있습니다.", icon: 'success', showConfirmButton: false, timer: 1500 }); // success
function check_onclick() {
location.href = "${URL_ROOT}/m/login/view_login.do";
$('#frmJoinMember').submit();
}
</script>

@ -31,7 +31,7 @@
<div class="login_input id_input">
<label>
<span class="hidden icon">ID</span>
<input type="text" id="member_id" name="member_id" pattern="[a-z]{4,8}" autocapitalize="none" class="" placeholder="이메일 입력" value="<#if model['member_id']?exists>${model['member_id']!}</#if>" maxlength="30" required>
<input type="text" id="member_id" name="member_id" pattern="[a-z]{4,8}" autocapitalize="none" class="" placeholder="이메일 입력" value="<#if model['email']?exists>${model['email']!}</#if>" maxlength="30" required>
</label>
</div>
<div class="login_input pw_input">

Loading…
Cancel
Save