linyang
/
24Hour.Service
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'develop' of http://18t7i08736.yicp.fun:10018/Coder/24Hour.Service into develop

develop
林杨 2 years ago
parent
57bc4252bc 7cec54f1e2
commit
1181fd9659
12 changed files with 352 additions and 458 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      .gitignore
  2. 5
      24Hour/24Hour.csproj
  3. 36
      24Hour/Controllers/Common/LawyerArchivesController.cs
  4. 39
      24Hour/TwentySystemProxyClient.cs
  5. 1
      Dto/obj/Debug/net6.0/Dto.AssemblyInfoInputs.cache
  6. 11
      Dto/obj/Debug/net6.0/Dto.GeneratedMSBuildEditorConfig.editorconfig
  7. BIN
      Dto/obj/Debug/net6.0/Dto.assets.cache
  8. BIN
      Dto/obj/Debug/net6.0/Dto.csproj.AssemblyReference.cache
  9. 64
      Dto/obj/Dto.csproj.nuget.dgspec.json
  10. 15
      Dto/obj/Dto.csproj.nuget.g.props
  11. 69
      Dto/obj/project.assets.json
  12. 8
      Dto/obj/project.nuget.cache

10
.gitignore vendored
Unescape View File

@ -82,3 +82,13 @@ dkms.conf
/24Hour/wwwroot /24Hour/wwwroot
/Dto/obj /Dto/obj
/Dto/obj/Debug /Dto/obj/Debug
/Dto/obj/Debug/net6.0
/Dto/obj/Release
*.cs
/Dto/obj/Debug/net6.0/Dto.csproj.AssemblyReference.cache
/Dto/obj/Debug/net6.0/Dto.AssemblyInfoInputs.cache
/Dto/obj/Debug/net6.0/Dto.GeneratedMSBuildEditorConfig.editorconfig
/Dto/obj/Dto.csproj.nuget.dgspec.json
/Dto/obj/Dto.csproj.nuget.g.props
/Dto/obj/project.assets.json
/Dto/obj/project.nuget.cache

5
24Hour/24Hour.csproj
Unescape View File

@ -8,8 +8,8 @@
<GenerateDocumentationFile>True</GenerateDocumentationFile> <GenerateDocumentationFile>True</GenerateDocumentationFile>
<UserSecretsId>e485308c-2f05-470b-b0a4-68f1ec2b3412</UserSecretsId> <UserSecretsId>e485308c-2f05-470b-b0a4-68f1ec2b3412</UserSecretsId>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS> <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<AssemblyVersion>1.0.1.16</AssemblyVersion> <AssemblyVersion>1.0.1.17</AssemblyVersion>
<Version>1.0.1.16</Version> <Version>1.0.1.17</Version>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@ -28,6 +28,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Dto\Dto.csproj" />
<ProjectReference Include="..\Elight.Entity\Elight.Entity.csproj" /> <ProjectReference Include="..\Elight.Entity\Elight.Entity.csproj" />
<ProjectReference Include="..\Elight.Logic\Elight.Logic.csproj" /> <ProjectReference Include="..\Elight.Logic\Elight.Logic.csproj" />
<ProjectReference Include="..\Elight.Utility\Elight.Utility.csproj" /> <ProjectReference Include="..\Elight.Utility\Elight.Utility.csproj" />

36
24Hour/Controllers/Common/LawyerArchivesController.cs
Unescape View File

@ -80,7 +80,6 @@ namespace _24Hour.Controllers.Common
res.result = data; res.result = data;
return res; return res;
} }
/// <summary> /// <summary>
/// 修改内网律师信息 /// 修改内网律师信息
/// </summary> /// </summary>
@ -815,8 +814,6 @@ namespace _24Hour.Controllers.Common
}; };
return result; return result;
} }
/// <summary> /// <summary>
/// 统计阅卷信息 /// 统计阅卷信息
/// </summary> /// </summary>
@ -989,7 +986,6 @@ namespace _24Hour.Controllers.Common
}; };
return result; return result;
} }
/// <summary> /// <summary>
/// 按律师分类 /// 按律师分类
/// </summary> /// </summary>
@ -1105,6 +1101,8 @@ namespace _24Hour.Controllers.Common
[HttpGet] [HttpGet]
[Route("ImportLawyerArchivesInfo")] [Route("ImportLawyerArchivesInfo")]
public async Task<Result> ImportLawyerArchivesInfo(string path) public async Task<Result> ImportLawyerArchivesInfo(string path)
{
try
{ {
if (System.IO.File.Exists(path) == false) if (System.IO.File.Exists(path) == false)
{ {
@ -1283,14 +1281,21 @@ namespace _24Hour.Controllers.Common
_db.CommitTran(); _db.CommitTran();
} }
} }
}
catch(Exception ex)
{
result.Message = ex.Message;
result.IsSucceed = false;
return result;
}
result.IsSucceed = true; result.IsSucceed = true;
return result; return result;
} }
[HttpPost] [HttpPost]
[Route("ExportLawyerArchivesInfo")] [Route("ExportLawyerArchivesInfo")]
public async Task<Result> ExportLawyerArchivesInfo(List<string> ids) public async Task<Result> ExportLawyerArchivesInfo(List<string> ids)
{
try
{ {
var lawyerarchives = await _db.Queryable<App_LawyerServicesModel>() var lawyerarchives = await _db.Queryable<App_LawyerServicesModel>()
.In(info => info.Id, ids) .In(info => info.Id, ids)
@ -1328,7 +1333,7 @@ namespace _24Hour.Controllers.Common
if (Directory.Exists(lawyerdir) == false) Directory.CreateDirectory(lawyerdir); if (Directory.Exists(lawyerdir) == false) Directory.CreateDirectory(lawyerdir);
var files = item.annex.ConvertToModel<List<string>>(); var files = item.annex.ConvertToModel<List<string>>() ?? new List<string>();
var annecdir = Path.Combine(lawyerdir, "annexs"); var annecdir = Path.Combine(lawyerdir, "annexs");
if (Directory.Exists(annecdir) == false) Directory.CreateDirectory(annecdir); if (Directory.Exists(annecdir) == false) Directory.CreateDirectory(annecdir);
foreach (var file in files) foreach (var file in files)
@ -1342,9 +1347,10 @@ namespace _24Hour.Controllers.Common
} }
var legalphotots = item.legalAidPhoto.ConvertToModel<List<string>>(); var legalphotots = item.legalAidPhoto.ConvertToModel<List<string>>() ?? new List<string>();
var legalAidPhotoDir = Path.Combine(lawyerdir, "legalAidPhoto"); var legalAidPhotoDir = Path.Combine(lawyerdir, "legalAidPhoto");
if (Directory.Exists(legalAidPhotoDir) == false) Directory.CreateDirectory(legalAidPhotoDir); if (Directory.Exists(legalAidPhotoDir) == false) Directory.CreateDirectory(legalAidPhotoDir);
foreach (var legalphotot in legalphotots) foreach (var legalphotot in legalphotots)
{ {
var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot") + legalphotot.Replace("/", @"\"); var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot") + legalphotot.Replace("/", @"\");
@ -1356,9 +1362,11 @@ namespace _24Hour.Controllers.Common
} }
var relationshipProofPhotos = item.relationshipProofPhoto.ConvertToModel<List<string>>();
var relationshipProofPhotos = item.relationshipProofPhoto.ConvertToModel<List<string>>() ?? new List<string>();
var relationshipProofPhotoDir = Path.Combine(lawyerdir, "relationshipProofPhoto"); var relationshipProofPhotoDir = Path.Combine(lawyerdir, "relationshipProofPhoto");
if (Directory.Exists(relationshipProofPhotoDir) == false) Directory.CreateDirectory(relationshipProofPhotoDir); if (Directory.Exists(relationshipProofPhotoDir) == false) Directory.CreateDirectory(relationshipProofPhotoDir);
foreach (var relationshipProofPhoto in relationshipProofPhotos) foreach (var relationshipProofPhoto in relationshipProofPhotos)
{ {
var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot") + relationshipProofPhoto.Replace("/", @"\"); var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot") + relationshipProofPhoto.Replace("/", @"\");
@ -1369,7 +1377,7 @@ namespace _24Hour.Controllers.Common
} }
} }
var otherPhotos = item.otherPhoto.ConvertToModel<List<string>>(); var otherPhotos = item.otherPhoto.ConvertToModel<List<string>>() ?? new List<string>();
var otherPhotoDir = Path.Combine(lawyerdir, "otherPhoto"); var otherPhotoDir = Path.Combine(lawyerdir, "otherPhoto");
if (Directory.Exists(otherPhotoDir) == false) Directory.CreateDirectory(otherPhotoDir); if (Directory.Exists(otherPhotoDir) == false) Directory.CreateDirectory(otherPhotoDir);
foreach (var otherPhoto in otherPhotos) foreach (var otherPhoto in otherPhotos)
@ -1434,7 +1442,13 @@ namespace _24Hour.Controllers.Common
result.IsSucceed = true; result.IsSucceed = true;
return result; return result;
} }
catch(Exception ex)
{
result.IsSucceed = false;
result.Message = ex.Message;
return result;
}
}
[HttpPost] [HttpPost]
[Route("UploadSignImage")] [Route("UploadSignImage")]
/// <summary> /// <summary>

39
24Hour/TwentySystemProxyClient.cs
Unescape View File

@ -1,9 +1,11 @@
using com.sun.xml.@internal.xsom; using com.sun.xml.@internal.xsom;
using Dto;
using Elight.Entity.APPDto.Lawyer; using Elight.Entity.APPDto.Lawyer;
using Elight.Utility; using Elight.Utility;
using Elight.Utility.Code; using Elight.Utility.Code;
using Elight.Utility.Extensions; using Elight.Utility.Extensions;
using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Mvc;
namespace _24Hour namespace _24Hour
{ {
@ -20,6 +22,19 @@ namespace _24Hour
httpCliet.DefaultRequestHeaders.Add("User-Agent", "HttpClientFactory-Sample"); httpCliet.DefaultRequestHeaders.Add("User-Agent", "HttpClientFactory-Sample");
httpCliet.DefaultRequestHeaders.ConnectionClose = true; httpCliet.DefaultRequestHeaders.ConnectionClose = true;
} }
/// <summary>
/// 申请人资格资料
/// </summary>
/// <returns></returns>
[HttpPost("UploadImage")]
public async Task<Result> UploadImage(UploadDto dto)
{
var request = await httpCliet.PostAsJsonAsync($"/TwentySystem/UploadImage", dto);
var response = await request.EnsureSuccessStatusCode().Content.ReadAsStringAsync();
return response.ConvertToModel<Result>();
}
public async Task<Result<QueryResult<CaseInfo>>> GetCaseList(string? casename, string? bmsah, string? dwbm, DateTime? starttime, DateTime? endtime, int page, int size) public async Task<Result<QueryResult<CaseInfo>>> GetCaseList(string? casename, string? bmsah, string? dwbm, DateTime? starttime, DateTime? endtime, int page, int size)
{ {
Result<QueryResult<CaseInfo>> Result = new(); Result<QueryResult<CaseInfo>> Result = new();
@ -91,7 +106,6 @@ namespace _24Hour
} }
return Result; return Result;
} }
public async Task<Result<JZJBXXDto>> GetArchivesInfo(string bmsah, string dwbm) public async Task<Result<JZJBXXDto>> GetArchivesInfo(string bmsah, string dwbm)
{ {
var result = new Result<JZJBXXDto>(); var result = new Result<JZJBXXDto>();
@ -200,5 +214,28 @@ namespace _24Hour
public string? sfkcz { get; set; } public string? sfkcz { get; set; }
public string? qlzt { get; set; } public string? qlzt { get; set; }
} }
class MyClass
{
/// <summary>
/// 部门受案号
/// </summary>
public string bmsah { get; set; }
/// <summary>
/// base64字符串
/// </summary>
public string ImageStr { get; set; }
/// <summary>
/// 1423000000100-律师执业证书,
/// 1423000000200-律师事务所证,
/// 1423000000300-授权委托书,
/// 1423000000400-法律援助公函,
/// 1423000000500-身份证件 ,
/// 1423000000600-关系证明材料,
/// 1423000000700-其他
/// </summary>
public string Code { get; set; }
}
} }
} }

1
Dto/obj/Debug/net6.0/Dto.AssemblyInfoInputs.cache
Unescape View File

@ -1 +0,0 @@
24467ac260176f765658abbc64d2580ba42c4bc0

11
Dto/obj/Debug/net6.0/Dto.GeneratedMSBuildEditorConfig.editorconfig
Unescape View File

@ -1,11 +0,0 @@
is_global = true
build_property.TargetFramework = net6.0
build_property.TargetPlatformMinVersion =
build_property.UsingMicrosoftNETSdkWeb =
build_property.ProjectTypeGuids =
build_property.InvariantGlobalization =
build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Dto
build_property.ProjectDir = C:\core\24Hour.Service\Dto\

BIN
Dto/obj/Debug/net6.0/Dto.assets.cache
View File

Binary file not shown.

BIN
Dto/obj/Debug/net6.0/Dto.csproj.AssemblyReference.cache
View File

Binary file not shown.

64
Dto/obj/Dto.csproj.nuget.dgspec.json
Unescape View File

@ -1,64 +0,0 @@
{
"format": 1,
"restore": {
"C:\\core\\24Hour.Service\\Dto\\Dto.csproj": {}
},
"projects": {
"C:\\core\\24Hour.Service\\Dto\\Dto.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\core\\24Hour.Service\\Dto\\Dto.csproj",
"projectName": "Dto",
"projectPath": "C:\\core\\24Hour.Service\\Dto\\Dto.csproj",
"packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
"outputPath": "C:\\core\\24Hour.Service\\Dto\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"C:\\游戏文件夹\\Dll": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48",
"net481"
],
"assetTargetFallback": true,
"warn": true,
"frameworkReferences": {
"Microsoft.NETCore.App": {
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
}
}
}
}
}

15
Dto/obj/Dto.csproj.nuget.g.props
Unescape View File

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.6.0</NuGetToolVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />
</ItemGroup>
</Project>

69
Dto/obj/project.assets.json
Unescape View File

@ -1,69 +0,0 @@
{
"version": 3,
"targets": {
"net6.0": {}
},
"libraries": {},
"projectFileDependencyGroups": {
"net6.0": []
},
"packageFolders": {
"C:\\Users\\Administrator\\.nuget\\packages\\": {}
},
"project": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\core\\24Hour.Service\\Dto\\Dto.csproj",
"projectName": "Dto",
"projectPath": "C:\\core\\24Hour.Service\\Dto\\Dto.csproj",
"packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
"outputPath": "C:\\core\\24Hour.Service\\Dto\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"C:\\游戏文件夹\\Dll": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48",
"net481"
],
"assetTargetFallback": true,
"warn": true,
"frameworkReferences": {
"Microsoft.NETCore.App": {
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
}
}
}
}

8
Dto/obj/project.nuget.cache
Unescape View File

@ -1,8 +0,0 @@
{
"version": 2,
"dgSpecHash": "aBP4DpXaMgoARxZa7jC+2/OpB8f0apQvutUjpKvCZq5BqhIvN/WzLcvuunyUhHgo503i8NiV6jJvit7a9mkSCQ==",
"success": true,
"projectFilePath": "C:\\core\\24Hour.Service\\Dto\\Dto.csproj",
"expectedPackageFiles": [],
"logs": []
}
Write Preview
Loading…
Cancel
Save