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 { ///