From 118036237610df78e2391ae7c1f0cf0dc2c0d7b3 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 5 Jan 2024 15:16:25 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=9B=B4=E6=96=B0=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF=E5=92=8C=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Order/Request/BalanceRecordPageRequest.cs | 3 +++ Src/Dlhis.Canteen/appsettings.json | 10 ++++++---- Src/Dlhis.Common/appsettings.json | 10 ++++++---- .../Canteen/Enums/DateTimeSearchEnumType.cs | 1 + 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs b/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs index 0606d174..1d5c294d 100644 --- a/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs @@ -7,6 +7,9 @@ namespace Dlhis.Canteen.Order.Request; public class BalanceRecordPageRequest : PageDto, IValidatableObject { + /// + /// 查询日期范围类型 DateTimeSearchEnumType + /// [EnumDataType(typeof(DateTimeSearchEnumType))] public DateTimeSearchEnumType? SearchDateTimeDimension { get; set; } diff --git a/Src/Dlhis.Canteen/appsettings.json b/Src/Dlhis.Canteen/appsettings.json index 745b748b..1469a953 100644 --- a/Src/Dlhis.Canteen/appsettings.json +++ b/Src/Dlhis.Canteen/appsettings.json @@ -17,16 +17,18 @@ }, "SwaggerOptions": { "Enable": true, - "Authority": "https://yikatong.isawesome.cn/oauth2", + "Authority": "http://identity.oauth.svc.cluster.local", "ClientId": "4fb184324eac4180", "ClientSecret": "8ac8f235152f1524", "Scopes": { - "openid": "openid" + "openid": "openid", + "profile": "profile", + "yikatong": "yikatong" } }, "IdentityServerOptions": { - "Authority": "https://yikatong.isawesome.cn/oauth2", - "RequireHttpsMetadata": true, + "Authority": "http://identity.oauth.svc.cluster.local", + "RequireHttpsMetadata": false, "Issuer": "identity.isawesome.cn", "Audience": "", "Pat": { diff --git a/Src/Dlhis.Common/appsettings.json b/Src/Dlhis.Common/appsettings.json index 369aba6b..21403016 100644 --- a/Src/Dlhis.Common/appsettings.json +++ b/Src/Dlhis.Common/appsettings.json @@ -8,16 +8,18 @@ "AllowedHosts": "*", "SwaggerOptions": { "Enable": true, - "Authority": "https://yikatong.isawesome.cn/oauth2", + "Authority": "http://identity.oauth.svc.cluster.local", "ClientId": "4fb184324eac4180", "ClientSecret": "8ac8f235152f1524", "Scopes": { - "openid": "openid" + "openid": "openid", + "profile": "profile", + "yikatong": "yikatong" } }, "IdentityServerOptions": { - "Authority": "https://yikatong.isawesome.cn/oauth2", - "RequireHttpsMetadata": true, + "Authority": "http://identity.oauth.svc.cluster.local", + "RequireHttpsMetadata": false, "Issuer": "identity.isawesome.cn", "Audience": "", "Pat": { diff --git a/Src/Dlhis.Entity/Canteen/Enums/DateTimeSearchEnumType.cs b/Src/Dlhis.Entity/Canteen/Enums/DateTimeSearchEnumType.cs index d42760ac..6bcf868d 100644 --- a/Src/Dlhis.Entity/Canteen/Enums/DateTimeSearchEnumType.cs +++ b/Src/Dlhis.Entity/Canteen/Enums/DateTimeSearchEnumType.cs @@ -2,6 +2,7 @@ namespace Dlhis.Entity.Canteen.Enums; +[Description("日期查询范围类型")] public enum DateTimeSearchEnumType { ///