From 34f4382c1908b0965904893c402d61df444c915a Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 9 Feb 2022 09:17:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=91=BD=E5=90=8D=E7=A9=BA?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/api.go | 4 ++-- api/api_test.go | 2 +- app/app.go | 8 ++++---- chart/api.go | 2 +- chart/chart.go | 4 ++-- chart/chart_test.go | 8 ++++---- chart/process_test.go | 10 +++++----- chart/types.go | 2 +- cmd/import.go | 4 ++-- cmd/inspect.go | 4 ++-- cmd/migrate.go | 4 ++-- cmd/root.go | 2 +- cmd/run.go | 4 ++-- cmd/start.go | 8 ++++---- cmd/version.go | 2 +- engine/init_test.go | 2 +- engine/load.go | 30 +++++++++++++++--------------- engine/load_test.go | 2 +- engine/process.go | 6 +++--- engine/process_test.go | 2 +- engine/user_test.go | 2 +- flow/flow.go | 4 ++-- flow/flow_test.go | 2 +- go.mod | 2 +- helper/jwt.go | 2 +- importer/importer.go | 12 ++++++------ importer/importer_test.go | 4 ++-- importer/init_test.go | 10 +++++----- importer/process_test.go | 2 +- importer/xlsx/xlsx.go | 4 ++-- init_test.go | 2 +- main.go | 10 +++++----- main_test.go | 4 ++-- model/model.go | 4 ++-- model/model_test.go | 4 ++-- page/api.go | 2 +- page/page.go | 4 ++-- page/page_test.go | 8 ++++---- page/process_test.go | 10 +++++----- page/types.go | 2 +- plugin/plugin.go | 4 ++-- plugin/plugin_test.go | 2 +- query/query.go | 2 +- script/script.go | 4 ++-- server/socket.go | 4 ++-- server/socket_test.go | 2 +- service/guard.go | 6 +++--- service/middleware.go | 4 ++-- service/service.go | 4 ++-- service/watch.go | 12 ++++++------ share/api.go | 2 +- share/db.go | 2 +- share/importable.go | 2 +- share/session.go | 2 +- share/utils.go | 2 +- table/api.go | 2 +- table/process_test.go | 12 ++++++------ table/table.go | 6 +++--- table/table_test.go | 6 +++--- table/types.go | 2 +- user/user.go | 2 +- workflow/process_test.go | 10 +++++----- workflow/types.go | 4 ++-- workflow/workflow.go | 8 ++++---- workflow/workflow_test.go | 10 +++++----- xfs/process.go | 4 ++-- xfs/process_test.go | 2 +- xfs/xfs.go | 2 +- 68 files changed, 164 insertions(+), 164 deletions(-) diff --git a/api/api.go b/api/api.go index 47c48885..5af1c70c 100644 --- a/api/api.go +++ b/api/api.go @@ -6,8 +6,8 @@ import ( "github.com/yaoapp/gou" "github.com/yaoapp/kun/log" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/share" ) // Load 加载API diff --git a/api/api_test.go b/api/api_test.go index 52b182a9..1fcb35b3 100644 --- a/api/api_test.go +++ b/api/api_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/yaoapp/gou" - "github.com/yaoapp/xiang/config" + "github.com/yaoapp/yao/config" ) func TestLoad(t *testing.T) { diff --git a/app/app.go b/app/app.go index 15bcedb6..c18b2ad2 100644 --- a/app/app.go +++ b/app/app.go @@ -4,10 +4,10 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/yaoapp/kun/exception" "github.com/yaoapp/kun/maps" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/data" - "github.com/yaoapp/xiang/share" - "github.com/yaoapp/xiang/xfs" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/data" + "github.com/yaoapp/yao/share" + "github.com/yaoapp/yao/xfs" ) // Load 加载应用信息 diff --git a/chart/api.go b/chart/api.go index ad895c1d..b0c15deb 100644 --- a/chart/api.go +++ b/chart/api.go @@ -1,7 +1,7 @@ package chart import ( - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/share" ) // SetupAPIs 设定API数据 diff --git a/chart/chart.go b/chart/chart.go index 12f838a8..43da6e2e 100644 --- a/chart/chart.go +++ b/chart/chart.go @@ -8,8 +8,8 @@ import ( "github.com/yaoapp/gou" "github.com/yaoapp/kun/exception" "github.com/yaoapp/kun/log" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/share" ) // Charts 已载入图表 diff --git a/chart/chart_test.go b/chart/chart_test.go index 02f8fac0..28f94b0d 100644 --- a/chart/chart_test.go +++ b/chart/chart_test.go @@ -4,10 +4,10 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/model" - "github.com/yaoapp/xiang/query" - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/model" + "github.com/yaoapp/yao/query" + "github.com/yaoapp/yao/share" ) func TestLoad(t *testing.T) { diff --git a/chart/process_test.go b/chart/process_test.go index a5f83921..91067a35 100644 --- a/chart/process_test.go +++ b/chart/process_test.go @@ -9,11 +9,11 @@ import ( "github.com/yaoapp/gou" "github.com/yaoapp/kun/any" "github.com/yaoapp/kun/utils" - "github.com/yaoapp/xiang/config" - _ "github.com/yaoapp/xiang/helper" - "github.com/yaoapp/xiang/model" - "github.com/yaoapp/xiang/query" - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/config" + _ "github.com/yaoapp/yao/helper" + "github.com/yaoapp/yao/model" + "github.com/yaoapp/yao/query" + "github.com/yaoapp/yao/share" ) func init() { diff --git a/chart/types.go b/chart/types.go index 30514724..446517fb 100644 --- a/chart/types.go +++ b/chart/types.go @@ -2,7 +2,7 @@ package chart import ( "github.com/yaoapp/gou" - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/share" ) // Chart 图表格式 diff --git a/cmd/import.go b/cmd/import.go index e0c2f7d2..e1ed1b43 100644 --- a/cmd/import.go +++ b/cmd/import.go @@ -9,8 +9,8 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/spf13/cobra" "github.com/yaoapp/gou" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/engine" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/engine" ) var importRenew bool diff --git a/cmd/inspect.go b/cmd/inspect.go index 315edaf1..9ecf9ece 100644 --- a/cmd/inspect.go +++ b/cmd/inspect.go @@ -4,8 +4,8 @@ import ( "github.com/spf13/cobra" "github.com/yaoapp/kun/maps" "github.com/yaoapp/kun/utils" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/share" ) var inspectCmd = &cobra.Command{ diff --git a/cmd/migrate.go b/cmd/migrate.go index e791233b..92ea5a01 100644 --- a/cmd/migrate.go +++ b/cmd/migrate.go @@ -6,8 +6,8 @@ import ( "github.com/fatih/color" "github.com/spf13/cobra" "github.com/yaoapp/gou" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/engine" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/engine" ) var name string diff --git a/cmd/root.go b/cmd/root.go index 17cde175..5a353cd1 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -6,7 +6,7 @@ import ( "path/filepath" "github.com/spf13/cobra" - "github.com/yaoapp/xiang/config" + "github.com/yaoapp/yao/config" ) var appPath string diff --git a/cmd/run.go b/cmd/run.go index c34d04ce..184a173e 100644 --- a/cmd/run.go +++ b/cmd/run.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cobra" "github.com/yaoapp/gou" "github.com/yaoapp/kun/utils" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/engine" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/engine" ) var runCmd = &cobra.Command{ diff --git a/cmd/start.go b/cmd/start.go index c215d801..5c862b2b 100644 --- a/cmd/start.go +++ b/cmd/start.go @@ -8,10 +8,10 @@ import ( "github.com/fatih/color" "github.com/spf13/cobra" "github.com/yaoapp/gou" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/engine" - "github.com/yaoapp/xiang/service" - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/engine" + "github.com/yaoapp/yao/service" + "github.com/yaoapp/yao/share" ) var startCmd = &cobra.Command{ diff --git a/cmd/version.go b/cmd/version.go index d844b712..82f3dd35 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/spf13/cobra" - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/share" ) var versionCmd = &cobra.Command{ diff --git a/engine/init_test.go b/engine/init_test.go index 61cda7b8..fda9f4ce 100644 --- a/engine/init_test.go +++ b/engine/init_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/yaoapp/gou" - "github.com/yaoapp/xiang/config" + "github.com/yaoapp/yao/config" ) var cfg config.Config diff --git a/engine/load.go b/engine/load.go index 687f4a50..ec72ea27 100644 --- a/engine/load.go +++ b/engine/load.go @@ -7,21 +7,21 @@ import ( "github.com/yaoapp/gou" "github.com/yaoapp/kun/exception" - "github.com/yaoapp/xiang/api" - "github.com/yaoapp/xiang/app" - "github.com/yaoapp/xiang/chart" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/flow" - "github.com/yaoapp/xiang/importer" - "github.com/yaoapp/xiang/model" - "github.com/yaoapp/xiang/page" - "github.com/yaoapp/xiang/plugin" - "github.com/yaoapp/xiang/query" - "github.com/yaoapp/xiang/script" - "github.com/yaoapp/xiang/server" - "github.com/yaoapp/xiang/share" - "github.com/yaoapp/xiang/table" - "github.com/yaoapp/xiang/workflow" + "github.com/yaoapp/yao/api" + "github.com/yaoapp/yao/app" + "github.com/yaoapp/yao/chart" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/flow" + "github.com/yaoapp/yao/importer" + "github.com/yaoapp/yao/model" + "github.com/yaoapp/yao/page" + "github.com/yaoapp/yao/plugin" + "github.com/yaoapp/yao/query" + "github.com/yaoapp/yao/script" + "github.com/yaoapp/yao/server" + "github.com/yaoapp/yao/share" + "github.com/yaoapp/yao/table" + "github.com/yaoapp/yao/workflow" ) // Load 根据配置加载 API, FLow, Model, Plugin diff --git a/engine/load_test.go b/engine/load_test.go index 74368b32..318d8b08 100644 --- a/engine/load_test.go +++ b/engine/load_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/yaoapp/xiang/config" + "github.com/yaoapp/yao/config" ) func TestLoad(t *testing.T) { diff --git a/engine/process.go b/engine/process.go index d3cd1b11..6f62ee27 100644 --- a/engine/process.go +++ b/engine/process.go @@ -4,9 +4,9 @@ import ( "path/filepath" "github.com/yaoapp/gou" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/share" - "github.com/yaoapp/xiang/xfs" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/share" + "github.com/yaoapp/yao/xfs" ) func init() { diff --git a/engine/process_test.go b/engine/process_test.go index 4d3cddb2..0a403708 100644 --- a/engine/process_test.go +++ b/engine/process_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/yaoapp/gou" - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/share" ) func TestProcessPing(t *testing.T) { diff --git a/engine/user_test.go b/engine/user_test.go index a0dcd8dd..4a05b208 100644 --- a/engine/user_test.go +++ b/engine/user_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/yaoapp/xiang/user" + "github.com/yaoapp/yao/user" ) func TestUserAuth(t *testing.T) { diff --git a/flow/flow.go b/flow/flow.go index 7134d9e6..c0b21700 100644 --- a/flow/flow.go +++ b/flow/flow.go @@ -6,8 +6,8 @@ import ( "github.com/yaoapp/gou" "github.com/yaoapp/kun/log" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/share" ) // Load 加载业务逻辑编排 diff --git a/flow/flow_test.go b/flow/flow_test.go index 6b09db6c..429cb9f3 100644 --- a/flow/flow_test.go +++ b/flow/flow_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/yaoapp/gou" - "github.com/yaoapp/xiang/config" + "github.com/yaoapp/yao/config" ) func TestLoad(t *testing.T) { diff --git a/go.mod b/go.mod index 834f5683..b85f1a1d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/yaoapp/xiang +module github.com/yaoapp/yao go 1.16 diff --git a/helper/jwt.go b/helper/jwt.go index e7912fbc..21254b1d 100644 --- a/helper/jwt.go +++ b/helper/jwt.go @@ -9,7 +9,7 @@ import ( "github.com/yaoapp/gou/session" "github.com/yaoapp/kun/any" "github.com/yaoapp/kun/exception" - "github.com/yaoapp/xiang/config" + "github.com/yaoapp/yao/config" ) // JwtClaims 用户Token diff --git a/importer/importer.go b/importer/importer.go index 4e9e294e..6c56d3e7 100644 --- a/importer/importer.go +++ b/importer/importer.go @@ -11,12 +11,12 @@ import ( "github.com/yaoapp/gou" "github.com/yaoapp/kun/any" "github.com/yaoapp/kun/exception" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/importer/from" - "github.com/yaoapp/xiang/importer/xlsx" - "github.com/yaoapp/xiang/share" - "github.com/yaoapp/xiang/xfs" - "github.com/yaoapp/xiang/xlog" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/importer/from" + "github.com/yaoapp/yao/importer/xlsx" + "github.com/yaoapp/yao/share" + "github.com/yaoapp/yao/xfs" + "github.com/yaoapp/yao/xlog" ) // Importers 导入器 diff --git a/importer/importer_test.go b/importer/importer_test.go index 5060f095..540aa173 100644 --- a/importer/importer_test.go +++ b/importer/importer_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/yaoapp/kun/utils" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/importer/xlsx" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/importer/xlsx" ) func TestLoad(t *testing.T) { diff --git a/importer/init_test.go b/importer/init_test.go index de1e5781..f2976cf3 100644 --- a/importer/init_test.go +++ b/importer/init_test.go @@ -4,11 +4,11 @@ import ( "os" "testing" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/model" - "github.com/yaoapp/xiang/query" - "github.com/yaoapp/xiang/script" - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/model" + "github.com/yaoapp/yao/query" + "github.com/yaoapp/yao/script" + "github.com/yaoapp/yao/share" ) func TestMain(m *testing.M) { diff --git a/importer/process_test.go b/importer/process_test.go index 33ac5bc1..ba8f870d 100644 --- a/importer/process_test.go +++ b/importer/process_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/yaoapp/gou" - "github.com/yaoapp/xiang/config" + "github.com/yaoapp/yao/config" ) func TestProcessMapping(t *testing.T) { diff --git a/importer/xlsx/xlsx.go b/importer/xlsx/xlsx.go index ee8c8468..cd5b80ea 100644 --- a/importer/xlsx/xlsx.go +++ b/importer/xlsx/xlsx.go @@ -6,8 +6,8 @@ import ( "github.com/xuri/excelize/v2" "github.com/yaoapp/kun/exception" - "github.com/yaoapp/xiang/importer/from" - "github.com/yaoapp/xiang/xlog" + "github.com/yaoapp/yao/importer/from" + "github.com/yaoapp/yao/xlog" ) // Xlsx xlsx file diff --git a/init_test.go b/init_test.go index e10f6e5b..9a59584f 100644 --- a/init_test.go +++ b/init_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/yaoapp/gou" - "github.com/yaoapp/xiang/config" + "github.com/yaoapp/yao/config" ) var cfg config.Config diff --git a/main.go b/main.go index 43c5f284..98509fdf 100644 --- a/main.go +++ b/main.go @@ -1,11 +1,11 @@ package main import ( - "github.com/yaoapp/xiang/cmd" - _ "github.com/yaoapp/xiang/helper" - _ "github.com/yaoapp/xiang/network" - _ "github.com/yaoapp/xiang/user" - _ "github.com/yaoapp/xiang/xfs" + "github.com/yaoapp/yao/cmd" + _ "github.com/yaoapp/yao/helper" + _ "github.com/yaoapp/yao/network" + _ "github.com/yaoapp/yao/user" + _ "github.com/yaoapp/yao/xfs" ) // 主程序 diff --git a/main_test.go b/main_test.go index 0dee331c..e5c2a25a 100644 --- a/main_test.go +++ b/main_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/yaoapp/kun/any" "github.com/yaoapp/kun/maps" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/service" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/service" ) func TestCommandVersion(t *testing.T) { diff --git a/model/model.go b/model/model.go index 91efbd0e..f4fa6f56 100644 --- a/model/model.go +++ b/model/model.go @@ -6,8 +6,8 @@ import ( "github.com/yaoapp/gou" "github.com/yaoapp/kun/log" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/share" ) // Load 加载数据模型 diff --git a/model/model_test.go b/model/model_test.go index 39ccfd78..52a485b3 100644 --- a/model/model_test.go +++ b/model/model_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/yaoapp/gou" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/share" ) func TestLoad(t *testing.T) { diff --git a/page/api.go b/page/api.go index 594e64b8..3f9c07dc 100644 --- a/page/api.go +++ b/page/api.go @@ -1,7 +1,7 @@ package page import ( - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/share" ) // SetupAPIs 设定API数据 diff --git a/page/page.go b/page/page.go index e99d88f5..8cbe9efb 100644 --- a/page/page.go +++ b/page/page.go @@ -8,8 +8,8 @@ import ( "github.com/yaoapp/gou" "github.com/yaoapp/kun/exception" "github.com/yaoapp/kun/log" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/share" ) // Pages 已载入页面 diff --git a/page/page_test.go b/page/page_test.go index c5647595..652474c1 100644 --- a/page/page_test.go +++ b/page/page_test.go @@ -4,10 +4,10 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/model" - "github.com/yaoapp/xiang/query" - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/model" + "github.com/yaoapp/yao/query" + "github.com/yaoapp/yao/share" ) func TestLoad(t *testing.T) { diff --git a/page/process_test.go b/page/process_test.go index 3f4a6580..0065567f 100644 --- a/page/process_test.go +++ b/page/process_test.go @@ -9,11 +9,11 @@ import ( "github.com/yaoapp/gou" "github.com/yaoapp/kun/any" "github.com/yaoapp/kun/utils" - "github.com/yaoapp/xiang/config" - _ "github.com/yaoapp/xiang/helper" - "github.com/yaoapp/xiang/model" - "github.com/yaoapp/xiang/query" - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/config" + _ "github.com/yaoapp/yao/helper" + "github.com/yaoapp/yao/model" + "github.com/yaoapp/yao/query" + "github.com/yaoapp/yao/share" ) func init() { diff --git a/page/types.go b/page/types.go index 53f21e6c..327c9f39 100644 --- a/page/types.go +++ b/page/types.go @@ -2,7 +2,7 @@ package page import ( "github.com/yaoapp/gou" - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/share" ) // Page 页面格式 diff --git a/plugin/plugin.go b/plugin/plugin.go index c237fcda..fa254b35 100644 --- a/plugin/plugin.go +++ b/plugin/plugin.go @@ -6,8 +6,8 @@ import ( "github.com/yaoapp/gou" "github.com/yaoapp/kun/log" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/share" ) // Load 加载业务插件 diff --git a/plugin/plugin_test.go b/plugin/plugin_test.go index 559464e4..69964a91 100644 --- a/plugin/plugin_test.go +++ b/plugin/plugin_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/yaoapp/gou" - "github.com/yaoapp/xiang/config" + "github.com/yaoapp/yao/config" ) func TestLoad(t *testing.T) { diff --git a/query/query.go b/query/query.go index 94939572..79f958d5 100644 --- a/query/query.go +++ b/query/query.go @@ -4,8 +4,8 @@ import ( "github.com/yaoapp/gou" dsl "github.com/yaoapp/gou/query/gou" "github.com/yaoapp/kun/log" - "github.com/yaoapp/xiang/config" "github.com/yaoapp/xun/capsule" + "github.com/yaoapp/yao/config" ) // Load 加载查询引擎 diff --git a/script/script.go b/script/script.go index 91f96719..06157f0e 100644 --- a/script/script.go +++ b/script/script.go @@ -6,8 +6,8 @@ import ( "github.com/yaoapp/gou" "github.com/yaoapp/kun/log" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/share" ) // Load 加载共享库 diff --git a/server/socket.go b/server/socket.go index c5ce68aa..0ab88c5e 100644 --- a/server/socket.go +++ b/server/socket.go @@ -6,8 +6,8 @@ import ( "github.com/yaoapp/gou" "github.com/yaoapp/kun/log" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/share" ) // Load 加载API diff --git a/server/socket_test.go b/server/socket_test.go index e32980ca..65f8d361 100644 --- a/server/socket_test.go +++ b/server/socket_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/yaoapp/gou" - "github.com/yaoapp/xiang/config" + "github.com/yaoapp/yao/config" ) func TestLoad(t *testing.T) { diff --git a/service/guard.go b/service/guard.go index 79a51ded..0d9bd9ec 100644 --- a/service/guard.go +++ b/service/guard.go @@ -6,9 +6,9 @@ import ( "github.com/dgrijalva/jwt-go" "github.com/gin-gonic/gin" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/helper" - "github.com/yaoapp/xiang/xlog" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/helper" + "github.com/yaoapp/yao/xlog" ) // Guards 服务中间件 diff --git a/service/middleware.go b/service/middleware.go index 6b2fe7c0..ed2e746b 100644 --- a/service/middleware.go +++ b/service/middleware.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/gin-gonic/gin" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/data" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/data" ) // AdminFileServer 数据管理平台 diff --git a/service/service.go b/service/service.go index d10c443c..c996a536 100644 --- a/service/service.go +++ b/service/service.go @@ -2,8 +2,8 @@ package service import ( "github.com/yaoapp/gou" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/share" ) var shutdown = make(chan bool) diff --git a/service/watch.go b/service/watch.go index 7e556cf7..7c797912 100644 --- a/service/watch.go +++ b/service/watch.go @@ -7,12 +7,12 @@ import ( "strings" "github.com/yaoapp/gou" - "github.com/yaoapp/xiang/chart" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/page" - "github.com/yaoapp/xiang/share" - "github.com/yaoapp/xiang/table" - "github.com/yaoapp/xiang/workflow" + "github.com/yaoapp/yao/chart" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/page" + "github.com/yaoapp/yao/share" + "github.com/yaoapp/yao/table" + "github.com/yaoapp/yao/workflow" ) // Watch 监听应用目录文件变更 diff --git a/share/api.go b/share/api.go index eba2c913..8a9fe8f9 100644 --- a/share/api.go +++ b/share/api.go @@ -12,7 +12,7 @@ import ( "github.com/yaoapp/kun/exception" "github.com/yaoapp/kun/maps" "github.com/yaoapp/kun/utils" - "github.com/yaoapp/xiang/xlog" + "github.com/yaoapp/yao/xlog" ) // IsAllow 鉴权处理程序 diff --git a/share/db.go b/share/db.go index 98bff706..d59bab8b 100644 --- a/share/db.go +++ b/share/db.go @@ -3,8 +3,8 @@ package share import ( "time" - "github.com/yaoapp/xiang/config" "github.com/yaoapp/xun/capsule" + "github.com/yaoapp/yao/config" ) // DBConnect 建立数据库连接 diff --git a/share/importable.go b/share/importable.go index dffada83..ce828a8b 100644 --- a/share/importable.go +++ b/share/importable.go @@ -10,7 +10,7 @@ import ( "github.com/yaoapp/kun/exception" "github.com/yaoapp/kun/log" "github.com/yaoapp/kun/maps" - "github.com/yaoapp/xiang/config" + "github.com/yaoapp/yao/config" ) // Libs 共享库 diff --git a/share/session.go b/share/session.go index f1cb0940..e4f8b5f6 100644 --- a/share/session.go +++ b/share/session.go @@ -11,7 +11,7 @@ import ( "github.com/buraksezer/olric/serializer" "github.com/yaoapp/gou/session" "github.com/yaoapp/kun/exception" - "github.com/yaoapp/xiang/config" + "github.com/yaoapp/yao/config" ) var sessServer *olric.Olric diff --git a/share/utils.go b/share/utils.go index 62723090..989bc203 100644 --- a/share/utils.go +++ b/share/utils.go @@ -9,7 +9,7 @@ import ( "github.com/yaoapp/kun/exception" "github.com/yaoapp/kun/log" - "github.com/yaoapp/xiang/data" + "github.com/yaoapp/yao/data" ) // Walk 遍历应用目录，读取文件列表 diff --git a/table/api.go b/table/api.go index b69d828f..5a297877 100644 --- a/table/api.go +++ b/table/api.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/yaoapp/gou" - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/share" ) // apiSearchDefault search 接口默认值 diff --git a/table/process_test.go b/table/process_test.go index c88b0c24..7fddf946 100644 --- a/table/process_test.go +++ b/table/process_test.go @@ -10,13 +10,13 @@ import ( "github.com/yaoapp/kun/any" "github.com/yaoapp/kun/maps" "github.com/yaoapp/kun/utils" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/flow" - _ "github.com/yaoapp/xiang/helper" - "github.com/yaoapp/xiang/model" - "github.com/yaoapp/xiang/query" - "github.com/yaoapp/xiang/share" "github.com/yaoapp/xun/capsule" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/flow" + _ "github.com/yaoapp/yao/helper" + "github.com/yaoapp/yao/model" + "github.com/yaoapp/yao/query" + "github.com/yaoapp/yao/share" ) func init() { diff --git a/table/table.go b/table/table.go index 181303b7..882e9e66 100644 --- a/table/table.go +++ b/table/table.go @@ -12,9 +12,9 @@ import ( "github.com/yaoapp/kun/exception" "github.com/yaoapp/kun/log" "github.com/yaoapp/kun/maps" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/share" - "github.com/yaoapp/xiang/xlog" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/share" + "github.com/yaoapp/yao/xlog" ) // Tables 已载入模型 diff --git a/table/table_test.go b/table/table_test.go index 5f27834b..c3e5f245 100644 --- a/table/table_test.go +++ b/table/table_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/model" - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/model" + "github.com/yaoapp/yao/share" ) func TestLoad(t *testing.T) { diff --git a/table/types.go b/table/types.go index 70647e8d..7b0cd557 100644 --- a/table/types.go +++ b/table/types.go @@ -2,7 +2,7 @@ package table import ( "github.com/yaoapp/gou" - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/share" ) // Table 数据表格配置结构 diff --git a/user/user.go b/user/user.go index 8204f6ce..15ef8fee 100644 --- a/user/user.go +++ b/user/user.go @@ -9,7 +9,7 @@ import ( "github.com/yaoapp/kun/any" "github.com/yaoapp/kun/exception" "github.com/yaoapp/kun/maps" - "github.com/yaoapp/xiang/helper" + "github.com/yaoapp/yao/helper" "golang.org/x/crypto/bcrypt" ) diff --git a/workflow/process_test.go b/workflow/process_test.go index f3395a65..981bd3af 100644 --- a/workflow/process_test.go +++ b/workflow/process_test.go @@ -8,12 +8,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/yaoapp/gou" "github.com/yaoapp/kun/any" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/flow" - "github.com/yaoapp/xiang/model" - "github.com/yaoapp/xiang/query" - "github.com/yaoapp/xiang/share" "github.com/yaoapp/xun/capsule" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/flow" + "github.com/yaoapp/yao/model" + "github.com/yaoapp/yao/query" + "github.com/yaoapp/yao/share" ) func init() { diff --git a/workflow/types.go b/workflow/types.go index 024f059f..e3275a28 100644 --- a/workflow/types.go +++ b/workflow/types.go @@ -1,8 +1,8 @@ package workflow import ( - "github.com/yaoapp/xiang/helper" - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/helper" + "github.com/yaoapp/yao/share" ) // WorkFlow 工作流配置结构 diff --git a/workflow/workflow.go b/workflow/workflow.go index bf02acf7..b1507a64 100644 --- a/workflow/workflow.go +++ b/workflow/workflow.go @@ -13,10 +13,10 @@ import ( "github.com/yaoapp/kun/log" "github.com/yaoapp/kun/maps" "github.com/yaoapp/kun/str" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/helper" - "github.com/yaoapp/xiang/share" - "github.com/yaoapp/xiang/xlog" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/helper" + "github.com/yaoapp/yao/share" + "github.com/yaoapp/yao/xlog" ) // Process diff --git a/workflow/workflow_test.go b/workflow/workflow_test.go index c1087a3b..5a28eec8 100644 --- a/workflow/workflow_test.go +++ b/workflow/workflow_test.go @@ -8,12 +8,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/yaoapp/kun/any" "github.com/yaoapp/kun/maps" - "github.com/yaoapp/xiang/config" - "github.com/yaoapp/xiang/flow" - "github.com/yaoapp/xiang/model" - "github.com/yaoapp/xiang/query" - "github.com/yaoapp/xiang/share" "github.com/yaoapp/xun/capsule" + "github.com/yaoapp/yao/config" + "github.com/yaoapp/yao/flow" + "github.com/yaoapp/yao/model" + "github.com/yaoapp/yao/query" + "github.com/yaoapp/yao/share" ) func init() { diff --git a/xfs/process.go b/xfs/process.go index 99ad79a8..ad7bf9c3 100644 --- a/xfs/process.go +++ b/xfs/process.go @@ -14,9 +14,9 @@ import ( "github.com/yaoapp/kun/any" "github.com/yaoapp/kun/exception" "github.com/yaoapp/kun/maps" - "github.com/yaoapp/xiang/data" - "github.com/yaoapp/xiang/share" "github.com/yaoapp/xun" + "github.com/yaoapp/yao/data" + "github.com/yaoapp/yao/share" ) func init() { diff --git a/xfs/process_test.go b/xfs/process_test.go index 83fffde7..5424637f 100644 --- a/xfs/process_test.go +++ b/xfs/process_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/yaoapp/gou" "github.com/yaoapp/kun/any" - "github.com/yaoapp/xiang/share" + "github.com/yaoapp/yao/share" ) func init() { diff --git a/xfs/xfs.go b/xfs/xfs.go index 91edf024..b3dcf0f6 100644 --- a/xfs/xfs.go +++ b/xfs/xfs.go @@ -16,7 +16,7 @@ import ( "github.com/spf13/afero/tarfs" "github.com/spf13/afero/zipfs" "github.com/yaoapp/kun/exception" - "github.com/yaoapp/xiang/config" + "github.com/yaoapp/yao/config" ) // Stor 文件系统实例