乐教通

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

@@ -63,5 +63,6 @@ public interface SysUserFeignService {
 	@PostMapping(value = "smsLogin")
 	HttpResponseResult<Map<String,Object>> smsLogin(@RequestParam("phone")String phone,
 													@RequestParam("clientId")String clientId,
+													@RequestParam("clientType")String clientType,
 													@RequestParam("clientSecret")String clientSecret);
 }

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

@@ -76,6 +76,7 @@ public class SysUserFeignServiceFallback implements SysUserFeignService {
 	@Override
 	public HttpResponseResult<Map<String,Object>> smsLogin(@RequestParam("phone")String phone,
 														   @RequestParam("clientId")String clientId,
+														   @RequestParam("clientType")String clientType,
 														   @RequestParam("clientSecret")String clientSecret) {
 		return null;
 	}

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/handler/BaseAuthenticationSuccessEventHandler.java

@@ -128,7 +128,7 @@ public class BaseAuthenticationSuccessEventHandler extends SavedRequestAwareAuth
 		sysUserLoginLogService.insert(sysUserLoginLog);
 		
 		try {
-			String clientId = request.getParameter("clientId").replace("QR_", "");
+			String clientId = request.getParameter("clientId");
 			String clientSecret = request.getParameter("clientSecret");
 			if (clientId == null || clientSecret == null) {
 				throw new UnapprovedClientAuthenticationException("请求头中client信息为空");

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/provider/PhoneAuthenticationProvider.java

@@ -59,7 +59,7 @@ public class PhoneAuthenticationProvider extends AbstractAuthenticationProvider
         String clientId = loginEntity.getClientId();
 
         // 验证码验证
-        if (!clientId.startsWith("QR_") && !smsCodeService.verifyValidCode(phone, smsCode)) {
+        if (!clientId.startsWith("qr_") && !smsCodeService.verifyValidCode(phone, smsCode)) {
             throw new BadCredentialsException("验证码校验失败");
         }
 
@@ -138,7 +138,7 @@ public class PhoneAuthenticationProvider extends AbstractAuthenticationProvider
                 sysUserDeviceService.bindDevice(clientId, user.getId(), deviceNum, userInfo.getSysUser().getTenantId());
             }
 
-            if (clientId.startsWith("QR_")) {
+            if (clientId.startsWith("qr_")) {
             } else  if (!userInfo.getSysUser().getUserType().contains(clientId)) {
                 if (isRegister == false || StringUtils.equals("SYSTEM", clientId)) {
                     throw new LockedException("用户不存在");

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/service/CustomAuthenticationKeyGenerator.java

@@ -27,7 +27,7 @@ public class CustomAuthenticationKeyGenerator extends DefaultAuthenticationKeyGe
 			values.put(USERNAME, StringUtils.substringAfter(authentication.getName(), ":"));
 		}
 		String clientId = authorizationRequest.getClientId();
-		clientId = clientId.replace("QR_", "");
+//		clientId = clientId.replace("QR_", "");
 		values.put(CLIENT_ID, clientId);
 		if (authorizationRequest.getScope() != null) {
 			values.put(SCOPE, OAuth2Utils.formatParameterList(new TreeSet<String>(authorizationRequest.getScope())));

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

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.Map;
+import java.util.UUID;
 
 @Service
 public class CbsQrCodeScanServiceImpl{
@@ -41,7 +42,7 @@ public class CbsQrCodeScanServiceImpl{
             throw new BizException(HttpStatus.UNAUTHORIZED.value(), "用户不存在");
         }
         //调用登陆接口
-        HttpResponseResult<Map<String,Object>> result = sysUserFeignService.smsLogin(phone, "QR_TEACHER", "QR_TEACHER");
+        HttpResponseResult<Map<String,Object>> result = sysUserFeignService.smsLogin(phone, "qr_teacher", UUID.randomUUID().toString(), "qr_teacher");
         if (result != null){
             if(result.getCode() != 200){
                 throw new BizException("扫码登陆失败", result.getMsg());

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -448,7 +448,7 @@ public class UserController extends BaseController {
 		}
 
 		QRLoginDto dto = (QRLoginDto) data;
-		if (!sysUser.getUserType().contains((dto).getClientId().replace("QR_", "").toUpperCase(Locale.ROOT))) {
+		if (!sysUser.getUserType().contains((dto).getClientId().replace("qr_", "").toUpperCase(Locale.ROOT))) {
 			throw new BizException("登录失败");
 		}
 		redisCache.put(code,data,5*60);
@@ -479,7 +479,7 @@ public class UserController extends BaseController {
 		QRLoginDto dto = (QRLoginDto) data;
 
 
-		if (!sysUser.getUserType().contains((dto).getClientId().replace("QR_", "").toUpperCase(Locale.ROOT))) {
+		if (!sysUser.getUserType().contains((dto).getClientId().replace("qr_", "").toUpperCase(Locale.ROOT))) {
 			throw new BizException("登录失败");
 		}