diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 54abce2..4bc1893 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,11 +9,11 @@
-
+
-
-
-
+
+
+
@@ -256,14 +256,7 @@
-
-
-
- 1649174166224
-
-
-
- 1649174166224
+
1649264283460
@@ -601,7 +594,14 @@
1652066536512
-
+
+ 1652106063064
+
+
+
+ 1652106063064
+
+
@@ -621,7 +621,6 @@
-
@@ -646,6 +645,7 @@
-
+
+
\ No newline at end of file
diff --git a/src/main/java/com/backoffice/m/login/M_LoginController.java b/src/main/java/com/backoffice/m/login/M_LoginController.java
index ee3e0db..a80be22 100644
--- a/src/main/java/com/backoffice/m/login/M_LoginController.java
+++ b/src/main/java/com/backoffice/m/login/M_LoginController.java
@@ -3,7 +3,6 @@ package com.backoffice.m.login;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-
import com.backoffice.api.bo.ApiSMSBO;
import com.backoffice.constants.ConstantSystem;
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();
@RequestMapping(value="view_login")
- public String view_login(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response
- , RedirectAttributes ra) {
+ public String view_login(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response, RedirectAttributes ra) {
DataMap paramMap = gmUtil.getDataMapFromRequest(request);
@@ -87,6 +85,7 @@ public class M_LoginController extends AbstractControllerManager{
try{
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();}
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl b/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl
index 9af3194..abfe5ae 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl
@@ -90,7 +90,7 @@
var naver_id_login = new naver_id_login(_naverKey, _naverCallUrl);
var naver_state = naver_id_login.getUniqState();
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.setPopup();
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');
location.href = url;
} else if(l_type == "K") {
- loginWithKakao();
+ Kakao.Auth.authorize({
+ redirectUri: '${model['WEB_URL']}/bf/m/login/kakaoLogin_callback.do'
+ });
/*
//카카오는 여기로 바로 redirect 한다.
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 정보 받기
<#--function fn_L_loginCallback(socialType, key){-->
<#-- //소셜로그인 체크여부 확인-->
diff --git a/개발참고.txt b/개발참고.txt
index 4cd9d04..d802f15 100644
--- a/개발참고.txt
+++ b/개발참고.txt
@@ -93,3 +93,11 @@ http://devops.lookylooks.ai:14288/bf/m/bf_food/list_bf_homemade_recommend_ajax?p
- 자동로그인 웹URL - POST or GET
http://devops.lookylooks.ai:14288/m/login/loginAutoMobile?member_id=1651069631295
+
+
+# 해야할일
+ - 디비 import
+ - 서버 배포
+ - SNS(네이버, 카카오) 개발자 센터 URL 등록
+ - SMS 및 구글메일 전송정보 확인
+ - 홈화면 아이정보 슬라이딩 기능 적용
\ No newline at end of file