update

TEAMModelBI/TEAMModelBI.csproj

@@ -65,9 +65,9 @@
 		<SpaRoot>ClientApp\</SpaRoot>
 		<DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
 		<UserSecretsId>078b5d89-7d90-4f6a-88fc-7d96025990a8</UserSecretsId>
-		<Version>5.2309.27</Version>
-		<AssemblyVersion>5.2309.27.1</AssemblyVersion>
-		<FileVersion>5.2309.27.1</FileVersion>
+		<Version>5.2310.11</Version>
+		<AssemblyVersion>5.2310.11.1</AssemblyVersion>
+		<FileVersion>5.2310.11.1</FileVersion>
 		<Description>TEAMModelBI(BI)</Description>
 		<PackageReleaseNotes>BI版本说明版本切换标记2022000908</PackageReleaseNotes>
 		<PackageId>TEAMModelBI</PackageId>

TEAMModelOS.FunctionV4/TEAMModelOS.FunctionV4.csproj

@@ -5,9 +5,9 @@
 		<OutputType>Exe</OutputType>
 		<_FunctionsSkipCleanOutput>true</_FunctionsSkipCleanOutput>
 		<SignAssembly>true</SignAssembly>
-		<Version>5.2309.27</Version>
-		<AssemblyVersion>5.2309.27.1</AssemblyVersion>
-		<FileVersion>5.2309.27.1</FileVersion>
+		<Version>5.2310.11</Version>
+		<AssemblyVersion>5.2310.11.1</AssemblyVersion>
+		<FileVersion>5.2310.11.1</FileVersion>
 		<PackageId>TEAMModelOS.FunctionV4</PackageId>
 		<Authors>teammodel</Authors>
 		<Company>醍摩豆（成都）信息技术有限公司</Company>

TEAMModelOS.SDK/TEAMModelOS.SDK.csproj

@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>5.2309.27</Version>
-    <AssemblyVersion>5.2309.27.1</AssemblyVersion>
-    <FileVersion>5.2309.27.1</FileVersion>
+    <Version>5.2310.11</Version>
+    <AssemblyVersion>5.2310.11.1</AssemblyVersion>
+    <FileVersion>5.2310.11.1</FileVersion>
     <PackageReleaseNotes>发版</PackageReleaseNotes>
   </PropertyGroup>
 

TEAMModelOS/Controllers/OpenApi/Business/BizSSOController.cs

@@ -239,6 +239,9 @@ namespace TEAMModelOS.Controllers
                 {
                     callback = $"https://www.teammodel.cn/login?code={code}&callback=https%3A%2F%2Fwww.teammodel.cn%2Flogin";
                 }
+                else {
+                    callback = $"https://account.teammodel.cn/?code={code}&callback={HttpUtility.UrlEncode(sso.callback, Encoding.UTF8)}";
+                }
                 //rurl.Append($"?status={status}&msg={HttpUtility.UrlEncode(msg, Encoding.UTF8)}&callback={HttpUtility.UrlEncode(callback)}&id_token={implicit_token?.id_token}&access_token={implicit_token?.access_token}&expires_in={HttpUtility.UrlEncode(implicit_token?.expires_in)}&token_type={HttpUtility.UrlEncode(implicit_token?.token_type)}").ToString();
 
                // rurl.Append($"?status={status}&msg={HttpUtility.UrlEncode(msg, Encoding.UTF8)}&callback={HttpUtility.UrlEncode(callback)}").ToString();
@@ -399,6 +402,10 @@ namespace TEAMModelOS.Controllers
                     {
                         callback = $"https://www.teammodel.cn/login?code={code}&callback=https%3A%2F%2Fwww.teammodel.cn%2Flogin";
                     }
+                    else
+                    {
+                        callback = $"https://account.teammodel.cn/?code={code}&callback={HttpUtility.UrlEncode(sso.callback, Encoding.UTF8)}";
+                    }
                     // rurl.Append($"?status={status}&msg={HttpUtility.UrlEncode("登录成功", Encoding.UTF8)}&callback={callback}&id_token={implicit_token?.id_token}&access_token={implicit_token?.access_token}&expires_in={HttpUtility.UrlEncode(implicit_token?.expires_in)}&token_type={HttpUtility.UrlEncode(implicit_token?.token_type)}").ToString();
                     // return Ok(new { url = rurl.ToString() });
                     return Ok(new { url = callback });

TEAMModelOS/TEAMModelOS.csproj

@@ -74,11 +74,11 @@
     <SpaRoot>ClientApp\</SpaRoot>
     <DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
     <UserSecretsId>078b5d89-7d90-4f6a-88fc-7d96025990a8</UserSecretsId>
-    <Version>5.2309.27</Version>
-    <AssemblyVersion>5.2309.27.1</AssemblyVersion>
-    <FileVersion>5.2309.27.1</FileVersion>
+    <Version>5.2310.11</Version>
+    <AssemblyVersion>5.2310.11.1</AssemblyVersion>
+    <FileVersion>5.2310.11.1</FileVersion>
     <Description>TEAMModelOS(IES5)</Description>
-    <PackageReleaseNotes>IES版本说明版本切换标记5.2309.27.1</PackageReleaseNotes>
+    <PackageReleaseNotes>IES版本说明版本切换标记5.2310.11.1</PackageReleaseNotes>
     <PackageId>TEAMModelOS</PackageId>
     <Authors>teammodel</Authors>
     <Company>醍摩豆（成都）信息技术有限公司</Company>

TEAMModelOS/appsettings.Development.json

@@ -18,7 +18,7 @@
     "IdTokenSalt": "8263692E2213497BB55E74792B7900B4",
     "HttpTrigger": "https://teammodelosfunction-test.chinacloudsites.cn/api/",
     //"HttpTrigger": "http://localhost:7071/api/"
-    "Version": "5.2309.27.1"
+    "Version": "5.2310.11.1"
   },
   "Azure": {
     // 测试站数据库

TEAMModelOS/appsettings.json

@@ -18,7 +18,7 @@
     "Exp": 86400,
     "IdTokenSalt": "8263692E2213497BB55E74792B7900B4",
     "HttpTrigger": "https://teammodelosfunction.chinacloudsites.cn/api/",
-    "Version": "5.2309.27.1"
+    "Version": "5.2310.11.1"
   },
   "Azure": {
     "Storage": {