chore: 调整目录结构

README.md

@@ -30,7 +30,7 @@ $ go get -u github.com/2637309949/dolphin
 3. Execute shell script, just a moment
 
 ```sh
-go run github.com/2637309949/dolphin/cli build
+go run github.com/2637309949/dolphin/client build
 ```
 
 ## Quick start
@@ -40,7 +40,7 @@ go run github.com/2637309949/dolphin/cli build
 <bean
     name="activity_info"
     desc="活动信息"
-    packages="github.com/2637309949/dolphin/cli/packages/null"
+    packages="github.com/2637309949/dolphin/packages/null"
     extends="$applet_activity">
     <prop name="code" desc="编码" type="null.String" />
     <prop name="name" desc="名称" type="null.String" />
@@ -106,7 +106,7 @@ go run github.com/2637309949/dolphin/cli build
 <table
     name="applet_activity"
     desc="活动信息"
-    packages="github.com/2637309949/dolphin/cli/packages/null">
+    packages="github.com/2637309949/dolphin/packages/null">
 	<column name="id" desc="主键" type="null.String" xorm="varchar(36) notnull unique pk" />
 	<column name="title" desc="标题" type="null.String" xorm="varchar(36)" />
 	<column name="content" desc="内容" type="null.String" xorm="varchar(1500)" />

cli/gen/pipes/auto.go

@@ -1,37 +0,0 @@
-// Copyright (c) 2018-2020 Double All rights reserved.
-// Use of this source code is governed by a MIT style
-// license that can be found in the LICENSE file.
-
-package pipes
-
-import (
-	"path"
-
-	"github.com/2637309949/dolphin/cli/gen"
-	"github.com/2637309949/dolphin/cli/gen/tempalte"
-	"github.com/2637309949/dolphin/cli/packages/viper"
-	"github.com/2637309949/dolphin/cli/schema"
-)
-
-// Auto struct
-type Auto struct {
-}
-
-// Build func
-func (auto *Auto) Build(dir string, node *schema.Application) ([]*gen.TmplCfg, error) {
-	data := map[string]interface{}{
-		"PackageName": node.PackageName,
-		"Name":        node.Name,
-		"Controllers": node.Controllers,
-		"Tables":      node.Tables,
-	}
-	return []*gen.TmplCfg{
-		&gen.TmplCfg{
-			Text:     tempalte.TmplAuto,
-			FilePath: path.Join(dir, viper.GetString("dir.app"), "app"),
-			Data:     data,
-			Overlap:  gen.OverlapWrite,
-			Suffix:   ".auto.go",
-		},
-	}, nil
-}

cli/platform/build.sh

@@ -1 +0,0 @@
-go run github.com/2637309949/dolphin/cli build

cli/cmd/init.go → client/cmd/init.go

@@ -7,10 +7,10 @@ package cmd
 import (
 	"os"
 
-	"github.com/2637309949/dolphin/cli/gen"
-	"github.com/2637309949/dolphin/cli/gen/pipes"
-	"github.com/2637309949/dolphin/cli/packages/cobra"
-	"github.com/2637309949/dolphin/cli/parser"
+	"github.com/2637309949/dolphin/client/gen"
+	"github.com/2637309949/dolphin/client/gen/pipes"
+	"github.com/2637309949/dolphin/packages/cobra"
+	"github.com/2637309949/dolphin/client/parser"
 )
 
 var initCmd = &cobra.Command{

cli/cmd/root.go → client/cmd/root.go

@@ -8,9 +8,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/2637309949/dolphin/cli/packages/cobra"
-	"github.com/2637309949/dolphin/cli/packages/logrus"
-	"github.com/2637309949/dolphin/cli/packages/viper"
+	"github.com/2637309949/dolphin/packages/cobra"
+	"github.com/2637309949/dolphin/packages/logrus"
+	"github.com/2637309949/dolphin/packages/viper"
 	"golang.org/x/crypto/ssh/terminal"
 	"golang.org/x/sys/unix"
 )

cli/gen/gen.go → client/gen/gen.go

@@ -10,9 +10,9 @@ import (
 	"os"
 	"path"
 
-	"github.com/2637309949/dolphin/cli/packages/logrus"
+	"github.com/2637309949/dolphin/packages/logrus"
 
-	"github.com/2637309949/dolphin/cli/schema"
+	"github.com/2637309949/dolphin/client/schema"
 )
 
 type (

cli/gen/pipes/app.go → client/gen/pipes/app.go

@@ -7,11 +7,11 @@ package pipes
 import (
 	"path"
 
-	"github.com/2637309949/dolphin/cli/packages/viper"
+	"github.com/2637309949/dolphin/packages/viper"
 
-	"github.com/2637309949/dolphin/cli/gen"
-	"github.com/2637309949/dolphin/cli/gen/tempalte"
-	"github.com/2637309949/dolphin/cli/schema"
+	"github.com/2637309949/dolphin/client/gen"
+	"github.com/2637309949/dolphin/client/gen/tempalte"
+	"github.com/2637309949/dolphin/client/schema"
 )
 
 // App struct

cli/gen/pipes/bean.go → client/gen/pipes/bean.go

@@ -7,10 +7,10 @@ package pipes
 import (
 	"path"
 
-	"github.com/2637309949/dolphin/cli/gen"
-	"github.com/2637309949/dolphin/cli/gen/tempalte"
-	"github.com/2637309949/dolphin/cli/packages/viper"
-	"github.com/2637309949/dolphin/cli/schema"
+	"github.com/2637309949/dolphin/client/gen"
+	"github.com/2637309949/dolphin/client/gen/tempalte"
+	"github.com/2637309949/dolphin/client/schema"
+	"github.com/2637309949/dolphin/packages/viper"
 )
 
 // Bean struct

cli/gen/pipes/ctr.go → client/gen/pipes/ctr.go

@@ -7,10 +7,10 @@ package pipes
 import (
 	"path"
 
-	"github.com/2637309949/dolphin/cli/gen"
-	"github.com/2637309949/dolphin/cli/schema"
-	"github.com/2637309949/dolphin/cli/gen/tempalte"
-	"github.com/2637309949/dolphin/cli/packages/viper"
+	"github.com/2637309949/dolphin/client/gen"
+	"github.com/2637309949/dolphin/client/gen/tempalte"
+	"github.com/2637309949/dolphin/client/schema"
+	"github.com/2637309949/dolphin/packages/viper"
 )
 
 // Ctr struct

cli/gen/pipes/doc.go → client/gen/pipes/doc.go

@@ -7,11 +7,11 @@ package pipes
 import (
 	"path"
 
-	"github.com/2637309949/dolphin/cli/packages/viper"
+	"github.com/2637309949/dolphin/packages/viper"
 
-	"github.com/2637309949/dolphin/cli/gen"
-	"github.com/2637309949/dolphin/cli/schema"
-	swag "github.com/2637309949/dolphin/cli/packages/swag/gen"
+	"github.com/2637309949/dolphin/client/gen"
+	"github.com/2637309949/dolphin/client/schema"
+	swag "github.com/2637309949/dolphin/packages/swag/gen"
 )
 
 // Doc struct

cli/gen/pipes/main.go → client/gen/pipes/main.go

@@ -7,9 +7,9 @@ package pipes
 import (
 	"path"
 
-	"github.com/2637309949/dolphin/cli/gen"
-	"github.com/2637309949/dolphin/cli/gen/tempalte"
-	"github.com/2637309949/dolphin/cli/schema"
+	"github.com/2637309949/dolphin/client/gen"
+	"github.com/2637309949/dolphin/client/gen/tempalte"
+	"github.com/2637309949/dolphin/client/schema"
 )
 
 // Main struct

cli/gen/pipes/model.go → client/gen/pipes/model.go

@@ -7,10 +7,10 @@ package pipes
 import (
 	"path"
 
-	"github.com/2637309949/dolphin/cli/gen"
-	"github.com/2637309949/dolphin/cli/gen/tempalte"
-	"github.com/2637309949/dolphin/cli/packages/viper"
-	"github.com/2637309949/dolphin/cli/schema"
+	"github.com/2637309949/dolphin/client/gen"
+	"github.com/2637309949/dolphin/client/gen/tempalte"
+	"github.com/2637309949/dolphin/client/schema"
+	"github.com/2637309949/dolphin/packages/viper"
 )
 
 // Model struct

cli/gen/pipes/oauth.go → client/gen/pipes/oauth.go

@@ -7,10 +7,10 @@ package pipes
 import (
 	"path"
 
-	"github.com/2637309949/dolphin/cli/gen"
-	"github.com/2637309949/dolphin/cli/gen/tempalte"
-	"github.com/2637309949/dolphin/cli/packages/viper"
-	"github.com/2637309949/dolphin/cli/schema"
+	"github.com/2637309949/dolphin/client/gen"
+	"github.com/2637309949/dolphin/client/gen/tempalte"
+	"github.com/2637309949/dolphin/client/schema"
+	"github.com/2637309949/dolphin/packages/viper"
 )
 
 // OAuth struct

cli/gen/pipes/script.go → client/gen/pipes/script.go

@@ -9,10 +9,10 @@ import (
 	"path"
 	"strings"
 
-	"github.com/2637309949/dolphin/cli/gen"
-	"github.com/2637309949/dolphin/cli/gen/tempalte"
-	"github.com/2637309949/dolphin/cli/packages/viper"
-	"github.com/2637309949/dolphin/cli/schema"
+	"github.com/2637309949/dolphin/client/gen"
+	"github.com/2637309949/dolphin/client/gen/tempalte"
+	"github.com/2637309949/dolphin/client/schema"
+	"github.com/2637309949/dolphin/packages/viper"
 )
 
 // Script struct

cli/gen/pipes/sql.go → client/gen/pipes/sql.go

@@ -9,10 +9,10 @@ import (
 	"path"
 	"strings"
 
-	"github.com/2637309949/dolphin/cli/gen"
-	"github.com/2637309949/dolphin/cli/gen/tempalte"
-	"github.com/2637309949/dolphin/cli/packages/viper"
-	"github.com/2637309949/dolphin/cli/schema"
+	"github.com/2637309949/dolphin/client/gen"
+	"github.com/2637309949/dolphin/client/gen/tempalte"
+	"github.com/2637309949/dolphin/client/schema"
+	"github.com/2637309949/dolphin/packages/viper"
 )
 
 // SQL struct

cli/gen/pipes/sqlmap.go → client/gen/pipes/sqlmap.go

@@ -7,10 +7,10 @@ package pipes
 import (
 	"path"
 
-	"github.com/2637309949/dolphin/cli/gen"
-	"github.com/2637309949/dolphin/cli/gen/tempalte"
-	"github.com/2637309949/dolphin/cli/packages/viper"
-	"github.com/2637309949/dolphin/cli/schema"
+	"github.com/2637309949/dolphin/client/gen"
+	"github.com/2637309949/dolphin/client/gen/tempalte"
+	"github.com/2637309949/dolphin/client/schema"
+	"github.com/2637309949/dolphin/packages/viper"
 )
 
 // SQLMap struct

cli/gen/pipes/srv.go → client/gen/pipes/srv.go

@@ -7,10 +7,10 @@ package pipes
 import (
 	"path"
 
-	"github.com/2637309949/dolphin/cli/gen"
-	"github.com/2637309949/dolphin/cli/gen/tempalte"
-	"github.com/2637309949/dolphin/cli/packages/viper"
-	"github.com/2637309949/dolphin/cli/schema"
+	"github.com/2637309949/dolphin/client/gen"
+	"github.com/2637309949/dolphin/client/gen/tempalte"
+	"github.com/2637309949/dolphin/client/schema"
+	"github.com/2637309949/dolphin/packages/viper"
 )
 
 // Srv struct

cli/gen/pipes/tool.go → client/gen/pipes/tool.go

@@ -7,10 +7,10 @@ package pipes
 import (
 	"path"
 
-	"github.com/2637309949/dolphin/cli/gen"
-	"github.com/2637309949/dolphin/cli/gen/tempalte"
-	"github.com/2637309949/dolphin/cli/packages/viper"
-	"github.com/2637309949/dolphin/cli/schema"
+	"github.com/2637309949/dolphin/client/gen"
+	"github.com/2637309949/dolphin/client/gen/tempalte"
+	"github.com/2637309949/dolphin/client/schema"
+	"github.com/2637309949/dolphin/packages/viper"
 )
 
 // Tool struct

cli/gen/tempalte/app.go → client/gen/tempalte/app.go

@@ -13,10 +13,10 @@ package app
 import (
 	"sync"
 
-	"github.com/2637309949/dolphin/cli/packages/gin"
-	"github.com/2637309949/dolphin/cli/packages/go-funk"
-	"github.com/2637309949/dolphin/cli/packages/viper"
-	pApp "github.com/2637309949/dolphin/cli/platform/app"
+	"github.com/2637309949/dolphin/packages/gin"
+	"github.com/2637309949/dolphin/packages/go-funk"
+	"github.com/2637309949/dolphin/packages/viper"
+	pApp "github.com/2637309949/dolphin/client/platform/app"
 )
 
 type (

cli/gen/tempalte/ctr.go → client/gen/tempalte/ctr.go

@@ -14,9 +14,9 @@ import (
 	"{{.PackageName}}/model"
 	"{{.PackageName}}/srv"
 
-	"github.com/2637309949/dolphin/cli/packages/gin/binding"
-	"github.com/2637309949/dolphin/cli/packages/null"
-	"github.com/2637309949/dolphin/cli/packages/time"
+	"github.com/2637309949/dolphin/packages/gin/binding"
+	"github.com/2637309949/dolphin/packages/null"
+	"github.com/2637309949/dolphin/packages/time"
 )
 {{range .Controller.APIS}}
 // {{$.Controller.ToUpperCase $.Controller.Name}}{{.ToUpperCase .Name}} api implementation

cli/gen/tempalte/main.go → client/gen/tempalte/main.go

@@ -13,7 +13,7 @@ package main
 import (
 	_ "{{.PackageName}}/app"
 
-	"github.com/2637309949/dolphin/srv/cli"
+	"github.com/2637309949/dolphin/packages/fx/cli"
 	_ "github.com/go-sql-driver/mysql"
 )
 

cli/main.go → client/main.go

@@ -5,7 +5,7 @@
 package main
 
 import (
-	"github.com/2637309949/dolphin/cli/cmd"
+	"github.com/2637309949/dolphin/client/cmd"
 )
 
 func main() {

cli/parser/xml.go → client/parser/xml.go

@@ -12,7 +12,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/2637309949/dolphin/cli/schema"
+	"github.com/2637309949/dolphin/client/schema"
 	"gopkg.in/go-playground/validator.v9"
 )
 

cli/platform/app/app.auth.go → client/platform/app/app.auth.go

@@ -5,12 +5,12 @@ import (
 	"net/http"
 	gt "time"
 
-	"github.com/2637309949/dolphin/cli/packages/time"
+	"github.com/2637309949/dolphin/packages/time"
 
-	"github.com/2637309949/dolphin/cli/packages/logrus"
-	"github.com/2637309949/dolphin/cli/packages/oauth2"
-	"github.com/2637309949/dolphin/cli/packages/oauth2/server"
-	"github.com/2637309949/dolphin/cli/packages/viper"
+	"github.com/2637309949/dolphin/packages/logrus"
+	"github.com/2637309949/dolphin/packages/oauth2"
+	"github.com/2637309949/dolphin/packages/oauth2/server"
+	"github.com/2637309949/dolphin/packages/viper"
 	xoauth2 "golang.org/x/oauth2"
 )
 

cli/platform/app/app.ctx.go → client/platform/app/app.ctx.go

@@ -10,12 +10,12 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/2637309949/dolphin/cli/packages/gin"
-	"github.com/2637309949/dolphin/cli/packages/go-funk"
-	"github.com/2637309949/dolphin/cli/packages/null"
-	"github.com/2637309949/dolphin/cli/packages/xormplus/xorm"
-	"github.com/2637309949/dolphin/cli/platform/model"
-	"github.com/2637309949/dolphin/cli/platform/util"
+	"github.com/2637309949/dolphin/packages/gin"
+	"github.com/2637309949/dolphin/packages/go-funk"
+	"github.com/2637309949/dolphin/packages/null"
+	"github.com/2637309949/dolphin/packages/xormplus/xorm"
+	"github.com/2637309949/dolphin/client/platform/model"
+	"github.com/2637309949/dolphin/client/platform/util"
 )
 
 type (

cli/platform/app/app.engine.go → client/platform/app/app.engine.go

@@ -12,21 +12,21 @@ import (
 
 	"google.golang.org/grpc"
 
-	"github.com/2637309949/dolphin/cli/packages/gin"
-	"github.com/2637309949/dolphin/cli/packages/logrus"
-	"github.com/2637309949/dolphin/cli/packages/null"
-	"github.com/2637309949/dolphin/cli/packages/oauth2/errors"
-	"github.com/2637309949/dolphin/cli/packages/oauth2/generates"
-	"github.com/2637309949/dolphin/cli/packages/oauth2/manage"
-	"github.com/2637309949/dolphin/cli/packages/oauth2/models"
-	"github.com/2637309949/dolphin/cli/packages/oauth2/server"
-	"github.com/2637309949/dolphin/cli/packages/oauth2/store"
-	"github.com/2637309949/dolphin/cli/packages/redis"
-	"github.com/2637309949/dolphin/cli/packages/viper"
-	"github.com/2637309949/dolphin/cli/packages/xormplus/xorm"
-	"github.com/2637309949/dolphin/cli/platform/model"
-	"github.com/2637309949/dolphin/cli/platform/sql"
-	"github.com/2637309949/dolphin/cli/platform/util"
+	"github.com/2637309949/dolphin/packages/gin"
+	"github.com/2637309949/dolphin/packages/logrus"
+	"github.com/2637309949/dolphin/packages/null"
+	"github.com/2637309949/dolphin/packages/oauth2/errors"
+	"github.com/2637309949/dolphin/packages/oauth2/generates"
+	"github.com/2637309949/dolphin/packages/oauth2/manage"
+	"github.com/2637309949/dolphin/packages/oauth2/models"
+	"github.com/2637309949/dolphin/packages/oauth2/server"
+	"github.com/2637309949/dolphin/packages/oauth2/store"
+	"github.com/2637309949/dolphin/packages/redis"
+	"github.com/2637309949/dolphin/packages/viper"
+	"github.com/2637309949/dolphin/packages/xormplus/xorm"
+	"github.com/2637309949/dolphin/client/platform/model"
+	"github.com/2637309949/dolphin/client/platform/sql"
+	"github.com/2637309949/dolphin/client/platform/util"
 	"github.com/go-session/session"
 )
 

cli/platform/app/app.go → client/platform/app/app.go

@@ -9,13 +9,13 @@ import (
 	"net"
 	"net/http"
 
-	"github.com/2637309949/dolphin/cli/packages/logrus"
-	"github.com/2637309949/dolphin/cli/packages/viper"
+	"github.com/2637309949/dolphin/packages/logrus"
+	"github.com/2637309949/dolphin/packages/viper"
 
-	// github.com/2637309949/dolphin/cli/platform/conf
-	_ "github.com/2637309949/dolphin/cli/platform/conf"
-	"github.com/2637309949/dolphin/srv"
-	"github.com/2637309949/dolphin/srv/cli"
+	// github.com/2637309949/dolphin/client/platform/conf
+	_ "github.com/2637309949/dolphin/client/platform/conf"
+	srv "github.com/2637309949/dolphin/packages/fx"
+	"github.com/2637309949/dolphin/packages/fx/cli"
 )
 
 // HTTPServer defined http.Server

cli/platform/app/app.log.go → client/platform/app/app.log.go

@@ -6,9 +6,9 @@ import (
 	"path"
 	"time"
 
-	"github.com/2637309949/dolphin/cli/packages/logrotate"
-	"github.com/2637309949/dolphin/cli/packages/logrus"
-	"github.com/2637309949/dolphin/cli/packages/viper"
+	"github.com/2637309949/dolphin/packages/logrotate"
+	"github.com/2637309949/dolphin/packages/logrus"
+	"github.com/2637309949/dolphin/packages/viper"
 	"golang.org/x/crypto/ssh/terminal"
 	"golang.org/x/sys/unix"
 )

cli/platform/app/app.middle.go → client/platform/app/app.middle.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-errors/errors"
 
-	"github.com/2637309949/dolphin/cli/packages/gin"
+	"github.com/2637309949/dolphin/packages/gin"
 )
 
 // Recovery defined

cli/platform/app/sys_attachment.go → client/platform/app/sys_attachment.go

@@ -4,11 +4,11 @@
 package app
 
 import (
-	"github.com/2637309949/dolphin/cli/platform/model"
+	"github.com/2637309949/dolphin/client/platform/model"
 
-	"github.com/2637309949/dolphin/cli/packages/gin/binding"
-	"github.com/2637309949/dolphin/cli/packages/null"
-	"github.com/2637309949/dolphin/cli/packages/time"
+	"github.com/2637309949/dolphin/packages/gin/binding"
+	"github.com/2637309949/dolphin/packages/null"
+	"github.com/2637309949/dolphin/packages/time"
 )
 
 // SysAttachmentAdd api implementation

cli/platform/app/sys_menu.go → client/platform/app/sys_menu.go

@@ -4,16 +4,16 @@
 package app
 
 import (
-	"github.com/2637309949/dolphin/cli/platform/model"
-	"github.com/2637309949/dolphin/cli/platform/srv"
+	"github.com/2637309949/dolphin/client/platform/model"
+	"github.com/2637309949/dolphin/client/platform/srv"
 
-	"github.com/2637309949/dolphin/cli/packages/gin/binding"
-	"github.com/2637309949/dolphin/cli/packages/null"
-	"github.com/2637309949/dolphin/cli/packages/time"
+	"github.com/2637309949/dolphin/packages/gin/binding"
+	"github.com/2637309949/dolphin/packages/null"
+	"github.com/2637309949/dolphin/packages/time"
 )
 
 // SysMenuAdd api implementation
-// @Summary 添加菜单 
+// @Summary 添加菜单
 // @Tags 菜单
 // @Accept application/json
 // @Param Authorization header string false "认证令牌"
@@ -42,7 +42,7 @@ func SysMenuAdd(ctx *Context) {
 }
 
 // SysMenuDel api implementation
-// @Summary 删除菜单 
+// @Summary 删除菜单
 // @Tags 菜单
 // @Accept application/json
 // @Param Authorization header string false "认证令牌"
@@ -69,7 +69,7 @@ func SysMenuDel(ctx *Context) {
 }
 
 // SysMenuUpdate api implementation
-// @Summary 更新菜单 
+// @Summary 更新菜单
 // @Tags 菜单
 // @Accept application/json
 // @Param Authorization header string false "认证令牌"
@@ -95,7 +95,7 @@ func SysMenuUpdate(ctx *Context) {
 }
 
 // SysMenuList api implementation
-// @Summary 菜单分页查询 
+// @Summary 菜单分页查询
 // @Tags 菜单
 // @Param Authorization header string false "认证令牌"
 // @Param page query int false "页码"
@@ -117,7 +117,7 @@ func SysMenuList(ctx *Context) {
 }
 
 // SysMenuTree api implementation
-// @Summary 菜单树形结构 
+// @Summary 菜单树形结构
 // @Tags 菜单
 // @Param Authorization header string false "认证令牌"
 // @Failure 403 {object} model.Response
@@ -133,7 +133,7 @@ func SysMenuTree(ctx *Context) {
 }
 
 // SysMenuGet api implementation
-// @Summary 获取菜单信息 
+// @Summary 获取菜单信息
 // @Tags 菜单
 // @Param Authorization header string false "认证令牌"
 // @Param id query string false "菜单id"
@@ -151,4 +151,3 @@ func SysMenuGet(ctx *Context) {
 	}
 	ctx.Success(ret)
 }
-

cli/platform/app/sys_oauth2.go → client/platform/app/sys_oauth2.go

@@ -11,10 +11,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/2637309949/dolphin/cli/packages/null"
-	"github.com/2637309949/dolphin/cli/packages/viper"
-	"github.com/2637309949/dolphin/cli/platform/model"
-	"github.com/2637309949/dolphin/cli/platform/util"
+	"github.com/2637309949/dolphin/packages/null"
+	"github.com/2637309949/dolphin/packages/viper"
+	"github.com/2637309949/dolphin/client/platform/model"
+	"github.com/2637309949/dolphin/client/platform/util"
 	"github.com/go-session/cookie"
 	"github.com/go-session/session"
 	"golang.org/x/oauth2"

cli/platform/app/sys_org.go → client/platform/app/sys_org.go

@@ -4,11 +4,11 @@
 package app
 
 import (
-	"github.com/2637309949/dolphin/cli/platform/model"
+	"github.com/2637309949/dolphin/client/platform/model"
 
-	"github.com/2637309949/dolphin/cli/packages/gin/binding"
-	"github.com/2637309949/dolphin/cli/packages/null"
-	"github.com/2637309949/dolphin/cli/packages/time"
+	"github.com/2637309949/dolphin/packages/gin/binding"
+	"github.com/2637309949/dolphin/packages/null"
+	"github.com/2637309949/dolphin/packages/time"
 )
 
 // SysOrgAdd api implementation

cli/platform/app/sys_role.go → client/platform/app/sys_role.go

@@ -4,11 +4,11 @@
 package app
 
 import (
-	"github.com/2637309949/dolphin/cli/platform/model"
+	"github.com/2637309949/dolphin/client/platform/model"
 
-	"github.com/2637309949/dolphin/cli/packages/gin/binding"
-	"github.com/2637309949/dolphin/cli/packages/null"
-	"github.com/2637309949/dolphin/cli/packages/time"
+	"github.com/2637309949/dolphin/packages/gin/binding"
+	"github.com/2637309949/dolphin/packages/null"
+	"github.com/2637309949/dolphin/packages/time"
 )
 
 // SysRoleAdd api implementation

cli/platform/app/sys_tag.go → client/platform/app/sys_tag.go

@@ -4,11 +4,11 @@
 package app
 
 import (
-	"github.com/2637309949/dolphin/cli/platform/model"
+	"github.com/2637309949/dolphin/client/platform/model"
 
-	"github.com/2637309949/dolphin/cli/packages/gin/binding"
-	"github.com/2637309949/dolphin/cli/packages/null"
-	"github.com/2637309949/dolphin/cli/packages/time"
+	"github.com/2637309949/dolphin/packages/gin/binding"
+	"github.com/2637309949/dolphin/packages/null"
+	"github.com/2637309949/dolphin/packages/time"
 )
 
 // SysTagAdd api implementation

cli/platform/app/sys_tag_group.go → client/platform/app/sys_tag_group.go

@@ -4,11 +4,11 @@
 package app
 
 import (
-	"github.com/2637309949/dolphin/cli/platform/model"
+	"github.com/2637309949/dolphin/client/platform/model"
 
-	"github.com/2637309949/dolphin/cli/packages/gin/binding"
-	"github.com/2637309949/dolphin/cli/packages/null"
-	"github.com/2637309949/dolphin/cli/packages/time"
+	"github.com/2637309949/dolphin/packages/gin/binding"
+	"github.com/2637309949/dolphin/packages/null"
+	"github.com/2637309949/dolphin/packages/time"
 )
 
 // SysTagGroupAdd api implementation

cli/platform/app/sys_user.go → client/platform/app/sys_user.go

@@ -4,16 +4,16 @@
 package app
 
 import (
-	"github.com/2637309949/dolphin/cli/platform/model"
-	"github.com/2637309949/dolphin/cli/platform/srv"
+	"github.com/2637309949/dolphin/client/platform/model"
+	"github.com/2637309949/dolphin/client/platform/srv"
 
-	"github.com/2637309949/dolphin/cli/packages/gin/binding"
-	"github.com/2637309949/dolphin/cli/packages/null"
-	"github.com/2637309949/dolphin/cli/packages/time"
+	"github.com/2637309949/dolphin/packages/gin/binding"
+	"github.com/2637309949/dolphin/packages/null"
+	"github.com/2637309949/dolphin/packages/time"
 )
 
 // SysUserAdd api implementation
-// @Summary 添加用户 
+// @Summary 添加用户
 // @Tags 用户
 // @Accept application/json
 // @Param Authorization header string false "认证令牌"
@@ -42,7 +42,7 @@ func SysUserAdd(ctx *Context) {
 }
 
 // SysUserDel api implementation
-// @Summary 删除用户 
+// @Summary 删除用户
 // @Tags 用户
 // @Accept application/json
 // @Param Authorization header string false "认证令牌"
@@ -69,7 +69,7 @@ func SysUserDel(ctx *Context) {
 }
 
 // SysUserUpdate api implementation
-// @Summary 更新用户 
+// @Summary 更新用户
 // @Tags 用户
 // @Accept application/json
 // @Param Authorization header string false "认证令牌"
@@ -95,7 +95,7 @@ func SysUserUpdate(ctx *Context) {
 }
 
 // SysUserPage api implementation
-// @Summary 用户分页查询 
+// @Summary 用户分页查询
 // @Tags 用户
 // @Param Authorization header string false "认证令牌"
 // @Param page query int false "页码"
@@ -117,7 +117,7 @@ func SysUserPage(ctx *Context) {
 }
 
 // SysUserGet api implementation
-// @Summary 获取用户信息 
+// @Summary 获取用户信息
 // @Tags 用户
 // @Param Authorization header string false "认证令牌"
 // @Param id query string false "用户id"
@@ -137,7 +137,7 @@ func SysUserGet(ctx *Context) {
 }
 
 // SysUserLogout api implementation
-// @Summary 用户退出登录 
+// @Summary 用户退出登录
 // @Tags 用户
 // @Param Authorization header string false "认证令牌"
 // @Failure 403 {object} model.Response
@@ -153,4 +153,3 @@ func SysUserLogout(ctx *Context) {
 	}
 	ctx.Success(ret)
 }
-

cli/platform/app/sys_user_template.go → client/platform/app/sys_user_template.go

@@ -4,11 +4,11 @@
 package app
 
 import (
-	"github.com/2637309949/dolphin/cli/platform/model"
+	"github.com/2637309949/dolphin/client/platform/model"
 
-	"github.com/2637309949/dolphin/cli/packages/gin/binding"
-	"github.com/2637309949/dolphin/cli/packages/null"
-	"github.com/2637309949/dolphin/cli/packages/time"
+	"github.com/2637309949/dolphin/packages/gin/binding"
+	"github.com/2637309949/dolphin/packages/null"
+	"github.com/2637309949/dolphin/packages/time"
 )
 
 // SysUserTemplateAdd api implementation

client/platform/build.sh

@@ -0,0 +1 @@
+go run github.com/2637309949/dolphin/client build

cli/platform/conf/properties.go → client/platform/conf/properties.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/2637309949/dolphin/cli/packages/logrus"
-	"github.com/2637309949/dolphin/cli/packages/viper"
+	"github.com/2637309949/dolphin/packages/logrus"
+	"github.com/2637309949/dolphin/packages/viper"
 )
 
 func init() {

cli/platform/main.go → client/platform/main.go

@@ -5,5 +5,5 @@ package platform
 
 import (
 	// platform/app
-	_ "github.com/2637309949/dolphin/cli/platform/app"
+	_ "github.com/2637309949/dolphin/client/platform/app"
 )

cli/platform/model/sys_user.helper.go → client/platform/model/sys_user.helper.go

@@ -3,9 +3,8 @@ package model
 import (
 	"fmt"
 
-	"github.com/2637309949/dolphin/cli/packages/null"
-
-	"github.com/2637309949/dolphin/cli/platform/util"
+	"github.com/2637309949/dolphin/client/platform/util"
+	"github.com/2637309949/dolphin/packages/null"
 	"golang.org/x/crypto/scrypt"
 )