Merge branch 'zx_saas_qrLogin' of http://git.dayaedu.com/yonge/mec into dev

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

@@ -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/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("登录失败");
 		}