扫码登陆

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

@@ -52,9 +52,9 @@ public interface SysUserFeignService {
 	@PostMapping(value = "user/list")
 	HttpResponseResult<List<SysUser>> page(@RequestBody SysUserQueryInfo queryInfo);
 
-	@PostMapping(value = "qrLogin/userInfo")
+	@PostMapping(value = "open/qrcode/userInfo")
 	CbsQrCodeScanWrapper.UserInfo userInfo(@RequestBody CbsQrCodeScanWrapper.QrCodeScanUserInfoReq req);
 
-	@PostMapping(value = "qrLogin/login")
+	@PostMapping(value = "open/qrcode/login")
 	CbsQrCodeScanWrapper.QrCodeScanToken login(@RequestBody CbsQrCodeScanWrapper.QrCodeScanReq req);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/config/ResourceServerConfig.java

@@ -28,7 +28,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                 .authorizeRequests().antMatchers(
                         "/task/**", "/user/updatePassword", "/user/noAuth/queryUserByPhone",
                         "/user/queryUserByPhone", "/user/queryClient", "/user/add",
-                        "/user/queryUserById/*","/open/cbs/qrcode/*",
+                        "/user/queryUserById/*","/open/qrcode/*",
                         "/queryUserInfo","/api/queryUserInfo").hasIpAddress("0.0.0.0/0")
                 .anyRequest().authenticated().and().httpBasic();
     }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/config/WebMvcConfig.java

@@ -39,7 +39,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		registry.addInterceptor(tenantInterceptor).addPathPatterns("/**").
 				excludePathPatterns("/queryUserInfo","/user/updatePassword","/user/queryUserByPhone","/user/add",
 						"user/queryUserById/*","/role/queryRoleCodeListByUserId",
-						"/user/updateSysUser","/user/open/*","/open/cbs/qrcode/*");
+						"/user/updateSysUser","/user/open/*","/open/qrcode/*");
 		registry.addInterceptor(operationLogInterceptor).addPathPatterns("/userDevice/unbind").excludePathPatterns("/*");
 	}
 	

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/CbsQrCodeScanServiceImpl.java

@@ -1,10 +1,9 @@
 package com.ym.mec.auth.service.impl;
 
-import com.dayaedu.cbs.openfeign.service.CbsQrCodeScanService;
 import com.dayaedu.cbs.openfeign.wrapper.qrcode.CbsQrCodeScanWrapper;
-import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.auth.core.service.CustomTokenServices;
+import com.ym.mec.auth.service.SysUserService;
 import com.ym.mec.common.exception.BizException;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
@@ -14,14 +13,13 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 
 @Service
-public class CbsQrCodeScanServiceImpl implements CbsQrCodeScanService {
+public class CbsQrCodeScanServiceImpl{
 
     @Resource
     private CustomTokenServices customTokenServices;
     @Resource
-    private SysUserFeignService sysUserFeignService;
+    private SysUserService sysUserService;
 
-    @Override
     public CbsQrCodeScanWrapper.UserInfo userInfo(CbsQrCodeScanWrapper.QrCodeScanUserInfoReq req) {
         CbsQrCodeScanWrapper.UserInfo userInfo = new CbsQrCodeScanWrapper.UserInfo();
         userInfo.setUsername(customTokenServices.loadAuthentication(req.getToken()).getName().split(":")[1]);
@@ -29,11 +27,10 @@ public class CbsQrCodeScanServiceImpl implements CbsQrCodeScanService {
         return userInfo;
     }
 
-    @Override
     public CbsQrCodeScanWrapper.QrCodeScanToken login(CbsQrCodeScanWrapper.QrCodeScanReq req) {
         OAuth2Authentication auth2Authentication = customTokenServices.loadAuthentication(req.getPassword());
         String phone = auth2Authentication.getName().split(":")[1];
-        SysUser sysUser = sysUserFeignService.queryUserByMobile(phone);
+        SysUser sysUser = sysUserService.queryByPhone(phone);
         if (sysUser == null) {
             throw new BizException(HttpStatus.UNAUTHORIZED.value(), "用户不存在");
         }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysUserServiceImpl.java

@@ -69,7 +69,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 
     @Override
     public SysUserInfo queryUserInfoByUsername(String username) {
-        return getSysUserInfo(queryByUsername(username));
+        return getSysUserInfo(queryByPhone(username));
     }
 
     @Override

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

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

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -197,11 +197,11 @@
 	</select>
 
     <select id="queryByPhone" resultMap="SysUser">
-		select * from sys_user where phone_ = #{phone} OR username_ = #{phone} LIMIT 1
+		select * from sys_user where phone_ = #{phone} LIMIT 1
 	</select>
 
     <select id="queryLockByPhone" resultMap="SysUser">
-		select * from sys_user where phone_ = #{phone} OR username_ = #{phone} LIMIT 1 FOR UPDATE
+		select * from sys_user where phone_ = #{phone} LIMIT 1 FOR UPDATE
 	</select>
     <resultMap id="ImUserModel" type="com.ym.mec.common.entity.ImUserModel">
         <result column="id_" property="id"/>

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CbsQrCodeScanServiceImpl.java

@@ -0,0 +1,25 @@
+package com.ym.mec.biz.service.impl;
+
+import com.dayaedu.cbs.openfeign.service.CbsQrCodeScanService;
+import com.dayaedu.cbs.openfeign.wrapper.qrcode.CbsQrCodeScanWrapper;
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class CbsQrCodeScanServiceImpl implements CbsQrCodeScanService {
+
+    @Resource
+    private SysUserFeignService sysUserFeignService;
+
+    @Override
+    public CbsQrCodeScanWrapper.UserInfo userInfo(CbsQrCodeScanWrapper.QrCodeScanUserInfoReq req) {
+        return sysUserFeignService.userInfo(req);
+    }
+
+    @Override
+    public CbsQrCodeScanWrapper.QrCodeScanToken login(CbsQrCodeScanWrapper.QrCodeScanReq req) {
+        return sysUserFeignService.login(req);
+    }
+}