Преглед на файлове

优化测试便捷方法
优化宿主项目文件,删除冗余代码
修复部分文件编码问题导致苹果电脑中文会乱码的问题

zhontai преди 2 години
родител
ревизия
74933201d1
променени са 89 файла, в които са добавени 419 реда и са изтрити 438 реда
  1. 2 2
      src/hosts/ZhonTai.Host/Configs/appconfig.Development.json
  2. 50 89
      src/hosts/ZhonTai.Host/ZhonTai.Host.csproj
  3. 1 1
      src/platform/ZhonTai.Admin/Domain/Api/ApiEntity.cs
  4. 1 1
      src/platform/ZhonTai.Admin/Domain/Api/IApiRepository.cs
  5. 1 1
      src/platform/ZhonTai.Admin/Domain/Dictionary/DictionaryEntity.cs
  6. 1 1
      src/platform/ZhonTai.Admin/Domain/DictionaryType/DictionaryTypeEntity.cs
  7. 1 1
      src/platform/ZhonTai.Admin/Domain/Document/DocumentEntity.cs
  8. 1 1
      src/platform/ZhonTai.Admin/Domain/DocumentImage/DocumentImageEntity.cs
  9. 1 1
      src/platform/ZhonTai.Admin/Domain/Employee/EmployeeEntity.cs
  10. 1 1
      src/platform/ZhonTai.Admin/Domain/Employee/IEmployeeRepository.cs
  11. 1 1
      src/platform/ZhonTai.Admin/Domain/EmployeeOrganization/EmployeeOrganizationEntity.cs
  12. 1 1
      src/platform/ZhonTai.Admin/Domain/LogAbstract/Dto/LogGetPageDto.cs
  13. 1 1
      src/platform/ZhonTai.Admin/Domain/LogAbstract/LogAbstract.cs
  14. 1 1
      src/platform/ZhonTai.Admin/Domain/LoginLog/ILoginLogRepository.cs
  15. 1 1
      src/platform/ZhonTai.Admin/Domain/LoginLog/LoginLogEntity.cs
  16. 1 1
      src/platform/ZhonTai.Admin/Domain/OprationLog/IOprationLogRepository.cs
  17. 1 1
      src/platform/ZhonTai.Admin/Domain/OprationLog/OprationLogEntity.cs
  18. 1 1
      src/platform/ZhonTai.Admin/Domain/Organization/OrganizationEntity.cs
  19. 1 1
      src/platform/ZhonTai.Admin/Domain/Permission/PermissionEntity.cs
  20. 1 1
      src/platform/ZhonTai.Admin/Domain/PermissionApi/PermissionApiEntity.cs
  21. 1 1
      src/platform/ZhonTai.Admin/Domain/Position/IPositionRepository.cs
  22. 1 1
      src/platform/ZhonTai.Admin/Domain/Position/PositionEntity.cs
  23. 1 1
      src/platform/ZhonTai.Admin/Domain/Role/IRoleRepository.cs
  24. 1 1
      src/platform/ZhonTai.Admin/Domain/Role/RoleEntity.cs
  25. 1 1
      src/platform/ZhonTai.Admin/Domain/RolePermission/RolePermissionEntity.cs
  26. 1 1
      src/platform/ZhonTai.Admin/Domain/Tenant/ITenantRepository.cs
  27. 1 1
      src/platform/ZhonTai.Admin/Domain/Tenant/TenantEntity.cs
  28. 1 1
      src/platform/ZhonTai.Admin/Domain/TenantPermission/TenantPermissionEntity.cs
  29. 1 1
      src/platform/ZhonTai.Admin/Domain/User/IUserRepository.cs
  30. 1 1
      src/platform/ZhonTai.Admin/Domain/User/UserEntity.cs
  31. 1 1
      src/platform/ZhonTai.Admin/Domain/UserRole/UserRoleEntity.cs
  32. 1 1
      src/platform/ZhonTai.Admin/Domain/View/IViewRepositoryRepository.cs
  33. 1 1
      src/platform/ZhonTai.Admin/Domain/View/ViewEntity.cs
  34. 1 1
      src/platform/ZhonTai.Admin/Repositories/Api/ApiRepository.cs
  35. 1 1
      src/platform/ZhonTai.Admin/Repositories/Employee/EmployeeRepository.cs
  36. 1 1
      src/platform/ZhonTai.Admin/Repositories/LoginLog/LoginLogRepository.cs
  37. 1 1
      src/platform/ZhonTai.Admin/Repositories/OprationLog/OprationLogRepository.cs
  38. 1 1
      src/platform/ZhonTai.Admin/Repositories/Position/PositionRepository.cs
  39. 1 1
      src/platform/ZhonTai.Admin/Repositories/Role/RoleRepository.cs
  40. 1 1
      src/platform/ZhonTai.Admin/Repositories/Tenant/TenantRepository.cs
  41. 1 1
      src/platform/ZhonTai.Admin/Repositories/User/UserRepository.cs
  42. 1 1
      src/platform/ZhonTai.Admin/Repositories/View/ViewRepositoryRepository.cs
  43. 24 24
      src/platform/ZhonTai.Admin/Services/Api/ApiService.cs
  44. 2 2
      src/platform/ZhonTai.Admin/Services/Api/IApiService.cs
  45. 1 1
      src/platform/ZhonTai.Admin/Services/Auth/AuthService.cs
  46. 12 12
      src/platform/ZhonTai.Admin/Services/Auth/Dto/AuthUserMenuDto.cs
  47. 2 2
      src/platform/ZhonTai.Admin/Services/Auth/IAuthService.cs
  48. 1 1
      src/platform/ZhonTai.Admin/Services/Cache/CacheService.cs
  49. 4 4
      src/platform/ZhonTai.Admin/Services/Cache/ICacheService.cs
  50. 21 21
      src/platform/ZhonTai.Admin/Services/Document/DocumentService.cs
  51. 6 6
      src/platform/ZhonTai.Admin/Services/Document/Dto/DocumentAddGroupInput.cs
  52. 3 3
      src/platform/ZhonTai.Admin/Services/Document/Dto/DocumentAddImageInput.cs
  53. 6 6
      src/platform/ZhonTai.Admin/Services/Document/Dto/DocumentAddMenuInput.cs
  54. 5 5
      src/platform/ZhonTai.Admin/Services/Document/Dto/DocumentGetContentOutput.cs
  55. 1 1
      src/platform/ZhonTai.Admin/Services/Document/Dto/DocumentGetGroupOutput.cs
  56. 1 1
      src/platform/ZhonTai.Admin/Services/Document/Dto/DocumentGetMenuOutput.cs
  57. 5 5
      src/platform/ZhonTai.Admin/Services/Document/Dto/DocumentUpdateContentInput.cs
  58. 3 3
      src/platform/ZhonTai.Admin/Services/Document/Dto/DocumentUpdateGroupInput.cs
  59. 3 3
      src/platform/ZhonTai.Admin/Services/Document/Dto/DocumentUpdateMenuInput.cs
  60. 3 3
      src/platform/ZhonTai.Admin/Services/Document/Dto/DocumentUploadImageInput.cs
  61. 1 1
      src/platform/ZhonTai.Admin/Services/Employee/EmployeeService.cs
  62. 2 2
      src/platform/ZhonTai.Admin/Services/Employee/IEmployeeService.cs
  63. 2 2
      src/platform/ZhonTai.Admin/Services/LoginLog/ILoginLogService.cs
  64. 4 4
      src/platform/ZhonTai.Admin/Services/LoginLog/LoginLogService.cs
  65. 2 2
      src/platform/ZhonTai.Admin/Services/OprationLog/IOprationLogService.cs
  66. 4 4
      src/platform/ZhonTai.Admin/Services/OprationLog/OprationLogService.cs
  67. 10 10
      src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionAddApiInput.cs
  68. 8 8
      src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionAddDotInput.cs
  69. 9 9
      src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionAddGroupInput.cs
  70. 13 13
      src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionAddMenuInput.cs
  71. 3 3
      src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionAssignInput.cs
  72. 1 1
      src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionGetApiOutput.cs
  73. 1 1
      src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionGetDotOutput.cs
  74. 1 1
      src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionGetGroupOutput.cs
  75. 1 1
      src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionGetMenuOutput.cs
  76. 3 3
      src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionSaveTenantPermissionsInput.cs
  77. 46 46
      src/platform/ZhonTai.Admin/Services/Permission/PermissionService.cs
  78. 1 1
      src/platform/ZhonTai.Admin/Services/Position/IPositionService.cs
  79. 10 10
      src/platform/ZhonTai.Admin/Services/Position/PositionService.cs
  80. 2 2
      src/platform/ZhonTai.Admin/Services/Role/IRoleService.cs
  81. 10 10
      src/platform/ZhonTai.Admin/Services/Role/RoleService.cs
  82. 2 2
      src/platform/ZhonTai.Admin/Services/Tenant/ITenantService.cs
  83. 26 26
      src/platform/ZhonTai.Admin/Services/Tenant/TenantService.cs
  84. 2 2
      src/platform/ZhonTai.Admin/Services/User/IUserService.cs
  85. 1 1
      src/platform/ZhonTai.Admin/Services/User/UserService.cs
  86. 2 3
      src/platform/ZhonTai.Admin/Services/View/IViewService.cs
  87. 17 17
      src/platform/ZhonTai.Admin/Services/View/ViewService.cs
  88. 38 14
      src/tests/ZhonTai.Tests/BaseControllerTest.cs
  89. 2 5
      src/tests/ZhonTai.Tests/ZhonTai.Tests.csproj

+ 2 - 2
src/hosts/ZhonTai.Host/Configs/appconfig.Development.json

@@ -1,8 +1,8 @@
 {
-  //輻郖華硊
+  //頝典��啣�
   "corUrls": [ "http://localhost:9000", "http://127.0.0.1:9000", "https://localhost:5000" ],
   "IdentityServer": {
-    //華硊
+    //�啣�
     "url": "https://localhost:5000"
   }
 }

+ 50 - 89
src/hosts/ZhonTai.Host/ZhonTai.Host.csproj

@@ -1,91 +1,52 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <!--<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>-->
-    <AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <Version>2.0.0</Version>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Authors>xiaoxue</Authors>
-    <Company>xiaoxue</Company>
-    <RepositoryType>git</RepositoryType>
-    <Description>中台宿主</Description>
-    <PackageProjectUrl>https://github.com/zhontai/ZhonTai.Host</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/zhontai/ZhonTai.Host</RepositoryUrl>
-    <PackageTags>ZhonTai Admin;WebApi</PackageTags>
-    <PackageId>ZhonTai.Host</PackageId>
-    <Product>ZhonTai.Host</Product>
-    <UserSecretsId>729fff27-b925-4753-a8c8-f3e9c0e50a40</UserSecretsId>
-    <AssemblyName>ZhonTai.Host</AssemblyName>
-    <RootNamespace>ZhonTai.Host</RootNamespace>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DocumentationFile></DocumentationFile>
-    <NoWarn>1701;1702;1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="AutoMapper\**" />
-    <Compile Remove="Hubs\**" />
-    <Content Remove="AutoMapper\**" />
-    <Content Remove="Hubs\**" />
-    <EmbeddedResource Remove="AutoMapper\**" />
-    <EmbeddedResource Remove="Hubs\**" />
-    <None Remove="AutoMapper\**" />
-    <None Remove="Hubs\**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Remove="ZhonTai.Host.Repository.dll" />
-    <None Remove="admin.db" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Properties\PublishProfiles\" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\platform\ZhonTai.Admin\ZhonTai.Admin.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Update="wwwroot\captcha\jigsaw\1.jpg">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Update="wwwroot\captcha\jigsaw\2.jpg">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Update="wwwroot\captcha\jigsaw\3.jpg">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Update="wwwroot\captcha\jigsaw\templates\1.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Update="wwwroot\captcha\jigsaw\templates\2.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Update="wwwroot\captcha\jigsaw\templates\3.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Update="wwwroot\captcha\jigsaw\templates\4.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Update="wwwroot\captcha\jigsaw\templates\5.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Update="wwwroot\captcha\jigsaw\templates\6.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Update="wwwroot\swagger\mini-profiler.js">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
-  <ProjectExtensions><VisualStudio><UserProperties properties_4launchsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
-
-  <ItemGroup>
-	<InternalsVisibleTo Include="ZhonTai.Tests" />
-  </ItemGroup>
+	<PropertyGroup>
+		<TargetFramework>net6.0</TargetFramework>
+		<Description>中台接口宿主</Description>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<DocumentationFile></DocumentationFile>
+		<NoWarn>1701;1702;1591</NoWarn>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\platform\ZhonTai.Admin\ZhonTai.Admin.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Content Update="wwwroot\captcha\jigsaw\1.jpg">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Update="wwwroot\captcha\jigsaw\2.jpg">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Update="wwwroot\captcha\jigsaw\3.jpg">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Update="wwwroot\captcha\jigsaw\templates\1.png">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Update="wwwroot\captcha\jigsaw\templates\2.png">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Update="wwwroot\captcha\jigsaw\templates\3.png">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Update="wwwroot\captcha\jigsaw\templates\4.png">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Update="wwwroot\captcha\jigsaw\templates\5.png">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Update="wwwroot\captcha\jigsaw\templates\6.png">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Update="wwwroot\swagger\mini-profiler.js">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
+
+	<ItemGroup>
+		<InternalsVisibleTo Include="ZhonTai.Tests" />
+	</ItemGroup>
 </Project>

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/Api/ApiEntity.cs

@@ -1,4 +1,4 @@
-using FreeSql.DataAnnotations;
+using FreeSql.DataAnnotations;
 using System;
 using System.Collections.Generic;
 using ZhonTai.Admin.Domain.PermissionApi;

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/Api/IApiRepository.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Repositories;
+using ZhonTai.Admin.Core.Repositories;
 
 namespace ZhonTai.Admin.Domain.Api
 {

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/Dictionary/DictionaryEntity.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Entities;
+using ZhonTai.Admin.Core.Entities;
 using FreeSql.DataAnnotations;
 using ZhonTai.Admin.Domain.DictionaryType;
 

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/DictionaryType/DictionaryTypeEntity.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Entities;
+using ZhonTai.Admin.Core.Entities;
 using FreeSql.DataAnnotations;
 
 namespace ZhonTai.Admin.Domain.DictionaryType

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/Document/DocumentEntity.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Entities;
+using ZhonTai.Admin.Core.Entities;
 using FreeSql.DataAnnotations;
 
 namespace ZhonTai.Admin.Domain.Document

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/DocumentImage/DocumentImageEntity.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Entities;
+using ZhonTai.Admin.Core.Entities;
 using FreeSql.DataAnnotations;
 using ZhonTai.Admin.Domain.Document;
 

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/Employee/EmployeeEntity.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Entities;
+using ZhonTai.Admin.Core.Entities;
 using FreeSql.DataAnnotations;
 using System;
 using System.Collections.Generic;

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/Employee/IEmployeeRepository.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Repositories;
+using ZhonTai.Admin.Core.Repositories;
 
 namespace ZhonTai.Admin.Domain.Employee
 {

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/EmployeeOrganization/EmployeeOrganizationEntity.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Entities;
+using ZhonTai.Admin.Core.Entities;
 using FreeSql.DataAnnotations;
 using ZhonTai.Admin.Domain.Employee;
 using ZhonTai.Admin.Domain.Organization;

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/LogAbstract/Dto/LogGetPageDto.cs

@@ -1,4 +1,4 @@
-namespace ZhonTai.Admin.Domain
+namespace ZhonTai.Admin.Domain
 {
     public class LogGetPageDto
     {

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/LogAbstract/LogAbstract.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Entities;
+using ZhonTai.Admin.Core.Entities;
 using FreeSql.DataAnnotations;
 
 namespace ZhonTai.Admin.Domain

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/LoginLog/ILoginLogRepository.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Repositories;
+using ZhonTai.Admin.Core.Repositories;
 
 namespace ZhonTai.Admin.Domain.LoginLog
 {

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/LoginLog/LoginLogEntity.cs

@@ -1,4 +1,4 @@
-using FreeSql.DataAnnotations;
+using FreeSql.DataAnnotations;
 
 namespace ZhonTai.Admin.Domain.LoginLog
 {

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/OprationLog/IOprationLogRepository.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Repositories;
+using ZhonTai.Admin.Core.Repositories;
 
 namespace ZhonTai.Admin.Domain.OprationLog
 {

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/OprationLog/OprationLogEntity.cs

@@ -1,4 +1,4 @@
-using FreeSql.DataAnnotations;
+using FreeSql.DataAnnotations;
 
 namespace ZhonTai.Admin.Domain.OprationLog
 {

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/Organization/OrganizationEntity.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Entities;
+using ZhonTai.Admin.Core.Entities;
 using FreeSql.DataAnnotations;
 using System.Collections.Generic;
 using ZhonTai.Admin.Domain.Employee;

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/Permission/PermissionEntity.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Entities;
+using ZhonTai.Admin.Core.Entities;
 using FreeSql.DataAnnotations;
 using System.Collections.Generic;
 using ZhonTai.Admin.Domain.Api;

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/PermissionApi/PermissionApiEntity.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Entities;
+using ZhonTai.Admin.Core.Entities;
 using FreeSql.DataAnnotations;
 using ZhonTai.Admin.Domain.Permission;
 using ZhonTai.Admin.Domain.Api;

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/Position/IPositionRepository.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Repositories;
+using ZhonTai.Admin.Core.Repositories;
 
 namespace ZhonTai.Admin.Domain.Position
 {

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/Position/PositionEntity.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Entities;
+using ZhonTai.Admin.Core.Entities;
 using FreeSql.DataAnnotations;
 using System;
 

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/Role/IRoleRepository.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Repositories;
+using ZhonTai.Admin.Core.Repositories;
 
 namespace ZhonTai.Admin.Domain.Role
 {

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/Role/RoleEntity.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Entities;
+using ZhonTai.Admin.Core.Entities;
 using FreeSql.DataAnnotations;
 using System;
 using System.Collections.Generic;

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/RolePermission/RolePermissionEntity.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Entities;
+using ZhonTai.Admin.Core.Entities;
 using FreeSql.DataAnnotations;
 using ZhonTai.Admin.Domain.Role;
 using ZhonTai.Admin.Domain.Permission;

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/Tenant/ITenantRepository.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Repositories;
+using ZhonTai.Admin.Core.Repositories;
 
 namespace ZhonTai.Admin.Domain.Tenant
 {

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/Tenant/TenantEntity.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Entities;
+using ZhonTai.Admin.Core.Entities;
 using FreeSql;
 using FreeSql.DataAnnotations;
 using System;

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/TenantPermission/TenantPermissionEntity.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Entities;
+using ZhonTai.Admin.Core.Entities;
 using FreeSql.DataAnnotations;
 using ZhonTai.Admin.Domain.Tenant;
 using ZhonTai.Admin.Domain.Permission;

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/User/IUserRepository.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Repositories;
+using ZhonTai.Admin.Core.Repositories;
 
 namespace ZhonTai.Admin.Domain.User
 {

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/User/UserEntity.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Entities;
+using ZhonTai.Admin.Core.Entities;
 using FreeSql.DataAnnotations;
 using System;
 using System.Collections.Generic;

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/UserRole/UserRoleEntity.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Entities;
+using ZhonTai.Admin.Core.Entities;
 using FreeSql.DataAnnotations;
 using ZhonTai.Admin.Domain.User;
 using ZhonTai.Admin.Domain.Role;

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/View/IViewRepositoryRepository.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Repositories;
+using ZhonTai.Admin.Core.Repositories;
 
 namespace ZhonTai.Admin.Domain.View
 {

+ 1 - 1
src/platform/ZhonTai.Admin/Domain/View/ViewEntity.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Entities;
+using ZhonTai.Admin.Core.Entities;
 using FreeSql.DataAnnotations;
 using System;
 using System.Collections.Generic;

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/Api/ApiRepository.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Db;
+using ZhonTai.Admin.Core.Db;
 using ZhonTai.Admin.Core.Repositories;
 using ZhonTai.Admin.Domain.Api;
 

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/Employee/EmployeeRepository.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Db;
+using ZhonTai.Admin.Core.Db;
 using ZhonTai.Admin.Core.Repositories;
 using ZhonTai.Admin.Domain.Employee;
 

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/LoginLog/LoginLogRepository.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Db;
+using ZhonTai.Admin.Core.Db;
 using ZhonTai.Admin.Core.Repositories;
 using ZhonTai.Admin.Domain.LoginLog;
 

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/OprationLog/OprationLogRepository.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Db;
+using ZhonTai.Admin.Core.Db;
 using ZhonTai.Admin.Core.Repositories;
 using ZhonTai.Admin.Domain.OprationLog;
 

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/Position/PositionRepository.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Db;
+using ZhonTai.Admin.Core.Db;
 using ZhonTai.Admin.Core.Repositories;
 using ZhonTai.Admin.Domain.Position;
 

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/Role/RoleRepository.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Db;
+using ZhonTai.Admin.Core.Db;
 using ZhonTai.Admin.Core.Repositories;
 using ZhonTai.Admin.Domain.Role;
 

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/Tenant/TenantRepository.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Db;
+using ZhonTai.Admin.Core.Db;
 using ZhonTai.Admin.Core.Repositories;
 using ZhonTai.Admin.Domain.Tenant;
 

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/User/UserRepository.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Db;
+using ZhonTai.Admin.Core.Db;
 using ZhonTai.Admin.Core.Repositories;
 using ZhonTai.Admin.Domain.User;
 

+ 1 - 1
src/platform/ZhonTai.Admin/Repositories/View/ViewRepositoryRepository.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Db;
+using ZhonTai.Admin.Core.Db;
 using ZhonTai.Admin.Core.Repositories;
 using ZhonTai.Admin.Domain.View;
 

+ 24 - 24
src/platform/ZhonTai.Admin/Services/Api/ApiService.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+锘縰sing System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
@@ -13,7 +13,7 @@ using ZhonTai.DynamicApi.Attributes;
 namespace ZhonTai.Admin.Services.Api
 {
     /// <summary>
-    /// 接口服务
+    /// 鎺ュ彛鏈嶅姟
     /// </summary>
     [DynamicApi(Area = "admin")]
     public class ApiService : BaseService, IApiService, IDynamicApi
@@ -26,7 +26,7 @@ namespace ZhonTai.Admin.Services.Api
         }
 
         /// <summary>
-        /// 查询接口
+        /// 鏌ヨ�鎺ュ彛
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -37,7 +37,7 @@ namespace ZhonTai.Admin.Services.Api
         }
 
         /// <summary>
-        /// 查询列表
+        /// 鏌ヨ�鍒楄〃
         /// </summary>
         /// <param name="key"></param>
         /// <returns></returns>
@@ -51,7 +51,7 @@ namespace ZhonTai.Admin.Services.Api
         }
 
         /// <summary>
-        /// 查询分页
+        /// 鏌ヨ�鍒嗛〉
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -78,7 +78,7 @@ namespace ZhonTai.Admin.Services.Api
         }
 
         /// <summary>
-        /// 添加
+        /// 娣诲姞
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -91,7 +91,7 @@ namespace ZhonTai.Admin.Services.Api
         }
 
         /// <summary>
-        /// 修改
+        /// 淇�敼
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -105,7 +105,7 @@ namespace ZhonTai.Admin.Services.Api
             var entity = await _apiRepository.GetAsync(input.Id);
             if (!(entity?.Id > 0))
             {
-                return ResultOutput.NotOk("接口不存在!");
+                return ResultOutput.NotOk("鎺ュ彛涓嶅瓨鍦�紒");
             }
 
             Mapper.Map(input, entity);
@@ -114,7 +114,7 @@ namespace ZhonTai.Admin.Services.Api
         }
 
         /// <summary>
-        /// 彻底删除
+        /// 褰诲簳鍒犻櫎
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -130,7 +130,7 @@ namespace ZhonTai.Admin.Services.Api
         }
 
         /// <summary>
-        /// 删除
+        /// 鍒犻櫎
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -142,7 +142,7 @@ namespace ZhonTai.Admin.Services.Api
         }
 
         /// <summary>
-        /// 批量删除
+        /// 鎵归噺鍒犻櫎
         /// </summary>
         /// <param name="ids"></param>
         /// <returns></returns>
@@ -154,27 +154,27 @@ namespace ZhonTai.Admin.Services.Api
         }
 
         /// <summary>
-        /// 同步
+        /// 鍚屾�
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
         [Transaction]
         public async Task<IResultOutput> SyncAsync(ApiSyncInput input)
         {
-            //查询所有api
+            //鏌ヨ�鎵€鏈塧pi
             var apis = await _apiRepository.Select.ToListAsync();
             var paths = apis.Select(a => a.Path).ToList();
 
-            //path处理
+            //path澶勭悊
             foreach (var api in input.Apis)
             {
                 api.Path = api.Path?.Trim().ToLower();
                 api.ParentPath = api.ParentPath?.Trim().ToLower();
             }
 
-            #region 执行插入
+            #region 鎵ц�鎻掑叆
 
-            //执行父级api插入
+            //鎵ц�鐖剁骇api鎻掑叆
             var parentApis = input.Apis.FindAll(a => a.ParentPath.IsNull());
             var pApis = (from a in parentApis where !paths.Contains(a.Path) select a).ToList();
             if (pApis.Count > 0)
@@ -184,7 +184,7 @@ namespace ZhonTai.Admin.Services.Api
                 apis.AddRange(insertPApis);
             }
 
-            //执行子级api插入
+            //鎵ц�瀛愮骇api鎻掑叆
             var childApis = input.Apis.FindAll(a => a.ParentPath.NotNull());
             var cApis = (from a in childApis where !paths.Contains(a.Path) select a).ToList();
             if (cApis.Count > 0)
@@ -194,12 +194,12 @@ namespace ZhonTai.Admin.Services.Api
                 apis.AddRange(insertCApis);
             }
 
-            #endregion 执行插入
+            #endregion 鎵ц�鎻掑叆
 
-            #region 修改和禁用
+            #region 淇�敼鍜岀�鐢�
 
             {
-                //api修改
+                //api淇�敼
                 ApiEntity a;
                 List<string> labels;
                 string label;
@@ -221,7 +221,7 @@ namespace ZhonTai.Admin.Services.Api
             }
 
             {
-                //api修改
+                //api淇�敼
                 ApiEntity a;
                 ApiEntity pa;
                 List<string> labels;
@@ -247,7 +247,7 @@ namespace ZhonTai.Admin.Services.Api
             }
 
             {
-                //api禁用
+                //api绂佺敤
                 var inputPaths = input.Apis.Select(a => a.Path).ToList();
                 var disabledApis = (from a in apis where !inputPaths.Contains(a.Path) select a).ToList();
                 if (disabledApis.Count > 0)
@@ -259,9 +259,9 @@ namespace ZhonTai.Admin.Services.Api
                 }
             }
 
-            #endregion 修改和禁用
+            #endregion 淇�敼鍜岀�鐢�
 
-            //批量更新
+            //鎵归噺鏇存柊
             await _apiRepository.UpdateDiy.SetSource(apis)
             .UpdateColumns(a => new { a.ParentId, a.Label, a.HttpMethods, a.Description, a.Enabled })
             .ExecuteAffrowsAsync();

+ 2 - 2
src/platform/ZhonTai.Admin/Services/Api/IApiService.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Dto;
+using ZhonTai.Admin.Core.Dto;
 using System.Threading.Tasks;
 using ZhonTai.Admin.Services.Api.Dto;
 using ZhonTai.Admin.Domain.Api.Dto;
@@ -6,7 +6,7 @@ using ZhonTai.Admin.Domain.Api.Dto;
 namespace ZhonTai.Admin.Services.Api
 {
     /// <summary>
-    /// api½Ó¿Ú
+    /// api接�
     /// </summary>
     public interface IApiService
     {

+ 1 - 1
src/platform/ZhonTai.Admin/Services/Auth/AuthService.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading.Tasks;
 using ZhonTai.Admin.Core.Configs;

+ 12 - 12
src/platform/ZhonTai.Admin/Services/Auth/Dto/AuthUserMenuDto.cs

@@ -1,59 +1,59 @@
-namespace ZhonTai.Admin.Services.Auth.Dto
+锘縩amespace ZhonTai.Admin.Services.Auth.Dto
 {
     public class AuthUserMenuDto
     {
         /// <summary>
-        /// 权限Id
+        /// 鏉冮檺Id
         /// </summary>
         public long Id { get; set; }
 
         /// <summary>
-        /// 父级节点
+        /// 鐖剁骇鑺傜偣
         /// </summary>
         public long ParentId { get; set; }
 
         /// <summary>
-        /// 访问地址
+        /// 璁块棶鍦板潃
         /// </summary>
         public string Path { get; set; }
 
         /// <summary>
-        /// 视图地址
+        /// 瑙嗗浘鍦板潃
         /// </summary>
         public string ViewPath { get; set; }
 
         /// <summary>
-        /// 权限名称
+        /// 鏉冮檺鍚嶇О
         /// </summary>
         public string Label { get; set; }
 
         /// <summary>
-        /// 图标
+        /// 鍥炬爣
         /// </summary>
         public string Icon { get; set; }
 
         /// <summary>
-        /// 打开
+        /// 鎵撳紑
         /// </summary>
         public bool? Opened { get; set; }
 
         /// <summary>
-        /// 可关闭
+        /// 鍙�叧闂�
         /// </summary>
         public bool? Closable { get; set; }
 
         /// <summary>
-        /// 隐藏
+        /// 闅愯棌
         /// </summary>
         public bool Hidden { get; set; }
 
         /// <summary>
-        /// 打开新窗口
+        /// 鎵撳紑鏂扮獥鍙�
         /// </summary>
         public bool? NewWindow { get; set; }
 
         /// <summary>
-        /// 链接外显
+        /// 閾炬帴澶栨樉
         /// </summary>
         public bool? External { get; set; }
     }

+ 2 - 2
src/platform/ZhonTai.Admin/Services/Auth/IAuthService.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Dto;
+嚜簑sing ZhonTai.Admin.Core.Dto;
 using System.Threading.Tasks;
 using ZhonTai.Admin.Services.Auth.Dto;
 using ZhonTai.Admin.Tools.Captcha;
@@ -6,7 +6,7 @@ using ZhonTai.Admin.Tools.Captcha;
 namespace ZhonTai.Admin.Services.Auth
 {
     /// <summary>
-    /// '痐忨�諉諳
+    /// 霈方�����亙藁
     /// </summary>
     public interface IAuthService
     {

+ 1 - 1
src/platform/ZhonTai.Admin/Services/Cache/CacheService.cs

@@ -1,4 +1,4 @@
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;

+ 4 - 4
src/platform/ZhonTai.Admin/Services/Cache/ICacheService.cs

@@ -1,21 +1,21 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using ZhonTai.Admin.Core.Dto;
 
 namespace ZhonTai.Admin.Services.Cache
 {
     /// <summary>
-    /// »º´æ½Ó¿Ú
+    /// 缓存接�
     /// </summary>
     public interface ICacheService
     {
         /// <summary>
-        /// »º´æÁбí
+        /// 缓存列表
         /// </summary>
         /// <returns></returns>
         IResultOutput GetList();
 
         /// <summary>
-        /// Çå³ý»º´æ
+        /// 清除缓存
         /// </summary>
         /// <param name="cacheKey"></param>
         /// <returns></returns>

+ 21 - 21
src/platform/ZhonTai.Admin/Services/Document/DocumentService.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Mvc;
+锘縰sing Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using System;
 using System.Linq;
@@ -15,7 +15,7 @@ using ZhonTai.Admin.Core.Helpers;
 namespace ZhonTai.Admin.Services.Document
 {
     /// <summary>
-    /// 文档服务
+    /// 鏂囨。鏈嶅姟
     /// </summary>
     [DynamicApi(Area = "admin")]
     public class DocumentService : BaseService, IDocumentService, IDynamicApi
@@ -33,7 +33,7 @@ namespace ZhonTai.Admin.Services.Document
         }
 
         /// <summary>
-        /// 查询文档
+        /// 鏌ヨ�鏂囨。
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -45,7 +45,7 @@ namespace ZhonTai.Admin.Services.Document
         }
 
         /// <summary>
-        /// 查询分组
+        /// 鏌ヨ�鍒嗙粍
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -56,7 +56,7 @@ namespace ZhonTai.Admin.Services.Document
         }
 
         /// <summary>
-        /// 查询菜单
+        /// 鏌ヨ�鑿滃崟
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -67,7 +67,7 @@ namespace ZhonTai.Admin.Services.Document
         }
 
         /// <summary>
-        /// 查询文档内容
+        /// 鏌ヨ�鏂囨。鍐呭�
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -78,7 +78,7 @@ namespace ZhonTai.Admin.Services.Document
         }
 
         /// <summary>
-        /// 查询文档列表
+        /// 鏌ヨ�鏂囨。鍒楄〃
         /// </summary>
         /// <param name="key"></param>
         /// <param name="start"></param>
@@ -102,7 +102,7 @@ namespace ZhonTai.Admin.Services.Document
         }
 
         /// <summary>
-        /// 查询图片列表
+        /// 鏌ヨ�鍥剧墖鍒楄〃
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -117,7 +117,7 @@ namespace ZhonTai.Admin.Services.Document
         }
 
         /// <summary>
-        /// 新增分组
+        /// 鏂板�鍒嗙粍
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -130,7 +130,7 @@ namespace ZhonTai.Admin.Services.Document
         }
 
         /// <summary>
-        /// 新增菜单
+        /// 鏂板�鑿滃崟
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -143,7 +143,7 @@ namespace ZhonTai.Admin.Services.Document
         }
 
         /// <summary>
-        /// 新增图片
+        /// 鏂板�鍥剧墖
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -156,7 +156,7 @@ namespace ZhonTai.Admin.Services.Document
         }
 
         /// <summary>
-        /// 修改分组
+        /// 淇�敼鍒嗙粍
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -174,7 +174,7 @@ namespace ZhonTai.Admin.Services.Document
         }
 
         /// <summary>
-        /// 修改菜单
+        /// 淇�敼鑿滃崟
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -192,7 +192,7 @@ namespace ZhonTai.Admin.Services.Document
         }
 
         /// <summary>
-        /// 修改文档内容
+        /// 淇�敼鏂囨。鍐呭�
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -210,7 +210,7 @@ namespace ZhonTai.Admin.Services.Document
         }
 
         /// <summary>
-        /// 彻底删除文档
+        /// 褰诲簳鍒犻櫎鏂囨。
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -226,7 +226,7 @@ namespace ZhonTai.Admin.Services.Document
         }
 
         /// <summary>
-        /// 彻底删除图片
+        /// 褰诲簳鍒犻櫎鍥剧墖
         /// </summary>
         /// <param name="documentId"></param>
         /// <param name="url"></param>
@@ -243,7 +243,7 @@ namespace ZhonTai.Admin.Services.Document
         }
 
         /// <summary>
-        /// 删除文档
+        /// 鍒犻櫎鏂囨。
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -254,7 +254,7 @@ namespace ZhonTai.Admin.Services.Document
         }
 
         /// <summary>
-        /// 查询精简文档列表
+        /// 鏌ヨ�绮剧畝鏂囨。鍒楄〃
         /// </summary>
         /// <returns></returns>
         public async Task<IResultOutput> GetPlainListAsync()
@@ -279,7 +279,7 @@ namespace ZhonTai.Admin.Services.Document
         }
 
         /// <summary>
-        /// 上传文档图片
+        /// 涓婁紶鏂囨。鍥剧墖
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -293,7 +293,7 @@ namespace ZhonTai.Admin.Services.Document
             var res = await uploadHelper.UploadAsync(input.File, config, new { input.Id });
             if (res.Success)
             {
-                //保存文档图片
+                //淇濆瓨鏂囨。鍥剧墖
                 var r = await AddImageAsync(
                 new DocumentAddImageInput
                 {
@@ -306,7 +306,7 @@ namespace ZhonTai.Admin.Services.Document
                 }
             }
 
-            return ResultOutput.NotOk("上传失败!");
+            return ResultOutput.NotOk("涓婁紶澶辫触锛�");
         }
     }
 }

+ 6 - 6
src/platform/ZhonTai.Admin/Services/Document/Dto/DocumentAddGroupInput.cs

@@ -1,31 +1,31 @@
-using ZhonTai.Admin.Domain.Document;
+锘縰sing ZhonTai.Admin.Domain.Document;
 
 namespace ZhonTai.Admin.Services.Document.Dto
 {
     public class DocumentAddGroupInput
     {
         /// <summary>
-        /// 父级节点
+        /// 鐖剁骇鑺傜偣
         /// </summary>
         public long ParentId { get; set; }
 
         /// <summary>
-        /// 类型
+        /// 绫诲瀷
         /// </summary>
         public DocumentTypeEnum Type { get; set; }
 
         /// <summary>
-        /// 名称
+        /// 鍚嶇О
         /// </summary>
         public string Label { get; set; }
 
         /// <summary>
-        /// 命名
+        /// 鍛藉悕
         /// </summary>
         public string Name { get; set; }
 
         /// <summary>
-        /// 打开
+        /// 鎵撳紑
         /// </summary>
         public bool? Opened { get; set; }
     }

+ 3 - 3
src/platform/ZhonTai.Admin/Services/Document/Dto/DocumentAddImageInput.cs

@@ -1,14 +1,14 @@
-namespace ZhonTai.Admin.Services.Document.Dto
+锘縩amespace ZhonTai.Admin.Services.Document.Dto
 {
     public class DocumentAddImageInput
     {
         /// <summary>
-        /// 用户Id
+        /// 鐢ㄦ埛Id
         /// </summary>
         public long DocumentId { get; set; }
 
         /// <summary>
-        /// 请求路径
+        /// 璇锋眰璺�緞
         /// </summary>
         public string Url { get; set; }
     }

+ 6 - 6
src/platform/ZhonTai.Admin/Services/Document/Dto/DocumentAddMenuInput.cs

@@ -1,31 +1,31 @@
-using ZhonTai.Admin.Domain.Document;
+锘縰sing ZhonTai.Admin.Domain.Document;
 
 namespace ZhonTai.Admin.Services.Document.Dto
 {
     public class DocumentAddMenuInput
     {
         /// <summary>
-        /// 父级节点
+        /// 鐖剁骇鑺傜偣
         /// </summary>
         public long ParentId { get; set; }
 
         /// <summary>
-        /// 类型
+        /// 绫诲瀷
         /// </summary>
         public DocumentTypeEnum Type { get; set; }
 
         /// <summary>
-        /// 命名
+        /// 鍛藉悕
         /// </summary>
         public string Name { get; set; }
 
         /// <summary>
-        /// 名称
+        /// 鍚嶇О
         /// </summary>
         public string Label { get; set; }
 
         /// <summary>
-        /// 说明
+        /// 璇存槑
         /// </summary>
         public string Description { get; set; }
     }

+ 5 - 5
src/platform/ZhonTai.Admin/Services/Document/Dto/DocumentGetContentOutput.cs

@@ -1,24 +1,24 @@
-namespace ZhonTai.Admin.Services.Document.Dto
+锘縩amespace ZhonTai.Admin.Services.Document.Dto
 {
     public class DocumentGetContentOutput
     {
         /// <summary>
-        /// 编号
+        /// 缂栧彿
         /// </summary>
         public long Id { get; set; }
 
         /// <summary>
-        /// 名称
+        /// 鍚嶇О
         /// </summary>
         public string Label { get; set; }
 
         /// <summary>
-        /// 内容
+        /// 鍐呭�
         /// </summary>
         public string Content { get; set; }
 
         /// <summary>
-        /// 版本
+        /// 鐗堟湰
         /// </summary>
         public long Version { get; set; }
     }

+ 1 - 1
src/platform/ZhonTai.Admin/Services/Document/Dto/DocumentGetGroupOutput.cs

@@ -1,4 +1,4 @@
-namespace ZhonTai.Admin.Services.Document.Dto
+namespace ZhonTai.Admin.Services.Document.Dto
 {
     public class DocumentGetGroupOutput : DocumentUpdateGroupInput
     {

+ 1 - 1
src/platform/ZhonTai.Admin/Services/Document/Dto/DocumentGetMenuOutput.cs

@@ -1,4 +1,4 @@
-namespace ZhonTai.Admin.Services.Document.Dto
+namespace ZhonTai.Admin.Services.Document.Dto
 {
     public class DocumentGetMenuOutput : DocumentUpdateMenuInput
     {

+ 5 - 5
src/platform/ZhonTai.Admin/Services/Document/Dto/DocumentUpdateContentInput.cs

@@ -1,19 +1,19 @@
-namespace ZhonTai.Admin.Services.Document.Dto
+锘縩amespace ZhonTai.Admin.Services.Document.Dto
 {
     public class DocumentUpdateContentInput
     {
         /// <summary>
-        /// 编号
+        /// 缂栧彿
         /// </summary>
         public long Id { get; set; }
 
         /// <summary>
-        /// 名称
+        /// 鍚嶇О
         /// </summary>
         public string Label { get; set; }
 
         /// <summary>
-        /// 内容
+        /// 鍐呭�
         /// </summary>
         public string Content { get; set; }
 
@@ -23,7 +23,7 @@ namespace ZhonTai.Admin.Services.Document.Dto
         public string Html { get; set; }
 
         /// <summary>
-        /// 版本
+        /// 鐗堟湰
         /// </summary>
         public long Version { get; set; }
     }

+ 3 - 3
src/platform/ZhonTai.Admin/Services/Document/Dto/DocumentUpdateGroupInput.cs

@@ -1,14 +1,14 @@
-namespace ZhonTai.Admin.Services.Document.Dto
+锘縩amespace ZhonTai.Admin.Services.Document.Dto
 {
     public class DocumentUpdateGroupInput : DocumentAddGroupInput
     {
         /// <summary>
-        /// 编号
+        /// 缂栧彿
         /// </summary>
         public long Id { get; set; }
 
         /// <summary>
-        /// 版本
+        /// 鐗堟湰
         /// </summary>
         public long Version { get; set; }
     }

+ 3 - 3
src/platform/ZhonTai.Admin/Services/Document/Dto/DocumentUpdateMenuInput.cs

@@ -1,14 +1,14 @@
-namespace ZhonTai.Admin.Services.Document.Dto
+锘縩amespace ZhonTai.Admin.Services.Document.Dto
 {
     public class DocumentUpdateMenuInput : DocumentAddMenuInput
     {
         /// <summary>
-        /// 编号
+        /// 缂栧彿
         /// </summary>
         public long Id { get; set; }
 
         /// <summary>
-        /// 版本
+        /// 鐗堟湰
         /// </summary>
         public long Version { get; set; }
     }

+ 3 - 3
src/platform/ZhonTai.Admin/Services/Document/Dto/DocumentUploadImageInput.cs

@@ -1,16 +1,16 @@
-using Microsoft.AspNetCore.Http;
+锘縰sing Microsoft.AspNetCore.Http;
 
 namespace ZhonTai.Admin.Services.Document.Dto
 {
     public class DocumentUploadImageInput
     {
         /// <summary>
-        /// 上传文件
+        /// 涓婁紶鏂囦欢
         /// </summary>
         public IFormFile File { get; set; }
 
         /// <summary>
-        /// 文档编号
+        /// 鏂囨。缂栧彿
         /// </summary>
         public long Id { get; set; }
     }

+ 1 - 1
src/platform/ZhonTai.Admin/Services/Employee/EmployeeService.cs

@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using ZhonTai.Admin.Core.Attributes;
 using ZhonTai.Admin.Core.Dto;

+ 2 - 2
src/platform/ZhonTai.Admin/Services/Employee/IEmployeeService.cs

@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using ZhonTai.Admin.Core.Dto;
 using ZhonTai.Admin.Services.Employee.Input;
 using ZhonTai.Admin.Services.Employee.Output;
@@ -7,7 +7,7 @@ using ZhonTai.Admin.Domain.Employee;
 namespace ZhonTai.Admin.Services.Employee
 {
     /// <summary>
-    /// Ô±¹¤·þÎñ
+    /// 员工�务
     /// </summary>
     public interface IEmployeeService
     {

+ 2 - 2
src/platform/ZhonTai.Admin/Services/LoginLog/ILoginLogService.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Dto;
+锘縰sing ZhonTai.Admin.Core.Dto;
 using System.Threading.Tasks;
 using ZhonTai.Admin.Services.LoginLog.Dto;
 using ZhonTai.Admin.Domain;
@@ -6,7 +6,7 @@ using ZhonTai.Admin.Domain;
 namespace ZhonTai.Admin.Services.LoginLog
 {
     /// <summary>
-    /// 登录日志接口
+    /// 鐧诲綍鏃ュ織鎺ュ彛
     /// </summary>
     public interface ILoginLogService
     {

+ 4 - 4
src/platform/ZhonTai.Admin/Services/LoginLog/LoginLogService.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Http;
+锘縰sing Microsoft.AspNetCore.Http;
 using System.Threading.Tasks;
 using ZhonTai.Common.Helpers;
 using ZhonTai.Admin.Core.Dto;
@@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Mvc;
 namespace ZhonTai.Admin.Services.LoginLog
 {
     /// <summary>
-    /// 登录日志服务
+    /// 鐧诲綍鏃ュ織鏈嶅姟
     /// </summary>
     [DynamicApi(Area = "admin")]
     public class LoginLogService : BaseService, ILoginLogService, IDynamicApi
@@ -30,7 +30,7 @@ namespace ZhonTai.Admin.Services.LoginLog
         }
 
         /// <summary>
-        /// 查询登录日志列表
+        /// 鏌ヨ�鐧诲綍鏃ュ織鍒楄〃
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -57,7 +57,7 @@ namespace ZhonTai.Admin.Services.LoginLog
         }
 
         /// <summary>
-        /// 新增
+        /// 鏂板�
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>

+ 2 - 2
src/platform/ZhonTai.Admin/Services/OprationLog/IOprationLogService.cs

@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+锘縰sing System.Threading.Tasks;
 using ZhonTai.Admin.Core.Dto;
 using ZhonTai.Admin.Services.OprationLog.Dto;
 using ZhonTai.Admin.Domain;
@@ -6,7 +6,7 @@ using ZhonTai.Admin.Domain;
 namespace ZhonTai.Admin.Services.OprationLog
 {
     /// <summary>
-    /// 操作日志接口
+    /// 鎿嶄綔鏃ュ織鎺ュ彛
     /// </summary>
     public interface IOprationLogService
     {

+ 4 - 4
src/platform/ZhonTai.Admin/Services/OprationLog/OprationLogService.cs

@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+锘縰sing System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using ZhonTai.Common.Helpers;
 using ZhonTai.Admin.Core.Dto;
@@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Mvc;
 namespace ZhonTai.Admin.Services.OprationLog
 {
     /// <summary>
-    /// 操作日志服务
+    /// 鎿嶄綔鏃ュ織鏈嶅姟
     /// </summary>
     [DynamicApi(Area = "admin")]
     public class OprationLogService : BaseService, IOprationLogService, IDynamicApi
@@ -30,7 +30,7 @@ namespace ZhonTai.Admin.Services.OprationLog
         }
 
         /// <summary>
-        /// 查询操作日志列表
+        /// 鏌ヨ�鎿嶄綔鏃ュ織鍒楄〃
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -57,7 +57,7 @@ namespace ZhonTai.Admin.Services.OprationLog
         }
 
         /// <summary>
-        /// 新增
+        /// 鏂板�
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>

+ 10 - 10
src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionAddApiInput.cs

@@ -1,51 +1,51 @@
-using ZhonTai.Admin.Domain.Permission;
+锘縰sing ZhonTai.Admin.Domain.Permission;
 
 namespace ZhonTai.Admin.Services.Permission.Dto
 {
     public class PermissionAddApiInput
     {
         /// <summary>
-        /// 权限类型
+        /// 鏉冮檺绫诲瀷
         /// </summary>
         public PermissionTypeEnum Type { get; set; }
 
         /// <summary>
-        /// 父级节点
+        /// 鐖剁骇鑺傜偣
         /// </summary>
         public long ParentId { get; set; }
 
         /// <summary>
-        /// 接口
+        /// 鎺ュ彛
         /// </summary>
         public long? ApiId { get; set; }
 
         /// <summary>
-        /// 权限名称
+        /// 鏉冮檺鍚嶇О
         /// </summary>
         public string Label { get; set; }
 
         /// <summary>
-        /// 权限编码
+        /// 鏉冮檺缂栫爜
         /// </summary>
         public string Code { get; set; }
 
         /// <summary>
-        /// 说明
+        /// 璇存槑
         /// </summary>
         public string Description { get; set; }
 
         /// <summary>
-        /// 隐藏
+        /// 闅愯棌
         /// </summary>
 		public bool Hidden { get; set; }
 
         ///// <summary>
-        ///// 启用
+        ///// 鍚�敤
         ///// </summary>
         //public bool Enabled { get; set; }
 
         /// <summary>
-        /// 图标
+        /// 鍥炬爣
         /// </summary>
         public string Icon { get; set; }
     }

+ 8 - 8
src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionAddDotInput.cs

@@ -1,41 +1,41 @@
-using ZhonTai.Admin.Domain.Permission;
+锘縰sing ZhonTai.Admin.Domain.Permission;
 
 namespace ZhonTai.Admin.Services.Permission.Dto
 {
     public class PermissionAddDotInput
     {
         /// <summary>
-        /// 权限类型
+        /// 鏉冮檺绫诲瀷
         /// </summary>
         public PermissionTypeEnum Type { get; set; } = PermissionTypeEnum.Dot;
 
         /// <summary>
-        /// 父级节点
+        /// 鐖剁骇鑺傜偣
         /// </summary>
         public long ParentId { get; set; }
 
         /// <summary>
-        /// 关联接口
+        /// 鍏宠仈鎺ュ彛
         /// </summary>
         public long[] ApiIds { get; set; }
 
         /// <summary>
-        /// 权限名称
+        /// 鏉冮檺鍚嶇О
         /// </summary>
         public string Label { get; set; }
 
         /// <summary>
-        /// 权限编码
+        /// 鏉冮檺缂栫爜
         /// </summary>
         public string Code { get; set; }
 
         /// <summary>
-        /// 说明
+        /// 璇存槑
         /// </summary>
         public string Description { get; set; }
 
         /// <summary>
-        /// 图标
+        /// 鍥炬爣
         /// </summary>
         public string Icon { get; set; }
     }

+ 9 - 9
src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionAddGroupInput.cs

@@ -1,46 +1,46 @@
-using ZhonTai.Admin.Domain.Permission;
+锘縰sing ZhonTai.Admin.Domain.Permission;
 
 namespace ZhonTai.Admin.Services.Permission.Dto
 {
     public class PermissionAddGroupInput
     {
         /// <summary>
-        /// 权限类型
+        /// 鏉冮檺绫诲瀷
         /// </summary>
         public PermissionTypeEnum Type { get; set; }
 
         /// <summary>
-        /// 父级节点
+        /// 鐖剁骇鑺傜偣
         /// </summary>
         public long ParentId { get; set; }
 
         /// <summary>
-        /// 权限名称
+        /// 鏉冮檺鍚嶇О
         /// </summary>
         public string Label { get; set; }
 
         ///// <summary>
-        ///// 说明
+        ///// 璇存槑
         ///// </summary>
         //public string Description { get; set; }
 
         /// <summary>
-        /// 隐藏
+        /// 闅愯棌
         /// </summary>
 		public bool Hidden { get; set; }
 
         ///// <summary>
-        ///// 启用
+        ///// 鍚�敤
         ///// </summary>
         //public bool Enabled { get; set; }
 
         /// <summary>
-        /// 图标
+        /// 鍥炬爣
         /// </summary>
         public string Icon { get; set; }
 
         /// <summary>
-        /// 打开
+        /// 鎵撳紑
         /// </summary>
         public bool? Opened { get; set; }
     }

+ 13 - 13
src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionAddMenuInput.cs

@@ -1,66 +1,66 @@
-using ZhonTai.Admin.Domain.Permission;
+锘縰sing ZhonTai.Admin.Domain.Permission;
 
 namespace ZhonTai.Admin.Services.Permission.Dto
 {
     public class PermissionAddMenuInput
     {
         /// <summary>
-        /// 权限类型
+        /// 鏉冮檺绫诲瀷
         /// </summary>
         public PermissionTypeEnum Type { get; set; }
 
         /// <summary>
-        /// 父级节点
+        /// 鐖剁骇鑺傜偣
         /// </summary>
         public long ParentId { get; set; }
 
         /// <summary>
-        /// 视图
+        /// 瑙嗗浘
         /// </summary>
         public long? ViewId { get; set; }
 
         /// <summary>
-        /// 访问地址
+        /// 璁块棶鍦板潃
         /// </summary>
         public string Path { get; set; }
 
         /// <summary>
-        /// 权限名称
+        /// 鏉冮檺鍚嶇О
         /// </summary>
         public string Label { get; set; }
 
         /// <summary>
-        /// 说明
+        /// 璇存槑
         /// </summary>
         public string Description { get; set; }
 
         /// <summary>
-        /// 隐藏
+        /// 闅愯棌
         /// </summary>
 		public bool Hidden { get; set; }
 
         ///// <summary>
-        ///// 启用
+        ///// 鍚�敤
         ///// </summary>
         //public bool Enabled { get; set; }
 
         /// <summary>
-        /// 图标
+        /// 鍥炬爣
         /// </summary>
         public string Icon { get; set; }
 
         /// <summary>
-        /// 可关闭
+        /// 鍙�叧闂�
         /// </summary>
         public bool? Closable { get; set; }
 
         /// <summary>
-        /// 打开新窗口
+        /// 鎵撳紑鏂扮獥鍙�
         /// </summary>
         public bool? NewWindow { get; set; }
 
         /// <summary>
-        /// 链接外显
+        /// 閾炬帴澶栨樉
         /// </summary>
         public bool? External { get; set; }
     }

+ 3 - 3
src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionAssignInput.cs

@@ -1,14 +1,14 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
 namespace ZhonTai.Admin.Services.Permission.Dto
 {
     public class PermissionAssignInput
     {
-        [Required(ErrorMessage = "½ÇÉ«²»ÄÜΪ¿Õ£¡")]
+        [Required(ErrorMessage = "角色�能为空�")]
         public long RoleId { get; set; }
 
-        [Required(ErrorMessage = "ȨÏÞ²»ÄÜΪ¿Õ£¡")]
+        [Required(ErrorMessage = "���能为空�")]
         public List<long> PermissionIds { get; set; }
     }
 }

+ 1 - 1
src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionGetApiOutput.cs

@@ -1,4 +1,4 @@
-namespace ZhonTai.Admin.Services.Permission.Dto
+namespace ZhonTai.Admin.Services.Permission.Dto
 {
     public class PermissionGetApiOutput : PermissionUpdateApiInput
     {

+ 1 - 1
src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionGetDotOutput.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Services.Permission.Dto;
+using ZhonTai.Admin.Services.Permission.Dto;
 
 namespace ZhonTai.Admin.Services.Permission.Dto
 {

+ 1 - 1
src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionGetGroupOutput.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Services.Permission.Dto;
+using ZhonTai.Admin.Services.Permission.Dto;
 
 namespace ZhonTai.Admin.Services.Permission.Dto
 {

+ 1 - 1
src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionGetMenuOutput.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Services.Permission.Dto;
+using ZhonTai.Admin.Services.Permission.Dto;
 
 namespace ZhonTai.Admin.Services.Permission.Dto
 {

+ 3 - 3
src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionSaveTenantPermissionsInput.cs

@@ -1,14 +1,14 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
 namespace ZhonTai.Admin.Services.Permission.Dto
 {
     public class PermissionSaveTenantPermissionsInput
     {
-        [Required(ErrorMessage = "×⻧²»ÄÜΪ¿Õ£¡")]
+        [Required(ErrorMessage = "租户�能为空�")]
         public long TenantId { get; set; }
 
-        [Required(ErrorMessage = "ȨÏÞ²»ÄÜΪ¿Õ£¡")]
+        [Required(ErrorMessage = "���能为空�")]
         public List<long> PermissionIds { get; set; }
     }
 }

+ 46 - 46
src/platform/ZhonTai.Admin/Services/Permission/PermissionService.cs

@@ -1,4 +1,4 @@
-using System;
+锘縰sing System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -25,7 +25,7 @@ using ZhonTai.Admin.Core.Db;
 namespace ZhonTai.Admin.Services.Permission
 {
     /// <summary>
-    /// 权限服务
+    /// 鏉冮檺鏈嶅姟
     /// </summary>
     [DynamicApi(Area = "admin")]
     public class PermissionService : BaseService, IPermissionService, IDynamicApi
@@ -58,7 +58,7 @@ namespace ZhonTai.Admin.Services.Permission
         }
 
         /// <summary>
-        /// 清除权限下关联的用户权限缓存
+        /// 娓呴櫎鏉冮檺涓嬪叧鑱旂殑鐢ㄦ埛鏉冮檺缂撳瓨
         /// </summary>
         /// <param name="permissionIds"></param>
         /// <returns></returns>
@@ -76,7 +76,7 @@ namespace ZhonTai.Admin.Services.Permission
         }
 
         /// <summary>
-        /// 查询权限
+        /// 鏌ヨ�鏉冮檺
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -88,7 +88,7 @@ namespace ZhonTai.Admin.Services.Permission
         }
 
         /// <summary>
-        /// 查询分组
+        /// 鏌ヨ�鍒嗙粍
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -99,7 +99,7 @@ namespace ZhonTai.Admin.Services.Permission
         }
 
         /// <summary>
-        /// 查询菜单
+        /// 鏌ヨ�鑿滃崟
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -110,7 +110,7 @@ namespace ZhonTai.Admin.Services.Permission
         }
 
         /// <summary>
-        /// 查询接口
+        /// 鏌ヨ�鎺ュ彛
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -121,7 +121,7 @@ namespace ZhonTai.Admin.Services.Permission
         }
 
         /// <summary>
-        /// 查询权限点
+        /// 鏌ヨ�鏉冮檺鐐�
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -136,7 +136,7 @@ namespace ZhonTai.Admin.Services.Permission
         }
 
         /// <summary>
-        /// 查询权限列表
+        /// 鏌ヨ�鏉冮檺鍒楄〃
         /// </summary>
         /// <param name="key"></param>
         /// <param name="start"></param>
@@ -160,7 +160,7 @@ namespace ZhonTai.Admin.Services.Permission
         }
 
         /// <summary>
-        /// 查询角色权限-权限列表
+        /// 鏌ヨ�瑙掕壊鏉冮檺-鏉冮檺鍒楄〃
         /// </summary>
         /// <returns></returns>
         public async Task<IResultOutput> GetPermissionList()
@@ -193,7 +193,7 @@ namespace ZhonTai.Admin.Services.Permission
         }
 
         /// <summary>
-        /// 查询角色权限列表
+        /// 鏌ヨ�瑙掕壊鏉冮檺鍒楄〃
         /// </summary>
         /// <param name="roleId"></param>
         /// <returns></returns>
@@ -207,7 +207,7 @@ namespace ZhonTai.Admin.Services.Permission
         }
 
         /// <summary>
-        /// 查询租户权限列表
+        /// 鏌ヨ�绉熸埛鏉冮檺鍒楄〃
         /// </summary>
         /// <param name="tenantId"></param>
         /// <returns></returns>
@@ -221,7 +221,7 @@ namespace ZhonTai.Admin.Services.Permission
         }
 
         /// <summary>
-        /// 新增分组
+        /// 鏂板�鍒嗙粍
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -234,7 +234,7 @@ namespace ZhonTai.Admin.Services.Permission
         }
 
         /// <summary>
-        /// 新增菜单
+        /// 鏂板�鑿滃崟
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -247,7 +247,7 @@ namespace ZhonTai.Admin.Services.Permission
         }
 
         /// <summary>
-        /// 新增接口
+        /// 鏂板�鎺ュ彛
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -260,7 +260,7 @@ namespace ZhonTai.Admin.Services.Permission
         }
 
         /// <summary>
-        /// 新增权限点
+        /// 鏂板�鏉冮檺鐐�
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -280,7 +280,7 @@ namespace ZhonTai.Admin.Services.Permission
         }
 
         /// <summary>
-        /// 修改分组
+        /// 淇�敼鍒嗙粍
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -298,7 +298,7 @@ namespace ZhonTai.Admin.Services.Permission
         }
 
         /// <summary>
-        /// 修改菜单
+        /// 淇�敼鑿滃崟
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -316,7 +316,7 @@ namespace ZhonTai.Admin.Services.Permission
         }
 
         /// <summary>
-        /// 修改接口
+        /// 淇�敼鎺ュ彛
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -334,7 +334,7 @@ namespace ZhonTai.Admin.Services.Permission
         }
 
         /// <summary>
-        /// 修改权限点
+        /// 淇�敼鏉冮檺鐐�
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -349,7 +349,7 @@ namespace ZhonTai.Admin.Services.Permission
             var entity = await _permissionRepository.GetAsync(input.Id);
             if (!(entity?.Id > 0))
             {
-                return ResultOutput.NotOk("权限点不存在!");
+                return ResultOutput.NotOk("鏉冮檺鐐逛笉瀛樺湪锛�");
             }
 
             Mapper.Map(input, entity);
@@ -363,90 +363,90 @@ namespace ZhonTai.Admin.Services.Permission
                 await _permissionApiRepository.InsertAsync(permissionApis);
             }
 
-            //清除用户权限缓存
+            //娓呴櫎鐢ㄦ埛鏉冮檺缂撳瓨
             await ClearUserPermissionsAsync(new List<long> { entity.Id });
 
             return ResultOutput.Ok();
         }
 
         /// <summary>
-        /// 彻底删除
+        /// 褰诲簳鍒犻櫎
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
         [Transaction]
         public async Task<IResultOutput> DeleteAsync(long id)
         {
-            //递归查询所有权限点
+            //閫掑綊鏌ヨ�鎵€鏈夋潈闄愮偣
             var ids = _permissionRepository.Select
             .Where(a => a.Id == id)
             .AsTreeCte()
             .ToList(a => a.Id);
 
-            //删除权限关联接口
+            //鍒犻櫎鏉冮檺鍏宠仈鎺ュ彛
             await _permissionApiRepository.DeleteAsync(a => ids.Contains(a.PermissionId));
 
-            //删除相关权限
+            //鍒犻櫎鐩稿叧鏉冮檺
             await _permissionRepository.DeleteAsync(a => ids.Contains(a.Id));
 
-            //清除用户权限缓存
+            //娓呴櫎鐢ㄦ埛鏉冮檺缂撳瓨
             await ClearUserPermissionsAsync(ids);
 
             return ResultOutput.Ok();
         }
 
         /// <summary>
-        /// 删除
+        /// 鍒犻櫎
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
         public async Task<IResultOutput> SoftDeleteAsync(long id)
         {
-            //递归查询所有权限点
+            //閫掑綊鏌ヨ�鎵€鏈夋潈闄愮偣
             var ids = _permissionRepository.Select
             .Where(a => a.Id == id)
             .AsTreeCte()
             .ToList(a => a.Id);
 
-            //删除权限
+            //鍒犻櫎鏉冮檺
             await _permissionRepository.SoftDeleteAsync(a => ids.Contains(a.Id));
 
-            //清除用户权限缓存
+            //娓呴櫎鐢ㄦ埛鏉冮檺缂撳瓨
             await ClearUserPermissionsAsync(ids);
 
             return ResultOutput.Ok();
         }
 
         /// <summary>
-        /// 保存角色权限
+        /// 淇濆瓨瑙掕壊鏉冮檺
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
         [Transaction]
         public async Task<IResultOutput> AssignAsync(PermissionAssignInput input)
         {
-            //分配权限的时候判断角色是否存在
+            //鍒嗛厤鏉冮檺鐨勬椂鍊欏垽鏂��鑹叉槸鍚﹀瓨鍦�
             var exists = await _roleRepository.Select.DisableGlobalFilter("Tenant").WhereDynamic(input.RoleId).AnyAsync();
             if (!exists)
             {
-                return ResultOutput.NotOk("该角色不存在或已被删除!");
+                return ResultOutput.NotOk("璇ヨ�鑹蹭笉瀛樺湪鎴栧凡琚�垹闄わ紒");
             }
 
-            //查询角色权限
+            //鏌ヨ�瑙掕壊鏉冮檺
             var permissionIds = await _rolePermissionRepository.Select.Where(d => d.RoleId == input.RoleId).ToListAsync(m => m.PermissionId);
 
-            //批量删除权限
+            //鎵归噺鍒犻櫎鏉冮檺
             var deleteIds = permissionIds.Where(d => !input.PermissionIds.Contains(d));
             if (deleteIds.Any())
             {
                 await _rolePermissionRepository.DeleteAsync(m => m.RoleId == input.RoleId && deleteIds.Contains(m.PermissionId));
             }
 
-            //批量插入权限
+            //鎵归噺鎻掑叆鏉冮檺
             var insertRolePermissions = new List<RolePermissionEntity>();
             var insertPermissionIds = input.PermissionIds.Where(d => !permissionIds.Contains(d));
 
-            //防止租户非法授权
+            //闃叉�绉熸埛闈炴硶鎺堟潈
             if (_appConfig.Tenant && User.TenantType == TenantType.Tenant)
             {
                 var masterDb = ServiceProvider.GetRequiredService<IFreeSql>();
@@ -467,7 +467,7 @@ namespace ZhonTai.Admin.Services.Permission
                 await _rolePermissionRepository.InsertAsync(insertRolePermissions);
             }
 
-            //清除角色下关联的用户权限缓存
+            //娓呴櫎瑙掕壊涓嬪叧鑱旂殑鐢ㄦ埛鏉冮檺缂撳瓨
             var userIds = await _userRoleRepository.Select.Where(a => a.RoleId == input.RoleId).ToListAsync(a => a.UserId);
             foreach (var userId in userIds)
             {
@@ -478,30 +478,30 @@ namespace ZhonTai.Admin.Services.Permission
         }
 
         /// <summary>
-        /// 保存租户权限
+        /// 淇濆瓨绉熸埛鏉冮檺
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
         [Transaction]
         public async Task<IResultOutput> SaveTenantPermissionsAsync(PermissionSaveTenantPermissionsInput input)
         {
-            //获得租户db
+            //鑾峰緱绉熸埛db
             var ib = ServiceProvider.GetRequiredService<IdleBus<IFreeSql>>();
             var tenantDb = ib.GetTenantFreeSql(ServiceProvider, input.TenantId);
 
-            //查询租户权限
+            //鏌ヨ�绉熸埛鏉冮檺
             var permissionIds = await _tenantPermissionRepository.Select.Where(d => d.TenantId == input.TenantId).ToListAsync(m => m.PermissionId);
 
-            //批量删除租户权限
+            //鎵归噺鍒犻櫎绉熸埛鏉冮檺
             var deleteIds = permissionIds.Where(d => !input.PermissionIds.Contains(d));
             if (deleteIds.Any())
             {
                 await _tenantPermissionRepository.DeleteAsync(m => m.TenantId == input.TenantId && deleteIds.Contains(m.PermissionId));
-                //删除租户下关联的角色权限
+                //鍒犻櫎绉熸埛涓嬪叧鑱旂殑瑙掕壊鏉冮檺
                 await tenantDb.GetRepositoryBase<RolePermissionEntity>().DeleteAsync(a => deleteIds.Contains(a.PermissionId));
             }
 
-            //批量插入租户权限
+            //鎵归噺鎻掑叆绉熸埛鏉冮檺
             var tenatPermissions = new List<TenantPermissionEntity>();
             var insertPermissionIds = input.PermissionIds.Where(d => !permissionIds.Contains(d));
             if (insertPermissionIds.Any())
@@ -517,7 +517,7 @@ namespace ZhonTai.Admin.Services.Permission
                 await _tenantPermissionRepository.InsertAsync(tenatPermissions);
             }
 
-            //清除租户下所有用户权限缓存
+            //娓呴櫎绉熸埛涓嬫墍鏈夌敤鎴锋潈闄愮紦瀛�
             var userIds = await tenantDb.GetRepositoryBase<UserEntity>().Select.Where(a => a.TenantId == input.TenantId).ToListAsync(a => a.Id);
             if(userIds.Any())
             {

+ 1 - 1
src/platform/ZhonTai.Admin/Services/Position/IPositionService.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Dto;
+using ZhonTai.Admin.Core.Dto;
 using ZhonTai.Admin.Services.Position.Input;
 using System.Threading.Tasks;
 using ZhonTai.Admin.Domain.Position.Dto;

+ 10 - 10
src/platform/ZhonTai.Admin/Services/Position/PositionService.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Admin.Core.Dto;
+锘縰sing ZhonTai.Admin.Core.Dto;
 using ZhonTai.Admin.Services.Position.Input;
 using ZhonTai.Admin.Services.Position.Output;
 using System.Threading.Tasks;
@@ -11,7 +11,7 @@ using ZhonTai.DynamicApi.Attributes;
 namespace ZhonTai.Admin.Services.Position
 {
     /// <summary>
-    /// 职位服务
+    /// 鑱屼綅鏈嶅姟
     /// </summary>
     public class PositionService : BaseService, IPositionService
     {
@@ -25,7 +25,7 @@ namespace ZhonTai.Admin.Services.Position
         }
 
         /// <summary>
-        /// 查询职位
+        /// 鏌ヨ�鑱屼綅
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -36,7 +36,7 @@ namespace ZhonTai.Admin.Services.Position
         }
 
         /// <summary>
-        /// 查询分页
+        /// 鏌ヨ�鍒嗛〉
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -61,7 +61,7 @@ namespace ZhonTai.Admin.Services.Position
         }
 
         /// <summary>
-        /// 新增
+        /// 鏂板�
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -74,7 +74,7 @@ namespace ZhonTai.Admin.Services.Position
         }
 
         /// <summary>
-        /// 修改
+        /// 淇�敼
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -88,7 +88,7 @@ namespace ZhonTai.Admin.Services.Position
             var entity = await _positionRepository.GetAsync(input.Id);
             if (!(entity?.Id > 0))
             {
-                return ResultOutput.NotOk("职位不存在!");
+                return ResultOutput.NotOk("鑱屼綅涓嶅瓨鍦�紒");
             }
 
             Mapper.Map(input, entity);
@@ -97,7 +97,7 @@ namespace ZhonTai.Admin.Services.Position
         }
 
         /// <summary>
-        /// 彻底删除
+        /// 褰诲簳鍒犻櫎
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -113,7 +113,7 @@ namespace ZhonTai.Admin.Services.Position
         }
 
         /// <summary>
-        /// 删除
+        /// 鍒犻櫎
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -126,7 +126,7 @@ namespace ZhonTai.Admin.Services.Position
         }
 
         /// <summary>
-        /// 批量删除
+        /// 鎵归噺鍒犻櫎
         /// </summary>
         /// <param name="ids"></param>
         /// <returns></returns>

+ 2 - 2
src/platform/ZhonTai.Admin/Services/Role/IRoleService.cs

@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using ZhonTai.Admin.Core.Dto;
 using ZhonTai.Admin.Domain.Role.Dto;
 using ZhonTai.Admin.Services.Role.Dto;
@@ -6,7 +6,7 @@ using ZhonTai.Admin.Services.Role.Dto;
 namespace ZhonTai.Admin.Services.Role
 {
     /// <summary>
-    /// ½ÇÉ«½Ó¿Ú
+    /// 角色接�
     /// </summary>
     public interface IRoleService
     {

+ 10 - 10
src/platform/ZhonTai.Admin/Services/Role/RoleService.cs

@@ -1,4 +1,4 @@
-using System.Linq;
+锘縰sing System.Linq;
 using System.Threading.Tasks;
 using ZhonTai.Admin.Core.Repositories;
 using ZhonTai.Admin.Core.Dto;
@@ -13,7 +13,7 @@ using Microsoft.AspNetCore.Mvc;
 namespace ZhonTai.Admin.Services.Role
 {
     /// <summary>
-    /// 角色服务
+    /// 瑙掕壊鏈嶅姟
     /// </summary>
     [DynamicApi(Area = "admin")]
     public class RoleService : BaseService, IRoleService, IDynamicApi
@@ -31,7 +31,7 @@ namespace ZhonTai.Admin.Services.Role
         }
 
         /// <summary>
-        /// 查询角色
+        /// 鏌ヨ�瑙掕壊
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -42,7 +42,7 @@ namespace ZhonTai.Admin.Services.Role
         }
 
         /// <summary>
-        /// 查询角色列表
+        /// 鏌ヨ�瑙掕壊鍒楄〃
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -69,7 +69,7 @@ namespace ZhonTai.Admin.Services.Role
         }
 
         /// <summary>
-        /// 新增
+        /// 鏂板�
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -82,7 +82,7 @@ namespace ZhonTai.Admin.Services.Role
         }
 
         /// <summary>
-        /// 修改
+        /// 淇�敼
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -96,7 +96,7 @@ namespace ZhonTai.Admin.Services.Role
             var entity = await _roleRepository.GetAsync(input.Id);
             if (!(entity?.Id > 0))
             {
-                return ResultOutput.NotOk("角色不存在!");
+                return ResultOutput.NotOk("瑙掕壊涓嶅瓨鍦�紒");
             }
 
             Mapper.Map(input, entity);
@@ -105,7 +105,7 @@ namespace ZhonTai.Admin.Services.Role
         }
 
         /// <summary>
-        /// 彻底删除
+        /// 褰诲簳鍒犻櫎
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -121,7 +121,7 @@ namespace ZhonTai.Admin.Services.Role
         }
 
         /// <summary>
-        /// 删除
+        /// 鍒犻櫎
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -134,7 +134,7 @@ namespace ZhonTai.Admin.Services.Role
         }
 
         /// <summary>
-        /// 批量删除
+        /// 鎵归噺鍒犻櫎
         /// </summary>
         /// <param name="ids"></param>
         /// <returns></returns>

+ 2 - 2
src/platform/ZhonTai.Admin/Services/Tenant/ITenantService.cs

@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+锘縰sing System.Threading.Tasks;
 using ZhonTai.Admin.Core.Dto;
 using ZhonTai.Admin.Domain.Tenant.Dto;
 using ZhonTai.Admin.Services.Tenant.Dto;
@@ -6,7 +6,7 @@ using ZhonTai.Admin.Services.Tenant.Dto;
 namespace ZhonTai.Admin.Services.Tenant
 {
     /// <summary>
-    /// 租户接口
+    /// 绉熸埛鎺ュ彛
     /// </summary>
     public interface ITenantService
     {

+ 26 - 26
src/platform/ZhonTai.Admin/Services/Tenant/TenantService.cs

@@ -1,4 +1,4 @@
-using System.Linq;
+锘縰sing System.Linq;
 using System.Threading.Tasks;
 using ZhonTai.Admin.Core.Attributes;
 using ZhonTai.Admin.Core.Repositories;
@@ -18,7 +18,7 @@ using Microsoft.AspNetCore.Mvc;
 namespace ZhonTai.Admin.Services.Tenant
 {
     /// <summary>
-    /// 租户服务
+    /// 绉熸埛鏈嶅姟
     /// </summary>
     [DynamicApi(Area = "admin")]
     public class TenantService : BaseService, ITenantService, IDynamicApi
@@ -45,7 +45,7 @@ namespace ZhonTai.Admin.Services.Tenant
         }
 
         /// <summary>
-        /// 查询租户
+        /// 鏌ヨ�绉熸埛
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -56,7 +56,7 @@ namespace ZhonTai.Admin.Services.Tenant
         }
 
         /// <summary>
-        /// 查询租户列表
+        /// 鏌ヨ�绉熸埛鍒楄〃
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -83,7 +83,7 @@ namespace ZhonTai.Admin.Services.Tenant
         }
 
         /// <summary>
-        /// 新增
+        /// 鏂板�
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -95,20 +95,20 @@ namespace ZhonTai.Admin.Services.Tenant
 
             var tenantId = tenant.Id;
 
-            //添加用户
+            //娣诲姞鐢ㄦ埛
             var pwd = MD5Encrypt.Encrypt32("111111");
             var user = new UserEntity { TenantId = tenantId, UserName = input.Phone, NickName = input.RealName, Password = pwd, Status = 0 };
             await _userRepository.InsertAsync(user);
 
-            //添加角色
-            var role = new RoleEntity { TenantId = tenantId, Code = "plat_admin", Name = "平台管理员", Enabled = true };
+            //娣诲姞瑙掕壊
+            var role = new RoleEntity { TenantId = tenantId, Code = "plat_admin", Name = "骞冲彴绠$悊鍛�", Enabled = true };
             await _roleRepository.InsertAsync(role);
 
-            //添加用户角色
+            //娣诲姞鐢ㄦ埛瑙掕壊
             var userRole = new UserRoleEntity() { UserId = user.Id, RoleId = role.Id };
             await _userRoleRepository.InsertAsync(userRole);
 
-            //更新租户用户和角色
+            //鏇存柊绉熸埛鐢ㄦ埛鍜岃�鑹�
             tenant.UserId = user.Id;
             tenant.RoleId = role.Id;
             await _tenantRepository.UpdateAsync(tenant);
@@ -117,7 +117,7 @@ namespace ZhonTai.Admin.Services.Tenant
         }
 
         /// <summary>
-        /// 修改
+        /// 淇�敼
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -131,7 +131,7 @@ namespace ZhonTai.Admin.Services.Tenant
             var entity = await _tenantRepository.GetAsync(input.Id);
             if (!(entity?.Id > 0))
             {
-                return ResultOutput.NotOk("租户不存在!");
+                return ResultOutput.NotOk("绉熸埛涓嶅瓨鍦�紒");
             }
 
             Mapper.Map(input, entity);
@@ -140,66 +140,66 @@ namespace ZhonTai.Admin.Services.Tenant
         }
 
         /// <summary>
-        /// 彻底删除
+        /// 褰诲簳鍒犻櫎
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
         [Transaction]
         public async Task<IResultOutput> DeleteAsync(long id)
         {
-            //删除角色权限
+            //鍒犻櫎瑙掕壊鏉冮檺
             await _rolePermissionRepository.Where(a => a.Role.TenantId == id).DisableGlobalFilter("Tenant").ToDelete().ExecuteAffrowsAsync();
 
-            //删除用户角色
+            //鍒犻櫎鐢ㄦ埛瑙掕壊
             await _userRoleRepository.Where(a => a.User.TenantId == id).DisableGlobalFilter("Tenant").ToDelete().ExecuteAffrowsAsync();
 
-            //删除用户
+            //鍒犻櫎鐢ㄦ埛
             await _userRepository.Where(a => a.TenantId == id).DisableGlobalFilter("Tenant").ToDelete().ExecuteAffrowsAsync();
 
-            //删除角色
+            //鍒犻櫎瑙掕壊
             await _roleRepository.Where(a => a.TenantId == id).DisableGlobalFilter("Tenant").ToDelete().ExecuteAffrowsAsync();
 
-            //删除租户
+            //鍒犻櫎绉熸埛
             await _tenantRepository.DeleteAsync(id);
 
             return ResultOutput.Ok();
         }
 
         /// <summary>
-        /// 删除
+        /// 鍒犻櫎
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
         [Transaction]
         public async Task<IResultOutput> SoftDeleteAsync(long id)
         {
-            //删除用户
+            //鍒犻櫎鐢ㄦ埛
             await _userRepository.SoftDeleteAsync(a => a.TenantId == id, "Tenant");
 
-            //删除角色
+            //鍒犻櫎瑙掕壊
             await _roleRepository.SoftDeleteAsync(a => a.TenantId == id, "Tenant");
 
-            //删除租户
+            //鍒犻櫎绉熸埛
             var result = await _tenantRepository.SoftDeleteAsync(id);
 
             return ResultOutput.Result(result);
         }
 
         /// <summary>
-        /// 批量删除
+        /// 鎵归噺鍒犻櫎
         /// </summary>
         /// <param name="ids"></param>
         /// <returns></returns>
         [Transaction]
         public async Task<IResultOutput> BatchSoftDeleteAsync(long[] ids)
         {
-            //删除用户
+            //鍒犻櫎鐢ㄦ埛
             await _userRepository.SoftDeleteAsync(a => ids.Contains(a.TenantId.Value), "Tenant");
 
-            //删除角色
+            //鍒犻櫎瑙掕壊
             await _roleRepository.SoftDeleteAsync(a => ids.Contains(a.TenantId.Value), "Tenant");
 
-            //删除租户
+            //鍒犻櫎绉熸埛
             var result = await _tenantRepository.SoftDeleteAsync(ids);
 
             return ResultOutput.Result(result);

+ 2 - 2
src/platform/ZhonTai.Admin/Services/User/IUserService.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+锘縰sing System.Collections.Generic;
 using System.Threading.Tasks;
 using ZhonTai.Admin.Core.Dto;
 using ZhonTai.Admin.Services.Auth.Dto;
@@ -7,7 +7,7 @@ using ZhonTai.Admin.Services.User.Dto;
 namespace ZhonTai.Admin.Services.User
 {
     /// <summary>
-    /// 用户接口
+    /// 鐢ㄦ埛鎺ュ彛
     /// </summary>
     public interface IUserService
     {

+ 1 - 1
src/platform/ZhonTai.Admin/Services/User/UserService.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using ZhonTai.Admin.Core.Attributes;

+ 2 - 3
src/platform/ZhonTai.Admin/Services/View/IViewService.cs

@@ -1,12 +1,11 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using ZhonTai.Admin.Core.Dto;
 using ZhonTai.Admin.Services.View.Dto;
 
-
 namespace ZhonTai.Admin.Services.View
 {
     /// <summary>
-    /// ÊÓͼ½Ó¿Ú
+    /// 视图接�
     /// </summary>
     public interface IViewService
     {

+ 17 - 17
src/platform/ZhonTai.Admin/Services/View/ViewService.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Mvc;
+锘縰sing Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -13,7 +13,7 @@ using ZhonTai.DynamicApi.Attributes;
 namespace ZhonTai.Admin.Services.View
 {
     /// <summary>
-    /// 视图服务
+    /// 瑙嗗浘鏈嶅姟
     /// </summary>
     [DynamicApi(Area = "admin")]
     public class ViewService : BaseService, IViewService, IDynamicApi
@@ -26,7 +26,7 @@ namespace ZhonTai.Admin.Services.View
         }
 
         /// <summary>
-        /// 查询视图
+        /// 鏌ヨ�瑙嗗浘
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -37,7 +37,7 @@ namespace ZhonTai.Admin.Services.View
         }
 
         /// <summary>
-        /// 查询列表
+        /// 鏌ヨ�鍒楄〃
         /// </summary>
         /// <param name="key"></param>
         /// <returns></returns>
@@ -53,7 +53,7 @@ namespace ZhonTai.Admin.Services.View
         }
 
         /// <summary>
-        /// 新增
+        /// 鏂板�
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -66,7 +66,7 @@ namespace ZhonTai.Admin.Services.View
         }
 
         /// <summary>
-        /// 修改
+        /// 淇�敼
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -80,7 +80,7 @@ namespace ZhonTai.Admin.Services.View
             var entity = await _viewRepository.GetAsync(input.Id);
             if (!(entity?.Id > 0))
             {
-                return ResultOutput.NotOk("视图不存在!");
+                return ResultOutput.NotOk("瑙嗗浘涓嶅瓨鍦�紒");
             }
 
             Mapper.Map(input, entity);
@@ -89,7 +89,7 @@ namespace ZhonTai.Admin.Services.View
         }
 
         /// <summary>
-        /// 彻底删除
+        /// 褰诲簳鍒犻櫎
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -105,7 +105,7 @@ namespace ZhonTai.Admin.Services.View
         }
 
         /// <summary>
-        /// 删除
+        /// 鍒犻櫎
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -117,7 +117,7 @@ namespace ZhonTai.Admin.Services.View
         }
 
         /// <summary>
-        /// 批量删除
+        /// 鎵归噺鍒犻櫎
         /// </summary>
         /// <param name="ids"></param>
         /// <returns></returns>
@@ -130,25 +130,25 @@ namespace ZhonTai.Admin.Services.View
         }
 
         /// <summary>
-        /// 同步
+        /// 鍚屾�
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
         [Transaction]
         public async Task<IResultOutput> SyncAsync(ViewSyncInput input)
         {
-            //查询所有视图
+            //鏌ヨ�鎵€鏈夎�鍥�
             var views = await _viewRepository.Select.ToListAsync();
             var names = views.Select(a => a.Name).ToList();
             var paths = views.Select(a => a.Path).ToList();
 
-            //path处理
+            //path澶勭悊
             foreach (var view in input.Views)
             {
                 view.Path = view.Path?.Trim();
             }
 
-            //批量插入
+            //鎵归噺鎻掑叆
             {
                 var inputViews = (from a in input.Views where !(paths.Contains(a.Path) || names.Contains(a.Name)) select a).ToList();
                 if (inputViews.Count > 0)
@@ -166,12 +166,12 @@ namespace ZhonTai.Admin.Services.View
                 }
             }
 
-            //批量更新
+            //鎵归噺鏇存柊
             {
                 var inputPaths = input.Views.Select(a => a.Path).ToList();
                 var inputNames = input.Views.Select(a => a.Name).ToList();
 
-                //修改
+                //淇�敼
                 var updateViews = (from a in views where inputPaths.Contains(a.Path) || inputNames.Contains(a.Name) select a).ToList();
                 if (updateViews.Count > 0)
                 {
@@ -192,7 +192,7 @@ namespace ZhonTai.Admin.Services.View
                     }
                 }
 
-                //禁用
+                //绂佺敤
                 var disabledViews = (from a in views where (a.Path.NotNull() || a.Name.NotNull()) && (!inputPaths.Contains(a.Path) || !inputNames.Contains(a.Name)) select a).ToList();
                 if (disabledViews.Count > 0)
                 {

+ 38 - 14
src/tests/ZhonTai.Tests/BaseControllerTest.cs

@@ -29,61 +29,85 @@ namespace ZhonTai.Tests
             _appConfig = GetService<AppConfig>();
         }
 
-        public ByteArrayContent GetHttpContent(object input)
+        public ByteArrayContent GetHttpContent(object input, string contentType = "application/json;charset=UTF-8")
         {
             // HttpContent httpContent = new StringContent(JsonConvert.SerializeObject(input));
             var content = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(input));
             var httpContent = new ByteArrayContent(content);
-            httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json;charset=UTF-8");
+            httpContent.Headers.ContentType = MediaTypeHeaderValue.Parse(contentType);
             return httpContent;
         }
 
         public async Task<T> GetResult<T>(string apiPath, object input = null, bool checkStatus = true)
         {
             await Login();
+            if (input != null)
+            {
+                var queryParams = ToParams(input);
+                apiPath = apiPath.IndexOf('?') > -1 ? $"{apiPath}&{queryParams}" : $"{apiPath}?{queryParams}";
+            }
             var res = await Client.GetAsync(apiPath);
             if (checkStatus)
             {
                 Assert.Equal(HttpStatusCode.OK, res.StatusCode);
             }
             var content = await res.Content.ReadAsStringAsync();
-            return JsonConvert.DeserializeObject<T>(content);
+            return content.NotNull() ? JsonConvert.DeserializeObject<T>(content) : default;
         }
 
-        public async Task<T> PostResult<T>(string apiPath, object input = null, bool checkStatus = true)
+        public async Task<T> PostResult<T>(string apiPath, object input = null, bool checkStatus = true, string contentType = "application/json;charset=UTF-8")
         {
             await Login();
-            var res = await Client.PostAsync(apiPath, GetHttpContent(input));
+            var res = await Client.PostAsync(apiPath, GetHttpContent(input, contentType));
             if (checkStatus)
             {
                 Assert.Equal(HttpStatusCode.OK, res.StatusCode);
             }
             var content = await res.Content.ReadAsStringAsync();
-            return JsonConvert.DeserializeObject<T>(content);
+            return content.NotNull() ? JsonConvert.DeserializeObject<T>(content) : default;
         }
 
-        public async Task<T> PutResult<T>(string apiPath, object input = null, bool checkStatus = true)
+        public async Task<string> PostResultAndGetContent(string apiPath, object input = null, bool checkStatus = true, string contentType = "application/json;charset=UTF-8")
         {
+            //application/json;charset=UTF-8
+            //application/x-www-form-urlencoded;charset=UTF-8
             await Login();
-            var res = await Client.PutAsync(apiPath, GetHttpContent(input));
+            var res = await Client.PostAsync(apiPath, GetHttpContent(input, contentType));
             if (checkStatus)
             {
                 Assert.Equal(HttpStatusCode.OK, res.StatusCode);
             }
             var content = await res.Content.ReadAsStringAsync();
-            return JsonConvert.DeserializeObject<T>(content);
+            return content;
+        }
+
+        public async Task<T> PutResult<T>(string apiPath, object input = null, bool checkStatus = true, string contentType = "application/json;charset=UTF-8")
+        {
+            await Login();
+            var res = await Client.PutAsync(apiPath, GetHttpContent(input, contentType));
+            if (checkStatus)
+            {
+                Assert.Equal(HttpStatusCode.OK, res.StatusCode);
+            }
+            var content = await res.Content.ReadAsStringAsync();
+            return content.NotNull() ? JsonConvert.DeserializeObject<T>(content) : default;
         }
 
         public async Task<T> DeleteResult<T>(string apiPath, object input = null, bool checkStatus = true)
         {
             await Login();
+            if (input != null)
+            {
+                var queryParams = ToParams(input);
+                apiPath = apiPath.IndexOf('?') > -1 ? $"{apiPath}&{queryParams}" : $"{apiPath}?{queryParams}";
+            }
             var res = await Client.DeleteAsync(apiPath);
             if (checkStatus)
             {
                 Assert.Equal(HttpStatusCode.OK, res.StatusCode);
             }
             var content = await res.Content.ReadAsStringAsync();
-            return JsonConvert.DeserializeObject<T>(content);
+            return content.NotNull() ? JsonConvert.DeserializeObject<T>(content) : default;
         }
 
         public async Task<ResultOutput<dynamic>> GetResult(string apiPath, object input = null, bool checkStatus = true)
@@ -91,14 +115,14 @@ namespace ZhonTai.Tests
             return await GetResult<ResultOutput<dynamic>>(apiPath, input, checkStatus);
         }
 
-        public async Task<ResultOutput<dynamic>> PostResult(string apiPath, object input = null, bool checkStatus = true)
+        public async Task<ResultOutput<dynamic>> PostResult(string apiPath, object input = null, bool checkStatus = true, string contentType = "application/json;charset=UTF-8")
         {
-            return await PostResult<ResultOutput<dynamic>>(apiPath, input, checkStatus);
+            return await PostResult<ResultOutput<dynamic>>(apiPath, input, checkStatus, contentType);
         }
 
-        public async Task<ResultOutput<dynamic>> PutResult(string apiPath, object input = null, bool checkStatus = true)
+        public async Task<ResultOutput<dynamic>> PutResult(string apiPath, object input = null, bool checkStatus = true, string contentType = "application/json;charset=UTF-8")
         {
-            return await PutResult<ResultOutput<dynamic>>(apiPath, input, checkStatus);
+            return await PutResult<ResultOutput<dynamic>>(apiPath, input, checkStatus, contentType);
         }
 
         public async Task<ResultOutput<dynamic>> DeleteResult(string apiPath, object input = null, bool checkStatus = true)

+ 2 - 5
src/tests/ZhonTai.Tests/ZhonTai.Tests.csproj

@@ -1,13 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<Description>中台测试库</Description>
+		<TargetFramework>net6.0</TargetFramework>
+		<IsPackable>false</IsPackable>
 	</PropertyGroup>
 
-	<PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.4" />