Skip to content

Commit

Permalink
Merge pull request #13 from noovertime7/v3
Browse files Browse the repository at this point in the history 
refactor(system): Optimization code
  • Loading branch information
@noovertime7
noovertime7 authored Dec 15, 2022
2 parents 68a2046 + ab73b36 commit 8a2be6c
Show file tree
Hide file tree
Showing 29 changed files with 125 additions and 89 deletions.
2 changes: 1 addition & 1 deletion cmd/app/config/viper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func Binding(filePath string) error {
}
v.WatchConfig()
v.OnConfigChange(func(in fsnotify.Event) {
fmt.Println("config file changed,system config reload")
fmt.Println("config file changed,sys config reload")
if err := viper.Unmarshal(&SysConfig); err != nil {
fmt.Printf("config file changed,viper.Unmarshal failed, err:%v\n", err)
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/app/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package app
import (
"context"
"fmt"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"net/http"
"os"
"time"
Expand All @@ -12,7 +13,6 @@ import (

"github.com/noovertime7/kubemanage/cmd/app/config"
"github.com/noovertime7/kubemanage/cmd/app/options"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1/kube"
"github.com/noovertime7/kubemanage/pkg/logger"
"github.com/noovertime7/kubemanage/pkg/utils"
Expand Down
4 changes: 2 additions & 2 deletions controller/authority/casbin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/noovertime7/kubemanage/dto"
"github.com/noovertime7/kubemanage/middleware"
v1 "github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/globalError"
)

Expand All @@ -24,5 +24,5 @@ func (c *casbinController) GetPolicyPathByAuthorityId(ctx *gin.Context) {
middleware.ResponseError(ctx, globalError.NewGlobalError(globalError.ParamBindError, err))
return
}
middleware.ResponseSuccess(ctx, v1.CoreV1.CasbinService().GetPolicyPathByAuthorityId(rule.AuthorityId))
middleware.ResponseSuccess(ctx, v1.CoreV1.System().CasbinService().GetPolicyPathByAuthorityId(rule.AuthorityId))
}
2 changes: 1 addition & 1 deletion controller/kubeController/configmap.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package kubeController
import (
"github.com/gin-gonic/gin"
"github.com/noovertime7/kubemanage/dto/kubeDto"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"

"github.com/noovertime7/kubemanage/middleware"
v1 "github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1/kube"
"github.com/noovertime7/kubemanage/pkg/globalError"
)
Expand Down
2 changes: 1 addition & 1 deletion controller/kubeController/daemonset.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/noovertime7/kubemanage/dto/kubeDto"
"github.com/noovertime7/kubemanage/middleware"
v1 "github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1/kube"
"github.com/noovertime7/kubemanage/pkg/globalError"
)
Expand Down
2 changes: 1 addition & 1 deletion controller/kubeController/deployment.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package kubeController
import (
"github.com/gin-gonic/gin"
"github.com/noovertime7/kubemanage/dto/kubeDto"
v1 "github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
_ "k8s.io/api/apps/v1"

"github.com/noovertime7/kubemanage/middleware"
Expand Down
2 changes: 1 addition & 1 deletion controller/kubeController/ingress.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/noovertime7/kubemanage/dto/kubeDto"
"github.com/noovertime7/kubemanage/middleware"
v1 "github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1/kube"
"github.com/noovertime7/kubemanage/pkg/globalError"
)
Expand Down
2 changes: 1 addition & 1 deletion controller/kubeController/namespace.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/noovertime7/kubemanage/dto/kubeDto"
"github.com/noovertime7/kubemanage/middleware"
v1 "github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1/kube"
"github.com/noovertime7/kubemanage/pkg/globalError"
)
Expand Down
2 changes: 1 addition & 1 deletion controller/kubeController/node.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/noovertime7/kubemanage/dto/kubeDto"
"github.com/noovertime7/kubemanage/middleware"
v1 "github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1/kube"
"github.com/noovertime7/kubemanage/pkg/globalError"
)
Expand Down
2 changes: 1 addition & 1 deletion controller/kubeController/persistentVolumeClaim.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/noovertime7/kubemanage/dto/kubeDto"
"github.com/noovertime7/kubemanage/middleware"
v1 "github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1/kube"
"github.com/noovertime7/kubemanage/pkg/globalError"
)
Expand Down
2 changes: 1 addition & 1 deletion controller/kubeController/persistentvolume.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package kubeController
import (
"github.com/gin-gonic/gin"
"github.com/noovertime7/kubemanage/dto/kubeDto"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"

"github.com/noovertime7/kubemanage/middleware"
v1 "github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1/kube"
"github.com/noovertime7/kubemanage/pkg/globalError"
)
Expand Down
2 changes: 1 addition & 1 deletion controller/kubeController/pod.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/noovertime7/kubemanage/dto/kubeDto"
"github.com/noovertime7/kubemanage/middleware"
v1 "github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1/kube"
"github.com/noovertime7/kubemanage/pkg/globalError"
_ "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion controller/kubeController/secret.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package kubeController
import (
"github.com/gin-gonic/gin"
"github.com/noovertime7/kubemanage/dto/kubeDto"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"

"github.com/noovertime7/kubemanage/middleware"
v1 "github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1/kube"
"github.com/noovertime7/kubemanage/pkg/globalError"
)
Expand Down
2 changes: 1 addition & 1 deletion controller/kubeController/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package kubeController
import (
"github.com/gin-gonic/gin"
"github.com/noovertime7/kubemanage/dto/kubeDto"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"

"github.com/noovertime7/kubemanage/middleware"
v1 "github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1/kube"
"github.com/noovertime7/kubemanage/pkg/globalError"
)
Expand Down
2 changes: 1 addition & 1 deletion controller/kubeController/statefulset.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package kubeController
import (
"github.com/gin-gonic/gin"
"github.com/noovertime7/kubemanage/dto/kubeDto"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"

"github.com/noovertime7/kubemanage/middleware"
v1 "github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1/kube"
"github.com/noovertime7/kubemanage/pkg/globalError"
)
Expand Down
2 changes: 1 addition & 1 deletion controller/kubeController/workflow.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package kubeController
import (
"github.com/gin-gonic/gin"
"github.com/noovertime7/kubemanage/dto/kubeDto"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"

"github.com/noovertime7/kubemanage/middleware"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/globalError"
)

Expand Down
8 changes: 4 additions & 4 deletions controller/menu/menu.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/noovertime7/kubemanage/dto"
"github.com/noovertime7/kubemanage/middleware"
v1 "github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/globalError"
"github.com/noovertime7/kubemanage/pkg/utils"
)
Expand All @@ -24,7 +24,7 @@ func (m *menuController) GetMenus(ctx *gin.Context) {
middleware.ResponseError(ctx, globalError.NewGlobalError(globalError.ParamBindError, err))
return
}
menus, err := v1.CoreV1.Menu().GetMenu(ctx, aid)
menus, err := v1.CoreV1.System().Menu().GetMenu(ctx, aid)
if err != nil {
v1.Log.ErrorWithCode(globalError.GetError, err)
middleware.ResponseError(ctx, globalError.NewGlobalError(globalError.GetError, err))
Expand All @@ -48,7 +48,7 @@ func (m *menuController) AddBaseMenu(ctx *gin.Context) {
v1.Log.ErrorWithCode(globalError.ParamBindError, err)
middleware.ResponseError(ctx, globalError.NewGlobalError(globalError.ParamBindError, err))
}
if err := v1.CoreV1.Menu().AddBaseMenu(ctx, params); err != nil {
if err := v1.CoreV1.System().Menu().AddBaseMenu(ctx, params); err != nil {
v1.Log.ErrorWithCode(globalError.CreateError, err)
middleware.ResponseError(ctx, globalError.NewGlobalError(globalError.CreateError, err))
return
Expand All @@ -71,7 +71,7 @@ func (m *menuController) AddMenuAuthority(ctx *gin.Context) {
v1.Log.ErrorWithCode(globalError.ParamBindError, err)
middleware.ResponseError(ctx, globalError.NewGlobalError(globalError.ParamBindError, err))
}
if err := v1.CoreV1.Menu().AddMenuAuthority(ctx, params.Menus, params.AuthorityId); err != nil {
if err := v1.CoreV1.System().Menu().AddMenuAuthority(ctx, params.Menus, params.AuthorityId); err != nil {
v1.Log.ErrorWithCode(globalError.ServerError, err)
middleware.ResponseError(ctx, globalError.NewGlobalError(globalError.ServerError, err))
}
Expand Down
8 changes: 4 additions & 4 deletions controller/operation/operation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package operation

import (
"github.com/gin-gonic/gin"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"

"github.com/noovertime7/kubemanage/dto"
"github.com/noovertime7/kubemanage/middleware"
v1 "github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/globalError"
"github.com/noovertime7/kubemanage/pkg/utils"
)
Expand All @@ -26,7 +26,7 @@ func (o *operationController) GetOperationRecordList(ctx *gin.Context) {
middleware.ResponseError(ctx, globalError.NewGlobalError(globalError.ParamBindError, err))
return
}
data, err := v1.CoreV1.Operation().GetPageList(ctx, params)
data, err := v1.CoreV1.System().Operation().GetPageList(ctx, params)
if err != nil {
v1.Log.ErrorWithErr("查询失败", err)
middleware.ResponseError(ctx, globalError.NewGlobalError(globalError.GetError, err))
Expand All @@ -50,7 +50,7 @@ func (o *operationController) DeleteOperationRecord(ctx *gin.Context) {
v1.Log.ErrorWithCode(globalError.ParamBindError, err)
middleware.ResponseError(ctx, globalError.NewGlobalError(globalError.ParamBindError, err))
}
if err := v1.CoreV1.Operation().DeleteRecord(ctx, recordId); err != nil {
if err := v1.CoreV1.System().Operation().DeleteRecord(ctx, recordId); err != nil {
v1.Log.ErrorWithCode(globalError.DeleteError, err)
middleware.ResponseError(ctx, globalError.NewGlobalError(globalError.DeleteError, err))
}
Expand All @@ -73,7 +73,7 @@ func (o *operationController) DeleteOperationRecords(ctx *gin.Context) {
middleware.ResponseError(ctx, globalError.NewGlobalError(globalError.ParamBindError, err))
return
}
if err := v1.CoreV1.Operation().DeleteRecords(ctx, params.Ids); err != nil {
if err := v1.CoreV1.System().Operation().DeleteRecords(ctx, params.Ids); err != nil {
v1.Log.ErrorWithErr("批量删除失败", err)
middleware.ResponseError(ctx, globalError.NewGlobalError(globalError.DeleteError, err))
return
Expand Down
16 changes: 8 additions & 8 deletions controller/user/user.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ package user

import (
"github.com/gin-gonic/gin"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"strconv"

"github.com/noovertime7/kubemanage/dto"
"github.com/noovertime7/kubemanage/middleware"
"github.com/noovertime7/kubemanage/pkg"
v1 "github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/globalError"
"github.com/noovertime7/kubemanage/pkg/utils"
)
Expand All @@ -29,7 +29,7 @@ func (u *userController) Login(ctx *gin.Context) {
middleware.ResponseError(ctx, globalError.NewGlobalError(globalError.ParamBindError, err))
return
}
token, err := v1.CoreV1.User().Login(ctx, params)
token, err := v1.CoreV1.System().User().Login(ctx, params)
if err != nil {
v1.Log.ErrorWithCode(globalError.LoginErr, err)
middleware.ResponseError(ctx, globalError.NewGlobalError(globalError.LoginErr, err))
Expand All @@ -53,7 +53,7 @@ func (u *userController) LoginOut(ctx *gin.Context) {
v1.Log.Error(globalError.ServerError)
}
cla, _ := claims.(*pkg.CustomClaims)
if err := v1.CoreV1.User().LoginOut(ctx, cla.ID); err != nil {
if err := v1.CoreV1.System().User().LoginOut(ctx, cla.ID); err != nil {
v1.Log.ErrorWithCode(globalError.LogoutErr, err)
middleware.ResponseError(ctx, globalError.NewGlobalError(globalError.ParamBindError, err))
return
Expand All @@ -75,7 +75,7 @@ func (u *userController) GetUserInfo(ctx *gin.Context) {
v1.Log.ErrorWithCode(globalError.ParamBindError, err)
return
}
userInfo, err := v1.CoreV1.User().GetUserInfo(ctx, clalms.ID, clalms.AuthorityId)
userInfo, err := v1.CoreV1.System().User().GetUserInfo(ctx, clalms.ID, clalms.AuthorityId)
if err != nil {
v1.Log.ErrorWithCode(globalError.ParamBindError, err)
middleware.ResponseError(ctx, globalError.NewGlobalError(globalError.LogoutErr, err))
Expand Down Expand Up @@ -104,7 +104,7 @@ func (u *userController) SetUserAuthority(ctx *gin.Context) {
middleware.ResponseError(ctx, globalError.NewGlobalError(globalError.ParamBindError, err))
return
}
if err := v1.CoreV1.User().SetUserAuth(ctx, uid, params.AuthorityId); err != nil {
if err := v1.CoreV1.System().User().SetUserAuth(ctx, uid, params.AuthorityId); err != nil {
v1.Log.ErrorWithCode(globalError.ParamBindError, err)
middleware.ResponseError(ctx, globalError.NewGlobalError(globalError.ParamBindError, err))
return
Expand Down Expand Up @@ -137,7 +137,7 @@ func (u *userController) DeleteUser(ctx *gin.Context) {
v1.Log.ErrorWithCode(globalError.ParamBindError, err)
middleware.ResponseError(ctx, globalError.NewGlobalError(globalError.ParamBindError, err))
}
if err := v1.CoreV1.User().DeleteUser(ctx, uid); err != nil {
if err := v1.CoreV1.System().User().DeleteUser(ctx, uid); err != nil {
v1.Log.ErrorWithCode(globalError.DeleteError, err)
middleware.ResponseError(ctx, globalError.NewGlobalError(globalError.DeleteError, err))
return
Expand Down Expand Up @@ -165,7 +165,7 @@ func (u *userController) ChangePassword(ctx *gin.Context) {
middleware.ResponseError(ctx, globalError.NewGlobalError(globalError.ParamBindError, err))
return
}
if err := v1.CoreV1.User().ChangePassword(ctx, uid, params); err != nil {
if err := v1.CoreV1.System().User().ChangePassword(ctx, uid, params); err != nil {
v1.Log.ErrorWithCode(globalError.ServerError, err)
middleware.ResponseError(ctx, globalError.NewGlobalError(globalError.ServerError, err))
return
Expand All @@ -186,7 +186,7 @@ func (u *userController) ResetPassword(ctx *gin.Context) {
v1.Log.ErrorWithCode(globalError.ParamBindError, err)
middleware.ResponseError(ctx, globalError.NewGlobalError(globalError.ParamBindError, err))
}
if err := v1.CoreV1.User().ResetPassword(ctx, uid); err != nil {
if err := v1.CoreV1.System().User().ResetPassword(ctx, uid); err != nil {
v1.Log.ErrorWithCode(globalError.ServerError, err)
middleware.ResponseError(ctx, globalError.NewGlobalError(globalError.ServerError, err))
return
Expand Down
4 changes: 2 additions & 2 deletions middleware/casbin_rbac.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package middleware

import (
"github.com/gin-gonic/gin"
v1 "github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/globalError"
"github.com/noovertime7/kubemanage/pkg/utils"
"strconv"
Expand All @@ -26,7 +26,7 @@ func CasbinHandler() gin.HandlerFunc {
act := c.Request.Method
// 获取用户的角色
sub := strconv.Itoa(int(waitUse.AuthorityId))
e := v1.CoreV1.CasbinService().Casbin() // 判断策略中是否存在
e := v1.CoreV1.System().CasbinService().Casbin() // 判断策略中是否存在
success, _ := e.Enforce(sub, obj, act)
if success {
c.Next()
Expand Down
4 changes: 2 additions & 2 deletions middleware/operation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package middleware
import (
"bytes"
"encoding/json"
"github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"io"
"net/http"
"net/url"
Expand All @@ -14,7 +15,6 @@ import (
"go.uber.org/zap"

"github.com/noovertime7/kubemanage/dao/model"
v1 "github.com/noovertime7/kubemanage/pkg/core/kubemanage/v1"
"github.com/noovertime7/kubemanage/pkg/logger"
"github.com/noovertime7/kubemanage/pkg/utils"
)
Expand Down Expand Up @@ -109,7 +109,7 @@ func OperationRecord() gin.HandlerFunc {
// defer respPool.Put(newBody[:0])
//}

if err := v1.CoreV1.Operation().CreateOperationRecord(c, &record); err != nil {
if err := v1.CoreV1.System().Operation().CreateOperationRecord(c, &record); err != nil {
logger.LG.Error("create operation record error:", zap.Error(err))
}
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/core/kubemanage/v1/cloud.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func (c *cloud) Pods(cloud string) kube.PodInterface {
return kube.NewPods(nil, "", c.factory)
}

func newCloud(c *KubeManage) CloudInterface {
func NewCloud(c *KubeManage) CloudInterface {
return &cloud{
app: c,
factory: c.Factory,
Expand Down
Loading

0 comments on commit 8a2be6c

Please sign in to comment.