Skip to content

Commit

Permalink
更新命名空间
Browse files Browse the repository at this point in the history
  • Loading branch information
@trheyi
trheyi committed Feb 9, 2022
1 parent c062b54 commit 34f4382
Show file tree
Hide file tree
Showing 68 changed files with 164 additions and 164 deletions.
4 changes: 2 additions & 2 deletions api/api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/api_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 加载应用信息
Expand Down
2 changes: 1 addition & 1 deletion chart/api.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package chart

import (
"github.com/yaoapp/xiang/share"
"github.com/yaoapp/yao/share"
)

// SetupAPIs 设定API数据
Expand Down
4 changes: 2 additions & 2 deletions chart/chart.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 已载入图表
Expand Down
8 changes: 4 additions & 4 deletions chart/chart_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
10 changes: 5 additions & 5 deletions chart/process_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion chart/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package chart

import (
"github.com/yaoapp/gou"
"github.com/yaoapp/xiang/share"
"github.com/yaoapp/yao/share"
)

// Chart 图表格式
Expand Down
4 changes: 2 additions & 2 deletions cmd/import.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions cmd/inspect.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
4 changes: 2 additions & 2 deletions cmd/migrate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmd/root.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"path/filepath"

"github.com/spf13/cobra"
"github.com/yaoapp/xiang/config"
"github.com/yaoapp/yao/config"
)

var appPath string
Expand Down
4 changes: 2 additions & 2 deletions cmd/run.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
8 changes: 4 additions & 4 deletions cmd/start.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion cmd/version.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"

"github.com/spf13/cobra"
"github.com/yaoapp/xiang/share"
"github.com/yaoapp/yao/share"
)

var versionCmd = &cobra.Command{
Expand Down
2 changes: 1 addition & 1 deletion engine/init_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"

"github.com/yaoapp/gou"
"github.com/yaoapp/xiang/config"
"github.com/yaoapp/yao/config"
)

var cfg config.Config
Expand Down
30 changes: 15 additions & 15 deletions engine/load.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion engine/load_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions engine/process.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion engine/process_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion engine/user_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions flow/flow.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 加载业务逻辑编排
Expand Down
2 changes: 1 addition & 1 deletion flow/flow_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/yaoapp/xiang
module github.com/yaoapp/yao

go 1.16

Expand Down
2 changes: 1 addition & 1 deletion helper/jwt.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions importer/importer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 导入器
Expand Down
4 changes: 2 additions & 2 deletions importer/importer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
10 changes: 5 additions & 5 deletions importer/init_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion importer/process_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions importer/xlsx/xlsx.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion init_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"

"github.com/yaoapp/gou"
"github.com/yaoapp/xiang/config"
"github.com/yaoapp/yao/config"
)

var cfg config.Config
Expand Down
10 changes: 5 additions & 5 deletions main.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)

// 主程序
Expand Down
4 changes: 2 additions & 2 deletions main_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading

0 comments on commit 34f4382

Please sign in to comment.