Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development

Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs

@@ -7,6 +7,9 @@ namespace Dlhis.Canteen.Order.Request;
 
 public class BalanceRecordPageRequest : PageDto, IValidatableObject
 {
+    /// <summary>
+    /// 查询日期范围类型 DateTimeSearchEnumType
+    /// </summary>
     [EnumDataType(typeof(DateTimeSearchEnumType))]
     public DateTimeSearchEnumType? SearchDateTimeDimension { get; set; }
 

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",
+    "Authority": "http://identity.oauth.svc.cluster.local",
-    "RequireHttpsMetadata": true,
+    "RequireHttpsMetadata": false,
     "Issuer": "identity.isawesome.cn",
     "Audience": "",
     "Pat": {

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",
+    "Authority": "http://identity.oauth.svc.cluster.local",
-    "RequireHttpsMetadata": true,
+    "RequireHttpsMetadata": false,
     "Issuer": "identity.isawesome.cn",
     "Audience": "",
     "Pat": {

Src/Dlhis.Entity/Canteen/Enums/DateTimeSearchEnumType.cs

@@ -2,6 +2,7 @@
 
 namespace Dlhis.Entity.Canteen.Enums;
 
+[Description("日期查询范围类型")]
 public enum DateTimeSearchEnumType
 {
     /// <summary>