From 3dbf6dc897bd721308b61e9bc920a288495556c8 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 6 Dec 2023 17:14:11 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BAutf8=20=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Domain/Trial/Trial.cs | 112 +++++++++++++++--------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs index 54cb8ba39..751903e6f 100644 --- a/IRaCIS.Core.Domain/Trial/Trial.cs +++ b/IRaCIS.Core.Domain/Trial/Trial.cs @@ -1,4 +1,4 @@ -using System; +锘縰sing System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; @@ -87,12 +87,12 @@ namespace IRaCIS.Core.Domain.Models [StringLength(512)] public string Indication { get; set; } = string.Empty; - //入组那一块的状态 + //鍏ョ粍閭ｄ竴鍧楃殑鐘舵 //[ConcurrencyCheck] public int TrialEnrollStatus { get; set; } - //启动状态 + //鍚姩鐘舵 [StringLength(500)] public string TrialStatusStr { get; set; } = StaticData.TrialState.TrialInitializing; @@ -142,15 +142,15 @@ namespace IRaCIS.Core.Domain.Models - //废弃 - //public AttendedReviewerType AttendedReviewerType { get; set; } = AttendedReviewerType.CN;//0全部中国医生 1美国医生 2既有中国医生，也有美国医生 + //搴熷純 + //public AttendedReviewerType AttendedReviewerType { get; set; } = AttendedReviewerType.CN;//0鍏ㄩ儴涓浗鍖荤敓 1缇庡浗鍖荤敓 2鏃㈡湁涓浗鍖荤敓锛屼篃鏈夌編鍥藉尰鐢 - ////废弃 + ////搴熷純 //[JsonIgnore] //[ForeignKey("DeclarationTypeId")] //public Dictionary DeclarationType { get; set; } - //废弃 + //搴熷純 //public Guid DeclarationTypeId { get; set; } = Guid.Empty; @@ -173,66 +173,66 @@ namespace IRaCIS.Core.Domain.Models public bool VisitPlanConfirmed { get; set; } /// - /// 受试者编号具体规则 + /// 鍙楄瘯鑰呯紪鍙峰叿浣撹鍒 /// public string SubjectCodeRule { get; set; } = StaticData.International("Trial_number"); /// - /// 是否 提醒受试者编号规则 + /// 鏄惁 鎻愰啋鍙楄瘯鑰呯紪鍙疯鍒 /// public bool IsNoticeSubjectCodeRule { get; set; } = true; /// - /// 是否 有基准时间（首次给药时间） + /// 鏄惁 鏈夊熀鍑嗘椂闂达紙棣栨缁欒嵂鏃堕棿锛 /// public bool IsHaveFirstGiveMedicineDate { get; set; } = true; /// - /// 是否有 受试者年龄 + /// 鏄惁鏈 鍙楄瘯鑰呭勾榫 /// public bool IsHaveSubjectAge { get; set; } = false; /// - /// 是否有 入组性确认 + /// 鏄惁鏈 鍏ョ粍鎬х‘璁 /// public bool IsEnrollementQualificationConfirm { get; set; } = false; /// - /// 出组后计划外访视名称 + /// 鍑虹粍鍚庤鍒掑璁胯鍚嶇О /// public string OutEnrollmentVisitName { get; set; } = "EOT"; /// - /// 是否 验证拍片日期 + /// 鏄惁 楠岃瘉鎷嶇墖鏃ユ湡 /// public bool IsVerifyVisitImageDate { get; set; } = true; /// - /// 临床信息传输 1：系统录入 2：系统录入+PDF 0：无 + /// 涓村簥淇℃伅浼犺緭 1锛氱郴缁熷綍鍏 2锛氱郴缁熷綍鍏+PDF 0锛氭棤 /// public int ClinicalInformationTransmissionEnum { get; set; } = 1; /// - /// 是否审核 临床信息 + /// 鏄惁瀹℃牳 涓村簥淇℃伅 /// public bool IsCRAAuditClinicalInformation { get; set; } = false; /// - /// QC流程 0 不审，1 单审，2双审 + /// QC娴佺▼ 0 涓嶅锛1 鍗曞锛2鍙屽 /// public TrialQCProcess QCProcessEnum { get; set; } = TrialQCProcess.NotAudit; /// - /// 影像一致性核查 + /// 褰卞儚涓鑷存ф牳鏌 /// public bool IsImageConsistencyVerification { get; set; } = false; /// - /// 影像导出 + /// 褰卞儚瀵煎嚭 /// public bool IsImageExport { get; set; } = false; @@ -241,7 +241,7 @@ namespace IRaCIS.Core.Domain.Models - //阅片方式 + //闃呯墖鏂瑰紡 public int ReadingMode { get; set; } = 1; @@ -249,12 +249,12 @@ namespace IRaCIS.Core.Domain.Models public int ChangeDefalutDays { get; set; } = 5; /// - /// 跨项目复制 + /// 璺ㄩ」鐩鍒 /// public bool IsImageReplicationAcrossTrial { get; set; } = false; - public string BodyPartTypes { get; set; } = "鼻咽部|脑部|颈部|胸部|上/下腹部|盆腔|全身|其他"; + public string BodyPartTypes { get; set; } = "榧诲捊閮▅鑴戦儴|棰堥儴|鑳搁儴|涓/涓嬭吂閮▅鐩嗚厰|鍏ㄨ韩|鍏朵粬"; @@ -270,25 +270,25 @@ namespace IRaCIS.Core.Domain.Models - //PD 进展是否显示 配置访视 是否显示 PD进展 (从而可以设置状态) + //PD 杩涘睍鏄惁鏄剧ず 閰嶇疆璁胯 鏄惁鏄剧ず PD杩涘睍 (浠庤屽彲浠ヨ缃姸鎬) public bool IsPDProgressView { get; set; } - //研究方案号 + //鐮旂┒鏂规鍙 public string ResearchProgramNo { get; set; } - //实验名称 + //瀹為獙鍚嶇О public string ExperimentName { get; set; } - //主研单位 + //涓荤爺鍗曚綅 public string MainResearchUnit { get; set; } - // 负责人PI + // 璐熻矗浜篜I public string HeadPI { get; set; } public bool IsUrgent { get; set; } /// - /// 项目类型 1 正式项目、0 非正式项目 2是培训项目 + /// 椤圭洰绫诲瀷 1 姝ｅ紡椤圭洰銆0 闈炴寮忛」鐩 2鏄煿璁」鐩 /// time public TrialType TrialType { get; set; } @@ -306,7 +306,7 @@ namespace IRaCIS.Core.Domain.Models public bool IsSubjectSexView { get; set; } = false; - //配置Suject Edit页面 是否显示 加急 + //閰嶇疆Suject Edit椤甸潰 鏄惁鏄剧ず 鍔犳 public bool IsSubjectExpeditedView { get; set; } = false; @@ -314,14 +314,14 @@ namespace IRaCIS.Core.Domain.Models public bool IsDeleted { get; set; } - //QC 问题流程 + //QC 闂娴佺▼ public User QCQuestionConfirmedUser { get; set; } public Guid? QCQuestionConfirmedUserId { get; set; } public DateTime? QCQuestionConfirmedTime { get; set; } /// - /// 项目完成时间 + /// 椤圭洰瀹屾垚鏃堕棿 /// public DateTime? TrialFinishTime { get; set; } @@ -340,7 +340,7 @@ namespace IRaCIS.Core.Domain.Models public Guid? DeleteUserId { get; set; } /// - /// 同步临床数据时间 + /// 鍚屾涓村簥鏁版嵁鏃堕棿 /// public DateTime? SyncClinicalDataTime { get; set; } @@ -359,34 +359,34 @@ namespace IRaCIS.Core.Domain.Models public UserTypeEnum? PDProgressDefaultUserType { get; set; } - #region 邮件配置 + #region 閭欢閰嶇疆 /// - /// 发件箱账号 + /// 鍙戜欢绠辫处鍙 /// public string EmailFromEmail { get; set; } = string.Empty; /// - /// 发件人 + /// 鍙戜欢浜 /// public string EmailFromName { get; set; } = string.Empty; /// - /// 密码/授权码 + /// 瀵嗙爜/鎺堟潈鐮 /// public string EmailAuthorizationCode { get; set; } = string.Empty; /// - /// SMTP服务器 + /// SMTP鏈嶅姟鍣 /// public string EmailSMTPServerAddress { get; set; } = string.Empty; /// - /// SMTP端口 + /// SMTP绔彛 /// public int EmailSMTPServerPort { get; set; } /// - /// 是否配置过邮箱 + /// 鏄惁閰嶇疆杩囬偖绠 /// public bool IsConfigureEmail { get; set; } = false; #endregion @@ -395,20 +395,20 @@ namespace IRaCIS.Core.Domain.Models ///// - ///// 图像是否有标注 + ///// 鍥惧儚鏄惁鏈夋爣娉 ///// //public bool IsImageIabeled { get; set; } - ////阅片类型 + ////闃呯墖绫诲瀷 //public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double; //public bool IsGlobalReading { get; set; } = true; ///// - ///// 仲裁阅片 + ///// 浠茶闃呯墖 ///// //public bool? IsArbitrationReading { get; set; } = true; @@ -416,50 +416,50 @@ namespace IRaCIS.Core.Domain.Models ///// - ///// 1 Mint、2 PACS + ///// 1 Mint銆2 PACS ///// //public int ImagePlatform { get; set; } = 1; ///// - ///// 仲裁规则 + ///// 浠茶瑙勫垯 ///// //public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.None; - ////任务分配对象 + ////浠诲姟鍒嗛厤瀵硅薄 //public TaskAllocateObj TaskAllocateObjEnum { get; set; } - ////后续访视任务自动分配 + ////鍚庣画璁胯浠诲姟鑷姩鍒嗛厤 //public bool IsFollowVisitAutoAssign { get; set; } = true; - ////后续全局自动分配 + ////鍚庣画鍏ㄥ眬鑷姩鍒嗛厤 //public bool IsFollowGlobalVisitAutoAssign { get; set; } = true; //public bool IsFollowJudgeTaskAutoAssign { get; set; } = true; //public TaskAllocateDefaultState FollowJudgeTaskAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; - ////后续访视自动分配默认状态 + ////鍚庣画璁胯鑷姩鍒嗛厤榛樿鐘舵 //public TaskAllocateDefaultState FollowVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; - ////后续全局自动分配默认状态 + ////鍚庣画鍏ㄥ眬鑷姩鍒嗛厤榛樿鐘舵 //public TaskAllocateDefaultState FollowGlobalVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; - ////读片任务显示规则 + ////璇荤墖浠诲姟鏄剧ず瑙勫垯 //public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; } - ////读片任务显示是否顺序 + ////璇荤墖浠诲姟鏄剧ず鏄惁椤哄簭 //public bool IsReadingTaskViewInOrder { get; set; } = true; ///// - ///// 阅片是否显示受试者信息 + ///// 闃呯墖鏄惁鏄剧ず鍙楄瘯鑰呬俊鎭 ///// //public bool IsReadingShowSubjectInfo { get; set; } = false; ///// - ///// 阅片是否显示既往结果 + ///// 闃呯墖鏄惁鏄剧ず鏃㈠線缁撴灉 ///// //public bool IsReadingShowPreviousResults { get; set; } = false; @@ -467,7 +467,7 @@ namespace IRaCIS.Core.Domain.Models ///// - ///// 是确认医学审核问题 + ///// 鏄‘璁ゅ尰瀛﹀鏍搁棶棰 ///// //public bool IsConfirmMedicineQuestion { get; set; } = false; @@ -476,12 +476,12 @@ namespace IRaCIS.Core.Domain.Models ///// - ///// 阅片信息签名时间 + ///// 闃呯墖淇℃伅绛惧悕鏃堕棿 ///// //public DateTime? ReadingInfoSignTime { get; set; } ///// - ///// 阅片工具 + ///// 闃呯墖宸ュ叿 ///// //public ReadingTool? ReadingTool { get; set; } From 6c2a1e0a4bce7252d62475b1dc9d585962175630 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 7 Dec 2023 10:02:32 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/Program.cs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/IRaCIS.Core.API/Program.cs b/IRaCIS.Core.API/Program.cs index 1d037402b..38f1a2ee5 100644 --- a/IRaCIS.Core.API/Program.cs +++ b/IRaCIS.Core.API/Program.cs @@ -1,4 +1,4 @@ -using System; +锘縰sing System; using Autofac.Extensions.DependencyInjection; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; @@ -24,7 +24,7 @@ namespace IRaCIS.Core.API { try { - //以配置文件为准，否则 从url中取环境值(服务以命令行传递参数启动，配置文件配置了就不需要传递环境参数) + //浠ラ厤缃枃浠朵负鍑嗭紝鍚﹀垯 浠巙rl涓彇鐜鍊(鏈嶅姟浠ュ懡浠よ浼犻掑弬鏁板惎鍔紝閰嶇疆鏂囦欢閰嶇疆浜嗗氨涓嶉渶瑕佷紶閫掔幆澧冨弬鏁) var config = new ConfigurationBuilder() .AddEnvironmentVariables() .Build(); @@ -40,11 +40,11 @@ namespace IRaCIS.Core.API : "Development"; } - //Dicom 浏览 + //Dicom 娴忚 //ImageManager.SetImplementation(WinFormsImageManager.Instance); var host = CreateHostBuilder(args) - .UseEnvironment(enviromentName) //命令行传入环境 + .UseEnvironment(enviromentName) //鍛戒护琛屼紶鍏ョ幆澧 .ConfigureAppConfiguration((hostContext, config) => { @@ -58,20 +58,20 @@ namespace IRaCIS.Core.API //// Serilog SerilogExtension.AddSerilogSetup(enviromentName, host.Services); - Log.Logger.Warning($"当前环境：{enviromentName}"); + Log.Logger.Warning($"褰撳墠鐜锛歿enviromentName}"); if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { - Log.Logger.Warning($"当前部署平台环境：windows"); + Log.Logger.Warning($"褰撳墠閮ㄧ讲骞冲彴鐜锛歸indows"); } else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) { - Log.Logger.Warning($"当前部署平台环境：linux"); + Log.Logger.Warning($"褰撳墠閮ㄧ讲骞冲彴鐜锛歭inux"); } else { - Log.Logger.Warning($"当前部署平台环境：OSX or FreeBSD"); + Log.Logger.Warning($"褰撳墠閮ㄧ讲骞冲彴鐜锛歄SX or FreeBSD"); } NewId.SetProcessIdProvider(new CurrentProcessIdProvider()); @@ -97,13 +97,13 @@ namespace IRaCIS.Core.API { webBuilder.ConfigureKestrel((context, options) => { - //设置应用服务器Kestrel请求体最大为1GB // if don't set default value is: 30 MB + //璁剧疆搴旂敤鏈嶅姟鍣↘estrel璇锋眰浣撴渶澶т负1GB // if don't set default value is: 30 MB options.Limits.MaxRequestBodySize = long.MaxValue; options.Limits.KeepAliveTimeout = TimeSpan.FromMinutes(30); options.Limits.RequestHeadersTimeout = TimeSpan.FromMinutes(20); }); - //webBuilder.UseSerilog();//在宿主机启动的时候配置serilog,与微软ILogger进行整合 + //webBuilder.UseSerilog();//鍦ㄥ涓绘満鍚姩鐨勬椂鍊欓厤缃畇erilog,涓庡井杞疘Logger杩涜鏁村悎 webBuilder.UseStartup(); }).UseSerilog() .UseServiceProviderFactory(new AutofacServiceProviderFactory()); @@ -113,7 +113,7 @@ namespace IRaCIS.Core.API { var _repository = host.Services.GetService(typeof(IRepository)) as IRepository; - //初始化 国际化数据，并且监测国际化文件变更 + //鍒濆鍖 鍥介檯鍖栨暟鎹紝骞朵笖鐩戞祴鍥介檯鍖栨枃浠跺彉鏇 //await InternationalizationHelper.InitInternationlizationDataAndWatchJsonFileAsync(_repository); } From 589cd835766ff0609db9d144829e1057598dc843 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 7 Dec 2023 10:27:59 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/GrpcToken.proto | 32 +++++++++---------- IRaCIS.Core.API/Protos/GrpcToken.proto | 32 +++++++++---------- IRaCIS.Core.Domain/Management/Role.cs | 2 +- IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs | 2 +- IRaCIS.Core.IdentityServer4/appsettings.json | 12 +++---- IRaCIS.Core.Test/DbHelper.ttinclude | 4 +-- .../Protos/GrpcToken.proto | 32 +++++++++---------- 7 files changed, 58 insertions(+), 58 deletions(-) diff --git a/IRaCIS.Core.API/GrpcToken.proto b/IRaCIS.Core.API/GrpcToken.proto index ace5d4240..f14d65a66 100644 --- a/IRaCIS.Core.API/GrpcToken.proto +++ b/IRaCIS.Core.API/GrpcToken.proto @@ -1,16 +1,16 @@ -// 使用的是proto3版本 +// 浣跨敤鐨勬槸proto3鐗堟湰 syntax = "proto3"; -// 定义命名空间，后续生成代码时就会生成对应的命名空间 +// 瀹氫箟鍛藉悕绌洪棿锛屽悗缁敓鎴愪唬鐮佹椂灏变細鐢熸垚瀵瑰簲鐨勫懡鍚嶇┖闂 option csharp_namespace = "gRPC.ZHiZHUN.AuthServer.protos"; /* -每一句需要用分号结尾 -message 用来定义请求和返回数据格式 -tag message后面的值数字代表是字段的标识(tag),不是赋值， +姣忎竴鍙ラ渶瑕佺敤鍒嗗彿缁撳熬 +message 鐢ㄦ潵瀹氫箟璇锋眰鍜岃繑鍥炴暟鎹牸寮 +tag message鍚庨潰鐨勫兼暟瀛椾唬琛ㄦ槸瀛楁鐨勬爣璇(tag),涓嶆槸璧嬪硷紝 */ -// 新增用户时需要传递数据消息， 可理解为一个类 +// 鏂板鐢ㄦ埛鏃堕渶瑕佷紶閫掓暟鎹秷鎭紝 鍙悊瑙ｄ负涓涓被 message GetTokenReuqest{ string id=1; string userName=2; @@ -22,48 +22,48 @@ message GetTokenReuqest{ } -// 新增时返回的消息格式 +// 鏂板鏃惰繑鍥炵殑娑堟伅鏍煎紡 message GetTokenResponse { int32 code=1; string token =2; } -// service 用标识定义服务的，里面写对应的方法 +// service 鐢ㄦ爣璇嗗畾涔夋湇鍔＄殑锛岄噷闈㈠啓瀵瑰簲鐨勬柟娉 service TokenGrpcService{ - // 获取token + // 鑾峰彇token rpc GetUserToken(GetTokenReuqest) returns (GetTokenResponse); } /* -// 新增用户时需要传递数据消息， 可理解为一个类 +// 鏂板鐢ㄦ埛鏃堕渶瑕佷紶閫掓暟鎹秷鎭紝 鍙悊瑙ｄ负涓涓被 message AddUserReuqest{ string name=1; int32 age=2; bool isBoy=3; } -// 新增时返回的消息格式 +// 鏂板鏃惰繑鍥炵殑娑堟伅鏍煎紡 message ResultResponse { int32 code=1; string msg =2; } -//传递的查询条件信息格式，可理解为平时传入的查询条件对象 +//浼犻掔殑鏌ヨ鏉′欢淇℃伅鏍煎紡锛屽彲鐞嗚В涓哄钩鏃朵紶鍏ョ殑鏌ヨ鏉′欢瀵硅薄 message QueryUserReuqest{ string name=1; } -//查询返回的用户信息格式，可理解为返回的类 +//鏌ヨ杩斿洖鐨勭敤鎴蜂俊鎭牸寮忥紝鍙悊瑙ｄ负杩斿洖鐨勭被 message UserInfoResponse { string name=1; int32 age=2; string gender=3; } -// service 用标识定义服务的，里面写对应的方法 +// service 鐢ㄦ爣璇嗗畾涔夋湇鍔＄殑锛岄噷闈㈠啓瀵瑰簲鐨勬柟娉 service UserService{ - // 新增用户 + // 鏂板鐢ㄦ埛 rpc AddUser(AddUserReuqest) returns (ResultResponse); - // 查询用户 + // 鏌ヨ鐢ㄦ埛 rpc GetAllUser(QueryUserReuqest) returns (UserInfoResponse); } */ diff --git a/IRaCIS.Core.API/Protos/GrpcToken.proto b/IRaCIS.Core.API/Protos/GrpcToken.proto index ace5d4240..f14d65a66 100644 --- a/IRaCIS.Core.API/Protos/GrpcToken.proto +++ b/IRaCIS.Core.API/Protos/GrpcToken.proto @@ -1,16 +1,16 @@ -// 使用的是proto3版本 +// 浣跨敤鐨勬槸proto3鐗堟湰 syntax = "proto3"; -// 定义命名空间，后续生成代码时就会生成对应的命名空间 +// 瀹氫箟鍛藉悕绌洪棿锛屽悗缁敓鎴愪唬鐮佹椂灏变細鐢熸垚瀵瑰簲鐨勫懡鍚嶇┖闂 option csharp_namespace = "gRPC.ZHiZHUN.AuthServer.protos"; /* -每一句需要用分号结尾 -message 用来定义请求和返回数据格式 -tag message后面的值数字代表是字段的标识(tag),不是赋值， +姣忎竴鍙ラ渶瑕佺敤鍒嗗彿缁撳熬 +message 鐢ㄦ潵瀹氫箟璇锋眰鍜岃繑鍥炴暟鎹牸寮 +tag message鍚庨潰鐨勫兼暟瀛椾唬琛ㄦ槸瀛楁鐨勬爣璇(tag),涓嶆槸璧嬪硷紝 */ -// 新增用户时需要传递数据消息， 可理解为一个类 +// 鏂板鐢ㄦ埛鏃堕渶瑕佷紶閫掓暟鎹秷鎭紝 鍙悊瑙ｄ负涓涓被 message GetTokenReuqest{ string id=1; string userName=2; @@ -22,48 +22,48 @@ message GetTokenReuqest{ } -// 新增时返回的消息格式 +// 鏂板鏃惰繑鍥炵殑娑堟伅鏍煎紡 message GetTokenResponse { int32 code=1; string token =2; } -// service 用标识定义服务的，里面写对应的方法 +// service 鐢ㄦ爣璇嗗畾涔夋湇鍔＄殑锛岄噷闈㈠啓瀵瑰簲鐨勬柟娉 service TokenGrpcService{ - // 获取token + // 鑾峰彇token rpc GetUserToken(GetTokenReuqest) returns (GetTokenResponse); } /* -// 新增用户时需要传递数据消息， 可理解为一个类 +// 鏂板鐢ㄦ埛鏃堕渶瑕佷紶閫掓暟鎹秷鎭紝 鍙悊瑙ｄ负涓涓被 message AddUserReuqest{ string name=1; int32 age=2; bool isBoy=3; } -// 新增时返回的消息格式 +// 鏂板鏃惰繑鍥炵殑娑堟伅鏍煎紡 message ResultResponse { int32 code=1; string msg =2; } -//传递的查询条件信息格式，可理解为平时传入的查询条件对象 +//浼犻掔殑鏌ヨ鏉′欢淇℃伅鏍煎紡锛屽彲鐞嗚В涓哄钩鏃朵紶鍏ョ殑鏌ヨ鏉′欢瀵硅薄 message QueryUserReuqest{ string name=1; } -//查询返回的用户信息格式，可理解为返回的类 +//鏌ヨ杩斿洖鐨勭敤鎴蜂俊鎭牸寮忥紝鍙悊瑙ｄ负杩斿洖鐨勭被 message UserInfoResponse { string name=1; int32 age=2; string gender=3; } -// service 用标识定义服务的，里面写对应的方法 +// service 鐢ㄦ爣璇嗗畾涔夋湇鍔＄殑锛岄噷闈㈠啓瀵瑰簲鐨勬柟娉 service UserService{ - // 新增用户 + // 鏂板鐢ㄦ埛 rpc AddUser(AddUserReuqest) returns (ResultResponse); - // 查询用户 + // 鏌ヨ鐢ㄦ埛 rpc GetAllUser(QueryUserReuqest) returns (UserInfoResponse); } */ diff --git a/IRaCIS.Core.Domain/Management/Role.cs b/IRaCIS.Core.Domain/Management/Role.cs index e110af3df..20d75daa4 100644 --- a/IRaCIS.Core.Domain/Management/Role.cs +++ b/IRaCIS.Core.Domain/Management/Role.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models public string RoleDescription { get; set; } = string.Empty; public int Status { get; set; } - public int PrivilegeLevel { get; set; } //权限级别 + public int PrivilegeLevel { get; set; } //鏉冮檺绾у埆 public DateTime CreateTime { get; set; } = DateTime.Now; public Guid CreateUserId { get; set; } = Guid.Empty; diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs index d1c5de42d..5bd0f4904 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs @@ -6,7 +6,7 @@ using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models { /// - /// 运维人员与项目关联关系表 - 实体 + /// 杩愮淮浜哄憳涓庨」鐩叧鑱斿叧绯昏〃 - 瀹炰綋 /// [Table("TrialUser")] public partial class TrialUser : Entity, IAuditUpdate, IAuditAdd ,ISoftDelete diff --git a/IRaCIS.Core.IdentityServer4/appsettings.json b/IRaCIS.Core.IdentityServer4/appsettings.json index 46b2381b7..8994bd51f 100644 --- a/IRaCIS.Core.IdentityServer4/appsettings.json +++ b/IRaCIS.Core.IdentityServer4/appsettings.json @@ -5,10 +5,10 @@ "RemoteNew": "Server=123.56.181.144,14333\\MSSQLExpress14;Database=IRaCIS_New;User ID=sa;Password=dev123456DEV;" }, "JwtSetting": { - "SecurityKey": "3e6dbfa227234a03977a2f421bdb7f4f", // 密钥 - "Issuer": "IRaCIS", // 颁发者 - "Audience": "ZhiZhun", // 接收者 - "TokenExpireDays": "7" // 过期时间（7day） + "SecurityKey": "3e6dbfa227234a03977a2f421bdb7f4f", // 瀵嗛挜 + "Issuer": "IRaCIS", // 棰佸彂鑰 + "Audience": "ZhiZhun", // 鎺ユ敹鑰 + "TokenExpireDays": "7" // 杩囨湡鏃堕棿锛7day锛 }, "IpRateLimiting": { "EnableEndpointRateLimiting": true, //False: globally executed, true: executed for each @@ -69,7 +69,7 @@ }, - //网站根地址，为了访问文件 dicom 和上传的文档... 实测发现不用将域名拼接返回，浏览器会自动加上当前ip，避免了多环境读取环境配置文件 + //缃戠珯鏍瑰湴鍧锛屼负浜嗚闂枃浠 dicom 鍜屼笂浼犵殑鏂囨。... 瀹炴祴鍙戠幇涓嶇敤灏嗗煙鍚嶆嫾鎺ヨ繑鍥烇紝娴忚鍣ㄤ細鑷姩鍔犱笂褰撳墠ip锛岄伩鍏嶄簡澶氱幆澧冭鍙栫幆澧冮厤缃枃浠 //"RootUrl": "http://localhost:8060", "GrpcAddress": "http://123.56.181.144:7200", @@ -83,7 +83,7 @@ "UserCodePrefix": "U", "Share": false, // "FileSizeLimit": 1073741824, - "LoginExpiredTimeSpan": "：15", // Minute + "LoginExpiredTimeSpan": "锛15", // Minute "OpenLog": true, "AddClinicalInfo": true diff --git a/IRaCIS.Core.Test/DbHelper.ttinclude b/IRaCIS.Core.Test/DbHelper.ttinclude index 24c236c0c..2ef79dec6 100644 --- a/IRaCIS.Core.Test/DbHelper.ttinclude +++ b/IRaCIS.Core.Test/DbHelper.ttinclude @@ -3,9 +3,9 @@ { 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 DbDatabase = "Test.Study"; - //表名称用字符串,拼接 + //琛ㄥ悕绉扮敤瀛楃涓,鎷兼帴 public static readonly string TableName = "SubjectVisitClinicalDialog"; - //具体文件里面 例如service 可以配置是否分页 + //鍏蜂綋鏂囦欢閲岄潰 渚嬪service 鍙互閰嶇疆鏄惁鍒嗛〉 } #> <#+ diff --git a/ZhiZhunAuthenticationCenter/Protos/GrpcToken.proto b/ZhiZhunAuthenticationCenter/Protos/GrpcToken.proto index ace5d4240..f14d65a66 100644 --- a/ZhiZhunAuthenticationCenter/Protos/GrpcToken.proto +++ b/ZhiZhunAuthenticationCenter/Protos/GrpcToken.proto @@ -1,16 +1,16 @@ -// 使用的是proto3版本 +// 浣跨敤鐨勬槸proto3鐗堟湰 syntax = "proto3"; -// 定义命名空间，后续生成代码时就会生成对应的命名空间 +// 瀹氫箟鍛藉悕绌洪棿锛屽悗缁敓鎴愪唬鐮佹椂灏变細鐢熸垚瀵瑰簲鐨勫懡鍚嶇┖闂 option csharp_namespace = "gRPC.ZHiZHUN.AuthServer.protos"; /* -每一句需要用分号结尾 -message 用来定义请求和返回数据格式 -tag message后面的值数字代表是字段的标识(tag),不是赋值， +姣忎竴鍙ラ渶瑕佺敤鍒嗗彿缁撳熬 +message 鐢ㄦ潵瀹氫箟璇锋眰鍜岃繑鍥炴暟鎹牸寮 +tag message鍚庨潰鐨勫兼暟瀛椾唬琛ㄦ槸瀛楁鐨勬爣璇(tag),涓嶆槸璧嬪硷紝 */ -// 新增用户时需要传递数据消息， 可理解为一个类 +// 鏂板鐢ㄦ埛鏃堕渶瑕佷紶閫掓暟鎹秷鎭紝 鍙悊瑙ｄ负涓涓被 message GetTokenReuqest{ string id=1; string userName=2; @@ -22,48 +22,48 @@ message GetTokenReuqest{ } -// 新增时返回的消息格式 +// 鏂板鏃惰繑鍥炵殑娑堟伅鏍煎紡 message GetTokenResponse { int32 code=1; string token =2; } -// service 用标识定义服务的，里面写对应的方法 +// service 鐢ㄦ爣璇嗗畾涔夋湇鍔＄殑锛岄噷闈㈠啓瀵瑰簲鐨勬柟娉 service TokenGrpcService{ - // 获取token + // 鑾峰彇token rpc GetUserToken(GetTokenReuqest) returns (GetTokenResponse); } /* -// 新增用户时需要传递数据消息， 可理解为一个类 +// 鏂板鐢ㄦ埛鏃堕渶瑕佷紶閫掓暟鎹秷鎭紝 鍙悊瑙ｄ负涓涓被 message AddUserReuqest{ string name=1; int32 age=2; bool isBoy=3; } -// 新增时返回的消息格式 +// 鏂板鏃惰繑鍥炵殑娑堟伅鏍煎紡 message ResultResponse { int32 code=1; string msg =2; } -//传递的查询条件信息格式，可理解为平时传入的查询条件对象 +//浼犻掔殑鏌ヨ鏉′欢淇℃伅鏍煎紡锛屽彲鐞嗚В涓哄钩鏃朵紶鍏ョ殑鏌ヨ鏉′欢瀵硅薄 message QueryUserReuqest{ string name=1; } -//查询返回的用户信息格式，可理解为返回的类 +//鏌ヨ杩斿洖鐨勭敤鎴蜂俊鎭牸寮忥紝鍙悊瑙ｄ负杩斿洖鐨勭被 message UserInfoResponse { string name=1; int32 age=2; string gender=3; } -// service 用标识定义服务的，里面写对应的方法 +// service 鐢ㄦ爣璇嗗畾涔夋湇鍔＄殑锛岄噷闈㈠啓瀵瑰簲鐨勬柟娉 service UserService{ - // 新增用户 + // 鏂板鐢ㄦ埛 rpc AddUser(AddUserReuqest) returns (ResultResponse); - // 查询用户 + // 鏌ヨ鐢ㄦ埛 rpc GetAllUser(QueryUserReuqest) returns (UserInfoResponse); } */ From dd9ec3d8fe908843566a40a88498837eee73d80d Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 1 Dec 2023 15:41:24 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Management/UserService.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs index 2047dcf58..b5b0a3f03 100644 --- a/IRaCIS.Core.Application/Service/Management/UserService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserService.cs @@ -644,7 +644,8 @@ namespace IRaCIS.Application.Services { await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = Guid.Empty, OptUserId = Guid.Empty, LoginFaildName = userName,LoginPassword=password, OptType = UserOptType.AccountLocked }, true); - throw new BusinessValidationFailedException($"瀵嗙爜杩炵画閿欒{maxFailures}娆,褰撳墠璐﹀彿宸茶闄愬埗鐧诲綍锛岃绛夊緟 {lockoutMinutes} 鍒嗛挓鍚庡啀璇曘"); + //$"瀵嗙爜杩炵画閿欒{maxFailures}娆,褰撳墠璐﹀彿宸茶闄愬埗鐧诲綍锛岃绛夊緟 {lockoutMinutes} 鍒嗛挓鍚庡啀璇曘" + throw new BusinessValidationFailedException(_localizer["User_ErrorLimit", maxFailures, lockoutMinutes]); } var userLoginReturnModel = new LoginReturnDTO(); From dc8451f55c8e68bc9042ced73e7dddc16085336f Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 8 Dec 2023 12:44:35 +0800 Subject: [PATCH 5/5] =?UTF-8?q?windows=20linux=20=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9=20=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Helper/FileStoreHelper.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Helper/FileStoreHelper.cs b/IRaCIS.Core.Application/Helper/FileStoreHelper.cs index cb8d71b66..fe661146d 100644 --- a/IRaCIS.Core.Application/Helper/FileStoreHelper.cs +++ b/IRaCIS.Core.Application/Helper/FileStoreHelper.cs @@ -142,8 +142,9 @@ public static class FileStoreHelper //API vue 閮ㄧ讲鐩綍 public static string GetIRaCISRootPath(IWebHostEnvironment _hostEnvironment) { - var rootPath = (Directory.GetParent(_hostEnvironment.ContentRootPath.TrimEnd('\\'))).IfNullThrowException().FullName; - return rootPath; + string parentDirectory = Path.GetFullPath(Path.Combine(_hostEnvironment.ContentRootPath, "..")); + + return parentDirectory; }