style: /common/config move to /config

arklnk · Aug 28, 2022 · f757397 · f757397
1 parent 5da1e9f
commit f757397
Show file tree

Hide file tree

Showing 29 changed files with 28 additions and 29 deletions.
diff --git a/app/core/cmd/api/internal/logic/config/dict/addconfigdictlogic.go b/app/core/cmd/api/internal/logic/config/dict/addconfigdictlogic.go
@@ -6,8 +6,8 @@ import (
 	"ark-admin-zero/app/core/cmd/api/internal/svc"
 	"ark-admin-zero/app/core/cmd/api/internal/types"
 	"ark-admin-zero/app/core/model"
-	"ark-admin-zero/common/config"
 	"ark-admin-zero/common/errorx"
+	"ark-admin-zero/config"
 
 	"github.com/jinzhu/copier"
 	"github.com/zeromicro/go-zero/core/logx"

diff --git a/app/core/cmd/api/internal/logic/config/dict/deleteconfigdictlogic.go b/app/core/cmd/api/internal/logic/config/dict/deleteconfigdictlogic.go
@@ -5,8 +5,8 @@ import (
 
 	"ark-admin-zero/app/core/cmd/api/internal/svc"
 	"ark-admin-zero/app/core/cmd/api/internal/types"
-	"ark-admin-zero/common/config"
 	"ark-admin-zero/common/errorx"
+	"ark-admin-zero/config"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

diff --git a/app/core/cmd/api/internal/logic/config/dict/updateconfigdictlogic.go b/app/core/cmd/api/internal/logic/config/dict/updateconfigdictlogic.go
@@ -5,8 +5,8 @@ import (
 
 	"ark-admin-zero/app/core/cmd/api/internal/svc"
 	"ark-admin-zero/app/core/cmd/api/internal/types"
-	"ark-admin-zero/common/config"
 	"ark-admin-zero/common/errorx"
+	"ark-admin-zero/config"
 
 	"github.com/jinzhu/copier"
 	"github.com/zeromicro/go-zero/core/logx"

diff --git a/app/core/cmd/api/internal/logic/log/login/getlogloginpagelogic.go b/app/core/cmd/api/internal/logic/log/login/getlogloginpagelogic.go
@@ -5,8 +5,8 @@ import (
 
 	"ark-admin-zero/app/core/cmd/api/internal/svc"
 	"ark-admin-zero/app/core/cmd/api/internal/types"
-	"ark-admin-zero/common/config"
 	"ark-admin-zero/common/errorx"
+	"ark-admin-zero/config"
 
 	"github.com/jinzhu/copier"
 	"github.com/zeromicro/go-zero/core/logx"

diff --git a/app/core/cmd/api/internal/logic/sys/dept/addsysdeptlogic.go b/app/core/cmd/api/internal/logic/sys/dept/addsysdeptlogic.go
@@ -6,8 +6,8 @@ import (
 	"ark-admin-zero/app/core/cmd/api/internal/svc"
 	"ark-admin-zero/app/core/cmd/api/internal/types"
 	"ark-admin-zero/app/core/model"
-	"ark-admin-zero/common/config"
 	"ark-admin-zero/common/errorx"
+	"ark-admin-zero/config"
 
 	"github.com/jinzhu/copier"
 	"github.com/zeromicro/go-zero/core/logx"

diff --git a/app/core/cmd/api/internal/logic/sys/dept/updatesysdeptlogic.go b/app/core/cmd/api/internal/logic/sys/dept/updatesysdeptlogic.go
@@ -6,9 +6,9 @@ import (
 	"ark-admin-zero/app/core/cmd/api/internal/svc"
 	"ark-admin-zero/app/core/cmd/api/internal/types"
 	"ark-admin-zero/app/core/model"
-	"ark-admin-zero/common/config"
 	"ark-admin-zero/common/errorx"
 	"ark-admin-zero/common/utils"
+	"ark-admin-zero/config"
 
 	"github.com/jinzhu/copier"
 	"github.com/zeromicro/go-zero/core/logx"

diff --git a/app/core/cmd/api/internal/logic/sys/job/updatesysjoblogic.go b/app/core/cmd/api/internal/logic/sys/job/updatesysjoblogic.go
@@ -5,8 +5,8 @@ import (
 
 	"ark-admin-zero/app/core/cmd/api/internal/svc"
 	"ark-admin-zero/app/core/cmd/api/internal/types"
-	"ark-admin-zero/common/config"
 	"ark-admin-zero/common/errorx"
+	"ark-admin-zero/config"
 
 	"github.com/jinzhu/copier"
 	"github.com/zeromicro/go-zero/core/logx"

diff --git a/app/core/cmd/api/internal/logic/sys/menu/addsyspermmenulogic.go b/app/core/cmd/api/internal/logic/sys/menu/addsyspermmenulogic.go
@@ -7,8 +7,8 @@ import (
 	"ark-admin-zero/app/core/cmd/api/internal/svc"
 	"ark-admin-zero/app/core/cmd/api/internal/types"
 	"ark-admin-zero/app/core/model"
-	"ark-admin-zero/common/config"
 	"ark-admin-zero/common/errorx"
+	"ark-admin-zero/config"
 
 	"github.com/jinzhu/copier"
 	"github.com/zeromicro/go-zero/core/logx"

diff --git a/app/core/cmd/api/internal/logic/sys/menu/deletesyspermmenulogic.go b/app/core/cmd/api/internal/logic/sys/menu/deletesyspermmenulogic.go
@@ -5,8 +5,8 @@ import (
 
 	"ark-admin-zero/app/core/cmd/api/internal/svc"
 	"ark-admin-zero/app/core/cmd/api/internal/types"
-	"ark-admin-zero/common/config"
 	"ark-admin-zero/common/errorx"
+	"ark-admin-zero/config"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

diff --git a/app/core/cmd/api/internal/logic/sys/menu/updatesyspermmenulogic.go b/app/core/cmd/api/internal/logic/sys/menu/updatesyspermmenulogic.go
@@ -7,9 +7,9 @@ import (
 	"ark-admin-zero/app/core/cmd/api/internal/svc"
 	"ark-admin-zero/app/core/cmd/api/internal/types"
 	"ark-admin-zero/app/core/model"
-	"ark-admin-zero/common/config"
 	"ark-admin-zero/common/errorx"
 	"ark-admin-zero/common/utils"
+	"ark-admin-zero/config"
 
 	"github.com/jinzhu/copier"
 	"github.com/zeromicro/go-zero/core/logx"

diff --git a/app/core/cmd/api/internal/logic/sys/profession/updatesysprofessionlogic.go b/app/core/cmd/api/internal/logic/sys/profession/updatesysprofessionlogic.go
@@ -5,8 +5,8 @@ import (
 
 	"ark-admin-zero/app/core/cmd/api/internal/svc"
 	"ark-admin-zero/app/core/cmd/api/internal/types"
-	"ark-admin-zero/common/config"
 	"ark-admin-zero/common/errorx"
+	"ark-admin-zero/config"
 
 	"github.com/jinzhu/copier"
 	"github.com/zeromicro/go-zero/core/logx"

diff --git a/app/core/cmd/api/internal/logic/sys/role/addsysrolelogic.go b/app/core/cmd/api/internal/logic/sys/role/addsysrolelogic.go
@@ -7,8 +7,8 @@ import (
 	"ark-admin-zero/app/core/cmd/api/internal/svc"
 	"ark-admin-zero/app/core/cmd/api/internal/types"
 	"ark-admin-zero/app/core/model"
-	"ark-admin-zero/common/config"
 	"ark-admin-zero/common/errorx"
+	"ark-admin-zero/config"
 
 	"github.com/jinzhu/copier"
 	"github.com/zeromicro/go-zero/core/logx"

diff --git a/app/core/cmd/api/internal/logic/sys/role/deletesysrolelogic.go b/app/core/cmd/api/internal/logic/sys/role/deletesysrolelogic.go
@@ -5,8 +5,8 @@ import (
 
 	"ark-admin-zero/app/core/cmd/api/internal/svc"
 	"ark-admin-zero/app/core/cmd/api/internal/types"
-	"ark-admin-zero/common/config"
 	"ark-admin-zero/common/errorx"
+	"ark-admin-zero/config"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

diff --git a/app/core/cmd/api/internal/logic/sys/role/updatesysrolelogic.go b/app/core/cmd/api/internal/logic/sys/role/updatesysrolelogic.go
@@ -7,9 +7,9 @@ import (
 	"ark-admin-zero/app/core/cmd/api/internal/svc"
 	"ark-admin-zero/app/core/cmd/api/internal/types"
 	"ark-admin-zero/app/core/model"
-	"ark-admin-zero/common/config"
 	"ark-admin-zero/common/errorx"
 	"ark-admin-zero/common/utils"
+	"ark-admin-zero/config"
 
 	"github.com/jinzhu/copier"
 	"github.com/zeromicro/go-zero/core/logx"

diff --git a/app/core/cmd/api/internal/logic/sys/user/addsysuserlogic.go b/app/core/cmd/api/internal/logic/sys/user/addsysuserlogic.go
@@ -7,9 +7,9 @@ import (
 	"ark-admin-zero/app/core/cmd/api/internal/svc"
 	"ark-admin-zero/app/core/cmd/api/internal/types"
 	"ark-admin-zero/app/core/model"
-	"ark-admin-zero/common/config"
 	"ark-admin-zero/common/errorx"
 	"ark-admin-zero/common/utils"
+	"ark-admin-zero/config"
 
 	"github.com/jinzhu/copier"
 	"github.com/zeromicro/go-zero/core/logx"

diff --git a/app/core/cmd/api/internal/logic/sys/user/deletesysuserlogic.go b/app/core/cmd/api/internal/logic/sys/user/deletesysuserlogic.go
@@ -5,8 +5,8 @@ import (
 
 	"ark-admin-zero/app/core/cmd/api/internal/svc"
 	"ark-admin-zero/app/core/cmd/api/internal/types"
-	"ark-admin-zero/common/config"
 	"ark-admin-zero/common/errorx"
+	"ark-admin-zero/config"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

diff --git a/app/core/cmd/api/internal/logic/sys/user/getsysuserrdpjinfologic.go b/app/core/cmd/api/internal/logic/sys/user/getsysuserrdpjinfologic.go
@@ -8,8 +8,8 @@ import (
 	"ark-admin-zero/app/core/cmd/api/internal/svc"
 	"ark-admin-zero/app/core/cmd/api/internal/types"
 	"ark-admin-zero/app/core/model"
-	"ark-admin-zero/common/config"
 	"ark-admin-zero/common/utils"
+	"ark-admin-zero/config"
 
 	"github.com/jinzhu/copier"
 	"github.com/zeromicro/go-zero/core/logx"

diff --git a/app/core/cmd/api/internal/logic/sys/user/updatesysuserlogic.go b/app/core/cmd/api/internal/logic/sys/user/updatesysuserlogic.go
@@ -7,9 +7,9 @@ import (
 
 	"ark-admin-zero/app/core/cmd/api/internal/svc"
 	"ark-admin-zero/app/core/cmd/api/internal/types"
-	"ark-admin-zero/common/config"
 	"ark-admin-zero/common/errorx"
 	"ark-admin-zero/common/utils"
+	"ark-admin-zero/config"
 
 	"github.com/jinzhu/copier"
 	"github.com/zeromicro/go-zero/core/logx"

diff --git a/app/core/cmd/api/internal/logic/user/getlogincaptchalogic.go b/app/core/cmd/api/internal/logic/user/getlogincaptchalogic.go
@@ -5,8 +5,8 @@ import (
 
 	"ark-admin-zero/app/core/cmd/api/internal/svc"
 	"ark-admin-zero/app/core/cmd/api/internal/types"
-	"ark-admin-zero/common/config"
 	"ark-admin-zero/common/utils"
+	"ark-admin-zero/config"
 
 	"github.com/mojocn/base64Captcha"
 	"github.com/satori/go.uuid"

diff --git a/app/core/cmd/api/internal/logic/user/getuserpermmenulogic.go b/app/core/cmd/api/internal/logic/user/getuserpermmenulogic.go
@@ -8,9 +8,9 @@ import (
 	"ark-admin-zero/app/core/cmd/api/internal/svc"
 	"ark-admin-zero/app/core/cmd/api/internal/types"
 	"ark-admin-zero/app/core/model"
-	"ark-admin-zero/common/config"
 	"ark-admin-zero/common/errorx"
 	"ark-admin-zero/common/utils"
+	"ark-admin-zero/config"
 
 	"github.com/jinzhu/copier"
 	"github.com/zeromicro/go-zero/core/logx"

diff --git a/app/core/cmd/api/internal/logic/user/loginlogic.go b/app/core/cmd/api/internal/logic/user/loginlogic.go
@@ -9,9 +9,9 @@ import (
 	"ark-admin-zero/app/core/cmd/api/internal/svc"
 	"ark-admin-zero/app/core/cmd/api/internal/types"
 	"ark-admin-zero/app/core/model"
-	"ark-admin-zero/common/config"
 	"ark-admin-zero/common/errorx"
 	"ark-admin-zero/common/utils"
+	"ark-admin-zero/config"
 
 	"github.com/golang-jwt/jwt/v4"
 	"github.com/zeromicro/go-zero/core/logx"

diff --git a/app/core/cmd/api/internal/logic/user/logoutlogic.go b/app/core/cmd/api/internal/logic/user/logoutlogic.go
@@ -5,8 +5,8 @@ import (
 	"strconv"
 
 	"ark-admin-zero/app/core/cmd/api/internal/svc"
-	"ark-admin-zero/common/config"
 	"ark-admin-zero/common/utils"
+	"ark-admin-zero/config"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

diff --git a/app/core/cmd/api/internal/logic/user/updateuserpasswordlogic.go b/app/core/cmd/api/internal/logic/user/updateuserpasswordlogic.go
@@ -5,9 +5,9 @@ import (
 
 	"ark-admin-zero/app/core/cmd/api/internal/svc"
 	"ark-admin-zero/app/core/cmd/api/internal/types"
-	"ark-admin-zero/common/config"
 	"ark-admin-zero/common/errorx"
 	"ark-admin-zero/common/utils"
+	"ark-admin-zero/config"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

diff --git a/app/core/cmd/api/internal/logic/user/updateuserprofilelogic.go b/app/core/cmd/api/internal/logic/user/updateuserprofilelogic.go
@@ -5,9 +5,9 @@ import (
 
 	"ark-admin-zero/app/core/cmd/api/internal/svc"
 	"ark-admin-zero/app/core/cmd/api/internal/types"
-	"ark-admin-zero/common/config"
 	"ark-admin-zero/common/errorx"
 	"ark-admin-zero/common/utils"
+	"ark-admin-zero/config"
 
 	"github.com/jinzhu/copier"
 	"github.com/zeromicro/go-zero/core/logx"

diff --git a/app/core/cmd/api/internal/middleware/permmenuauthmiddleware.go b/app/core/cmd/api/internal/middleware/permmenuauthmiddleware.go
@@ -5,9 +5,9 @@ import (
 	"strconv"
 	"strings"
 
-	"ark-admin-zero/common/config"
 	"ark-admin-zero/common/errorx"
 	"ark-admin-zero/common/utils"
+	"ark-admin-zero/config"
 
 	"github.com/zeromicro/go-zero/core/stores/redis"
 	"github.com/zeromicro/go-zero/rest/httpx"

diff --git a/app/core/model/sysrolemodel.go b/app/core/model/sysrolemodel.go
@@ -1,7 +1,7 @@
 package model
 
 import (
-	"ark-admin-zero/common/config"
+	"ark-admin-zero/config"
 	"context"
 	"fmt"
 	"github.com/zeromicro/go-zero/core/stores/cache"

diff --git a/app/core/model/sysusermodel.go b/app/core/model/sysusermodel.go
@@ -1,12 +1,11 @@
 package model
 
 import (
+	"ark-admin-zero/config"
 	"context"
 	"fmt"
 	"time"
 
-	"ark-admin-zero/common/config"
-
 	"github.com/zeromicro/go-zero/core/stores/cache"
 	"github.com/zeromicro/go-zero/core/stores/sqlx"
 )

diff --git a/common/utils/function.go b/common/utils/function.go
@@ -6,7 +6,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"ark-admin-zero/common/config"
+	"ark-admin-zero/config"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

diff --git a/common/config/system.go → config/core.go b/common/config/system.go → config/core.go