修改配置文件

IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

@@ -1002,7 +1002,6 @@ namespace IRaCIS.Core.API.Controllers
 
         [HttpPost, Route("TrialSiteSurvey/UploadTrialSiteSurveyUser")]
         [DisableFormValueModelBinding]
-        [UnitOfWork]
         public async Task<IResponseOutput> UploadTrialSiteSurveyUser(Guid trialId, string baseUrl, string routeUrl,
     [FromServices] IRepository<TrialSite> _trialSiteRepository,
      [FromServices] IRepository<UserType> _usertypeRepository,

IRaCIS.Core.API/IRaCIS.Core.API.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <SignAssembly>false</SignAssembly>
     <UserSecretsId>354572d4-9e15-4099-807c-63a2d29ff9f2</UserSecretsId>
     <LangVersion>default</LangVersion>
@@ -85,6 +85,7 @@
     <PackageReference Include="Quartz.Extensions.Hosting" Version="3.7.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
     <PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.0.1" />
+    <PackageReference Include="Serilog.Sinks.Email" Version="2.4.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0" />
   </ItemGroup>

IRaCIS.Core.API/Properties/launchSettings.json

@@ -15,7 +15,7 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Uat_Study"
       },
-      "applicationUrl": "http://localhost:6101"
+      "applicationUrl": "http://localhost:6100"
     }
   }
 }

IRaCIS.Core.API/_ServiceExtensions/Serilog/SerilogSetup.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Builder;
 using Serilog;
 using Serilog.Events;
-//using Serilog.Sinks.Email;
+using Serilog.Sinks.Email;
 using System;
 using System.Net;
 

IRaCIS.Core.API/appsettings.Uat_Study.json

@@ -11,17 +11,26 @@
     "AliyunOSS": {
       "regionId": "cn-shanghai",
       "endpoint": "https://oss-cn-shanghai.aliyuncs.com",
-      "accessKeyId": "LTAI5tL9GrNqqvCWYWtfVfn9",
-      "accessKeySecret": "YAZuoDTenF7ljLcDPgNjvh93KemAxk",
-      "bucketName": "tl-med-sir-uat-store",
-      "roleArn": "acs:ram::1078130221702011:role/uat-oss-access",
-      "viewEndpoint": "https://tl-med-sir-uat-store.oss-cn-shanghai.aliyuncs.com",
+      "accessKeyId": "LTAI5tKvzs7ed3UfSpNk3xwQ",
+      "accessKeySecret": "zTIceGEShlZDGnLrCFfIGFE7TXVRio",
+      "bucketName": "zy-sir-uat-store",
+      "roleArn": "acs:ram::1899121822495495:role/oss-upload",
+      "viewEndpoint": "https://zy-sir-uat-store.oss-cn-shanghai.aliyuncs.com",
       "region": "oss-cn-shanghai"
+    },
+
+    "MinIO": {
+      "endpoint": "http://192.168.3.68",
+      "port": "8001",
+      "useSSL": false,
+      "accessKey": "IDFkwEpWej0b4DtiuThL",
+      "secretKey": "Lhuu83yMhVwu7c1SnjvGY6lq74jzpYqifK6Qtj4h",
+      "bucketName": "test"
     }
   },
   "ConnectionStrings": {
-    "RemoteNew": "Server=101.132.253.119,1435;Database=Uat_Study;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    "Hangfire": "Server=101.132.253.119,1435;Database=Uat_Study_hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
+    "RemoteNew": "Server=47.117.164.182,1434;Database=Uat.Study;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    "Hangfire": "Server=47.117.164.182,1434;Database=Uat.Study.hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
   },
   "BasicSystemConfig": {
 

IRaCIS.Core.Application/IRaCIS.Core.Application.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net6.0</TargetFramework>
 		<LangVersion>default</LangVersion>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>

IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs

@@ -23,9 +23,9 @@ using System.Linq;
 using Spire.Doc;
 using Microsoft.AspNetCore.Http;
 using System;
+using System.Runtime.InteropServices;
 using SharpCompress.Common;
 using SkiaSharp;
-using System.Runtime.InteropServices;
 
 namespace IRaCIS.Core.Application.Service
 {

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -18,6 +18,7 @@ using DocumentFormat.OpenXml.Drawing;
 using EasyCaching.Core;
 using Quartz;
 using IRaCIS.Application.Services.BackGroundJob;
+using EasyCaching.Core;
 
 namespace IRaCIS.Application.Services
 {

IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs

@@ -1712,24 +1712,14 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             else
             {
                 var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).ProjectTo<VisitTaskDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
-
-                var lastTaskId = default(Guid);
-                if (taskinfo.ReadingTaskState == ReadingTaskState.HaveSigned)
-                {
-                    lastTaskId = await _visitTaskRepository.Where(x => taskinfo.RelatedVisitTaskIdList.Contains(x.Id) && x.Id != taskinfo.Id).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync(); ;
-                }
-                else
-                {
-                     lastTaskId = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
-                       x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
-                       x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
-                        //x.DoctorUserId == taskinfo.DoctorUserId &&
-                        x.IsSelfAnalysis == taskinfo.IsSelfAnalysis &&
-                       x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ArmEnum == taskinfo.ArmEnum
-                       && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect
-                       ).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
-                }
-                 
+                var lastTaskId = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
+                     x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
+                     x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
+                      //x.DoctorUserId == taskinfo.DoctorUserId &&
+                      x.IsSelfAnalysis == taskinfo.IsSelfAnalysis &&
+                     x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ArmEnum == taskinfo.ArmEnum
+                     && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect
+                     ).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
                 lastVisitTaskId = lastTaskId;
                 return lastTaskId;
             }

IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs

@@ -1373,26 +1373,21 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         /// <returns></returns>
         private async Task<Guid> GetLastVisitTaskId(ReadingCalculateDto inDto)
         {
-            var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).ProjectTo<VisitTaskDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
+            // 拿到这一个访视
+            var thisNum = await _subjectVisitRepository.Where(x => x.Id == inDto.SubjectVisitId).Select(x => x.VisitNum).FirstOrDefaultAsync();
 
-            var lastTaskId = default(Guid);
-            if (taskinfo.ReadingTaskState == ReadingTaskState.HaveSigned)
-            {
-                lastTaskId = await _visitTaskRepository.Where(x => taskinfo.RelatedVisitTaskIdList.Contains(x.Id) && x.Id != taskinfo.Id).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync(); ;
-            }
-            else
-            {
-                lastTaskId = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
-                  x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
-                  x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
-                   //x.DoctorUserId == taskinfo.DoctorUserId &&
-                   x.IsSelfAnalysis == taskinfo.IsSelfAnalysis &&
-                  x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ArmEnum == taskinfo.ArmEnum
-                  && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect
-                  ).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
-            }
+            // 先找到上一个访视
+            var lastVisitId = await _subjectVisitRepository.Where(x => x.SubjectId == inDto.SubjectId && !x.IsLostVisit && x.VisitNum < thisNum).OrderByDescending(x => x.VisitNum).Select(x => x.Id).FirstOrDefaultAsync();
 
-            return lastTaskId;
+            // 找到访视任务Id
+
+            var LastVisitTaskId = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
+            x.TrialReadingCriterionId == inDto.TrialReadingCriterionId &&
+            x.TaskState == TaskState.Effect &&
+            x.IsAnalysisCreate == inDto.IsAnalysisCreate
+            && x.SourceSubjectVisitId == lastVisitId && x.ArmEnum==inDto.ArmEnum).Select(x => x.Id).FirstOrDefaultAsync();
+
+            return LastVisitTaskId;
         }
         #endregion
 

IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs

@@ -1368,26 +1368,21 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         /// <returns></returns>
         private async Task<Guid> GetLastVisitTaskId(ReadingCalculateDto inDto)
         {
-            var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).ProjectTo<VisitTaskDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
+            // 拿到这一个访视
+            var thisNum = await _subjectVisitRepository.Where(x => x.Id == inDto.SubjectVisitId).Select(x => x.VisitNum).FirstOrDefaultAsync();
 
-            var lastTaskId = default(Guid);
-            if (taskinfo.ReadingTaskState == ReadingTaskState.HaveSigned)
-            {
-                lastTaskId = await _visitTaskRepository.Where(x => taskinfo.RelatedVisitTaskIdList.Contains(x.Id) && x.Id != taskinfo.Id).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync(); ;
-            }
-            else
-            {
-                lastTaskId = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
-                  x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
-                  x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
-                   //x.DoctorUserId == taskinfo.DoctorUserId &&
-                   x.IsSelfAnalysis == taskinfo.IsSelfAnalysis &&
-                  x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ArmEnum == taskinfo.ArmEnum
-                  && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect
-                  ).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
-            }
+            // 先找到上一个访视
+            var lastVisitId = await _subjectVisitRepository.Where(x => x.SubjectId == inDto.SubjectId && !x.IsLostVisit && x.VisitNum < thisNum).OrderByDescending(x => x.VisitNum).Select(x => x.Id).FirstOrDefaultAsync();
 
-            return lastTaskId;
+            // 找到访视任务Id
+
+            var LastVisitTaskId = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
+            x.TrialReadingCriterionId == inDto.TrialReadingCriterionId &&
+            x.TaskState == TaskState.Effect &&
+            x.IsAnalysisCreate == inDto.IsAnalysisCreate
+            && x.SourceSubjectVisitId == lastVisitId && x.ArmEnum==inDto.ArmEnum).Select(x => x.Id).FirstOrDefaultAsync();
+
+            return LastVisitTaskId;
         }
         #endregion
 

IRaCIS.Core.Domain.Share/IRaCIS.Core.Domain.Share.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

IRaCIS.Core.Domain.Share/NetResource.cs

@@ -0,0 +1,50 @@
+using System.Runtime.InteropServices;
+
+namespace IRaCIS.Core.Domain.Share
+{
+    [StructLayout(LayoutKind.Sequential)]
+    public class NetResource
+    {
+        public int dwScope;
+        public int dwType;
+        public int dwDisplayType;
+        public int dwUsage;
+        public string lpLocalName;
+        public string lpRemoteName;
+        public string lpComment;
+        public string lpProvider;
+    }
+
+
+    public class WNetAddConnectionHelper
+    {
+        [DllImport("mpr.dll", EntryPoint = "WNetAddConnection2")]
+        private static extern uint WNetAddConnection2(NetResource lpNetResource, string lpPassword, string lpUsername, uint dwFlags);
+
+        [DllImport("mpr.dll")]
+        public static extern int WNetCancelConnection2A(string sharename, int dwFlags, int fForce);
+
+        public static void Connect()
+        {
+
+            var remoteName = @"\\192.168.1.119\Potomac_01";
+            NetResource netResource = new NetResource();
+            netResource.dwScope = 1;
+            netResource.dwType = 1;
+            netResource.dwDisplayType = 3;
+            netResource.dwUsage = 1;
+            netResource.lpLocalName = "W:";
+            netResource.lpRemoteName = remoteName.TrimEnd('\\');
+
+            WNetAddConnection2(netResource, "Everest@suzhou406", "share", 1);
+
+        }
+
+        public static int Disconnect()
+        {
+            return WNetCancelConnection2A("W:", 1, 1);
+        }
+
+    }
+}
+

IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net6.0</TargetFramework>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

IRaCIS.Core.Domain/Institution/Site.cs

@@ -37,7 +37,8 @@ namespace IRaCIS.Core.Domain.Models
         public DateTime CreateTime { get; set; } = DateTime.Now;
         public Guid UpdateUserId { get; set; } = Guid.Empty;
         public DateTime UpdateTime { get; set; } = DateTime.Now;
-
+        [JsonIgnore]
+        public List<Subject> SubjectList { get; set; }
 
         //导航属性
         [JsonIgnore]

IRaCIS.Core.Domain/SQLFile/20220808.sql

@@ -3,4 +3,14 @@
 update TrialSiteUserSurvey  set TrialRoleCode= (select Code from Dictionary where Id=TrialSiteUserSurvey.TrialRoleNameId)
 
 --邮件发送维护
-update TrialEmailNoticeConfig set AttachCNPath=FilePath,AttachPath=FilePath,AttachNameCN=FileName,AttachName=FileName
+update TrialEmailNoticeConfig set AttachCNPath=FilePath,AttachPath=FilePath,AttachNameCN=FileName,AttachName=FileName
+
+
+UPDATE DicomSeries
+SET ImageResizePath = REPLACE(ImageResizePath, 'http://zyypacs.oss-cn-shanghai.aliyuncs.com', '')
+WHERE ImageResizePath LIKE 'http://zyypacs.oss-cn-shanghai.aliyuncs.com%';
+
+
+UPDATE DicomSeries
+SET ImageResizePath = REPLACE(ImageResizePath, 'http://zyypacs-uat.oss-cn-shanghai.aliyuncs.com', '')
+WHERE ImageResizePath LIKE 'http://zyypacs-uat.oss-cn-shanghai.aliyuncs.com%';

IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net6.0</TargetFramework>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

IRaCIS.Core.Test/DbHelper.ttinclude

@@ -1,7 +1,7 @@
 <#+
 	public class config
 	{
-        public static readonly string ConnectionString = "Server=123.56.94.154,1433\\MSSQLSERVER;Database=Test.Study;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true";
+        public static readonly string ConnectionString = "Server=106.14.89.110,1435;Database=Test_Study;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true";
         public static readonly string DbDatabase = "Test.Study";
         //表名称用字符串,拼接
         public static readonly string TableName = "SubjectVisitClinicalDialog";

IRaCIS.Core.Test/IRaCIS.Core.Test.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
 
@@ -26,10 +26,6 @@
       <LastGenOutput>IRaCIS .Core.ServiceAsync.cs</LastGenOutput>
       <Generator>TextTemplatingFileGenerator</Generator>
     </None>
-    <None Update="TT_Template\IRaCIS .Core.IServiceAsync.tt">
-      <LastGenOutput>IRaCIS .Core.IServiceAsync.cs</LastGenOutput>
-      <Generator>TextTemplatingFileGenerator</Generator>
-    </None>
     <None Update="TT_Template\IRaCIS.Core.Dto.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>IRaCIS.Core.Dto.cs</LastGenOutput>
@@ -61,46 +57,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="TT_Template\IRaCIS .Core.IServiceAsync.cs">
-      <DependentUpon>IRaCIS .Core.IServiceAsync.tt</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="TT_Template\IRaCIS .Core.ServiceAsync.cs">
-      <DependentUpon>IRaCIS .Core.ServiceAsync.tt</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="TT_Template\IRaCIS.Core.Dto.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>IRaCIS.Core.Dto.tt</DependentUpon>
-    </Compile>
-    <Compile Update="TT_Template\IRaCIS.Core.Entity.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>IRaCIS.Core.Entity.tt</DependentUpon>
-    </Compile>
     <Compile Update="TT_Template\IRaCIS.Core.IRepository.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>IRaCIS.Core.IRepository.tt</DependentUpon>
     </Compile>
-    <Compile Update="TT_Template\IRaCIS.Core.IServices.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>IRaCIS.Core.IServices.tt</DependentUpon>
-    </Compile>
-    <Compile Update="TT_Template\IRaCIS.Core.Repository.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>IRaCIS.Core.Repository.tt</DependentUpon>
-    </Compile>
-    <Compile Update="TT_Template\IRaCIS.Core.Services.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>IRaCIS.Core.Services.tt</DependentUpon>
-    </Compile>
   </ItemGroup>
 
   <ItemGroup>

IRaCIS.Core.Test/TT_Template/IRaCIS .Core.IServiceAsync.cs

@@ -1,10 +0,0 @@
-
-
-//在这里设置 isPage 是否生成分页的还是不分页
-
-
-
-
-
-
-

IRaCIS.Core.Test/TT_Template/IRaCIS .Core.ServiceAsync.cs

@@ -1,9 +0,0 @@
-
-
-
-
-//在这里设置 isPage 是否生成分页的还是不分页
-
-
-
-

IRaCIS.Core.Test/TT_Template/IRaCIS.Core.Dto.cs

@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-

IRaCIS.Core.Test/TT_Template/IRaCIS.Core.Entity.cs

@@ -1,3 +0,0 @@
-
-
-

IRaCIS.Core.Test/TT_Template/IRaCIS.Core.IServices.cs

@@ -1,10 +0,0 @@
-
-
-//在这里设置 isPage 是否生成分页的还是不分页
-
-
-
-
-
-
-

IRaCIS.Core.Test/TT_Template/IRaCIS.Core.Repository.cs

@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-

IRaCIS.Core.Test/TT_Template/IRaCIS.Core.Services.cs

@@ -1,9 +0,0 @@
-
-
-
-
-//在这里设置 isPage 是否生成分页的还是不分页
-
-
-
-

irc_api.drone.yml

@@ -1,3 +1,114 @@
+kind: pipeline
+type: docker
+name: irc-netcore-api
+
+clone:
+  disable: true  #禁用默认克隆
+
+steps:
+- name: clone-repo
+  image: alpine/git
+  pull: if-not-exists
+  volumes:
+    - name: irc-test-work
+      path: /work
+  commands:
+    - if [ ! -e /work/netcore-repo/.git ]; then
+        git clone -b Test.IRC http://192.168.3.68:2000/XCKJ/irc-netcore-api.git  /work/netcore-repo;
+      else
+        cd /work/netcore-repo;
+        git pull;
+      fi
+
+    - |
+      if [ ! -e Dockerfile ]; then
+        echo 'FROM mcr.microsoft.com/dotnet/aspnet:6.0 
+        EXPOSE 80 
+        WORKDIR /app 
+        COPY publish . 
+        ENTRYPOINT ["dotnet", "IRaCIS.Core.API.dll"]' > /work/Dockerfile
+      fi
+
+- name: restore-publish
+  image: mcr.microsoft.com/dotnet/sdk:6.0
+  pull: if-not-exists
+  depends_on:
+    - clone-repo
+  volumes:
+    - name: nuget-packages
+      path: /root/.nuget/packages
+    - name: irc-test-work
+      path: /work
+  commands:
+    - cd /work/netcore-repo/IRaCIS.Core.API
+    - dotnet restore ./IRaCIS.Core.API.csproj
+    - rm -rf /work/publish
+    - cd  /work/netcore-repo/IRaCIS.Core.API
+    - dotnet publish ./IRaCIS.Core.API.csproj -c Release --no-restore -o /work/publish
+
+
+- name: docker-build
+  image: docker
+  pull: if-not-exists
+  depends_on:
+    - restore-publish
+  commands:
+    - cd /work
+    - docker build -t test-irc:v${DRONE_BUILD_NUMBER} .
+  volumes:
+    - name: irc-test-work
+      path: /work
+    - name: dockersock
+      path: /var/run/docker.sock
+
+
+volumes:
+  - name: nuget-packages
+    host:
+      path: /opt/cicd/nuget/packages
+  - name: irc-test-work
+    host:
+      path: /opt/cicd/irc-test 
+  - name: dockersock
+    host:
+      path: /var/run/docker.sock
+      
+trigger:
+  branch:
+    - master   
+    
+---
+kind: pipeline
+type: ssh
+name: ssh-linux-test-irc-publish
+
+platform:
+  os: Linux
+  arch: 386
+  
+clone:
+  disable: true  #禁用默认克隆
+  
+server:
+  host: 106.14.89.110
+  user: root
+  password:
+    from_secret: test_ssh_pwd
+
+steps:
+- name: publish-test-irc
+  commands:
+  - echo start publish test-irc-api
+  - cd /opt/1panel/hang/devops/test-irc
+  - sh test-irc.sh v${DRONE_BUILD_NUMBER}
+  
+trigger:
+  branch:
+    - Test.IRC    
+       
+---
+
+      
 kind: pipeline
 type: ssh
 name: ssh-linux-test-study-publish
@@ -16,23 +127,14 @@ server:
     from_secret: test_ssh_pwd
   
 steps:
-  - name: publish-test-sir(study)
-    commands:
-      - bash /opt/1panel/xc-deploy-new/Test_Study/devops-publish/test-branch-publish.sh
-  - name: notify-wecom
-    commands:
-      - bash /opt/1panel/xc-deploy-new/devops-center/drone-notify-wecom.sh "$DRONE_BUILD_STATUS" "$DRONE_REPO_NAME" "$DRONE_BRANCH" "$DRONE_BUILD_NUMBER" "4355b98e-1e72-4678-8dfb-2fc6ad0bf449" "$DRONE_COMMIT_MESSAGE" "$DRONE_COMMIT_AUTHOR" "Test_Study_API" "sir.test.extimaging.com"
-    when:
-      status:
-        - success
-        - failure
+- name: publish-test-study
+  commands:
+  - echo start publish test-study-api
+  - cd /opt/1panel/hang/devops/test-study
+  - sh test-study.sh v${DRONE_BUILD_NUMBER}
   
 trigger:
   branch:
-    - Test_Study_Net8  
-
-
+    - Test.Study  
     
-
-