Skip to content

Commit

Permalink
feat: 调整mod
Browse files Browse the repository at this point in the history
  • Loading branch information
@gly-hub
gly-hub committed Oct 30, 2023
1 parent f68f30f commit 168c962
Show file tree
Hide file tree
Showing 36 changed files with 83 additions and 83 deletions.
6 changes: 3 additions & 3 deletions application/db.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ package application

import (
"errors"
"github.com/gly-hub/go-dandelion/config"
dgorm "github.com/gly-hub/go-dandelion/database/gorm"
"github.com/gly-hub/go-dandelion/logger"
timex "github.com/gly-hub/toolbox/time"

Check failure on line 5 in application/db.go

View workflow job for this annotation

GitHub Actions / Windows 

github.com/gly-hub/[email protected]: invalid version: unknown revision 55b7564cca88
zedis "github.com/gomodule/redigo/redis"
jsoniter "github.com/json-iterator/go"
"github.com/team-dandelion/go-dandelion/config"
dgorm "github.com/team-dandelion/go-dandelion/database/gorm"
"github.com/team-dandelion/go-dandelion/logger"
"gorm.io/gorm"
)

Expand Down
4 changes: 2 additions & 2 deletions application/httpserver.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package application

import (
"github.com/gly-hub/go-dandelion/config"
"github.com/gly-hub/go-dandelion/server/http"
"github.com/team-dandelion/go-dandelion/config"
"github.com/team-dandelion/go-dandelion/server/http"
)

var httpServer *http.HttpServer
Expand Down
4 changes: 2 additions & 2 deletions application/logger.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package application

import (
"github.com/gly-hub/go-dandelion/config"
"github.com/gly-hub/go-dandelion/logger"
"github.com/team-dandelion/go-dandelion/config"
"github.com/team-dandelion/go-dandelion/logger"
)

func initLogger() {
Expand Down
2 changes: 1 addition & 1 deletion application/plugin.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package application

import "github.com/gly-hub/go-dandelion/config"
import "github.com/team-dandelion/go-dandelion/config"

/*
插件功能。
Expand Down
6 changes: 3 additions & 3 deletions application/redis.go
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package application

import (
"github.com/gly-hub/go-dandelion/config"
"github.com/gly-hub/go-dandelion/database/redigo"
"github.com/gly-hub/go-dandelion/database/redigo/smart_redis"
timex "github.com/gly-hub/toolbox/time"
"github.com/team-dandelion/go-dandelion/config"
"github.com/team-dandelion/go-dandelion/database/redigo"
"github.com/team-dandelion/go-dandelion/database/redigo/smart_redis"
)

var redis *smart_redis.SmartRedis
Expand Down
12 changes: 6 additions & 6 deletions application/rpcserver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ import (
"context"
"fmt"
routing "github.com/gly-hub/fasthttp-routing"
"github.com/gly-hub/go-dandelion/config"
error_support "github.com/gly-hub/go-dandelion/error-support"
"github.com/gly-hub/go-dandelion/logger"
"github.com/gly-hub/go-dandelion/server/http"
"github.com/gly-hub/go-dandelion/server/rpcx"
"github.com/gly-hub/go-dandelion/telemetry"
"github.com/gly-hub/toolbox/ip"

Check failure on line 7 in application/rpcserver.go

View workflow job for this annotation

GitHub Actions / Windows 

github.com/gly-hub/[email protected]: invalid version: unknown revision 55b7564cca88
"github.com/gly-hub/toolbox/stringx"

Check failure on line 8 in application/rpcserver.go

View workflow job for this annotation

GitHub Actions / Windows 

github.com/gly-hub/[email protected]: invalid version: unknown revision 55b7564cca88
jsoniter "github.com/json-iterator/go"
"github.com/smallnest/rpcx/server"
"github.com/team-dandelion/go-dandelion/config"
error_support "github.com/team-dandelion/go-dandelion/error-support"
"github.com/team-dandelion/go-dandelion/logger"
"github.com/team-dandelion/go-dandelion/server/http"
"github.com/team-dandelion/go-dandelion/server/rpcx"
"github.com/team-dandelion/go-dandelion/telemetry"
_ "net/http/pprof"
"reflect"
)
Expand Down
4 changes: 2 additions & 2 deletions application/tracer.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package application

import (
"github.com/gly-hub/go-dandelion/config"
"github.com/gly-hub/go-dandelion/telemetry"
"github.com/team-dandelion/go-dandelion/config"
"github.com/team-dandelion/go-dandelion/telemetry"
)

func initTracer() {
Expand Down
6 changes: 3 additions & 3 deletions database/gorm/gdb.go
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package gorm

import (
"github.com/gly-hub/go-dandelion/config"
"github.com/gly-hub/go-dandelion/database/redigo"
"github.com/gly-hub/go-dandelion/database/redigo/tools"
timex "github.com/gly-hub/toolbox/time"
jsoniter "github.com/json-iterator/go"
"github.com/team-dandelion/go-dandelion/config"
"github.com/team-dandelion/go-dandelion/database/redigo"
"github.com/team-dandelion/go-dandelion/database/redigo/tools"
"gorm.io/gorm"
"sync"
)
Expand Down
4 changes: 2 additions & 2 deletions database/gorm/logger.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"context"
"errors"
"fmt"
loggerx "github.com/gly-hub/go-dandelion/logger"
"github.com/gly-hub/go-dandelion/telemetry"
"github.com/opentracing/opentracing-go"
"github.com/opentracing/opentracing-go/log"
loggerx "github.com/team-dandelion/go-dandelion/logger"
"github.com/team-dandelion/go-dandelion/telemetry"
glogger "gorm.io/gorm/logger"
"gorm.io/gorm/utils"
"strconv"
Expand Down
4 changes: 2 additions & 2 deletions database/redigo/logger/logger.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"bytes"
"context"
"fmt"
"github.com/gly-hub/go-dandelion/logger"
"github.com/gly-hub/go-dandelion/telemetry"
"github.com/gomodule/redigo/redis"
"github.com/opentracing/opentracing-go"
"github.com/opentracing/opentracing-go/log"
"github.com/team-dandelion/go-dandelion/logger"
"github.com/team-dandelion/go-dandelion/telemetry"
"time"
)

Expand Down
4 changes: 2 additions & 2 deletions database/redigo/mode/alone/alone.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package alone

import (
"context"
"github.com/gly-hub/go-dandelion/database/redigo"
"github.com/gly-hub/go-dandelion/database/redigo/logger"
"github.com/gomodule/redigo/redis"
"github.com/team-dandelion/go-dandelion/database/redigo"
"github.com/team-dandelion/go-dandelion/database/redigo/logger"
)

type aloneMode struct{ pool *redis.Pool }
Expand Down
2 changes: 1 addition & 1 deletion database/redigo/mode/alone/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package alone
import (
"github.com/gomodule/redigo/redis"

"github.com/gly-hub/go-dandelion/database/redigo"
"github.com/team-dandelion/go-dandelion/database/redigo"
)

type options struct {
Expand Down
2 changes: 1 addition & 1 deletion database/redigo/mode/cluster/cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/gomodule/redigo/redis"
"github.com/mna/redisc"

"github.com/gly-hub/go-dandelion/database/redigo"
"github.com/team-dandelion/go-dandelion/database/redigo"
)

type clusterMode struct {
Expand Down
2 changes: 1 addition & 1 deletion database/redigo/mode/cluster/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/gomodule/redigo/redis"

"github.com/gly-hub/go-dandelion/database/redigo"
"github.com/team-dandelion/go-dandelion/database/redigo"
)

type options struct {
Expand Down
2 changes: 1 addition & 1 deletion database/redigo/mode/sentinel/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package sentinel
import (
"github.com/gomodule/redigo/redis"

"github.com/gly-hub/go-dandelion/database/redigo"
"github.com/team-dandelion/go-dandelion/database/redigo"
)

type options struct {
Expand Down
2 changes: 1 addition & 1 deletion database/redigo/mode/sentinel/sentinel.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/FZambia/sentinel"
"github.com/gomodule/redigo/redis"

"github.com/gly-hub/go-dandelion/database/redigo"
"github.com/team-dandelion/go-dandelion/database/redigo"
)

type sentinelMode struct {
Expand Down
8 changes: 4 additions & 4 deletions database/redigo/smart_redis/smart_redis.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package smart_redis

import (
"errors"
"github.com/gly-hub/go-dandelion/database/redigo"
"github.com/gly-hub/go-dandelion/database/redigo/mode/alone"
"github.com/gly-hub/go-dandelion/database/redigo/mode/cluster"
"github.com/gly-hub/go-dandelion/database/redigo/mode/sentinel"
"github.com/gomodule/redigo/redis"
"github.com/team-dandelion/go-dandelion/database/redigo"
"github.com/team-dandelion/go-dandelion/database/redigo/mode/alone"
"github.com/team-dandelion/go-dandelion/database/redigo/mode/cluster"
"github.com/team-dandelion/go-dandelion/database/redigo/mode/sentinel"
"time"
)

Expand Down
4 changes: 2 additions & 2 deletions database/redigo/tools/subscribe.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package tools

import (
"github.com/gly-hub/go-dandelion/database/redigo"
"github.com/gly-hub/go-dandelion/logger"
"github.com/gomodule/redigo/redis"
"github.com/team-dandelion/go-dandelion/database/redigo"
"github.com/team-dandelion/go-dandelion/logger"
"sync"
"unsafe"
)
Expand Down
2 changes: 1 addition & 1 deletion go-dandelion-cli/cmd/application/server.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package application

import (
"github.com/gly-hub/go-dandelion/go-dandelion-cli/internal/build"
"github.com/spf13/cobra"
"github.com/team-dandelion/go-dandelion/go-dandelion-cli/internal/build"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion go-dandelion-cli/cmd/build/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package build

import (
"fmt"
"github.com/gly-hub/go-dandelion/go-dandelion-cli/internal/build"
"github.com/spf13/cobra"
"github.com/team-dandelion/go-dandelion/go-dandelion-cli/internal/build"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions go-dandelion-cli/cmd/cobra.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ package cmd

import (
"errors"
"github.com/gly-hub/go-dandelion/go-dandelion-cli/cmd/application"
"github.com/gly-hub/go-dandelion/go-dandelion-cli/cmd/build"
"github.com/spf13/cobra"
"github.com/team-dandelion/go-dandelion/go-dandelion-cli/cmd/application"
"github.com/team-dandelion/go-dandelion/go-dandelion-cli/cmd/build"
"os"
)

var rootCmd = &cobra.Command{
Use: "github.com/gly-hub/go-dandelion/go-dandelion-cli",
Use: "github.com/team-dandelion/go-dandelion/go-dandelion-cli",
Short: "go-dandelion-cli",
SilenceUsage: true,
Long: "go-dandelion-cli",
Expand Down
4 changes: 2 additions & 2 deletions go-dandelion-cli/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module github.com/gly-hub/go-dandelion/go-dandelion-cli
module github.com/team-dandelion/go-dandelion/go-dandelion-cli

go 1.20

require (
github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be
github.com/gly-hub/fasthttp-routing v0.0.0-20230103092213-f65d0ebb75bb
github.com/gly-hub/go-dandelion v1.1.1
github.com/team-dandelion/go-dandelion v1.1.1
github.com/gly-hub/toolbox v0.0.0-20230606092113-55b7564cca88
github.com/spf13/cobra v1.7.0
)
Expand Down
4 changes: 2 additions & 2 deletions go-dandelion-cli/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@ github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME
github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
github.com/gly-hub/fasthttp-routing v0.0.0-20230103092213-f65d0ebb75bb h1:zowBxKRjLgDHbSHcF8FfgfZr9beRYG58tokwDAiWGe0=
github.com/gly-hub/fasthttp-routing v0.0.0-20230103092213-f65d0ebb75bb/go.mod h1:+Y557LGCG89Q4TwIdXw3NF/HJqNjlxz+mT4VmC5uX+E=
github.com/gly-hub/go-dandelion v1.1.1 h1:+HoRq2KdJSQ7w1xEVj66HLiv7ajKhgaD0QJjtkkS8HM=
github.com/gly-hub/go-dandelion v1.1.1/go.mod h1:1vQMgZHFYxd9vVHAeItMPofxQKMY/8KKbGvbzcC/33k=
github.com/team-dandelion/go-dandelion v1.1.1 h1:+HoRq2KdJSQ7w1xEVj66HLiv7ajKhgaD0QJjtkkS8HM=
github.com/team-dandelion/go-dandelion v1.1.1/go.mod h1:1vQMgZHFYxd9vVHAeItMPofxQKMY/8KKbGvbzcC/33k=
github.com/gly-hub/toolbox v0.0.0-20230606092113-55b7564cca88 h1:QCEBUkQMCaELf32fKXDOIUcozX5tslciSj8HvNgoxTw=
github.com/gly-hub/toolbox v0.0.0-20230606092113-55b7564cca88/go.mod h1:+HfT//1beTikSEa/wV9bUqOv2/7GUQ7Yc6C5ixoMhFg=
github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
Expand Down
2 changes: 1 addition & 1 deletion go-dandelion-cli/internal/build/template.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package build

import (
"github.com/gly-hub/go-dandelion/go-dandelion-cli/internal/asset"
"github.com/team-dandelion/go-dandelion/go-dandelion-cli/internal/asset"
"os"
"text/template"
)
Expand Down
6 changes: 3 additions & 3 deletions go-dandelion-cli/internal/template/cmd/apiserver.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
routing "github.com/gly-hub/fasthttp-routing"
"{{ .PackageName }}/internal/route"
"github.com/gly-hub/go-dandelion/application"
"github.com/gly-hub/go-dandelion/config"
"github.com/gly-hub/go-dandelion/logger"
"github.com/team-dandelion/go-dandelion/application"
"github.com/team-dandelion/go-dandelion/config"
"github.com/team-dandelion/go-dandelion/logger"
"github.com/gly-hub/toolbox/ip"
"github.com/gly-hub/toolbox/stringx"
"github.com/spf13/cobra"
Expand Down
2 changes: 1 addition & 1 deletion go-dandelion-cli/internal/template/cmd/cobra.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cmd
import (
"errors"
"{{ .PackageName }}/cmd/api"
"github.com/gly-hub/go-dandelion/logger"
"github.com/team-dandelion/go-dandelion/logger"
"github.com/spf13/cobra"
"os"
)
Expand Down
6 changes: 3 additions & 3 deletions go-dandelion-cli/internal/template/cmd/rpcserver.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"{{ .PackageName }}/boot"
"{{ .PackageName }}/internal/service"
"github.com/gly-hub/go-dandelion/application"
"github.com/gly-hub/go-dandelion/config"
"github.com/gly-hub/go-dandelion/logger"
"github.com/team-dandelion/go-dandelion/application"
"github.com/team-dandelion/go-dandelion/config"
"github.com/team-dandelion/go-dandelion/logger"
"github.com/gly-hub/toolbox/stringx"
"github.com/spf13/cobra"
"io/ioutil"
Expand Down
8 changes: 4 additions & 4 deletions go-dandelion-cli/internal/template/internal/route.tmpl
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package route

import (
"github.com/gly-hub/go-dandelion/application"
"github.com/gly-hub/go-dandelion/config"
"github.com/gly-hub/go-dandelion/server/http"
routingSwagger "github.com/gly-hub/go-dandelion/swagger"
"github.com/team-dandelion/go-dandelion/application"
"github.com/team-dandelion/go-dandelion/config"
"github.com/team-dandelion/go-dandelion/server/http"
routingSwagger "github.com/team-dandelion/go-dandelion/swagger"
)

func InitRoute() {
Expand Down
2 changes: 1 addition & 1 deletion go-dandelion-cli/main.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/gly-hub/go-dandelion/go-dandelion-cli/cmd"
"github.com/team-dandelion/go-dandelion/go-dandelion-cli/cmd"
)

func main() {
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/gly-hub/go-dandelion
module github.com/team-dandelion/go-dandelion

go 1.18

Expand Down
14 changes: 7 additions & 7 deletions readme-ZH.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
## 📚关于go-dandelion
go-dandelion项目意在通过集成相关组件，方便开发者快速构建项目框架，提升开发效率。不在浪费时间在各组组件的集成上，可快速进行业务开发。

[![Go](https://github.com/gly-hub/go-dandelion/workflows/Go/badge.svg?branch=main)](https://github.com/gly-hub/go-dandelion/actions)
[![Go Report Card](https://goreportcard.com/badge/github.com/gly-hub/go-dandelion)](https://goreportcard.com/report/github.com/gly-hub/go-dandelion)
[![Go](https://github.com/team-dandelion/go-dandelion/workflows/Go/badge.svg?branch=main)](https://github.com/team-dandelion/go-dandelion/actions)
[![Go Report Card](https://goreportcard.com/badge/github.com/team-dandelion/go-dandelion)](https://goreportcard.com/report/github.com/team-dandelion/go-dandelion)
[![codecov](https://codecov.io/gh/gly-hub/go-dandelion/branch/main/graph/badge.svg)](https://codecov.io/gh/gly-hub/go-dandelion)
[![MIT license](https://img.shields.io/badge/License-Apache2.0-brightgreen.svg)](https://opensource.org/licenses/apache-2-0/)
[![Release](https://img.shields.io/badge/release-1.2.0-white.svg)](https://pkg.go.dev/github.com/gly-hub/go-dandelion/go-dandelion-cli?tab=doc)
[![Go.Dev reference](https://img.shields.io/badge/go.dev-reference-blue?logo=go&logoColor=white)](https://pkg.go.dev/github.com/gly-hub/go-dandelion/go-dandelion-cli?tab=doc)
[![Release](https://img.shields.io/badge/release-1.2.0-white.svg)](https://pkg.go.dev/github.com/team-dandelion/go-dandelion/go-dandelion-cli?tab=doc)
[![Go.Dev reference](https://img.shields.io/badge/go.dev-reference-blue?logo=go&logoColor=white)](https://pkg.go.dev/github.com/team-dandelion/go-dandelion/go-dandelion-cli?tab=doc)

[![Security Status](https://www.murphysec.com/platform3/v31/badge/1666706410635550720.svg)](https://www.murphysec.com/console/report/1666706410597801984/1666706410635550720)

Expand All @@ -34,8 +34,8 @@ go-dandelion项目意在通过集成相关组件，方便开发者快速构建

### 1.安装
```
go get github.com/gly-hub/go-dandelion/go-dandelion-cli@latest
go install github.com/gly-hub/go-dandelion/go-dandelion-cli@latest
go get github.com/team-dandelion/go-dandelion/go-dandelion-cli@latest
go install github.com/team-dandelion/go-dandelion/go-dandelion-cli@latest
```

### 2.创建项目
Expand Down Expand Up @@ -66,7 +66,7 @@ go build -o example-server

## 🔥贡献者

<a href="https://github.com/gly-hub/go-dandelion/graphs/contributors">
<a href="https://github.com/team-dandelion/go-dandelion/graphs/contributors">
<img src="https://contrib.rocks/image?repo=gly-hub/go-dandelion" />
</a>

Expand Down
Loading

0 comments on commit 168c962

Please sign in to comment.