Merge remote-tracking branch 'refs/remotes/github/master'

src/InterfaceForward.Api/appsettings.json

@@ -56,7 +56,7 @@
   "ElasticSearch": {
     "NodeUrls": [ "http://129.204.22.146:9200" ],
     "LoginName": "elastic",
-    "Password": "afyTgmVb8jq6",
+    "Password": "itd!@#123",
     "Base64PassPassword": "Basic ZWxhc3RpYzphZnlUZ21WYjhqcTY="
   }
 }

src/InterfaceForward.Application/Services/Interface/ServiceProviderInterfaceService.cs

@@ -33,7 +33,7 @@ public class ServiceProviderInterfaceService : ApplicationService
 
     private IBasicRepository<InterfaceMapEntity> InterfaceMapRepository =>
         LazyServiceProvider.GetRequiredService<IBasicRepository<InterfaceMapEntity>>();
-    
+
     private InterfaceCategoryService InterfaceCategoryService =>
         LazyServiceProvider.GetRequiredService<InterfaceCategoryService>();
 
@@ -48,12 +48,12 @@ public class ServiceProviderInterfaceService : ApplicationService
         GetServiceProviderInterfaceTreeListAsync(ServiceProviderInterfaceTreeListInputObjectValue input)
     {
         var res = await InterfaceRepository.GetServiceProviderInterfaceListAsync(input);
-        
+
         var tree = await InterfaceCategoryService.GetCategoryTree(false, res);
-        
+
         return tree;
     }
-    
+
     /// <summary>
     /// 服务商接口分页列表
     /// </summary>
@@ -128,13 +128,12 @@ public class ServiceProviderInterfaceService : ApplicationService
     /// <returns></returns>
     /// <exception cref="BusinessException"></exception>
     [HttpPost("Interface/SaveServiceProviderInterface")]
-    public async Task SaveServiceProviderInterfaceAsync(ServiceProviderInterfaceInput input)
+    public async Task<int> SaveServiceProviderInterfaceAsync(ServiceProviderInterfaceInput input)
     {
         switch (input.OptionType)
         {
             case OptionType.新增:
-                await CreateServiceProviderInterfaceAsync(input);
-                break;
+                return await CreateServiceProviderInterfaceAsync(input);
             case OptionType.修改:
                 await UpdateServiceProviderInterfaceAsync(input);
                 break;
@@ -146,6 +145,8 @@ public class ServiceProviderInterfaceService : ApplicationService
             default:
                 throw new ArgumentOutOfRangeException();
         }
+
+        return input.Id ?? 0;
     }
 
 
@@ -173,7 +174,7 @@ public class ServiceProviderInterfaceService : ApplicationService
         return true;
     }
 
-    internal async Task CreateServiceProviderInterfaceAsync(ServiceProviderInterfaceInput input)
+    internal async Task<int> CreateServiceProviderInterfaceAsync(ServiceProviderInterfaceInput input)
     {
         // 校验参数合法性
         ParameterService.ValidateParameter(
@@ -232,6 +233,8 @@ public class ServiceProviderInterfaceService : ApplicationService
 
         // 提交事务
         ts.Complete();
+
+        return interfaceId;
     }
 
     private async Task<string> GenerateServiceProviderInterfaceCode(int serviceProviderId)

src/InterfaceForward.Application/Services/InterfaceMap/InterfaceMapPublishService.cs

@@ -23,7 +23,7 @@ public class InterfaceMapPublishService(
     IInterfaceMapPublishRepository interfaceMapPublishRepository,
     InterfaceForwardQuery interfaceForwardQuery,
     IInterfaceMapRepository interfaceMapRepository)
-    : Fake.Application.ApplicationService
+    : ApplicationService
 {
     private static readonly JsonSerializerSettings Settings = new()
     {
@@ -79,7 +79,7 @@ public class InterfaceMapPublishService(
         string redisContent = JsonConvert.SerializeObject(cache, Settings);
 
 
-        var differenceContent = CompareTexts(redisContent, dbContent);
+        var differenceContent = CompareTexts(redisContent, dbContent?? String.Empty);
 
         return new InterfaceMapPublishedDifferenceVO
         {

src/InterfaceForward.Repositories/BasicRepository.cs

@@ -17,12 +17,12 @@ public class BasicRepository<T> : SqlSugarRepository<InterfaceForwardDbContext,
         return Context.Queryable<T>();
     }
 
-    public async Task<T> GetFirstAsync(Expression<Func<T, bool>> whereExpression)
+    public async Task<T?> GetFirstAsync(Expression<Func<T, bool>> whereExpression)
     {
         return await AsQueryable().FirstAsync(whereExpression);
     }
 
-    public async Task<TResult> GetFirstAsync<TResult>(Expression<Func<T, bool>> whereExpression,
+    public async Task<TResult?> GetFirstAsync<TResult>(Expression<Func<T, bool>> whereExpression,
         Expression<Func<T, TResult>> resultExpression)
     {
         return await Context.Queryable<T>().Where(whereExpression).Select(resultExpression).FirstAsync();

src/InterfaceForward.Repositories/IBasicRepository.cs

@@ -13,9 +13,9 @@ public interface IBasicRepository<T>: ISqlSugarRepository<InterfaceForwardDbCont
     /// </summary>
     /// <param name="whereExpression"></param>
     /// <returns></returns>
-    Task<T> GetFirstAsync(Expression<Func<T, bool>> whereExpression);
+    Task<T?> GetFirstAsync(Expression<Func<T, bool>> whereExpression);
     
-    Task<TResult> GetFirstAsync<TResult>(Expression<Func<T, bool>> whereExpression,Expression<Func<T, TResult>> resultExpression);
+    Task<TResult?> GetFirstAsync<TResult>(Expression<Func<T, bool>> whereExpression,Expression<Func<T, TResult>> resultExpression);
 
     /// <summary>
     /// get list