-

forward-server/Controllers/ForwardCtrl.go

@@ -29,10 +29,12 @@ func (c *ForwardCtrl) ForwardListJson() {
 	pageParam.PSize, _ = c.GetInt64("pSize")
 
 	port, _ := c.GetInt("port")
+	targetAddr := c.GetString("targetAddr", "")
 	targetPort, _ := c.GetInt("targetPort")
 
 	query := &Models.PortForward{}
 	query.Port = port
+	query.TargetAddr = targetAddr
 	query.TargetPort = targetPort
 	query.FType = -1
 

forward-server/Service/ForwardClient.go

@@ -1,24 +1,24 @@
 package Service
 
 import (
-	"github.com/astaxie/beego/logs"
 	"io"
 	"net"
+
+	"github.com/astaxie/beego/logs"
 )
 
 type ForWardClient struct {
-	SrcConn net.Conn
-	DestConn net.Conn
+	SrcConn        net.Conn
+	DestConn       net.Conn
 	ClosedCallBack func(srcConn net.Conn, destConn net.Conn)
 }
 
-
 func (_self *ForWardClient) StartForward() {
 
 	//io.Copy(dst, src)
 
 	go func() {
-		_,err := io.Copy(_self.DestConn, _self.SrcConn)
+		_, err := io.Copy(_self.DestConn, _self.SrcConn)
 		if err != nil {
 			//logs.Error("客户端来源数据转发到目标端口异常：", err)
 			_self.StopForward()
@@ -26,7 +26,7 @@ func (_self *ForWardClient) StartForward() {
 	}()
 
 	go func() {
-		_,err := io.Copy(_self.SrcConn, _self.DestConn)
+		_, err := io.Copy(_self.SrcConn, _self.DestConn)
 		if err != nil {
 			//logs.Error("目标端口返回响应数据异常：", err)
 			_self.StopForward()
@@ -46,9 +46,9 @@ func (_self *ForWardClient) DispatchData(dispatchConns []io.Writer) {
 }
 
 func (_self *ForWardClient) StopForward() {
-	logs.Debug("关闭一个连接：", _self.SrcConn.RemoteAddr()," on ", _self.SrcConn.LocalAddr())
+	//logs.Debug("关闭一个连接：", _self.SrcConn.RemoteAddr()," on ", _self.SrcConn.LocalAddr())
 	_self.SrcConn.Close()
 	_self.DestConn.Close()
 	_self.ClosedCallBack(_self.SrcConn, _self.DestConn)
 
-}
+}

forward-server/Service/SysDataService.go

@@ -194,6 +194,10 @@ func (_self *SysDataService) GetPortForwardList(query *Models.PortForward, pageI
 		qs = qs.Filter("Port", query.Port)
 	}
 
+	if len(query.TargetAddr) > 0 {
+		qs = qs.Filter("TargetAddr__icontains", query.TargetAddr)
+	}
+
 	if query.TargetPort > 0 {
 		qs = qs.Filter("TargetPort", query.TargetPort)
 	}

forward-server/views/ucenter/apiDoc.html

@@ -159,7 +159,7 @@ Msg: 成功或失败的消息内容
     $(document).ready(function () {
 
         layui.use(['jquery','layer', 'form', 'element'], function () {
-            var $ = layui.jquery, form = layui.form();
+            var $ = layui.jquery, form = layui.form;
 
 
         });

forward-server/views/ucenter/changePwd.html

@@ -32,7 +32,7 @@
   $(document).ready(function () {
 
     layui.use(["form", "element"], function () {
-      var form = layui.form();
+      var form = layui.form;
 
       form.on('submit(pwd)', function(data){
         

forward-server/views/ucenter/forwardForm.html

@@ -83,7 +83,7 @@
   $(document).ready(function () {
 
     layui.use(["form", "element"], function () {
-      var form = layui.form();
+      var form = layui.form;
 
       form.render('select');
     });

forward-server/views/ucenter/forwardList.1.html

@@ -85,7 +85,7 @@
 <script type="text/javascript">
     $(document).ready(function () {
         layui.use(["jquery", "layer", "form", "element", "laytpl", "laypage"], function () {
-            var $ = layui.jquery, layer = layui.layer, form = layui.form(), laytpl = layui.laytpl, laypage = layui.laypage;
+            var $ = layui.jquery, layer = layui.layer, form = layui.form, laytpl = layui.laytpl, laypage = layui.laypage;
             //全选
             form.on('checkbox(allChoose)', function (data) {
                 var child = $(data.elem).parents('table').find('tbody input[type="checkbox"]');
@@ -121,7 +121,7 @@
                         }
                     }
                 });
-                layui.form().render('checkbox');
+                layui.form.render('checkbox');
             } else {//失败
                 layui.layer.alert("失败：" + json.Msg, { icon: 2 });
             }

forward-server/views/ucenter/forwardList.html

@@ -17,6 +17,12 @@
               <input type="text" id="port" name="port" placeholder="本地监听端口" autocomplete="off" class="layui-input">
             </div>
           </div>
+          <div class="layui-inline">
+            <label class="layui-form-label">目标地址</label>
+            <div class="layui-input-inline">
+              <input type="text" id="targetAddr" name="targetAddr" placeholder="转发到地址" autocomplete="off" class="layui-input">
+            </div>
+          </div>
           <div class="layui-inline">
             <label class="layui-form-label">目标端口</label>
             <div class="layui-input-inline">
@@ -111,7 +117,7 @@ $(document).ready(function() {
   layui.use(["jquery", "layer", "form", "element", "laytpl", "laypage"], function() {
     var $ = layui.jquery,
       layer = layui.layer,
-      form = layui.form(),
+      form = layui.form,
       laytpl = layui.laytpl,
       laypage = layui.laypage;
     //全选
@@ -126,6 +132,7 @@ $(document).ready(function() {
       open: "{Start{",
       close: "}End}"
     });
+
     query(1);
   });
 });
@@ -134,10 +141,12 @@ function query(pIndex) {
   // var columnFiled = $("#columnFiled").val();
   // var keyWord = $("#keyWord").val();
   var port = $("#port").val();
+  var targetAddr = $("#targetAddr").val();
   var targetPort = $("#targetPort").val();
 
   $.post("ForwardList/json", {
     port: port,
+    targetAddr: targetAddr,
     targetPort: targetPort,
     pIndex: pIndex,
     pSize: 10
@@ -147,21 +156,23 @@ function query(pIndex) {
       var totalPages = json.Data.Pages;
       var totalRows = json.Data.TotalRows;
       //显示分页
-      layui.laypage({
-        cont: 'pagination', //容器
+      layui.laypage.render({
+        elem: 'pagination', //容器
         pages: totalPages, //通过后台拿到的总页数
-        total: totalRows,
+        count: totalRows,
+        limit: 10,
         groups: 5, //连续分页数
         skin: "#51b921", //控制分页皮肤。目前支持：molv、yahei、flow 除此之外，还支持16进制颜色值，如:skin:'#c00'
         curr: pIndex || 1, //当前页
         skip: true,
+        layout: ['count','prev', 'page', 'next', 'skip'],
         jump: function(obj, first) { //触发分页后的回调
           if (!first) { //点击跳页触发函数自身，并传递当前页：obj.curr
             query(obj.curr);
           }
         }
       });
-      layui.form().render('checkbox');
+      layui.form.render('checkbox');
     } else { //失败
       layui.layer.alert("失败：" + json.Msg, {
         icon: 2

forward-server/views/ucenter/index.html

@@ -41,7 +41,7 @@
     $(document).ready(function () {
 
         layui.use(['jquery','layer', 'form', 'element'], function () {
-            var $ = layui.jquery, form = layui.form();
+            var $ = layui.jquery, form = layui.form;
 
 
         });

forward-server/views/ucenter/netAgent.html

@@ -99,7 +99,7 @@ NetAgent 下载 <a href="http://git.oschina.net/tavenli/port-forward/releases" t
     $(document).ready(function () {
 
         layui.use(['jquery','layer', 'form', 'element'], function () {
-            var $ = layui.jquery, form = layui.form();
+            var $ = layui.jquery, form = layui.form;
             form.render('select');
 
         });