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

공유기능 퍼블리싱 및 기능 적용

Browse Source
dev_bert
jonghwan76 3 years ago
parent 7db3ff68a9
commit 89040e78b9
11 changed files with 102 additions and 84 deletions
Show Stats Download Patch File Download Diff File

45
.idea/workspace.xml
Unescape View File

@ -9,28 +9,17 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="회원가입 밸리데이션 및 유효성체크 보완">
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_phone_02.ftl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_phone_20220416.ftl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_phone_confirm.ftl" afterDir="false" />
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="회원가입 밸리데이션 및 유효성체크 보완 - 2">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/api/ApiSMSController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/api/ApiSMSController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/api/bo/APIMemberBO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/api/bo/APIMemberBO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/api/bo/APIMemberBOImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/api/bo/APIMemberBOImpl.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/member_env/M_Member_envController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_recommend.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_recommend.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/api/com.backoffice.api.bf.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/api/com.backoffice.api.bf.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_cart_popup.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_cart_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/bf_food/view_bf_homemade_popup.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_bf_homemade_popup.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/confirm.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/confirm.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_pw_reset_phone_01.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone_01.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_confirm.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_confirm.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_confirm_end.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_confirm_end.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_phone.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_phone.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/static/js/util.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_family_baby/com.backoffice.m.bf_family_baby.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_family_baby/com.backoffice.m.bf_family_baby.xml" 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/member_env/view_set_account_phone_confirm.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_phone_confirm.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_common.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_common.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_daily.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_daily.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -235,7 +224,10 @@
<workItem from="1649928321125" duration="16823000" />
<workItem from="1650020162949" duration="8484000" />
<workItem from="1650082025322" duration="596000" />
<workItem from="1650099253570" duration="21289000" />
<workItem from="1650099253570" duration="21674000" />
<workItem from="1650210956375" duration="846000" />
<workItem from="1650243545918" duration="874000" />
<workItem from="1650278800214" duration="7789000" />
</task>
<task id="LOCAL-00001" summary="최초 커밋">
<created>1645354476031</created>
@ -482,7 +474,14 @@
<option name="project" value="LOCAL" />
<updated>1650110425602</updated>
</task>
<option name="localTasksCounter" value="36" />
<task id="LOCAL-00036" summary="회원가입 밸리데이션 및 유효성체크 보완 - 2">
<created>1650124395162</created>
<option name="number" value="00036" />
<option name="presentableId" value="LOCAL-00036" />
<option name="project" value="LOCAL" />
<updated>1650124395162</updated>
</task>
<option name="localTasksCounter" value="37" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -502,7 +501,6 @@
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="음악설정 수정&#10;부모정보 변경 삭제" />
<MESSAGE value="비밀번호 찾기 기능 적용&#10;로그인 회원가입 형식 변경" />
<MESSAGE value="닉네임 변경기능 적용" />
<MESSAGE value="계정 동기화 기능 수정" />
@ -527,6 +525,7 @@
<MESSAGE value="아기정보입력 생년월일 형식 수정&#10;추천이유식 &gt; 카트팝업 검색 기능 및 조회 적용" />
<MESSAGE value="메모리 공유기능 적용 - 카카오, URL복사" />
<MESSAGE value="회원가입 밸리데이션 및 유효성체크 보완" />
<option name="LAST_COMMIT_MESSAGE" value="회원가입 밸리데이션 및 유효성체크 보완" />
<MESSAGE value="회원가입 밸리데이션 및 유효성체크 보완 - 2" />
<option name="LAST_COMMIT_MESSAGE" value="회원가입 밸리데이션 및 유효성체크 보완 - 2" />
</component>
</project>

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

@ -565,6 +565,16 @@ public class ApiSMSController extends AbstractControllerManager{
json = RenaStringUtil.getJSONFromMap(map_json);
}else{
try {
//기존 등록된 전화번호가 있는지 확인
DataMap rm = aPIMemberBO.select_member_with_email_phone(paramMap);
//기존에 등록된 번호가 있다면
if(rm != null) {
map_json.put("MSG", "해당 전화번호는 이미 가입된 전화번호 입니다.");
json = RenaStringUtil.getJSONFromMap(map_json);
return json;
}
map_json.put("RESULT", "true");
String is_test = RenaStringUtil.getData(paramMap, "is_test");

4
src/main/resources/sqlmap/api/com.backoffice.api.bf.xml
Unescape View File

@ -27,7 +27,7 @@
x.member_id
,x.name
,x.nickname
,x.birthday
,DATE_FORMAT(x.birthday, '%Y-%m-%d') as birthday
,x.gender
,x.password
,x.profile_path
@ -68,7 +68,7 @@
,x.name
,x.social_type
,mc.email
,x.birthday
,DATE_FORMAT(x.birthday, '%Y-%m-%d') as birthday
,x.gender
,x.password
,x.profile_path

2
src/main/resources/sqlmap/m/bf_family_baby/com.backoffice.m.bf_family_baby.xml
Unescape View File

@ -111,7 +111,7 @@
x.smc_no
,x.name
,x.gender
,x.birthday
,DATE_FORMAT(x.birthday, '%Y-%m-%d') as birthday
,x.weight_birth
,x.height_birth
,x.weight

2
src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml
Unescape View File

@ -25,7 +25,7 @@
x.member_id
,x.name
,x.nickname
,x.birthday
,DATE_FORMAT(x.birthday, '%Y-%m-%d') as birthday
,x.gender
,x.password
,x.profile_path

4
src/main/webapp/WEB-INF/views/ftl/m/bf_board/view_bf_detail_board.ftl
Unescape View File

@ -272,8 +272,8 @@
<div class="shared">
<div class="item">
<a>
<div class="img"><img src="${URL_ROOT}/m/img/Icon_Share_Insta.png"></div>
인스타그램
<div class="img"><img src="${URL_ROOT}/m/img/Icon_Share_Facebook.png"></div>
페이스북
</a>
</div>
<div class="item">

2
src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_phone_confirm.ftl
Unescape View File

@ -6,7 +6,7 @@
<!-- header_sub -->
<header class="header_wrapper">
<a href="javascript:history.back();" class="side_Lbtn hidden pre_btn">이전으로</a>
<h1 class="header_title">아이디 찾기</h1>
<h1 class="header_title">전화번호 변경</h1>
</header>
<!-- //header_sub -->

92
src/main/webapp/WEB-INF/views/ftl/m/memory/memory_common.ftl
Unescape View File

@ -1,35 +1,33 @@
<div id="sharePopup" class="modal-wrapper">
<div class="modal_content" style="width: 320px;">
<div class="head">
<div class="title">공유하기</div>
<div class="modal_close_btn"><img src="../img/close_ico.png"></div>
</div>
<div class="content">
<ul class="share-list">
<li class="kakao" id="linkedKakao" style="padding-left:40px;padding-right:40px;"><a href="#"><img src="/bf/m/img/Icon_Share_Kakao.png" alt="" style="width:40px;" /></a></li>
<li class="facebook" style="padding-right:40px;"><a href="#"><img src="/bf/m/img/Icon_Share_Facebook.png" style="width:40px;" /></a></li>
<li class="copy">
<a href="#popup-url-copy" class="copy_btn" >
<img src="/bf/m/img/Icon_Share_Clip.png" alt="" style="width:60px;margin-top:-10px;"/>
<input type="hidden" class="copy_text" value=""/>
</a>
</li>
</ul>
<!-- modal-wrapper -->
<div class="community_option" id="shared">
<div class="content">
<!-- 공유 모달 -->
<div class="shared">
<div class="item">
<a>
<div id="linkedFacebook" class="img"><img src="../img/Icon_Share_Facebook.png"></div>
페이스북
</a>
</div>
<div class="item">
<a>
<div id="linkedKakao" class="img"><img src="../img/Icon_Share_Kakao.png"></div>
카카오톡
</a>
</div>
<div class="item">
<a>
<div class="img copy"><img src="../img/Icon_Share_Clip.png"></div>
URL 복사
</a>
</div>
</div>
</div>
<div class="modal_layer"></div>
<input type="text" style="display: none" id="copyText" value=""/>
</div>
<!-- //modal-wrapper -->
<div id="shareCopy" class="modal-wrapper">
<div class="modal_content" style="width: 400px;">
<div class="head">
<div class="title">공유하기</div>
<div class="modal_close_btn"><img src="../img/close_ico.png"></div>
</div>
<div class="content">
<p class="single-txt">URL이 복사 되었습니다. <br />원하는 곳에 붙여넣기 해 주세요.</p>
</div>
</div>
</div>
<script>
var kakao_option = {
@ -44,8 +42,7 @@
webUrl:"",
mobileWebUrl: "",
androidExecutionParams: "",
iosExecutionParams: "",
iosExecutionParams: ""
},
},
buttons: [
@ -64,29 +61,30 @@
]
};
$(".modal_layer").on("click", function() {
$(".community_option").removeClass("open");
})
//공유버튼 클리기 이벤트
$("#share-list").on("click", function() {
$('#sharePopup').addClass('open');
$('#shared').addClass('open');
});
$('.modal_close_btn').on('click', function() {
$('.modal-wrapper').removeClass('open');
});
//복사하기 클릭시 이벤트
$(".copy").on("click" , function(e) {
$("#copyText").css("display","");
var copyText = document.getElementById("copyText");
copyText.select();
copyText.setSelectionRange(0,99999);
document.execCommand("Copy");
$(".community_option").removeClass("open");
$("#copyText").css("display","none");
$(".kakao").on("click" , function(e) {
e.preventDefault();
Swal.fire({text: 'URL이 복사 되었습니다. 원하는 곳에 붙여넣기 해 주세요.'});
});
$(".copy").on("click" , function(e) {
$("#linkedFacebook").on("click" , function(e) {
e.preventDefault();
var target = $(this);
target.find("input").attr("type" , "text");
target.find("input").get(0).select();
target.find("input").get(0).setSelectionRange(0, 9999); // 추가
var success = document.execCommand("copy");
target.find("input").attr("type" , "hidden");
$('.modal-wrapper').removeClass('open');
$("#shareCopy").addClass('open');
window.open(shareUrlFB, '', 'scrollbars=no, width=584, height=635');
});
</script>

8
src/main/webapp/WEB-INF/views/ftl/m/memory/memory_daily.ftl
Unescape View File

@ -125,11 +125,15 @@
$("#p_" + attr_id).show();
}
//공유 URL
//카카오톡 공유 및 클립보드 복사 URL
var param = "member_id=${model['rm_mem']['member_id']!}&smc_no=${model['rm_child']['smc_no']}&birthday=${model['rm_child']['birthday']}&dayFlag=${model['rm_mem']['dayFlag']!}&currDate=${model['rm_mem']['currDate']!}";
var shareURL = window.location.protocol + "//" + window.location.host + "${URL_ROOT}" + "/m/memory/memory_daily_share?" + param;
var webURL = window.location.protocol + "//" + window.location.host + "${URL_ROOT}" + "/m/";
//페이스북 URL
var shareUrlFB = "https://www.facebook.com/sharer/sharer.php?u="+encodeURIComponent(shareURL)+"&t="+encodeURI("이유식당");
kakao_option.content.description = "메모리 일간 공유";
kakao_option.container = "#linkedKakao";
kakao_option.content.link.webUrl = shareURL;
@ -155,6 +159,6 @@
}
});
$(".copy .copy_text").val(shareURL);
$("#copyText").val(shareURL);
</script>
</html>

10
src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.ftl
Unescape View File

@ -117,10 +117,14 @@
<!-- 공유기능 -->
<#include "/m/memory/memory_common.ftl">
<script>
//공유 URL
var shareURL = window.location.protocol + "//" + window.location.host + "${URL_ROOT}" + "/m/memory/memory_timeline_share?member_id=${model['rm_mem']['member_id']!}&smc_no=${model['rm_child']['smc_no']}";
//카카오톡 공유 및 클립보드 복사 URL
var param = "member_id=${model['rm_mem']['member_id']!}&smc_no=${model['rm_child']['smc_no']}";
var shareURL = window.location.protocol + "//" + window.location.host + "${URL_ROOT}" + "/m/memory/memory_timeline_share?" + param;
var webURL = window.location.protocol + "//" + window.location.host + "${URL_ROOT}" + "/m/";
//페이스북 URL
var shareUrlFB = "https://www.facebook.com/sharer/sharer.php?u="+encodeURIComponent(shareURL)+"&t="+encodeURI("이유식당");
kakao_option.content.description = "메모리 타임라인 공유";
kakao_option.container = "#linkedKakao";
kakao_option.content.link.webUrl = shareURL;
@ -146,7 +150,7 @@
}
});
$(".copy .copy_text").val(shareURL);
$("#copyText").val(shareURL);
</script>
</body>
<#include "/m/include/index_bottom.ftl">

7
src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl
Unescape View File

@ -253,11 +253,14 @@
});
}
//공유 URL
//카카오톡 공유 및 클립보드 복사 URL
var param = "member_id=${model['rm_mem']['member_id']!}&smc_no=${model['rm_child']['smc_no']}&dayFlag=${model['rm_mem']['dayFlag']!}&currDate=${model['rm_mem']['currDate']!}";
var shareURL = window.location.protocol + "//" + window.location.host + "${URL_ROOT}" + "/m/memory/memory_week_share?" + param;
var webURL = window.location.protocol + "//" + window.location.host + "${URL_ROOT}" + "/m/";
//페이스북 URL
var shareUrlFB = "https://www.facebook.com/sharer/sharer.php?u="+encodeURIComponent(shareURL)+"&t="+encodeURI("이유식당");
kakao_option.content.description = "메모리 주간 공유";
kakao_option.container = "#linkedKakao";
kakao_option.content.link.webUrl = shareURL;
@ -283,7 +286,7 @@
}
});
$(".copy .copy_text").val(shareURL);
$("#copyText").val(shareURL);
</script>
</body>

Write Preview
Loading…
Cancel
Save