Skip to content

Commit 8117ffd

Browse files
zhenlei520zhenlei520
authored
feat(Caller): Support Caller.HttpClient And Caller.Dapr (#168)
* feat(Caller): Add Caller * fix(Configuration.Dcc): Fix ConfigurationManager to get inappropriate CallerProvider * chore: Deprecated IOptionsFactory * feat(Caller.Dapr): Support custom HTTPRequestMessage * docs: Modify Caller Document * feat(Caller): Replaced with Contrib.Caller * fix: Fix unit test errors * chore: using global version * rename: Rename parameters and classes * feat: Delete IdGenerator * chore: TryOrUpdateCallerOptions rename to TryOrUpdate * test(Caller): Fix unit test errors * refactor(Caller): Delete IdGeneratorFunc
1 parent 457f7d6 commit 8117ffd

File tree

172 files changed

+3514
-780
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+3514
-780
lines changed

‎Directory.Build.props

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<MasaUtilsPackageVersion>0.5.0</MasaUtilsPackageVersion>
1010
<MapsterPackageVersion>7.3.0</MapsterPackageVersion>
1111
<DaprPackageVersion>1.5.0</DaprPackageVersion>
12+
<GoogleProtobufPackageVersion>3.19.1</GoogleProtobufPackageVersion>
1213
<MedallionDistributedLockPackageVersion>1.0.4</MedallionDistributedLockPackageVersion>
1314

1415
<OpenTelemetryVersion>1.3.0</OpenTelemetryVersion>

‎Masa.Contrib.sln

+83-8
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,24 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.BasicAbility.T
324324
EndProject
325325
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.BuildingBlocks.BasicAbility.Tsc", "src\BuildingBlocks\MASA.BuildingBlocks\src\BasicAbility\Masa.BuildingBlocks.BasicAbility.Tsc\Masa.BuildingBlocks.BasicAbility.Tsc.csproj", "{C265268A-F311-4B6A-915E-C1AF9D1EB624}"
326326
EndProject
327+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.BuildingBlocks.Service.Caller", "src\BuildingBlocks\MASA.BuildingBlocks\src\Service\Masa.BuildingBlocks.Service.Caller\Masa.BuildingBlocks.Service.Caller.csproj", "{ABF6E41A-CBF9-49DE-87FC-9D88F440A104}"
328+
EndProject
329+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Caller", "Caller", "{F9DDEB6F-25F8-4505-8300-2E247564BD8B}"
330+
EndProject
331+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Service.Caller.DaprClient", "src\Service\Caller\Masa.Contrib.Service.Caller.DaprClient\Masa.Contrib.Service.Caller.DaprClient.csproj", "{1CDA9001-A29F-4EBE-BBEA-0B2E663B9A19}"
332+
EndProject
333+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Service.Caller.HttpClient", "src\Service\Caller\Masa.Contrib.Service.Caller.HttpClient\Masa.Contrib.Service.Caller.HttpClient.csproj", "{00659C82-2E23-4E8F-BA34-EC41D78C87A1}"
334+
EndProject
335+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Service.Caller", "src\Service\Caller\Masa.Contrib.Service.Caller\Masa.Contrib.Service.Caller.csproj", "{28893415-0789-4FBB-A8B7-F0F9260CEDE3}"
336+
EndProject
337+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Service", "Service", "{4AA6B450-D4AA-4474-9ECF-52A44935D8D9}"
338+
EndProject
339+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Service.Caller.Tests", "test\Masa.Contrib.Service.Caller.Tests\Masa.Contrib.Service.Caller.Tests.csproj", "{D855894E-4C72-41DC-8F84-EF66CDE37453}"
340+
EndProject
341+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Service.Caller.AutomaticCaller.Tests", "test\Masa.Contrib.Service.Caller.AutomaticCaller.Tests\Masa.Contrib.Service.Caller.AutomaticCaller.Tests.csproj", "{1EE45374-EF8E-4E9D-A74F-51C14DA58ED8}"
342+
EndProject
343+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BasicAbility", "BasicAbility", "{7012AE14-D352-405F-8412-4B60A017AEC9}"
344+
EndProject
327345
Global
328346
GlobalSection(SolutionConfigurationPlatforms) = preSolution
329347
Debug|Any CPU = Debug|Any CPU
@@ -1356,6 +1374,54 @@ Global
13561374
{C265268A-F311-4B6A-915E-C1AF9D1EB624}.Release|Any CPU.Build.0 = Release|Any CPU
13571375
{C265268A-F311-4B6A-915E-C1AF9D1EB624}.Release|x64.ActiveCfg = Release|Any CPU
13581376
{C265268A-F311-4B6A-915E-C1AF9D1EB624}.Release|x64.Build.0 = Release|Any CPU
1377+
{ABF6E41A-CBF9-49DE-87FC-9D88F440A104}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1378+
{ABF6E41A-CBF9-49DE-87FC-9D88F440A104}.Debug|Any CPU.Build.0 = Debug|Any CPU
1379+
{ABF6E41A-CBF9-49DE-87FC-9D88F440A104}.Debug|x64.ActiveCfg = Debug|Any CPU
1380+
{ABF6E41A-CBF9-49DE-87FC-9D88F440A104}.Debug|x64.Build.0 = Debug|Any CPU
1381+
{ABF6E41A-CBF9-49DE-87FC-9D88F440A104}.Release|Any CPU.ActiveCfg = Release|Any CPU
1382+
{ABF6E41A-CBF9-49DE-87FC-9D88F440A104}.Release|Any CPU.Build.0 = Release|Any CPU
1383+
{ABF6E41A-CBF9-49DE-87FC-9D88F440A104}.Release|x64.ActiveCfg = Release|Any CPU
1384+
{ABF6E41A-CBF9-49DE-87FC-9D88F440A104}.Release|x64.Build.0 = Release|Any CPU
1385+
{1CDA9001-A29F-4EBE-BBEA-0B2E663B9A19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1386+
{1CDA9001-A29F-4EBE-BBEA-0B2E663B9A19}.Debug|Any CPU.Build.0 = Debug|Any CPU
1387+
{1CDA9001-A29F-4EBE-BBEA-0B2E663B9A19}.Debug|x64.ActiveCfg = Debug|Any CPU
1388+
{1CDA9001-A29F-4EBE-BBEA-0B2E663B9A19}.Debug|x64.Build.0 = Debug|Any CPU
1389+
{1CDA9001-A29F-4EBE-BBEA-0B2E663B9A19}.Release|Any CPU.ActiveCfg = Release|Any CPU
1390+
{1CDA9001-A29F-4EBE-BBEA-0B2E663B9A19}.Release|Any CPU.Build.0 = Release|Any CPU
1391+
{1CDA9001-A29F-4EBE-BBEA-0B2E663B9A19}.Release|x64.ActiveCfg = Release|Any CPU
1392+
{1CDA9001-A29F-4EBE-BBEA-0B2E663B9A19}.Release|x64.Build.0 = Release|Any CPU
1393+
{00659C82-2E23-4E8F-BA34-EC41D78C87A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1394+
{00659C82-2E23-4E8F-BA34-EC41D78C87A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
1395+
{00659C82-2E23-4E8F-BA34-EC41D78C87A1}.Debug|x64.ActiveCfg = Debug|Any CPU
1396+
{00659C82-2E23-4E8F-BA34-EC41D78C87A1}.Debug|x64.Build.0 = Debug|Any CPU
1397+
{00659C82-2E23-4E8F-BA34-EC41D78C87A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
1398+
{00659C82-2E23-4E8F-BA34-EC41D78C87A1}.Release|Any CPU.Build.0 = Release|Any CPU
1399+
{00659C82-2E23-4E8F-BA34-EC41D78C87A1}.Release|x64.ActiveCfg = Release|Any CPU
1400+
{00659C82-2E23-4E8F-BA34-EC41D78C87A1}.Release|x64.Build.0 = Release|Any CPU
1401+
{28893415-0789-4FBB-A8B7-F0F9260CEDE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1402+
{28893415-0789-4FBB-A8B7-F0F9260CEDE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
1403+
{28893415-0789-4FBB-A8B7-F0F9260CEDE3}.Debug|x64.ActiveCfg = Debug|Any CPU
1404+
{28893415-0789-4FBB-A8B7-F0F9260CEDE3}.Debug|x64.Build.0 = Debug|Any CPU
1405+
{28893415-0789-4FBB-A8B7-F0F9260CEDE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
1406+
{28893415-0789-4FBB-A8B7-F0F9260CEDE3}.Release|Any CPU.Build.0 = Release|Any CPU
1407+
{28893415-0789-4FBB-A8B7-F0F9260CEDE3}.Release|x64.ActiveCfg = Release|Any CPU
1408+
{28893415-0789-4FBB-A8B7-F0F9260CEDE3}.Release|x64.Build.0 = Release|Any CPU
1409+
{D855894E-4C72-41DC-8F84-EF66CDE37453}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1410+
{D855894E-4C72-41DC-8F84-EF66CDE37453}.Debug|Any CPU.Build.0 = Debug|Any CPU
1411+
{D855894E-4C72-41DC-8F84-EF66CDE37453}.Debug|x64.ActiveCfg = Debug|Any CPU
1412+
{D855894E-4C72-41DC-8F84-EF66CDE37453}.Debug|x64.Build.0 = Debug|Any CPU
1413+
{D855894E-4C72-41DC-8F84-EF66CDE37453}.Release|Any CPU.ActiveCfg = Release|Any CPU
1414+
{D855894E-4C72-41DC-8F84-EF66CDE37453}.Release|Any CPU.Build.0 = Release|Any CPU
1415+
{D855894E-4C72-41DC-8F84-EF66CDE37453}.Release|x64.ActiveCfg = Release|Any CPU
1416+
{D855894E-4C72-41DC-8F84-EF66CDE37453}.Release|x64.Build.0 = Release|Any CPU
1417+
{1EE45374-EF8E-4E9D-A74F-51C14DA58ED8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1418+
{1EE45374-EF8E-4E9D-A74F-51C14DA58ED8}.Debug|Any CPU.Build.0 = Debug|Any CPU
1419+
{1EE45374-EF8E-4E9D-A74F-51C14DA58ED8}.Debug|x64.ActiveCfg = Debug|Any CPU
1420+
{1EE45374-EF8E-4E9D-A74F-51C14DA58ED8}.Debug|x64.Build.0 = Debug|Any CPU
1421+
{1EE45374-EF8E-4E9D-A74F-51C14DA58ED8}.Release|Any CPU.ActiveCfg = Release|Any CPU
1422+
{1EE45374-EF8E-4E9D-A74F-51C14DA58ED8}.Release|Any CPU.Build.0 = Release|Any CPU
1423+
{1EE45374-EF8E-4E9D-A74F-51C14DA58ED8}.Release|x64.ActiveCfg = Release|Any CPU
1424+
{1EE45374-EF8E-4E9D-A74F-51C14DA58ED8}.Release|x64.Build.0 = Release|Any CPU
13591425
EndGlobalSection
13601426
GlobalSection(SolutionProperties) = preSolution
13611427
HideSolutionNode = FALSE
@@ -1400,7 +1466,7 @@ Global
14001466
{428CDAF3-957A-4017-82EA-70737F205546} = {38E6C400-90C0-493E-9266-C1602E229F1B}
14011467
{DB93B639-899D-4B2C-AF8A-47B4BC6B3776} = {9EEE31DA-3165-4CB3-AAE9-27CC3A4DE669}
14021468
{9EEE31DA-3165-4CB3-AAE9-27CC3A4DE669} = {38E6C400-90C0-493E-9266-C1602E229F1B}
1403-
{A5C1EF6B-A3B5-4D0C-8373-F854EE7EF4AD} = {38E6C400-90C0-493E-9266-C1602E229F1B}
1469+
{A5C1EF6B-A3B5-4D0C-8373-F854EE7EF4AD} = {4AA6B450-D4AA-4474-9ECF-52A44935D8D9}
14041470
{B29ABF5D-AFA8-4480-B74E-3ACB6FAAA826} = {13EDB361-AF88-4F89-B4AB-46622BCCBC37}
14051471
{5A163042-B03A-4063-85FF-22D4C5BB5B90} = {38E6C400-90C0-493E-9266-C1602E229F1B}
14061472
{84EFF9E1-6852-458F-8D57-62E3F084EA0F} = {9EEE31DA-3165-4CB3-AAE9-27CC3A4DE669}
@@ -1433,7 +1499,6 @@ Global
14331499
{118A91A6-6FBB-431A-B50D-076375AD6A63} = {5DFAF4A2-ECB5-46E4-904D-1EA5F48B2D48}
14341500
{74283F68-6B38-4CF4-B0CB-AAD65618ADB8} = {DC578D74-98F0-4F19-A230-CFA8DAEE0AF1}
14351501
{AB6FAB84-5218-48A8-8F94-03B02ECD098F} = {0D34A7F0-DC77-4789-A136-93089CBD15C3}
1436-
{C4DDEA6E-D6AF-4890-9713-C2862403E57C} = {38E6C400-90C0-493E-9266-C1602E229F1B}
14371502
{86898E0C-D1C5-4A57-B5DD-69A4BC1F4ABE} = {165391A5-034E-4894-8084-8DF7D4AA7518}
14381503
{97532A33-A591-4DF5-A2C0-72527B78ED82} = {38E6C400-90C0-493E-9266-C1602E229F1B}
14391504
{165391A5-034E-4894-8084-8DF7D4AA7518} = {42DF7AAC-362C-48F4-B76A-BDEEEFF17CC9}
@@ -1462,7 +1527,6 @@ Global
14621527
{CE1CABB0-B307-4709-84E0-583382FAAA29} = {5DFAF4A2-ECB5-46E4-904D-1EA5F48B2D48}
14631528
{E7987CBB-8DDD-4AC5-B522-653E2F457C85} = {6DB8780E-BA11-47CD-8FAB-D73A1F71B305}
14641529
{AD427256-9686-4289-A635-1B387BD56D15} = {E6363F59-2BA4-4AA7-8578-C433A2C2567F}
1465-
{2B644A8C-F0EE-4566-AB78-9E1C6D4185A3} = {38E6C400-90C0-493E-9266-C1602E229F1B}
14661530
{4995742C-033A-4147-89E7-7FFE7681C971} = {42DF7AAC-362C-48F4-B76A-BDEEEFF17CC9}
14671531
{B7F5651E-C4CB-413E-AF6E-420D1AFB7EA6} = {DC578D74-98F0-4F19-A230-CFA8DAEE0AF1}
14681532
{DC50078D-D706-4CB9-A301-F47CB3F46007} = {6DB8780E-BA11-47CD-8FAB-D73A1F71B305}
@@ -1494,29 +1558,40 @@ Global
14941558
{AA7876FF-3EF9-40EC-B5FF-66AB748DB93E} = {5F25960E-646D-4EA6-A648-3CAD284B6E38}
14951559
{DB2B4DA3-EEF2-49AA-93A4-B00C25210A68} = {38E6C400-90C0-493E-9266-C1602E229F1B}
14961560
{23582B50-BAEA-4A2D-82A4-345A3C30124E} = {59DA3D5F-9E39-4173-8C31-126967CC189F}
1497-
{1371F22B-FDD7-43B0-8E7D-E68DA31F07F3} = {38E6C400-90C0-493E-9266-C1602E229F1B}
1561+
{1371F22B-FDD7-43B0-8E7D-E68DA31F07F3} = {9EEE31DA-3165-4CB3-AAE9-27CC3A4DE669}
14981562
{FF3FD53D-D23E-48AC-98B6-3B028B4DE8AF} = {0D34A7F0-DC77-4789-A136-93089CBD15C3}
14991563
{83FA668F-C838-4883-996D-AF2ECF00FDF8} = {5DFAF4A2-ECB5-46E4-904D-1EA5F48B2D48}
1500-
{789ABED5-7C94-4F6F-ADCA-E97F3DFC9479} = {38E6C400-90C0-493E-9266-C1602E229F1B}
15011564
{981E883E-CCDC-400B-8FB1-76E1E65C32AF} = {0D34A7F0-DC77-4789-A136-93089CBD15C3}
15021565
{0D34A7F0-DC77-4789-A136-93089CBD15C3} = {DC578D74-98F0-4F19-A230-CFA8DAEE0AF1}
15031566
{0EB0CB69-4C44-4462-A92A-A9B9FDA171DE} = {0D34A7F0-DC77-4789-A136-93089CBD15C3}
1504-
{5980D054-E2F3-4143-93D1-01993A955AE7} = {38E6C400-90C0-493E-9266-C1602E229F1B}
15051567
{8D84666E-C79E-4D49-B73D-360E62D312EF} = {5DFAF4A2-ECB5-46E4-904D-1EA5F48B2D48}
15061568
{7C4B88FA-3681-4C29-BC3F-0FDB111C5681} = {FBD326D3-E59C-433E-A88E-14E179E3093D}
15071569
{592297DE-DA72-452D-9D88-61EE882FE9A6} = {38E6C400-90C0-493E-9266-C1602E229F1B}
15081570
{4E237346-F948-46AC-801B-492545978280} = {38E6C400-90C0-493E-9266-C1602E229F1B}
15091571
{75A25CF6-9BA4-46F5-8BC3-90396230CB64} = {5DFAF4A2-ECB5-46E4-904D-1EA5F48B2D48}
15101572
{DA816A33-F164-4456-92DD-A672BAD1A6B1} = {0D34A7F0-DC77-4789-A136-93089CBD15C3}
1511-
{23633E49-F11A-4D14-899A-E2599C8182CE} = {38E6C400-90C0-493E-9266-C1602E229F1B}
15121573
{FC4E526A-DBFC-406A-8ED3-64983B67F688} = {E33ADF54-4D35-49B7-BDA6-412587CA39FF}
15131574
{AE3607C0-3278-46D7-97CD-4E6F37C120D3} = {07BD7788-9DC0-4BD0-9861-0C9AC13B4EB8}
15141575
{A1232A01-3927-4EDE-B7D4-657E08DEB36D} = {07BD7788-9DC0-4BD0-9861-0C9AC13B4EB8}
15151576
{2870B6BB-4188-45A0-A2D3-085834EBDC2A} = {DB2B4DA3-EEF2-49AA-93A4-B00C25210A68}
15161577
{913DA066-8A23-4671-AC8F-B5B61134F8FE} = {DB2B4DA3-EEF2-49AA-93A4-B00C25210A68}
15171578
{4CD3D849-7277-4C9C-9461-7ABB66F78629} = {38E6C400-90C0-493E-9266-C1602E229F1B}
1518-
{FED315CF-7CA2-4653-AD37-BC0C1D7FFD22} = {38E6C400-90C0-493E-9266-C1602E229F1B}
15191579
{C265268A-F311-4B6A-915E-C1AF9D1EB624} = {0D34A7F0-DC77-4789-A136-93089CBD15C3}
1580+
{ABF6E41A-CBF9-49DE-87FC-9D88F440A104} = {DC578D74-98F0-4F19-A230-CFA8DAEE0AF1}
1581+
{F9DDEB6F-25F8-4505-8300-2E247564BD8B} = {593A3114-D1E0-47ED-BC37-58E08886175B}
1582+
{1CDA9001-A29F-4EBE-BBEA-0B2E663B9A19} = {F9DDEB6F-25F8-4505-8300-2E247564BD8B}
1583+
{00659C82-2E23-4E8F-BA34-EC41D78C87A1} = {F9DDEB6F-25F8-4505-8300-2E247564BD8B}
1584+
{28893415-0789-4FBB-A8B7-F0F9260CEDE3} = {F9DDEB6F-25F8-4505-8300-2E247564BD8B}
1585+
{4AA6B450-D4AA-4474-9ECF-52A44935D8D9} = {38E6C400-90C0-493E-9266-C1602E229F1B}
1586+
{D855894E-4C72-41DC-8F84-EF66CDE37453} = {4AA6B450-D4AA-4474-9ECF-52A44935D8D9}
1587+
{1EE45374-EF8E-4E9D-A74F-51C14DA58ED8} = {4AA6B450-D4AA-4474-9ECF-52A44935D8D9}
1588+
{7012AE14-D352-405F-8412-4B60A017AEC9} = {38E6C400-90C0-493E-9266-C1602E229F1B}
1589+
{2B644A8C-F0EE-4566-AB78-9E1C6D4185A3} = {7012AE14-D352-405F-8412-4B60A017AEC9}
1590+
{789ABED5-7C94-4F6F-ADCA-E97F3DFC9479} = {7012AE14-D352-405F-8412-4B60A017AEC9}
1591+
{23633E49-F11A-4D14-899A-E2599C8182CE} = {7012AE14-D352-405F-8412-4B60A017AEC9}
1592+
{C4DDEA6E-D6AF-4890-9713-C2862403E57C} = {7012AE14-D352-405F-8412-4B60A017AEC9}
1593+
{5980D054-E2F3-4143-93D1-01993A955AE7} = {7012AE14-D352-405F-8412-4B60A017AEC9}
1594+
{FED315CF-7CA2-4653-AD37-BC0C1D7FFD22} = {7012AE14-D352-405F-8412-4B60A017AEC9}
15201595
EndGlobalSection
15211596
GlobalSection(ExtensibilityGlobals) = postSolution
15221597
SolutionGuid = {40383055-CC50-4600-AD9A-53C14F620D03}

‎src/BasicAbility/Masa.Contrib.BasicAbility.Auth/AuthClient.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ namespace Masa.Contrib.BasicAbility.Auth;
55

66
public class AuthClient : IAuthClient
77
{
8-
public AuthClient(ICallerProvider callerProvider, IMultiEnvironmentUserContext userContext)
8+
public AuthClient(ICaller caller, IMultiEnvironmentUserContext userContext)
99
{
10-
UserService = new UserService(callerProvider, userContext);
11-
SubjectService = new SubjectService(callerProvider);
12-
TeamService = new TeamService(callerProvider, userContext);
13-
ProjectService = new ProjectService(callerProvider, userContext);
14-
PermissionService = new PermissionService(callerProvider, userContext);
10+
UserService = new UserService(caller, userContext);
11+
SubjectService = new SubjectService(caller);
12+
TeamService = new TeamService(caller, userContext);
13+
ProjectService = new ProjectService(caller, userContext);
14+
PermissionService = new PermissionService(caller, userContext);
1515
}
1616

1717
public IUserService UserService { get; }

‎src/BasicAbility/Masa.Contrib.BasicAbility.Auth/Masa.Contrib.BasicAbility.Auth.csproj

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Masa.Utils.Caller.HttpClient" Version="$(MasaUtilsPackageVersion)" />
1110
<PackageReference Include="Masa.Utils.Configuration.Json" Version="$(MasaUtilsPackageVersion)" />
12-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
11+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftPackageVersion)" />
1312
<PackageReference Include="Masa.Utils.Extensions.DependencyInjection" Version="$(MasaUtilsPackageVersion)" />
1413
</ItemGroup>
1514

1615
<ItemGroup>
1716
<ProjectReference Include="..\..\BuildingBlocks\MASA.BuildingBlocks\src\BasicAbility\Masa.BuildingBlocks.BasicAbility.Auth\Masa.BuildingBlocks.BasicAbility.Auth.csproj" />
1817
<ProjectReference Include="..\..\BuildingBlocks\MASA.BuildingBlocks\src\Identity\Masa.BuildingBlocks.Identity.IdentityModel\Masa.BuildingBlocks.Identity.IdentityModel.csproj" />
18+
<ProjectReference Include="..\..\Service\Caller\Masa.Contrib.Service.Caller.HttpClient\Masa.Contrib.Service.Caller.HttpClient.csproj" />
19+
<ProjectReference Include="..\..\Service\Caller\Masa.Contrib.Service.Caller\Masa.Contrib.Service.Caller.csproj" />
1920
</ItemGroup>
2021

2122
</Project>

‎src/BasicAbility/Masa.Contrib.BasicAbility.Auth/Service/PermissionService.cs

+9-9
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ namespace Masa.Contrib.BasicAbility.Auth.Service;
55

66
public class PermissionService : IPermissionService
77
{
8-
readonly ICallerProvider _callerProvider;
8+
readonly ICaller _caller;
99
readonly IUserContext _userContext;
1010

1111
const string PART = "api/permission/";
1212

13-
public PermissionService(ICallerProvider callerProvider, IUserContext userContext)
13+
public PermissionService(ICaller caller, IUserContext userContext)
1414
{
15-
_callerProvider = callerProvider;
15+
_caller = caller;
1616
_userContext = userContext;
1717
}
1818

@@ -21,29 +21,29 @@ public async Task<bool> AuthorizedAsync(string appId, string code)
2121
{
2222
var userId = _userContext.GetUserId<Guid>();
2323
var requestUri = $"{PART}authorized?appId={appId}&code={code}&userId={userId}";
24-
return await _callerProvider.GetAsync<bool>(requestUri);
24+
return await _caller.GetAsync<bool>(requestUri);
2525
}
2626

2727
public async Task<List<MenuModel>> GetMenusAsync(string appId)
2828
{
2929
var userId = _userContext.GetUserId<Guid>();
3030
var requestUri = $"{PART}menus?appId={appId}&userId={userId}";
31-
return await _callerProvider.GetAsync<List<MenuModel>>(requestUri, default) ?? new();
31+
return await _caller.GetAsync<List<MenuModel>>(requestUri, default) ?? new();
3232
}
3333

3434
public async Task<List<string>> GetElementPermissionsAsync(string appId)
3535
{
3636
var userId = _userContext.GetUserId<Guid>();
3737
var requestUri = $"{PART}element-permissions?appId={appId}&userId={userId}";
38-
return await _callerProvider.GetAsync<List<string>>(requestUri, default) ?? new();
38+
return await _caller.GetAsync<List<string>>(requestUri, default) ?? new();
3939
}
4040

4141
public async Task<bool> AddFavoriteMenuAsync(Guid menuId)
4242
{
4343
try
4444
{
4545
var userId = _userContext.GetUserId<Guid>();
46-
await _callerProvider.PutAsync($"{PART}addFavoriteMenu?permissionId={menuId}&userId={userId}", null);
46+
await _caller.PutAsync($"{PART}addFavoriteMenu?permissionId={menuId}&userId={userId}", null);
4747
return true;
4848
}
4949
catch
@@ -57,7 +57,7 @@ public async Task<bool> RemoveFavoriteMenuAsync(Guid menuId)
5757
try
5858
{
5959
var userId = _userContext.GetUserId<Guid>();
60-
await _callerProvider.PutAsync($"{PART}removeFavoriteMenu?permissionId={menuId}&userId={userId}", null);
60+
await _caller.PutAsync($"{PART}removeFavoriteMenu?permissionId={menuId}&userId={userId}", null);
6161
return true;
6262
}
6363
catch
@@ -70,6 +70,6 @@ public async Task<List<CollectMenuModel>> GetFavoriteMenuListAsync()
7070
{
7171
var userId = _userContext.GetUserId<Guid>();
7272
var requestUri = $"{PART}menu-favorite-list?userId={userId}";
73-
return await _callerProvider.GetAsync<List<CollectMenuModel>>(requestUri, default) ?? new();
73+
return await _caller.GetAsync<List<CollectMenuModel>>(requestUri, default) ?? new();
7474
}
7575
}

‎src/BasicAbility/Masa.Contrib.BasicAbility.Auth/Service/ProjectService.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ namespace Masa.Contrib.BasicAbility.Auth.Service;
55

66
public class ProjectService : IProjectService
77
{
8-
readonly ICallerProvider _callerProvider;
8+
readonly ICaller _caller;
99
readonly IMultiEnvironmentUserContext _multiEnvironmentUserContext;
1010

1111
const string PARTY = "api/project/";
1212

13-
public ProjectService(ICallerProvider callerProvider, IMultiEnvironmentUserContext multiEnvironmentUserContext)
13+
public ProjectService(ICaller caller, IMultiEnvironmentUserContext multiEnvironmentUserContext)
1414
{
15-
_callerProvider = callerProvider;
15+
_caller = caller;
1616
_multiEnvironmentUserContext = multiEnvironmentUserContext;
1717
}
1818

@@ -21,6 +21,6 @@ public async Task<List<ProjectModel>> GetGlobalNavigations()
2121
var userId = _multiEnvironmentUserContext.GetUserId<Guid>();
2222
var environment = _multiEnvironmentUserContext.Environment ?? "";
2323
var requestUri = $"{PARTY}navigations?userId={userId}&environment={environment}";
24-
return await _callerProvider.GetAsync<List<ProjectModel>>(requestUri) ?? new();
24+
return await _caller.GetAsync<List<ProjectModel>>(requestUri) ?? new();
2525
}
2626
}

‎src/BasicAbility/Masa.Contrib.BasicAbility.Auth/Service/SubjectService.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ namespace Masa.Contrib.BasicAbility.Auth.Service;
55

66
public class SubjectService : ISubjectService
77
{
8-
readonly ICallerProvider _callerProvider;
8+
readonly ICaller _caller;
99

10-
public SubjectService(ICallerProvider callerProvider)
10+
public SubjectService(ICaller caller)
1111
{
12-
_callerProvider = callerProvider;
12+
_caller = caller;
1313
}
1414

1515
public async Task<List<SubjectModel>> GetListAsync(string filter)
1616
{
1717
var requestUri = $"api/subject/getList";
18-
return await _callerProvider.GetAsync<object, List<SubjectModel>>(requestUri, new { filter }) ?? new();
18+
return await _caller.GetAsync<object, List<SubjectModel>>(requestUri, new { filter }) ?? new();
1919
}
2020
}
2121

0 commit comments

Comments
 (0)