1.增加盟讯公司业务逻辑相关适配 前后端增加配置参数“ISMX”进行控制
2.前端websocket取消心跳机制(原有心跳和断线重连当服务端网线断开后需要等tcp保活期到期后才能发现重连),自己实现心跳和重连 3.前端关闭后任占用后台线程问题修复
This commit is contained in:
@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user