ICM-WCS/wcs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.增加盟讯公司业务逻辑相关适配 前后端增加配置参数“ISMX”进行控制

Browse Source 
2.前端websocket取消心跳机制（原有心跳和断线重连当服务端网线断开后需要等tcp保活期到期后才能发现重连），自己实现心跳和重连
3.前端关闭后任占用后台线程问题修复
This commit is contained in:
hehaibing-1996
2024-05-25 17:25:27 +08:00
parent 472862a978
commit 00621bcd55
82 changed files with 3404 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WCS.DAL/Db/AuthDb/AuthDbHelp.cs
View File

@ -49,7 +49,7 @@ namespace WCS.DAL
{
Id = 1,
LoginName = "admin",
Password = "",
Password = "admin123",
RoleIds = new List<int> () { 1 },
IsAdmin = true,
Time = dt,

11
WCS.DAL/Db/AuthDb/AuthModels.cs
View File

@ -10,7 +10,7 @@ namespace WCS.DAL.Db.AuthDb
/// <summary>
/// 用户
/// </summary>
[SugarTable("User")]
[SugarTable("wcs_user")]
public class UserBase
{
[SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
@ -37,6 +37,13 @@ namespace WCS.DAL.Db.AuthDb
/// 是否最大权限
/// </summary>
public bool IsAdmin { get; set; }
///// <summary>
///// 是否是工程研发
///// </summary>
//[SugarColumn(ColumnName = "IsGCYF", IsNullable = true, ColumnDescription = "是否是工程研发人员")]
public bool IsGCYF { get; set; } = false;
/// <summary>
/// 创建时间
/// </summary>
@ -52,7 +59,7 @@ namespace WCS.DAL.Db.AuthDb
/// <summary>
/// 角色
/// </summary>
[SugarTable("Role")]
[SugarTable("wcs_role")]
public class RoleBase
{
[SugarColumn(IsPrimaryKey = true, IsIdentity = true)]

20
WCS.DAL/Db/DbHelp.cs
View File

@ -1,6 +1,7 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@ -21,11 +22,8 @@ namespace WCS.DAL.Db
{
db.Aop.OnError = ex =>
{
//TO DO LOG
//Logs.Write($@"{nameof(db)}{Environment.NewLine}SQL:{ex?.Sql}{Environment.NewLine}Parametres:{JsonConvert.SerializeObject(ex?.Parametres)}{Environment.NewLine}InnerException:{ex?.InnerException?.ToString()}{Environment.NewLine}Exception:{ex?.ToString()}{Environment.NewLine}", LogsType.DbErr);
};
});
/// <summary>
/// 日志数据库
/// </summary>
@ -38,23 +36,7 @@ namespace WCS.DAL.Db
{
db.Aop.OnError = ex =>
{
//TO DO LOG
//Logs.Write($@"{nameof(dbAuth)}{Environment.NewLine}SQL:{ex?.Sql}{Environment.NewLine}Parametres:{JsonConvert.SerializeObject(ex?.Parametres)}{Environment.NewLine}InnerException:{ex?.InnerException?.ToString()}{Environment.NewLine}Exception:{ex?.ToString()}{Environment.NewLine}", LogsType.DbErr);
};
});
public static void InitDb()
{
//#region 初始化业务数据库
////不存在创建数据库，存在不会创建
//db.DbMaintenance.CreateDatabase();
////创建表根据实体类
//db.CodeFirst.InitTables(typeof(ModuleInfo), typeof(ShelfInfo), typeof(StoreInfo));
//#endregion
//#region 初始化日志数据库
//dbLog.DbMaintenance.CreateDatabase();
//#endregion
}
}
}