扫码登陆

mec-application/src/main/java/com/ym/mec/web/controller/open/OpenQrLoginController.java

@@ -0,0 +1,34 @@
+package com.ym.mec.web.controller.open;
+
+import com.dayaedu.cbs.openfeign.wrapper.qrcode.CbsQrCodeScanWrapper;
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@Api(tags = "扫码登陆")
+@RequestMapping(value = "${app-config.url.web:}/open")
+public class OpenQrLoginController extends BaseController {
+
+	@Resource
+	private SysUserFeignService sysUserFeignService;
+
+	@ApiOperation(value = "获取用户信息")
+	@PostMapping(value = "/cbs/qrcode/userInfo")
+	public CbsQrCodeScanWrapper.UserInfo userInfo(@RequestBody CbsQrCodeScanWrapper.QrCodeScanUserInfoReq req) {
+		return sysUserFeignService.userInfo(req);
+	}
+
+	@ApiOperation(value = "生成token")
+	@PostMapping(value = "/cbs/qrcode/login")
+	public CbsQrCodeScanWrapper.QrCodeScanToken login(@RequestBody CbsQrCodeScanWrapper.QrCodeScanReq req) {
+		return sysUserFeignService.login(req);
+	}
+}

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/client/SysUserFeignService.java

@@ -1,19 +1,17 @@
 package com.ym.mec.auth.api.client;
 
-import java.util.List;
-import java.util.Map;
-
+import com.dayaedu.cbs.openfeign.wrapper.qrcode.CbsQrCodeScanWrapper;
+import com.ym.mec.auth.api.client.fallback.SysUserFeignServiceFallback;
 import com.ym.mec.auth.api.dto.SysUserQueryInfo;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.common.config.FeignConfiguration;
+import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
-import com.ym.mec.auth.api.client.fallback.SysUserFeignServiceFallback;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.common.config.FeignConfiguration;
-import com.ym.mec.common.entity.HttpResponseResult;
+import java.util.List;
 
 @FeignClient(contextId = "sysUserFeignService", name = "auth-server", configuration = { FeignConfiguration.class }, fallback = SysUserFeignServiceFallback.class)
 public interface SysUserFeignService {
@@ -54,9 +52,9 @@ public interface SysUserFeignService {
 	@PostMapping(value = "user/list")
 	HttpResponseResult<List<SysUser>> page(@RequestBody SysUserQueryInfo queryInfo);
 
-	@PostMapping(value = "usernameLogin")
-	HttpResponseResult<Map<String,Object>> usernameLogin(@RequestParam("username")String username,
-														 @RequestParam("password")String password,
-														 @RequestParam("clientId")String clientId,
-														 @RequestParam("clientSecret")String clientSecret);
+	@PostMapping(value = "qrLogin/userInfo")
+	CbsQrCodeScanWrapper.UserInfo userInfo(@RequestBody CbsQrCodeScanWrapper.QrCodeScanUserInfoReq req);
+
+	@PostMapping(value = "qrLogin/login")
+	CbsQrCodeScanWrapper.QrCodeScanToken login(@RequestBody CbsQrCodeScanWrapper.QrCodeScanReq req);
 }

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/client/fallback/SysUserFeignServiceFallback.java

@@ -3,6 +3,7 @@ package com.ym.mec.auth.api.client.fallback;
 import java.util.List;
 import java.util.Map;
 
+import com.dayaedu.cbs.openfeign.wrapper.qrcode.CbsQrCodeScanWrapper;
 import com.ym.mec.auth.api.dto.SysUserQueryInfo;
 import org.springframework.stereotype.Component;
 
@@ -63,7 +64,13 @@ public class SysUserFeignServiceFallback implements SysUserFeignService {
 	}
 
 	@Override
-	public HttpResponseResult<Map<String, Object>> usernameLogin(String username, String password, String clientId, String clientSecret) {
+	public CbsQrCodeScanWrapper.UserInfo userInfo(CbsQrCodeScanWrapper.QrCodeScanUserInfoReq req) {
 		return null;
 	}
+
+	@Override
+	public CbsQrCodeScanWrapper.QrCodeScanToken login(CbsQrCodeScanWrapper.QrCodeScanReq req) {
+		return null;
+	}
+
 }

mec-auth/mec-auth-server/pom.xml

@@ -21,11 +21,6 @@
 	<dependencies>
 
 		<dependency>
-			<groupId>com.dayaedu.cbs.openfeign</groupId>
-			<artifactId>dayaedu-openfeign-api</artifactId>
-			<version>1.0.0</version>
-		</dependency>
-		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 		</dependency>

mec-auth/pom.xml

@@ -15,6 +15,11 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	<dependencies>
+		<dependency>
+			<groupId>com.dayaedu.cbs.openfeign</groupId>
+			<artifactId>dayaedu-openfeign-api</artifactId>
+			<version>1.0.0</version>
+		</dependency>
 		<!-- 引用Mybatis 和 Mysql驱动开始 -->
 		<dependency>
 			<groupId>org.mybatis.spring.boot</groupId>