jsshin 5 роки тому
батько
коміт
e629703c5e

+ 7 - 3
src/main/java/com/style24/front/biz/thirdparty/Yes24Login.java

@@ -52,7 +52,8 @@ public class Yes24Login {
 
 	private String id;
 	private String type;
-	private String requestUrl;
+	private String webRequestUrl;
+	private String mobRequestUrl;
 	private String callBackUrl;
 	private String userInfoUrl;
 	private String linkUrl;
@@ -62,7 +63,8 @@ public class Yes24Login {
 	public void init() {
 		id = env.getProperty("yes24.id");
 		type = env.getProperty("yes24.type");
-		requestUrl = env.getProperty("yes24.login.requestUrl");
+		webRequestUrl = env.getProperty("yes24.login.web.requestUrl");
+		mobRequestUrl = env.getProperty("yes24.login.mob.requestUrl");
 		callBackUrl = env.getProperty("yes24.login.callbackUrl");
 		userInfoUrl = env.getProperty("yes24.userInfoUrl");
 		linkUrl = env.getProperty("yes24.linkUrl");
@@ -71,7 +73,8 @@ public class Yes24Login {
 		log.debug("\n\n---- YES24 initialization started ----");
 		log.debug("id: [{}]", id);
 		log.debug("type: [{}]", type);
-		log.debug("requestUrl: [{}]", requestUrl);
+		log.debug("webRequestUrl: [{}]", webRequestUrl);
+		log.debug("mobRequestUrl: [{}]", mobRequestUrl);
 		log.debug("callBackUrl: [{}]", callBackUrl);
 		log.debug("userInfoUrl: [{}]", userInfoUrl);
 		log.debug("linkUrl: [{}]", linkUrl);
@@ -88,6 +91,7 @@ public class Yes24Login {
 	 */
 	public String getAuthorizeUrl(String state) {
 		String idGb = TsfSession.getFrontGb().equals("P") ? "PID" : "MID";
+		String requestUrl = TsfSession.getFrontGb().equals("P") ? webRequestUrl : mobRequestUrl;
 		StringBuilder apiUrlBuilder = new StringBuilder();
 		String redirectUri = GagaFileUtil.getConcatenationPath(PROTOCOL + TsfSession.getHttpServletRequest().getServerName(), callBackUrl);
 		apiUrlBuilder.append(requestUrl)

+ 2 - 1
src/main/java/com/style24/front/biz/web/TsfCustomerController.java

@@ -822,7 +822,8 @@ public class TsfCustomerController extends TsfBaseController {
 
 		mav.addObject("custNm", customer.getCustNm());
 
-		mav.setViewName(super.getDeviceViewName("customer/ConsentUseInfoForm"));
+//		mav.setViewName(super.getDeviceViewName("customer/ConsentUseInfoForm"));
+		mav.setViewName("web/customer/ConsentUseInfoFormWeb");
 
 		return mav;
 	}

+ 3 - 1
src/main/resources/config/application.yml

@@ -102,7 +102,9 @@ kakao:
 yes24 :
     id : 101582
     type : ISTYLE
-    login.requestUrl: https://www.yes24.com/Templates/FTLoginPartner.aspx
+    login :
+           web.requestUrl : https://www.yes24.com/Templates/FTLoginPartner.aspx
+           mob.requestUrl : https://m.yes24.com/Momo/Templates/FTLogin.aspx
     login.callbackUrl: /signin/yes24LoginCallback
     userInfoUrl : https://wsyes24.yes24.com/Yes_Mem.asmx/Yes_Mem_Search_By_CI
     linkUrl : https://wsyes24.yes24.com/Yes_Mem.asmx/Yes_Partner_Insert