Skip to content

Commit 24f0d92

Browse files
author
linrongjian
committed
fix module
1 parent fa85c38 commit 24f0d92

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+195
-140
lines changed

‎cavy.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package cavy
22

33
import (
4-
"github.com/linrongjian/cavy/component/logserver/logconsumer"
5-
"github.com/linrongjian/cavy/component/logserver/logproducer"
6-
"github.com/linrongjian/cavy/core/network/amqp/rmqconsumer"
4+
"cavy/component/logserver/logconsumer"
5+
"cavy/component/logserver/logproducer"
6+
"cavy/core/network/amqp/rmqconsumer"
77
)
88

99
var (

‎common/aes/aes_gcm.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"crypto/cipher"
66
"fmt"
77

8-
"github.com/linrongjian/cavy/common/util"
8+
"cavy/common/util"
99
)
1010

1111
// AES-GCM 加密数据

‎common/aes/aes_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"encoding/base64"
55
"testing"
66

7-
"github.com/linrongjian/cavy/common/xlog"
7+
"cavy/common/xlog"
88
)
99

1010
var (

‎common/api/token.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"strings"
88
"time"
99

10-
"github.com/linrongjian/cavy/common/mlog"
10+
"cavy/common/mlog"
1111
)
1212

1313
const (

‎common/cache/blacklist.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ import (
44
"fmt"
55
"time"
66

7+
"cavy/common/stateless"
8+
79
"github.com/gomodule/redigo/redis"
8-
"github.com/linrongjian/cavy/common/stateless"
910
)
1011

1112
// AddRequestNum 增加请求次数

‎common/cache/cache.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ import (
55
"fmt"
66
"time"
77

8+
"cavy/common/api"
9+
"cavy/common/hook"
10+
"cavy/common/mlog"
11+
812
"github.com/gomodule/redigo/redis"
9-
"github.com/linrongjian/cavy/common/api"
10-
"github.com/linrongjian/cavy/common/hook"
11-
"github.com/linrongjian/cavy/common/mlog"
1213
)
1314

1415
// baseCache 基础缓存数据结构

‎common/cache/config.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package cache
22

33
import (
4+
"cavy/common/mlog"
5+
"cavy/common/stateless"
6+
47
"github.com/gomodule/redigo/redis"
5-
"github.com/linrongjian/cavy/common/mlog"
6-
"github.com/linrongjian/cavy/common/stateless"
78
)
89

910
func ReadConfig(key string) string {

‎common/cache/hashCache.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package cache
22

33
import (
4+
"cavy/common/mlog"
5+
46
"github.com/gomodule/redigo/redis"
5-
"github.com/linrongjian/cavy/common/mlog"
67
)
78

89
// HashCache 哈希表缓存

‎common/cache/nginx.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package cache
22

33
import (
4+
"cavy/common/stateless"
5+
46
"github.com/gomodule/redigo/redis"
5-
"github.com/linrongjian/cavy/common/stateless"
67
)
78

89
// WriteNginxAddr 写nginx地址

‎common/cache/player.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package cache
22

33
import (
4+
"cavy/common/mlog"
5+
"cavy/common/stateless"
6+
47
"github.com/gomodule/redigo/redis"
5-
"github.com/linrongjian/cavy/common/mlog"
6-
"github.com/linrongjian/cavy/common/stateless"
78
)
89

910
// GetOnline 获取在线状态

‎common/cache/server.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ package cache
33
import (
44
"encoding/json"
55

6+
"cavy/common/stateless"
7+
68
"github.com/gomodule/redigo/redis"
7-
"github.com/linrongjian/cavy/common/stateless"
89
)
910

1011
// Server 服务器信息

‎common/cache/statistics.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ import (
44
"encoding/json"
55
"time"
66

7+
"cavy/common/mlog"
8+
"cavy/common/stateless"
9+
710
"github.com/gomodule/redigo/redis"
8-
"github.com/linrongjian/cavy/common/mlog"
9-
"github.com/linrongjian/cavy/common/stateless"
1011
)
1112

1213
// 统计对象信息

‎common/cache/syncdb.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ package cache
33
import (
44
"encoding/json"
55

6+
"cavy/common/stateless"
7+
68
"github.com/gomodule/redigo/redis"
7-
"github.com/linrongjian/cavy/common/stateless"
89
)
910

1011
type Syncdb struct {

‎common/consul/config.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ import (
66
"strings"
77
"time"
88

9+
"cavy/common/api"
10+
"cavy/common/hook"
11+
912
consul "github.com/hashicorp/consul/api"
10-
"github.com/linrongjian/cavy/common/api"
11-
"github.com/linrongjian/cavy/common/hook"
1213
"github.com/sirupsen/logrus"
1314
)
1415

‎common/consul/consul.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ import (
99

1010
////"battlePlatform/wjrgit.qianz.com/common/api" //"battlePlatform/wjrgit.qianz.com/common/hook"
1111

12-
"github.com/linrongjian/cavy/common/api"
13-
"github.com/linrongjian/cavy/common/hook"
12+
"cavy/common/api"
13+
"cavy/common/hook"
14+
15+
"cavy/common/mlog"
1416

1517
consul "github.com/hashicorp/consul/api"
16-
"github.com/linrongjian/cavy/common/mlog"
1718
)
1819

1920
var client *consul.Client

‎common/core/core.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package core
22

33
import (
4-
"github.com/linrongjian/cavy/common/api"
4+
"cavy/common/api"
55
)
66

77
type rechargeCore struct {

‎common/errgroup/errgroup_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"testing"
88
"time"
99

10-
"github.com/linrongjian/cavy/common/xlog"
10+
"cavy/common/xlog"
1111
)
1212

1313
func TestErrgroup(t *testing.T) {

‎common/hook/hook.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package hook
22

3-
import "github.com/linrongjian/cavy/common/api"
3+
import "cavy/common/api"
44

55
var hooks = []func(s *api.Conf){}
66

‎common/jwt/rsa.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import (
55
"crypto/rand"
66
"crypto/rsa"
77
"fmt"
8-
9-
"github.com/go-pay/gopay"
108
)
119

1210
// Implements the RSA family of signing methods signing methods
@@ -74,7 +72,7 @@ func (m *SigningMethodRSA) Verify(signingString, signature string, key any) erro
7472

7573
// Verify the signature
7674
if err = rsa.VerifyPKCS1v15(rsaKey, crypto.SHA256, h.Sum(nil), sig); err != nil {
77-
return fmt.Errorf("[%w]: %v", gopay.VerifySignatureErr, err)
75+
return fmt.Errorf("[%w]: %v", "todo", err)
7876
}
7977
return nil
8078
}

‎common/launch/launch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package launch
22

3-
import "github.com/linrongjian/cavy/core/module"
3+
import "cavy/core/module"
44

55
type LaunchBase struct {
66
*module.Module

‎common/retry/retry_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"testing"
66
"time"
77

8-
"github.com/go-pay/gopay/pkg/xlog"
8+
"cavy/common/xlog"
99
)
1010

1111
func TestRetry(t *testing.T) {

‎common/servercfg/setting.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"io/ioutil"
77

8-
"github.com/linrongjian/cavy/common/api"
8+
"cavy/common/api"
99
)
1010

1111
// Cfg server config

‎common/xhttp/body_map.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"sort"
1010
"strings"
1111

12-
"github.com/linrongjian/cavy/common/util"
12+
"cavy/common/util"
1313
)
1414

1515
type BodyMap map[string]any

‎common/xhttp/client_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"os"
66
"testing"
77

8-
"github.com/linrongjian/cavy/common/util"
9-
"github.com/linrongjian/cavy/common/xlog"
8+
"cavy/common/util"
9+
"cavy/common/xlog"
1010
)
1111

1212
type HttpGet struct {

‎common/xhttp/request.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"sort"
1515
"strings"
1616

17-
"github.com/linrongjian/cavy/common/util"
17+
"cavy/common/util"
1818
)
1919

2020
type Request struct {

‎common/xlog/log_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"testing"
66

7-
"github.com/linrongjian/cavy/common/errgroup"
7+
"cavy/common/errgroup"
88
)
99

1010
func TestLog(t *testing.T) {

‎common/xpem/xpem_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package xpem
33
import (
44
"testing"
55

6-
"github.com/linrongjian/cavy/common/xlog"
6+
"cavy/common/xlog"
77
)
88

99
var (

‎common/xrsa/rsa_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"fmt"
77
"testing"
88

9-
"github.com/linrongjian/cavy/common/xlog"
9+
"cavy/common/xlog"
1010
)
1111

1212
var (

‎common/xtime/parse_format.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"strings"
55
"time"
66

7-
"github.com/linrongjian/cavy/common/util"
7+
"cavy/common/util"
88
)
99

1010
// 解析时间

‎common/xtime/xtime_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"testing"
66
"time"
77

8-
"github.com/linrongjian/cavy/common/xlog"
8+
"cavy/common/xlog"
99
)
1010

1111
func TestXtime(t *testing.T) {

‎component/auth/login_server.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"os"
55
"os/signal"
66

7-
"github.com/linrongjian/cavy/core/app"
8-
"github.com/linrongjian/cavy/core/logger"
7+
"cavy/core/app"
8+
"cavy/core/logger"
99
)
1010

1111
type LoginServer interface {

‎component/auth/options.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package auth
33
import (
44
"context"
55

6-
"github.com/linrongjian/cavy/core/store/redis"
6+
"cavy/core/store/redis"
77
)
88

99
type Options struct {

‎component/gateway/connect.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import (
44
"math/rand"
55
"strconv"
66

7-
"github.com/linrongjian/cavy/core/httpsvr"
8-
"github.com/linrongjian/cavy/core/logger"
9-
"github.com/linrongjian/cavy/core/network/protocols/wswrap"
10-
"github.com/linrongjian/cavy/proto/pb"
7+
"cavy/core/httpsvr"
8+
"cavy/core/logger"
9+
"cavy/core/network/protocols/wswrap"
10+
"cavy/proto/pb"
1111
)
1212

1313
var (

‎component/gateway/gateway.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package gateway
22

33
import (
4-
"github.com/linrongjian/cavy/core/app"
5-
"github.com/linrongjian/cavy/core/httpsvr"
6-
"github.com/linrongjian/cavy/core/network/protocols/mqwrap"
4+
"cavy/core/app"
5+
"cavy/core/httpsvr"
6+
"cavy/core/network/protocols/mqwrap"
77
)
88

99
type GateServer interface {

‎component/gateway/opts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package gateway
33
import (
44
"context"
55

6-
"github.com/linrongjian/cavy/core/store/redis"
6+
"cavy/core/store/redis"
77
)
88

99
type Opts struct {

‎component/gateway/player.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import (
66
"sync/atomic"
77
"time"
88

9-
"github.com/linrongjian/cavy/core/app"
10-
"github.com/linrongjian/cavy/core/logger"
11-
"github.com/linrongjian/cavy/core/network/protocols/mqwrap"
12-
"github.com/linrongjian/cavy/core/network/protocols/wswrap"
9+
"cavy/core/app"
10+
"cavy/core/logger"
11+
"cavy/core/network/protocols/mqwrap"
12+
"cavy/core/network/protocols/wswrap"
1313
)
1414

1515
const (

0 commit comments

Comments
 (0)