zilinsoft/SuperDesign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

### 2021-09-02更新

Browse Source 
------
#### SuperDesign    V2.0.2105.1701
- *.[改进]新增对新版公用库的支持,将RyWeb等合并到一个库里。
This commit is contained in:
鑫Intel 2021-09-02 17:39:17 +08:00
parent 2d3bb192f9
commit d402952ed5
27 changed files with 10567 additions and 366 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Bin/Debug/SuperDesign/MyDb.dll
View File

Binary file not shown.

5201
Bin/Debug/SuperDesign/MyDb.xml
View File

File diff suppressed because it is too large Load Diff

BIN
Bin/Debug/SuperDesign/MyDb_SQLite.dll
View File

Binary file not shown.

BIN
Bin/Debug/SuperDesign/RyWeb.dll
View File

Binary file not shown.

5
Bin/Debug/SuperDesign/RyWeb.xml
View File

@ -472,6 +472,11 @@
</summary> </summary>
</member> </member>
<member name="P:RyWeb.QuickWeb.Referer">
<summary>
</summary>
</member>
<member name="P:RyWeb.QuickWeb.Timeout"> <member name="P:RyWeb.QuickWeb.Timeout">
<summary> <summary>

BIN
Bin/Debug/SuperDesign/SuperDesign.exe
View File

Binary file not shown.

BIN
Bin/Debug/SuperDesign/SuperDesign.rar Normal file
View File

Binary file not shown.

BIN
Bin/Debug/SuperDesign/System.Data.SQLite.dll
View File

Binary file not shown.

BIN
Bin/Debug/SuperDesign/XPTable.dll
View File

Binary file not shown.

BIN
Bin/Debug/SuperDesign/ryControls.dll
View File

Binary file not shown.

5152
Bin/Debug/SuperDesign/ryControls.xml
View File

File diff suppressed because it is too large Load Diff

BIN
Bin/Debug/SuperDesign/x64/SQLite.Interop.dll Normal file
View File

Binary file not shown.

BIN
Bin/Debug/SuperDesign/x86/SQLite.Interop.dll Normal file
View File

Binary file not shown.

13
CHANGELOG.md
View File

@ -1,4 +1,15 @@
### 2021-02-28更新 ### 2021-09-02更新
------
#### SuperDesign V2.0.2105.1701
- *.[改进]新增对新版公用库的支持,将RyWeb等合并到一个库里。
### 2021-05-17更新
------
#### SuperDesign V2.0.2105.1701
- *.[新增]新增对新版SQLite库文件的更新支持。
- *.[新增]新增支持x64。
### 2021-02-28更新
------ ------
#### SuperDesign V2.0.2102.2801 #### SuperDesign V2.0.2102.2801
- *.[新增]支持毕方3.0标准。 - *.[新增]支持毕方3.0标准。

BIN
Source/.vs/开发辅助工具/v16/.suo
View File

Binary file not shown.

BIN
Source/.vs/开发辅助工具/v17/.suo Normal file
View File

Binary file not shown.

127
Source/开发辅助工具/Controls/FrmText.Designer.cs generated
View File

@ -28,69 +28,70 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.panelEx1 = new ryControls.PanelEx(); this.panelEx1 = new ryControls.PanelEx();
this.BtnSave = new ryControls.ButtonEx(); this.richTextBox1 = new System.Windows.Forms.RichTextBox();
this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.contextMenuStripRichText1 = new ryProcessManager.hezuo.ContextMenuStripRichText();
this.contextMenuStripRichText1 = new ryProcessManager.hezuo.ContextMenuStripRichText(); this.BtnSave = new ryControls.ButtonEx();
this.panelEx1.SuspendLayout(); this.panelEx1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// panelEx1 // panelEx1
// //
this.panelEx1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.panelEx1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.panelEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(216)))), ((int)(((byte)(223))))); this.panelEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(216)))), ((int)(((byte)(223)))));
this.panelEx1.Controls.Add(this.richTextBox1); this.panelEx1.Controls.Add(this.richTextBox1);
this.panelEx1.Location = new System.Drawing.Point(12, 36); this.panelEx1.Location = new System.Drawing.Point(12, 36);
this.panelEx1.Name = "panelEx1"; this.panelEx1.Name = "panelEx1";
this.panelEx1.RoundeStyle = ryControls.RoundStyle.None; this.panelEx1.RoundeStyle = ryControls.RoundStyle.None;
this.panelEx1.Size = new System.Drawing.Size(725, 467); this.panelEx1.Size = new System.Drawing.Size(725, 467);
this.panelEx1.TabIndex = 0; this.panelEx1.TabIndex = 0;
this.panelEx1.TileBackColor = System.Drawing.Color.White; this.panelEx1.TileBackColor = System.Drawing.Color.White;
// //
// BtnSave // richTextBox1
// //
this.BtnSave.ForeColor = System.Drawing.Color.White; this.richTextBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
this.BtnSave.Location = new System.Drawing.Point(12, 6); | System.Windows.Forms.AnchorStyles.Left)
this.BtnSave.Name = "BtnSave"; | System.Windows.Forms.AnchorStyles.Right)));
this.BtnSave.Size = new System.Drawing.Size(65, 26); this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.BtnSave.TabIndex = 1; this.richTextBox1.ContextMenuStrip = this.contextMenuStripRichText1;
this.BtnSave.Text = "保存"; this.richTextBox1.Location = new System.Drawing.Point(3, 7);
this.BtnSave.UseVisualStyleBackColor = true; this.richTextBox1.Name = "richTextBox1";
this.BtnSave.Click += new System.EventHandler(this.BtnSave_Click); this.richTextBox1.Size = new System.Drawing.Size(719, 455);
// this.richTextBox1.TabIndex = 0;
// richTextBox1 this.richTextBox1.Text = "";
// //
this.richTextBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) // contextMenuStripRichText1
| System.Windows.Forms.AnchorStyles.Left) //
| System.Windows.Forms.AnchorStyles.Right))); this.contextMenuStripRichText1.Name = "contextMenuStripRichText1";
this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.contextMenuStripRichText1.Size = new System.Drawing.Size(101, 164);
this.richTextBox1.ContextMenuStrip = this.contextMenuStripRichText1; //
this.richTextBox1.Location = new System.Drawing.Point(3, 7); // BtnSave
this.richTextBox1.Name = "richTextBox1"; //
this.richTextBox1.Size = new System.Drawing.Size(719, 455); this.BtnSave.BaseColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(76)))), ((int)(((byte)(95)))));
this.richTextBox1.TabIndex = 0; this.BtnSave.Location = new System.Drawing.Point(12, 6);
this.richTextBox1.Text = ""; this.BtnSave.Name = "BtnSave";
// this.BtnSave.Size = new System.Drawing.Size(65, 26);
// contextMenuStripRichText1 this.BtnSave.TabIndex = 1;
// this.BtnSave.Text = "保存";
this.contextMenuStripRichText1.Name = "contextMenuStripRichText1"; this.BtnSave.UseVisualStyleBackColor = true;
this.contextMenuStripRichText1.Size = new System.Drawing.Size(101, 164); this.BtnSave.Click += new System.EventHandler(this.BtnSave_Click);
// //
// FrmText // FrmText
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(749, 515); this.ClientSize = new System.Drawing.Size(749, 515);
this.Controls.Add(this.BtnSave); this.Controls.Add(this.BtnSave);
this.Controls.Add(this.panelEx1); this.Controls.Add(this.panelEx1);
this.Name = "FrmText"; this.Name = "FrmText";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "文本编辑 "; this.Text = "文本编辑 ";
this.panelEx1.ResumeLayout(false); this.Load += new System.EventHandler(this.FrmText_Load);
this.ResumeLayout(false); this.panelEx1.ResumeLayout(false);
this.ResumeLayout(false);
} }
#endregion #endregion

53
Source/开发辅助工具/Controls/FrmText.cs
View File

@ -1,24 +1,29 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Data; using System.Data;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
namespace 开发辅助工具.Controls namespace 开发辅助工具.Controls
{ {
public partial class FrmText : Form public partial class FrmText : Form
{ {
public FrmText() public FrmText()
{ {
InitializeComponent(); InitializeComponent();
} }
private void BtnSave_Click(object sender, EventArgs e) private void BtnSave_Click(object sender, EventArgs e)
{ {
DialogResult = DialogResult.OK; DialogResult = DialogResult.OK;
} }
}
} private void FrmText_Load(object sender, EventArgs e)
{
richTextBox1.AutoWordSelection = false;
}
}
}

244
Source/开发辅助工具/Controls/FrmText.resx
View File

@ -1,123 +1,123 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
Version 2.0 Version 2.0
The primary goals of this format is to allow a simple XML format The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes various data types are done through the TypeConverter classes
associated with the data types. associated with the data types.
Example: Example:
... ado.net/XML headers & schema ... ... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader> <resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader> <resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value> <value>[base64 mime encoded serialized .NET Framework object]</value>
</data> </data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment> <comment>This is a comment</comment>
</data> </data>
There are any number of "resheader" rows that contain simple There are any number of "resheader" rows that contain simple
name/value pairs. name/value pairs.
Each data row contains a name, and value. The row also contains a Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture. text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the Classes that don't support this are serialized and stored with the
mimetype set. mimetype set.
The mimetype is used for serialized objects, and tells the The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly: extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below. read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64 mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64 mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64 mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter : using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
--> -->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType> <xsd:complexType>
<xsd:choice maxOccurs="unbounded"> <xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata"> <xsd:element name="metadata">
<xsd:complexType> <xsd:complexType>
<xsd:sequence> <xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" /> <xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence> </xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" /> <xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" /> <xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" /> <xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" /> <xsd:attribute ref="xml:space" />
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
<xsd:element name="assembly"> <xsd:element name="assembly">
<xsd:complexType> <xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" /> <xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" /> <xsd:attribute name="name" type="xsd:string" />
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
<xsd:element name="data"> <xsd:element name="data">
<xsd:complexType> <xsd:complexType>
<xsd:sequence> <xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence> </xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" /> <xsd:attribute ref="xml:space" />
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
<xsd:element name="resheader"> <xsd:element name="resheader">
<xsd:complexType> <xsd:complexType>
<xsd:sequence> <xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence> </xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" /> <xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
</xsd:choice> </xsd:choice>
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
</xsd:schema> </xsd:schema>
<resheader name="resmimetype"> <resheader name="resmimetype">
<value>text/microsoft-resx</value> <value>text/microsoft-resx</value>
</resheader> </resheader>
<resheader name="version"> <resheader name="version">
<value>2.0</value> <value>2.0</value>
</resheader> </resheader>
<resheader name="reader"> <resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="contextMenuStripRichText1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="contextMenuStripRichText1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>
</root> </root>

45
Source/开发辅助工具/Manager/RyProject.cs
View File

@ -69,10 +69,19 @@ namespace 开发辅助工具.Manager
/// <summary> /// <summary>
/// 通过dll名称来寻找dll路径 /// 通过dll名称来寻找dll路径
/// </summary> /// </summary>
/// <param name="_ReferenceDllPath"></param>
/// <param name="dll_name"></param> /// <param name="dll_name"></param>
/// <returns></returns> /// <returns></returns>
public string GetDllPath(string dll_name) public string GetDllPath(string dll_name)
{
return GetDllPath("", dll_name);
}
/// <summary>
/// 通过dll名称来寻找dll路径
/// </summary>
/// <param name="dll_foldername">为空则表示根目录下查找,否则查找子目录</param>
/// <param name="dll_name"></param>
/// <returns></returns>
public string GetDllPath(string dll_foldername,string dll_name)
{ {
var path_list = ReferenceDllPath.Replace("\r", "").Split('\n'); var path_list = ReferenceDllPath.Replace("\r", "").Split('\n');
var find = false; var find = false;
@ -80,9 +89,11 @@ namespace 开发辅助工具.Manager
#region 在引用文件夹查找是否有该dll,有则使用引用文件夹里的dll #region 在引用文件夹查找是否有该dll,有则使用引用文件夹里的dll
for (int m = 0; m < path_list.Length; m++) for (int m = 0; m < path_list.Length; m++)
{ {
if (path_list[m].Trim() == "") { continue; } if (path_list[m].Trim().Length==0) { continue; }
if (!System.IO.Directory.Exists(path_list[m])) { continue; } var path = path_list[m].Trim('\\');
var files = System.IO.Directory.GetFiles(path_list[m]); if (dll_foldername.Length > 0) { path += "\\" + dll_foldername; }
if (!System.IO.Directory.Exists(path)) { continue; }
var files = System.IO.Directory.GetFiles(path);
for (int z = 0; z < files.Length; z++) for (int z = 0; z < files.Length; z++)
{ {
if (System.IO.Path.GetFileName(files[z]).ToLower() == dll_name.ToLower()) if (System.IO.Path.GetFileName(files[z]).ToLower() == dll_name.ToLower())
@ -152,19 +163,31 @@ namespace 开发辅助工具.Manager
/// </summary> /// </summary>
public int UpdateDlls(string folder,out string error_str) public int UpdateDlls(string folder,out string error_str)
{ {
error_str = "";
var _error_str = ""; var _error_str = "";
int error = 0; int error = 0;
Updates(folder); Updates("",folder);
void Updates(string _path) Updates("x86", folder+"\\x86");
Updates("x64", folder + "\\x64");
void Updates(string foldername,string _path)
{ {
if (!System.IO.Directory.Exists(_path)) { return; }
var files = System.IO.Directory.GetFiles(_path, "*.dll"); var files = System.IO.Directory.GetFiles(_path, "*.dll");
for (int i = 0; i < files.Length; i++) for (int i = 0; i < files.Length; i++)
{ {
string filename = System.IO.Path.GetFileName(files[i]); string filename = System.IO.Path.GetFileName(files[i]);
var dllpath = GetDllPath(filename); var dllpath = GetDllPath(foldername,filename);
if (dllpath != "") if (dllpath.Length>0)
{ {
if (filename.ToLower() == "System.Data.SQLite.dll".ToLower())
{
RyFiles.CreateDirectory(_path + "\\x86");
RyFiles.CreateDirectory(_path + "\\x64");
var sourch_folder = System.IO.Path.GetDirectoryName(dllpath);
if (RyFiles.CopyFile(sourch_folder + "\\x86\\*", _path + "\\x86\\") != 0)
{ _error_str += sourch_folder + "\\x86\\*\r\n"; error++; }
if (RyFiles.CopyFile(sourch_folder + "\\x64\\*", _path + "\\x64\\") != 0)
{ _error_str += sourch_folder + "\\x64\\*\r\n"; error++; }
}
if (RyFiles.CopyFile(dllpath, files[i]) != 0) if (RyFiles.CopyFile(dllpath, files[i]) != 0)
{ _error_str += files[i]+ "\r\n"; error++; } { _error_str += files[i]+ "\r\n"; error++; }
var dll_xml_path = System.IO.Path.GetDirectoryName(dllpath) +"\\"+ System.IO.Path.GetFileNameWithoutExtension(dllpath) + ".xml"; var dll_xml_path = System.IO.Path.GetDirectoryName(dllpath) +"\\"+ System.IO.Path.GetFileNameWithoutExtension(dllpath) + ".xml";
@ -178,7 +201,7 @@ namespace 开发辅助工具.Manager
var dirs = System.IO.Directory.GetDirectories(_path); var dirs = System.IO.Directory.GetDirectories(_path);
for (int i = 0; i < dirs.Length; i++) for (int i = 0; i < dirs.Length; i++)
{ {
Updates(dirs[i]); Updates(foldername,dirs[i]);
} }
} }
error_str = _error_str; error_str = _error_str;
@ -239,7 +262,7 @@ namespace 开发辅助工具.Manager
{ {
var Reference_Name = HintPath.Substring(iPos + 1);//引用的dll名称 var Reference_Name = HintPath.Substring(iPos + 1);//引用的dll名称
var dll_path = GetDllPath(Reference_Name); var dll_path = GetDllPath(Reference_Name);
if (dll_path != "") if (dll_path.Length>0)
{ {
if (CopyDllToBin) if (CopyDllToBin)
{ {

4
Source/开发辅助工具/Properties/AssemblyInfo.cs
View File

@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: : // 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.2102.2801")] [assembly: AssemblyVersion("2.0.2109.0201")]
[assembly: AssemblyFileVersion("2.0.2102.2801")] [assembly: AssemblyFileVersion("2.0.2109.0201")]

14
Source/开发辅助工具/SuperDesign.csproj
View File

@ -13,7 +13,7 @@
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
@ -41,12 +41,6 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Bin\Debug\SuperDesign\FastColoredTextBox.dll</HintPath> <HintPath>..\..\Bin\Debug\SuperDesign\FastColoredTextBox.dll</HintPath>
</Reference> </Reference>
<Reference Include="HtmlAgilityPack">
<HintPath>..\..\Bin\Debug\SupperDesign\HtmlAgilityPack.dll</HintPath>
</Reference>
<Reference Include="MGdUI">
<HintPath>..\..\Bin\Debug\SupperDesign\MGdUI.dll</HintPath>
</Reference>
<Reference Include="MyDb"> <Reference Include="MyDb">
<HintPath>..\..\Bin\Debug\SupperDesign\MyDb.dll</HintPath> <HintPath>..\..\Bin\Debug\SupperDesign\MyDb.dll</HintPath>
</Reference> </Reference>
@ -60,12 +54,6 @@
<Reference Include="ryControls"> <Reference Include="ryControls">
<HintPath>..\..\Bin\Debug\SupperDesign\ryControls.dll</HintPath> <HintPath>..\..\Bin\Debug\SupperDesign\ryControls.dll</HintPath>
</Reference> </Reference>
<Reference Include="RyWeb">
<HintPath>..\..\Bin\Debug\SupperDesign\RyWeb.dll</HintPath>
</Reference>
<Reference Include="SCREEN_CAPTURE">
<HintPath>..\..\Bin\Debug\SupperDesign\SCREEN_CAPTURE.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Design" /> <Reference Include="System.Design" />

3
Source/开发辅助工具/Tools/FrmCreateProject.cs
View File

@ -175,6 +175,7 @@ namespace 开发辅助工具.Tools
#region 复制和修改基准项目 #region 复制和修改基准项目
if (System.IO.Directory.Exists(CshapeBasePath) && prog_lang == "c#") //存在基准项目 if (System.IO.Directory.Exists(CshapeBasePath) && prog_lang == "c#") //存在基准项目
{ {
ryCommon.RyFiles.DeleteFile(full_path + "\\Bin\\Debug\\CommonControls");
var source_folder = full_path + "\\Source\\" + project_Eng_name; var source_folder = full_path + "\\Source\\" + project_Eng_name;
ryCommon.RyFiles.CopyFile(CshapeBasePath + "\\*", source_folder); ryCommon.RyFiles.CopyFile(CshapeBasePath + "\\*", source_folder);
ryCommon.RyFiles.DeleteFile(source_folder + "\\Bin"); ryCommon.RyFiles.DeleteFile(source_folder + "\\Bin");
@ -193,7 +194,7 @@ namespace 开发辅助工具.Tools
var AssemblyInfo = ryCommon.RyFiles.ReadAllText(Application.StartupPath + "\\SysDb\\AssemblyInfo.cs"); var AssemblyInfo = ryCommon.RyFiles.ReadAllText(Application.StartupPath + "\\SysDb\\AssemblyInfo.cs");
AssemblyInfo = AssemblyInfo.Replace("@AssemblyTitle", project_Eng_name); AssemblyInfo = AssemblyInfo.Replace("@AssemblyTitle", project_Eng_name);
AssemblyInfo = AssemblyInfo.Replace("@AssemblyProduct", project_Eng_name); AssemblyInfo = AssemblyInfo.Replace("@AssemblyProduct", project_Eng_name);
AssemblyInfo = AssemblyInfo.Replace("@Copyright", "Copyright 2010-2020"); AssemblyInfo = AssemblyInfo.Replace("@Copyright", "Copyright 2010-2021");
ryCommon.RyFiles.WriteAllText(source_folder + "\\Properties\\AssemblyInfo.cs", AssemblyInfo, Encoding.UTF8); ryCommon.RyFiles.WriteAllText(source_folder + "\\Properties\\AssemblyInfo.cs", AssemblyInfo, Encoding.UTF8);
#endregion #endregion
#region 替换命名空间 #region 替换命名空间

3
Source/开发辅助工具/Tools/FrmQrCode.cs
View File

@ -1,4 +1,5 @@
using _SCREEN_CAPTURE; using _SCREEN_CAPTURE;
using ryCommon._SCREEN_CAPTURE;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
@ -123,7 +124,7 @@ namespace 开发辅助工具.Tools
private void BtnCapture_Click(object sender, EventArgs e) private void BtnCapture_Click(object sender, EventArgs e)
{ {
ScreenCapture capture = new _SCREEN_CAPTURE.ScreenCapture(); ScreenCapture capture = new ScreenCapture();
Bitmap m = capture.StartCapture(false); Bitmap m = capture.StartCapture(false);
if (m != null) if (m != null)
{ {

2
Source/开发辅助工具/Tools/FrmWebGet.cs
View File

@ -34,6 +34,7 @@ namespace 开发辅助工具.Tools
Te_Format.AutoIndentNeeded -= fctb_AutoIndentNeeded; Te_Format.AutoIndentNeeded -= fctb_AutoIndentNeeded;
Te_Format.Language = Language.JSON; Te_Format.Language = Language.JSON;
Te_Format.OnSyntaxHighlight(new TextChangedEventArgs(Te_Format.Range)); Te_Format.OnSyntaxHighlight(new TextChangedEventArgs(Te_Format.Range));
} }
private void fctb_AutoIndentNeeded(object sender, AutoIndentEventArgs args) private void fctb_AutoIndentNeeded(object sender, AutoIndentEventArgs args)
{ {
@ -457,6 +458,7 @@ namespace 开发辅助工具.Tools
private void FrmWebGet_Load(object sender, EventArgs e) private void FrmWebGet_Load(object sender, EventArgs e)
{ {
//TxtPost.AutoWordSelection = false;
System.Net.ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12; //加上这一句 System.Net.ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12; //加上这一句
contextMenuStripHighlightText1.AddSeparatorMenu(); contextMenuStripHighlightText1.AddSeparatorMenu();
contextMenuStripHighlightText1.AddMenu("将选中的内容作为Json分析", "").Click += AnalyJson_Click; contextMenuStripHighlightText1.AddMenu("将选中的内容作为Json分析", "").Click += AnalyJson_Click;

42
Source/开发辅助工具/Tools/FrmXpath.Designer.cs generated
View File

@ -33,12 +33,12 @@
this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.TxtXML = new ryControls.Controls.RichTextBox2(); this.TxtXML = new ryControls.Controls.RichTextBox2();
this.panelEx1 = new ryControls.PanelEx(); this.panelEx1 = new ryControls.PanelEx();
this.fastColoredTextBox1 = new FastColoredTextBoxNS.FastColoredTextBox();
this.contextMenuStripHighlightText1 = new ryProcessManager.hezuo.ContextMenuStripHighlightText(); this.contextMenuStripHighlightText1 = new ryProcessManager.hezuo.ContextMenuStripHighlightText();
this.RySearchXpath = new ryControls.rySearch(); this.RySearchXpath = new ryControls.rySearch();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.CbbXMLType = new ryControls.RyComboBox(); this.CbbXMLType = new ryControls.RyComboBox();
this.menuRight1 = new ryPaiban.Model.MenuRight(this.components); this.menuRight1 = new ryPaiban.Model.MenuRight(this.components);
this.fastColoredTextBox1 = new FastColoredTextBoxNS.FastColoredTextBox();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout();
@ -62,8 +62,8 @@
// splitContainer1.Panel2 // splitContainer1.Panel2
// //
this.splitContainer1.Panel2.Controls.Add(this.panelEx1); this.splitContainer1.Panel2.Controls.Add(this.panelEx1);
this.splitContainer1.Size = new System.Drawing.Size(875, 475); this.splitContainer1.Size = new System.Drawing.Size(875, 471);
this.splitContainer1.SplitterDistance = 145; this.splitContainer1.SplitterDistance = 143;
this.splitContainer1.SplitterWidth = 2; this.splitContainer1.SplitterWidth = 2;
this.splitContainer1.TabIndex = 13; this.splitContainer1.TabIndex = 13;
// //
@ -79,7 +79,7 @@
this.TxtXML.Location = new System.Drawing.Point(3, 3); this.TxtXML.Location = new System.Drawing.Point(3, 3);
this.TxtXML.Name = "TxtXML"; this.TxtXML.Name = "TxtXML";
this.TxtXML.OnlyInputText = true; this.TxtXML.OnlyInputText = true;
this.TxtXML.Size = new System.Drawing.Size(868, 139); this.TxtXML.Size = new System.Drawing.Size(868, 137);
this.TxtXML.TabIndex = 32; this.TxtXML.TabIndex = 32;
this.TxtXML.Text = ""; this.TxtXML.Text = "";
this.TxtXML.DoubleClick += new System.EventHandler(this.TxtXML_DoubleClick); this.TxtXML.DoubleClick += new System.EventHandler(this.TxtXML_DoubleClick);
@ -95,10 +95,23 @@
this.panelEx1.Name = "panelEx1"; this.panelEx1.Name = "panelEx1";
this.panelEx1.Padding = new System.Windows.Forms.Padding(2); this.panelEx1.Padding = new System.Windows.Forms.Padding(2);
this.panelEx1.RoundeStyle = ryControls.RoundStyle.None; this.panelEx1.RoundeStyle = ryControls.RoundStyle.None;
this.panelEx1.Size = new System.Drawing.Size(869, 322); this.panelEx1.Size = new System.Drawing.Size(869, 324);
this.panelEx1.TabIndex = 8; this.panelEx1.TabIndex = 8;
this.panelEx1.TileBackColor = System.Drawing.Color.White; this.panelEx1.TileBackColor = System.Drawing.Color.White;
// //
// fastColoredTextBox1
//
this.fastColoredTextBox1.AutoScrollMinSize = new System.Drawing.Size(0, 14);
this.fastColoredTextBox1.ContextMenuStrip = this.contextMenuStripHighlightText1;
this.fastColoredTextBox1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.fastColoredTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.fastColoredTextBox1.Font = new System.Drawing.Font("Courier New", 9.75F);
this.fastColoredTextBox1.ImeMode = System.Windows.Forms.ImeMode.On;
this.fastColoredTextBox1.Location = new System.Drawing.Point(2, 2);
this.fastColoredTextBox1.Name = "fastColoredTextBox1";
this.fastColoredTextBox1.Size = new System.Drawing.Size(865, 320);
this.fastColoredTextBox1.TabIndex = 0;
//
// contextMenuStripHighlightText1 // contextMenuStripHighlightText1
// //
this.contextMenuStripHighlightText1.Name = "contextMenuStripHighlightText1"; this.contextMenuStripHighlightText1.Name = "contextMenuStripHighlightText1";
@ -110,6 +123,7 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.RySearchXpath.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(239)))), ((int)(((byte)(244))))); this.RySearchXpath.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(239)))), ((int)(((byte)(244)))));
this.RySearchXpath.BaseColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(76)))), ((int)(((byte)(95))))); this.RySearchXpath.BaseColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(76)))), ((int)(((byte)(95)))));
this.RySearchXpath.ButtonRoundBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(239)))), ((int)(((byte)(244)))));
this.RySearchXpath.EmptyText = ""; this.RySearchXpath.EmptyText = "";
this.RySearchXpath.Location = new System.Drawing.Point(179, 3); this.RySearchXpath.Location = new System.Drawing.Point(179, 3);
this.RySearchXpath.Name = "RySearchXpath"; this.RySearchXpath.Name = "RySearchXpath";
@ -135,11 +149,13 @@
this.CbbXMLType.FormattingEnabled = true; this.CbbXMLType.FormattingEnabled = true;
this.CbbXMLType.Items.AddRange(new object[] { this.CbbXMLType.Items.AddRange(new object[] {
"XML内容", "XML内容",
"Html内容"}); "Html内容",
"JSon内容"});
this.CbbXMLType.Location = new System.Drawing.Point(11, 3); this.CbbXMLType.Location = new System.Drawing.Point(11, 3);
this.CbbXMLType.Name = "CbbXMLType"; this.CbbXMLType.Name = "CbbXMLType";
this.CbbXMLType.Size = new System.Drawing.Size(85, 24); this.CbbXMLType.Size = new System.Drawing.Size(85, 24);
this.CbbXMLType.TabIndex = 10; this.CbbXMLType.TabIndex = 10;
this.CbbXMLType.SelectedIndexChanged += new System.EventHandler(this.CbbXMLType_SelectedIndexChanged);
// //
// menuRight1 // menuRight1
// //
@ -147,18 +163,6 @@
this.menuRight1.Size = new System.Drawing.Size(185, 92); this.menuRight1.Size = new System.Drawing.Size(185, 92);
this.menuRight1.SourceContent = this; this.menuRight1.SourceContent = this;
// //
// fastColoredTextBox1
//
this.fastColoredTextBox1.AutoScrollMinSize = new System.Drawing.Size(27, 14);
this.fastColoredTextBox1.ContextMenuStrip = this.contextMenuStripHighlightText1;
this.fastColoredTextBox1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.fastColoredTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.fastColoredTextBox1.Font = new System.Drawing.Font("Courier New", 9.75F);
this.fastColoredTextBox1.Location = new System.Drawing.Point(2, 2);
this.fastColoredTextBox1.Name = "fastColoredTextBox1";
this.fastColoredTextBox1.Size = new System.Drawing.Size(865, 318);
this.fastColoredTextBox1.TabIndex = 0;
//
// FrmXpath // FrmXpath
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@ -171,7 +175,7 @@
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "FrmXpath"; this.Name = "FrmXpath";
this.TabPageContextMenuStrip = this.menuRight1; this.TabPageContextMenuStrip = this.menuRight1;
this.Text = "Xpath测试工具"; this.Text = "Xpath/JPath测试工具";
this.Load += new System.EventHandler(this.FrmXpath_Load); this.Load += new System.EventHandler(this.FrmXpath_Load);
this.splitContainer1.Panel1.ResumeLayout(false); this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel2.ResumeLayout(false); this.splitContainer1.Panel2.ResumeLayout(false);

25
Source/开发辅助工具/Tools/FrmXpath.cs
View File

@ -1,5 +1,7 @@
using FastColoredTextBoxNS; using FastColoredTextBoxNS;
using HtmlAgilityPack; using HtmlAgilityPack;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
@ -102,6 +104,23 @@ namespace 开发辅助工具.Tools
} }
} }
} }
else if (CbbXMLType.SelectedIndex == 2)
{
fastColoredTextBox1.Language = Language.JSON;
try
{
JObject jo = (JObject)JsonConvert.DeserializeObject(TxtXML.Text);
var list= jo.SelectTokens(RySearchXpath.Text).ToList();
for (int i = 0; i < list.Count; i++)
{
if (text != "") { text += "\r\n\r\n"; }
text += list[i].ToString();
}
}
catch (Exception ex)
{
}
}
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -128,5 +147,11 @@ namespace 开发辅助工具.Tools
txt.Text = frm.richTextBox1.Text; txt.Text = frm.richTextBox1.Text;
} }
} }
private void CbbXMLType_SelectedIndexChanged(object sender, EventArgs e)
{
if (CbbXMLType.SelectedIndex == 2) { label1.Text = "JPath表达式"; }
else { label1.Text = "XPath表达式"; }
}
} }
} }