- *.[改进]项目支持自动打包功能。
### RySmartEditor V1.0.2501.2701 - *.[改进]FTP上传时限制300毫秒内只能刷新一次UI进度。 ### SuperDesign V3.0.2501.2701 - *.[新增]新增支持在线升级功能。 #### 项目功能->项目管理 - *.[新增]FTP上传文件列表和打包文件列表支持在软件里直接编辑。 - *.[改进]更新dll版本将比对版本号,只更新版本号更新或者更新日期更新的dll。 #### 项目功能->更新日志 - *.[新增]新增支持自动记录过的分组信息,然后可以进行选择快速插入。 - *.[新增]记录使用过的项目信息到总数据库,以方便总览。 - *.[改进]右键插入日志时直接对富文本框进行编辑,而不是替换内容,从而具备撤销功能。 - *.[改进]改进MD日志输出的样式设计。 - *.[修复]修复《确认日志覆盖》窗口里的按钮,随着窗口大小变化,按钮会错乱的BUG。 - *.[修复]修复双击日志列表显示日志时,针对本周的时间显示不正确的BUG。 - *.[修复]修复右键新增日志时,如果没有分组，插入的行可能不正确的BUG。 - *.[修复]修复设为开发日志后,鼠标指针变到文本开头的问题。 #### 网页抓取工具 - *.[新增]新增多个常用UA。 - *.[新增]切换Url时如果存在Cookie和Header时,则提示是否清空。 - *.[新增]保存记录时新增支持保存UA。 - *.[新增]Url列表支持图标展示。
This commit is contained in:
zilinsoft committed
1 parent
747a97a1c9
commit
1f8c54fe38
47 files changed
+1593
-374
No files matched your search
@@ -14,12 +14,11 @@ namespace SuperDesign.Manager
|
||||
{
|
||||
public static string GetMdLogText(JArray jarr, DateTime dt,bool UseEmoji=false)
|
||||
{
|
||||
string log_text = "### " + DateTime.Now.ToString("yyyy-MM-dd dddd") + "更新";
|
||||
log_text += "\r\n----";
|
||||
string log_text = "## :date:" + DateTime.Now.ToString("yyyy-MM-dd dddd") + "更新";
|
||||
for (int i = 0; i < jarr.Count; i++)
|
||||
{
|
||||
var item = jarr[i];
|
||||
log_text += "\r\n\r\n#### " + item.GetJsonValue("ProjectName", "").Trim() + " V" + item.GetJsonValue("VerStr", "");
|
||||
log_text += "\r\n\r\n### " + item.GetJsonValue("ProjectName", "").Trim() + " V" + item.GetJsonValue("VerStr", "");
|
||||
var logs = item.GetJsonValue("LogText", "").Replace("\r", "\n").Replace("\n\n", "\n").Split('\n');
|
||||
for (int m = 0; m < logs.Length; m++)
|
||||
{
|
||||
@@ -29,34 +28,32 @@ namespace SuperDesign.Manager
|
||||
{
|
||||
log_item = "- " + log_item;
|
||||
}
|
||||
else if (log_item.StartsWith("["))
|
||||
{
|
||||
log_item = "- *." + log_item;
|
||||
}
|
||||
if (UseEmoji)
|
||||
{
|
||||
var type_item = logs[m].GetStr("- *.[", "]");
|
||||
var is_kf = log_item.IndexOfEx("[开发]") > 0;
|
||||
var type_item = log_item.GetStr("- *.[", "]");
|
||||
if (type_item == "修复")
|
||||
{
|
||||
log_item = log_item.Replace("*.[" + type_item + "]", ":lady_beetle:[" + type_item + "]");
|
||||
log_item = log_item.Replace("*.[" + type_item + "]", ":lady_beetle:"+(is_kf? ":secret:" : "")+"[" + type_item + "]");
|
||||
}
|
||||
else if (type_item == "改进")
|
||||
{
|
||||
log_item = log_item.Replace("*.[" + type_item + "]", ":butterfly:[" + type_item + "]");
|
||||
log_item = log_item.Replace("*.[" + type_item + "]", ":100:"+(is_kf? ":secret:" : "")+"[" + type_item + "]");
|
||||
}
|
||||
else if (type_item == "新增")
|
||||
{
|
||||
log_item = log_item.Replace("*.[" + type_item + "]", ":cactus:[" + type_item + "]");
|
||||
log_item = log_item.Replace("*.[" + type_item + "]", ":cactus:"+(is_kf? ":secret:" : "")+"[" + type_item + "]");
|
||||
}
|
||||
else if (type_item == "删除")
|
||||
{
|
||||
log_item = log_item.Replace("*.[" + type_item + "]", ":x:"+(is_kf? ":secret:" : "")+"[" + type_item + "]");
|
||||
}
|
||||
}
|
||||
if (log_item.StartsWith("- *."))
|
||||
{
|
||||
log_text += "\r\n" + log_item;
|
||||
}
|
||||
else if (log_item.StartsWith("#### "))
|
||||
{
|
||||
log_text += "\r\n" + log_item;
|
||||
}
|
||||
else
|
||||
{
|
||||
log_text += "\r\n- *." + log_item;
|
||||
}
|
||||
log_text += "\r\n" + log_item.Trim();
|
||||
}
|
||||
}
|
||||
return log_text;
|
||||
|
||||
@@ -161,6 +161,7 @@ namespace 开发辅助工具.Manager
|
||||
mySQL.AddField("Cookie", "");
|
||||
mySQL.AddField("Postdata", "");
|
||||
mySQL.AddField("Method", "");
|
||||
mySQL.AddField("UserAgent", "");
|
||||
mySQL.AddField("Header", "");
|
||||
mySQL.AddField("Referer", "");
|
||||
mySQL.AddField("ContentType", "");
|
||||
|
||||
@@ -71,25 +71,28 @@ namespace 开发辅助工具.Manager
|
||||
db.Free();
|
||||
}
|
||||
/// <summary>
|
||||
/// 通过dll名称来寻找dll路径
|
||||
/// 通过dll路径来寻找dll路径
|
||||
/// </summary>
|
||||
/// <param name="dll_name"></param>
|
||||
/// <param name="dll_full_path"></param>
|
||||
/// <returns></returns>
|
||||
public string GetDllPath(string dll_name)
|
||||
public string GetDllPath(string dll_full_path)
|
||||
{
|
||||
return GetDllPath("", dll_name);
|
||||
return GetDllPath("", dll_full_path);
|
||||
}
|
||||
/// <summary>
|
||||
/// 通过dll名称来寻找dll路径
|
||||
/// </summary>
|
||||
/// <param name="dll_foldername">为空则表示根目录下查找,否则查找子目录</param>
|
||||
/// <param name="dll_name"></param>
|
||||
/// <param name="dll_full_path"></param>
|
||||
/// <returns></returns>
|
||||
public string GetDllPath(string dll_foldername,string dll_name)
|
||||
public string GetDllPath(string dll_foldername,string dll_full_path)
|
||||
{
|
||||
var dll_name = System.IO.Path.GetFileName(dll_full_path);
|
||||
var path_list = ReferenceDllPath.Replace("\r", "").Split('\n');
|
||||
var find = false;
|
||||
//var find = false;
|
||||
var result = "";
|
||||
var Min_Ver = RySoft.GetVersionStr(dll_full_path);
|
||||
var Min_dt=RyFiles.GetFileDate(dll_full_path);
|
||||
#region 在引用文件夹查找是否有该dll,有则使用引用文件夹里的dll
|
||||
for (int m = 0; m < path_list.Length; m++)
|
||||
{
|
||||
@@ -102,12 +105,38 @@ namespace 开发辅助工具.Manager
|
||||
{
|
||||
if (System.IO.Path.GetFileName(files[z]).ToLower() == dll_name.ToLower())
|
||||
{
|
||||
var dll_ver = RySoft.GetVersionStr(files[z]);
|
||||
var compareVer = RySoft.CompareVer(Min_Ver, dll_ver);
|
||||
if (compareVer < 0)//引用位置版本比较老,直接忽略
|
||||
{
|
||||
continue;
|
||||
}
|
||||
else if (compareVer == 0)//引用位置版本一致,则看更新时间
|
||||
{
|
||||
var file_dt=RyFiles.GetFileDate(files[z]);
|
||||
if (file_dt.LastWriteTime <= Min_dt.LastWriteTime)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
else
|
||||
{
|
||||
Min_dt=file_dt;
|
||||
}
|
||||
}
|
||||
else if(compareVer==-1000)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
else
|
||||
{
|
||||
Min_dt = RyFiles.GetFileDate(files[z]);
|
||||
}
|
||||
result = files[z];
|
||||
find = true;
|
||||
break;
|
||||
Min_Ver=dll_ver;
|
||||
//find = true;
|
||||
}
|
||||
}
|
||||
if (find) { break; }
|
||||
//if (find) { break; }
|
||||
}
|
||||
#endregion
|
||||
return result;
|
||||
@@ -179,7 +208,7 @@ namespace 开发辅助工具.Manager
|
||||
for (int i = 0; i < files.Length; i++)
|
||||
{
|
||||
string filename = System.IO.Path.GetFileName(files[i]);
|
||||
var dllpath = GetDllPath(foldername,filename);
|
||||
var dllpath = GetDllPath(foldername, files[i]);
|
||||
if (dllpath.Length>0)
|
||||
{
|
||||
if (filename.ToLower() == "System.Data.SQLite.dll".ToLower())
|
||||
@@ -266,7 +295,7 @@ namespace 开发辅助工具.Manager
|
||||
if (iPos > 0)
|
||||
{
|
||||
var Reference_Name = HintPath.Substring(iPos + 1);//引用的dll名称
|
||||
var dll_path = GetDllPath(Reference_Name);
|
||||
var dll_path = GetDllPath(OutputPath + Reference_Name);
|
||||
if (dll_path.Length>0)
|
||||
{
|
||||
if (CopyDllToBin)
|
||||
@@ -305,7 +334,7 @@ namespace 开发辅助工具.Manager
|
||||
{ dll_name = "ryUpdate.dll"; }
|
||||
if (dll_name != "")
|
||||
{
|
||||
var dll_path = GetDllPath(dll_name);
|
||||
var dll_path = GetDllPath(OutputPath + dll_name);
|
||||
if (dll_path != "")
|
||||
{
|
||||
if (CopyDllToBin)
|
||||
@@ -660,6 +689,11 @@ namespace 开发辅助工具.Manager
|
||||
{
|
||||
ouput_folder = bf_folder + "\\Bin\\" + com_mode;
|
||||
}
|
||||
if (!System.IO.Directory.Exists(ouput_folder))
|
||||
{
|
||||
ShowState("打包失败,生成目录不存在。");
|
||||
return;
|
||||
}
|
||||
var file_ver = "";
|
||||
if (System.IO.File.Exists(ouput_folder + "\\" + eng_name + ".exe"))
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user