Skip to content

Commit 4492bbc

Browse files
yuwnloyblogyuwnloyblog
committed
opt
1 parent 766ad51 commit 4492bbc

35 files changed

+125
-371
lines changed

‎admins/apis/account.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ import (
44
"net/http"
55

66
"github.com/gin-gonic/gin"
7+
"github.com/juggleim/commons/errs"
8+
"github.com/juggleim/commons/responses"
79
utils "github.com/juggleim/commons/tools"
8-
"github.com/juggleim/jugglechat-server/admins/apis/responses"
9-
"github.com/juggleim/jugglechat-server/admins/errs"
1010
"github.com/juggleim/jugglechat-server/admins/services"
1111
)
1212

1313
func Login(ctx *gin.Context) {
1414
var req AccountReq
1515
if err := ctx.ShouldBindJSON(&req); err != nil {
16-
ctx.JSON(http.StatusBadRequest, &errs.ApiErrorMsg{
16+
ctx.JSON(http.StatusBadRequest, &errs.AdminApiErrorMsg{
1717
Code: errs.AdminErrorCode_ParamError,
1818
Msg: "param illegal",
1919
})
@@ -23,20 +23,20 @@ func Login(ctx *gin.Context) {
2323
if code == errs.AdminErrorCode_Success {
2424
authStr, err := generateAuthorization(req.Account)
2525
if err != nil {
26-
ctx.JSON(http.StatusInternalServerError, &errs.ApiErrorMsg{
26+
ctx.JSON(http.StatusInternalServerError, &errs.AdminApiErrorMsg{
2727
Code: errs.AdminErrorCode_Default,
2828
Msg: "auth fail",
2929
})
3030
return
3131
}
32-
responses.SuccessHttpResp(ctx, &LoginResp{
32+
responses.AdminSuccessHttpResp(ctx, &LoginResp{
3333
Account: req.Account,
3434
Authorization: authStr,
3535
Env: "private", //public
3636
RoleId: account.RoleId,
3737
})
3838
} else {
39-
ctx.JSON(http.StatusOK, &errs.ApiErrorMsg{
39+
ctx.JSON(http.StatusOK, &errs.AdminApiErrorMsg{
4040
Code: code,
4141
Msg: "login failed",
4242
})
@@ -60,59 +60,59 @@ type LoginResp struct {
6060
func AddAccount(ctx *gin.Context) {
6161
var req AccountReq
6262
if err := ctx.ShouldBindJSON(&req); err != nil {
63-
ctx.JSON(http.StatusBadRequest, &errs.ApiErrorMsg{
63+
ctx.JSON(http.StatusBadRequest, &errs.AdminApiErrorMsg{
6464
Code: errs.AdminErrorCode_ParamError,
6565
Msg: "param illegal",
6666
})
6767
return
6868
}
6969
code := services.AddAccount(GetLoginedAccount(ctx), req.Account, req.Password, req.RoleId)
70-
ctx.JSON(http.StatusOK, &errs.ApiErrorMsg{
70+
ctx.JSON(http.StatusOK, &errs.AdminApiErrorMsg{
7171
Code: code,
7272
})
7373
}
7474

7575
func UpdPassword(ctx *gin.Context) {
7676
var req AccountReq
7777
if err := ctx.ShouldBindJSON(&req); err != nil {
78-
ctx.JSON(http.StatusBadRequest, &errs.ApiErrorMsg{
78+
ctx.JSON(http.StatusBadRequest, &errs.AdminApiErrorMsg{
7979
Code: errs.AdminErrorCode_ParamError,
8080
Msg: "param illegal",
8181
})
8282
return
8383
}
8484
code := services.UpdPassword(req.Account, req.Password, req.NewPassword)
85-
ctx.JSON(http.StatusOK, &errs.ApiErrorMsg{
85+
ctx.JSON(http.StatusOK, &errs.AdminApiErrorMsg{
8686
Code: code,
8787
})
8888
}
8989

9090
func DisableAccounts(ctx *gin.Context) {
9191
var req AccountsReq
9292
if err := ctx.ShouldBindJSON(&req); err != nil || len(req.Accounts) <= 0 {
93-
ctx.JSON(http.StatusBadRequest, &errs.ApiErrorMsg{
93+
ctx.JSON(http.StatusBadRequest, &errs.AdminApiErrorMsg{
9494
Code: errs.AdminErrorCode_ParamError,
9595
Msg: "param illegal",
9696
})
9797
return
9898
}
9999
code := services.DisableAccounts(req.Accounts, req.IsDisable)
100-
ctx.JSON(http.StatusOK, &errs.ApiErrorMsg{
100+
ctx.JSON(http.StatusOK, &errs.AdminApiErrorMsg{
101101
Code: code,
102102
})
103103
}
104104

105105
func DeleteAccounts(ctx *gin.Context) {
106106
var req AccountsReq
107107
if err := ctx.ShouldBindJSON(&req); err != nil || len(req.Accounts) <= 0 {
108-
ctx.JSON(http.StatusBadRequest, &errs.ApiErrorMsg{
108+
ctx.JSON(http.StatusBadRequest, &errs.AdminApiErrorMsg{
109109
Code: errs.AdminErrorCode_ParamError,
110110
Msg: "param illegal",
111111
})
112112
return
113113
}
114114
code := services.DeleteAccounts(req.Accounts)
115-
ctx.JSON(http.StatusOK, &errs.ApiErrorMsg{
115+
ctx.JSON(http.StatusOK, &errs.AdminApiErrorMsg{
116116
Code: code,
117117
})
118118
}

‎admins/apis/group.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ import (
44
"strconv"
55

66
"github.com/gin-gonic/gin"
7+
"github.com/juggleim/commons/ctxs"
8+
"github.com/juggleim/commons/errs"
9+
"github.com/juggleim/commons/responses"
710
"github.com/juggleim/commons/tools"
8-
"github.com/juggleim/jugglechat-server/admins/apis/responses"
9-
"github.com/juggleim/jugglechat-server/admins/errs"
1011
"github.com/juggleim/jugglechat-server/admins/services"
11-
"github.com/juggleim/jugglechat-server/ctxs"
1212
)
1313

1414
func QryGroups(ctx *gin.Context) {
1515
appkey := ctx.Query("app_key")
1616
if appkey == "" {
17-
responses.ErrorHttpResp(ctx, errs.AdminErrorCode_ParamError)
17+
responses.AdminErrorHttpResp(ctx, errs.AdminErrorCode_ParamError)
1818
return
1919
}
2020
offset := ctx.Query("offset")
@@ -37,8 +37,8 @@ func QryGroups(ctx *gin.Context) {
3737
}
3838
code, grps := services.QryGroups(ctxs.ToCtx(ctx), appkey, offset, count, isPositiveOrder)
3939
if code != errs.AdminErrorCode_Success {
40-
responses.ErrorHttpResp(ctx, code)
40+
responses.AdminErrorHttpResp(ctx, code)
4141
return
4242
}
43-
responses.SuccessHttpResp(ctx, grps)
43+
responses.AdminSuccessHttpResp(ctx, grps)
4444
}

‎admins/apis/responses/response.go‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎admins/apis/user.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ import (
44
"strconv"
55

66
"github.com/gin-gonic/gin"
7+
"github.com/juggleim/commons/ctxs"
8+
"github.com/juggleim/commons/errs"
9+
"github.com/juggleim/commons/responses"
710
"github.com/juggleim/commons/tools"
8-
"github.com/juggleim/jugglechat-server/admins/apis/responses"
9-
"github.com/juggleim/jugglechat-server/admins/errs"
1011
"github.com/juggleim/jugglechat-server/admins/services"
11-
"github.com/juggleim/jugglechat-server/ctxs"
1212
)
1313

1414
func QryUsers(ctx *gin.Context) {
1515
appkey := ctx.Query("app_key")
1616
if appkey == "" {
17-
responses.ErrorHttpResp(ctx, errs.AdminErrorCode_ParamError)
17+
responses.AdminErrorHttpResp(ctx, errs.AdminErrorCode_ParamError)
1818
return
1919
}
2020
offset := ctx.Query("offset")
@@ -37,8 +37,8 @@ func QryUsers(ctx *gin.Context) {
3737
}
3838
code, users := services.QryUsers(ctxs.ToCtx(ctx), appkey, offset, count, isPositiveOrder)
3939
if code != errs.AdminErrorCode_Success {
40-
responses.ErrorHttpResp(ctx, code)
40+
responses.AdminErrorHttpResp(ctx, code)
4141
return
4242
}
43-
responses.SuccessHttpResp(ctx, users)
43+
responses.AdminSuccessHttpResp(ctx, users)
4444
}

‎admins/apis/validate.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77

88
"github.com/gin-gonic/gin"
99
"github.com/golang-jwt/jwt/v4"
10+
"github.com/juggleim/commons/ctxs"
11+
"github.com/juggleim/commons/errs"
12+
"github.com/juggleim/commons/responses"
1013
utils "github.com/juggleim/commons/tools"
11-
"github.com/juggleim/jugglechat-server/admins/apis/responses"
12-
"github.com/juggleim/jugglechat-server/admins/errs"
1314
"github.com/juggleim/jugglechat-server/admins/services"
14-
"github.com/juggleim/jugglechat-server/ctxs"
1515
)
1616

1717
const (
@@ -31,14 +31,14 @@ func Validate(ctx *gin.Context) {
3131
authStr := ctx.Request.Header.Get(Header_Authorization)
3232
account, err := validateAuthorization(authStr)
3333
if err != nil {
34-
responses.ErrorHttpResp(ctx, errs.AdminErrorCode_AuthFail)
34+
responses.AdminErrorHttpResp(ctx, errs.AdminErrorCode_AuthFail)
3535
ctx.Abort()
3636
return
3737
}
3838
//check account
3939
code := services.CheckAccountState(account)
4040
if code != errs.AdminErrorCode_Success {
41-
responses.ErrorHttpResp(ctx, code)
41+
responses.AdminErrorHttpResp(ctx, code)
4242
ctx.Abort()
4343
return
4444
}

‎admins/errs/errorcode.go‎

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎admins/routers/router.go‎

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

1010
"github.com/gin-gonic/gin"
11+
"github.com/juggleim/commons/ctxs"
1112
"github.com/juggleim/jugglechat-server/admins/apis"
1213
"github.com/juggleim/jugglechat-server/configures"
13-
"github.com/juggleim/jugglechat-server/ctxs"
1414
)
1515

1616
var Prefix string = ""

‎admins/services/accountservice.go‎

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

6+
"github.com/juggleim/commons/errs"
67
utils "github.com/juggleim/commons/tools"
78
apimodels "github.com/juggleim/jugglechat-server/admins/apis/models"
8-
"github.com/juggleim/jugglechat-server/admins/errs"
99
"github.com/juggleim/jugglechat-server/storages/dbs"
1010
)
1111

‎admins/services/groupservice.go‎

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

6+
"github.com/juggleim/commons/errs"
67
"github.com/juggleim/commons/tools"
78
apimodels "github.com/juggleim/jugglechat-server/admins/apis/models"
8-
"github.com/juggleim/jugglechat-server/admins/errs"
99
"github.com/juggleim/jugglechat-server/storages"
1010
)
1111

‎admins/services/userservice.go‎

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

6+
"github.com/juggleim/commons/errs"
67
"github.com/juggleim/commons/tools"
78
apimodels "github.com/juggleim/jugglechat-server/admins/apis/models"
8-
"github.com/juggleim/jugglechat-server/admins/errs"
99
"github.com/juggleim/jugglechat-server/storages"
1010
)
1111

0 commit comments

Comments
 (0)