From cc25110cd017c60633c5f57b2c843d0bf6805cfa Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Wed, 3 Jan 2024 18:03:52 +0800
Subject: [PATCH] feat: support Independence sso

---
 .../java/com/cloud/kicc/system/service/AppService.java |  4 +++-
 .../cloud/kicc/system/service/impl/AppServiceImpl.java | 10 +++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/AppService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/AppService.java
index c9f8f414..6f99327b 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/AppService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/AppService.java
@@ -3,6 +3,8 @@ package com.cloud.kicc.system.service;
 import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.data.entity.SsoUser;
 
+import java.util.Map;
+
 /**
  *<p>
  * 移动端 服务类
@@ -25,5 +27,5 @@ public interface AppService {
 	 * @param phone 手机号
 	 * @param captcha 验证码
 	 */
-	SsoUser phoneRegister(String phone, String captcha, String identityProvider);
+	Map<String, Object> phoneRegister(String phone, String captcha, String identityProvider);
 }
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/AppServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/AppServiceImpl.java
index 246acd05..78cf6f95 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/AppServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/AppServiceImpl.java
@@ -1,5 +1,6 @@
 package com.cloud.kicc.system.service.impl;
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.text.CharSequenceUtil;
@@ -28,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -73,7 +75,7 @@ public class AppServiceImpl implements AppService {
 	}
 
 	@Transactional(rollbackFor = Exception.class)
-	public SsoUser phoneRegister(String phone, String captcha, String identityProvider) {
+	public Map<String, Object> phoneRegister(String phone, String captcha, String identityProvider) {
 		// 设置不区分大小写,全部以小写验证
 		Validator.validateMobile(phone, "手机号码不合法");
 		String code = captcha.toLowerCase();
@@ -105,7 +107,7 @@ public class AppServiceImpl implements AppService {
 				.eq(SsoUser::getTenantId, initTenantId)
 				.eq(SsoUser::getIdentityProvider, identityProvider));
 		if (!findSsoUser.isEmpty()) {
-			return findSsoUser.get(0);
+			return Convert.convert(Map.class, findSsoUser.get(0));
 		}
 
 		// 修改扩展用户信息
@@ -151,7 +153,9 @@ public class AppServiceImpl implements AppService {
 
 		// 处理原密码给到APP自动一键登陆
 		ssoUser.setPassword(initPassword);
-		return ssoUser;
+		Map result = Convert.convert(Map.class, findSsoUser.get(0));
+		result.put("register", true);
+		return result;
 	}