fix: CreateAt,UpdateAt,DeleteAt 命名不统一 #29

suyuan32 · Oct 26, 2022 · befa6b6 · befa6b6
1 parent e280563
commit befa6b6
Show file tree

Hide file tree

Showing 42 changed files with 685 additions and 678 deletions.
diff --git a/api/api_desc/apis.api b/api/api_desc/apis.api
@@ -17,7 +17,7 @@ type (
         // ID
         Id            uint64 `json:"id"`
 
-        CreateAt      int64  `json:"createAt"`
+        CreatedAt      int64  `json:"createdAt"`
 
         // API path | API路径
         Path          string `json:"path"`
@@ -41,7 +41,7 @@ type (
 
         // Create date | 创建日期
         // Required: true
-        CreateAt      int64  `json:"createAt" validate:"number"`
+        CreatedAt      int64  `json:"createdAt" validate:"number"`
 
         // API path | API路径
         // Required: true

diff --git a/api/api_desc/dictionary.api b/api/api_desc/dictionary.api
@@ -17,7 +17,7 @@ type (
         // ID
         Id            uint64 `json:"id"`
 
-        CreateAt      int64  `json:"createAt"`
+        CreatedAt      int64  `json:"createdAt"`
 
         // Dictionary title | 字典显示名称
         Title         string `json:"title"`
@@ -94,7 +94,7 @@ type (
         // ID
         Id            uint64 `json:"id"`
 
-        CreateAt      int64  `json:"createAt"`
+        CreatedAt      int64  `json:"createdAt"`
 
         // Dictionary title | 字典显示名称
         Title         string `json:"title"`

diff --git a/api/api_desc/oauth.api b/api/api_desc/oauth.api
@@ -17,7 +17,7 @@ type (
         // ID
         Id            uint64 `json:"id"`
 
-        CreateAt      int64  `json:"createAt"`
+        CreatedAt      int64  `json:"createdAt"`
 
         // Provider name | 提供商名字
         Name          string `json:"name"`
@@ -57,7 +57,7 @@ type (
 
         // Create date | 创建日期
         // Required: true
-        CreateAt      int64  `json:"createAt" validate:"number"`
+        CreatedAt      int64  `json:"createdAt" validate:"number"`
 
         // Provider name | 提供商名字
         // Required: true

diff --git a/api/api_desc/role.api b/api/api_desc/role.api
@@ -51,7 +51,7 @@ type (
 
         // Create time | 创建日期
         // Required: true
-        CreateAt      int64  `json:"createAt" validate:"number"`
+        CreatedAt      int64  `json:"createdAt" validate:"number"`
     }
 
     // The response data of role list | 角色列表数据

diff --git a/api/api_desc/token.api b/api/api_desc/token.api
@@ -17,7 +17,7 @@ type (
         // ID
         Id            uint64 `json:"id"`
 
-        CreateAt      int64  `json:"createAt"`
+        CreatedAt      int64  `json:"createdAt"`
 
         // User's UUID | 用户的UUID
         UUID          string `json:"UUID"`
@@ -44,7 +44,7 @@ type (
 
        // Create date | 创建日期
        // Required: true
-       CreateAt      int64  `json:"createAt" validate:"number"`
+       CreatedAt      int64  `json:"createdAt" validate:"number"`
 
        // User's UUID | 用户的UUID
        // Required: true

diff --git a/api/api_desc/user.api b/api/api_desc/user.api
@@ -182,9 +182,9 @@ type (
         // 1 normal, 2 ban | 1 正常 2 拉黑
         Status       int32        `json:"status"`
 
-        CreateAt     int64        `json:"createAt"`
+        CreatedAt     int64        `json:"createdAt"`
 
-        UpdateAt     int64        `json:"updateAt"`
+        UpdatedAt     int64        `json:"updatedAt"`
     }
 
     // The response data of user's basic information | 用户基本信息返回数据

diff --git a/api/internal/logic/api/createorupdateapilogic.go b/api/internal/logic/api/createorupdateapilogic.go
@@ -28,7 +28,7 @@ func (l *CreateOrUpdateApiLogic) CreateOrUpdateApi(req *types.CreateOrUpdateApiR
 	data, err := l.svcCtx.CoreRpc.CreateOrUpdateApi(context.Background(),
 		&core.ApiInfo{
 			Id:          req.Id,
-			CreateAt:    req.CreateAt,
+			CreatedAt:   req.CreatedAt,
 			Path:        req.Path,
 			Description: req.Description,
 			Group:       req.Group,

diff --git a/api/internal/logic/api/getapilistlogic.go b/api/internal/logic/api/getapilistlogic.go
@@ -45,7 +45,7 @@ func (l *GetApiListLogic) GetApiList(req *types.ApiListReq) (resp *types.ApiList
 		resp.Data = append(resp.Data,
 			types.ApiInfo{
 				Id:          v.Id,
-				CreateAt:    v.CreateAt,
+				CreatedAt:   v.CreatedAt,
 				Path:        v.Path,
 				Description: v.Description,
 				Group:       v.Group,

diff --git a/api/internal/logic/dictionary/getdetailbydictionarynamelogic.go b/api/internal/logic/dictionary/getdetailbydictionarynamelogic.go
@@ -2,6 +2,7 @@ package dictionary
 
 import (
 	"context"
+
 	"github.com/suyuan32/simple-admin-core/rpc/types/core"
 
 	"github.com/suyuan32/simple-admin-core/api/internal/svc"
@@ -35,12 +36,12 @@ func (l *GetDetailByDictionaryNameLogic) GetDetailByDictionaryName(req *types.Di
 	resp.Total = result.Total
 	for _, v := range result.Data {
 		resp.Data = append(resp.Data, types.DictionaryDetailInfo{
-			Id:       v.Id,
-			CreateAt: v.CreateAt,
-			Title:    v.Title,
-			Key:      v.Key,
-			Value:    v.Value,
-			Status:   v.Status,
+			Id:        v.Id,
+			CreatedAt: v.CreatedAt,
+			Title:     v.Title,
+			Key:       v.Key,
+			Value:     v.Value,
+			Status:    v.Status,
 		})
 	}
 

diff --git a/api/internal/logic/dictionary/getdictionarylistlogic.go b/api/internal/logic/dictionary/getdictionarylistlogic.go
@@ -2,6 +2,7 @@ package dictionary
 
 import (
 	"context"
+
 	"github.com/suyuan32/simple-admin-core/rpc/types/core"
 
 	"github.com/suyuan32/simple-admin-core/api/internal/svc"
@@ -41,7 +42,7 @@ func (l *GetDictionaryListLogic) GetDictionaryList(req *types.DictionaryListReq)
 	for _, v := range result.Data {
 		resp.Data = append(resp.Data, types.DictionaryInfo{
 			Id:          v.Id,
-			CreateAt:    v.CreateAt,
+			CreatedAt:   v.CreatedAt,
 			Title:       v.Title,
 			Name:        v.Name,
 			Status:      v.Status,

diff --git a/api/internal/logic/menu/getmenulistlogic.go b/api/internal/logic/menu/getmenulistlogic.go
@@ -47,8 +47,8 @@ func convertMenuList(data []*core.MenuInfo) []*types.Menu {
 		tmp := &types.Menu{
 			BaseInfo: types.BaseInfo{
 				ID:        uint(v.Id),
-				CreatedAt: v.CreateAt,
-				UpdatedAt: v.UpdateAt,
+				CreatedAt: v.CreatedAt,
+				UpdatedAt: v.UpdatedAt,
 			},
 			MenuType:  v.MenuType,
 			ParentId:  uint(v.ParentId),

diff --git a/api/internal/logic/menu/getmenuparamlistbymenuidlogic.go b/api/internal/logic/menu/getmenuparamlistbymenuidlogic.go
@@ -2,6 +2,7 @@ package menu
 
 import (
 	"context"
+
 	"github.com/suyuan32/simple-admin-core/rpc/types/core"
 
 	"github.com/suyuan32/simple-admin-core/api/internal/svc"
@@ -34,7 +35,7 @@ func (l *GetMenuParamListByMenuIdLogic) GetMenuParamListByMenuId(req *types.IDRe
 	resp.Total = result.Total
 	for _, v := range result.Data {
 		resp.Data = append(resp.Data, types.MenuParamResp{
-			BaseInfo: types.BaseInfo{ID: uint(v.Id), CreatedAt: v.CreateAt, UpdatedAt: v.UpdateAt},
+			BaseInfo: types.BaseInfo{ID: uint(v.Id), CreatedAt: v.CreatedAt, UpdatedAt: v.UpdatedAt},
 			MenuId:   uint32(v.MenuId),
 			DataType: v.Type,
 			Key:      v.Key,

diff --git a/api/internal/logic/oauth/createorupdateproviderlogic.go b/api/internal/logic/oauth/createorupdateproviderlogic.go
@@ -37,7 +37,7 @@ func (l *CreateOrUpdateProviderLogic) CreateOrUpdateProvider(req *types.CreateOr
 			TokenUrl:     req.TokenURL,
 			AuthStyle:    uint64(req.AuthStyle),
 			InfoUrl:      req.InfoURL,
-			CreateAt:     req.CreateAt,
+			CreatedAt:    req.CreatedAt,
 		})
 	if err != nil {
 		return nil, err

diff --git a/api/internal/logic/oauth/getproviderlistlogic.go b/api/internal/logic/oauth/getproviderlistlogic.go
@@ -39,7 +39,7 @@ func (l *GetProviderListLogic) GetProviderList(req *types.PageInfo) (resp *types
 		resp.Data = append(resp.Data,
 			types.ProviderInfo{
 				Id:           v.Id,
-				CreateAt:     v.CreateAt,
+				CreatedAt:    v.CreatedAt,
 				Name:         v.Name,
 				ClientID:     v.ClientId,
 				ClientSecret: v.ClientSecret,

diff --git a/api/internal/logic/oauth/oauthcallbacklogic.go b/api/internal/logic/oauth/oauthcallbacklogic.go
@@ -46,13 +46,13 @@ func (l *OauthCallbackLogic) OauthCallback() (resp *types.CallbackResp, err erro
 	// add token into database
 	expireAt := time.Now().Add(time.Second * 259200).Unix()
 	_, err = l.svcCtx.CoreRpc.CreateOrUpdateToken(context.Background(), &core.TokenInfo{
-		Id:       0,
-		CreateAt: 0,
-		UUID:     result.Id,
-		Token:    token,
-		Source:   strings.Split(l.r.FormValue("state"), "-")[1],
-		Status:   1,
-		ExpireAt: expireAt,
+		Id:        0,
+		CreatedAt: 0,
+		UUID:      result.Id,
+		Token:     token,
+		Source:    strings.Split(l.r.FormValue("state"), "-")[1],
+		Status:    1,
+		ExpireAt:  expireAt,
 	})
 
 	if err != nil {

diff --git a/api/internal/logic/role/getrolelistlogic.go b/api/internal/logic/role/getrolelistlogic.go
@@ -2,11 +2,13 @@ package role
 
 import (
 	"context"
+
 	"github.com/suyuan32/simple-admin-core/rpc/types/core"
 
+	"github.com/zeromicro/go-zero/core/logx"
+
 	"github.com/suyuan32/simple-admin-core/api/internal/svc"
 	"github.com/suyuan32/simple-admin-core/api/internal/types"
-	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type GetRoleListLogic struct {
@@ -42,7 +44,7 @@ func (l *GetRoleListLogic) GetRoleList(req *types.PageInfo) (resp *types.RoleLis
 			Status:        v.Status,
 			Remark:        v.Remark,
 			OrderNo:       v.OrderNo,
-			CreateAt:      v.CreateAt,
+			CreatedAt:     v.CreatedAt,
 		})
 	}
 	return resp, nil

diff --git a/api/internal/logic/token/createorupdatetokenlogic.go b/api/internal/logic/token/createorupdatetokenlogic.go
@@ -26,13 +26,13 @@ func NewCreateOrUpdateTokenLogic(ctx context.Context, svcCtx *svc.ServiceContext
 
 func (l *CreateOrUpdateTokenLogic) CreateOrUpdateToken(req *types.CreateOrUpdateTokenReq) (resp *types.SimpleMsg, err error) {
 	result, err := l.svcCtx.CoreRpc.CreateOrUpdateToken(context.Background(), &core.TokenInfo{
-		Id:       req.Id,
-		CreateAt: req.CreateAt,
-		UUID:     req.UUID,
-		Token:    req.Token,
-		Source:   req.Source,
-		Status:   req.Status,
-		ExpireAt: req.ExpireAt,
+		Id:        req.Id,
+		CreatedAt: req.CreatedAt,
+		UUID:      req.UUID,
+		Token:     req.Token,
+		Source:    req.Source,
+		Status:    req.Status,
+		ExpireAt:  req.ExpireAt,
 	})
 
 	if err != nil {

diff --git a/api/internal/logic/token/gettokenlistlogic.go b/api/internal/logic/token/gettokenlistlogic.go
@@ -45,13 +45,13 @@ func (l *GetTokenListLogic) GetTokenList(req *types.TokenListReq) (resp *types.T
 
 	for _, v := range result.Data {
 		resp.Data = append(resp.Data, types.TokenInfo{
-			Id:       v.Id,
-			CreateAt: v.CreateAt,
-			UUID:     v.UUID,
-			Token:    v.Token,
-			Source:   v.Source,
-			Status:   v.Status,
-			ExpireAt: v.ExpireAt,
+			Id:        v.Id,
+			CreatedAt: v.CreatedAt,
+			UUID:      v.UUID,
+			Token:     v.Token,
+			Source:    v.Source,
+			Status:    v.Status,
+			ExpireAt:  v.ExpireAt,
 		})
 	}
 

diff --git a/api/internal/logic/user/getuserlistlogic.go b/api/internal/logic/user/getuserlistlogic.go
@@ -41,17 +41,17 @@ func (l *GetUserListLogic) GetUserList(req *types.GetUserListReq) (resp *types.U
 	var res []types.UserInfoResp
 	for _, v := range data.Data {
 		res = append(res, types.UserInfoResp{
-			Id:       int64(v.Id),
-			Username: v.Username,
-			Nickname: v.Nickname,
-			Mobile:   v.Mobile,
-			RoleId:   v.RoleId,
-			Email:    v.Email,
-			Avatar:   v.Avatar,
-			Status:   v.Status,
-			CreateAt: v.CreateAt,
-			UpdateAt: v.UpdateAt,
-			UUID:     v.UUID,
+			Id:        int64(v.Id),
+			Username:  v.Username,
+			Nickname:  v.Nickname,
+			Mobile:    v.Mobile,
+			RoleId:    v.RoleId,
+			Email:     v.Email,
+			Avatar:    v.Avatar,
+			Status:    v.Status,
+			CreatedAt: v.CreatedAt,
+			UpdatedAt: v.UpdatedAt,
+			UUID:      v.UUID,
 		})
 	}
 	resp = &types.UserListResp{}

diff --git a/api/internal/logic/user/loginlogic.go b/api/internal/logic/user/loginlogic.go
@@ -50,13 +50,13 @@ func (l *LoginLogic) Login(req *types.LoginReq) (resp *types.LoginResp, err erro
 		// add token into database
 		expireAt := time.Now().Add(time.Second * 259200).Unix()
 		_, err = l.svcCtx.CoreRpc.CreateOrUpdateToken(context.Background(), &core.TokenInfo{
-			Id:       0,
-			CreateAt: 0,
-			UUID:     user.Id,
-			Token:    token,
-			Source:   "core",
-			Status:   1,
-			ExpireAt: expireAt,
+			Id:        0,
+			CreatedAt: 0,
+			UUID:      user.Id,
+			Token:     token,
+			Source:    "core",
+			Status:    1,
+			ExpireAt:  expireAt,
 		})
 
 		if err != nil {