init

cmd/cache/redis/redis.go → cmd/cache/cache_cmd.go

@@ -1,4 +1,4 @@
-package redis
+package cache
 
 import (
 	"context"
@@ -29,13 +29,6 @@ var CONFIG = Redis{
 	PoolSize: 0,
 }
 
-type Redis struct {
-	DB       int    `mapstructure:"db"        json:"db"        yaml:"db"`
-	Addr     string `mapstructure:"addr"      json:"addr"      yaml:"addr"`
-	Password string `mapstructure:"password"  json:"password"  yaml:"password"`
-	PoolSize int    `mapstructure:"pool-size" json:"pool-size" yaml:"pool-size"`
-}
-
 func init() {
 	if Instance() == nil {
 		log.Fatal(ErrRedisInit)
@@ -56,38 +49,6 @@ func Instance() redis.UniversalClient {
 	return cacheClient
 }
 
-func SetCache(key string, value interface{}, expiration time.Duration) error {
-	err := Instance().Set(context.Background(), key, value, expiration).Err()
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func GetCache(key string) (interface{}, error) {
-	return Instance().Get(context.Background(), key).Result()
-}
-
-func DeleteCache(key string) (int64, error) {
-	return Instance().Del(context.Background(), key).Result()
-}
-
-func GetCacheString(key string) (string, error) {
-	value, err := GetCacheBytes(key)
-	if err != nil {
-		return "", err
-	}
-	return string(value), nil
-}
-
-func GetCacheBytes(key string) ([]byte, error) {
-	return Instance().Get(context.Background(), key).Bytes()
-}
-
-func GetCacheUint(key string) (uint64, error) {
-	return Instance().Get(context.Background(), key).Uint64()
-}
-
 func SetUserData(userId int64, userData *sysViewModel.UserData) error {
 	keyStr := fmt.Sprintf("user_%d", userId)
 	return SetCache(keyStr, userData, 0)

cmd/cache/cache_data_init.go

@@ -0,0 +1,5 @@
+package cache
+
+func InitCacheData() {
+
+}

cmd/cache/redis_client.go

@@ -0,0 +1,45 @@
+package cache
+
+import (
+	"context"
+	"time"
+)
+
+type Redis struct {
+	DB       int    `mapstructure:"db"        json:"db"        yaml:"db"`
+	Addr     string `mapstructure:"addr"      json:"addr"      yaml:"addr"`
+	Password string `mapstructure:"password"  json:"password"  yaml:"password"`
+	PoolSize int    `mapstructure:"pool-size" json:"pool-size" yaml:"pool-size"`
+}
+
+func SetCache(key string, value interface{}, expiration time.Duration) error {
+	err := Instance().Set(context.Background(), key, value, expiration).Err()
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func GetCache(key string) (interface{}, error) {
+	return Instance().Get(context.Background(), key).Result()
+}
+
+func DeleteCache(key string) (int64, error) {
+	return Instance().Del(context.Background(), key).Result()
+}
+
+func GetCacheString(key string) (string, error) {
+	value, err := GetCacheBytes(key)
+	if err != nil {
+		return "", err
+	}
+	return string(value), nil
+}
+
+func GetCacheBytes(key string) ([]byte, error) {
+	return Instance().Get(context.Background(), key).Bytes()
+}
+
+func GetCacheUint(key string) (uint64, error) {
+	return Instance().Get(context.Background(), key).Uint64()
+}

pkg/api/controller/base.go

@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/objx"
 	"io"
 	"log"
-	cache "xps/cmd/cache/redis"
+	"xps/cmd/cache"
 	"xps/pkg/system/viewmodel"
 )
 

pkg/api/service/api_service.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"errors"
-	cache "xps/cmd/cache/redis"
+	"xps/cmd/cache"
 	"xps/cmd/datasource"
 	"xps/pkg/api/datamodel"
 	"xps/pkg/api/repository"

pkg/app/controller/base.go

@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/objx"
 	"io"
 	"log"
-	cache "xps/cmd/cache/redis"
+	"xps/cmd/cache"
 	"xps/pkg/system/viewmodel"
 )
 

pkg/biz/controller/base.go

@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/objx"
 	"io"
 	"log"
-	cache "xps/cmd/cache/redis"
+	"xps/cmd/cache"
 	"xps/pkg/system/viewmodel"
 )
 

pkg/biz/service/biz_object_attr_service.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"errors"
-	cache "xps/cmd/cache/redis"
+	"xps/cmd/cache"
 	"xps/cmd/datasource"
 	"xps/pkg/base"
 	"xps/pkg/biz/datamodel"

pkg/biz/service/biz_object_mapping_service.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"errors"
-	cache "xps/cmd/cache/redis"
+	"xps/cmd/cache"
 	"xps/cmd/datasource"
 	"xps/pkg/base"
 	"xps/pkg/biz/datamodel"

pkg/biz/service/biz_object_oam_mapping_service.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"errors"
-	cache "xps/cmd/cache/redis"
+	"xps/cmd/cache"
 	"xps/cmd/datasource"
 	"xps/pkg/biz/datamodel"
 	"xps/pkg/biz/repository"

pkg/biz/service/biz_object_oam_params_service.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"errors"
-	cache "xps/cmd/cache/redis"
+	"xps/cmd/cache"
 	"xps/cmd/datasource"
 	"xps/pkg/biz/datamodel"
 	"xps/pkg/biz/repository"

pkg/biz/service/biz_object_oam_rule_service.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"errors"
-	cache "xps/cmd/cache/redis"
+	"xps/cmd/cache"
 	"xps/cmd/datasource"
 	"xps/pkg/biz/datamodel"
 	"xps/pkg/biz/repository"

pkg/biz/service/biz_object_oam_service.go

@@ -3,7 +3,7 @@ package service
 import (
 	"errors"
 	"time"
-	cache "xps/cmd/cache/redis"
+	"xps/cmd/cache"
 	"xps/cmd/constant"
 	"xps/cmd/datasource"
 	apiDataModel "xps/pkg/api/datamodel"

pkg/biz/service/biz_object_service.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"errors"
-	cache "xps/cmd/cache/redis"
+	"xps/cmd/cache"
 	"xps/cmd/datasource"
 	"xps/pkg/base"
 	"xps/pkg/biz/datamodel"

pkg/bpm/controller/base.go

@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/objx"
 	"io"
 	"log"
-	cache "xps/cmd/cache/redis"
+	"xps/cmd/cache"
 	"xps/pkg/system/viewmodel"
 )
 

pkg/bpm/service/base.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"log"
-	cache "xps/cmd/cache/redis"
+	"xps/cmd/cache"
 	"xps/cmd/datasource"
 	"xps/pkg/system/viewmodel"
 )

pkg/dataway/database_io.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"time"
 	"xorm.io/xorm"
-	cache "xps/cmd/cache/redis"
+	"xps/cmd/cache"
 	"xps/cmd/constant"
 	"xps/pkg/base"
 )

pkg/gateway/api_gateway_controller.go

@@ -4,7 +4,7 @@ import (
 	"github.com/kataras/iris/v12/mvc"
 	"strconv"
 	"time"
-	cache "xps/cmd/cache/redis"
+	"xps/cmd/cache"
 	"xps/cmd/constant"
 	"xps/pkg/api/controller"
 	"xps/pkg/base"

pkg/gateway/http_handler.go

@@ -3,7 +3,7 @@ package gateway
 import (
 	"errors"
 	"time"
-	cache "xps/cmd/cache/redis"
+	"xps/cmd/cache"
 	"xps/cmd/constant"
 	"xps/cmd/datasource"
 	"xps/pkg/base"

pkg/model/controller/base.go

@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/objx"
 	"io"
 	"log"
-	cache "xps/cmd/cache/redis"
+	"xps/cmd/cache"
 	"xps/pkg/system/viewmodel"
 )
 

pkg/model/service/base.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"log"
-	cache "xps/cmd/cache/redis"
+	"xps/cmd/cache"
 	"xps/cmd/datasource"
 	"xps/pkg/system/viewmodel"
 )

pkg/model/service/model_object_attr_service.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"errors"
-	cache "xps/cmd/cache/redis"
+	"xps/cmd/cache"
 	"xps/cmd/datasource"
 	"xps/pkg/base"
 	"xps/pkg/model/datamodel"

pkg/model/service/model_object_oam_service.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"errors"
-	cache "xps/cmd/cache/redis"
+	"xps/cmd/cache"
 	"xps/cmd/datasource"
 	"xps/pkg/model/datamodel"
 	"xps/pkg/model/repository"

pkg/model/service/model_object_service.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"errors"
-	cache "xps/cmd/cache/redis"
+	"xps/cmd/cache"
 	"xps/cmd/datasource"
 	"xps/pkg/base"
 	"xps/pkg/model/datamodel"

pkg/repo/controller/base.go

@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/objx"
 	"io"
 	"log"
-	cache "xps/cmd/cache/redis"
+	"xps/cmd/cache"
 	"xps/pkg/system/viewmodel"
 )
 

pkg/repo/controller/repo_db_controller.go

@@ -2,7 +2,7 @@ package controller
 
 import (
 	"github.com/kataras/iris/v12/mvc"
-	cache "xps/cmd/cache/redis"
+	"xps/cmd/cache"
 	"xps/pkg/repo/service"
 )
 

pkg/system/controller/base.go

@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/objx"
 	"io"
 	"log"
-	cache "xps/cmd/cache/redis"
+	"xps/cmd/cache"
 	"xps/pkg/system/viewmodel"
 )
 

pkg/system/service/login_service.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"time"
-	cache "xps/cmd/cache/redis"
+	"xps/cmd/cache"
 	"xps/cmd/datasource"
 	"xps/cmd/middleware"
 	"xps/pkg/system/repository"