From 224097311c48250b36ab642380e9419dbe88f88f Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 25 Dec 2023 14:47:34 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6?=
=?UTF-8?q?=E7=8E=AF=E5=A2=83oss=20=20=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRaCIS.Core.API/appsettings.Event_IRC.json | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/IRaCIS.Core.API/appsettings.Event_IRC.json b/IRaCIS.Core.API/appsettings.Event_IRC.json
index cae85863f..6e3f5aa3a 100644
--- a/IRaCIS.Core.API/appsettings.Event_IRC.json
+++ b/IRaCIS.Core.API/appsettings.Event_IRC.json
@@ -11,20 +11,17 @@
"Hangfire": "Server=47.117.164.182,1434;Database=Event_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
},
"ObjectStoreService": {
-
"ObjectStoreUse": "AliyunOSS",
-
"AliyunOSS": {
"regionId": "cn-shanghai",
"endpoint": "https://oss-cn-shanghai.aliyuncs.com",
"accessKeyId": "LTAI5tKvzs7ed3UfSpNk3xwQ",
"accessKeySecret": "zTIceGEShlZDGnLrCFfIGFE7TXVRio",
- "bucketName": "zy-irc-uat-store",
+ "bucketName": "zy-irc-store",
"roleArn": "acs:ram::1899121822495495:role/oss-upload",
- "viewEndpoint": "https://zy-irc-uat-store.oss-cn-shanghai.aliyuncs.com",
+ "viewEndpoint": "https://zy-irc-cache.oss-cn-shanghai.aliyuncs.com",
"region": "oss-cn-shanghai"
},
-
"MinIO": {
"endpoint": "http://192.168.3.68",
"port": "8001",
From 9512846bb0e49dc8c45b32b437acced0d3819be0 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 26 Dec 2023 09:24:29 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AD=BE=E5=90=8D?=
=?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=9F=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Service/Document/TrialDocumentService.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
index 11331bd45..06869ba94 100644
--- a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
+++ b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
@@ -682,7 +682,7 @@ namespace IRaCIS.Core.Application.Services
///
///
[HttpPut("{documentId:guid}/{isSystemDoc:bool}")]
- [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })]
+ [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt", "SignSystemDocNoTrialId" })]
public async Task UserAbandonDoc(Guid documentId, bool isSystemDoc)
{
if (isSystemDoc)
From f8ca73c164c56aa0542eb372f847ca81f5ae561d Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 27 Dec 2023 10:46:45 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=9C=8D=E5=8A=A1=E5=99=A8=E8=BF=9E=E6=8E=A5?=
=?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRaCIS.Core.API/appsettings.Test_IRC.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/IRaCIS.Core.API/appsettings.Test_IRC.json b/IRaCIS.Core.API/appsettings.Test_IRC.json
index 971c23c0d..6d1b2efcb 100644
--- a/IRaCIS.Core.API/appsettings.Test_IRC.json
+++ b/IRaCIS.Core.API/appsettings.Test_IRC.json
@@ -7,8 +7,8 @@
}
},
"ConnectionStrings": {
- "RemoteNew": "Server=101.132.193.237,1435;Database=Test_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
- "Hangfire": "Server=101.132.193.237,1435;Database=Test_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
+ "RemoteNew": "Server=123.56.94.154,1435;Database=Test_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+ "Hangfire": "Server=123.56.94.154,1435;Database=Test_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
},