修改命名空间

booking_auth_dev
wanghaomei 2 years ago
parent fbcc5d6367
commit 5c363a58c1

@ -1,27 +0,0 @@
using System;
using SqlSugar;
using System.ComponentModel;
using Magic.Core.Entity;
namespace Magic.Application.Entity
{
/// <summary>
/// 订舱
/// </summary>
[SugarTable("djy_booking")]
[Description("订舱")]
public class DjyBooking : DBEntityTenant
{
/// <summary>
/// 提单号
/// </summary>
public string MBLNO { get; set; }
/// <summary>
/// 船公司
/// </summary>
public string Carrier { get; set; }
/// <summary>
/// 船公司 ID
/// </summary>
public string CarrierId { get; set; }
}
}

@ -1,170 +0,0 @@
<?xml version="1.0"?>
<doc>
<assembly>
<name>Myshipping.Application</name>
</assembly>
<members>
<member name="T:Magic.Application.Entity.DjyBooking">
<summary>
订舱
</summary>
</member>
<member name="P:Magic.Application.Entity.DjyBooking.MBLNO">
<summary>
提单号
</summary>
</member>
<member name="P:Magic.Application.Entity.DjyBooking.Carrier">
<summary>
船公司
</summary>
</member>
<member name="P:Magic.Application.Entity.DjyBooking.CarrierId">
<summary>
船公司 ID
</summary>
</member>
<member name="T:Magic.Application.DjyBookingService">
<summary>
订舱服务
</summary>
</member>
<member name="M:Magic.Application.DjyBookingService.Page(Magic.Application.DjyBookingInput)">
<summary>
分页查询订舱
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Magic.Application.DjyBookingService.Add(Magic.Application.AddDjyBookingInput)">
<summary>
增加订舱
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Magic.Application.DjyBookingService.Delete(Magic.Application.DeleteDjyBookingInput)">
<summary>
删除订舱
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Magic.Application.DjyBookingService.Update(Magic.Application.UpdateDjyBookingInput)">
<summary>
更新订舱
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Magic.Application.DjyBookingService.Get(Magic.Application.QueryeDjyBookingInput)">
<summary>
获取订舱
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Magic.Application.DjyBookingService.List(Magic.Application.DjyBookingInput)">
<summary>
获取订舱列表
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="T:Magic.Application.DjyBookingDto">
<summary>
订舱输出参数
</summary>
</member>
<member name="P:Magic.Application.DjyBookingDto.Id">
<summary>
主键Id
</summary>
</member>
<member name="P:Magic.Application.DjyBookingDto.MBLNO">
<summary>
提单号
</summary>
</member>
<member name="P:Magic.Application.DjyBookingDto.Carrier">
<summary>
船公司
</summary>
</member>
<member name="P:Magic.Application.DjyBookingDto.CarrierId">
<summary>
船公司 ID
</summary>
</member>
<member name="P:Magic.Application.DjyBookingDto.TenantId">
<summary>
租户Id
</summary>
</member>
<member name="T:Magic.Application.DjyBookingInput">
<summary>
订舱输入参数
</summary>
</member>
<member name="P:Magic.Application.DjyBookingInput.MBLNO">
<summary>
提单号
</summary>
</member>
<member name="P:Magic.Application.DjyBookingInput.Carrier">
<summary>
船公司
</summary>
</member>
<member name="P:Magic.Application.DjyBookingInput.CarrierId">
<summary>
船公司 ID
</summary>
</member>
<member name="P:Magic.Application.DjyBookingInput.TenantId">
<summary>
租户Id
</summary>
</member>
<member name="P:Magic.Application.DeleteDjyBookingInput.Id">
<summary>
主键Id
</summary>
</member>
<member name="P:Magic.Application.UpdateDjyBookingInput.Id">
<summary>
主键Id
</summary>
</member>
<member name="T:Magic.Application.DjyBookingOutput">
<summary>
订舱输出参数
</summary>
</member>
<member name="P:Magic.Application.DjyBookingOutput.Id">
<summary>
主键Id
</summary>
</member>
<member name="P:Magic.Application.DjyBookingOutput.MBLNO">
<summary>
提单号
</summary>
</member>
<member name="P:Magic.Application.DjyBookingOutput.Carrier">
<summary>
船公司
</summary>
</member>
<member name="P:Magic.Application.DjyBookingOutput.CarrierId">
<summary>
船公司 ID
</summary>
</member>
<member name="P:Magic.Application.DjyBookingOutput.TenantId">
<summary>
租户Id
</summary>
</member>
</members>
</doc>

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<NoWarn>1701;1702;1591</NoWarn> <NoWarn>1701;1702;1591</NoWarn>
<DocumentationFile>Magic.Application.xml</DocumentationFile> <DocumentationFile>Myshipping.Application.xml</DocumentationFile>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -18,18 +18,17 @@
<ItemGroup> <ItemGroup>
<None Remove="applicationsettings.json" /> <None Remove="applicationsettings.json" />
<None Remove="Magic.Application.xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="applicationsettings.json"> <Content Include="applicationsettings.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Magic.Application.xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="Entity\DjyBooking\" /> <Folder Include="Entity\" />
<Folder Include="Service\" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

@ -1,170 +1,8 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<doc> <doc>
<assembly> <assembly>
<name>Magic.Application</name> <name>Myshipping.Application</name>
</assembly> </assembly>
<members> <members>
<member name="T:Magic.Application.Entity.DjyBooking">
<summary>
订舱
</summary>
</member>
<member name="P:Magic.Application.Entity.DjyBooking.MBLNO">
<summary>
提单号
</summary>
</member>
<member name="P:Magic.Application.Entity.DjyBooking.Carrier">
<summary>
船公司
</summary>
</member>
<member name="P:Magic.Application.Entity.DjyBooking.CarrierId">
<summary>
船公司 ID
</summary>
</member>
<member name="T:Magic.Application.DjyBookingService">
<summary>
订舱服务
</summary>
</member>
<member name="M:Magic.Application.DjyBookingService.Page(Magic.Application.DjyBookingInput)">
<summary>
分页查询订舱
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Magic.Application.DjyBookingService.Add(Magic.Application.AddDjyBookingInput)">
<summary>
增加订舱
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Magic.Application.DjyBookingService.Delete(Magic.Application.DeleteDjyBookingInput)">
<summary>
删除订舱
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Magic.Application.DjyBookingService.Update(Magic.Application.UpdateDjyBookingInput)">
<summary>
更新订舱
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Magic.Application.DjyBookingService.Get(Magic.Application.QueryeDjyBookingInput)">
<summary>
获取订舱
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Magic.Application.DjyBookingService.List(Magic.Application.DjyBookingInput)">
<summary>
获取订舱列表
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="T:Magic.Application.DjyBookingDto">
<summary>
订舱输出参数
</summary>
</member>
<member name="P:Magic.Application.DjyBookingDto.Id">
<summary>
主键Id
</summary>
</member>
<member name="P:Magic.Application.DjyBookingDto.MBLNO">
<summary>
提单号
</summary>
</member>
<member name="P:Magic.Application.DjyBookingDto.Carrier">
<summary>
船公司
</summary>
</member>
<member name="P:Magic.Application.DjyBookingDto.CarrierId">
<summary>
船公司 ID
</summary>
</member>
<member name="P:Magic.Application.DjyBookingDto.TenantId">
<summary>
租户Id
</summary>
</member>
<member name="T:Magic.Application.DjyBookingInput">
<summary>
订舱输入参数
</summary>
</member>
<member name="P:Magic.Application.DjyBookingInput.MBLNO">
<summary>
提单号
</summary>
</member>
<member name="P:Magic.Application.DjyBookingInput.Carrier">
<summary>
船公司
</summary>
</member>
<member name="P:Magic.Application.DjyBookingInput.CarrierId">
<summary>
船公司 ID
</summary>
</member>
<member name="P:Magic.Application.DjyBookingInput.TenantId">
<summary>
租户Id
</summary>
</member>
<member name="P:Magic.Application.DeleteDjyBookingInput.Id">
<summary>
主键Id
</summary>
</member>
<member name="P:Magic.Application.UpdateDjyBookingInput.Id">
<summary>
主键Id
</summary>
</member>
<member name="T:Magic.Application.DjyBookingOutput">
<summary>
订舱输出参数
</summary>
</member>
<member name="P:Magic.Application.DjyBookingOutput.Id">
<summary>
主键Id
</summary>
</member>
<member name="P:Magic.Application.DjyBookingOutput.MBLNO">
<summary>
提单号
</summary>
</member>
<member name="P:Magic.Application.DjyBookingOutput.Carrier">
<summary>
船公司
</summary>
</member>
<member name="P:Magic.Application.DjyBookingOutput.CarrierId">
<summary>
船公司 ID
</summary>
</member>
<member name="P:Magic.Application.DjyBookingOutput.TenantId">
<summary>
租户Id
</summary>
</member>
</members> </members>
</doc> </doc>

@ -1,103 +0,0 @@
using Magic.Core;
using Furion.DependencyInjection;
using Furion.DynamicApiController;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using System.Linq;
using System.Threading.Tasks;
using Magic.Application.Entity;
using Furion;
using System;
namespace Magic.Application
{
/// <summary>
/// 订舱服务
/// </summary>
[ApiDescriptionSettings("Application", Name = "DjyBooking", Order = 1)]
public class DjyBookingService : IDjyBookingService, IDynamicApiController, ITransient
{
private readonly SqlSugarRepository<DjyBooking> _rep;
public DjyBookingService(SqlSugarRepository<DjyBooking> rep)
{
_rep = rep;
}
/// <summary>
/// 分页查询订舱
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpGet("/DjyBooking/page")]
public async Task<dynamic> Page([FromQuery] DjyBookingInput input)
{
var entities = await _rep.AsQueryable()
.WhereIF(!string.IsNullOrWhiteSpace(input.MBLNO), u => u.MBLNO == input.MBLNO)
.WhereIF(!string.IsNullOrWhiteSpace(input.Carrier), u => u.Carrier == input.Carrier)
.WhereIF(!string.IsNullOrWhiteSpace(input.CarrierId), u => u.CarrierId == input.CarrierId)
.ToPagedListAsync(input.PageNo, input.PageSize);
return entities.XnPagedResult();
}
/// <summary>
/// 增加订舱
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost("/DjyBooking/add")]
public async Task Add(AddDjyBookingInput input)
{
var entity = input.Adapt<DjyBooking>();
entity.TenantId = Convert.ToInt64(App.User.FindFirst(ClaimConst.TENANT_ID)?.Value);
await _rep.InsertAsync(entity);
}
/// <summary>
/// 删除订舱
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost("/DjyBooking/delete")]
public async Task Delete(DeleteDjyBookingInput input)
{
var entity = await _rep.FirstOrDefaultAsync(u => u.Id == input.Id);
await _rep.DeleteAsync(entity);
}
/// <summary>
/// 更新订舱
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost("/DjyBooking/edit")]
public async Task Update(UpdateDjyBookingInput input)
{
var entity = input.Adapt<DjyBooking>();
await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
}
/// <summary>
/// 获取订舱
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpGet("/DjyBooking/detail")]
public async Task<DjyBooking> Get([FromQuery] QueryeDjyBookingInput input)
{
return await _rep.FirstOrDefaultAsync(u => u.Id == input.Id);
}
/// <summary>
/// 获取订舱列表
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpGet("/DjyBooking/list")]
public async Task<dynamic> List([FromQuery] DjyBookingInput input)
{
return await _rep.ToListAsync();
}
}
}

@ -1,37 +0,0 @@
using System;
using Magic.Core;
namespace Magic.Application
{
/// <summary>
/// 订舱输出参数
/// </summary>
public class DjyBookingDto
{
/// <summary>
/// 主键Id
/// </summary>
public long Id { get; set; }
/// <summary>
/// 提单号
/// </summary>
public string MBLNO { get; set; }
/// <summary>
/// 船公司
/// </summary>
public string Carrier { get; set; }
/// <summary>
/// 船公司 ID
/// </summary>
public string CarrierId { get; set; }
/// <summary>
/// 租户Id
/// </summary>
public long TenantId { get; set; }
}
}

@ -1,62 +0,0 @@
using Magic.Core;
using System;
using System.ComponentModel.DataAnnotations;
namespace Magic.Application
{
/// <summary>
/// 订舱输入参数
/// </summary>
public class DjyBookingInput : PageInputBase
{
/// <summary>
/// 提单号
/// </summary>
public virtual string MBLNO { get; set; }
/// <summary>
/// 船公司
/// </summary>
public virtual string Carrier { get; set; }
/// <summary>
/// 船公司 ID
/// </summary>
public virtual string CarrierId { get; set; }
/// <summary>
/// 租户Id
/// </summary>
public virtual long TenantId { get; set; }
}
public class AddDjyBookingInput : DjyBookingInput
{
}
public class DeleteDjyBookingInput
{
/// <summary>
/// 主键Id
/// </summary>
[Required(ErrorMessage = "主键Id不能为空")]
public long Id { get; set; }
}
public class UpdateDjyBookingInput : DjyBookingInput
{
/// <summary>
/// 主键Id
/// </summary>
[Required(ErrorMessage = "主键Id不能为空")]
public long Id { get; set; }
}
public class QueryeDjyBookingInput : DeleteDjyBookingInput
{
}
}

@ -1,36 +0,0 @@
using System;
namespace Magic.Application
{
/// <summary>
/// 订舱输出参数
/// </summary>
public class DjyBookingOutput
{
/// <summary>
/// 主键Id
/// </summary>
public long Id { get; set; }
/// <summary>
/// 提单号
/// </summary>
public string MBLNO { get; set; }
/// <summary>
/// 船公司
/// </summary>
public string Carrier { get; set; }
/// <summary>
/// 船公司 ID
/// </summary>
public string CarrierId { get; set; }
/// <summary>
/// 租户Id
/// </summary>
public long TenantId { get; set; }
}
}

@ -1,16 +0,0 @@
using Magic.Core;
using Microsoft.AspNetCore.Mvc;
using System.Threading.Tasks;
using Magic.Application.Entity;
namespace Magic.Application
{
public interface IDjyBookingService
{
Task Add(AddDjyBookingInput input);
Task Delete(DeleteDjyBookingInput input);
Task<DjyBooking> Get([FromQuery] QueryeDjyBookingInput input);
Task<dynamic> List([FromQuery] DjyBookingInput input);
Task<dynamic> Page([FromQuery] DjyBookingInput input);
Task Update(UpdateDjyBookingInput input);
}
}

@ -1,7 +1,7 @@
using Furion; using Furion;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
namespace Magic.Application; namespace Myshipping.Application;
public class Startup : AppStartup public class Startup : AppStartup
{ {

@ -1,6 +1,6 @@
using System; using System;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 启用用操作日志 /// 启用用操作日志

@ -1,7 +1,7 @@
using System; using System;
using System.Data; using System.Data;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// SqlSugar 工作单元配置特性 /// SqlSugar 工作单元配置特性

@ -2,7 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 缓存接口 /// 缓存接口

@ -6,7 +6,7 @@ using System.Linq;
using System.Reflection; using System.Reflection;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 内存缓存 /// 内存缓存

@ -5,7 +5,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// Redis缓存 /// Redis缓存

@ -4,7 +4,7 @@ using SqlSugar;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace Magic.Core; namespace Myshipping.Core;
public class SqlSugarCache : ICacheService public class SqlSugarCache : ICacheService
{ {

@ -10,7 +10,7 @@ using System.IO;
using System.Linq; using System.Linq;
using Yitter.IdGenerator; using Yitter.IdGenerator;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 点选验证码 /// 点选验证码

@ -1,7 +1,7 @@
using Furion.DependencyInjection; using Furion.DependencyInjection;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 点击验证码输入参数 /// 点击验证码输入参数

@ -1,7 +1,7 @@
using Furion.DependencyInjection; using Furion.DependencyInjection;
using System.Collections.Generic; using System.Collections.Generic;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 验证码输出参数 /// 验证码输出参数

@ -1,4 +1,4 @@
namespace Magic.Core; namespace Myshipping.Core;
public interface IClickWordCaptcha public interface IClickWordCaptcha
{ {

@ -7,7 +7,7 @@ using System.Drawing.Imaging;
using System.IO; using System.IO;
using System.Text; using System.Text;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 常规验证码 /// 常规验证码

@ -1,7 +1,7 @@
using Furion.DependencyInjection; using Furion.DependencyInjection;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 常规验证码输入 /// 常规验证码输入

@ -1,4 +1,4 @@
namespace Magic.Core; namespace Myshipping.Core;
public interface IGeneralCaptcha public interface IGeneralCaptcha
{ {

@ -1,7 +1,7 @@
using Furion.ConfigurableOptions; using Furion.ConfigurableOptions;
using System.Collections.Generic; using System.Collections.Generic;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 缓存配置 /// 缓存配置

@ -1,4 +1,4 @@
namespace Magic.Core; namespace Myshipping.Core;
public class ClaimConst public class ClaimConst
{ {

@ -1,4 +1,4 @@
namespace Magic.Core; namespace Myshipping.Core;
public class CommonConst public class CommonConst
{ {
@ -43,7 +43,7 @@ public class CommonConst
/// <summary> /// <summary>
/// 程序集 /// 程序集
/// </summary> /// </summary>
public static string[] ENTITY_ASSEMBLY_NAME = new string[] { "Magic.Core", "Magic.Application", "Magic.FlowCenter" }; public static string[] ENTITY_ASSEMBLY_NAME = new string[] { "Myshipping.Core", "Myshipping.Application", "Myshipping.FlowCenter" };
/// <summary> /// <summary>
/// 删除字段 /// 删除字段
/// </summary> /// </summary>

@ -1,7 +1,7 @@
 
using SqlSugar; using SqlSugar;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 自定义租户基类实体 /// 自定义租户基类实体

@ -2,7 +2,7 @@
using System; using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 自定义实体基类 /// 自定义实体基类

@ -1,7 +1,7 @@
using SqlSugar; using SqlSugar;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 文档表 /// 文档表

@ -2,7 +2,7 @@
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 系统应用表 /// 系统应用表

@ -2,7 +2,7 @@
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 代码生成表 /// 代码生成表

@ -2,7 +2,7 @@
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 代码生成字段配置表 /// 代码生成字段配置表

@ -2,7 +2,7 @@
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 参数配置表 /// 参数配置表

@ -1,7 +1,7 @@
using SqlSugar; using SqlSugar;
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 字典值表 /// 字典值表

@ -5,7 +5,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 字典类型表 /// 字典类型表

@ -1,7 +1,7 @@
using SqlSugar; using SqlSugar;
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 员工表 /// 员工表

@ -1,6 +1,6 @@
using SqlSugar; using SqlSugar;
using System.ComponentModel; using System.ComponentModel;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 员工附属机构职位表 /// 员工附属机构职位表

@ -1,7 +1,7 @@
using SqlSugar; using SqlSugar;
using System.ComponentModel; using System.ComponentModel;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 员工职位表 /// 员工职位表

@ -1,7 +1,7 @@
using SqlSugar; using SqlSugar;
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 文件信息表 /// 文件信息表

@ -3,7 +3,7 @@ using SqlSugar;
using System; using System;
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 系统操作/审计日志表 /// 系统操作/审计日志表

@ -3,7 +3,7 @@ using SqlSugar;
using System; using System;
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 异常日志 /// 异常日志

@ -2,7 +2,7 @@ using SqlSugar;
using System; using System;
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 操作日志表 /// 操作日志表

@ -2,7 +2,7 @@
using System; using System;
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 访问日志表 /// 访问日志表

@ -2,7 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 菜单表 /// 菜单表

@ -2,7 +2,7 @@
using System; using System;
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 通知公告表 /// 通知公告表

@ -2,7 +2,7 @@
using System; using System;
using System.ComponentModel; using System.ComponentModel;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 通知公告用户表 /// 通知公告用户表

@ -1,7 +1,7 @@
using SqlSugar; using SqlSugar;
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// Oauth登录用户表 /// Oauth登录用户表

@ -3,7 +3,7 @@ using System;
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 在线用户表 /// 在线用户表

@ -1,7 +1,7 @@
using SqlSugar; using SqlSugar;
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 组织机构表 /// 组织机构表

@ -1,7 +1,7 @@
using SqlSugar; using SqlSugar;
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 职位表 /// 职位表

@ -1,7 +1,7 @@
using SqlSugar; using SqlSugar;
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 角色表 /// 角色表

@ -1,7 +1,7 @@
using SqlSugar; using SqlSugar;
using System.ComponentModel; using System.ComponentModel;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 角色数据范围表 /// 角色数据范围表

@ -1,7 +1,7 @@
using SqlSugar; using SqlSugar;
using System.ComponentModel; using System.ComponentModel;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 角色菜单表 /// 角色菜单表

@ -1,7 +1,7 @@
using SqlSugar; using SqlSugar;
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 租户表 /// 租户表

@ -2,7 +2,7 @@
using SqlSugar; using SqlSugar;
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 定时任务 /// 定时任务

@ -2,7 +2,7 @@ using SqlSugar;
using System; using System;
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 用户表 /// 用户表

@ -1,7 +1,7 @@
using SqlSugar; using SqlSugar;
using System.ComponentModel; using System.ComponentModel;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 用户数据范围表 /// 用户数据范围表

@ -1,7 +1,7 @@
using SqlSugar; using SqlSugar;
using System.ComponentModel; using System.ComponentModel;
namespace Magic.Core.Entity; namespace Myshipping.Core.Entity;
/// <summary> /// <summary>
/// 用户角色表 /// 用户角色表

@ -1,6 +1,6 @@
using System.ComponentModel; using System.ComponentModel;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 账号类型 /// 账号类型

@ -4,7 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 缓存类型 /// 缓存类型

@ -1,6 +1,6 @@
using System.ComponentModel; using System.ComponentModel;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 公共状态 /// 公共状态

@ -1,4 +1,4 @@
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 数据操作类型 /// 数据操作类型

@ -1,6 +1,6 @@
using System.ComponentModel; using System.ComponentModel;
namespace Magic.Core; namespace Myshipping.Core;
public enum DataScopeType public enum DataScopeType
{ {

@ -1,6 +1,6 @@
using System.ComponentModel; using System.ComponentModel;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 文档类型 /// 文档类型

@ -1,6 +1,6 @@
using Furion.FriendlyException; using Furion.FriendlyException;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 系统错误码 /// 系统错误码

@ -1,4 +1,4 @@
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 文件扩展枚举 /// 文件扩展枚举

@ -1,6 +1,6 @@
using System.ComponentModel; using System.ComponentModel;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 文件存储位置 /// 文件存储位置

@ -1,6 +1,6 @@
using System.ComponentModel; using System.ComponentModel;
namespace Magic.Core; namespace Myshipping.Core;
public enum FilterType public enum FilterType
{ {

@ -1,6 +1,6 @@
using System.ComponentModel; using System.ComponentModel;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 性别 /// 性别

@ -1,6 +1,6 @@
using System.ComponentModel; using System.ComponentModel;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// HTTP状态码 /// HTTP状态码

@ -1,6 +1,6 @@
using System.ComponentModel; using System.ComponentModel;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 登陆类型 /// 登陆类型

@ -1,6 +1,6 @@
using System.ComponentModel; using System.ComponentModel;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 系统菜单类型 /// 系统菜单类型

@ -1,6 +1,6 @@
using System.ComponentModel; using System.ComponentModel;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 系统菜单类型 /// 系统菜单类型

@ -1,6 +1,6 @@
using System.ComponentModel; using System.ComponentModel;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 菜单权重 /// 菜单权重

@ -1,6 +1,6 @@
using System.ComponentModel; using System.ComponentModel;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 通知公告状态 /// 通知公告状态

@ -5,7 +5,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Magic.Core; namespace Myshipping.Core;
public enum NoticeType public enum NoticeType
{ {

@ -1,6 +1,6 @@
using System.ComponentModel; using System.ComponentModel;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 通知公告用户状态 /// 通知公告用户状态

@ -1,6 +1,6 @@
using System.ComponentModel; using System.ComponentModel;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 查询类型的枚举 /// 查询类型的枚举

@ -1,4 +1,4 @@
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// http请求类型 /// http请求类型

@ -1,6 +1,6 @@
using System.ComponentModel; using System.ComponentModel;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 账号类型 /// 账号类型

@ -1,6 +1,6 @@
using System.ComponentModel; using System.ComponentModel;
namespace Magic.Core; namespace Myshipping.Core;
public enum TenantTypeEnum public enum TenantTypeEnum
{ {

@ -1,6 +1,6 @@
using System.ComponentModel; using System.ComponentModel;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 菜单激活类型 /// 菜单激活类型

@ -1,10 +1,10 @@
using Furion.EventBus; using Furion.EventBus;
using Magic.Core.Entity; using Myshipping.Core.Entity;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Magic.Core; namespace Myshipping.Core;
public class LogEventSubscriber : IEventSubscriber public class LogEventSubscriber : IEventSubscriber
{ {

@ -1,7 +1,7 @@
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using System; using System;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// B格 /// B格

@ -9,7 +9,7 @@ using System.Linq.Expressions;
using System.Reflection; using System.Reflection;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Magic.Core; namespace Myshipping.Core;
public static class DataFilterExtensions public static class DataFilterExtensions
{ {

@ -2,7 +2,7 @@
using System.Linq; using System.Linq;
using System.Text; using System.Text;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 字典扩展 /// 字典扩展

@ -6,7 +6,7 @@ using System.Linq;
using System.Reflection; using System.Reflection;
using Furion.FriendlyException; using Furion.FriendlyException;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 枚举扩展 /// 枚举扩展

@ -1,6 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 通用输入扩展参数(带权限) /// 通用输入扩展参数(带权限)

@ -1,4 +1,4 @@
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 通用输入帮助类 /// 通用输入帮助类

@ -2,7 +2,7 @@
using Mapster; using Mapster;
using SqlSugar; using SqlSugar;
namespace Magic.Core; namespace Myshipping.Core;
public class PageResult<T> public class PageResult<T>
{ {

@ -2,7 +2,7 @@ using SqlSugar;
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 分页拓展类 /// 分页拓展类

@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Mvc.Filters;
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 规范化RESTful风格返回值 /// 规范化RESTful风格返回值

@ -3,14 +3,14 @@ using Furion.DependencyInjection;
using Furion.EventBus; using Furion.EventBus;
using Furion.FriendlyException; using Furion.FriendlyException;
using Furion.Logging.Extensions; using Furion.Logging.Extensions;
using Magic.Core.Entity; using Myshipping.Core.Entity;
using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.Filters;
using System; using System;
using System.Security.Claims; using System.Security.Claims;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 全局异常处理 /// 全局异常处理

@ -5,14 +5,14 @@ using System.Threading.Tasks;
using Furion; using Furion;
using Furion.EventBus; using Furion.EventBus;
using Furion.JsonSerialization; using Furion.JsonSerialization;
using Magic.Core.Entity; using Myshipping.Core.Entity;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Controllers;
using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.Filters;
using UAParser; using UAParser;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 请求日志拦截 /// 请求日志拦截

@ -4,7 +4,7 @@ using SqlSugar;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// SqlSugar 工作单元拦截器 /// SqlSugar 工作单元拦截器

@ -1,12 +1,12 @@
using Furion.DataEncryption; using Furion.DataEncryption;
using Magic.Core.Entity; using Myshipping.Core.Entity;
using Magic.Core.Service; using Myshipping.Core.Service;
using Microsoft.AspNetCore.SignalR; using Microsoft.AspNetCore.SignalR;
using System; using System;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// 聊天集线器 /// 聊天集线器

@ -1,7 +1,7 @@
using Magic.Core.Entity; using Myshipping.Core.Entity;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Magic.Core; namespace Myshipping.Core;
public interface IChatClient public interface IChatClient
{ {

@ -1,8 +1,8 @@
using Furion; using Furion;
using Furion.DependencyInjection; using Furion.DependencyInjection;
using Furion.TaskScheduler; using Furion.TaskScheduler;
using Magic.Core.Entity; using Myshipping.Core.Entity;
using Magic.Core.Service; using Myshipping.Core.Service;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using SqlSugar; using SqlSugar;
using System; using System;
@ -10,7 +10,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Linq.Expressions; using System.Linq.Expressions;
namespace Magic.Core.Job; namespace Myshipping.Core.Job;
/// <summary> /// <summary>
/// 日志定时任务类 /// 日志定时任务类

@ -2,7 +2,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace Magic.Core; namespace Myshipping.Core;
/// <summary> /// <summary>
/// Long 类型Json返回处理 /// Long 类型Json返回处理

@ -3,7 +3,7 @@ using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Console; using Microsoft.Extensions.Logging.Console;
using System; using System;
namespace Magic.Core; namespace Myshipping.Core;
public sealed class ConsoleForamtComponent : IWebComponent public sealed class ConsoleForamtComponent : IWebComponent
{ {

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save