v3.4.6
This commit is contained in:
@@ -0,0 +1,41 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using JNPF.DependencyInjection;
|
||||
|
||||
namespace JNPF.Systems.Entitys.Dto.User;
|
||||
|
||||
/// <summary>
|
||||
/// 当前用户默认值信息输出.
|
||||
/// </summary>
|
||||
[SuppressSniffer]
|
||||
public class GetDefaultCurrentValueInput
|
||||
{
|
||||
/// <summary>
|
||||
/// 部门Ids.
|
||||
/// </summary>
|
||||
public List<string> DepartIds { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 用户Ids.
|
||||
/// </summary>
|
||||
public List<string> UserIds { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 角色Ids.
|
||||
/// </summary>
|
||||
public List<string> RoleIds { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 岗位Ids.
|
||||
/// </summary>
|
||||
public List<string> PositionIds { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 分组Ids.
|
||||
/// </summary>
|
||||
public List<string> GroupIds { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// .
|
||||
/// </summary>
|
||||
public string Keyword { get; set; }
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
namespace JNPF.Systems.Entitys.Dto.System.CommonWords
|
||||
{
|
||||
public class CommonWordsInput
|
||||
{
|
||||
/// <summary>
|
||||
/// 自然主键.
|
||||
/// </summary>
|
||||
public string id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 应用id.
|
||||
/// </summary>
|
||||
public List<string> systemIds { get; set; } = new List<string>();
|
||||
|
||||
/// <summary>
|
||||
/// 应用名称.
|
||||
/// </summary>
|
||||
public List<string> systemNames { get; set; } = new List<string>();
|
||||
|
||||
/// <summary>
|
||||
/// 常用语.
|
||||
/// </summary>
|
||||
public string commonWordsText { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 常用语类型(0:系统,1:个人).
|
||||
/// </summary>
|
||||
public int commonWordsType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 排序.
|
||||
/// </summary>
|
||||
public long sortCode { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 有效标志.
|
||||
/// </summary>
|
||||
public int? enabledMark { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
namespace JNPF.Systems.Entitys.Dto.System.CommonWords;
|
||||
|
||||
public class CommonWordsOutput
|
||||
{
|
||||
/// <summary>
|
||||
/// 自然主键.
|
||||
/// </summary>
|
||||
public string id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 应用id.
|
||||
/// </summary>
|
||||
public string systemId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 应用名称.
|
||||
/// </summary>
|
||||
public string systemNames { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 常用语.
|
||||
/// </summary>
|
||||
public string commonWordsText { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 常用语类型(0:系统,1:个人).
|
||||
/// </summary>
|
||||
public int commonWordsType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 排序.
|
||||
/// </summary>
|
||||
public long sortCode { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 有效标志.
|
||||
/// </summary>
|
||||
public int? enabledMark { get; set; }
|
||||
}
|
||||
@@ -62,4 +62,9 @@ public class PrintDevCrInput
|
||||
/// 打印模板.
|
||||
/// </summary>
|
||||
public string printTemplate { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 纸张参数.
|
||||
/// </summary>
|
||||
public string pageParam { get; set; }
|
||||
}
|
||||
@@ -67,4 +67,9 @@ public class PrintDevInfoOutput
|
||||
/// 打印模板.
|
||||
/// </summary>
|
||||
public string printTemplate { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 纸张参数.
|
||||
/// </summary>
|
||||
public string pageParam { get; set; }
|
||||
}
|
||||
@@ -17,4 +17,9 @@ public class PrintDevSqlDataQuery
|
||||
/// 参数.
|
||||
/// </summary>
|
||||
public string formId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 模板id.
|
||||
/// </summary>
|
||||
public List<string> ids { get; set; }
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
namespace JNPF.Systems.Entitys.Dto.System.PrintLog;
|
||||
|
||||
public class PrintLogOutuut
|
||||
{
|
||||
/// <summary>
|
||||
/// id.
|
||||
/// </summary>
|
||||
public string id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 打印人.
|
||||
/// </summary>
|
||||
public string printMan { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 打印时间.
|
||||
/// </summary>
|
||||
public DateTime? printTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 打印条数.
|
||||
/// </summary>
|
||||
public int? printNum { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 打印功能名称.
|
||||
/// </summary>
|
||||
public string printTitle { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 打印模板id.
|
||||
/// </summary>
|
||||
public string printId { get; set; }
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
using JNPF.Common.Filter;
|
||||
|
||||
namespace JNPF.Systems.Entitys.Dto.System.PrintLog;
|
||||
|
||||
public class PrintLogQuery : PageInputBase
|
||||
{
|
||||
/// <summary>
|
||||
/// 开始时间.
|
||||
/// </summary>
|
||||
public long? startTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 结束时间.
|
||||
/// </summary>
|
||||
public long? endTime { get; set; }
|
||||
}
|
||||
@@ -346,4 +346,71 @@ public class SysConfigOutput
|
||||
/// 链接点击几次后失效.
|
||||
/// </summary>
|
||||
public int unClickNum { get; set; }
|
||||
|
||||
#region 密码策略
|
||||
/// <summary>
|
||||
/// 密码定期更新开关.
|
||||
/// </summary>
|
||||
public int passwordIsUpdatedRegularly { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 更新周期.
|
||||
/// </summary>
|
||||
public int updateCycle { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 提前N天提醒更新.
|
||||
/// </summary>
|
||||
public int updateInAdvance { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 密码强度限制开关.
|
||||
/// </summary>
|
||||
public int passwordStrengthLimit { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 最小长度开关.
|
||||
/// </summary>
|
||||
public int passwordLengthMin { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 密码最小长度限制.
|
||||
/// </summary>
|
||||
public int passwordLengthMinNumber { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 是否包含数字.
|
||||
/// </summary>
|
||||
public int containsNumbers { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 是否包含小写字母.
|
||||
/// </summary>
|
||||
public int includeLowercaseLetters { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 是否包含大写字母.
|
||||
/// </summary>
|
||||
public int includeUppercaseLetters { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 是否包含字符.
|
||||
/// </summary>
|
||||
public int containsCharacters { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 是否禁用旧密码开关.
|
||||
/// </summary>
|
||||
public int disableOldPassword { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 禁用旧密码个数.
|
||||
/// </summary>
|
||||
public int disableTheNumberOfOldPasswords { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 初始密码强制修改开关.
|
||||
/// </summary>
|
||||
public int mandatoryModificationOfInitialPassword { get; set; }
|
||||
#endregion
|
||||
}
|
||||
11
system/Tnb.Systems.Entitys/Dto/System/System/SystemQuery.cs
Normal file
11
system/Tnb.Systems.Entitys/Dto/System/System/SystemQuery.cs
Normal file
@@ -0,0 +1,11 @@
|
||||
using JNPF.Common.Filter;
|
||||
|
||||
namespace JNPF.Systems.Entitys.Dto.System.System;
|
||||
|
||||
public class SystemQuery : KeywordInput
|
||||
{
|
||||
/// <summary>
|
||||
/// 开启 1 0 禁用.
|
||||
/// </summary>
|
||||
public string enableMark { get; set; }
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
using JNPF.Common.Contracts;
|
||||
using SqlSugar;
|
||||
|
||||
namespace JNPF.Systems.Entitys.Entity.Permission;
|
||||
|
||||
/// <summary>
|
||||
/// 用户旧密码记录表.
|
||||
/// </summary>
|
||||
[SugarTable("BASE_USER_OLD_PASSWORD")]
|
||||
public class UserOldPasswordEntity : EntityBase<string>
|
||||
{
|
||||
/// <summary>
|
||||
/// 用户ID.
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "F_USERID")]
|
||||
public string UserId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 用户ID.
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "F_Account")]
|
||||
public string Account { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 账户.
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "F_OldPassword")]
|
||||
public string OldPassword { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 秘钥.
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "F_Secretkey")]
|
||||
public string Secretkey { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 创建时间.
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "F_CreatorTime")]
|
||||
public DateTime CreatorTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 租户ID.
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "F_TenantId")]
|
||||
public string TenantId { get; set; }
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
using JNPF.Common.Contracts;
|
||||
using SqlSugar;
|
||||
|
||||
namespace JNPF.Systems.Entitys.Entity.System;
|
||||
|
||||
/// <summary>
|
||||
/// 常用语
|
||||
/// 版 本:V3.2
|
||||
/// 版 权:引迈信息技术有限公司(https://www.jnpfsoft.com)
|
||||
/// 作 者:JNPF开发平台组
|
||||
/// 日 期:2021-06-01.
|
||||
/// </summary>
|
||||
[SugarTable("BASE_COMMONWORDS")]
|
||||
public class CommonWordsEntity : CLDEntityBase
|
||||
{
|
||||
/// <summary>
|
||||
/// 应用id.
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "F_SYSTEMIDS")]
|
||||
public string SystemIds { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 应用名称.
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "F_SYSTEMNAMES")]
|
||||
public string SystemNames { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 常用语.
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "F_COMMONWORDSTEXT")]
|
||||
public string CommonWordsText { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 常用语类型(0:系统,1:个人).
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "F_COMMONWORDSTYPE")]
|
||||
public int CommonWordsType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 排序.
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "F_SORTCODE")]
|
||||
public long SortCode { get; set; }
|
||||
}
|
||||
@@ -73,4 +73,6 @@ public class PrintDevEntity : CLDEntityBase
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "F_PRINTTEMPLATE")]
|
||||
public string PrintTemplate { get; set; }
|
||||
[SugarColumn(ColumnName = "F_PAGEPARAM")]
|
||||
public string PageParam { get; set; }
|
||||
}
|
||||
47
system/Tnb.Systems.Entitys/Entity/System/PrintLogEntity.cs
Normal file
47
system/Tnb.Systems.Entitys/Entity/System/PrintLogEntity.cs
Normal file
@@ -0,0 +1,47 @@
|
||||
using JNPF.Common.Const;
|
||||
using JNPF.Common.Contracts;
|
||||
using SqlSugar;
|
||||
|
||||
namespace JNPF.Systems.Entitys.Entity.System;
|
||||
|
||||
/// <summary>
|
||||
/// 打印模板日志
|
||||
/// 版 本:V3.2
|
||||
/// 版 权:引迈信息技术有限公司(https://www.jnpfsoft.com)
|
||||
/// 作 者:JNPF开发平台组
|
||||
/// 日 期:2021-06-01.
|
||||
/// </summary>
|
||||
[SugarTable("BASE_PRINT_LOG")]
|
||||
[Tenant(ClaimConst.TENANTID)]
|
||||
public class PrintLogEntity : EntityBase<string>
|
||||
{
|
||||
/// <summary>
|
||||
/// 打印人.
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "F_PrintMan")]
|
||||
public string PrintMan { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 打印时间.
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "F_PrintTime")]
|
||||
public DateTime? PrintTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 打印条数.
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "F_PrintNum")]
|
||||
public int? PrintNum { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 打印功能名称.
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "F_PrintTitle")]
|
||||
public string PrintTitle { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 打印模板id.
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnName = "F_PrintId")]
|
||||
public string PrintId { get; set; }
|
||||
}
|
||||
@@ -0,0 +1,201 @@
|
||||
namespace JNPF.Systems.Entitys.Model.Permission.User;
|
||||
|
||||
public class UserInfo
|
||||
{
|
||||
private static readonly long serialVersionUID = 6402443942083382236L;
|
||||
|
||||
public static readonly string CLASS_TYPE = "UserInfo";
|
||||
|
||||
public static readonly string DEFAULT_PASSWORD_SUFFIX = "MaxKey@888";
|
||||
|
||||
string sessionId { get; set; }
|
||||
|
||||
public string id { get; set; }
|
||||
public string username { get; set; }
|
||||
public string password { get; set; }
|
||||
public string decipherable { get; set; }
|
||||
public string sharedSecret { get; set; }
|
||||
public string sharedCounter { get; set; }
|
||||
/**
|
||||
* "Employee", "Supplier","Dealer","Contractor",Partner,Customer "Intern",
|
||||
* "Temp", "External", and "Unknown" .
|
||||
*/
|
||||
public string userType { get; set; }
|
||||
|
||||
public string userState { get; set; }
|
||||
|
||||
public string windowsAccount { get; set; }
|
||||
|
||||
// for user name
|
||||
public string displayName { get; set; }
|
||||
public string nickName { get; set; }
|
||||
public string nameZhSpell { get; set; }
|
||||
public string nameZhShortSpell { get; set; }
|
||||
public string givenName { get; set; }
|
||||
public string middleName { get; set; }
|
||||
public string familyName { get; set; }
|
||||
public string honorificPrefix { get; set; }
|
||||
public string honorificSuffix { get; set; }
|
||||
public string formattedName { get; set; }
|
||||
|
||||
public int married { get; set; }
|
||||
public int gender { get; set; }
|
||||
public string birthDate { get; set; }
|
||||
public byte[] picture { get; set; }
|
||||
public string pictureBase64 { get; set; }
|
||||
public string pictureId { get; set; }
|
||||
public int idType { get; set; }
|
||||
public string idCardNo { get; set; }
|
||||
public string webSite { get; set; }
|
||||
public string startWorkDate { get; set; }
|
||||
|
||||
// for security
|
||||
public int authnType { get; set; }
|
||||
public string email { get; set; }
|
||||
|
||||
public int emailVerified { get; set; }
|
||||
public string mobile { get; set; }
|
||||
|
||||
public int mobileVerified { get; set; }
|
||||
|
||||
public string passwordQuestion { get; set; }
|
||||
|
||||
public string passwordAnswer { get; set; }
|
||||
// for apps login public
|
||||
public int appLoginAuthnType { get; set; }
|
||||
public string appLoginPassword { get; set; }
|
||||
public string protectedApps { get; set; }
|
||||
public Dictionary<string, string> protectedAppsMap { get; set; }
|
||||
|
||||
public string passwordLastSetTime { get; set; }
|
||||
public int badPasswordCount { get; set; }
|
||||
public string badPasswordTime { get; set; }
|
||||
public string unLockTime { get; set; }
|
||||
public int isLocked { get; set; }
|
||||
public string lastLoginTime { get; set; }
|
||||
public string lastLoginIp { get; set; }
|
||||
public string lastLogoffTime { get; set; }
|
||||
public int passwordSetType { get; set; }
|
||||
public int loginCount { get; set; }
|
||||
public string regionHistory { get; set; }
|
||||
public string passwordHistory { get; set; }
|
||||
|
||||
public string locale { get; set; }
|
||||
public string timeZone { get; set; }
|
||||
public string preferredLanguage { get; set; }
|
||||
|
||||
// for work
|
||||
public string workCountry { get; set; }
|
||||
public string workRegion { get; set; }// province
|
||||
public string workLocality { get; set; }// city
|
||||
public string workStreetAddress { get; set; }
|
||||
public string workAddressFormatted { get; set; }
|
||||
public string workEmail { get; set; }
|
||||
public string workPhoneNumber { get; set; }
|
||||
public string workPostalCode { get; set; }
|
||||
public string workFax { get; set; }
|
||||
|
||||
public string workOfficeName { get; set; }
|
||||
// for home
|
||||
public string homeCountry { get; set; }
|
||||
public string homeRegion { get; set; }// province
|
||||
public string homeLocality { get; set; }// city
|
||||
public string homeStreetAddress { get; set; }
|
||||
public string homeAddressFormatted { get; set; }
|
||||
public string homeEmail { get; set; }
|
||||
public string homePhoneNumber { get; set; }
|
||||
public string homePostalCode { get; set; }
|
||||
public string homeFax { get; set; }
|
||||
// for company
|
||||
public string employeeNumber { get; set; }
|
||||
public string costCenter { get; set; }
|
||||
public string organization { get; set; }
|
||||
public string division { get; set; }
|
||||
public string departmentId { get; set; }
|
||||
public string department { get; set; }
|
||||
public string jobTitle { get; set; }
|
||||
public string jobLevel { get; set; }
|
||||
public string managerId { get; set; }
|
||||
public string manager { get; set; }
|
||||
public string assistantId { get; set; }
|
||||
public string assistant { get; set; }
|
||||
public string entryDate { get; set; }
|
||||
public string quitDate { get; set; }
|
||||
|
||||
// for social contact
|
||||
public string defineIm { get; set; }
|
||||
public int weixinFollow { get; set; }
|
||||
|
||||
public string theme { get; set; }
|
||||
/*
|
||||
* for extended Attribute from userType extraAttribute for database
|
||||
* extraAttributeName & extraAttributeValue for page submit
|
||||
*/
|
||||
public string extraAttribute { get; set; }
|
||||
public string extraAttributeName { get; set; }
|
||||
public string extraAttributeValue { get; set; }
|
||||
public Dictionary<string, string> extraAttributeMap { get; set; }
|
||||
|
||||
public int online { get; set; }
|
||||
|
||||
public string ldapDn { get; set; }
|
||||
|
||||
public int gridList { get; set; }
|
||||
|
||||
public string createdBy { get; set; }
|
||||
public string createdDate { get; set; }
|
||||
public string modifiedBy { get; set; }
|
||||
public string modifiedDate { get; set; }
|
||||
public int status { get; set; }
|
||||
string description { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 租户Id.
|
||||
/// </summary>
|
||||
public string instId { get; set; }
|
||||
|
||||
private string instName;
|
||||
|
||||
string syncId { get; set; }
|
||||
|
||||
string syncName { get; set; }
|
||||
|
||||
string originId { get; set; }
|
||||
|
||||
string originId2 { get; set; }
|
||||
|
||||
string gradingUserId { get; set; }
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
return "UserInfo{" +
|
||||
"id='" + id + '\'' +
|
||||
", username='" + username + '\'' +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
|
||||
public class MqMessage
|
||||
{
|
||||
public string id { get; set; }
|
||||
public string topic { get; set; }
|
||||
public string actionType { get; set; }
|
||||
public string sendTime { get; set; }
|
||||
public object content { get; set; }
|
||||
public UserInfo userInfo { get; set; }
|
||||
|
||||
public MqMessage()
|
||||
{
|
||||
}
|
||||
|
||||
public MqMessage(string id, string topic, string actionType, string sendTime, object content, UserInfo userInfo)
|
||||
{
|
||||
this.id = id;
|
||||
this.topic = topic;
|
||||
this.actionType = actionType;
|
||||
this.sendTime = sendTime;
|
||||
this.content = content;
|
||||
this.userInfo = userInfo;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user