Skip to content

Commit 9f00d49

Browse files
Hans-Wengitee-org
Hans-Wen
authored and
gitee-org
committed
Merge branch 'next' of gitee.com:zuohuaijun/Admin.NET into SyncDingTalkUserJob2
Signed-off-by: Hans <[email protected]>
2 parents 9fdd5d0 + 9cecf55 commit 9f00d49

File tree

394 files changed

+1947
-1591
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

394 files changed

+1947
-1591
lines changed

‎Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
<PackageReference Include="AspNet.Security.OAuth.Weixin" Version="6.0.15" />
2323
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
2424
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.13.5" />
25-
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.2.16" />
26-
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.2.16" />
27-
<PackageReference Include="Furion.Pure" Version="4.9.2.16" />
25+
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.2.17" />
26+
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.2.17" />
27+
<PackageReference Include="Furion.Pure" Version="4.9.2.17" />
2828
<PackageReference Include="IPTools.China" Version="1.6.0" />
2929
<PackageReference Include="IPTools.International" Version="1.6.0" />
3030
<PackageReference Include="Lazy.Captcha.Core" Version="2.0.6" />

‎Admin.NET/Admin.NET.Core/Entity/EntityBase.cs

+14-14
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ public abstract class EntityBase : EntityBaseId, IDeletedFilter
4444
[SugarColumn(ColumnDescription = "创建者Id", IsOnlyIgnoreUpdate = true)]
4545
public virtual long? CreateUserId { get; set; }
4646

47-
/// <summary>
48-
/// 创建者
49-
/// </summary>
50-
[Newtonsoft.Json.JsonIgnore]
51-
[System.Text.Json.Serialization.JsonIgnore]
52-
[Navigate(NavigateType.OneToOne, nameof(CreateUserId))]
53-
public virtual SysUser CreateUser { get; set; }
47+
///// <summary>
48+
///// 创建者
49+
///// </summary>
50+
//[Newtonsoft.Json.JsonIgnore]
51+
//[System.Text.Json.Serialization.JsonIgnore]
52+
//[Navigate(NavigateType.OneToOne, nameof(CreateUserId))]
53+
//public virtual SysUser CreateUser { get; set; }
5454

5555
/// <summary>
5656
/// 创建者姓名
@@ -64,13 +64,13 @@ public abstract class EntityBase : EntityBaseId, IDeletedFilter
6464
[SugarColumn(ColumnDescription = "修改者Id")]
6565
public virtual long? UpdateUserId { get; set; }
6666

67-
/// <summary>
68-
/// 修改者
69-
/// </summary>
70-
[Newtonsoft.Json.JsonIgnore]
71-
[System.Text.Json.Serialization.JsonIgnore]
72-
[Navigate(NavigateType.OneToOne, nameof(UpdateUserId))]
73-
public virtual SysUser UpdateUser { get; set; }
67+
///// <summary>
68+
///// 修改者
69+
///// </summary>
70+
//[Newtonsoft.Json.JsonIgnore]
71+
//[System.Text.Json.Serialization.JsonIgnore]
72+
//[Navigate(NavigateType.OneToOne, nameof(UpdateUserId))]
73+
//public virtual SysUser UpdateUser { get; set; }
7474

7575
/// <summary>
7676
/// 修改者姓名

‎Admin.NET/Admin.NET.Core/Service/APIJSON/APIJSONService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace Admin.NET.Core.Service;
1010

1111
/// <summary>
12-
/// APIJSON服务 💥
12+
/// APIJSON服务 🧩
1313
/// </summary>
1414
[ApiDescriptionSettings(Order = 100)]
1515
public class APIJSONService : IDynamicApiController, ITransient

‎Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Admin.NET.Core.Service;
1313

1414
/// <summary>
15-
/// 系统登录授权服务 💥
15+
/// 系统登录授权服务 🧩
1616
/// </summary>
1717
[ApiDescriptionSettings(Order = 500)]
1818
public class SysAuthService : IDynamicApiController, ITransient

‎Admin.NET/Admin.NET.Core/Service/Auth/SysLdapService.cs

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
namespace Admin.NET.Core;
1212

1313
/// <summary>
14-
/// 系统域登录配置服务 💥
14+
/// 系统域登录配置服务 🧩
1515
/// </summary>
1616
[ApiDescriptionSettings(Order = 485)]
1717
public class SysLdapService : IDynamicApiController, ITransient
@@ -24,7 +24,7 @@ public SysLdapService(SqlSugarRepository<SysLdap> sysLdapRep)
2424
}
2525

2626
/// <summary>
27-
/// 获取系统域登录配置分页列表
27+
/// 获取系统域登录配置分页列表 🔖
2828
/// </summary>
2929
/// <param name="input"></param>
3030
/// <returns></returns>
@@ -39,7 +39,7 @@ public async Task<SqlSugarPagedList<SysLdap>> Page(SysLdapInput input)
3939
}
4040

4141
/// <summary>
42-
/// 增加系统域登录配置
42+
/// 增加系统域登录配置 🔖
4343
/// </summary>
4444
/// <param name="input"></param>
4545
/// <returns></returns>
@@ -54,7 +54,7 @@ public async Task<long> Add(AddSysLdapInput input)
5454
}
5555

5656
/// <summary>
57-
/// 更新系统域登录配置
57+
/// 更新系统域登录配置 🔖
5858
/// </summary>
5959
/// <param name="input"></param>
6060
/// <returns></returns>
@@ -72,7 +72,7 @@ public async Task Update(UpdateSysLdapInput input)
7272
}
7373

7474
/// <summary>
75-
/// 删除系统域登录配置
75+
/// 删除系统域登录配置 🔖
7676
/// </summary>
7777
/// <param name="input"></param>
7878
/// <returns></returns>
@@ -86,7 +86,7 @@ public async Task Delete(DeleteSysLdapInput input)
8686
}
8787

8888
/// <summary>
89-
/// 获取系统域登录配置详情
89+
/// 获取系统域登录配置详情 🔖
9090
/// </summary>
9191
/// <param name="input"></param>
9292
/// <returns></returns>
@@ -97,7 +97,7 @@ public async Task<SysLdap> GetDetail([FromQuery] DetailSysLdapInput input)
9797
}
9898

9999
/// <summary>
100-
/// 获取系统域登录配置列表
100+
/// 获取系统域登录配置列表 🔖
101101
/// </summary>
102102
/// <returns></returns>
103103
[DisplayName("获取系统域登录配置列表")]
@@ -157,7 +157,7 @@ public async Task<bool> AuthAccount(long tenantId, string account, string passwo
157157
}
158158

159159
/// <summary>
160-
/// 同步域用户
160+
/// 同步域用户 🔖
161161
/// </summary>
162162
/// <param name="input"></param>
163163
/// <returns></returns>

‎Admin.NET/Admin.NET.Core/Service/Cache/SysCacheService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
namespace Admin.NET.Core.Service;
1212

1313
/// <summary>
14-
/// 系统缓存服务 💥
14+
/// 系统缓存服务 🧩
1515
/// </summary>
1616
[ApiDescriptionSettings(Order = 400)]
1717
public class SysCacheService : IDynamicApiController, ISingleton

‎Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenConfigService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace Admin.NET.Core.Service;
1010

1111
/// <summary>
12-
/// 系统代码生成配置服务 💥
12+
/// 系统代码生成配置服务 🧩
1313
/// </summary>
1414
[ApiDescriptionSettings(Order = 260)]
1515
public class SysCodeGenConfigService : IDynamicApiController, ITransient

‎Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
namespace Admin.NET.Core.Service;
1212

1313
/// <summary>
14-
/// 系统代码生成器服务 💥
14+
/// 系统代码生成器服务 🧩
1515
/// </summary>
1616
[ApiDescriptionSettings(Order = 270)]
1717
public class SysCodeGenService : IDynamicApiController, ITransient

‎Admin.NET/Admin.NET.Core/Service/Common/SysCommonService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
namespace Admin.NET.Core.Service;
1515

1616
/// <summary>
17-
/// 系统通用服务 💥
17+
/// 系统通用服务 🧩
1818
/// </summary>
1919
[ApiDescriptionSettings(Order = 101)]
2020
[AllowAnonymous]

‎Admin.NET/Admin.NET.Core/Service/Config/SysConfigService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace Admin.NET.Core.Service;
1010

1111
/// <summary>
12-
/// 系统参数配置服务 💥
12+
/// 系统参数配置服务 🧩
1313
/// </summary>
1414
[ApiDescriptionSettings(Order = 440)]
1515
public class SysConfigService : IDynamicApiController, ITransient

‎Admin.NET/Admin.NET.Core/Service/Const/SysConstService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace Admin.NET.Core.Service;
1010

1111
/// <summary>
12-
/// 系统常量服务 💥
12+
/// 系统常量服务 🧩
1313
/// </summary>
1414
[ApiDescriptionSettings(Order = 280)]
1515
[AllowAnonymous]

‎Admin.NET/Admin.NET.Core/Service/DataBase/Dto/DbTableVisual.cs

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
// 大名科技（天津）有限公司 版权所有
2+
//
3+
// 此源代码遵循位于源代码树根目录中的 LICENSE 文件的许可证
4+
//
5+
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动
6+
//
7+
// 任何基于本项目二次开发而产生的一切法律纠纷和责任，均与作者无关
8+
9+
namespace Admin.NET.Core.Service;
10+
11+
/// <summary>
12+
/// 库表可视化
13+
/// </summary>
14+
public class VisualDbTable
15+
{
16+
public List<VisualTable> VisualTableList { get; set; }
17+
18+
public List<VisualColumn> VisualColumnList { get; set; }
19+
20+
public List<ColumnRelation> ColumnRelationList { get; set; }
21+
}
22+
23+
public class VisualTable
24+
{
25+
public string TableName { get; set; }
26+
27+
public string TableComents { get; set; }
28+
29+
public int X { get; set; }
30+
31+
public int Y { get; set; }
32+
}
33+
34+
public class VisualColumn
35+
{
36+
public string TableName { get; set; }
37+
38+
public string ColumnName { get; set; }
39+
40+
public string DataType { get; set; }
41+
42+
public string DataLength { get; set; }
43+
44+
public string ColumnDescription { get; set; }
45+
}
46+
47+
public class ColumnRelation
48+
{
49+
public string SourceTableName { get; set; }
50+
51+
public string SourceColumnName { get; set; }
52+
53+
public string Type { get; set; }
54+
55+
public string TargetTableName { get; set; }
56+
57+
public string TargetColumnName { get; set; }
58+
}

‎Admin.NET/Admin.NET.Core/Service/DataBase/SysDatabaseService.cs

+61-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
namespace Admin.NET.Core.Service;
1414

1515
/// <summary>
16-
/// 系统数据库管理服务 💥
16+
/// 系统数据库管理服务 🧩
1717
/// </summary>
1818
[ApiDescriptionSettings(Order = 250)]
1919
public class SysDatabaseService : IDynamicApiController, ITransient
@@ -41,6 +41,66 @@ public List<string> GetList()
4141
return App.GetOptions<DbConnectionOptions>().ConnectionConfigs.Select(u => u.ConfigId.ToString()).ToList();
4242
}
4343

44+
/// <summary>
45+
/// 获取可视化库表结构 🔖
46+
/// </summary>
47+
/// <returns></returns>
48+
[DisplayName("获取可视化库表结构")]
49+
public VisualDbTable GetVisualDbTable()
50+
{
51+
var visualTableList = new List<VisualTable>();
52+
var visualColumnList = new List<VisualColumn>();
53+
var columnRelationList = new List<ColumnRelation>();
54+
55+
// 遍历所有实体获取所有库表结构
56+
var random = new Random();
57+
var entityTypes = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.IsDefined(typeof(SugarTable), false)).ToList();
58+
foreach (var entityType in entityTypes)
59+
{
60+
var entityInfo = _db.EntityMaintenance.GetEntityInfoNoCache(entityType);
61+
62+
var visualTable = new VisualTable
63+
{
64+
TableName = entityInfo.DbTableName,
65+
TableComents = entityInfo.TableDescription + entityInfo.DbTableName,
66+
X = random.Next(5000),
67+
Y = random.Next(5000)
68+
};
69+
visualTableList.Add(visualTable);
70+
71+
foreach (EntityColumnInfo columnInfo in entityInfo.Columns)
72+
{
73+
var visualColumn = new VisualColumn
74+
{
75+
TableName = columnInfo.DbTableName,
76+
ColumnName = columnInfo.DbColumnName,
77+
DataType = columnInfo.PropertyInfo.PropertyType.Name,
78+
DataLength = columnInfo.Length.ToString(),
79+
ColumnDescription = columnInfo.ColumnDescription,
80+
};
81+
visualColumnList.Add(visualColumn);
82+
83+
// 根据导航配置获取表之间关联关系
84+
if (columnInfo.Navigat != null)
85+
{
86+
var name1 = columnInfo.Navigat.GetName();
87+
var name2 = columnInfo.Navigat.GetName2();
88+
var relation = new ColumnRelation
89+
{
90+
SourceTableName = columnInfo.DbTableName,
91+
SourceColumnName = name1,
92+
Type = columnInfo.Navigat.GetNavigateType() == NavigateType.OneToOne ? "ONE_TO_ONE" : "ONE_TO_MANY",
93+
TargetTableName = columnInfo.DbColumnName,
94+
TargetColumnName = string.IsNullOrEmpty(name2) ? "Id" : name2
95+
};
96+
columnRelationList.Add(relation);
97+
}
98+
}
99+
}
100+
101+
return new VisualDbTable { VisualTableList = visualTableList, VisualColumnList = visualColumnList, ColumnRelationList = columnRelationList };
102+
}
103+
44104
/// <summary>
45105
/// 获取字段列表 🔖
46106
/// </summary>

‎Admin.NET/Admin.NET.Core/Service/Dict/SysDictDataService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace Admin.NET.Core.Service;
1010

1111
/// <summary>
12-
/// 系统字典值服务 💥
12+
/// 系统字典值服务 🧩
1313
/// </summary>
1414
[ApiDescriptionSettings(Order = 420)]
1515
[AllowAnonymous]

‎Admin.NET/Admin.NET.Core/Service/Dict/SysDictTypeService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace Admin.NET.Core.Service;
1010

1111
/// <summary>
12-
/// 系统字典类型服务 💥
12+
/// 系统字典类型服务 🧩
1313
/// </summary>
1414
[ApiDescriptionSettings(Order = 430)]
1515
[AllowAnonymous]

‎Admin.NET/Admin.NET.Core/Service/Enum/SysEnumService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace Admin.NET.Core.Service;
1010

1111
/// <summary>
12-
/// 系统枚举服务 💥
12+
/// 系统枚举服务 🧩
1313
/// </summary>
1414
[ApiDescriptionSettings(Order = 275)]
1515
[AllowAnonymous]

‎Admin.NET/Admin.NET.Core/Service/File/SysFileService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
namespace Admin.NET.Core.Service;
1414

1515
/// <summary>
16-
/// 系统文件服务 💥
16+
/// 系统文件服务 🧩
1717
/// </summary>
1818
[ApiDescriptionSettings(Order = 410)]
1919
public class SysFileService : IDynamicApiController, ITransient

‎Admin.NET/Admin.NET.Core/Service/Job/SysJobService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace Admin.NET.Core.Service;
1010

1111
/// <summary>
12-
/// 系统作业任务服务 💥
12+
/// 系统作业任务服务 🧩
1313
/// </summary>
1414
[ApiDescriptionSettings(Order = 320)]
1515
public class SysJobService : IDynamicApiController, ITransient

‎Admin.NET/Admin.NET.Core/Service/Logging/SysLogDiffService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace Admin.NET.Core.Service;
1010

1111
/// <summary>
12-
/// 系统差异日志服务 💥
12+
/// 系统差异日志服务 🧩
1313
/// </summary>
1414
[ApiDescriptionSettings(Order = 330)]
1515
public class SysLogDiffService : IDynamicApiController, ITransient

‎Admin.NET/Admin.NET.Core/Service/Logging/SysLogExService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace Admin.NET.Core.Service;
1010

1111
/// <summary>
12-
/// 系统异常日志服务 💥
12+
/// 系统异常日志服务 🧩
1313
/// </summary>
1414
[ApiDescriptionSettings(Order = 350)]
1515
public class SysLogExService : IDynamicApiController, ITransient

0 commit comments

Comments
 (0)