update

application/handler/_service_rpc.go

@@ -11,8 +11,8 @@ import (
 	"github.com/webx-top/db"
 	"github.com/webx-top/echo"
 
-	"github.com/admpub/nging/v5/application/model"
 	rpc "github.com/coscms/rpcxx"
+	"github.com/coscms/webcore/model"
 
 	_ "github.com/nging-plugins/frpmanager/application/library/frp/rpcservice"
 )

application/handler/account.go

@@ -21,25 +21,25 @@ package handler
 import (
 	"time"
 
+	"github.com/coscms/webcore/library/backend"
+	"github.com/coscms/webcore/library/common"
 	"github.com/webx-top/db"
 	"github.com/webx-top/echo"
 	"github.com/webx-top/echo/code"
 	"github.com/webx-top/echo/formfilter"
 
-	"github.com/admpub/nging/v5/application/handler"
-
 	"github.com/nging-plugins/frpmanager/application/model"
 )
 
 func AccountIndex(ctx echo.Context) error {
 	m := model.NewFrpUser(ctx)
 	cond := db.NewCompounds()
 	list := []*model.FrpUserAndServer{}
-	_, err := handler.PagingWithLister(ctx, handler.NewLister(m, &list, func(r db.Result) db.Result {
+	_, err := common.PagingWithLister(ctx, common.NewLister(m, &list, func(r db.Result) db.Result {
 		return r.OrderBy(`-id`)
 	}, cond.And()))
 	ctx.Set(`listData`, list)
-	return ctx.Render(`frp/account`, handler.Err(ctx, err))
+	return ctx.Render(`frp/account`, common.Err(ctx, err))
 }
 
 func accountFormFilter(opts ...formfilter.Options) echo.FormDataFilter {
@@ -53,7 +53,7 @@ func accountFormFilter(opts ...formfilter.Options) echo.FormDataFilter {
 func AccountAdd(ctx echo.Context) error {
 	var err error
 	m := model.NewFrpUser(ctx)
-	user := handler.User(ctx)
+	user := backend.User(ctx)
 	if ctx.IsPost() {
 		if ctx.Form(`confirmPassword`) != ctx.Form(`password`) {
 			err = ctx.E(`两次输入的密码之间不匹配，请输入一样的密码`)
@@ -66,8 +66,8 @@ func AccountAdd(ctx echo.Context) error {
 			m.Uid = user.Id
 			_, err = m.Add()
 			if err == nil {
-				handler.SendOk(ctx, ctx.T(`操作成功`))
-				return ctx.Redirect(handler.URLFor(`/frp/account`))
+				common.SendOk(ctx, ctx.T(`操作成功`))
+				return ctx.Redirect(backend.URLFor(`/frp/account`))
 			}
 		}
 	} else {
@@ -124,8 +124,8 @@ func AccountEdit(ctx echo.Context) error {
 			m.Id = id
 			err = m.Edit(nil, db.Cond{`id`: id})
 			if err == nil {
-				handler.SendOk(ctx, ctx.T(`操作成功`))
-				return ctx.Redirect(handler.URLFor(`/frp/account`))
+				common.SendOk(ctx, ctx.T(`操作成功`))
+				return ctx.Redirect(backend.URLFor(`/frp/account`))
 			}
 		}
 	} else {
@@ -155,10 +155,10 @@ func AccountDelete(ctx echo.Context) error {
 	m := model.NewFrpUser(ctx)
 	err := m.Delete(nil, db.Cond{`id`: id})
 	if err == nil {
-		handler.SendOk(ctx, ctx.T(`操作成功`))
+		common.SendOk(ctx, ctx.T(`操作成功`))
 	} else {
-		handler.SendFail(ctx, err.Error())
+		common.SendFail(ctx, err.Error())
 	}
 
-	return ctx.Redirect(handler.URLFor(`/frp/account`))
+	return ctx.Redirect(backend.URLFor(`/frp/account`))
 }

application/handler/addon.go

@@ -7,7 +7,7 @@ import (
 	"github.com/webx-top/com"
 	"github.com/webx-top/echo"
 
-	"github.com/admpub/nging/v5/application/library/common"
+	"github.com/coscms/webcore/library/common"
 )
 
 var regexNumEnd = regexp.MustCompile(`_[\d]+$`)

application/handler/client.go

@@ -32,9 +32,9 @@ import (
 	"github.com/webx-top/echo/code"
 	"github.com/webx-top/echo/formfilter"
 
-	"github.com/admpub/nging/v5/application/handler"
-	"github.com/admpub/nging/v5/application/library/common"
-	"github.com/admpub/nging/v5/application/library/config"
+	"github.com/coscms/webcore/library/backend"
+	"github.com/coscms/webcore/library/common"
+	"github.com/coscms/webcore/library/config"
 
 	"github.com/nging-plugins/frpmanager/application/dbschema"
 	"github.com/nging-plugins/frpmanager/application/library/cmder"
@@ -54,7 +54,7 @@ func ClientIndex(ctx echo.Context) error {
 		cond.AddKV(`name`, db.Like(`%`+q+`%`))
 	}
 	var clientAndGroup []*model.FrpClientAndGroup
-	_, err := handler.PagingWithLister(ctx, handler.NewLister(m, &clientAndGroup, func(r db.Result) db.Result {
+	_, err := common.PagingWithLister(ctx, common.NewLister(m, &clientAndGroup, func(r db.Result) db.Result {
 		return r.OrderBy(`-id`)
 	}, cond.And()))
 	for k, u := range clientAndGroup {
@@ -68,7 +68,7 @@ func ClientIndex(ctx echo.Context) error {
 	ctx.Set(`groupList`, groupList)
 	ctx.Set(`groupId`, groupId)
 	ctx.Set(`isRunning`, config.FromCLI().CmdHasGroup(`frpclient`))
-	return ctx.Render(`frp/client_index`, handler.Err(ctx, err))
+	return ctx.Render(`frp/client_index`, common.Err(ctx, err))
 }
 
 func clientFormFilter(opts ...formfilter.Options) echo.FormDataFilter {
@@ -78,7 +78,7 @@ func clientFormFilter(opts ...formfilter.Options) echo.FormDataFilter {
 
 func ClientAdd(ctx echo.Context) error {
 	m := model.NewFrpClient(ctx)
-	user := handler.User(ctx)
+	user := backend.User(ctx)
 	cm, err := cmder.GetClient()
 	if err != nil {
 		return err
@@ -103,11 +103,11 @@ func ClientAdd(ctx echo.Context) error {
 					err = cm.StartBy(m.NgingFrpClient.Id)
 				}
 				if err != nil {
-					handler.SendOk(ctx, ctx.T(`保存成功。但启动失败: %v`, err.Error()))
+					common.SendOk(ctx, ctx.T(`保存成功。但启动失败: %v`, err.Error()))
 				} else {
-					handler.SendOk(ctx, ctx.T(`操作成功`))
+					common.SendOk(ctx, ctx.T(`操作成功`))
 				}
-				return ctx.Redirect(handler.URLFor(`/frp/client_index`))
+				return ctx.Redirect(backend.URLFor(`/frp/client_index`))
 			}
 		}
 	} else {
@@ -177,11 +177,11 @@ func ClientEdit(ctx echo.Context) error {
 					opType = ctx.T(`关闭失败`)
 				}
 				if err != nil {
-					handler.SendOk(ctx, ctx.T(`保存成功。但%s: %v`, opType, err.Error()))
+					common.SendOk(ctx, ctx.T(`保存成功。但%s: %v`, opType, err.Error()))
 				} else {
-					handler.SendOk(ctx, ctx.T(`操作成功`))
+					common.SendOk(ctx, ctx.T(`操作成功`))
 				}
-				return ctx.Redirect(handler.URLFor(`/frp/client_index`))
+				return ctx.Redirect(backend.URLFor(`/frp/client_index`))
 			}
 		}
 	} else if ctx.IsAjax() {
@@ -296,12 +296,12 @@ func ClientDelete(ctx echo.Context) error {
 		err = utils.SaveConfigFile(&dbschema.NgingFrpClient{Disabled: `Y`, Id: id})
 	}
 	if err == nil {
-		handler.SendOk(ctx, ctx.T(`操作成功`))
+		common.SendOk(ctx, ctx.T(`操作成功`))
 	} else {
-		handler.SendFail(ctx, err.Error())
+		common.SendFail(ctx, err.Error())
 	}
 
-	return ctx.Redirect(handler.URLFor(`/frp/client_index`))
+	return ctx.Redirect(backend.URLFor(`/frp/client_index`))
 }
 
 func ClientLog(ctx echo.Context) error {

application/handler/group.go

@@ -19,18 +19,18 @@
 package handler
 
 import (
+	"github.com/coscms/webcore/library/backend"
+	"github.com/coscms/webcore/library/common"
 	"github.com/webx-top/db"
 	"github.com/webx-top/echo"
 
-	"github.com/admpub/nging/v5/application/handler"
-
 	"github.com/nging-plugins/frpmanager/application/model"
 )
 
 func GroupIndex(ctx echo.Context) error {
 	m := model.NewFrpGroup(ctx)
-	_, err := handler.PagingWithLister(ctx, m)
-	ret := handler.Err(ctx, err)
+	_, err := common.PagingWithLister(ctx, m)
+	ret := common.Err(ctx, err)
 	ctx.Set(`listData`, m.Objects())
 	return ctx.Render(`frp/group_index`, ret)
 }
@@ -52,8 +52,8 @@ func GroupAdd(ctx echo.Context) error {
 		if err == nil {
 			_, err = m.Insert()
 			if err == nil {
-				handler.SendOk(ctx, ctx.T(`操作成功`))
-				return ctx.Redirect(handler.URLFor(`/frp/group_index`))
+				common.SendOk(ctx, ctx.T(`操作成功`))
+				return ctx.Redirect(backend.URLFor(`/frp/group_index`))
 			}
 		}
 	} else {
@@ -92,8 +92,8 @@ func GroupEdit(ctx echo.Context) error {
 			m.Id = id
 			err = m.Update(nil, db.Cond{`id`: id})
 			if err == nil {
-				handler.SendOk(ctx, ctx.T(`操作成功`))
-				return ctx.Redirect(handler.URLFor(`/frp/group_index`))
+				common.SendOk(ctx, ctx.T(`操作成功`))
+				return ctx.Redirect(backend.URLFor(`/frp/group_index`))
 			}
 		}
 	} else if err == nil {
@@ -109,10 +109,10 @@ func GroupDelete(ctx echo.Context) error {
 	m := model.NewFrpGroup(ctx)
 	err := m.Delete(nil, db.Cond{`id`: id})
 	if err == nil {
-		handler.SendOk(ctx, ctx.T(`操作成功`))
+		common.SendOk(ctx, ctx.T(`操作成功`))
 	} else {
-		handler.SendFail(ctx, err.Error())
+		common.SendFail(ctx, err.Error())
 	}
 
-	return ctx.Redirect(handler.URLFor(`/frp/group_index`))
+	return ctx.Redirect(backend.URLFor(`/frp/group_index`))
 }

application/handler/init.go

@@ -21,11 +21,10 @@ package handler
 import (
 	"github.com/webx-top/echo"
 
-	"github.com/admpub/nging/v5/application/handler"
-	"github.com/admpub/nging/v5/application/registry/perm"
+	"github.com/coscms/webcore/registry/perm"
 
-	ngingdbschema "github.com/admpub/nging/v5/application/dbschema"
-	"github.com/admpub/nging/v5/application/library/route"
+	ngingdbschema "github.com/coscms/webcore/dbschema"
+	"github.com/coscms/webcore/library/route"
 	_ "github.com/nging-plugins/frpmanager/application/handler/plugins/multiuser"
 	"github.com/nging-plugins/frpmanager/application/handler/proxy"
 )
@@ -47,7 +46,7 @@ func RegisterRoute(r *route.Collection) {
 }
 
 func registerRoute(g echo.RouteRegister) {
-	metaHandler := handler.IRegister().MetaHandler
+	metaHandler := route.IRegister().MetaHandler
 	g.Route(`GET,POST`, `/server_index`, ServerIndex)
 	g.Route(`GET,POST`, `/server_add`, ServerAdd)
 	g.Route(`GET,POST`, `/server_edit`, ServerEdit)

application/handler/navigate.go

@@ -1,6 +1,6 @@
 package handler
 
-import "github.com/admpub/nging/v5/application/registry/navigate"
+import "github.com/coscms/webcore/registry/navigate"
 
 var LeftNavigate = &navigate.Item{
 	Display: true,

application/handler/plugins/multiuser/init.go

@@ -7,10 +7,10 @@ import (
 	"github.com/admpub/log"
 	"github.com/webx-top/echo"
 
-	"github.com/admpub/nging/v5/application/cmd/bootconfig"
-	"github.com/admpub/nging/v5/application/handler"
-	"github.com/admpub/nging/v5/application/library/common"
-	"github.com/admpub/nging/v5/application/library/config"
+	"github.com/coscms/webcore/cmd/bootconfig"
+	"github.com/coscms/webcore/library/common"
+	"github.com/coscms/webcore/library/config"
+	"github.com/coscms/webcore/library/route"
 	"github.com/nging-plugins/frpmanager/application/library/frp"
 )
 
@@ -50,7 +50,7 @@ func init() {
 		}()
 		return nil
 	})
-	handler.Register(func(g echo.RouteRegister) {
+	route.Register(func(g echo.RouteRegister) {
 		g.Post(`/frp_login`, Login)
 	})
 }

application/handler/proxy/proxy.go

@@ -9,7 +9,7 @@ import (
 	"github.com/webx-top/echo/code"
 	mw "github.com/webx-top/echo/middleware"
 
-	"github.com/admpub/nging/v5/application/library/config"
+	"github.com/coscms/webcore/library/config"
 	"github.com/nging-plugins/frpmanager/application/model"
 )
 

application/handler/server.go

@@ -30,9 +30,9 @@ import (
 	"github.com/webx-top/echo/formfilter"
 	"github.com/webx-top/echo/param"
 
-	"github.com/admpub/nging/v5/application/handler"
-	"github.com/admpub/nging/v5/application/library/common"
-	"github.com/admpub/nging/v5/application/library/config"
+	"github.com/coscms/webcore/library/backend"
+	"github.com/coscms/webcore/library/common"
+	"github.com/coscms/webcore/library/config"
 
 	"github.com/nging-plugins/frpmanager/application/dbschema"
 	"github.com/nging-plugins/frpmanager/application/library/cmder"
@@ -50,7 +50,7 @@ func ServerIndex(ctx echo.Context) error {
 	}
 	common.SelectPageCond(ctx, &cond)
 	var serverAndGroup []*model.FrpServerAndGroup
-	_, err := handler.PagingWithLister(ctx, handler.NewLister(m, &serverAndGroup, func(r db.Result) db.Result {
+	_, err := common.PagingWithLister(ctx, common.NewLister(m, &serverAndGroup, func(r db.Result) db.Result {
 		return r.OrderBy(`-id`)
 	}, cond.And()))
 	for k, u := range serverAndGroup {
@@ -64,7 +64,7 @@ func ServerIndex(ctx echo.Context) error {
 	ctx.Set(`groupList`, groupList)
 	ctx.Set(`groupId`, groupId)
 	ctx.Set(`isRunning`, config.FromCLI().CmdHasGroup(`frpserver`))
-	return ctx.Render(`frp/server_index`, handler.Err(ctx, err))
+	return ctx.Render(`frp/server_index`, common.Err(ctx, err))
 }
 
 func serverFormFilter(opts ...formfilter.Options) echo.FormDataFilter {
@@ -80,7 +80,7 @@ func ServerAdd(ctx echo.Context) error {
 		return err
 	}
 	m := model.NewFrpServer(ctx)
-	user := handler.User(ctx)
+	user := backend.User(ctx)
 	if ctx.IsPost() {
 		err = ctx.MustBind(m.NgingFrpServer, serverFormFilter())
 		if err == nil {
@@ -94,11 +94,11 @@ func ServerAdd(ctx echo.Context) error {
 					err = cm.StartBy(m.NgingFrpServer.Id)
 				}
 				if err != nil {
-					handler.SendOk(ctx, ctx.T(`保存成功。但启动失败: %v`, err.Error()))
+					common.SendOk(ctx, ctx.T(`保存成功。但启动失败: %v`, err.Error()))
 				} else {
-					handler.SendOk(ctx, ctx.T(`操作成功`))
+					common.SendOk(ctx, ctx.T(`操作成功`))
 				}
-				return ctx.Redirect(handler.URLFor(`/frp/server_index`))
+				return ctx.Redirect(backend.URLFor(`/frp/server_index`))
 			}
 		}
 	} else {
@@ -171,11 +171,11 @@ func ServerEdit(ctx echo.Context) error {
 					opType = ctx.T(`关闭失败`)
 				}
 				if err != nil {
-					handler.SendOk(ctx, ctx.T(`保存成功。但%s: %v`, opType, err.Error()))
+					common.SendOk(ctx, ctx.T(`保存成功。但%s: %v`, opType, err.Error()))
 				} else {
-					handler.SendOk(ctx, ctx.T(`操作成功`))
+					common.SendOk(ctx, ctx.T(`操作成功`))
 				}
-				return ctx.Redirect(handler.URLFor(`/frp/server_index`))
+				return ctx.Redirect(backend.URLFor(`/frp/server_index`))
 			}
 		}
 	} else if ctx.IsAjax() {
@@ -253,12 +253,12 @@ func ServerDelete(ctx echo.Context) error {
 		err = utils.SaveConfigFile(&dbschema.NgingFrpServer{Disabled: `Y`, Id: id})
 	}
 	if err == nil {
-		handler.SendOk(ctx, ctx.T(`操作成功`))
+		common.SendOk(ctx, ctx.T(`操作成功`))
 	} else {
-		handler.SendFail(ctx, err.Error())
+		common.SendFail(ctx, err.Error())
 	}
 
-	return ctx.Redirect(handler.URLFor(`/frp/server_index`))
+	return ctx.Redirect(backend.URLFor(`/frp/server_index`))
 }
 
 func ServerLog(ctx echo.Context) error {

application/handler/service_client.go

@@ -24,7 +24,7 @@ import (
 	"github.com/admpub/log"
 	"github.com/webx-top/echo"
 
-	"github.com/admpub/nging/v5/application/library/writer"
+	"github.com/coscms/webcore/library/writer"
 	"github.com/nging-plugins/frpmanager/application/library/cmder"
 )