更新项目配置,新增设备同步模块,优化WebSocket和Swagger配置,增强SCADA系统的免登录接口,支持数据字典项和登录日志的免登录查询与记录。调整Java编译设置,确保更好的开发体验。
This commit is contained in:
124
yy-admin-master/YY.Admin.Core/Const/CacheConst.cs
Normal file
124
yy-admin-master/YY.Admin.Core/Const/CacheConst.cs
Normal file
@@ -0,0 +1,124 @@
|
||||
|
||||
|
||||
namespace YY.Admin.Core.Const;
|
||||
|
||||
/// <summary>
|
||||
/// 缓存相关常量
|
||||
/// </summary>
|
||||
public class CacheConst
|
||||
{
|
||||
/// <summary>
|
||||
/// 用户权限缓存(按钮集合)
|
||||
/// </summary>
|
||||
public const string KeyUserButton = "sys_user_button:";
|
||||
|
||||
/// <summary>
|
||||
/// 用户机构缓存
|
||||
/// </summary>
|
||||
public const string KeyUserOrg = "sys_user_org:";
|
||||
|
||||
/// <summary>
|
||||
/// 角色最大数据范围缓存
|
||||
/// </summary>
|
||||
public const string KeyRoleMaxDataScope = "sys_role_maxDataScope:";
|
||||
|
||||
/// <summary>
|
||||
/// 在线用户缓存
|
||||
/// </summary>
|
||||
public const string KeyUserOnline = "sys_user_online:";
|
||||
|
||||
/// <summary>
|
||||
/// 图形验证码缓存
|
||||
/// </summary>
|
||||
public const string KeyVerCode = "sys_verCode:";
|
||||
|
||||
/// <summary>
|
||||
/// 手机验证码缓存
|
||||
/// </summary>
|
||||
public const string KeyPhoneVerCode = "sys_phoneVerCode:";
|
||||
|
||||
/// <summary>
|
||||
/// 密码错误次数缓存
|
||||
/// </summary>
|
||||
public const string KeyPasswordErrorTimes = "sys_password_error_times:";
|
||||
|
||||
/// <summary>
|
||||
/// 租户缓存
|
||||
/// </summary>
|
||||
public const string KeyTenant = "sys_tenant";
|
||||
|
||||
/// <summary>
|
||||
/// 常量下拉框
|
||||
/// </summary>
|
||||
public const string KeyConst = "sys_const:";
|
||||
|
||||
/// <summary>
|
||||
/// 所有缓存关键字集合
|
||||
/// </summary>
|
||||
public const string KeyAll = "sys_keys";
|
||||
|
||||
/// <summary>
|
||||
/// SqlSugar二级缓存
|
||||
/// </summary>
|
||||
public const string SqlSugar = "sys_sqlSugar:";
|
||||
|
||||
/// <summary>
|
||||
/// 开放接口身份缓存
|
||||
/// </summary>
|
||||
public const string KeyOpenAccess = "sys_open_access:";
|
||||
|
||||
/// <summary>
|
||||
/// 开放接口身份随机数缓存
|
||||
/// </summary>
|
||||
public const string KeyOpenAccessNonce = "sys_open_access_nonce:";
|
||||
|
||||
/// <summary>
|
||||
/// 登录黑名单
|
||||
/// </summary>
|
||||
public const string KeyBlacklist = "sys_blacklist:";
|
||||
|
||||
/// <summary>
|
||||
/// 系统配置缓存
|
||||
/// </summary>
|
||||
public const string KeyConfig = "sys_config:";
|
||||
|
||||
/// <summary>
|
||||
/// 系统租户配置缓存
|
||||
/// </summary>
|
||||
public const string KeyTenantConfig = "sys_tenant_config:";
|
||||
|
||||
/// <summary>
|
||||
/// 系统用户配置缓存
|
||||
/// </summary>
|
||||
public const string KeyUserConfig = "sys_user_config:";
|
||||
|
||||
/// <summary>
|
||||
/// 系统字典缓存
|
||||
/// </summary>
|
||||
public const string KeyDict = "sys_dict:";
|
||||
|
||||
/// <summary>
|
||||
/// 系统租户字典缓存
|
||||
/// </summary>
|
||||
public const string KeyTenantDict = "sys_tenant_dict:";
|
||||
|
||||
/// <summary>
|
||||
/// 重复请求(幂等)字典缓存
|
||||
/// </summary>
|
||||
public const string KeyIdempotent = "sys_idempotent:";
|
||||
|
||||
/// <summary>
|
||||
/// Excel临时文件缓存
|
||||
/// </summary>
|
||||
public const string KeyExcelTemp = "sys_excel_temp:";
|
||||
|
||||
/// <summary>
|
||||
/// 系统更新命令日志缓存
|
||||
/// </summary>
|
||||
public const string KeySysUpdateLog = "sys_update_log";
|
||||
|
||||
/// <summary>
|
||||
/// 系统更新间隔标记缓存
|
||||
/// </summary>
|
||||
public const string KeySysUpdateInterval = "sys_update_interval";
|
||||
}
|
||||
64
yy-admin-master/YY.Admin.Core/Const/ClaimConst.cs
Normal file
64
yy-admin-master/YY.Admin.Core/Const/ClaimConst.cs
Normal file
@@ -0,0 +1,64 @@
|
||||
|
||||
|
||||
namespace YY.Admin.Core.Const;
|
||||
|
||||
/// <summary>
|
||||
/// Claim相关常量
|
||||
/// </summary>
|
||||
public class ClaimConst
|
||||
{
|
||||
/// <summary>
|
||||
/// 用户Id
|
||||
/// </summary>
|
||||
public const string UserId = "UserId";
|
||||
|
||||
/// <summary>
|
||||
/// 账号
|
||||
/// </summary>
|
||||
public const string Account = "Account";
|
||||
|
||||
/// <summary>
|
||||
/// 真实姓名
|
||||
/// </summary>
|
||||
public const string RealName = "RealName";
|
||||
|
||||
/// <summary>
|
||||
/// 昵称
|
||||
/// </summary>
|
||||
public const string NickName = "NickName";
|
||||
|
||||
/// <summary>
|
||||
/// 账号类型
|
||||
/// </summary>
|
||||
public const string AccountType = "AccountType";
|
||||
|
||||
/// <summary>
|
||||
/// 租户Id
|
||||
/// </summary>
|
||||
public const string TenantId = "TenantId";
|
||||
|
||||
/// <summary>
|
||||
/// 组织机构Id
|
||||
/// </summary>
|
||||
public const string OrgId = "OrgId";
|
||||
|
||||
/// <summary>
|
||||
/// 组织机构名称
|
||||
/// </summary>
|
||||
public const string OrgName = "OrgName";
|
||||
|
||||
/// <summary>
|
||||
/// 组织机构类型
|
||||
/// </summary>
|
||||
public const string OrgType = "OrgType";
|
||||
|
||||
/// <summary>
|
||||
/// 微信OpenId
|
||||
/// </summary>
|
||||
public const string OpenId = "OpenId";
|
||||
|
||||
/// <summary>
|
||||
/// 登录模式PC、APP
|
||||
/// </summary>
|
||||
public const string LoginMode = "LoginMode";
|
||||
}
|
||||
53
yy-admin-master/YY.Admin.Core/Const/CommonConst.cs
Normal file
53
yy-admin-master/YY.Admin.Core/Const/CommonConst.cs
Normal file
@@ -0,0 +1,53 @@
|
||||
namespace YY.Admin.Core.Const;
|
||||
|
||||
/// <summary>
|
||||
/// 通用常量
|
||||
/// </summary>
|
||||
[Const("平台配置")]
|
||||
public class CommonConst
|
||||
{
|
||||
/// <summary>
|
||||
/// 日志分组名称
|
||||
/// </summary>
|
||||
public const string SysLogCategoryName = "System.Logging.LoggingMonitor";
|
||||
|
||||
/// <summary>
|
||||
/// 事件-增加异常日志
|
||||
/// </summary>
|
||||
public const string AddExLog = "Add:ExLog";
|
||||
|
||||
/// <summary>
|
||||
/// 事件-发送异常邮件
|
||||
/// </summary>
|
||||
public const string SendErrorMail = "Send:ErrorMail";
|
||||
|
||||
/// <summary>
|
||||
/// 默认基本角色名称
|
||||
/// </summary>
|
||||
public const string DefaultBaseRoleName = "默认基本角色";
|
||||
|
||||
/// <summary>
|
||||
/// 默认基本角色编码
|
||||
/// </summary>
|
||||
public const string DefaultBaseRoleCode = "default_base_role";
|
||||
|
||||
/// <summary>
|
||||
/// MainWinndow 主内容区域名称
|
||||
/// </summary>
|
||||
public const string ContentRegion = "ContentRegion";
|
||||
|
||||
/// <summary>
|
||||
/// MainWinndow 菜单区域名称
|
||||
/// </summary>
|
||||
public const string MenuRegion = "MenuRegion";
|
||||
|
||||
/// <summary>
|
||||
/// 系统名称
|
||||
/// </summary>
|
||||
public const string SystemName = "智能制造MES工控";
|
||||
|
||||
/// <summary>
|
||||
/// 系统设置文件路径
|
||||
/// </summary>
|
||||
public const string AppSettingsFilePath = "AppSettings\\{0}\\appsettings.json";
|
||||
}
|
||||
144
yy-admin-master/YY.Admin.Core/Const/ConfigConst.cs
Normal file
144
yy-admin-master/YY.Admin.Core/Const/ConfigConst.cs
Normal file
@@ -0,0 +1,144 @@
|
||||
|
||||
|
||||
namespace YY.Admin.Core.Const;
|
||||
|
||||
/// <summary>
|
||||
/// 配置常量
|
||||
/// </summary>
|
||||
public class ConfigConst
|
||||
{
|
||||
/// <summary>
|
||||
/// 演示环境
|
||||
/// </summary>
|
||||
public const string SysDemoEnv = "sys_demo";
|
||||
|
||||
/// <summary>
|
||||
/// 默认密码
|
||||
/// </summary>
|
||||
public const string SysPassword = "sys_password";
|
||||
|
||||
/// <summary>
|
||||
/// 密码最大错误次数
|
||||
/// </summary>
|
||||
public const string SysPasswordMaxErrorTimes = "sys_password_max_error_times";
|
||||
|
||||
/// <summary>
|
||||
/// 日志保留天数
|
||||
/// </summary>
|
||||
public const string SysLogRetentionDays = "sys_log_retention_days";
|
||||
|
||||
/// <summary>
|
||||
/// 记录操作日志
|
||||
/// </summary>
|
||||
public const string SysOpLog = "sys_oplog";
|
||||
|
||||
/// <summary>
|
||||
/// 单设备登录
|
||||
/// </summary>
|
||||
public const string SysSingleLogin = "sys_single_login";
|
||||
|
||||
/// <summary>
|
||||
/// 登入登出提醒
|
||||
/// </summary>
|
||||
public const string SysLoginOutReminder = "sys_login_out_reminder";
|
||||
|
||||
/// <summary>
|
||||
/// 登陆时隐藏租户
|
||||
/// </summary>
|
||||
public const string SysHideTenantLogin = "sys_hide_tenant_login";
|
||||
|
||||
/// <summary>
|
||||
/// 登录二次验证
|
||||
/// </summary>
|
||||
public const string SysSecondVer = "sys_second_ver";
|
||||
|
||||
/// <summary>
|
||||
/// 图形验证码
|
||||
/// </summary>
|
||||
public const string SysCaptcha = "sys_captcha";
|
||||
|
||||
/// <summary>
|
||||
/// Token过期时间
|
||||
/// </summary>
|
||||
public const string SysTokenExpire = "sys_token_expire";
|
||||
|
||||
/// <summary>
|
||||
/// RefreshToken过期时间
|
||||
/// </summary>
|
||||
public const string SysRefreshTokenExpire = "sys_refresh_token_expire";
|
||||
|
||||
/// <summary>
|
||||
/// 发送异常日志邮件
|
||||
/// </summary>
|
||||
public const string SysErrorMail = "sys_error_mail";
|
||||
|
||||
/// <summary>
|
||||
/// 域登录验证
|
||||
/// </summary>
|
||||
public const string SysDomainLogin = "sys_domain_login";
|
||||
|
||||
// /// <summary>
|
||||
// /// 租户域名隔离登录验证
|
||||
// /// </summary>
|
||||
// public const string SysTenantHostLogin = "sys_tenant_host_login";
|
||||
|
||||
/// <summary>
|
||||
/// 数据校验日志
|
||||
/// </summary>
|
||||
public const string SysValidationLog = "sys_validation_log";
|
||||
|
||||
/// <summary>
|
||||
/// 行政区域同步层级 1-省级,2-市级,3-区县级,4-街道级,5-村级
|
||||
/// </summary>
|
||||
public const string SysRegionSyncLevel = "sys_region_sync_level";
|
||||
|
||||
/// <summary>
|
||||
/// Default 分组
|
||||
/// </summary>
|
||||
public const string SysDefaultGroup = "Default";
|
||||
|
||||
/// <summary>
|
||||
/// 支付宝授权页面地址
|
||||
/// </summary>
|
||||
public const string AlipayAuthPageUrl = "alipay_auth_page_url_";
|
||||
|
||||
// /// <summary>
|
||||
// /// 系统图标
|
||||
// /// </summary>
|
||||
// public const string SysWebLogo = "sys_web_logo";
|
||||
//
|
||||
// /// <summary>
|
||||
// /// 系统主标题
|
||||
// /// </summary>
|
||||
// public const string SysWebTitle = "sys_web_title";
|
||||
//
|
||||
// /// <summary>
|
||||
// /// 系统副标题
|
||||
// /// </summary>
|
||||
// public const string SysWebViceTitle = "sys_web_viceTitle";
|
||||
//
|
||||
// /// <summary>
|
||||
// /// 系统描述
|
||||
// /// </summary>
|
||||
// public const string SysWebViceDesc = "sys_web_viceDesc";
|
||||
//
|
||||
// /// <summary>
|
||||
// /// 水印内容
|
||||
// /// </summary>
|
||||
// public const string SysWebWatermark = "sys_web_watermark";
|
||||
//
|
||||
// /// <summary>
|
||||
// /// 版权说明
|
||||
// /// </summary>
|
||||
// public const string SysWebCopyright = "sys_web_copyright";
|
||||
//
|
||||
// /// <summary>
|
||||
// /// ICP备案号
|
||||
// /// </summary>
|
||||
// public const string SysWebIcp = "sys_web_icp";
|
||||
//
|
||||
// /// <summary>
|
||||
// /// ICP地址
|
||||
// /// </summary>
|
||||
// public const string SysWebIcpUrl = "sys_web_icpUrl";
|
||||
}
|
||||
31
yy-admin-master/YY.Admin.Core/Const/SqlSugarConst.cs
Normal file
31
yy-admin-master/YY.Admin.Core/Const/SqlSugarConst.cs
Normal file
@@ -0,0 +1,31 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace YY.Admin.Core.Const
|
||||
{
|
||||
public class SqlSugarConst
|
||||
{
|
||||
/// <summary>
|
||||
/// 默认主数据库标识(默认租户)
|
||||
/// </summary>
|
||||
public const string MainConfigId = "1300000000001";
|
||||
|
||||
/// <summary>
|
||||
/// 默认日志数据库标识
|
||||
/// </summary>
|
||||
public const string LogConfigId = "1300000000002";
|
||||
|
||||
/// <summary>
|
||||
/// 默认表主键
|
||||
/// </summary>
|
||||
public const string PrimaryKey = "Id";
|
||||
|
||||
/// <summary>
|
||||
/// 默认租户Id
|
||||
/// </summary>
|
||||
public const long DefaultTenantId = 1300000000001;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user