From 31d22e2b4f1bfa2466f337af71a4e0955a77ce3f Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 4 Jul 2024 14:31:50 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BE=8E=E5=9B=BD?=
=?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=E6=96=87?=
=?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRaCIS.Core.API/appsettings.US_Prod_IRC.json | 74 ++++++++++++++++++++
1 file changed, 74 insertions(+)
create mode 100644 IRaCIS.Core.API/appsettings.US_Prod_IRC.json
diff --git a/IRaCIS.Core.API/appsettings.US_Prod_IRC.json b/IRaCIS.Core.API/appsettings.US_Prod_IRC.json
new file mode 100644
index 000000000..ff75d90b9
--- /dev/null
+++ b/IRaCIS.Core.API/appsettings.US_Prod_IRC.json
@@ -0,0 +1,74 @@
+{
+ "Logging": {
+ "LogLevel": {
+ "Default": "Information",
+ "Microsoft": "Warning",
+ "Microsoft.Hosting.Lifetime": "Information"
+ }
+ },
+ "ConnectionStrings": {
+ "RemoteNew": "Server=us-prod-mssql-service,1433;Database=US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+ "Hangfire": "Server=us-prod-mssql-service,1433;Database=US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
+ },
+
+ "ObjectStoreService": {
+ "ObjectStoreUse": "AWS",
+ "AliyunOSS": {
+ "regionId": "cn-shanghai",
+ "endPoint": "https://oss-cn-shanghai.aliyuncs.com",
+ "accessKeyId": "",
+ "accessKeySecret": "",
+ "bucketName": "zy-irc-test-store",
+ "roleArn": "acs:ram::1899121822495495:role/oss-upload",
+ "viewEndpoint": "https://zy-irc-test-store.oss-cn-shanghai.aliyuncs.com",
+ "region": "oss-cn-shanghai"
+ },
+
+ "MinIO": {
+ "endPoint": "192.168.3.68",
+ "port": "8001",
+ "useSSL": false,
+ "accessKey": "IDFkwEpWej0b4DtiuThL",
+ "secretKey": "Lhuu83yMhVwu7c1SnjvGY6lq74jzpYqifK6Qtj4h",
+ "bucketName": "test",
+ "viewEndpoint": "http://192.168.3.68:8001/test/"
+ },
+
+ "AWS": {
+ "endPoint": "s3.us-east-1.amazonaws.com",
+ "useSSL": true,
+ "accessKey": "AKIAW3MEAFJX5P32P6NA",
+ "secretKey": "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",
+ "bucketName": "ei-med-s3-lili-store",
+ "viewEndpoint": "https://ei-med-s3-lili-store.s3.amazonaws.com/"
+ }
+ },
+ "BasicSystemConfig": {
+
+ "OpenUserComplexPassword": false,
+
+ "OpenSignDocumentBeforeWork": false,
+
+ "OpenTrialRelationDelete": true,
+
+ "OpenLoginLimit": false,
+
+ "LoginMaxFailCount": 5,
+
+ "LoginFailLockMinutes": 30,
+ "AutoLoginOutMinutes": 60
+ },
+
+ "SystemEmailSendConfig": {
+ "Port": 465,
+ "Host": "smtp.qiye.aliyun.com",
+ "FromEmail": "test@extimaging.com",
+ "FromName": "Test_IRC",
+ "AuthorizationCode": "SHzyyl2021",
+ "CompanyName": "Elevate Imaging",
+ "CompanyNameCN": "上海展影医疗科技有限公司",
+ "CompanyShortName": "Elevate Imaging",
+ "CompanyShortNameCN": "展影医疗"
+ }
+
+}
From b1be0e2a984b17b812d86a50a593587f7c5179f4 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 5 Jul 2024 09:07:57 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRaCIS.Core.API/appsettings.US_Prod_IRC.json | 2 ++
IRaCIS.Core.Application/IRaCIS.Core.Application.xml | 7 +++++++
2 files changed, 9 insertions(+)
diff --git a/IRaCIS.Core.API/appsettings.US_Prod_IRC.json b/IRaCIS.Core.API/appsettings.US_Prod_IRC.json
index ff75d90b9..ceeb34e5f 100644
--- a/IRaCIS.Core.API/appsettings.US_Prod_IRC.json
+++ b/IRaCIS.Core.API/appsettings.US_Prod_IRC.json
@@ -9,6 +9,8 @@
"ConnectionStrings": {
"RemoteNew": "Server=us-prod-mssql-service,1433;Database=US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
"Hangfire": "Server=us-prod-mssql-service,1433;Database=US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
+ //"RemoteNew": "Server=44.210.231.169,1435;Database=US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+ //"Hangfire": "Server=44.210.231.169,1435;Database=US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
},
"ObjectStoreService": {
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index ebd172a4c..4a3b09d4b 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -14634,6 +14634,13 @@
+
+
+ 重置阅片任务
+
+
+
+
验证阅片休息时间
From 643574666052b383cba6b6e9748b33f95e9b574c Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 5 Jul 2024 10:24:11 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRaCIS.Core.API/appsettings.Prod_IRC.json | 2 +-
IRaCIS.Core.API/appsettings.Test_IRC.json | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/IRaCIS.Core.API/appsettings.Prod_IRC.json b/IRaCIS.Core.API/appsettings.Prod_IRC.json
index 257d517e3..fdd20e47a 100644
--- a/IRaCIS.Core.API/appsettings.Prod_IRC.json
+++ b/IRaCIS.Core.API/appsettings.Prod_IRC.json
@@ -42,7 +42,7 @@
"LoginMaxFailCount": 5,
"LoginFailLockMinutes": 30,
- "AutoLoginOutMinutes": 60,
+ "AutoLoginOutMinutes": 120,
"OpenLoginMFA": false
diff --git a/IRaCIS.Core.API/appsettings.Test_IRC.json b/IRaCIS.Core.API/appsettings.Test_IRC.json
index 44e6a76ad..9ef5c0ff1 100644
--- a/IRaCIS.Core.API/appsettings.Test_IRC.json
+++ b/IRaCIS.Core.API/appsettings.Test_IRC.json
@@ -9,7 +9,6 @@
"ConnectionStrings": {
"RemoteNew": "Server=106.14.89.110,1435;Database=Test_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
"Hangfire": "Server=106.14.89.110,1435;Database=Test_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
-
},
"ObjectStoreService": {
@@ -35,7 +34,6 @@
"bucketName": "irc-test",
"viewEndpoint": "https://hir-oss.test.extimaging.com/irc-test"
},
-
"AWS": {
"endPoint": "s3.us-east-1.amazonaws.com",
"useSSL": true,
From c32ec2f1321a72f7c31cf5f4702ce360c7e85c1c Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 8 Jul 2024 11:38:47 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=BE=8E=E5=9B=BD=E9=AA=8C=E8=AF=81?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRaCIS.Core.API/appsettings.Prod_IRC.json | 2 +-
IRaCIS.Core.API/appsettings.US_Prod_IRC.json | 12 +--
IRaCIS.Core.API/appsettings.US_Test_IRC.json | 82 +++++++++++++++++++
...S_IRC.json => appsettings.US_Uat_IRC.json} | 21 +++--
4 files changed, 103 insertions(+), 14 deletions(-)
create mode 100644 IRaCIS.Core.API/appsettings.US_Test_IRC.json
rename IRaCIS.Core.API/{appsettings.US_IRC.json => appsettings.US_Uat_IRC.json} (82%)
diff --git a/IRaCIS.Core.API/appsettings.Prod_IRC.json b/IRaCIS.Core.API/appsettings.Prod_IRC.json
index fdd20e47a..7d6013b68 100644
--- a/IRaCIS.Core.API/appsettings.Prod_IRC.json
+++ b/IRaCIS.Core.API/appsettings.Prod_IRC.json
@@ -42,7 +42,7 @@
"LoginMaxFailCount": 5,
"LoginFailLockMinutes": 30,
- "AutoLoginOutMinutes": 120,
+ "AutoLoginOutMinutes": 360,
"OpenLoginMFA": false
diff --git a/IRaCIS.Core.API/appsettings.US_Prod_IRC.json b/IRaCIS.Core.API/appsettings.US_Prod_IRC.json
index ceeb34e5f..9831fa664 100644
--- a/IRaCIS.Core.API/appsettings.US_Prod_IRC.json
+++ b/IRaCIS.Core.API/appsettings.US_Prod_IRC.json
@@ -27,13 +27,13 @@
},
"MinIO": {
- "endPoint": "192.168.3.68",
- "port": "8001",
+ "endPoint": "44.210.231.169",
+ "port": "9001",
"useSSL": false,
- "accessKey": "IDFkwEpWej0b4DtiuThL",
- "secretKey": "Lhuu83yMhVwu7c1SnjvGY6lq74jzpYqifK6Qtj4h",
- "bucketName": "test",
- "viewEndpoint": "http://192.168.3.68:8001/test/"
+ "accessKey": "e9bT1isTOqSAUxb6wd4n",
+ "secretKey": "b5TaDzNdQCBtCvfm8eZ3dR6yY7tfZu2JYze2Po1i",
+ "bucketName": "prod-irc-us",
+ "viewEndpoint": "http://44.210.231.169:9001/prod-irc-us/"
},
"AWS": {
diff --git a/IRaCIS.Core.API/appsettings.US_Test_IRC.json b/IRaCIS.Core.API/appsettings.US_Test_IRC.json
new file mode 100644
index 000000000..5278ddb56
--- /dev/null
+++ b/IRaCIS.Core.API/appsettings.US_Test_IRC.json
@@ -0,0 +1,82 @@
+{
+ "Logging": {
+ "LogLevel": {
+ "Default": "Information",
+ "Microsoft": "Warning",
+ "Microsoft.Hosting.Lifetime": "Information"
+ }
+ },
+ "ConnectionStrings": {
+ "RemoteNew": "Server=106.14.89.110,1435;Database=Test_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+ "Hangfire": "Server=106.14.89.110,1435;Database=Test_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
+ },
+
+ "ObjectStoreService": {
+
+ "ObjectStoreUse": "MinIO",
+ "AliyunOSS": {
+ "regionId": "cn-shanghai",
+ "endPoint": "https://oss-cn-shanghai.aliyuncs.com",
+ "accessKeyId": "LTAI5tKvzs7ed3UfSpNk3xwQ",
+ "accessKeySecret": "zTIceGEShlZDGnLrCFfIGFE7TXVRio",
+ "bucketName": "zy-irc-test-store",
+ "roleArn": "acs:ram::1899121822495495:role/oss-upload",
+ "viewEndpoint": "https://zy-irc-test-store.oss-cn-shanghai.aliyuncs.com",
+ "region": "oss-cn-shanghai"
+ },
+
+ "MinIO": {
+ //"endPoint": "hir-oss.uat.extimaging.com",
+ //"port": "443",
+ //"useSSL": true,
+ //"viewEndpoint": "https://hir-oss.uat.extimaging.com/hir-uat",
+
+ "endPoint": "47.117.164.182",
+ "port": "9001",
+ "useSSL": false,
+ "viewEndpoint": "http://47.117.164.182:9001/test-irc-us",
+
+ "accessKey": "b9Ul0e98xPzt6PwRXA1Q",
+ "secretKey": "DzMaU2L4OXl90uytwOmDXF2encN0Jf4Nxu2XkYqQ",
+ "bucketName": "test-irc-us"
+
+ },
+
+ "AWS": {
+ "endPoint": "s3.us-east-1.amazonaws.com",
+ "useSSL": true,
+ "accessKey": "AKIAZQ3DRSOHFPJJ6FEU",
+ "secretKey": "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",
+ "bucketName": "ei-irc-test-store",
+ "viewEndpoint": "https://ei-irc-test-store.s3.amazonaws.com/"
+ }
+ },
+ "BasicSystemConfig": {
+
+ "OpenUserComplexPassword": false,
+
+ "OpenSignDocumentBeforeWork": false,
+
+ "OpenTrialRelationDelete": true,
+
+ "OpenLoginLimit": false,
+
+ "LoginMaxFailCount": 5,
+
+ "LoginFailLockMinutes": 30,
+ "AutoLoginOutMinutes": 60
+ },
+
+ "SystemEmailSendConfig": {
+ "Port": 465,
+ "Host": "smtp.qiye.aliyun.com",
+ "FromEmail": "test@extimaging.com",
+ "FromName": "Test_IRC",
+ "AuthorizationCode": "SHzyyl2021",
+ "CompanyName": "Elevate Imaging",
+ "CompanyNameCN": "上海展影医疗科技有限公司",
+ "CompanyShortName": "Elevate Imaging",
+ "CompanyShortNameCN": "展影医疗"
+ }
+
+}
diff --git a/IRaCIS.Core.API/appsettings.US_IRC.json b/IRaCIS.Core.API/appsettings.US_Uat_IRC.json
similarity index 82%
rename from IRaCIS.Core.API/appsettings.US_IRC.json
rename to IRaCIS.Core.API/appsettings.US_Uat_IRC.json
index fe1312e46..212bae7ab 100644
--- a/IRaCIS.Core.API/appsettings.US_IRC.json
+++ b/IRaCIS.Core.API/appsettings.US_Uat_IRC.json
@@ -16,7 +16,7 @@
"ObjectStoreService": {
- "ObjectStoreUse": "AWS",
+ "ObjectStoreUse": "MinIO",
"AliyunOSS": {
"regionId": "cn-shanghai",
@@ -30,13 +30,20 @@
},
"MinIO": {
- "endPoint": "192.168.3.68",
- "port": "8001",
+ //"endPoint": "hir-oss.us.extimaging.com",
+ //"port": "443",
+ //"useSSL": true,
+ //"viewEndpoint": "https://hir-oss.us.extimaging.com/hir-us",
+
+ "endPoint": "44.218.11.19",
+ "port": "9001",
"useSSL": false,
- "accessKey": "IDFkwEpWej0b4DtiuThL",
- "secretKey": "Lhuu83yMhVwu7c1SnjvGY6lq74jzpYqifK6Qtj4h",
- "bucketName": "test",
- "viewEndpoint": "http://192.168.3.68:8001/test/"
+ "viewEndpoint": "http://44.218.11.19:9001/uat-irc-us",
+
+ "accessKey": "lH8DkKskLuDqPaiubuSQ",
+ "secretKey": "pdPdicvvLeH7xAC5yFUrI7odMyBfOXxvVWMvKYV4",
+ "bucketName": "uat-irc-us"
+
},
"AWS": {