From 249ef0d4a5b5011927d1b73ad7e05284258ec11a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 21 九月 2023 11:07:58 +0800
Subject: [PATCH] 代码冲突，整合代码
---
Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/endpoint/BladeSocialEndpoint.java | 14 +-------------
1 files changed, 1 insertions(+), 13 deletions(-)
diff --git a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/endpoint/BladeSocialEndpoint.java b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/endpoint/BladeSocialEndpoint.java
index 9a9b201..7b92db7 100644
--- a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/endpoint/BladeSocialEndpoint.java
+++ b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/endpoint/BladeSocialEndpoint.java
@@ -16,6 +16,7 @@
*/
package com.vci.ubcs.auth.endpoint;
+import com.vci.ubcs.starter.util.HttpUtils;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import me.zhyd.oauth.model.AuthCallback;
@@ -61,19 +62,6 @@
}
/**
- * 涓嶰A绯荤粺鐨勫崟鐐圭櫥褰�
- */
- @GetMapping("/oauth/oasso")
- public ModelAndView require(HttpServletRequest request, ModelAndView model) {
- // 鎷垮埌鐢ㄦ埛鐨勯壌鏉冧俊鎭�
- String userName = request.getParameter("username");
-
- model.setViewName("login");
- return model;
- }
-
-
- /**
* 鑾峰彇璁よ瘉淇℃伅
*/
@RequestMapping("/oauth/callback/{source}")
--
Gitblit v1.10.0