diff --git a/Lib/Tiobon.Core.Base.dll b/Lib/Tiobon.Core.Base.dll index 8f0d3459..7b4f60cd 100644 Binary files a/Lib/Tiobon.Core.Base.dll and b/Lib/Tiobon.Core.Base.dll differ diff --git a/Lib/Tiobon.Core.dll b/Lib/Tiobon.Core.dll index e94e98bc..9a5b89f9 100644 Binary files a/Lib/Tiobon.Core.dll and b/Lib/Tiobon.Core.dll differ diff --git a/Lib/Tiobon.Core.xml b/Lib/Tiobon.Core.xml index 8147e0bf..dab351fa 100644 --- a/Lib/Tiobon.Core.xml +++ b/Lib/Tiobon.Core.xml @@ -1742,6 +1742,276 @@ 【-1 取值结束】【0 未开始】【1 无引号开始】【2 单引号开始】【3 双引号开始】 + + + + 大数据json序列化重写 + + + + + 转换成字符串的类型 + + + + + 大数据json序列化重写实例化 + + + + + 大数据json序列化重写实例化 + + 转换成字符串的类型 + + + + + 确定此实例是否可以转换指定的对象类型。 + + 对象的类型。 + 如果此实例可以转换指定的对象类型，则为：true，否则为：false + + + + + 读取对象的JSON表示。 + + 从 中读取。 + 对象的类型。 + 正在读取的对象的现有值。 + 调用的序列化器实例。 + 对象值。 + + + + 字符串格式数据转其他类型数据 + + 输入的字符串 + 目标格式 + 转换结果 + + + + + 写入对象的JSON表示形式。 + + 要写入的 。 + 要写入对象值 + 调用的序列化器实例。 + + + + 转换成字符串的类型 + + + + + 长整数 + + + + + 无符号长整数 + + + + + 浮点数 + + + + + 双精度浮点数 + + + + + 大数字 + + + + + 泛型递归求树形结构 + + + + + 将父子级数据结构转换为普通list + + + + + + + 递归子级数据 + + 树形列表数据 + Item + + + + 根据分隔符返回前n条数据 + + 数据内容 + 分隔符 + 前n条 + 是否倒序（默认false） + + + + + 根据字段拼接get参数 + + + + + + + 根据字段拼接get参数 + + + + + + + 获取一个GUID + + 格式-默认为N + + + + + 根据GUID获取19位的唯一数字序列 + + + + + + 获取字符串最后X行 + + + + + + + + 求系统唯一字符串，常用于ROW_ID值。 + + 字符串 + + + + 格式化数字字符，如传入1.24500，返回1.245 + + + + + + + 格式化数字字符，并保留指定的小数位 + + 需要处理的值 + 保留小数点后位数 + + + + + 格式化数字字符，并保留指定的小数位 + + 需要处理的值 + 保留小数点后位数，-1时只会去除小数点后最后几位的0 + + + + + 格式化数字字符，并保留指定的小数位 + + 需要处理的值 + 保留小数点后位数，-1时只会去除小数点后最后几位的0 + + + + + 对象字段描述 + + + + + 获取字段的描述(描述 - 列名) + + + + + + + 字符串转Unicode码 + + The to unicode. + Value. + + + + Unicode转字符串 + + The to string. + Unicode. + + + + UrlEncode编码 + + url + + + + + UrlEncode解码 + + 数据 + + + + + xml序列化帮助类 + + + + + 存储序列类型,防止内存泄漏 + + + + + 转换对象为JSON格式数据 + + 类 + 对象 + 字符格式的JSON数据 + + + + Xml格式字符转换为T类型的对象 + + + + + + + + 序列化 + + + + + + + 反序列化 + + + + + @@ -1869,6 +2139,74 @@ + + + + + + + + 向指定群组发送信息 + + 组名 + 信息内容 + + + + + 加入指定组 + + 组名 + + + + + 退出指定组 + + 组名 + + + + + 向指定成员发送信息 + + 成员名 + 信息内容 + + + + + 当连接建立时运行 + + + + + + 当链接断开时运行 + + + + + + + + + + + + SignalR接收信息 + + 信息内容 + + + + + SignalR接收信息 + + 指定接收客户端 + 信息内容 + + 读取文件内容 diff --git a/Model/Tiobon.Web.pdm b/Model/Tiobon.Web.pdm index 60428180..72f8fe95 100644 --- a/Model/Tiobon.Web.pdm +++ b/Model/Tiobon.Web.pdm @@ -1,5 +1,5 @@ - + @@ -9743,7 +9743,7 @@ DESTINATION 0 新宋体,8,N 1717726229 1719381754 -((-42449,11400), (-39225,18375)) +((-42337,11400), (-39337,18375)) ((-40837,11400),(-40837,18375)) 2 1 @@ -9966,7 +9966,7 @@ DESTINATION 0 新宋体,8,N 1727337857 1727337857 -((-54898,11250), (-48674,18150)) +((-54786,11250), (-48786,18150)) ((-51786,18150),(-51786,11250)) 2 1 @@ -10010,7 +10010,7 @@ DESTINATION 0 新宋体,8,N 1738913762 1747275741 -((-45223,-30675), (-40499,-24525)) +((-45111,-30675), (-40611,-24525)) ((-44099,-30675),(-44099,-27375),(-41624,-27375),(-41624,-24525)) 2 1 @@ -10056,7 +10056,7 @@ DESTINATION 0 新宋体,8,N 1738915648 1738915648 -((-43123,-23625), (-38399,-17925)) +((-43011,-23625), (-38511,-17925)) ((-40761,-17925),(-40761,-23625)) 2 1 @@ -10078,7 +10078,7 @@ DESTINATION 0 新宋体,8,N 1738916095 1738916119 -((-54036,-23812), (-39449,-17325)) +((-53924,-23812), (-39449,-17325)) ((-51674,-17325),(-51674,-23400),(-39449,-23400)) 2 1 @@ -10100,7 +10100,7 @@ DESTINATION 0 新宋体,8,N 1738916098 1738916104 -((-54111,-31050), (-42899,-24863)) +((-53999,-31050), (-42899,-24863)) ((-51749,-31050),(-51749,-25275),(-42899,-25275)) 2 1 diff --git a/Tiobon.Core.Api/Controllers/Ghre/Ghre_ExamRecordController.cs b/Tiobon.Core.Api/Controllers/Ghre/Ghre_ExamRecordController.cs index 0bd34dd4..4142a2fe 100644 --- a/Tiobon.Core.Api/Controllers/Ghre/Ghre_ExamRecordController.cs +++ b/Tiobon.Core.Api/Controllers/Ghre/Ghre_ExamRecordController.cs @@ -302,4 +302,10 @@ public class Ghre_ExamRecordController : BaseController MarkCompleteStatus(long id) + { + return await _service.MarkCompleteStatus(id); + } } \ No newline at end of file diff --git a/Tiobon.Core.Api/Controllers/Ghre/Ghre_SurveyController.cs b/Tiobon.Core.Api/Controllers/Ghre/Ghre_SurveyController.cs index 7e1717f4..3d7356c1 100644 --- a/Tiobon.Core.Api/Controllers/Ghre/Ghre_SurveyController.cs +++ b/Tiobon.Core.Api/Controllers/Ghre/Ghre_SurveyController.cs @@ -143,8 +143,6 @@ public class Ghre_SurveyController : BaseController /// 记录 @@ -155,4 +153,15 @@ public class Ghre_SurveyController : BaseController QueryRecord(long id) => await _service.QueryRecord(id); #endregion + + #region QueryESS + /// + /// QueryESS + /// + /// + /// + [HttpPost("QueryESS")] + public async Task> QueryESS([FromBody] QueryBody id) => await _service.QueryESS(id); + + #endregion } diff --git a/Tiobon.Core.Common/Helper/ExamHelper.cs b/Tiobon.Core.Common/Helper/ExamHelper.cs index 4a335f00..debe36bc 100644 --- a/Tiobon.Core.Common/Helper/ExamHelper.cs +++ b/Tiobon.Core.Common/Helper/ExamHelper.cs @@ -97,7 +97,11 @@ public class ExamHelper { if (record.ExamId != null) { - if (await Db.Queryable().Where(x => x.Id == record.ExamId && x.StudyFinishedRule == DIC_EXAM_STUDY_FINISHED_RULE.STUDY_FINISHED).AnyAsync() || await Db.Queryable().Where(x => x.StudyRecordId == record.Id && x.IsPass == true).AnyAsync()) + if (await Db.Queryable() + .Where(x => x.Id == record.ExamId && + x.StudyFinishedRule == DIC_EXAM_STUDY_FINISHED_RULE.STUDY_FINISHED) + .AnyAsync() || await Db.Queryable() + .Where(x => x.StudyRecordId == record.Id && x.IsPass == true).AnyAsync()) record.CompleteStatus = DIC_STUDY_RECORD_STUDY_COMPLETE_STATUS.FINISHED; } else diff --git a/Tiobon.Core.Common/Helper/NumberConverter.cs b/Tiobon.Core.Common/Helper/NumberConverter.cs deleted file mode 100644 index 6026b515..00000000 --- a/Tiobon.Core.Common/Helper/NumberConverter.cs +++ /dev/null @@ -1,168 +0,0 @@ -using Newtonsoft.Json; -using System.ComponentModel; - -namespace Tiobon.Core.Common.Helper; - -/// -/// -/// 大数据json序列化重写 -/// -public sealed class NumberConverter : JsonConverter -{ - /// - /// 转换成字符串的类型 - /// - private readonly NumberConverterShip _ship; - - /// - /// 大数据json序列化重写实例化 - /// - public NumberConverter() - { - _ship = (NumberConverterShip)0xFF; - } - - /// - /// 大数据json序列化重写实例化 - /// - /// 转换成字符串的类型 - public NumberConverter(NumberConverterShip ship) - { - _ship = ship; - } - - /// - /// - /// 确定此实例是否可以转换指定的对象类型。 - /// - /// 对象的类型。 - /// 如果此实例可以转换指定的对象类型，则为：true，否则为：false - public override bool CanConvert(Type objectType) - { - var typecode = Type.GetTypeCode(objectType.Name.Equals("Nullable`1") ? objectType.GetGenericArguments().First() : objectType); - switch (typecode) - { - case TypeCode.Decimal: - return (_ship & NumberConverterShip.Decimal) == NumberConverterShip.Decimal; - case TypeCode.Double: - return (_ship & NumberConverterShip.Double) == NumberConverterShip.Double; - case TypeCode.Int64: - return (_ship & NumberConverterShip.Int64) == NumberConverterShip.Int64; - case TypeCode.UInt64: - return (_ship & NumberConverterShip.UInt64) == NumberConverterShip.UInt64; - case TypeCode.Single: - return (_ship & NumberConverterShip.Single) == NumberConverterShip.Single; - default: return false; - } - } - - /// - /// - /// 读取对象的JSON表示。 - /// - /// 从 中读取。 - /// 对象的类型。 - /// 正在读取的对象的现有值。 - /// 调用的序列化器实例。 - /// 对象值。 - public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) - { - return AsType(reader.Value.ObjToString(), objectType); - } - - /// - /// 字符串格式数据转其他类型数据 - /// - /// 输入的字符串 - /// 目标格式 - /// 转换结果 - public static object AsType(string input, Type destinationType) - { - try - { - var converter = TypeDescriptor.GetConverter(destinationType); - if (converter.CanConvertFrom(typeof(string))) - { - return converter.ConvertFrom(null, null, input); - } - - converter = TypeDescriptor.GetConverter(typeof(string)); - if (converter.CanConvertTo(destinationType)) - { - return converter.ConvertTo(null, null, input, destinationType); - } - } - catch - { - return null; - } - return null; - } - - /// - /// - /// 写入对象的JSON表示形式。 - /// - /// 要写入的 。 - /// 要写入对象值 - /// 调用的序列化器实例。 - public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) - { - if (value == null) - { - writer.WriteNull(); - } - else - { - var objectType = value.GetType(); - var typeCode = Type.GetTypeCode(objectType.Name.Equals("Nullable`1") ? objectType.GetGenericArguments().First() : objectType); - switch (typeCode) - { - case TypeCode.Decimal: - writer.WriteValue(((decimal)value).ToString("f6")); - break; - case TypeCode.Double: - writer.WriteValue(((double)value).ToString("f4")); - break; - case TypeCode.Single: - writer.WriteValue(((float)value).ToString("f2")); - break; - default: - writer.WriteValue(value.ToString()); - break; - } - } - } -} - -/// -/// 转换成字符串的类型 -/// -[Flags] -public enum NumberConverterShip -{ - /// - /// 长整数 - /// - Int64 = 1, - - /// - /// 无符号长整数 - /// - UInt64 = 2, - - /// - /// 浮点数 - /// - Single = 4, - - /// - /// 双精度浮点数 - /// - Double = 8, - - /// - /// 大数字 - /// - Decimal =16 -} diff --git a/Tiobon.Core.Common/Helper/RecursionHelper.cs b/Tiobon.Core.Common/Helper/RecursionHelper.cs deleted file mode 100644 index df449b17..00000000 --- a/Tiobon.Core.Common/Helper/RecursionHelper.cs +++ /dev/null @@ -1,214 +0,0 @@ -namespace Tiobon.Core.Common.Helper; - -/// -/// 泛型递归求树形结构 -/// -public static class RecursionHelper -{ - public static void LoopToAppendChildren(List all, PermissionTree curItem, long pid, bool needbtn) - { - var subItems = all.Where(ee => ee.Pid == curItem.value).ToList(); - - var btnItems = subItems.Where(ss => ss.isbtn == true).ToList(); - if (subItems.Count > 0) - { - curItem.btns = new List(); - curItem.btns.AddRange(btnItems); - } - else - { - curItem.btns = null; - } - - if (!needbtn) - { - subItems = subItems.Where(ss => ss.isbtn == false).ToList(); - } - - if (subItems.Count > 0) - { - curItem.children = new List(); - curItem.children.AddRange(subItems); - } - else - { - curItem.children = null; - } - - if (curItem.isbtn) - { - //curItem.label += "按钮"; - } - - foreach (var subItem in subItems) - { - if (subItem.value == pid && pid > 0) - { - //subItem.disabled = true;//禁用当前节点 - } - - LoopToAppendChildren(all, subItem, pid, needbtn); - } - } - public static void LoopToAppendChildren(List all, DepartmentTree curItem, long pid) - { - var subItems = all.Where(ee => ee.Pid == curItem.value).ToList(); - - if (subItems.Count > 0) - { - curItem.children = new List(); - curItem.children.AddRange(subItems); - } - else - { - curItem.children = null; - } - - foreach (var subItem in subItems) - { - if (subItem.value == pid && pid > 0) - { - //subItem.disabled = true;//禁用当前节点 - } - - LoopToAppendChildren(all, subItem, pid); - } - } - - - public static void LoopNaviBarAppendChildren(List all, NavigationBar curItem) - { - var subItems = all.Where(ee => ee.pid == curItem.id).ToList(); - - if (subItems.Count > 0) - { - curItem.children = new List(); - curItem.children.AddRange(subItems); - } - else - { - curItem.children = null; - } - - - foreach (var subItem in subItems) - { - LoopNaviBarAppendChildren(all, subItem); - } - } - - - public static void LoopToAppendChildrenT(List all, T curItem, string parentIdName = "Pid", string idName = "value", string childrenName = "children") - { - var subItems = all.Where(ee => ee.GetType().GetProperty(parentIdName).GetValue(ee, null).ToString() == curItem.GetType().GetProperty(idName).GetValue(curItem, null).ToString()).ToList(); - - if (subItems.Count > 0) curItem.GetType().GetField(childrenName).SetValue(curItem, subItems); - foreach (var subItem in subItems) - { - LoopToAppendChildrenT(all, subItem); - } - } - - /// - /// 将父子级数据结构转换为普通list - /// - /// - /// - public static List TreeToList(List list, Action> action = null) - { - List results = new List(); - foreach (var item in list) - { - results.Add(item); - OperationChildData(results, item, action); - } - - return results; - } - - /// - /// 递归子级数据 - /// - /// 树形列表数据 - /// Item - public static void OperationChildData(List allList, T item, Action> action) - { - dynamic dynItem = item; - if (dynItem.Children == null) return; - if (dynItem.Children.Count <= 0) return; - allList.AddRange(dynItem.Children); - foreach (var subItem in dynItem.Children) - { - action?.Invoke(item, subItem, allList); - OperationChildData(allList, subItem, action); - } - } -} - -public class PermissionTree -{ - public long value { get; set; } - public long Pid { get; set; } - public string label { get; set; } - public int order { get; set; } - public bool isbtn { get; set; } - public bool disabled { get; set; } - public List children { get; set; } - public List btns { get; set; } -} - -public class DepartmentTree -{ - public long value { get; set; } - public long Pid { get; set; } - public string label { get; set; } - public int order { get; set; } - public bool disabled { get; set; } - public List children { get; set; } -} - -public class NavigationBar -{ - public long id { get; set; } - public long pid { get; set; } - public int order { get; set; } - public string name { get; set; } - public bool IsHide { get; set; } = false; - public bool IsButton { get; set; } = false; - public string path { get; set; } - public string Func { get; set; } - public string iconCls { get; set; } - public NavigationBarMeta meta { get; set; } - public List children { get; set; } -} - -public class NavigationBarMeta -{ - public string title { get; set; } - public bool requireAuth { get; set; } = true; - public bool NoTabPage { get; set; } = false; - public bool keepAlive { get; set; } = false; -} - - -public class NavigationBarPro -{ - public long id { get; set; } - public long parentId { get; set; } - public int order { get; set; } - public string name { get; set; } - public bool IsHide { get; set; } = false; - public bool IsButton { get; set; } = false; - public string path { get; set; } - public string component { get; set; } - public string Func { get; set; } - public string iconCls { get; set; } - public NavigationBarMetaPro meta { get; set; } -} - -public class NavigationBarMetaPro -{ - public string title { get; set; } - public string icon { get; set; } - public bool show { get; set; } = false; -} \ No newline at end of file diff --git a/Tiobon.Core.Common/Helper/SerializeHelper.cs b/Tiobon.Core.Common/Helper/SerializeHelper.cs deleted file mode 100644 index fe7f485d..00000000 --- a/Tiobon.Core.Common/Helper/SerializeHelper.cs +++ /dev/null @@ -1,34 +0,0 @@ -using Newtonsoft.Json; -using System.Text; - -namespace Tiobon.Core.Common; - -public class SerializeHelper -{ - /// - /// 序列化 - /// - /// - /// - public static byte[] Serialize(object item) - { - var jsonString = JsonConvert.SerializeObject(item); - - return Encoding.UTF8.GetBytes(jsonString); - } - /// - /// 反序列化 - /// - /// - /// - /// - public static TEntity Deserialize(byte[] value) - { - if (value == null) - { - return default(TEntity); - } - var jsonString = Encoding.UTF8.GetString(value); - return JsonConvert.DeserializeObject(jsonString); - } -} diff --git a/Tiobon.Core.Common/Helper/ShaHelper.cs b/Tiobon.Core.Common/Helper/ShaHelper.cs deleted file mode 100644 index 96a765c5..00000000 --- a/Tiobon.Core.Common/Helper/ShaHelper.cs +++ /dev/null @@ -1,1086 +0,0 @@ -// This is an implementation of -// http://csrc.nist.gov/publications/fips/fips180-4/fips-180-4.pdf - -namespace Tiobon.Core.Common.Helper; - -using Word32 = System.UInt32; -using Word64 = System.UInt64; - - -public static class ShaHelper -{ - // Constants K - static Word32[] K1; - static Word32[] K256; - static Word64[] K512; - - // Initial hash values H0 - static Word32[] H0Sha1; - static Word32[] H0Sha224; - static Word32[] H0Sha256; - static Word64[] H0Sha384; - static Word64[] H0Sha512; - static Word64[] H0Sha512_224; - static Word64[] H0Sha512_256; - - - static ShaHelper() - { - DefineK1(); - DefineK256(); - DefineK512(); - - DefineH0Sha1(); - DefineH0Sha224(); - DefineH0Sha256(); - DefineH0Sha384(); - DefineH0Sha512(); - DefineH0Sha512_224(); - DefineH0Sha512_256(); - } - - - #region Public Functions - - public static byte[] Sha1(byte[] plaintext) - { - DefineH0Sha1(); - return Sha1Algorithm(plaintext); - } - - public static string Sha1(string plaintext) - { - return ShaUtilities.ByteArrayToHexString(Sha1(ShaUtilities.StringToByteArray(plaintext))); - } - - public static byte[] Sha224(byte[] plaintext) - { - DefineH0Sha224(); - return Sha256Algorithm(plaintext, H0Sha224, 224); - } - - public static string Sha224(string plaintext) - { - return ShaUtilities.ByteArrayToHexString(Sha224(ShaUtilities.StringToByteArray(plaintext))); - } - - public static byte[] Sha256(byte[] plaintext) - { - DefineH0Sha256(); - return Sha256Algorithm(plaintext, H0Sha256, 256); - } - - public static string Sha256(string plaintext) - { - return ShaUtilities.ByteArrayToHexString(Sha256(ShaUtilities.StringToByteArray(plaintext))); - } - - public static byte[] Sha512(byte[] plaintext) - { - DefineH0Sha512(); - return Sha512Algorithm(plaintext, H0Sha512, 512); - } - - public static string Sha512(string plaintext) - { - return ShaUtilities.ByteArrayToHexString(Sha512(ShaUtilities.StringToByteArray(plaintext))); - } - - public static byte[] Sha384(byte[] plaintext) - { - DefineH0Sha384(); - return Sha512Algorithm(plaintext, H0Sha384, 384); - } - - public static string Sha384(string plaintext) - { - return ShaUtilities.ByteArrayToHexString(Sha384(ShaUtilities.StringToByteArray(plaintext))); - } - - public static byte[] Sha512_224(byte[] plaintext) - { - DefineH0Sha512_224(); - return Sha512Algorithm(plaintext, H0Sha512_224, 224); - } - - public static string Sha512_224(string plaintext) - { - return ShaUtilities.ByteArrayToHexString(Sha512_224(ShaUtilities.StringToByteArray(plaintext))); - } - - public static byte[] Sha512_256(byte[] plaintext) - { - DefineH0Sha512_256(); - return Sha512Algorithm(plaintext, H0Sha512_256, 256); - } - - public static string Sha512_256(string plaintext) - { - return ShaUtilities.ByteArrayToHexString(Sha512_256(ShaUtilities.StringToByteArray(plaintext))); - } - - #endregion - - - - - - #region Hash Algorithms - - static Word32[] CreateMessageScheduleSha1(Block512 block) - { - // The message schedule. - Word32[] W = new Word32[80]; - - // Prepare the message schedule W. - // The first 16 words in W are the same as the words of the block. - // The remaining 80-16 = 64 words in W are functions of the previously defined words. - for (int t = 0; t < 80; t++) - { - if (t < 16) - { - W[t] = block.words[t]; - } - else - { - W[t] = RotL(1, W[t - 3] ^ W[t - 8] ^ W[t - 14] ^ W[t - 16]); - } - } - - return W; - } - - static Word32[] CreateMessageScheduleSha256(Block512 block) - { - // The message schedule. - Word32[] W = new Word32[64]; - - // Prepare the message schedule W. - // The first 16 words in W are the same as the words of the block. - // The remaining 64-16 = 48 words in W are functions of the previously defined words. - for (int t = 0; t < 64; t++) - { - if (t < 16) - { - W[t] = block.words[t]; - } - else - { - W[t] = sigma1_256(W[t - 2]) + W[t - 7] + sigma0_256(W[t - 15]) + W[t - 16]; - } - } - - return W; - } - - static Word64[] CreateMessageScheduleSha512(Block1024 block) - { - // The message schedule. - Word64[] W = new Word64[80]; - - // Prepare the message schedule W. - // The first 16 words in W are the same as the words of the block. - // The remaining 80-16 =64 words in W are functions of the previously defined words. - for (int t = 0; t < 80; t++) - { - if (t < 16) - { - W[t] = block.words[t]; - } - else - { - W[t] = sigma1_512(W[t - 2]) + W[t - 7] + sigma0_512(W[t - 15]) + W[t - 16]; - } - } - - return W; - } - - static byte[] Sha1Algorithm(byte[] plaintext) - { - Block512[] blocks = ConvertPaddedTextToBlock512Array(PadPlainText512(plaintext)); - - // Define the hash variable and set its initial values. - Word32[] H = new Word32[5]; - H0Sha1.CopyTo(H, 0); - - for (int i = 0; i < blocks.Length; i++) - { - Word32[] W = CreateMessageScheduleSha1(blocks[i]); - - // Set the working variables a,...,e to the current hash values. - Word32 a = H[0]; - Word32 b = H[1]; - Word32 c = H[2]; - Word32 d = H[3]; - Word32 e = H[4]; - - for (int t = 0; t < 80; t++) - { - Word32 T = RotL(5, a) + f(t, b, c, d) + e + K1[t] + W[t]; - e = d; - d = c; - c = RotL(30, b); - b = a; - a = T; - } - - // Update the current value of the hash H after processing block i. - H[0] += a; - H[1] += b; - H[2] += c; - H[3] += d; - H[4] += e; - } - - // Concatenating the final 5 hash words H[0],...,H[4] gives the digest. - // Since each H[i] is 4 bytes, the digest is 5 * 4 = 20 bytes = 160 bits. - return ShaUtilities.Word32ArrayToByteArray(H); - } - - static byte[] Sha256Algorithm(byte[] plaintext, Word32[] H0, int numberBits) - { - Block512[] blocks = ConvertPaddedTextToBlock512Array(PadPlainText512(plaintext)); - - // Define the hash variables and set their initial values. - Word32[] H = H0; - - for (int i = 0; i < blocks.Length; i++) - { - Word32[] W = CreateMessageScheduleSha256(blocks[i]); - - // Set the working variables a,...,h to the current hash values. - Word32 a = H[0]; - Word32 b = H[1]; - Word32 c = H[2]; - Word32 d = H[3]; - Word32 e = H[4]; - Word32 f = H[5]; - Word32 g = H[6]; - Word32 h = H[7]; - - for (int t = 0; t < 64; t++) - { - Word32 T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[t] + W[t]; - Word32 T2 = Sigma0_256(a) + Maj(a, b, c); - h = g; - g = f; - f = e; - e = d + T1; - d = c; - c = b; - b = a; - a = T1 + T2; - } - - // Update the current value of the hash H after processing block i. - H[0] += a; - H[1] += b; - H[2] += c; - H[3] += d; - H[4] += e; - H[5] += f; - H[6] += g; - H[7] += h; - } - - // Concatenate all the Word32 Hash Values - byte[] hash = ShaUtilities.Word32ArrayToByteArray(H); - - // The number of bytes in the final output hash - int numberBytes = numberBits / 8; - byte[] truncatedHash = new byte[numberBytes]; - Array.Copy(hash, truncatedHash, numberBytes); - - return truncatedHash; - } - - static byte[] Sha512Algorithm(byte[] plaintext, Word64[] H0, int numberBits) - { - Block1024[] blocks = ConvertPaddedMessageToBlock1024Array(PadPlainText1024(plaintext)); - - // Define the hash variable and set its initial values. - Word64[] H = H0; - - for (int i = 0; i < blocks.Length; i++) - { - Word64[] W = CreateMessageScheduleSha512(blocks[i]); - - // Set the working variables a,...,h to the current hash values. - Word64 a = H[0]; - Word64 b = H[1]; - Word64 c = H[2]; - Word64 d = H[3]; - Word64 e = H[4]; - Word64 f = H[5]; - Word64 g = H[6]; - Word64 h = H[7]; - - for (int t = 0; t < 80; t++) - { - Word64 T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[t] + W[t]; - Word64 T2 = Sigma0_512(a) + Maj(a, b, c); - h = g; - g = f; - f = e; - e = d + T1; - d = c; - c = b; - b = a; - a = T1 + T2; - } - - // Update the current value of the hash H after processing block i. - H[0] += a; - H[1] += b; - H[2] += c; - H[3] += d; - H[4] += e; - H[5] += f; - H[6] += g; - H[7] += h; - } - - // Concatenate all the Word64 Hash Values - byte[] hash = ShaUtilities.Word64ArrayToByteArray(H); - - // The number of bytes in the final output hash - int numberBytes = numberBits / 8; - byte[] truncatedHash = new byte[numberBytes]; - Array.Copy(hash, truncatedHash, numberBytes); - - return truncatedHash; - } - - #endregion - - - #region Plaintext preprocessing functions - - static byte[] PadPlainText512(byte[] plaintext) - { - // After padding the total bits of the output will be divisible by 512. - int numberBits = plaintext.Length * 8; - int t = (numberBits + 8 + 64) / 512; - - // Note that 512 * (t + 1) is the least multiple of 512 greater than (numberBits + 8 + 64) - // Therefore the number of zero bits we need to add is - int k = 512 * (t + 1) - (numberBits + 8 + 64); - - // Since numberBits % 8 = 0, we know k % 8 = 0. So n = k / 8 is the number of zero bytes to add. - int n = k / 8; - - List paddedtext = plaintext.ToList(); - - // Start the padding by concatenating 1000_0000 = 0x80 = 128 - paddedtext.Add(0x80); - - // Next add n zero bytes - for (int i = 0; i < n; i++) - { - paddedtext.Add(0); - } - - // Now add 8 bytes (64 bits) to represent the length of the message in bits - byte[] B = BitConverter.GetBytes((ulong)numberBits); - Array.Reverse(B); - - for (int i = 0; i < B.Length; i++) - { - paddedtext.Add(B[i]); - } - - return paddedtext.ToArray(); - } - - static byte[] PadPlainText1024(byte[] plaintext) - { - // After padding the total bits of the output will be divisible by 1024. - int numberBits = plaintext.Length * 8; - int t = (numberBits + 8 + 128) / 1024; - - // Note that 1024 * (t + 1) is the least multiple of 1024 greater than (numberBits + 8 + 128) - // Therefore the number of zero bits we need to add is - int k = 1024 * (t + 1) - (numberBits + 8 + 128); - - // Since numberBits % 8 = 0, we know k % 8 = 0. So n = k / 8 is the number of zero bytes to add. - int n = k / 8; - - List paddedtext = plaintext.ToList(); - - // Start the padding by concatenating 1000_0000 = 0x80 = 128 - paddedtext.Add(0x80); - - // Next add n zero bytes - for (int i = 0; i < n; i++) - { - paddedtext.Add(0); - } - - // Now add 16 bytes (128 bits) to represent the length of the message in bits. - // C# does not have 128 bit integer. - // For now just add 8 zero bytes and then 8 bytes to represent the int - for (int i = 0; i < 8; i++) - { - paddedtext.Add(0); - } - - byte[] B = BitConverter.GetBytes((ulong)numberBits); - Array.Reverse(B); - - for (int i = 0; i < B.Length; i++) - { - paddedtext.Add(B[i]); - } - - return paddedtext.ToArray(); - } - - static Block512[] ConvertPaddedTextToBlock512Array(byte[] paddedtext) - { - // We are assuming M has been padded, so the number of bits in M is divisible by 512 - int numberBlocks = (paddedtext.Length * 8) / 512; // same as: paddedtext.Length / 64 - Block512[] blocks = new Block512[numberBlocks]; - - for (int i = 0; i < numberBlocks; i++) - { - // First extract the relavant subarray from paddedtext - byte[] B = new byte[64]; // 64 * 8 = 512 - - for (int j = 0; j < 64; j++) - { - B[j] = paddedtext[i * 64 + j]; - } - - Word32[] words = ShaUtilities.ByteArrayToWord32Array(B); - blocks[i] = new Block512(words); - } - - return blocks; - } - - static Block1024[] ConvertPaddedMessageToBlock1024Array(byte[] M) - { - // We are assuming M is padded, so the number of bits in M is divisible by 1024 - int numberBlocks = (M.Length * 8) / 1024; // same as: M.Length / 128 - Block1024[] blocks = new Block1024[numberBlocks]; - - for (int i = 0; i < numberBlocks; i++) - { - // First extract the relavant subarray from M - byte[] B = new byte[128]; // 128 * 8 = 1024 - - for (int j = 0; j < 128; j++) - { - B[j] = M[i * 128 + j]; - } - - Word64[] words = ShaUtilities.ByteArrayToWord64Array(B); - blocks[i] = new Block1024(words); - } - - return blocks; - } - - - #endregion - - - - #region Functions used in the hashing process. - - // Most of these functions have a Word32 version and a Word64 version. - // Sometimes they are the same (Ch, Maj,..) but sometimes different (Sigma0_256, Sigma0_512). - // We do not need a RotL or Parity function for Word64 since they are only used in Sha-1. - - static Word32 ShR(int n, Word32 x) - { - // should have 0 <= n < 32 - return (x >> n); - } - - static Word64 ShR(int n, Word64 x) - { - // should have 0 <= n < 64 - return (x >> n); - } - - static Word32 RotR(int n, Word32 x) - { - // should have 0 <= n < 32 - return (x >> n) | (x << 32 - n); - } - - static Word64 RotR(int n, Word64 x) - { - // should have 0 <= n < 64 - return (x >> n) | (x << 64 - n); - } - - static Word32 RotL(int n, Word32 x) - { - // should have 0 <= n < 32 - return (x << n) | (x >> 32 - n); - } - - static Word32 Ch(Word32 x, Word32 y, Word32 z) - { - return (x & y) ^ (~x & z); - } - - static Word64 Ch(Word64 x, Word64 y, Word64 z) - { - return (x & y) ^ (~x & z); - } - - static Word32 Maj(Word32 x, Word32 y, Word32 z) - { - return (x & y) ^ (x & z) ^ (y & z); - } - - static Word64 Maj(Word64 x, Word64 y, Word64 z) - { - return (x & y) ^ (x & z) ^ (y & z); - } - - static Word32 Parity(Word32 x, Word32 y, Word32 z) - { - return x ^ y ^ z; - } - - static Word32 f(int t, Word32 x, Word32 y, Word32 z) - { - // This function is used in Sha-1 - // should have 0 <= t <= 79 - - if (t >= 0 && t <= 19) - { - return Ch(x, y, z); - } - else if (t >= 20 && t <= 39) - { - return Parity(x, y, z); - } - else if (t >= 40 && t <= 59) - { - return Maj(x, y, z); - } - else if (t >= 60 && t <= 79) - { - return Parity(x, y, z); - } - else - { - throw new ArgumentException("ERROR: t is out of bounds"); - } - } - - static Word32 Sigma0_256(Word32 x) - { - return RotR(2, x) ^ RotR(13, x) ^ RotR(22, x); - } - - static Word32 Sigma1_256(Word32 x) - { - return RotR(6, x) ^ RotR(11, x) ^ RotR(25, x); - } - - static Word32 sigma0_256(Word32 x) - { - return RotR(7, x) ^ RotR(18, x) ^ ShR(3, x); - } - - static Word32 sigma1_256(Word32 x) - { - return RotR(17, x) ^ RotR(19, x) ^ ShR(10, x); - } - - static Word64 Sigma0_512(Word64 x) - { - return RotR(28, x) ^ RotR(34, x) ^ RotR(39, x); - } - - static Word64 Sigma1_512(Word64 x) - { - return RotR(14, x) ^ RotR(18, x) ^ RotR(41, x); - } - - static Word64 sigma0_512(Word64 x) - { - return RotR(1, x) ^ RotR(8, x) ^ ShR(7, x); - } - - static Word64 sigma1_512(Word64 x) - { - return RotR(19, x) ^ RotR(61, x) ^ ShR(6, x); - } - - #endregion - - - - #region Functions to define the constants K and the initial hashes H0. - - static void DefineK1() - { - // The eighty 32-bit words in the array K1 are used in Sha-1. - - K1 = new Word32[80]; - - for (int i = 0; i < 80; i++) - { - if (i <= 19) - { - K1[i] = 0x5a827999; - } - else if (i <= 39) - { - K1[i] = 0x6ed9eba1; - } - else if (i <= 59) - { - K1[i] = 0x8f1bbcdc; - } - else - { - K1[i] = 0xca62c1d6; - } - } - } - - static void DefineK256() - { - // The sixty four 32-bit words in the array K256 are used in Sha-224 and Sha-256. - // They are obtained by taking the first 32 bits of the fractional - // parts of the cube roots of the first sixty four primes. - // ------------------------------------------------------- - // NOTE: To find the first 32 bits of the fractional part of the cube root of an integer n: - // double x = Math.Pow(n, 1d / 3); - // x = x - Math.Floor(x); - // x = x * Math.Pow(2, 32); - // return (uint)x; - - K256 = new Word32[] - { - 0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5, - 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, - 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, - 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967, - 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, - 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070, - 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3, - 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2 - }; - } - - static void DefineK512() - { - // The eighty 64-bit words in the array K512 are used in Sha-384, Sha-512, Sha-512/224, Sha-512/256. - // They are obtained by taking the first 64 bits of the fractional - // parts of the cube roots of the first eighty primes. - - K512 = new Word64[] - { - 0x428a2f98d728ae22, 0x7137449123ef65cd, 0xb5c0fbcfec4d3b2f, 0xe9b5dba58189dbbc, - 0x3956c25bf348b538, 0x59f111f1b605d019, 0x923f82a4af194f9b, 0xab1c5ed5da6d8118, - 0xd807aa98a3030242, 0x12835b0145706fbe, 0x243185be4ee4b28c, 0x550c7dc3d5ffb4e2, - 0x72be5d74f27b896f, 0x80deb1fe3b1696b1, 0x9bdc06a725c71235, 0xc19bf174cf692694, - 0xe49b69c19ef14ad2, 0xefbe4786384f25e3, 0x0fc19dc68b8cd5b5, 0x240ca1cc77ac9c65, - 0x2de92c6f592b0275, 0x4a7484aa6ea6e483, 0x5cb0a9dcbd41fbd4, 0x76f988da831153b5, - 0x983e5152ee66dfab, 0xa831c66d2db43210, 0xb00327c898fb213f, 0xbf597fc7beef0ee4, - 0xc6e00bf33da88fc2, 0xd5a79147930aa725, 0x06ca6351e003826f, 0x142929670a0e6e70, - 0x27b70a8546d22ffc, 0x2e1b21385c26c926, 0x4d2c6dfc5ac42aed, 0x53380d139d95b3df, - 0x650a73548baf63de, 0x766a0abb3c77b2a8, 0x81c2c92e47edaee6, 0x92722c851482353b, - 0xa2bfe8a14cf10364, 0xa81a664bbc423001, 0xc24b8b70d0f89791, 0xc76c51a30654be30, - 0xd192e819d6ef5218, 0xd69906245565a910, 0xf40e35855771202a, 0x106aa07032bbd1b8, - 0x19a4c116b8d2d0c8, 0x1e376c085141ab53, 0x2748774cdf8eeb99, 0x34b0bcb5e19b48a8, - 0x391c0cb3c5c95a63, 0x4ed8aa4ae3418acb, 0x5b9cca4f7763e373, 0x682e6ff3d6b2b8a3, - 0x748f82ee5defb2fc, 0x78a5636f43172f60, 0x84c87814a1f0ab72, 0x8cc702081a6439ec, - 0x90befffa23631e28, 0xa4506cebde82bde9, 0xbef9a3f7b2c67915, 0xc67178f2e372532b, - 0xca273eceea26619c, 0xd186b8c721c0c207, 0xeada7dd6cde0eb1e, 0xf57d4f7fee6ed178, - 0x06f067aa72176fba, 0x0a637dc5a2c898a6, 0x113f9804bef90dae, 0x1b710b35131c471b, - 0x28db77f523047d84, 0x32caab7b40c72493, 0x3c9ebe0a15c9bebc, 0x431d67c49c100d4c, - 0x4cc5d4becb3e42b6, 0x597f299cfc657e2a, 0x5fcb6fab3ad6faec, 0x6c44198c4a475817 - }; - } - - static void DefineH0Sha1() - { - H0Sha1 = new Word32[] - { - 0x67452301, 0xefcdab89, 0x98badcfe, 0x10325476, 0xc3d2e1f0 - }; - } - - static void DefineH0Sha224() - { - H0Sha224 = new Word32[] - { - 0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939, - 0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4 - }; - - } - - static void DefineH0Sha256() - { - // These eight 32-bit words are obtained by taking the first 32 bits of the - // fractional parts of the square roots of the first 8 prime numbers. - - H0Sha256 = new Word32[] - { - 0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, - 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19 - }; - } - - static void DefineH0Sha384() - { - // These eight 64-bit words are obtained by taking the first 64 bits of the - // fractional parts of the square roots of the ninth through sixteenth prime numbers. - - H0Sha384 = new Word64[] - { - 0xcbbb9d5dc1059ed8, 0x629a292a367cd507, 0x9159015a3070dd17, 0x152fecd8f70e5939, - 0x67332667ffc00b31, 0x8eb44a8768581511, 0xdb0c2e0d64f98fa7, 0x47b5481dbefa4fa4 - }; - } - - static void DefineH0Sha512() - { - // These eight 64-bit words are obtained by taking the first 64 bits of the - // fractional parts of the square roots of the first eight prime numbers. - - H0Sha512 = new Word64[] - { - 0x6a09e667f3bcc908, 0xbb67ae8584caa73b, 0x3c6ef372fe94f82b, 0xa54ff53a5f1d36f1, - 0x510e527fade682d1, 0x9b05688c2b3e6c1f, 0x1f83d9abfb41bd6b, 0x5be0cd19137e2179 - }; - } - - static void DefineH0Sha512_224() - { - // These eight 64-bit words are obtained from GenerateInitialHashSha512t(224) - - H0Sha512_224 = new Word64[] - { - 0x8c3d37c819544da2, 0x73e1996689dcd4d6, 0x1dfab7ae32ff9c82, 0x679dd514582f9fcf, - 0x0f6d2b697bd44da8, 0x77e36f7304c48942, 0x3f9d85a86a1d36c8, 0x1112e6ad91d692a1 - }; - } - - static void DefineH0Sha512_256() - { - // These eight 64-bit words are obtained from GenerateInitialHashSha512t(256) - - H0Sha512_256 = new Word64[] - { - 0x22312194fc2bf72c, 0x9f555fa3c84c64c2, 0x2393b86b6f53b151, 0x963877195940eabd, - 0x96283ee2a88effe3, 0xbe5e1e2553863992, 0x2b0199fc2c85b8aa, 0x0eb72ddc81c52ca2 - }; - } - - /* - static Word64[] GenerateInitialHashSha512t(int t) - { - // t = number of bits. - // We assume t is postive, divisible by 8 and is strictly less than 512. - // Also assume numberBits != 384 (WHY does 384 get its own initial hash?) - - Word64[] H0 = new Word64[8]; - - for (int i = 0; i < 8; i++) - { - H0[i] = H0Sha512[i] ^ 0xa5a5a5a5a5a5a5a5; - } - - byte[] B = ShaUtil.StringToByteArray("SHA-512/" + t.ToString()); // so arbitary! - - return ShaUtil.ByteArrayToWord64Array(Sha512(B)); ; - } - */ - - #endregion - -} - - -// Helper Classes - -class Block512 -{ - // A Block512 consists of an array of 16 elements of type Word32. - public Word32[] words; - - public Block512(Word32[] words) - { - if (words.Length == 16) - { - this.words = words; - } - else - { - Console.WriteLine("ERROR: A block must be 16 words"); - this.words = null; - } - } -} - - -class Block1024 -{ - // A Block1024 consists of an array of 16 elements of type Word64. - public Word64[] words; - - public Block1024(Word64[] words) - { - if (words.Length == 16) - { - this.words = words; - } - else - { - Console.WriteLine("ERROR: A block must be 16 words"); - this.words = null; - } - } -} - - -static class ShaUtilities -{ - #region Functions to convert between byte arrays and Word32 arrays, and Word64 arrays. - - public static bool ByteArraysEqual(byte[] B1, byte[] B2) - { - if ((B1 == null) && (B2 == null)) - return true; - - if ((B1 == null) || (B2 == null)) - return false; - - if (B1.Length != B2.Length) - return false; - - for (int i = 0; i < B1.Length; i++) - { - if (B1[i] != B2[i]) - return false; - } - - return true; - } - - public static byte[] StringToByteArray(string plaintext) - { - char[] c = plaintext.ToCharArray(); - int numberBytes = plaintext.Length; - byte[] b = new byte[numberBytes]; - - for (int i = 0; i < numberBytes; i++) - { - b[i] = Convert.ToByte(c[i]); - } - - return b; - } - - // Returns an array of 4 bytes. - public static byte[] Word32ToByteArray(Word32 x) - { - byte[] b = BitConverter.GetBytes(x); - Array.Reverse(b); - return b; - } - - // Returns an array of 8 bytes. - public static byte[] Word64ToByteArray(Word64 x) - { - byte[] b = BitConverter.GetBytes(x); - Array.Reverse(b); - return b; - } - - public static byte[] Word32ArrayToByteArray(Word32[] words) - { - List b = new List(); - - for (int i = 0; i < words.Length; i++) - { - b.AddRange(Word32ToByteArray(words[i])); - } - - return b.ToArray(); - } - - public static byte[] Word32ArrayToByteArray(Word32[] words, int startIndex, int numberWords) - { - // This overload is useful in Sha224 - // assume 0 <= startIndex < words.Length and startIndex + numberWords <= words.Length - - List b = new List(); - - for (int i = startIndex; i < startIndex + numberWords; i++) - { - b.AddRange(Word32ToByteArray(words[i])); - } - - return b.ToArray(); - } - - public static byte[] Word64ArrayToByteArray(Word64[] words) - { - List b = new List(); - - for (int i = 0; i < words.Length; i++) - { - b.AddRange(Word64ToByteArray(words[i])); - } - - return b.ToArray(); - } - - public static Word32 ByteArrayToWord32(byte[] B, int startIndex) - { - // We assume: 0 <= startIndex < B. Length, and startIndex + 4 <= B.Length - - Word32 c = 256; - Word32 output = 0; - - for (int i = startIndex; i < startIndex + 4; i++) - { - output = output * c + (Word32)B[i]; - } - - return output; - } - - public static Word64 ByteArrayToWord64(byte[] B, int startIndex) - { - // We assume: 0 <= startIndex < B. Length, and startIndex + 8 <= B.Length - Word64 c = 256; - Word64 output = 0; - - for (int i = startIndex; i < startIndex + 8; i++) - { - output = output * c + B[i]; - } - - return output; - } - - public static Word32[] ByteArrayToWord32Array(byte[] B) - { - // We assume B is not null, is not empty and number elements is divisible by 4 - int numberBytes = B.Length; - int n = numberBytes / 4; // 4 bytes for each Word32 - Word32[] word32Array = new Word32[n]; - - for (int i = 0; i < n; i++) - { - word32Array[i] = ByteArrayToWord32(B, 4 * i); - } - - return word32Array; - } - - - public static Word64[] ByteArrayToWord64Array(byte[] B) - { - // We assume B is not null, is not empty and number elements is divisible by 8 - int numberWords = B.Length / 8; // 8 bytes for each Word32 - Word64[] word64Array = new Word64[numberWords]; - - for (int i = 0; i < numberWords; i++) - { - word64Array[i] = ByteArrayToWord64(B, 8 * i); - } - - return word64Array; - } - - #endregion - - - #region To string methods - - public static string ByteToBinaryString(byte b) - { - string binaryString = Convert.ToString(b, 2).PadLeft(8, '0'); - return binaryString.Substring(0, 4) + "_" + binaryString.Substring(4, 4); - } - - public static string ByteArrayToBinaryString(byte[] x) - { - string binaryString = ""; - - for (int i = 0; i < x.Length; i++) - { - binaryString += ByteToBinaryString(x[i]); - - if (i < x.Length - 1) - { - binaryString += " "; - } - } - - return binaryString; - } - - public static string ByteToHexString(byte b) - { - return Convert.ToString(b, 16).PadLeft(2, '0'); - } - - public static string ByteArrayToHexString(byte[] a) - { - string hexString = ""; - - for (int i = 0; i < a.Length; i++) - { - hexString += ByteToHexString(a[i]); - } - - return hexString; - } - - public static string Word32ToBinaryString(Word32 x) - { - return ByteArrayToBinaryString(Word32ToByteArray(x)); - } - - public static string Word32ToHexString(Word32 x) - { - return ByteArrayToHexString(Word32ToByteArray(x)); - } - - public static string Word64ToHexString(Word64 x) - { - return ByteArrayToHexString(Word64ToByteArray(x)); - } - - public static string ByteArrayToString(byte[] X) - { - if (X == null) - { - Console.WriteLine("ERROR: The byte array is null"); - return null; - } - - string s = ""; - - for (int i = 0; i < X.Length; i++) - { - s += (char)X[i]; - } - - return s; - } - - #endregion -} - - - - - diff --git a/Tiobon.Core.Common/Helper/StringHelper.cs b/Tiobon.Core.Common/Helper/StringHelper.cs deleted file mode 100644 index 90c9e64c..00000000 --- a/Tiobon.Core.Common/Helper/StringHelper.cs +++ /dev/null @@ -1,293 +0,0 @@ -using System.ComponentModel; -using System.Reflection; -using System.Text; - -namespace Tiobon.Core.Common.Helper; - -public class StringHelper -{ - /// - /// 根据分隔符返回前n条数据 - /// - /// 数据内容 - /// 分隔符 - /// 前n条 - /// 是否倒序（默认false） - /// - public static List GetTopDataBySeparator(string content, string separator, int top, bool isDesc = false) - { - if (string.IsNullOrEmpty(content)) - { - return new List() { }; - } - - if (string.IsNullOrEmpty(separator)) - { - throw new ArgumentException("message", nameof(separator)); - } - - var dataArray = content.Split(separator).Where(d => !string.IsNullOrEmpty(d)).ToArray(); - if (isDesc) - { - Array.Reverse(dataArray); - } - - if (top > 0) - { - dataArray = dataArray.Take(top).ToArray(); - } - - return dataArray.ToList(); - } - /// - /// 根据字段拼接get参数 - /// - /// - /// - public static string GetPars(Dictionary dic) - { - - StringBuilder sb = new StringBuilder(); - string urlPars = null; - bool isEnter = false; - foreach (var item in dic) - { - sb.Append($"{(isEnter ? "&" : "")}{item.Key}={item.Value}"); - isEnter = true; - } - urlPars = sb.ToString(); - return urlPars; - } - /// - /// 根据字段拼接get参数 - /// - /// - /// - public static string GetPars(Dictionary dic) - { - - StringBuilder sb = new StringBuilder(); - string urlPars = null; - bool isEnter = false; - foreach (var item in dic) - { - sb.Append($"{(isEnter ? "&" : "")}{item.Key}={item.Value}"); - isEnter = true; - } - urlPars = sb.ToString(); - return urlPars; - } - /// - /// 获取一个GUID - /// - /// 格式-默认为N - /// - public static string GetGUID(string format = "N") - { - return Guid.NewGuid().ToString(format); - } - /// - /// 根据GUID获取19位的唯一数字序列 - /// - /// - public static long GetGuidToLongID() - { - byte[] buffer = Guid.NewGuid().ToByteArray(); - return BitConverter.ToInt64(buffer, 0); - } - /// - /// 获取字符串最后X行 - /// - /// - /// - /// - public static string GetCusLine(string resourceStr, int length) - { - string[] arrStr = resourceStr.Split("\r\n"); - return string.Join("", (from q in arrStr select q).Skip(arrStr.Length - length + 1).Take(length).ToArray()); - } - #region 求系统唯一字符串 - /// - /// 求系统唯一字符串，常用于ROW_ID值。 - /// - /// 字符串 - public static string GetSysID() - { - string sid = string.Empty; - - byte[] buffer = Guid.NewGuid().ToByteArray(); - sid = DateTime.Now.ToString("yyMMddHHmmss") + BitConverter.ToInt64(buffer, 0).ToString(); - return sid; - } - #endregion - - #region 格式化数字字符 - /// - /// 格式化数字字符，如传入1.24500，返回1.245 - /// - /// - /// - public static string TrimDecimalString(string value) - { - try - { - string result = string.Empty; - if (!string.IsNullOrEmpty(value)) - { - Decimal tmp = Decimal.Parse(value); - result = string.Format("{0:#0.##########}", tmp); - } - return result; - } - catch (Exception) - { - throw; - } - } - - public static string TrimDecimalString(decimal value) - { - return TrimDecimalString(value.ToString()); - } - public static string TrimDecimalString(decimal? value) - { - if (value is null) return ""; - return TrimDecimalString(value.ToString()); - } - /// - /// 格式化数字字符，并保留指定的小数位 - /// - /// 需要处理的值 - /// 保留小数点后位数 - /// - public static string TrimDecimalString(string value, int reservedDigit) - { - try - { - string result = string.Empty; - if (!string.IsNullOrEmpty(value)) - { - Decimal tmp = Decimal.Parse(value); - if (reservedDigit == -1) - result = string.Format("{0:#0.##########}", tmp); - else - { - result = String.Format("{0:N" + reservedDigit.ToString() + "}", tmp); - result = result.Replace(",", ""); - } - } - return result; - } - catch (Exception) { throw; } - } - - /// - /// 格式化数字字符，并保留指定的小数位 - /// - /// 需要处理的值 - /// 保留小数点后位数，-1时只会去除小数点后最后几位的0 - /// - public static string TrimDecimalString(object value, int reservedDigit) - { - try - { - string result = string.Empty; - if (!string.IsNullOrEmpty(Convert.ToString(value))) - { - Decimal tmp = Decimal.Parse(Convert.ToString(value)); - if (reservedDigit == -1) - result = string.Format("{0:#0.##########}", tmp); - else - { - result = String.Format("{0:N" + reservedDigit.ToString() + "}", tmp); - result = result.Replace(",", ""); - } - } - return result; - } - catch (Exception) { throw; } - } - - /// - /// 格式化数字字符，并保留指定的小数位 - /// - /// 需要处理的值 - /// 保留小数点后位数，-1时只会去除小数点后最后几位的0 - /// - public static decimal TrimDecimal(object value, int reservedDigit) - { - try - { - string result = string.Empty; - if (!string.IsNullOrEmpty(Convert.ToString(value))) - { - Decimal tmp = Decimal.Parse(Convert.ToString(value)); - if (reservedDigit == -1) - result = string.Format("{0:#0.##########}", tmp); - else - { - result = String.Format("{0:N" + reservedDigit.ToString() + "}", tmp); - result = result.Replace(",", ""); - } - } - return Convert.ToDecimal(result); - } - catch (Exception) { throw; } - } - #endregion - - #region 获取字段描述 - /// - /// 对象字段描述 - /// - private static Dictionary> m_FieldDesc = new Dictionary>(); - - /// - /// 获取字段的描述(描述 - 列名) - /// - /// - /// - public static Dictionary GetFieldDesc() - { - var type = typeof(T).ToString(); - lock (m_FieldDesc) - { - if (m_FieldDesc.ContainsKey(type)) - return m_FieldDesc[type]; - } - Dictionary dic = new Dictionary(); - try - { - PropertyInfo[] peroperties = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance); - if (peroperties != null) - { - foreach (PropertyInfo property in peroperties) - { - object[] objs = property.GetCustomAttributes(typeof(DescriptionAttribute), true); - if (objs.Length > 0) - { - var desc = ((DescriptionAttribute)objs[0]).Description.Trim(); - if (!dic.ContainsKey(desc)) - { - dic.Add(desc, property.Name); - } - else - { - dic[desc] = property.Name; - } - } - } - } - } - catch //(Exception ex) - { - } - lock (m_FieldDesc) - { - if (!m_FieldDesc.ContainsKey(type)) - m_FieldDesc.Add(type, dic); - } - return dic; - } - #endregion -} diff --git a/Tiobon.Core.Common/Helper/UnicodeHelper.cs b/Tiobon.Core.Common/Helper/UnicodeHelper.cs deleted file mode 100644 index 63c5315f..00000000 --- a/Tiobon.Core.Common/Helper/UnicodeHelper.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System.Text; -using System.Text.RegularExpressions; - -namespace Tiobon.Core.Common.Helper; - -public static class UnicodeHelper -{ - /// - /// 字符串转Unicode码 - /// - /// The to unicode. - /// Value. - public static string StringToUnicode(string value) - { - byte[] bytes = Encoding.Unicode.GetBytes(value); - StringBuilder stringBuilder = new StringBuilder(); - for (int i = 0; i < bytes.Length; i += 2) - { - // 取两个字符，每个字符都是右对齐。 - stringBuilder.AppendFormat("u{0}{1}", bytes[i + 1].ToString("x").PadLeft(2, '0'), bytes[i].ToString("x").PadLeft(2, '0')); - } - return stringBuilder.ToString(); - } - - /// - /// Unicode转字符串 - /// - /// The to string. - /// Unicode. - public static string UnicodeToString(string unicode) - { - unicode = unicode.Replace("%", "\\"); - - return new Regex(@"\\u([0-9A-F]{4})", RegexOptions.IgnoreCase | RegexOptions.Compiled).Replace( - unicode, x => string.Empty + Convert.ToChar(Convert.ToUInt16(x.Result("$1"), 16))); - - //string resultStr = ""; - //string[] strList = unicode.Split('u'); - //for (int i = 1; i < strList.Length; i++) - //{ - // resultStr += (char)int.Parse(strList[i], System.Globalization.NumberStyles.HexNumber); - //} - //return resultStr; - } -} diff --git a/Tiobon.Core.Common/Helper/UrlHelper.cs b/Tiobon.Core.Common/Helper/UrlHelper.cs deleted file mode 100644 index 6a5480c2..00000000 --- a/Tiobon.Core.Common/Helper/UrlHelper.cs +++ /dev/null @@ -1,22 +0,0 @@ -namespace Tiobon.Core.Common.Helper; - -public class UrlHelper -{ - /// - /// UrlEncode编码 - /// - /// url - /// - public static string UrlEncode(string url) { - return System.Web.HttpUtility.UrlEncode(url, System.Text.Encoding.UTF8); - } - /// - /// UrlEncode解码 - /// - /// 数据 - /// - public static string UrlDecode(string data) - { - return System.Web.HttpUtility.UrlDecode(data, System.Text.Encoding.UTF8); - } -} diff --git a/Tiobon.Core.Common/Helper/XmlHelper.cs b/Tiobon.Core.Common/Helper/XmlHelper.cs deleted file mode 100644 index 8db9f124..00000000 --- a/Tiobon.Core.Common/Helper/XmlHelper.cs +++ /dev/null @@ -1,59 +0,0 @@ -using System.Collections.Concurrent; -using System.Xml.Serialization; - -namespace Tiobon.Core.Common.Helper; - -/// -/// xml序列化帮助类 -/// -public class XmlHelper -{ - /// - /// 存储序列类型,防止内存泄漏 - /// - private static ConcurrentDictionary hasTypes = new ConcurrentDictionary(); - /// - /// 转换对象为JSON格式数据 - /// - /// 类 - /// 对象 - /// 字符格式的JSON数据 - public static string GetXML(object obj, string rootName = "root") - { - XmlSerializer xs; - var xsType = typeof(T); - hasTypes.TryGetValue(xsType, out xs); - if(xs == null) - { - xs = new XmlSerializer(typeof(T)); - hasTypes.TryAdd(xsType, xs); - } - using (TextWriter tw = new StringWriter()) - { - xs.Serialize(tw, obj); - return tw.ObjToString(); - } - } - - /// - /// Xml格式字符转换为T类型的对象 - /// - /// - /// - /// - public static T ParseFormByXml(string xml, string rootName = "root") - { - XmlSerializer xs; - var xsType = typeof(T); - hasTypes.TryGetValue(xsType, out xs); - if (xs == null) - { - xs = new XmlSerializer(xsType, new XmlRootAttribute(rootName)); - hasTypes.TryAdd(xsType, xs); - } - using (StringReader reader = new StringReader(xml)) - { - return (T)xs.Deserialize(reader); - } - } -} diff --git a/Tiobon.Core.Common/Hubs/ChatHub.cs b/Tiobon.Core.Common/Hubs/ChatHub.cs deleted file mode 100644 index ec4b107f..00000000 --- a/Tiobon.Core.Common/Hubs/ChatHub.cs +++ /dev/null @@ -1,105 +0,0 @@ -using Microsoft.AspNetCore.SignalR; -using System.Security.Claims; -using Tiobon.Core.LogHelper; - -namespace Tiobon.Core.Hubs; - -public class ChatHub : Hub -{ - /// - /// 向指定群组发送信息 - /// - /// 组名 - /// 信息内容 - /// - public async Task SendMessageToGroupAsync(string groupName, string message) - { - await Clients.Group(groupName).ReceiveMessage(message); - } - - /// - /// 加入指定组 - /// - /// 组名 - /// - public async Task AddToGroup(string groupName) - { - await Groups.AddToGroupAsync(Context.ConnectionId, groupName); - } - - /// - /// 退出指定组 - /// - /// 组名 - /// - public async Task RemoveFromGroup(string groupName) - { - await Groups.RemoveFromGroupAsync(Context.ConnectionId, groupName); - } - - /// - /// 向指定成员发送信息 - /// - /// 成员名 - /// 信息内容 - /// - public async Task SendPrivateMessage(string user, string message) - { - await Clients.User(user).ReceiveMessage(message); - } - - /// - /// 当连接建立时运行 - /// - /// - public override async Task OnConnectedAsync() - { - await base.OnConnectedAsync(); - if (Context.User?.Identity?.IsAuthenticated == true) - { - //按用户分组 - //是有必要的 例如多个浏览器、多个标签页使用同个用户登录 应当归属于一组 - await AddToGroup(Context.User.Identity.Name); - - //加入角色组 - //根据角色分组 例如管理员分组发送管理员的消息 - var roles = Context.User.Claims.Where(s => s.Type == ClaimTypes.Role).ToList(); - foreach (var role in roles) - { - await AddToGroup(role.Value); - } - } - } - - /// - /// 当链接断开时运行 - /// - /// - /// - public override Task OnDisconnectedAsync(System.Exception ex) - { - //TODO.. - return base.OnDisconnectedAsync(ex); - } - - - public async Task SendMessage(string user, string message) - { - await Clients.All.ReceiveMessage(user, message); - } - - //定于一个通讯管道，用来管理我们和客户端的连接 - //1、客户端调用 GetLatestCount，就像订阅 - public async Task GetLatestCount(string random) - { - //2、服务端主动向客户端发送数据，名字千万不能错 - if (AppSettings.app(new string[] {"Middleware", "SignalRSendLog", "Enabled"}).ObjToBool()) - { - //TODO 主动发送错误消息 - await Clients.All.ReceiveUpdate(LogLock.GetLogData()); - } - - - //3、客户端再通过 ReceiveUpdate ，来接收 - } -} \ No newline at end of file diff --git a/Tiobon.Core.Common/Hubs/IChatClient.cs b/Tiobon.Core.Common/Hubs/IChatClient.cs deleted file mode 100644 index f9edaaf5..00000000 --- a/Tiobon.Core.Common/Hubs/IChatClient.cs +++ /dev/null @@ -1,21 +0,0 @@ -namespace Tiobon.Core.Hubs; - -public interface IChatClient -{ - /// - /// SignalR接收信息 - /// - /// 信息内容 - /// - Task ReceiveMessage(object message); - - /// - /// SignalR接收信息 - /// - /// 指定接收客户端 - /// 信息内容 - /// - Task ReceiveMessage(string user, string message); - - Task ReceiveUpdate(object message); -} diff --git a/Tiobon.Core.IServices/Ghre/IGhre_ExamRecordServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_ExamRecordServices.cs index d3bcf4f9..dd5b7110 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_ExamRecordServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_ExamRecordServices.cs @@ -35,4 +35,6 @@ public interface IGhre_ExamRecordServices : IBaseServices IssueCertificate(); Task>> QueryGroups(long examRecordId); + + Task MarkCompleteStatus(long id); } \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_SurveyServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_SurveyServices.cs index 6b8e1312..c01f1fba 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_SurveyServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_SurveyServices.cs @@ -24,4 +24,6 @@ public interface IGhre_SurveyServices : IBaseServices Start(long id); Task QueryRecord(long id); + + Task> QueryESS(QueryBody filter); } \ No newline at end of file diff --git a/Tiobon.Core.Model/ViewModels/Extend/Ghre_ESSSurvey.cs b/Tiobon.Core.Model/ViewModels/Extend/Ghre_ESSSurvey.cs new file mode 100644 index 00000000..3d25a2f3 --- /dev/null +++ b/Tiobon.Core.Model/ViewModels/Extend/Ghre_ESSSurvey.cs @@ -0,0 +1,18 @@ +namespace Tiobon.Core.Model; + +public class Ghre_ESSSurvey +{ + public long Id { get; set; } + public string SurveyClass { get; set; } + public string SurveyName { get; set; } + public DateTime? BeginTime { get; set; } + public DateTime? EndTime { get; set; } + public DateTime? SubmitDate { get; set; } + public string Status { get; set; } + public string SurveyStatus { get; set; } + + public string BeginEndTime { get; set; } + public string IsAnonymous1 { get; set; } + public bool? IsAnonymous { get; set; } + +} \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs index 0135491e..e66fe519 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs @@ -476,6 +476,12 @@ public class Ghre_ExamRecordServices : BaseServices().Where(x => x.Id == record.StudyRecordId).FirstAsync(); + await ExamHelper.MarkCompleteStatusAsync(Db, studyRecord); + } + return ServiceResult.OprateSuccess("提交成功！"); } @@ -1839,4 +1845,11 @@ public class Ghre_ExamRecordServices : BaseServices MarkCompleteStatus(long id) + { + var studyRecord = await Db.Queryable().Where(x => x.Id == id).FirstAsync(); + await ExamHelper.MarkCompleteStatusAsync(Db, studyRecord); + return ServiceResult.OprateSuccess(); + } } \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghre/Ghre_SurveyServices.cs b/Tiobon.Core.Services/Ghre/Ghre_SurveyServices.cs index 7f747d44..bfda756d 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_SurveyServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_SurveyServices.cs @@ -1,4 +1,5 @@ -using System.Text.RegularExpressions; +using MySqlX.XDevAPI.Common; +using System.Text.RegularExpressions; namespace Tiobon.Core.Services; @@ -118,7 +119,6 @@ public class Ghre_SurveyServices : BaseServices> InsertData(long id, InsertGhre_SurveyExtend insertModel) { @@ -200,7 +200,6 @@ public class Ghre_SurveyServices : BaseServices> QueryESSData(long id, long? openClassId = null) { long? feedbackId = null; @@ -812,20 +811,67 @@ public class Ghre_SurveyServices : BaseServices> QueryESS(QueryBody filter) + { + + var deptId = await Db.Queryable().Where(x => x.StaffID == App.User.StaffId).Select(x => x.DeptID).FirstAsync(); + var sql1 = @$"SELECT A.Id, + A.SurveyClass, + A.SurveyName, + A.BeginTime, + A.EndTime, B.SubmitDate, A.CreateTime,A.Status SurveyStatus,A.IsAnonymous +FROM Ghre_Survey A + LEFT JOIN Ghre_SurveyRecord B ON A.Id = B.SurveyId AND B.IsEnable = 1 and B.StaffId=9 +WHERE A.IsEnable = 1 AND A.Status ! = 'Temporary' + and ({App.User.StaffId} in (select value from openjson(A.StaffID)) + or {deptId} in (select value from openjson(A.deptId)))"; + + if (string.IsNullOrWhiteSpace(filter.orderBy)) + filter.orderBy = "CreateTime DESC"; + + if (filter.pageSize == 0) + filter.pageSize = 10000; + + var countSql = @$" SELECT COUNT(1) FROM ({sql1}) A"; + + string conditions = " "; + + if (filter.jsonParam != null) + foreach (JProperty jProperty in filter.jsonParam.Properties()) + { + var name = jProperty.Name; + var value = jProperty.Value.ToString(); + if (name == "page" || name == "pageSize") + continue; + if (!string.IsNullOrWhiteSpace(value)) + conditions = DealConditions(conditions, name, value); + } + + sql1 += conditions; + countSql += conditions; + int total = await Db.Ado.GetIntAsync(countSql); + + var sql = "SELECT * FROM (SELECT *, ROW_NUMBER() OVER (ORDER BY " + filter.orderBy + ") NUM FROM (SELECT * FROM (" + sql1 + " "; + sql += ") A ) B ) C"; + + sql += " WHERE NUM <= " + filter.pageNum * filter.pageSize + " AND NUM >" + (filter.pageNum - 1) * filter.pageSize; + //sql = sql1 + sql; + var entitys = await Db.Ado.SqlQueryAsync(sql); -// public async Task QueryRecord(long id) -// { -// var sql = @$"SELECT A.Id, -// A.SurveyClass, -// A.SurveyName, -// A.BeginTime, -// A.EndTime, B.SubmitDate -//FROM Ghre_Survey A -// LEFT JOIN Ghre_SurveyRecord B ON A.Id = B.SurveyId AND B.IsEnable = 1 and B.StaffId=9 -//WHERE A.IsEnable = 1 AND A.Status ! = 'Temporary' -// and (9 in (select value from openjson(A.StaffID)) -// or 41 in (select value from openjson(A.deptId)))" -// return obj; -// } + + entitys.ForEach(async x => + { + x.IsAnonymous1 = x.IsAnonymous == true ? "是" : "否"; + x.Status = x.SubmitDate != null ? "已填" : "未填"; + x.SurveyClass = await GetParaLabel("TrainSurveyClass", x.SurveyClass); + if (x.BeginTime != null && x.EndTime != null) + x.BeginEndTime = $"{DateTimeHelper.ConvertToMiniuteString(x.BeginTime)}~{DateTimeHelper.ConvertToMiniuteString(x.EndTime)}"; + else + x.BeginEndTime = "长期"; + }); + + return new ServicePageResult(filter.pageNum, total, filter.pageSize, entitys); + + } } diff --git a/Tiobon.Core.Tasks/QuartzNet/Jobs/JobBase.cs b/Tiobon.Core.Tasks/QuartzNet/Jobs/JobBase.cs index aec34117..da89b7d8 100644 --- a/Tiobon.Core.Tasks/QuartzNet/Jobs/JobBase.cs +++ b/Tiobon.Core.Tasks/QuartzNet/Jobs/JobBase.cs @@ -1,4 +1,4 @@ -using Tiobon.Core.Common.Helper; +using Tiobon.Core.Helper; using Tiobon.Core.Model.Models; namespace Tiobon.Core.Tasks; diff --git a/Tiobon.Core/Tiobon.Core.Api.xml b/Tiobon.Core/Tiobon.Core.Api.xml index c9716450..56df0c66 100644 --- a/Tiobon.Core/Tiobon.Core.Api.xml +++ b/Tiobon.Core/Tiobon.Core.Api.xml @@ -1654,6 +1654,13 @@ + + + QueryESS + + + + 问卷调查选项(Controller)