From 1071daaaf374856f6f700c3e8cec5ce01f355914 Mon Sep 17 00:00:00 2001 From: Mason Date: Tue, 18 Apr 2023 20:23:39 +0800 Subject: [PATCH] update --- ModelGenerator/Common/ConfigHelper.cs | 6 +- ModelGenerator/Common/FileHelper.cs | 6 +- ModelGenerator/Common/InvokeHelper.cs | 6 +- ModelGenerator/Common/ListBoxExtends.cs | 10 +- ModelGenerator/Common/MessageQueue.cs | 6 +- ModelGenerator/Common/SyncDataHelper.cs | 6 +- ModelGenerator/Common/TemplateHelper.cs | 6 +- ModelGenerator/Common/TextBoxPositionInfo.cs | 10 +- ModelGenerator/Common/WEFMessageBox.cs | 10 +- ModelGenerator/Common/Win32Helper.cs | 6 +- ModelGenerator/Common/XSDToCSharp.cs | 6 +- ModelGenerator/Controls/TextBoxE.cs | 41 ++ ModelGenerator/Forms/ApiLogForm.Designer.cs | 6 +- ModelGenerator/Forms/ApiLogForm.cs | 6 +- ModelGenerator/Forms/Base64Form.Designer.cs | 48 +-- ModelGenerator/Forms/Base64Form.cs | 10 +- .../Forms/FileClearForm.Designer.cs | 2 +- .../Forms/TxtReplaceForm.Designer.cs | 12 +- ModelGenerator/Forms/TxtReplaceForm.cs | 1 + ModelGenerator/Forms/TxtReplaceForm.resx | 360 ++++++++++++++---- ModelGenerator/Model/CollectInfo.cs | 6 +- ModelGenerator/Model/ConnectionInfo.cs | 6 +- ModelGenerator/Model/DataSyncConfig.cs | 6 +- ModelGenerator/Model/DatabaseObject.cs | 6 +- ModelGenerator/Model/LogInfo.cs | 6 +- ModelGenerator/Model/SqlWord.cs | 6 +- ModelGenerator/Model/TemplateData.cs | 6 +- ModelGenerator/Model/TemplateToCodeConfig.cs | 6 +- ModelGenerator/Model/UserDefinedType.cs | 6 +- WEF.Standard.Test/MultyTableTest.cs | 6 +- WEF.Standard.Test/MySqlBitTypeTest.cs | 14 +- WEF.Standard/BaseRepository.cs | 6 +- WEF.Standard/Batcher/AdoBatcher.cs | 6 +- WEF.Standard/Common/DataTableHelper.cs | 10 +- WEF.Standard/Db/DTCTran.cs | 6 +- WEF.Standard/Db/DbTransType.cs | 6 +- WEF.Standard/Provider/DbProviderCreator.cs | 6 +- 37 files changed, 470 insertions(+), 208 deletions(-) diff --git a/ModelGenerator/Common/ConfigHelper.cs b/ModelGenerator/Common/ConfigHelper.cs index 70122dd..cee7080 100644 --- a/ModelGenerator/Common/ConfigHelper.cs +++ b/ModelGenerator/Common/ConfigHelper.cs @@ -8,15 +8,15 @@ *版本号： V1.0.0.0 *唯一标识：9b642397-4ee6-4277-8a1a-52b6010fa188 *当前的用户域：OCEANIA -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2021/7/19 14:20:22 *描述： * *===================================================================== *修改标记 *修改时间：2021/7/19 14:20:22 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * diff --git a/ModelGenerator/Common/FileHelper.cs b/ModelGenerator/Common/FileHelper.cs index d49e12d..59c83b5 100644 --- a/ModelGenerator/Common/FileHelper.cs +++ b/ModelGenerator/Common/FileHelper.cs @@ -8,15 +8,15 @@ *版本号： V1.0.0.0 *唯一标识：42d16536-5c19-4987-88fe-2f3cbe883546 *当前的用户域：OCEANIA -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2021/11/8 13:21:12 *描述： * *===================================================================== *修改标记 *修改时间：2021/11/8 13:21:12 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * diff --git a/ModelGenerator/Common/InvokeHelper.cs b/ModelGenerator/Common/InvokeHelper.cs index 55964e7..8aa7b4b 100644 --- a/ModelGenerator/Common/InvokeHelper.cs +++ b/ModelGenerator/Common/InvokeHelper.cs @@ -8,15 +8,15 @@ *版本号： V1.0.0.0 *唯一标识：fb5126a6-0c23-4d19-bc5d-68d0f9d51375 *当前的用户域：OCEANIA -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2021/6/3 15:51:33 *描述： * *===================================================================== *修改标记 *修改时间：2021/6/3 15:51:33 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * diff --git a/ModelGenerator/Common/ListBoxExtends.cs b/ModelGenerator/Common/ListBoxExtends.cs index 15f966f..139737f 100644 --- a/ModelGenerator/Common/ListBoxExtends.cs +++ b/ModelGenerator/Common/ListBoxExtends.cs @@ -2,21 +2,21 @@ *Copyright (c) 2022 Oceania All Rights Reserved. *CLR版本： 4.0.30319.42000 *机器名称：LP20210416002 -*公司名称：Mason.Wen +*公司名称：Walle.Wen *命名空间：WEF.ModelGenerator.Common *文件名： ListBoxExtends *版本号： V1.0.0.0 *唯一标识：6ab5a043-e378-4e55-9122-0a06559ad8b7 -*当前的用户域：Mason.Wen -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*当前的用户域：Walle.Wen +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2022/1/12 11:58:40 *描述： * *===================================================================== *修改标记 *修改时间：2022/1/12 11:58:40 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * diff --git a/ModelGenerator/Common/MessageQueue.cs b/ModelGenerator/Common/MessageQueue.cs index 3496f0b..81c765f 100644 --- a/ModelGenerator/Common/MessageQueue.cs +++ b/ModelGenerator/Common/MessageQueue.cs @@ -8,15 +8,15 @@ *版本号： V1.0.0.0 *唯一标识：33986572-cc52-4214-a294-fe55478786fa *当前的用户域：OCEANIA -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2022/2/24 18:05:28 *描述： * *===================================================================== *修改标记 *修改时间：2022/2/24 18:05:28 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * diff --git a/ModelGenerator/Common/SyncDataHelper.cs b/ModelGenerator/Common/SyncDataHelper.cs index fc37d5d..9f02b88 100644 --- a/ModelGenerator/Common/SyncDataHelper.cs +++ b/ModelGenerator/Common/SyncDataHelper.cs @@ -8,15 +8,15 @@ *版本号： V1.0.0.0 *唯一标识：94b4a9e0-cddc-4aaa-b26f-e6dd679efe2d *当前的用户域：OCEANIA -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2021/7/20 10:46:08 *描述： * *===================================================================== *修改标记 *修改时间：2021/7/20 10:46:08 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * diff --git a/ModelGenerator/Common/TemplateHelper.cs b/ModelGenerator/Common/TemplateHelper.cs index 160683e..1054585 100644 --- a/ModelGenerator/Common/TemplateHelper.cs +++ b/ModelGenerator/Common/TemplateHelper.cs @@ -8,15 +8,15 @@ *版本号： V1.0.0.0 *唯一标识：a691abfd-3fc6-4ada-a73b-02efc38486e5 *当前的用户域：OCEANIA -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2021/7/13 10:26:21 *描述： * *===================================================================== *修改标记 *修改时间：2021/7/13 10:26:21 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * diff --git a/ModelGenerator/Common/TextBoxPositionInfo.cs b/ModelGenerator/Common/TextBoxPositionInfo.cs index 705dea6..4d6888b 100644 --- a/ModelGenerator/Common/TextBoxPositionInfo.cs +++ b/ModelGenerator/Common/TextBoxPositionInfo.cs @@ -2,21 +2,21 @@ *Copyright (c) 2022 Oceania All Rights Reserved. *CLR版本： 4.0.30319.42000 *机器名称：LP20210416002 -*公司名称：Mason.Wen +*公司名称：Walle.Wen *命名空间：WEF.ModelGenerator.Common *文件名： TextBoxPositionInfo *版本号： V1.0.0.0 *唯一标识：9713a116-5bf9-4de3-ae1c-a5a8cc9aae84 -*当前的用户域：Mason.Wen -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*当前的用户域：Walle.Wen +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2022/1/12 11:57:32 *描述： * *===================================================================== *修改标记 *修改时间：2022/1/12 11:57:32 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * diff --git a/ModelGenerator/Common/WEFMessageBox.cs b/ModelGenerator/Common/WEFMessageBox.cs index fb1e338..732bff8 100644 --- a/ModelGenerator/Common/WEFMessageBox.cs +++ b/ModelGenerator/Common/WEFMessageBox.cs @@ -2,21 +2,21 @@ *Copyright (c) 2022 Oceania All Rights Reserved. *CLR版本： 4.0.30319.42000 *机器名称：LP20210416002 -*公司名称：Mason.Wen +*公司名称：Walle.Wen *命名空间：WEF.ModelGenerator.Common *文件名： MessageBoxEx *版本号： V1.0.0.0 *唯一标识：60f74840-1030-4da4-be7b-1025025b4ae6 -*当前的用户域：Mason.Wen -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*当前的用户域：Walle.Wen +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2022/1/12 13:27:15 *描述： * *===================================================================== *修改标记 *修改时间：2022/1/12 13:27:15 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * diff --git a/ModelGenerator/Common/Win32Helper.cs b/ModelGenerator/Common/Win32Helper.cs index 7b70c9c..b9a4f05 100644 --- a/ModelGenerator/Common/Win32Helper.cs +++ b/ModelGenerator/Common/Win32Helper.cs @@ -8,15 +8,15 @@ *版本号： V1.0.0.0 *唯一标识：bd4f439c-a2af-46dd-a796-f388d20ee5cb *当前的用户域：OCEANIA -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2022/1/12 11:59:46 *描述： * *===================================================================== *修改标记 *修改时间：2022/1/12 11:59:46 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * diff --git a/ModelGenerator/Common/XSDToCSharp.cs b/ModelGenerator/Common/XSDToCSharp.cs index 9c66b55..baecb02 100644 --- a/ModelGenerator/Common/XSDToCSharp.cs +++ b/ModelGenerator/Common/XSDToCSharp.cs @@ -8,15 +8,15 @@ *版本号： V1.0.0.0 *唯一标识：201fe12a-cff3-4a68-acb6-23c6a53ffe5d *当前的用户域：OCEANIA -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2021/12/2 14:48:53 *描述：xsd 转换成C# * *===================================================================== *修改标记 *修改时间：2021/12/2 14:48:53 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述：xsd 转换成C# * diff --git a/ModelGenerator/Controls/TextBoxE.cs b/ModelGenerator/Controls/TextBoxE.cs index a78669c..58d1405 100644 --- a/ModelGenerator/Controls/TextBoxE.cs +++ b/ModelGenerator/Controls/TextBoxE.cs @@ -16,15 +16,56 @@ using System.Windows.Forms; +using WEF.ModelGenerator.Common; + namespace WEF.ModelGenerator.Controls { + /// + /// 扩展输入控件 + /// public class TextBoxE : TextBox { + /// + /// 是否是输入键 + /// + /// + /// protected override bool IsInputKey(Keys KeyData) { if ((KeyData == Keys.Up) || (KeyData == Keys.Down)) return true; return base.IsInputKey(KeyData); } + + /// + /// 检查粘帖内容及长度 + /// + /// + protected override void WndProc(ref System.Windows.Forms.Message m) + { + //0x007B:鼠标右键 message ID + //0x0301:复制(包括ctrl + c) message ID （其实这个判断不要，因为设置textbox的PasswordChar属性 实际上已经屏蔽了复制功能） + //0x0302：粘贴（包括ctrl + v) message ID + if (m.Msg == 0x0302) + { + var txt = Clipboard.GetText(); + if (string.IsNullOrEmpty(txt)) + { + return; + } + if (txt.Length > this.MaxLength) + { + WEFMessageBox.Show(this, "粘贴的内容不能超过" + this.MaxLength, "Base64转小图片"); + } + else + { + base.WndProc(ref m); + } + } + else + { + base.WndProc(ref m); + } + } } } \ No newline at end of file diff --git a/ModelGenerator/Forms/ApiLogForm.Designer.cs b/ModelGenerator/Forms/ApiLogForm.Designer.cs index 5f7059b..988d17c 100644 --- a/ModelGenerator/Forms/ApiLogForm.Designer.cs +++ b/ModelGenerator/Forms/ApiLogForm.Designer.cs @@ -8,15 +8,15 @@ *版本号： V1.0.0.0 *唯一标识：9ae8c072-cd3c-4ef9-9433-92f6189af33e *当前的用户域：OCEANIA -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2022/4/14 21:29:16 *描述： * *===================================================================== *修改标记 *修改时间：2022/4/14 21:29:16 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * diff --git a/ModelGenerator/Forms/ApiLogForm.cs b/ModelGenerator/Forms/ApiLogForm.cs index 5019a59..0614994 100644 --- a/ModelGenerator/Forms/ApiLogForm.cs +++ b/ModelGenerator/Forms/ApiLogForm.cs @@ -8,15 +8,15 @@ *版本号： V1.0.0.0 *唯一标识：9ae8c072-cd3c-4ef9-9433-92f6189af33e *当前的用户域：OCEANIA -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2022/4/14 21:29:16 *描述： * *===================================================================== *修改标记 *修改时间：2022/4/14 21:29:16 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * diff --git a/ModelGenerator/Forms/Base64Form.Designer.cs b/ModelGenerator/Forms/Base64Form.Designer.cs index 94b6b05..b983b42 100644 --- a/ModelGenerator/Forms/Base64Form.Designer.cs +++ b/ModelGenerator/Forms/Base64Form.Designer.cs @@ -1,3 +1,5 @@ +using WEF.ModelGenerator.Controls; + namespace WEF.ModelGenerator.Forms { public partial class Base64Form{ @@ -28,7 +30,7 @@ private void InitializeComponent() this.skinWaterTextBox6 = new CCWin.SkinControl.SkinWaterTextBox(); this.skinGroupBox3 = new CCWin.SkinControl.SkinGroupBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.textBox1 = new System.Windows.Forms.TextBox(); + this.textBox1 = new WEF.ModelGenerator.Controls.TextBoxE(); this.skinGroupBox1.SuspendLayout(); this.skinGroupBox2.SuspendLayout(); this.skinGroupBox3.SuspendLayout(); @@ -47,13 +49,13 @@ private void InitializeComponent() this.skinGroupBox1.Controls.Add(this.skinWaterTextBox1); this.skinGroupBox1.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.skinGroupBox1.ForeColor = System.Drawing.SystemColors.ControlText; - this.skinGroupBox1.Location = new System.Drawing.Point(39, 62); + this.skinGroupBox1.Location = new System.Drawing.Point(19, 60); this.skinGroupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.skinGroupBox1.Name = "skinGroupBox1"; this.skinGroupBox1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.skinGroupBox1.RectBackColor = System.Drawing.Color.White; this.skinGroupBox1.RoundStyle = CCWin.SkinClass.RoundStyle.All; - this.skinGroupBox1.Size = new System.Drawing.Size(1422, 377); + this.skinGroupBox1.Size = new System.Drawing.Size(1445, 377); this.skinGroupBox1.TabIndex = 0; this.skinGroupBox1.TabStop = false; this.skinGroupBox1.Text = "字符串Base64转换"; @@ -72,7 +74,7 @@ private void InitializeComponent() this.skinWaterTextBox2.Multiline = true; this.skinWaterTextBox2.Name = "skinWaterTextBox2"; this.skinWaterTextBox2.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.skinWaterTextBox2.Size = new System.Drawing.Size(642, 293); + this.skinWaterTextBox2.Size = new System.Drawing.Size(665, 293); this.skinWaterTextBox2.TabIndex = 3; this.skinWaterTextBox2.WaterColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(127)))), ((int)(((byte)(127))))); this.skinWaterTextBox2.WaterText = "Base64字符串"; @@ -94,7 +96,7 @@ private void InitializeComponent() this.skinButton2.NormlBack = null; this.skinButton2.Radius = 15; this.skinButton2.RoundStyle = CCWin.SkinClass.RoundStyle.All; - this.skinButton2.Size = new System.Drawing.Size(93, 61); + this.skinButton2.Size = new System.Drawing.Size(93, 52); this.skinButton2.TabIndex = 2; this.skinButton2.Text = "<-"; this.skinButton2.UseVisualStyleBackColor = false; @@ -117,7 +119,7 @@ private void InitializeComponent() this.skinButton1.NormlBack = null; this.skinButton1.Radius = 15; this.skinButton1.RoundStyle = CCWin.SkinClass.RoundStyle.All; - this.skinButton1.Size = new System.Drawing.Size(93, 61); + this.skinButton1.Size = new System.Drawing.Size(93, 52); this.skinButton1.TabIndex = 1; this.skinButton1.Text = "->"; this.skinButton1.UseVisualStyleBackColor = false; @@ -158,13 +160,13 @@ private void InitializeComponent() this.skinGroupBox2.Controls.Add(this.skinWaterTextBox6); this.skinGroupBox2.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.skinGroupBox2.ForeColor = System.Drawing.SystemColors.ControlText; - this.skinGroupBox2.Location = new System.Drawing.Point(39, 449); + this.skinGroupBox2.Location = new System.Drawing.Point(21, 444); this.skinGroupBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.skinGroupBox2.Name = "skinGroupBox2"; this.skinGroupBox2.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.skinGroupBox2.RectBackColor = System.Drawing.Color.White; this.skinGroupBox2.RoundStyle = CCWin.SkinClass.RoundStyle.All; - this.skinGroupBox2.Size = new System.Drawing.Size(1422, 285); + this.skinGroupBox2.Size = new System.Drawing.Size(1443, 285); this.skinGroupBox2.TabIndex = 2; this.skinGroupBox2.TabStop = false; this.skinGroupBox2.Text = "文件Base64转换"; @@ -175,7 +177,7 @@ private void InitializeComponent() // button3 // this.button3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.button3.Location = new System.Drawing.Point(1300, 65); + this.button3.Location = new System.Drawing.Point(1321, 65); this.button3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(45, 56); @@ -191,7 +193,7 @@ private void InitializeComponent() this.skinWaterTextBox5.Location = new System.Drawing.Point(82, 66); this.skinWaterTextBox5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.skinWaterTextBox5.Name = "skinWaterTextBox5"; - this.skinWaterTextBox5.Size = new System.Drawing.Size(1219, 46); + this.skinWaterTextBox5.Size = new System.Drawing.Size(1240, 46); this.skinWaterTextBox5.TabIndex = 5; this.skinWaterTextBox5.WaterColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(127)))), ((int)(((byte)(127))))); this.skinWaterTextBox5.WaterText = "Base64文本文件地址"; @@ -205,7 +207,7 @@ private void InitializeComponent() this.skinButton6.ControlState = CCWin.SkinClass.ControlState.Normal; this.skinButton6.DownBack = null; this.skinButton6.DownBaseColor = System.Drawing.SystemColors.ControlDark; - this.skinButton6.Location = new System.Drawing.Point(718, 208); + this.skinButton6.Location = new System.Drawing.Point(728, 208); this.skinButton6.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.skinButton6.MouseBack = null; this.skinButton6.MouseBaseColor = System.Drawing.SystemColors.ControlLight; @@ -213,7 +215,7 @@ private void InitializeComponent() this.skinButton6.NormlBack = null; this.skinButton6.Radius = 15; this.skinButton6.RoundStyle = CCWin.SkinClass.RoundStyle.All; - this.skinButton6.Size = new System.Drawing.Size(240, 67); + this.skinButton6.Size = new System.Drawing.Size(240, 52); this.skinButton6.TabIndex = 3; this.skinButton6.Text = "文件转Base64"; this.skinButton6.UseVisualStyleBackColor = false; @@ -228,7 +230,7 @@ private void InitializeComponent() this.skinButton5.ControlState = CCWin.SkinClass.ControlState.Normal; this.skinButton5.DownBack = null; this.skinButton5.DownBaseColor = System.Drawing.SystemColors.ControlDark; - this.skinButton5.Location = new System.Drawing.Point(484, 208); + this.skinButton5.Location = new System.Drawing.Point(494, 208); this.skinButton5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.skinButton5.MouseBack = null; this.skinButton5.MouseBaseColor = System.Drawing.SystemColors.ControlLight; @@ -236,7 +238,7 @@ private void InitializeComponent() this.skinButton5.NormlBack = null; this.skinButton5.Radius = 15; this.skinButton5.RoundStyle = CCWin.SkinClass.RoundStyle.All; - this.skinButton5.Size = new System.Drawing.Size(226, 67); + this.skinButton5.Size = new System.Drawing.Size(226, 52); this.skinButton5.TabIndex = 4; this.skinButton5.Text = "Base64转文件"; this.skinButton5.UseVisualStyleBackColor = false; @@ -245,7 +247,7 @@ private void InitializeComponent() // button2 // this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.button2.Location = new System.Drawing.Point(1299, 136); + this.button2.Location = new System.Drawing.Point(1320, 136); this.button2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(45, 56); @@ -261,7 +263,7 @@ private void InitializeComponent() this.skinWaterTextBox6.Location = new System.Drawing.Point(82, 141); this.skinWaterTextBox6.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.skinWaterTextBox6.Name = "skinWaterTextBox6"; - this.skinWaterTextBox6.Size = new System.Drawing.Size(1219, 46); + this.skinWaterTextBox6.Size = new System.Drawing.Size(1240, 46); this.skinWaterTextBox6.TabIndex = 0; this.skinWaterTextBox6.WaterColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(127)))), ((int)(((byte)(127))))); this.skinWaterTextBox6.WaterText = "文件地址"; @@ -277,13 +279,13 @@ private void InitializeComponent() this.skinGroupBox3.Controls.Add(this.textBox1); this.skinGroupBox3.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.skinGroupBox3.ForeColor = System.Drawing.SystemColors.ControlText; - this.skinGroupBox3.Location = new System.Drawing.Point(39, 737); + this.skinGroupBox3.Location = new System.Drawing.Point(22, 737); this.skinGroupBox3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.skinGroupBox3.Name = "skinGroupBox3"; this.skinGroupBox3.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.skinGroupBox3.RectBackColor = System.Drawing.Color.White; this.skinGroupBox3.RoundStyle = CCWin.SkinClass.RoundStyle.All; - this.skinGroupBox3.Size = new System.Drawing.Size(1422, 344); + this.skinGroupBox3.Size = new System.Drawing.Size(1442, 344); this.skinGroupBox3.TabIndex = 2; this.skinGroupBox3.TabStop = false; this.skinGroupBox3.Text = "Base64转换小图片"; @@ -299,7 +301,7 @@ private void InitializeComponent() this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.pictureBox1.Location = new System.Drawing.Point(690, 62); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(700, 254); + this.pictureBox1.Size = new System.Drawing.Size(720, 254); this.pictureBox1.TabIndex = 1; this.pictureBox1.TabStop = false; // @@ -308,7 +310,7 @@ private void InitializeComponent() this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.textBox1.Location = new System.Drawing.Point(42, 62); - this.textBox1.MaxLength = 0; + this.textBox1.MaxLength = 65536; this.textBox1.Multiline = true; this.textBox1.Name = "textBox1"; this.textBox1.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; @@ -319,14 +321,14 @@ private void InitializeComponent() // Base64Form // this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F); - this.ClientSize = new System.Drawing.Size(1490, 1206); + this.ClientSize = new System.Drawing.Size(1487, 1206); this.Controls.Add(this.skinGroupBox3); this.Controls.Add(this.skinGroupBox2); this.Controls.Add(this.skinGroupBox1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.Name = "Base64Form"; - this.Text = "Base64转换-Developed by Mason"; + this.Text = "Base64转换-Developed by Walle"; this.Load += new System.EventHandler(this.Base64Form_Load); this.skinGroupBox1.ResumeLayout(false); this.skinGroupBox1.PerformLayout(); @@ -347,7 +349,7 @@ private void InitializeComponent() private CCWin.SkinControl.SkinButton skinButton6; private System.Windows.Forms.Button button2; private CCWin.SkinControl.SkinWaterTextBox skinWaterTextBox6; - private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.PictureBox pictureBox1; + private TextBoxE textBox1; } } \ No newline at end of file diff --git a/ModelGenerator/Forms/Base64Form.cs b/ModelGenerator/Forms/Base64Form.cs index 3dc4117..19c5a98 100644 --- a/ModelGenerator/Forms/Base64Form.cs +++ b/ModelGenerator/Forms/Base64Form.cs @@ -8,15 +8,15 @@ *版本号： V1.0.0.0 *唯一标识：4a0b637e-681f-4d9f-b902-4a8a57529b9d *当前的用户域：OCEANIA -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2021/11/8 11:56:31 *描述： * *===================================================================== *修改标记 *修改时间：2021/11/8 11:56:31 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * @@ -43,7 +43,7 @@ public Base64Form() private void Base64Form_Load(object sender, EventArgs e) { - openFileDialog1.Filter = "png files (*.png)|*.png|txt files (*.txt)|*.txt|All files (*.*)|*.*"; + openFileDialog1.Filter = "All files (*.*)|*.*|png files (*.png)|*.png|txt files (*.txt)|*.txt"; openFileDialog1.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Desktop); } @@ -74,6 +74,7 @@ private async void skinButton2_Click(object sender, EventArgs e) private void button2_Click(object sender, EventArgs e) { + openFileDialog1.FilterIndex = 2; if (openFileDialog1.ShowDialog() == System.Windows.Forms.DialogResult.OK) { var filePath = openFileDialog1.FileName; @@ -84,6 +85,7 @@ private void button2_Click(object sender, EventArgs e) private void button3_Click(object sender, EventArgs e) { + openFileDialog1.FilterIndex = 3; if (openFileDialog1.ShowDialog() == System.Windows.Forms.DialogResult.OK) { var filePath = openFileDialog1.FileName; diff --git a/ModelGenerator/Forms/FileClearForm.Designer.cs b/ModelGenerator/Forms/FileClearForm.Designer.cs index 7399e09..c365a89 100644 --- a/ModelGenerator/Forms/FileClearForm.Designer.cs +++ b/ModelGenerator/Forms/FileClearForm.Designer.cs @@ -165,7 +165,7 @@ private void InitializeComponent() this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.MaximizeBox = false; this.Name = "FileClearForm"; - this.Text = "文件清理工具--Devloped by Mason"; + this.Text = "文件清理工具--Devloped by Walle"; this.ResumeLayout(false); this.PerformLayout(); diff --git a/ModelGenerator/Forms/TxtReplaceForm.Designer.cs b/ModelGenerator/Forms/TxtReplaceForm.Designer.cs index 97c52d2..743a271 100644 --- a/ModelGenerator/Forms/TxtReplaceForm.Designer.cs +++ b/ModelGenerator/Forms/TxtReplaceForm.Designer.cs @@ -40,6 +40,7 @@ private void InitializeComponent() this.listBox1 = new System.Windows.Forms.ListBox(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.removeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.label4 = new System.Windows.Forms.Label(); this.textBox4 = new System.Windows.Forms.TextBox(); @@ -49,7 +50,6 @@ private void InitializeComponent() this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.label5 = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripProgressBar1 = new System.Windows.Forms.ToolStripProgressBar(); - this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); this.contextMenuStrip1.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.SuspendLayout(); @@ -148,6 +148,11 @@ private void InitializeComponent() this.removeToolStripMenuItem.Text = "排除此项"; this.removeToolStripMenuItem.Click += new System.EventHandler(this.removeToolStripMenuItem_Click); // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(181, 6); + // // deleteToolStripMenuItem // this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem"; @@ -223,11 +228,6 @@ private void InitializeComponent() this.toolStripProgressBar1.Style = System.Windows.Forms.ProgressBarStyle.Marquee; this.toolStripProgressBar1.Visible = false; // - // toolStripMenuItem2 - // - this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(181, 6); - // // TxtReplaceForm // this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 31F); diff --git a/ModelGenerator/Forms/TxtReplaceForm.cs b/ModelGenerator/Forms/TxtReplaceForm.cs index ca9f44b..2e81150 100644 --- a/ModelGenerator/Forms/TxtReplaceForm.cs +++ b/ModelGenerator/Forms/TxtReplaceForm.cs @@ -75,6 +75,7 @@ private void button2_Click(object sender, EventArgs e) else { label5.Text = $"找不到任何内容,共用时{stopWatch.Elapsed.TotalSeconds}s"; + listBox1.Items.Clear(); } toolStripProgressBar1.Visible = false; button2.Enabled = true; diff --git a/ModelGenerator/Forms/TxtReplaceForm.resx b/ModelGenerator/Forms/TxtReplaceForm.resx index 3d07278..1137ffe 100644 --- a/ModelGenerator/Forms/TxtReplaceForm.resx +++ b/ModelGenerator/Forms/TxtReplaceForm.resx @@ -129,78 +129,294 @@ - AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAABAAABILAAASCwAAAAAAAAAA - AAD///////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ///////////////////////////////////////////////////////////////////+/v////////// - //////////////////////////////////////////////////////////////////////////////// - ///////////////////////////////////////////////////////////////////////////////+ - /f/+/v7///////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////9fz//////v/+/v////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////+6p4//+P7//////f/+/////////////////////v7+//7+/f/+/v7//v7+//// - /////////////////////v7//v7+//7+/v/+/v7///////////////////////7+/v/+/v7///7///// - ///+/v7//v7+///////+/////v7+/7hrBv/EvLH///////79/P/+/////v79//7+/P////////////// - //////3//v7+//7////+/v7//v37/////v////////////////////3//v7+//7+/v/+/v3///////// - /////v7//v79///////////////+//7/////////vWYA/7R7L//i5+7///////39/P///v7//f////Dz - 9f/o6Of/6Ovt//X6/v///////v7+//7+/f//////9fj6/+rq6//n6Oj/6+/0//j9//////////79//3/ - ///t7e3/5+jr//b6/v/9/v//8vb8//P2+v/+/v3/+Pv+//L2/P/Mizz/u2MA/8Wym/////////////Ls - 5P/InWb/unoi/7RtCf+2cRT/t4dI/+Hc1f//////+Pb0/9KvhP+9fy7/tm8O/7NsCf+3dyD/t49Y/+Xg - 2///////0qt5/7dyFP+0awn/toxT/8amff+6eyb/uYpQ//Hx8f/EnFn/q3Ug//Li0P/DawD/vIpF//P6 - ///89er/xIEp/7hiAP+/cQf/zI0v/8mFH/+1XQD/1cSu///////Ol0z/t2AA/71rA//LiSb/zpE2/8Z9 - E/+zVgD/287B/+zRq/+2YQD/v28C/8+PMf/MjC//uWwC/75pAP+9eCT/7+/u/8CGKP+rXwD//////9ia - SP+7bwn/6fH6/+S8hv+5ZQD/vnQL/+rVuv///////v39/968if/t5Nf/7de4/7lmAP+8cgf/5dK5//// - /////v3//P7+/+HHo//z8Oz/2axz/7pmAP+6eyD/6evq///////bsXT/uWUA/71/K//v8PD/wYwt/6tk - AP//////6MCJ/8BpAP/i39z/16FV/7tlAP/Bhzb/9/v//////v/9/v7//v38///////asXb/umcA/714 - Fv/DpXz/xaN2/8Ohcv/HqH//xKeB/+Dc2P/r0q3/tmMA/7lpAv+3iUz/yraf/8eYWP+8aAD/vH4p//Dw - 8P/Biiv/rGMA///////tzJ7/w2kA/+Lc1v/Yolb/vGYA/7uBL//w9fv//////////v/8/Pv//v///9ux - dv+5aAD/vnQJ/8JzCP/AcQH/wXMG/7trBP+2WgD/0LSQ///////nyZ3/zo0u/8N0BP+8aQD/u24D/71u - AP+8fCb/7+/v/8GKK/+rYgD//////+rEjf/AagD/6ejm/+S9if+6ZgD/vHEH/8W0n//w+P//8vT2/9Gt - gf/d1Mf/7ti6/7llAP+5dRb/1NLP//z////q2cL/wHYI/7hoAP/hz7r//////+Lf2//m7PP/8PDu/+zp - 4//PnVT/u2kA/718Kf/x8vH/wYos/69pAP//////26JS/79yCf/w8vX//fft/8WEJP+5ZAD/t2gF/7Z7 - J/+5dRn/slcA/9nIsf//////zZVC/7dhAP+2eir/wJxr/8CBK/+2YAD/yYw7//z////9+fP/vHMa/7Fw - Ff+8jE3/vYY7/7twB/+3XwD/0aRo//7///+6fyD/rGYA//Xq3P/FcAD/xpBI//v/////////9+/i/9ir - af/IiCj/xHoN/8eCHP/VpV7/9e/n///////69e7/2rF1/8iCG/+/cAD/w3oR/9OhV//37+H///////37 - +f/Xpl//yIMc/8N2B//Cdgj/x4Yl/9itbP/89/P//f38/8yiV//Aii3/0plN/7lgAP/bxKb///////38 - +v///v7///////79/P/69/H//fz6/////////////v7+//7+/f///////f37//r07f/7+fX///////7+ - /v/+/v7////////////+/v3/+/fx//r28P/+/fz///////7+/v/+//7///////////+6ZAD/w4U2//j5 - +v////////7+///+/f/+/fz//////////////////v38///+/v////////7+//79/P////////////// - ///+/v3//v79//////////////79///////////////////////+/fz///7+//////////7////+/7xu - Cf/p2sb///////79/P////////////////////7///7+/////v////////////////////////////// - /v///v7///7+///////////////////////////////+///+/v///v7////+//////////////////// - ////////5Mmm///////+/fz//v////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - /////////////////////////v37//////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////39+/////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + AAABAAEAQEEAAAEAIAAwQwAAFgAAACgAAABAAAAAggAAAAEAIAAAAAAAAEEAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAD8/f1E/f7+pf3+/oX8/f1EAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/f7+Gvz+ + /s/9/v71/P39n/z+/nD9/v54/P39+/3+/v/9/v7//P39+/3+/nj8/f1w/f39cP39/d/8/v7P/f7+GgAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD9/v5c8fn82fD5 + /Hrt+Pxm+v39Zv3+/s39/v7//f39//39/f/9/v7//f7+//3+/v/9/v7//f7+//3+/v/9/v7//f39//3+ + /v/9/v7//f39//3+/u/8/f2J7vj8ZvX7/Gb9/v5m/f7+XAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAD9/v4m/f7+7/3+/v/8/f3/+/39//z9/f/9/v7//f7+//3+/v/9/v7//P39//z9/f/9/v7//f7+//3+ + /v/9/v7//f7+//39/f/9/v7//P39//3+/v/9/f3//P39//v9/f/8/f3//f7+//z9/e/4/P1WAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA/f7+2f39/f/9/v7//f39//39/f/8/f3//P39//39/f/9/f3//f7+//39 + /f/9/f3//P39//L59//2+/v//f7+//39/f/9/f3//f7+//39/f/9/f3//P39//z9/f/9/f3//f39//3+ + /v/9/f3//P398/3+/iQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAD5/PwE+/39SP3+/kj9/v5I/P39x/3+/vv9/v7//f39//3+/v/8/f3//P39//L4 + 9P/e69L/xdmg/7HNh/+Tt0n/krQ6/5K0Ov+LsDb/jbI4/5K0Ov+StDr/k7hP/7fQiP/F2J//3+vQ//P4 + 8//8/f3//P39//3+/v/9/v7//f39//z9/f/8/f3f/f7+SP3+/kj9/v5I/P39BAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+vz9dPz9/f/9/f3//f39//39/f/9/f3//f39//3+ + /v/r8uD/ydqj/6bDZv+RtUL/gKkh/3eiDf92oQj/dqAI/3egCP93oAj/d6EI/3ehCP93oAj/d6AI/3eg + CP93oQj/d6IM/4GoH/+StUH/sct//9Titv/s8uD//f39//39/f/9/f3//f39//39/f/9/f3//f39//z9 + /XQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP3+/pX9/v7//f7+//39 + /f/9/f3//f7+//H26//J26f/krQ//3qkEf93oQj/dqEI/3ahCP92oQj/dqEI/3ehCP93oQj/d6EI/3eh + CP93oAj/d6EI/3ehCP93oQj/d6EI/3egCP93oQj/d6EI/3ehCP97pBH/krVC/8ndrf/r8uH//f39//3+ + /v/9/v7//f39//39/f/9/v6VAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/f7+Gvv9 + /Xr9/f3d/f39//39/f/9/f3/9/r2/9Hivf+Vt0n/eKIO/3agCP93oAj/d6AI/3egCP92oAj/dqAI/3eg + CP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3agCP92oAj/d6AI/3egCP93oAj/dqAI/3ag + CP94og3/kLM9/8/jx//3+vX//f39//39/f/9/f3//f393fv9/Xr9/v4GAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAD8/v50/P39o/z9/d/8/f3//P39//z9/f/8/f3/6PHh/6fEbP97pBP/dqAI/3egCP93oAj/dqAI/3eh + CP93oQj/d6EI/3egCP92oQj/dqAI/3egCP92oQj/dqAI/3agCP92oAj/d6AI/3agCP93oAj/d6AI/3ag + CP93oQj/d6EI/3ehCP93oAj/dqEI/3agCP95pyP/psJk/+Dqzv/8/f3//P39//z9/f/8/f3//P39r/z9 + /aP8/f18/f7+BgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAD8/f0i/f394f39/f/9/v7//f7+//z9/f/7/Pv/0uS//4muL/92oAj/d6AI/3eg + CP92oAj/dqAI/3ehCP92oQj/dqAI/3ahCP92oQj/dqEI/3ehCP92oQj/dqAI/3ahCP92oAj/dqAI/3eg + CP93oAj/dqAI/3agCP93oQj/dqEI/3agCP92oQj/dqEI/3ahCP93oQj/dqEI/3ahCP+Iri3/1+nX//j7 + 9//8/f3//f7+//3+/v/9/f3//f7+//3+/joAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/f7+Ovz9/f/9/v7//f7+//z9/f/5/Pr/wtml/3qj + D/92oAj/d6EI/3ehCP93oQj/dqAI/3agCP93oQj/d6EI/3agCP92oAj/d6EI/3ehCP92oAj/dqAI/3eh + CP93oQj/dqAI/3ehCP93oQj/d6EI/3agCP92oAj/d6EI/3ehCP92oAj/dqAI/3ehCP93oQj/dqAI/3ag + CP93oQj/dqEI/3iiDP+tx3D/8/fs//z9/f/8/f3//P39//3+/v/9/v46AAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP3+/jr9/v7//f39//z9 + /f/5/Pv/tdOg/3iiDv93oQj/d6EI/3ehCP93oQj/dqAI/3ehCP93oQj/d6EI/3agCP92oAj/d6EI/3eg + CP92oAj/dqAI/3ehCP93oAj/d6EI/3ehCP93oQj/d6EI/3agCP93oQj/d6EI/3ehCP92oAj/dqAI/3eh + CP93oAj/dqAI/3agCP93oQj/d6AI/3ehCP93oQj/eKEK/7HPj//5/Pr//f39//39/f/9/f3//f7+fgAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/f7+JPz9 + /Xr9/v7d/f7+//3+/v/4/Pr/sM6N/3eiDf93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3eh + CP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3eh + CP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP94og3/stGZ//j7 + +v/9/f3//f7+//z9/f/8/f2d/f7+JAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA+vz9Tvz9/ff9/v7//f7+//z9/f/6/Pv/wNil/3mkEv92oQj/dqEK/3ahCP93oQj/d6EI/3eh + CP93oQj/d6EI/3egCP93oAj/d6AI/3ehCP92oAj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/dqEI/3ah + CP92oQj/dqEI/3ehCP93oAj/d6AI/3egCP93oQj/dqAI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3eh + CP93oQj/d6EI/3mjEf/F2aX/+vz6//3+/v/9/v7//f7+//z9/ff7/f1OAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPz9/cv9/f3//f7+//3+/v/7/f3/0OG4/3+mF/92oQj/dqEJ/3ag + CP92oAj/dqEI/3ehCP92oQj/d6EI/3ehCP93oQj/dqEI/3ehCP93oQj/d6EI/3ahCP93oQj/d6EI/3eh + CP92oAj/d6AI/3WhCf92oQj/dqEI/3ahCP93oQj/d6EI/3ahCP93oQj/d6EI/3ehCP92oQj/d6EI/3eh + CP93oQj/dqAI/3egCP93oQj/d6EI/3ahCP92oQn/fqYX/8/ht//8/f3//f7+//3+/v/9/v7//f39ywAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8/f3X/f7+//39/f/9/v7/5e/b/4qx + Of92oQj/dqAI/3agCP93oQj/d6AI/3egCP93oQj/d6AI/3egCP93oQj/d6AI/3ehCP93oAj/d6EI/3eg + CP93oQj/d6EI/3agCP93oAj/d6EI/3egCP92oAj/dqEI/3egCP93oAj/d6EI/3egCP93oQj/d6AI/3eh + CP93oAj/d6EI/3ehCP92oAj/d6AI/3ehCP93oAj/d6AI/3ehCP92oAj/dqAI/3ahCP+Nsjr/5/Df//39 + /f/9/v7//f7+//z+/tcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4+/0c/P394/39 + /f/8/f3/9vn1/6XDa/93oQj/dqEI/3ahCP92oQj/d6EI/3ehCP93oAj/d6EI/3ehCP93oQj/d6EI/3eh + CP93oQj/dqEI/3agCP93oQj/d6EI/3ehCP93oQj/dqEI/3ehCP93oQj/d6AI/3ehCP93oQj/d6EI/3eh + CP93oQj/d6EI/3ahCP92oAj/d6EI/3ehCP93oQj/d6EI/3ahCP93oQj/d6EI/3egCP93oQj/dqEI/3ah + CP92oQj/daEM/6TFd//1+fX//P39//39/f/8/f3j+v39HAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAD9/f0c/P39zfz9/f/8/f3//P39/87fsP97pRb/d6EI/3ehCP93oQj/dqEI/3agCP93oQj/d6EI/3eh + CP93oQj/d6EI/3ehCP93oQj/d6AI/3agCP92oAj/d6EI/3ehCP93oQj/d6EI/3ahCP92oAj/d6EI/3eh + CP93oQj/d6EI/3ehCP93oQj/d6EI/3egCP92oAj/dqAI/3ehCP93oQj/d6EI/3ehCP92oQj/dqAI/3eh + CP93oQj/d6EI/3ehCP93oQj/dqEI/3ShEP97pRn/zN+2//z9/f/8/f3//P39//z9/c39/f0cAAAAAAAA + AAAAAAAAAAAAAAAAAAD9/f0a/f39zf3+/v/9/f3//f39//D27P+Ut0X/d6AI/3ehCP92oQj/dqAI/3eg + CP93oAj/d6EI/3ehCP93oAj/d6AI/3egCP93oQj/d6EI/3ehCP93oAj/d6AI/3egCP93oQj/dqEI/3ag + CP93oAj/d6AI/3ehCP93oQj/d6AI/3egCP93oAj/d6EI/3ehCP93oQj/d6AI/3egCP93oAj/d6EI/3ah + CP92oAj/d6AI/3egCP93oQj/d6EI/3egCP93oAj/d6AI/3ahCP91oQr/daEL/5G4Uf/w9u///f39//39 + /f/9/f3//f7+2f3+/lAAAAAAAAAAAAAAAAAAAAAA/f7+r/3+/v/9/f3//f39//z9/f/F2qX/eaMP/3eh + CP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oAj/d6EI/3ehCP93oQj/d6EI/3egCP93oQj/d6EI/3eh + CP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6AI/3ehCP93oQj/d6EI/3ehCP93oAj/d6EI/3ah + CP92oQj/dqEI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3egCP93oQj/d6EI/3ehCP93oQj/d6AI/3Wh + DP94oxP/xNig//v9+//9/v7//f7+//39/f/9/v7JAAAAAAAAAAAAAAAAAAAAAPz+/mr9/f3//P39//z9 + /f/z+PL/lLdI/3egCP92oAj/dqAI/3egCP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3ag + CP92oAj/d6AI/3egCP93oAj/dqAI/3agCP93oAj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3eh + CP92oAj/dqAI/3egCP92oAj/dqAI/3agCP92oAj/d6AI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3eh + CP93oQj/dqAI/3agCP93oAj/d6AI/42xNv/q8d7//P39//z9/f/9/f3//f39lQAAAAAAAAAAAAAAAAAA + AAD8/v5q/P39//z9/f/8/f3/0uO9/3ulGP92oQj/dqEI/3agCP92oQj/dqAI/3egCP92oQj/dqAI/3ag + CP92oAj/dqAI/3agCP93oAj/dqAI/3agCP92oQj/dqEI/3ahCP92oAj/dqEI/3agCP92oAj/dqEI/3ag + CP92oAj/dqAI/3egCP92oAj/d6AI/3egCP92oAj/d6EI/3ahCP92oQj/d6AI/3ahCP92oAj/d6AI/3ah + CP92oAj/dqAI/3agCP92oAn/dqAI/3agCP92oAj/dqAI/3ehCP96oxD/wdWW//z9/f/8/f3//P39//z+ + /moAAAAAAAAAAAAAAAAAAAAA/f7+av3+/v/9/v7//P39/6fEbf92oQj/dqAJ/3ahCf92oQj/d6EL/4Gr + KP+Gri//hq4v/4CqJf92oQn/dqAI/3agCP92oAj/dqAI/32mGf+FrS7/hq4v/4WuNv95pRr/dqEI/3ah + CP92oQj/dqEI/3agCP92oQj/dqAI/3ehCP94ogz/fqgj/4iuLf+Lri3/iK4u/4auL/+Gri//hq0u/32m + GP92oQj/fKUV/4auL/+Gri//gaon/3agCP92oAr/dqAI/3egCP92oAj/dqAI/3ahCP92oQj/dqAI/6C+ + V//8/f3//f7+//3+/v/9/v52AAAAAAAAAAAAAAAA/f39BPz+/rX9/f3//P39/+716v+JrzD/dqEJ/3ag + CP92oAj/dqEI/32nHv/U6dX/8fjy//H48v/X69r/facd/3ehCP93oQj/d6EI/3ahCP+lxnf/7vbv//H4 + 8v/u9vD/pch//3ahCP93oQj/dqAI/3agCP92oQj/d6EI/3ahCP+HsT3/t9Oc/9fq2//y9/H/9/ry//P4 + 8v/x+PL/8fjy/+/37v+pxGj/d6EI/6LAW//x+PL/8fjy/8fhx/92oAj/daEK/3ahCP93oQj/dqAI/3ag + CP92oQn/dqEI/3agCP+HrS3/7fXs//3+/v/8/f3//P397/39/QQAAAAAAAAAAP3+/rf9/f3//P39//39 + /f/X5sb/faYY/3WgCv92oAj/d6EI/3agCP+Ot1L/8/n2//7+/v/+/v7/+Pv5/4axQP93oQj/d6EI/3ag + CP95oxP/wt24//3+/v/+/v7//v7+/8bdtP93oxb/dqAI/3agCP93oQj/d6AI/3ahCP+IsUD/5PDj//7+ + /v/+/v7//v7+//3+/v/8/f3//P38//z9/P/6/Pn/rcZt/3agCP+mwl///v7+//7+/v/M5ND/dqEJ/3Sh + Df92oQn/dqAI/3ehCP93oQj/d6EI/3agCP92oAj/faYW/9rnxv/8/f3//P39//39/f/9/v63AAAAAAAA + AAD9/f33/f7+//3+/v/9/f3/u9GJ/3ahCP91oQv/daEL/3ahCP93og//r8+S//7+/v////////////7+ + /v+uzpD/dqEJ/3ehCP93oQj/fagh/+Lu2v/////////////////q8+j/ha41/3ehCP93oQj/d6EI/3ah + CP95qjf/6vTq//7+/v/+/v7/8fj2/8jds/+w0Z3/lsF3/5C9av+QvWr/kL1p/4GsMf93oQj/psJf//// + ///+/v7/y+TP/3ahCP92oQj/dqEJ/3ahCf92oQj/dqEI/3ahCP92oQn/dqEJ/3ehCv+40In//f7+//39 + /f/9/f3//P39+/r8+UAAAAAA/f7+9/3+/v/9/v7//f7+/6DCb/92oAn/dqAJ/3ahCf92oAj/fKce/9jp + 0f/+/v7/8fj1/+328f//////yuHB/3qkFf93oQj/d6EI/5m+Yf/1+vf//f7+/+T09f/7/f3/+fz7/6HF + ev93oQj/d6EI/3ahCP90oRL/pcmI//7+/v//////6fTu/4u1Sv95og//d6EK/3ehCf93oQn/d6EJ/3eh + Cf93oQj/d6EI/6bCX////////v7+/8vkz/93oQj/d6EI/3ahCf92oQn/dqEJ/3agCP91oAr/dqAJ/3ah + CP92oAj/n8Bk//v9/P/9/v7//f7+//3+/vcAAAAAAAAAAO/5/Pf9/v7//f39//3+/v+MsDb/dqEI/3ah + CP92oQj/dqEI/422Tv/z+ff//f7+/8fgv//H3rX//v7+/+nz6f9/qin/dqEI/3eiDP+x0Zj//P39/+/2 + 7/+gx4X/8Pfv//7+/v+82Kv/eKMR/3ehCP91oQv/eKMS/9Tq3P///////////73Ypf95oxD/d6EI/3eh + CP92oQj/d6EI/3ehCP93oQj/dqEI/3ehCP+mwl////////7+/v/L5M//d6EI/3ehCP92oQj/d6EI/3eh + CP92oQj/dqEJ/3ahCP93oQj/d6EI/4uwMf/6/Pn//f7+//3+/v/4/P33AAAAAAAAAADv+fz3/f7+//39 + /f/0+vn/iK4u/3ahCP93oAj/d6EI/3iiD/+szZD//v7+//r8+v+ixXX/msBq//v9/P/6/Pz/msBq/3eg + CP94pBb/0eXH//7+/v/b69T/ga43/9bnzP/+/v7/4O7c/3+rLP92oAj/dqAI/3elGv/l8uj///////// + //+u18H/jLZR/4uyPf+Lsj3/i7I9/4uyPf+Lsj3/i7I9/3+oHf93oQj/psJf//7+/v/+/v7/1unY/5O0 + O/+TtDv/k7Q7/5O0O/+TtDv/kLM7/42yO/+Rszv/f6gf/3egCP+HrSv/8fj1//z9/f/8/f3/+vz99wAA + AAAAAAAA/f7+9/39/f/9/f3/3+zX/36oHv93oQj/dqEI/3agCP97pRf/z+G8///////t9er/gq42/4aw + O//t9vH//////7TSmf94og3/irI//+nz6v/9/v3/ttOa/3mkFP+41aH//P39//X6+P+bwGj/dqEI/3ah + CP95rUL/7/j3///////+/v7/9vv9//H38P/w9uz/8Pbs//D27P/w9uz/8Pbs/+716P+ow2X/d6EI/6bC + X////////v7+//r8+//09+v/9Pfr//T36//09+v/9Pfr//L36//x9uv/7PTq/57Cb/93oQj/f6kk/+Dv + 5P/9/f3//f39//3+/vcAAAAA/f7+if3+/v38/f3//P39/9zoxf99phX/dqEI/3ahCP92oQj/g6wq/+Pt + 1v/+/v7/1unZ/3ejEv94oxH/1ufO//7+/v/f7Nn/fKYd/57Cbv/5/Pn/9/v5/5/Baf92oQj/mLxa//T5 + 9f/9/v7/vtmu/3ijEP92oAj/fKw5//D39P/+/v7//v7+//v9/v/4+/n/9fnz//X58//2+vj/9fr4//X6 + +P/z+fT/qsVq/3ehCP+mwl///v7+//7+/v/+/v7/+/3+//v9/v/7/f7/+/3+//v9/v/7/f7/+/3+//P6 + /f+bw3j/dqEI/3ymF//a6Mn//P39//z9/f/8/v79+/39zf3+/v/8/v7//f7+//3+/v/c6MX/faUV/3ah + CP92oQj/d6EJ/5q8V//09+3/+/38/67Plv92oQv/d6EK/7HRmv/+/v7/8vj1/4y2Uf/H3rb//v7+/+by + 5f+ErTL/d6EI/4GsMP/g7tz//v7+/+Dt2f99qCL/d6EI/3mjEf/l8eb//v7+//7+/v+04uz/mMaM/5a6 + VP+Xu1j/mcFy/5jBcf+YwXH/l8Fw/4SuNP93oQj/o8Ff//z+/v/+/v7/5PLs/7TUov+11KL/tdSi/7XU + ov+11KL/tNSi/7TUov+y06D/hrNK/3ahCf98pRP/2ebA//39/f/9/f3//P7+//3+/v/8/f3l/P39//3+ + /v/9/v7/3OjF/32mFf93oQj/dqEI/3mjEf+905L//v7+//T58/+Nt1b/d6EI/3ehCP+Vu1v/+v38//7+ + //+q0qj/4e/h//7+/v/M4sL/fKYb/3ahCP94oxT/yOC8//7+/v/z+PP/lrtZ/3ehCP95ow//2Ovc//7+ + /v//////k8aV/3KhE/92oQj/d6EI/3ehCP92oQj/dqEI/3ehCP93oQj/d6EI/5W8W//z+vz//v7+/9Hm + z/93oQj/d6EI/3ehCP93oQj/dqEI/3ahCP92oQj/dqEI/3ahCP93oQj/fKUV/9rnxf/9/f3//f7+//z9 + /f/8/f3l/P39KPz9/fn9/f3//f39/93r0f9+pxv/d6AI/3egCP+KsTn/5vHh//7+/v/g7uD/e6cg/3eh + CP92oQj/eaYh/+nz5//+/v7/7/n8//z9/v/9/v7/rc2K/3ehC/93oAj/d6EJ/6TGdv/8/f3/+/38/7jU + nv92oQj/d6EK/67Okf/+/v7//////7jRjv96pBP/d6EI/3agCP93oAj/d6AI/3egCP92oAj/dqAI/3eg + CP+Crjb/5vHm//7+/v/j79//fKci/3ehCf92oQj/d6EI/3agCP92oAj/d6AI/3egCP93oAj/dqAI/36o + Iv/e7uH//f39//39/f/8/f35/P39KAAAAADz+v33/f7+//3+/v/w+Pb/hq0s/3ahCP92oQj/oMR0//b7 + +P/9/v7/vtil/3ehC/93oQj/dqEI/3ahDf/L48r//v7+//7+/v/+/v7/9fr1/5G5WP93oQn/d6EI/3eh + CP+Js0L/6PLn//7+/v/b6tH/eaUZ/3ehCP+Crjf/7fXs//7+/v/x9un/vdWa/4+2TP+Psjb/kLI2/5Cy + Nv+Qsjb/kLI1/4GoG/92oQj/eqQV/8ziwP/+/v7//P38/8nfuf+Tu17/irE4/5CyNv+Qsjb/kLI2/5Cy + Nv+PsTb/fqcd/3ehCP+FrCr/7vfz//3+/v/9/v7//f7+owAAAAAAAAAA6vj89/39/f/9/v7//P39/4yw + MP93oAj/eKMU/8Tcr//+/v7/9fr2/53Dcv92oQj/dqEI/3egCP93oAj/qMh8//z9/f///////v7+/+Pw + 4v+DrCr/d6AI/3ehCP93oAj/facb/9Llx///////8/n0/5K4Uf93oAj/d6AI/6HHf//0+vf//v7+//3+ + /v/2+vX/9/ny//f58v/3+fL/9/ny//X47v+rxWj/d6EI/3ehCP+LtUn/6fPq//7+/v/+/v7/9/v4//b5 + 8v/3+fL/9/ny//f58v/3+fL/7/bx/5/Dc/93oAj/i68v//r8+f/9/v7//f39//z9/X4AAAAAAAAAAP3+ + /vf9/f3//P39//z9/f+Yu1n/d6EI/4evNv/n8uX//f7+/+fy5v+DrTL/dqAI/3ahCP93oQj/dqAI/4iz + R//v9/D//P37//3+/f++2Kb/eKMQ/3ehCP92oQj/dqEI/3ehCv+oy4f//f7+//v9/P+y0pr/d6EI/3ag + CP95oxP/n8R2/+Hv4//6/Pr/+/38//3+/v/9/v7//f7+//3+/v/7/fv/rcZs/3agCP92oAj/d6IO/5C3 + UP/P48T/9fr4//v9+//7/fz//f7+//3+/v/9/v7//f7+//T7/f+hxXj/dqEI/5a7Wf/7/Pv//P39//3+ + /v/7/f33AAAAAPj8/UD8/f37/f39//z9/f/9/f3/utCI/3ahCP+Brjn/rtCb/7TUo/+exXv/d6IP/3ag + CP93oQj/d6AI/3ehCP94pBj/osV3/5/AZf+uz5L/kLpb/3ehCf93oQj/dqAI/3agCP93oQj/hbA//7DS + n/+01KP/nMN3/3egCP93oQj/d6EI/3ehCP+DrC3/j7hT/5zEfv+y06H/tNSj/7TUo/+01KP/ttSh/420 + SP92oAj/dqAI/3ehCP93oQj/eKQX/42yPf+Qu17/lsFy/7LSn/+01KP/tNSj/7TUo/+v0qD/h7NG/3ah + CP+2zoL//P39//z9/f/9/f3//f399wAAAAAAAAAA/f7+t/3+/v/9/v7//f39/9HivP98pRX/d6EI/3eh + CP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3eh + CP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3eh + CP93oQj/d6EI/3ehCP92oQj/dqEI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3eh + CP93oQj/d6EI/3ahCP98pRT/0eK8//3+/v/9/f3//f39//3+/rcAAAAAAAAAAP3+/gT8/v61/f7+//3+ + /v/q8uL/hqwq/3ehCP93oQj/d6EI/3ehCP92oQj/dqEI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3ah + CP92oQj/dqEI/3ehCP93oQj/d6EI/3ehCP93oQj/dqEI/3ahCP93oQj/d6EI/3ehCP93oQj/d6EI/3eh + CP92oQj/dqEI/3ahCP93oQj/d6EI/3ehCP93oQj/d6EI/3ahCP92oQj/d6EI/3ehCP93oQj/d6EI/3eh + CP93oQj/dqEI/3ahCP92oQj/d6EI/3ehCP93oQj/hawo/+ny5P/9/v7//f7+//z+/rX9/v4EAAAAAAAA + AAAAAAAA/P7+av3+/v/8/f3//P39/6DAYP92oAj/dqAI/3ehCP93oAj/dqAI/3ehCP92oAj/dqAI/3eg + CP93oAj/dqAI/3agCP93oQj/dqAI/3egCP93oQj/dqAI/3agCP93oQj/d6AI/3agCP93oQj/dqAI/3ag + CP93oAj/d6AI/3agCP92oAj/d6EI/3agCP93oAj/d6EI/3agCP92oAj/d6EI/3egCP92oAj/d6EI/3ag + CP92oAj/d6AI/3egCP92oAj/dqAI/3ehCP92oAj/d6AI/3ehCP92oAj/dqAI/6DAX//8/f3//P39//3+ + /v/8/v5qAAAAAAAAAAAAAAAAAAAAAP3+/mr9/v7//f7+//z+/v/N3rH/eqQT/3ehCP93oAj/d6EI/3eh + CP92oAj/d6AI/3ahCP92oAj/dqAI/3ehCP93oAj/dqAI/3ehCP92oAj/d6EI/3ehCP93oQj/d6AI/3eh + CP93oQj/dqAI/3egCP92oQj/dqAI/3agCP93oQj/d6AI/3agCP93oQj/dqAI/3ehCP93oQj/d6EI/3eg + CP93oQj/d6EI/3agCP93oAj/dqEI/3agCP92oAj/d6EI/3egCP92oAj/d6EI/3agCP93oQj/d6EI/3uk + E//N37L//f7+//3+/v/8/f3//f7+agAAAAAAAAAAAAAAAAAAAAD8/v5q/f39//3+/v/9/f3/7vXq/46y + N/92oAj/d6EI/3ehCP93oQj/d6EI/3ahCP93oQj/d6EI/3egCP93oQj/d6EI/3ehCP93oQj/d6EI/3eh + CP92oQj/dqAI/3ehCP93oQj/d6EI/3ehCP92oQj/d6EI/3ehCP93oAj/d6EI/3ehCP93oQj/d6EI/3eh + CP93oQj/dqEI/3agCP93oQj/d6EI/3ehCP93oQj/dqEI/3ehCP93oQj/d6AI/3ehCP93oQj/d6EI/3eh + CP93oQj/d6EI/3ahCP+MsDT/7vXq//39/f/9/v7//f39//z+/moAAAAAAAAAAAAAAAAAAAAA/f7+avz9 + /f/9/v7//f7+//z9/f++1Zr/eKIN/3ehCP93oQj/d6EI/3agCP92oAj/dqAI/3agCP92oAj/dqEI/3ah + CP92oAj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP92oAj/dqAI/3agCP92oAj/dqAI/3ah + CP92oQj/dqAI/3ehCP93oQj/d6EI/3ehCP93oQj/dqEI/3ahCf92oQj/dqAI/3agCP92oAj/dqAI/3ag + CP92oQj/dqEI/3agCP93oQj/d6EI/3ehCP94ogz/vdSV//z9/f/9/v7//P7+//z9/f/9/v7VAAAAAAAA + AAAAAAAAAAAAAP3+/lD9/v75/f39//39/f/9/v7/6vLi/4yxNv93oQj/d6EI/3ehCP93oQj/d6EI/3ah + CP93oQj/d6EI/3agCP93oQj/d6EI/3ehCP93oAj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3eh + CP92oQj/d6EI/3ehCP92oAj/d6EI/3ehCP93oQj/d6AI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3eh + CP93oQj/dqEI/3ehCP93oQj/dqAI/3ehCP93oQj/d6EI/3egCP93oQj/iq8z/+jx4P/9/v7//f7+//3+ + /v/8/f3/+v39iwAAAAAAAAAAAAAAAAAAAAAAAAAA9fr8dPv9/c39/f33/f7+//z9/f/E2J//eaMQ/3eh + CP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP92oQj/dqEI/3eh + CP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/dqEI/3ah + CP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/eaMP/8HW + mv/7/f3//f7+//3+/v/8/f3f9/v5evH5/B4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/P391/z9 + /f/8/f3/8vfv/5y9WP92oAj/d6AI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/dqAI/3ag + CP93oAj/d6AI/3egCP92oAj/dqAI/3egCP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3ag + CP92oAj/d6AI/3egCP93oAj/dqAI/3agCP93oAj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3eh + CP92oAj/dqAI/5m6Uf/x9u7//P39//z9/f/8/f3j/f7+HAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAPz9/df9/v7//f7+//3+/v/c6c3/hKso/3ahCP92oQj/d6AI/3ahCP92oQj/dqEI/3ah + CP93oQj/dqEI/3ehCP93oAj/d6EI/3ehCP93oQj/dqEI/3ehCP92oQj/dqEI/3egCP92oQj/dqEI/3ah + CP92oQj/d6EI/3ahCP93oQj/d6AI/3ehCP93oQj/d6EI/3ahCP93oQj/dqEI/3ahCP93oAj/dqEI/3ah + CP92oQj/dqEI/3ehCP92oQj/d6EI/4OqJf/Z5sX//f7+//3+/v/9/v7//P391wAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD8/f2H/f7+//39/f/9/v7/+/39/8Tapv96ow3/d6EI/3eh + CP93oQj/dqEI/3egCP92oQj/d6EI/3ahCP93oQj/dqEI/3ehCP92oQj/d6EI/3agCP93oQj/d6EI/3eh + CP93oQj/d6EI/3ahCP93oAj/dqEI/3ehCP92oQj/d6EI/3ahCP93oQj/dqEI/3ehCP92oAj/d6EI/3eh + CP93oQj/d6EI/3ehCP92oQj/d6AI/3ahCP93oQj/dqEI/3miDf/A157/+v39//39/f/9/v7//P39//3+ + /ssAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/f7+Tv3+/vf8/v7//P39//3+ + /v/5+/j/tc+M/3ehC/93oQj/d6EI/3egCP92oAj/d6EI/3ehCP93oQj/dqEI/3ehCP93oQj/dqEI/3eh + CP93oQj/d6EI/3egCP93oAj/d6EI/3ehCP93oAj/dqAI/3ehCP93oQj/d6EI/3ahCP93oQj/d6EI/3ah + CP93oQj/d6EI/3ehCP93oAj/d6AI/3ehCP93oQj/d6AI/3agCP93oQj/d6EI/3ehCv+vzIX/9/v4//3+ + /v/8/v7//P39//z9/f39/v5OAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAD9/f0k/P39nf3+/v/8/f3//f7+//X69/+ixHT/dqEI/3agCP92oQj/d6EI/3ehCP92oQj/dqAI/3ah + CP93oQj/d6EI/3egCP92oQj/dqAI/3egCP93oQj/d6EI/3ehCP92oAj/dqEI/3ehCP93oQj/dqEI/3ag + CP92oQj/d6EI/3ehCP93oAj/dqEI/3agCP93oAj/d6EI/3ehCP93oQj/dqAI/3ahCP93oQj/d6EI/3ah + CP+fw3D/9Pn2//z+/v/9/v7//f7+//z9/Z38/f1iAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD9/v5+/f39//3+/v/9/v7/8/jy/6fIgP93oQr/d6EI/3eh + CP92oQj/d6EI/3ahCP93oQj/dqEI/3ahCP93oQj/dqEI/3ahCP93oQj/dqEI/3ahCP92oQj/dqEI/3eh + CP93oQj/dqEI/3ehCP92oQj/d6EI/3ahCP92oQj/d6EI/3ahCP92oQj/d6EI/3ahCP92oQj/dqEI/3ah + CP92oQr/dqEI/3ehCf+fwm7/8vfu//3+/v/9/v7//f7+//3+/n4AAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/P39Ov3+/v/9/v7//f7+//z9 + /f/1+vf/sMyE/3iiC/93oQj/d6EI/3ehCP92oQj/dqEI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3eg + CP93oQj/dqEI/3ehCP93oQj/d6EI/3ehCP93oQj/dqEI/3ahCP93oQj/d6EI/3ehCP93oQj/d6EI/3eh + CP93oAj/d6EI/3ahCP92oQj/dqEI/3ehCf+dvVf/8vjy//z9/f/9/v7//P7+//3+/v/8/f06AAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP39 + /Tr8/v7//P39//z9/f/9/v7//P39//n7+P/A1pz/gakf/3ahCP93oAj/d6EI/3ahCP93oQj/d6EI/3ag + CP92oAj/d6EI/3ehCP92oQj/d6EI/3egCP92oQj/d6EI/3ehCP92oQj/d6AI/3ehCP92oQj/d6EI/3eh + CP92oAj/dqAI/3ehCP93oQj/dqEI/3ehCP93oAj/dqEI/4CoHP/A16P/8vbr//z9/f/8/v7//P39//z9 + /f/8/v7//f39OgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAD8/v4G/f7+j/3+/v/9/v7//f7+//z9/f/9/v7//P39/9royf+WuEr/eKIN/3eg + CP93oQj/d6AI/3ehCP93oAj/d6EI/3ehCP93oQj/d6EI/3egCP93oQj/d6EI/3ehCP93oQj/d6EI/3eg + CP93oAj/d6EI/3egCP93oQj/d6AI/3ehCP93oQj/d6EI/3ehCP93oAj/eKIM/5W3R//Y5sb/+/39//3+ + /v/9/v7//f7+//3+/v/8/fz//P38j/z+/gYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP3+/gj9/f0o/f7+KPz9/YP8/f3//f7+//3+ + /v/8/f3/8vfv/73Ul/+HrS3/d6EK/3ehCP93oQj/dqAI/3ahCP93oQj/d6EI/3ehCP93oQj/dqEI/3eh + CP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3agCP92oQj/d6EI/3ehCP93oQr/hq0s/73U + mf/x9+///P39//3+/v/9/v7//P39//z9/YP9/f0o+vz5KPX48AgAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAD8/f0E/P39qf3+/v/8/v7//P7+//3+/v/7/fz/6fHe/7bOhf+KsDX/eaIO/3ahCP93oQj/d6EI/3ah + CP93oAj/d6EI/3ehCP93oQj/d6EI/3ehCP93oQj/d6EI/3ehCP93oAj/d6AI/3egCP93oQj/dqEI/3mi + Df+IrzL/tc6H/+fw3P/7/fz//f7+//z+/v/8/v7//f7+//z9/an8/f0EAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPz9/XT8/f3//f7+//3+/v/9/v7//f7+//39/f/7/Pv/7PTn/8fa + pf+evl3/hKsn/3iiDP93oQj/d6EI/3ahCP92oAj/dqEI/3ehCP93oQj/dqEI/3ahCP92oAj/dqEJ/3ah + C/94og3/hKso/5+/W//J26X/6/Lk//v8+//9/v7//f7+//z+/v/9/v7//f7+//z9/f/8/f10AAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD7/PwE/P39kf3+/s39/v7N/f7+4/39 + /f/8/f3//P7+//39/f/8/f3/9/r2/+fw3f/Q4bj/sMt9/6DAYv+KsDX/ia4q/4mtKv+Dqib/hawo/4mu + Kv+Grzj/ibZX/6PEdP+tzIr/0uK5/+fw3v/3+vb//P39//39/f/8/f3//f7+//3+/vv9/v7N/f7+zf3+ + /s38/f2R+/z8BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAPz9/ST8/f3f/f7+//3+/v/9/f3//f7+//z9/f/9/f3//f7+//z9/f/4+/v/8PXq/+/1 + 5v/v9eb/5fDf/+ny4//v9eb/7/Xq/+/49v/6/f3//f39//3+/v/8/f3//f39//3+/v/8/f3//f7+//3+ + /v/8/v7ZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/P39Xvz9/f39/v7//f7+//3+/v/9/f3//f39//3+ + /v/9/v7//f7+//3+/v/8/f3//f7+//3+/v/9/f3//f7+//39/f/9/v7//f7+//3+/v/9/v7//f39//39 + /f/9/v7//f7+//3+/v/9/v79/P7+XgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2+/zV/P39dv3+ + /mbv+PyN8fn86/3+/vn9/v7//f7+//3+/v/9/v7//f7+//3+/v/9/v7//f7+//z9/f/9/v7//f7+//3+ + /v/9/v7//f7+//v8++/6/PmJ/f39Zv3+/mb9/v67/P39jwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD9/v5w/P39/fz+/vn8/f2f/f7+cPz9/b39/v77/P39//3+ + /v/9/v77/P39vf3+/nD9/v6f/f7++f3+/v39/v44AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPz9/Vb9/f0oAAAAAAAA + AAAAAAAA/f7+SPz+/v/9/v7//f7+SAAAAAAAAAAAAAAAAP3+/ij9/v5WAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////5/////////jDn///////cAAH//////4AAAB//////AAAAD + /////4AAAAH////8AAAAAD////gAAAAAH///+AAAAAAf///AAAAAAAP//4AAAAAAAf//gAAAAAAB//+A + AAAAAAH//wAAAAAAAH/8AAAAAAAAP/gAAAAAAAAf+AAAAAAAAB/4AAAAAAAAH/AAAAAAAAAP4AAAAAAA + AAfAAAAAAAAAA+AAAAAAAAAD4AAAAAAAAAfgAAAAAAAAB8AAAAAAAAADgAAAAAAAAAGAAAAAAAAAAYAA + AAAAAAABgAAAAAAAAAGAAAAAAAAAAYAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAA + AAGAAAAAAAAAAYAAAAAAAAADgAAAAAAAAAGAAAAAAAAAAYAAAAAAAAABwAAAAAAAAAPgAAAAAAAAB+AA + AAAAAAAH4AAAAAAAAAfgAAAAAAAAA+AAAAAAAAAD8AAAAAAAAA/4AAAAAAAAH/gAAAAAAAAf+AAAAAAA + AB/8AAAAAAAAP/4AAAAAAAB//4AAAAAAAf//gAAAAAAB//+AAAAAAAH//4AAAAAAAf//8AAAAAAP///4 + AAAAAB////wAAAAAP////AAAAAA/////wAAAA//////gAAAH/////+wAAGf//////4gR/////////n// + //8= \ No newline at end of file diff --git a/ModelGenerator/Model/CollectInfo.cs b/ModelGenerator/Model/CollectInfo.cs index c21d002..4eb9ce4 100644 --- a/ModelGenerator/Model/CollectInfo.cs +++ b/ModelGenerator/Model/CollectInfo.cs @@ -8,15 +8,15 @@ *版本号： V1.0.0.0 *唯一标识：6e4af0f9-87eb-4611-b640-6a55bf2ec47a *当前的用户域：OCEANIA -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2021/8/19 17:01:29 *描述： * *===================================================================== *修改标记 *修改时间：2021/8/19 17:01:29 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * diff --git a/ModelGenerator/Model/ConnectionInfo.cs b/ModelGenerator/Model/ConnectionInfo.cs index eb75780..5a5de19 100644 --- a/ModelGenerator/Model/ConnectionInfo.cs +++ b/ModelGenerator/Model/ConnectionInfo.cs @@ -8,15 +8,15 @@ *版本号： V1.0.0.0 *唯一标识：ca80519f-e1d5-4070-b3ba-1fa7b0fba364 *当前的用户域：OCEANIA -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2021/7/23 11:28:55 *描述： * *===================================================================== *修改标记 *修改时间：2021/7/23 11:28:55 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * diff --git a/ModelGenerator/Model/DataSyncConfig.cs b/ModelGenerator/Model/DataSyncConfig.cs index 797b61e..ebdae45 100644 --- a/ModelGenerator/Model/DataSyncConfig.cs +++ b/ModelGenerator/Model/DataSyncConfig.cs @@ -8,15 +8,15 @@ *版本号： V1.0.0.0 *唯一标识：81377ac9-4323-4407-8610-ba4a23d21581 *当前的用户域：OCEANIA -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2021/7/19 14:12:02 *描述： * *===================================================================== *修改标记 *修改时间：2021/7/19 14:12:02 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * diff --git a/ModelGenerator/Model/DatabaseObject.cs b/ModelGenerator/Model/DatabaseObject.cs index a785238..1a38154 100644 --- a/ModelGenerator/Model/DatabaseObject.cs +++ b/ModelGenerator/Model/DatabaseObject.cs @@ -8,15 +8,15 @@ *版本号： V1.0.0.0 *唯一标识：838fd268-a417-4725-aa94-cb707dfbe478 *当前的用户域：OCEANIA -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2021/7/19 13:32:01 *描述： * *===================================================================== *修改标记 *修改时间：2021/7/19 13:32:01 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * diff --git a/ModelGenerator/Model/LogInfo.cs b/ModelGenerator/Model/LogInfo.cs index 7820701..84705b2 100644 --- a/ModelGenerator/Model/LogInfo.cs +++ b/ModelGenerator/Model/LogInfo.cs @@ -8,15 +8,15 @@ *版本号： V1.0.0.0 *唯一标识：f7f7aabb-0401-486d-9457-a29c20ad3c20 *当前的用户域：OCEANIA -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2022/4/14 21:42:57 *描述： * *===================================================================== *修改标记 *修改时间：2022/4/14 21:42:57 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * diff --git a/ModelGenerator/Model/SqlWord.cs b/ModelGenerator/Model/SqlWord.cs index 548d75d..b464d76 100644 --- a/ModelGenerator/Model/SqlWord.cs +++ b/ModelGenerator/Model/SqlWord.cs @@ -8,15 +8,15 @@ *版本号： V1.0.0.0 *唯一标识：b8d23148-cfc1-4afc-b8e3-5f67dec79264 *当前的用户域：OCEANIA -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2021/7/19 13:38:04 *描述： * *===================================================================== *修改标记 *修改时间：2021/7/19 13:38:04 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * diff --git a/ModelGenerator/Model/TemplateData.cs b/ModelGenerator/Model/TemplateData.cs index e04de4b..68bd8c5 100644 --- a/ModelGenerator/Model/TemplateData.cs +++ b/ModelGenerator/Model/TemplateData.cs @@ -8,15 +8,15 @@ *版本号： V1.0.0.0 *唯一标识：e6a24f69-1486-4661-b2ce-16ca177d337d *当前的用户域：OCEANIA -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2021/7/13 10:27:39 *描述： * *===================================================================== *修改标记 *修改时间：2021/7/13 10:27:39 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * diff --git a/ModelGenerator/Model/TemplateToCodeConfig.cs b/ModelGenerator/Model/TemplateToCodeConfig.cs index 96295bf..0fc4f92 100644 --- a/ModelGenerator/Model/TemplateToCodeConfig.cs +++ b/ModelGenerator/Model/TemplateToCodeConfig.cs @@ -8,15 +8,15 @@ *版本号： V1.0.0.0 *唯一标识：d5ed1206-2a5c-4b32-99c6-74265d9b53a9 *当前的用户域：OCEANIA -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2021/7/13 13:21:18 *描述： * *===================================================================== *修改标记 *修改时间：2021/7/13 13:21:18 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * diff --git a/ModelGenerator/Model/UserDefinedType.cs b/ModelGenerator/Model/UserDefinedType.cs index edbd326..7d6f195 100644 --- a/ModelGenerator/Model/UserDefinedType.cs +++ b/ModelGenerator/Model/UserDefinedType.cs @@ -8,15 +8,15 @@ *版本号： V1.0.0.0 *唯一标识：540ef405-6f17-40fe-abb4-166ba8eb7ebb *当前的用户域：OCEANIA -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2021/7/19 13:32:16 *描述： * *===================================================================== *修改标记 *修改时间：2021/7/19 13:32:16 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * diff --git a/WEF.Standard.Test/MultyTableTest.cs b/WEF.Standard.Test/MultyTableTest.cs index 7ee9e99..9069dd7 100644 --- a/WEF.Standard.Test/MultyTableTest.cs +++ b/WEF.Standard.Test/MultyTableTest.cs @@ -8,15 +8,15 @@ *版本号： V1.0.0.0 *唯一标识：645f0536-df8d-4cd1-ad3c-fcc8e33f6480 *当前的用户域：OCEANIA -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2021/10/15 16:45:39 *描述： * *===================================================================== *修改标记 *修改时间：2021/10/15 16:45:39 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * diff --git a/WEF.Standard.Test/MySqlBitTypeTest.cs b/WEF.Standard.Test/MySqlBitTypeTest.cs index 182ef9e..5194f7b 100644 --- a/WEF.Standard.Test/MySqlBitTypeTest.cs +++ b/WEF.Standard.Test/MySqlBitTypeTest.cs @@ -8,15 +8,15 @@ *版本号： V1.0.0.0 *唯一标识：6738a661-57e8-4a3d-b837-f9cb29604bd9 *当前的用户域：OCEANIA -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2021/12/6 14:55:52 *描述： * *===================================================================== *修改标记 *修改时间：2021/12/6 14:55:52 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * @@ -33,7 +33,7 @@ public static class MySqlBitTypeTest /// public static void Test1() { - var cnnStr = "server=192.168.9.234;user id=root; password=12321; Port=3306;database=oceaniawms; pooling=true"; + var cnnStr = "server=127.0.0.1;user id=root; password=12321; Port=3306;database=oceaniawms; pooling=true"; DBOcWarehouseArea area = new DBOcWarehouseArea() { @@ -49,7 +49,7 @@ public static void Test1() Detectable = false, IsTemporary = false, Repairable = false, - CreateBy = "Mason", + CreateBy = "Walle", CreateTime = DateTime.Now }; @@ -64,7 +64,7 @@ public static void Test1() public static void Test2() { - var cnnStr = "server=192.168.9.234;user id=root; password=12321; Port=3306;database=oceaniawms; pooling=true"; + var cnnStr = "server=127.0.0.1;user id=root; password=12321; Port=3306;database=oceaniawms; pooling=true"; DBWarehouseInboundData data = new DBWarehouseInboundData() { @@ -103,7 +103,7 @@ public static void Test2() public static void Test3() { - var cnnStr = "server=192.168.9.234;user id=root; password=12321; Port=3306;database=oceaniawms; pooling=true"; + var cnnStr = "server=127.0.0.1;user id=root; password=12321; Port=3306;database=oceaniawms; pooling=true"; var repository = new DBWarehouseInboundDataRepository(DatabaseType.MySql, cnnStr); diff --git a/WEF.Standard/BaseRepository.cs b/WEF.Standard/BaseRepository.cs index bbfb0c5..f96cd50 100644 --- a/WEF.Standard/BaseRepository.cs +++ b/WEF.Standard/BaseRepository.cs @@ -8,15 +8,15 @@ *版本号： V1.0.0.0 *唯一标识：565b31a1-4753-4ffb-bbae-f0dc1eae1b38 *当前的用户域：OCEANIA -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2019/5/20 15:11:37 *描述： * *===================================================================== *修改标记 *修改时间：2022/9/14 15:11:37 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * diff --git a/WEF.Standard/Batcher/AdoBatcher.cs b/WEF.Standard/Batcher/AdoBatcher.cs index 295d353..a989760 100644 --- a/WEF.Standard/Batcher/AdoBatcher.cs +++ b/WEF.Standard/Batcher/AdoBatcher.cs @@ -8,15 +8,15 @@ *版本号： V1.0.0.0 *唯一标识：f0c04a8c-417f-49ee-9a11-b320874f4941 *当前的用户域：OCEANIA -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2021/7/30 17:35:27 *描述： * *===================================================================== *修改标记 *修改时间：2021/7/30 17:35:27 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * diff --git a/WEF.Standard/Common/DataTableHelper.cs b/WEF.Standard/Common/DataTableHelper.cs index 66f5379..4ccf553 100644 --- a/WEF.Standard/Common/DataTableHelper.cs +++ b/WEF.Standard/Common/DataTableHelper.cs @@ -2,21 +2,21 @@ *Copyright (c) 2022 Oceania All Rights Reserved. *CLR版本： 4.0.30319.42000 *机器名称：LP20210416002 -*公司名称：Mason.Wen +*公司名称：Walle.Wen *命名空间：WEF.Common *文件名： DataTableHelper *版本号： V1.0.0.0 *唯一标识：7d76ce7e-c970-4d5f-8ad8-9b8906b7e591 -*当前的用户域：Mason.Wen -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@outlook.com +*当前的用户域：Walle.Wen +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@outlook.com *创建时间：2022/3/7 10:28:58 *描述： * *===================================================================== *修改标记 *修改时间：2022/3/7 10:28:58 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * diff --git a/WEF.Standard/Db/DTCTran.cs b/WEF.Standard/Db/DTCTran.cs index 3b966ba..eac255e 100644 --- a/WEF.Standard/Db/DTCTran.cs +++ b/WEF.Standard/Db/DTCTran.cs @@ -8,15 +8,15 @@ *版本号： V1.0.0.0 *唯一标识：5f2f048d-3c8f-411d-8cff-ba8334a46c72 *当前的用户域：OCEANIA -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2022/1/24 10:40:13 *描述： * *===================================================================== *修改标记 *修改时间：2022/1/24 10:40:13 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * diff --git a/WEF.Standard/Db/DbTransType.cs b/WEF.Standard/Db/DbTransType.cs index 1790af8..063f9c0 100644 --- a/WEF.Standard/Db/DbTransType.cs +++ b/WEF.Standard/Db/DbTransType.cs @@ -8,15 +8,15 @@ *版本号： V1.0.0.0 *唯一标识：d4e82219-272a-4d57-b315-c9a3814a8422 *当前的用户域：OCEANIA -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2021/12/8 9:29:46 *描述： * *===================================================================== *修改标记 *修改时间：2021/12/8 9:29:46 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述： * diff --git a/WEF.Standard/Provider/DbProviderCreator.cs b/WEF.Standard/Provider/DbProviderCreator.cs index c6f3f60..5570947 100644 --- a/WEF.Standard/Provider/DbProviderCreator.cs +++ b/WEF.Standard/Provider/DbProviderCreator.cs @@ -8,15 +8,15 @@ *版本号： V1.0.0.0 *唯一标识：f48ff98a-a27e-44be-a636-8fa2bd7f9d56 *当前的用户域：OCEANIA -*创建人： Mason.Wen -*电子邮箱：Mason.Wen@oceania-inc.com +*创建人： Walle.Wen +*电子邮箱：Walle.Wen@oceania-inc.com *创建时间：2022/2/28 14:19:57 *描述：创建Provider * *===================================================================== *修改标记 *修改时间：2022/2/28 14:19:57 -*修改人： Mason.Wen +*修改人： Walle.Wen *版本号： V1.0.0.0 *描述：创建Provider *