TANG JIANG преди 1 година
родител
ревизия
44c5d9ef6b

+ 3 - 3
src/Push.Share/Enums/EPushStatus.cs

@@ -11,17 +11,17 @@ public enum EPushStatus
     /// 
     /// </summary>
     [Description("推送中")]
-    Pushing =0,
+    Pushing = 0,
 
     /// <summary>
     /// 
     /// </summary>
     [Description("推送成功")]
-    Success =1,
+    Success = 1,
 
     /// <summary>
     /// 
     /// </summary>
     [Description("推送失败")]
-    Failed =2
+    Failed = 2
 }

+ 1 - 1
src/Push.Share/GlobalUsing.cs

@@ -1 +1 @@
-global using XF.Utility.EnumExtensions;
+

+ 0 - 5
src/yibin/Push.YiBin.Application/ApplicationStartupExtensions.cs

@@ -1,11 +1,6 @@
 using Mapster;
 using Microsoft.Extensions.DependencyInjection;
 using Push.YiBin.Application.Mappers;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Push.YiBin.Application
 {

+ 2 - 2
src/yibin/Push.YiBin.Application/Mappers/MapperConfigs.cs

@@ -5,8 +5,8 @@ namespace Push.YiBin.Application.Mappers
     public class MapperConfigs : IRegister
     {
         public void Register(TypeAdapterConfig config)
-        { 
-        
+        {
+
         }
     }
 }

+ 0 - 25
src/yibin/Push.YiBin.Host/Program.cs

@@ -1,28 +1,3 @@
-//var builder = WebApplication.CreateBuilder(args);
-
-//// Add services to the container.
-
-//builder.Services.AddControllers();
-//// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-//builder.Services.AddEndpointsApiExplorer();
-//builder.Services.AddSwaggerGen();
-
-//var app = builder.Build();
-
-//// Configure the HTTP request pipeline.
-//if (app.Environment.IsDevelopment())
-//{
-//    app.UseSwagger();
-//    app.UseSwaggerUI();
-//}
-
-//app.UseAuthorization();
-
-//app.MapControllers();
-
-//app.Run();
-
-
 using Push.YiBin.Host;
 using Serilog;
 

+ 0 - 4
src/yibin/Push.YiBin.Host/StartupHelper.cs

@@ -1,11 +1,7 @@
 using Mapster;
 using MapsterMapper;
-using Microsoft.IdentityModel.Tokens;
 using Microsoft.OpenApi.Models;
-using System.Text;
 using XF.Domain.Entities;
-using XF.Domain.Exceptions;
-using XF.Domain.Options;
 using XF.Domain.Repository;
 namespace Push.YiBin.Host
 {

+ 0 - 117
src/yibin/Push.YiBin/Extensions/SqlSugarExtensions.cs

@@ -1,117 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Push.YiBin.Extensions
-{
-    public static class SqlSugarExtensions
-    {
-        /// <summary>
-        /// List转Dictionary
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="list"></param>
-        /// <returns></returns>
-        public static List<Dictionary<string, object?>> ToDictionary<T>(this List<T> list)
-        {
-            var result = new List<Dictionary<string, object?>>();
-            if (list.Any())
-            {
-                foreach (var item in list)
-                {
-                    Dictionary<string, object?> dc = new();
-                    var properties = item.GetType().GetProperties();
-                    foreach (var property in properties)
-                    {
-                        if (IsIgnoreColumn(property)) continue;
-                        if (IsNavigateColumn(property)) continue;
-                        dc.Add(property.Name, property.GetValue(item));
-                    }
-                    result.Add(dc);
-                }
-            }
-
-            return result;
-        }
-
-        public static DataTable ToDataTable<T>(this List<T> list, string tableName)
-        {
-            var dt = new DataTable();
-            dt.TableName = tableName; //设置表名
-
-            if (list.Any())
-            {
-                PropertyInfo[] properties = list[0].GetType().GetProperties();
-                foreach (PropertyInfo property in properties)
-                {
-                    if (IsIgnoreColumn(property)) continue;
-                    if (IsNavigateColumn(property)) continue;
-                    Type colType = property.PropertyType;
-                    if (colType.IsGenericType && colType.GetGenericTypeDefinition() == typeof(Nullable<>))
-                    {
-                        colType = colType.GetGenericArguments()[0];
-                    }
-                    dt.Columns.Add(property.Name, colType);
-                }
-
-                foreach (var item in list)
-                {
-                    ArrayList tempList = new();
-                    //var properties = item.GetType().GetProperties();
-                    foreach (var property in properties)
-                    {
-                        if (IsIgnoreColumn(property)) continue;
-                        if (IsNavigateColumn(property)) continue;
-                        var obj = property.GetValue(item, null);
-                        tempList.Add(obj);
-                    }
-                    dt.LoadDataRow(tempList.ToArray(), true);
-                }
-
-                //for (int i = 0; i < list.Count; i++)
-                //{
-                //    ArrayList tempList = new();
-                //    foreach (PropertyInfo pi in propertys)
-                //    {
-                //        if (IsIgnoreColumn(pi))
-                //            continue;
-                //        object obj = pi.GetValue(list[i], null);
-                //        tempList.Add(obj);
-                //    }
-                //    object[] array = tempList.ToArray();
-                //    result.LoadDataRow(array, true);
-                //}
-            }
-
-            //var addRow = dt.NewRow();
-            //addRow["id"] = 0;
-            //addRow["price"] = 1;
-            //addRow["Name"] = "a";
-            //dt.Rows.Add(addRow);//添加数据
-
-            //var x = db.Storageable(dt).WhereColumns("id").ToStorage();//id作为主键
-            //x.AsInsertable.IgnoreColumns("id").ExecuteCommand();//如果是自增要添加IgnoreColumns
-            //x.AsUpdateable.ExecuteCommand();
-            return dt;
-        }
-
-        /// <summary>
-        /// 排除SqlSugar忽略的列
-        /// </summary>
-        /// <param name="pi"></param>
-        /// <returns></returns>
-        private static bool IsIgnoreColumn(PropertyInfo property)
-        {
-            var sc = property.GetCustomAttributes<SugarColumn>(false).FirstOrDefault(u => u.IsIgnore);
-            return sc != null;
-        }
-
-        private static bool IsNavigateColumn(PropertyInfo property) =>
-            property.GetCustomAttributes<Navigate>(false).Any();
-    }
-}

+ 0 - 27
src/yibin/Push.YiBin/Extensions/SqlSugarRepositoryExtensions.cs

@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Push.YiBin.Extensions
-{
-    public static class SqlSugarRepositoryExtensions
-    {
-        public static async Task<(int Total, List<TEntity> Items)> ToPagedListAsync<TEntity>(this ISugarQueryable<TEntity> query, int pageIndex, int pageSize, CancellationToken cancellationToken = default)
-            where TEntity : class, new()
-        {
-            RefAsync<int> total = 0;
-            var items = await query.ToPageListAsync(pageIndex, pageSize, total);
-            return (total.Value, items);
-        }
-
-        //public static async Task<(int Total, List<TEntity> Items)> ToPagedListAsync<TEntity>(this ISugarQueryable<TEntity> query, PagedRequest dto, CancellationToken cancellationToken = default)
-        //    where TEntity : class, new()
-        //{
-        //    RefAsync<int> total = 0;
-        //    var items = await query.ToPageListAsync(dto.PageIndex, dto.PageSize, total);
-        //    return (total.Value, items);
-        //}
-    }
-}

+ 1 - 1
src/yibin/Push.YiBin/Extensions/SqlSugarStartupExtensions.cs

@@ -48,7 +48,7 @@ namespace Push.YiBin.Extensions
                     EntityNameService = (type, entity) =>
                     {
                         var attributes = type.GetCustomAttributes(true);
-                   
+
 
                         entity.DbTableName = entity.DbTableName.ToSnakeCase();