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

1. 남은 작업 기록

Browse Source 
2. 소셜로그인 도메인 및 redirect 정보 프로퍼티 수정
dev_bert
jonghwan76 3 years ago
parent e100254485
commit 9e3d42fcf1
4 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File

30
.idea/workspace.xml
Unescape View File

@ -9,11 +9,11 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="연동완료후 이동 URL 수정-2"> <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="1. D-Day 없을경우 링크 되도록 수정&#10;2. 간식기록제품 홈정보 표시오류 수정">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml" 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/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml" 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" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" afterDir="false" /> <change beforePath="$PROJECT_DIR$/개발참고.txt" beforeDir="false" afterPath="$PROJECT_DIR$/개발참고.txt" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -256,14 +256,7 @@
<workItem from="1651995870891" duration="2261000" /> <workItem from="1651995870891" duration="2261000" />
<workItem from="1652058308312" duration="456000" /> <workItem from="1652058308312" duration="456000" />
<workItem from="1652060536329" duration="3124000" /> <workItem from="1652060536329" duration="3124000" />
<workItem from="1652100883750" duration="4593000" /> <workItem from="1652100883750" duration="5192000" />
</task>
<task id="LOCAL-00017" summary="데이터 연동작업">
<created>1649174166224</created>
<option name="number" value="00017" />
<option name="presentableId" value="LOCAL-00017" />
<option name="project" value="LOCAL" />
<updated>1649174166224</updated>
</task> </task>
<task id="LOCAL-00018" summary="퍼블리싱 기능 적용&#10;1. 설정하기&#10; - 인증코드 확인&#10; - 계정연동 하기&#10; - 기록 카테고리 수정&#10; - 자주쓰는 표현 수정&#10; &#10;2. 로그인화면"> <task id="LOCAL-00018" summary="퍼블리싱 기능 적용&#10;1. 설정하기&#10; - 인증코드 확인&#10; - 계정연동 하기&#10; - 기록 카테고리 수정&#10; - 자주쓰는 표현 수정&#10; &#10;2. 로그인화면">
<created>1649264283460</created> <created>1649264283460</created>
@ -601,7 +594,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1652066536512</updated> <updated>1652066536512</updated>
</task> </task>
<option name="localTasksCounter" value="66" /> <task id="LOCAL-00066" summary="1. D-Day 없을경우 링크 되도록 수정&#10;2. 간식기록제품 홈정보 표시오류 수정">
<created>1652106063064</created>
<option name="number" value="00066" />
<option name="presentableId" value="LOCAL-00066" />
<option name="project" value="LOCAL" />
<updated>1652106063064</updated>
</task>
<option name="localTasksCounter" value="67" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@ -621,7 +621,6 @@
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" /> <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" /> <option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="- 전화번호 인증 만료시 재발행 버튼 적용&#10;- 메인화면 기록이미지 노출(대표이미지 관련 문의해야함)&#10;- 아기정보 성별 변경 오류 수정" />
<MESSAGE value="- 체크리스트 오류사항 수정" /> <MESSAGE value="- 체크리스트 오류사항 수정" />
<MESSAGE value="- 기본음악파일 삭제불가처리" /> <MESSAGE value="- 기본음악파일 삭제불가처리" />
<MESSAGE value="소셜회원가입 오류수정" /> <MESSAGE value="소셜회원가입 오류수정" />
@ -646,6 +645,7 @@
<MESSAGE value="연동계정 취소하기시 확인 창" /> <MESSAGE value="연동계정 취소하기시 확인 창" />
<MESSAGE value="연동완료후 이동 URL 수정" /> <MESSAGE value="연동완료후 이동 URL 수정" />
<MESSAGE value="연동완료후 이동 URL 수정-2" /> <MESSAGE value="연동완료후 이동 URL 수정-2" />
<option name="LAST_COMMIT_MESSAGE" value="연동완료후 이동 URL 수정-2" /> <MESSAGE value="1. D-Day 없을경우 링크 되도록 수정&#10;2. 간식기록제품 홈정보 표시오류 수정" />
<option name="LAST_COMMIT_MESSAGE" value="1. D-Day 없을경우 링크 되도록 수정&#10;2. 간식기록제품 홈정보 표시오류 수정" />
</component> </component>
</project> </project>

5
src/main/java/com/backoffice/m/login/M_LoginController.java
Unescape View File

@ -3,7 +3,6 @@ package com.backoffice.m.login;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import com.backoffice.api.bo.ApiSMSBO; import com.backoffice.api.bo.ApiSMSBO;
import com.backoffice.constants.ConstantSystem; import com.backoffice.constants.ConstantSystem;
import com.backoffice.m.member_env.M_Member_envBO; import com.backoffice.m.member_env.M_Member_envBO;
@ -62,8 +61,7 @@ public class M_LoginController extends AbstractControllerManager{
M_Util gmUtil = new M_Util(); M_Util gmUtil = new M_Util();
@RequestMapping(value="view_login") @RequestMapping(value="view_login")
public String view_login(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response public String view_login(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response, RedirectAttributes ra) {
, RedirectAttributes ra) {
DataMap paramMap = gmUtil.getDataMapFromRequest(request); DataMap paramMap = gmUtil.getDataMapFromRequest(request);
@ -87,6 +85,7 @@ public class M_LoginController extends AbstractControllerManager{
try{ try{
boolean is_login = gmUtil.setSessionForMobileMember(request, paramMap); boolean is_login = gmUtil.setSessionForMobileMember(request, paramMap);
paramMap.put("WEB_URL",ConstantSystem.WEB_URL); //WEB URL세팅 - 소셜로그인을 위하여.
}catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();} }catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();}

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

@ -90,7 +90,7 @@
var naver_id_login = new naver_id_login(_naverKey, _naverCallUrl); var naver_id_login = new naver_id_login(_naverKey, _naverCallUrl);
var naver_state = naver_id_login.getUniqState(); var naver_state = naver_id_login.getUniqState();
naver_id_login.setButton("white", 3, 40); naver_id_login.setButton("white", 3, 40);
naver_id_login.setDomain("http://devops.lookylooks.ai:14288"); naver_id_login.setDomain("${model['WEB_URL']}");
naver_id_login.setState(naver_state); naver_id_login.setState(naver_state);
naver_id_login.setPopup(); naver_id_login.setPopup();
naver_id_login.init_naver_id_login(); naver_id_login.init_naver_id_login();
@ -106,7 +106,9 @@
// window.open(url, 'naverloginpop', 'titlebar=1, resizable=1, scrollbars=yes, width=600, height=550'); // window.open(url, 'naverloginpop', 'titlebar=1, resizable=1, scrollbars=yes, width=600, height=550');
location.href = url; location.href = url;
} else if(l_type == "K") { } else if(l_type == "K") {
loginWithKakao(); Kakao.Auth.authorize({
redirectUri: '${model['WEB_URL']}/bf/m/login/kakaoLogin_callback.do'
});
/* /*
//카카오는 여기로 바로 redirect 한다. //카카오는 여기로 바로 redirect 한다.
Kakao.Auth.login({ Kakao.Auth.login({
@ -123,12 +125,6 @@
} }
} }
function loginWithKakao() {
Kakao.Auth.authorize({
redirectUri: 'http://devops.lookylooks.ai:14288/bf/m/login/kakaoLogin_callback.do'
})
}
// 소셜 로그인 callback 정보 받기 // 소셜 로그인 callback 정보 받기
<#--function fn_L_loginCallback(socialType, key){--> <#--function fn_L_loginCallback(socialType, key){-->
<#-- //소셜로그인 체크여부 확인--> <#-- //소셜로그인 체크여부 확인-->

8
개발참고.txt
Unescape View File

@ -93,3 +93,11 @@ http://devops.lookylooks.ai:14288/bf/m/bf_food/list_bf_homemade_recommend_ajax?p
- 자동로그인 웹URL - POST or GET - 자동로그인 웹URL - POST or GET
http://devops.lookylooks.ai:14288/m/login/loginAutoMobile?member_id=1651069631295 http://devops.lookylooks.ai:14288/m/login/loginAutoMobile?member_id=1651069631295
# 해야할일
- 디비 import
- 서버 배포
- SNS(네이버, 카카오) 개발자 센터 URL 등록
- SMS 및 구글메일 전송정보 확인
- 홈화면 아이정보 슬라이딩 기능 적용
Write Preview
Loading…
Cancel
Save