Commit 900fc555 authored by brent's avatar brent

modify tip

parent 5c682e14
...@@ -31,14 +31,14 @@ func (server *AppController) CreateApiKey() { ...@@ -31,14 +31,14 @@ func (server *AppController) CreateApiKey() {
return return
} }
if appRequest.Name == "" { if appRequest.Name == "" {
server.respond(models.MissingParameter, "名称不能为空") server.respond(models.MissingParameter, "Missing name parameter")
return return
} }
checkUser := &models.User{Id: info.UserID} checkUser := &models.User{Id: info.UserID}
err = mysql.GetMysqlInstace().Ormer.Read(checkUser) err = mysql.GetMysqlInstace().Ormer.Read(checkUser)
if err != nil { if err != nil {
server.respond(models.BusinessFailed, "用户不存在") server.respond(models.BusinessFailed, "user is not exist")
return return
} }
data, err := kong.CreateApiKey(checkUser) data, err := kong.CreateApiKey(checkUser)
...@@ -126,17 +126,17 @@ func (server *AppController) UpdateApikey() { ...@@ -126,17 +126,17 @@ func (server *AppController) UpdateApikey() {
return return
} }
if appRequest.Id == 0 { if appRequest.Id == 0 {
server.respond(models.MissingParameter, "ID不能为空") server.respond(models.MissingParameter, "Missing id parameter")
return return
} }
if appRequest.Name == "" { if appRequest.Name == "" {
server.respond(models.MissingParameter, "名称不能为空") server.respond(models.MissingParameter, "Missing name parameter")
return return
} }
apiKay := models.ApiKey{Id: appRequest.Id} apiKay := models.ApiKey{Id: appRequest.Id}
err = mysql.GetMysqlInstace().Ormer.Read(&apiKay) err = mysql.GetMysqlInstace().Ormer.Read(&apiKay)
if err != nil { if err != nil {
server.respond(models.BusinessFailed, "api-key 不存在") server.respond(models.BusinessFailed, "api-key not exist")
return return
} }
apiKay.Name = appRequest.Name apiKay.Name = appRequest.Name
...@@ -147,7 +147,7 @@ func (server *AppController) UpdateApikey() { ...@@ -147,7 +147,7 @@ func (server *AppController) UpdateApikey() {
return return
} }
server.respond(http.StatusOK, "修改成功") server.respond(http.StatusOK, "success")
} }
func (server *AppController) DelApiKey() { func (server *AppController) DelApiKey() {
...@@ -166,14 +166,14 @@ func (server *AppController) DelApiKey() { ...@@ -166,14 +166,14 @@ func (server *AppController) DelApiKey() {
return return
} }
if appRequest.Id == 0 { if appRequest.Id == 0 {
server.respond(models.MissingParameter, "id 不能为空") server.respond(models.MissingParameter, "Missing id parameter")
return return
} }
apiKay := models.ApiKey{Id: appRequest.Id} apiKay := models.ApiKey{Id: appRequest.Id}
err = mysql.GetMysqlInstace().Ormer.Read(&apiKay) err = mysql.GetMysqlInstace().Ormer.Read(&apiKay)
if err != nil { if err != nil {
server.respond(models.BusinessFailed, "api-key 不存在") server.respond(models.BusinessFailed, "api-key not exist")
return return
} }
...@@ -193,7 +193,7 @@ func (server *AppController) DelApiKey() { ...@@ -193,7 +193,7 @@ func (server *AppController) DelApiKey() {
if found { if found {
err = kong.DelateApiKey(info.Username, apiKay.ApiKeyId) err = kong.DelateApiKey(info.Username, apiKay.ApiKeyId)
if err != nil { if err != nil {
server.respond(models.BusinessFailed, "删除 api-key 失败") server.respond(models.BusinessFailed, "failed")
return return
} }
} }
...@@ -201,11 +201,11 @@ func (server *AppController) DelApiKey() { ...@@ -201,11 +201,11 @@ func (server *AppController) DelApiKey() {
//if found { //if found {
_, err = mysql.GetMysqlInstace().Ormer.Delete(&apiKay) _, err = mysql.GetMysqlInstace().Ormer.Delete(&apiKay)
if err != nil { if err != nil {
server.respond(models.BusinessFailed, "删除 api-key 失败") server.respond(models.BusinessFailed, "failed")
return return
} }
//} //}
server.respond(http.StatusOK, "删除 api-key 成功") server.respond(http.StatusOK, "success")
} }
func (server *AppController) CreateJWTToken() { func (server *AppController) CreateJWTToken() {
...@@ -224,14 +224,14 @@ func (server *AppController) CreateJWTToken() { ...@@ -224,14 +224,14 @@ func (server *AppController) CreateJWTToken() {
return return
} }
if appRequest.Name == "" { if appRequest.Name == "" {
server.respond(models.MissingParameter, "名称不能为空") server.respond(models.MissingParameter, "Missing name parameter")
return return
} }
checkUser := &models.User{Id: info.UserID} checkUser := &models.User{Id: info.UserID}
err = mysql.GetMysqlInstace().Ormer.Read(checkUser) err = mysql.GetMysqlInstace().Ormer.Read(checkUser)
if err != nil { if err != nil {
server.respond(models.BusinessFailed, "用户不存在") server.respond(models.BusinessFailed, "user not exist")
return return
} }
...@@ -329,11 +329,11 @@ func (server *AppController) UpdateJWT() { ...@@ -329,11 +329,11 @@ func (server *AppController) UpdateJWT() {
return return
} }
if appRequest.Id == 0 { if appRequest.Id == 0 {
server.respond(models.MissingParameter, "ID不能为空") server.respond(models.MissingParameter, "Missing id parameter")
return return
} }
if appRequest.Name == "" { if appRequest.Name == "" {
server.respond(models.MissingParameter, "名称不能为空") server.respond(models.MissingParameter, "Missing name parameter")
return return
} }
token := models.JwtToken{Id: appRequest.Id} token := models.JwtToken{Id: appRequest.Id}
...@@ -350,7 +350,7 @@ func (server *AppController) UpdateJWT() { ...@@ -350,7 +350,7 @@ func (server *AppController) UpdateJWT() {
return return
} }
server.respond(http.StatusOK, "修改成功") server.respond(http.StatusOK, "success")
} }
func (server *AppController) DelJWT() { func (server *AppController) DelJWT() {
...@@ -369,14 +369,14 @@ func (server *AppController) DelJWT() { ...@@ -369,14 +369,14 @@ func (server *AppController) DelJWT() {
return return
} }
if appRequest.Id == 0 { if appRequest.Id == 0 {
server.respond(models.MissingParameter, "id 不能为空") server.respond(models.MissingParameter, "Missing id parameter")
return return
} }
jwt := models.JwtToken{Id: appRequest.Id} jwt := models.JwtToken{Id: appRequest.Id}
err = mysql.GetMysqlInstace().Ormer.Read(&jwt) err = mysql.GetMysqlInstace().Ormer.Read(&jwt)
if err != nil { if err != nil {
server.respond(models.BusinessFailed, "jwt-token 不存在") server.respond(models.BusinessFailed, "jwt-token not exist")
return return
} }
...@@ -396,7 +396,7 @@ func (server *AppController) DelJWT() { ...@@ -396,7 +396,7 @@ func (server *AppController) DelJWT() {
if found { if found {
err = kong.DelateJWT(info.Username, jwt.JwtId) err = kong.DelateJWT(info.Username, jwt.JwtId)
if err != nil { if err != nil {
server.respond(models.BusinessFailed, "删除 jwt-token 失败") server.respond(models.BusinessFailed, "failed")
return return
} }
} }
...@@ -404,9 +404,9 @@ func (server *AppController) DelJWT() { ...@@ -404,9 +404,9 @@ func (server *AppController) DelJWT() {
//if found { //if found {
_, err = mysql.GetMysqlInstace().Ormer.Delete(&jwt) _, err = mysql.GetMysqlInstace().Ormer.Delete(&jwt)
if err != nil { if err != nil {
server.respond(models.BusinessFailed, "删除 jwt-token 失败") server.respond(models.BusinessFailed, "failed")
return return
} }
//} //}
server.respond(http.StatusOK, "删除 jwt-token 成功") server.respond(http.StatusOK, "success")
} }
...@@ -52,7 +52,7 @@ func (server *MainController) respond(code int, message string, data ...interfac ...@@ -52,7 +52,7 @@ func (server *MainController) respond(code int, message string, data ...interfac
func (server *MainController) Check() (*models.JwtPayload, error) { func (server *MainController) Check() (*models.JwtPayload, error) {
token := server.Ctx.Input.Header("Authorization") token := server.Ctx.Input.Header("Authorization")
if token == "" { if token == "" {
return nil, errors.New("error: 登陆失效") return nil, errors.New("error: login expire")
} }
// token := "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwianNvbiI6ImdhbmdhbiIsImV4cCI6MTU3ODU1NDMyOCwiaWF0IjoxNTc4NTUzNzI4LCJpc3MiOiJnYW5nYW4ifQ.jOlMlfLMFBJvyrJTLagrwQx2931LzM7Z0EVMFZ75xYI" // token := "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwianNvbiI6ImdhbmdhbiIsImV4cCI6MTU3ODU1NDMyOCwiaWF0IjoxNTc4NTUzNzI4LCJpc3MiOiJnYW5nYW4ifQ.jOlMlfLMFBJvyrJTLagrwQx2931LzM7Z0EVMFZ75xYI"
info, err := utils.ValidateToken(token) info, err := utils.ValidateToken(token)
...@@ -64,21 +64,21 @@ func (server *MainController) Check() (*models.JwtPayload, error) { ...@@ -64,21 +64,21 @@ func (server *MainController) Check() (*models.JwtPayload, error) {
session, err := redis.GetDataToString(key) session, err := redis.GetDataToString(key)
if err != nil { if err != nil {
redis.DeleteKey(key) redis.DeleteKey(key)
return nil, errors.New("error: 登陆失效") return nil, errors.New("error: login expire")
} }
//session := c.GetSession(key) //session := c.GetSession(key)
if session == "" { if session == "" {
return nil, errors.New("error: 登陆失效") return nil, errors.New("error: login expire")
} }
if !(token == session) { if !(token == session) {
//c.DelSession(info.UserID) //c.DelSession(info.UserID)
redis.DeleteKey(key) redis.DeleteKey(key)
return nil, errors.New("error: 登陆失效") return nil, errors.New("error: login expire")
} }
if info.ExpiresAt <= time.Now().Unix() { if info.ExpiresAt <= time.Now().Unix() {
//c.DelSession(info.UserID) //c.DelSession(info.UserID)
redis.DeleteKey(key) redis.DeleteKey(key)
return nil, errors.New("error: 登陆已过期") return nil, errors.New("error: login expire")
} }
return info, err return info, err
......
...@@ -37,7 +37,7 @@ func (server *FundsController) Recharge() { ...@@ -37,7 +37,7 @@ func (server *FundsController) Recharge() {
} }
if info.Role != 1 && info.Role != 2 && chargeRequest.PaymentMethod == models.ManualPay { if info.Role != 1 && info.Role != 2 && chargeRequest.PaymentMethod == models.ManualPay {
server.respond(models.BusinessFailed, "请联系客户服务人员") server.respond(models.BusinessFailed, "Please contact the business development")
return return
} }
...@@ -49,7 +49,7 @@ func (server *FundsController) Recharge() { ...@@ -49,7 +49,7 @@ func (server *FundsController) Recharge() {
} }
err = mysql.GetMysqlInstace().Ormer.Read(checkUser, cond) err = mysql.GetMysqlInstace().Ormer.Read(checkUser, cond)
if err != nil { if err != nil {
server.respond(models.BusinessFailed, "用户不存在") server.respond(models.BusinessFailed, "user not exist")
return return
} }
...@@ -147,7 +147,7 @@ func (server *FundsController) Recharge() { ...@@ -147,7 +147,7 @@ func (server *FundsController) Recharge() {
checkUser.UpdatedTime = timestamp checkUser.UpdatedTime = timestamp
flag, err = mysql.GetMysqlInstace().Ormer.Update(checkUser) flag, err = mysql.GetMysqlInstace().Ormer.Update(checkUser)
if err != nil { if err != nil {
server.respond(http.StatusOK, "充值失败") server.respond(http.StatusOK, "failed")
} }
logs.Debug("更新用户", flag) logs.Debug("更新用户", flag)
//balanceKey := "balance:" + checkUser.CustomId //balanceKey := "balance:" + checkUser.CustomId
...@@ -178,7 +178,7 @@ func (server *FundsController) Recharge() { ...@@ -178,7 +178,7 @@ func (server *FundsController) Recharge() {
} }
} }
server.respond(http.StatusOK, "充值成功") server.respond(http.StatusOK, "success")
} }
func (server *FundsController) RechargeRecords() { func (server *FundsController) RechargeRecords() {
...@@ -253,11 +253,11 @@ func (server *FundsController) IncomeAndExpense() { ...@@ -253,11 +253,11 @@ func (server *FundsController) IncomeAndExpense() {
size := appRequest.Page * appRequest.Size size := appRequest.Page * appRequest.Size
if appRequest.StartTime == "" && appRequest.EndTime != "" { if appRequest.StartTime == "" && appRequest.EndTime != "" {
server.respond(models.MissingParameter, "缺少开始时间") server.respond(models.MissingParameter, "Missing start time")
return return
} }
if appRequest.StartTime != "" && appRequest.EndTime == "" { if appRequest.StartTime != "" && appRequest.EndTime == "" {
server.respond(models.MissingParameter, "缺少结束时间") server.respond(models.MissingParameter, "Missing end time")
return return
} }
...@@ -280,7 +280,7 @@ func (server *FundsController) IncomeAndExpense() { ...@@ -280,7 +280,7 @@ func (server *FundsController) IncomeAndExpense() {
end, _ := time.Parse(layout, appRequest.EndTime) end, _ := time.Parse(layout, appRequest.EndTime)
endTime := fmt.Sprintf(end.Format(format)) endTime := fmt.Sprintf(end.Format(format))
if end.Before(start) { if end.Before(start) {
server.respond(models.BusinessFailed, "起始时间不能大于结束时间") server.respond(models.BusinessFailed, "Start time cannot be greater than end time")
return return
} }
countQB.And(fmt.Sprintf("trade_time >= '%s'", startTime)).And(fmt.Sprintf("trade_time <= '%s'", endTime)) countQB.And(fmt.Sprintf("trade_time >= '%s'", startTime)).And(fmt.Sprintf("trade_time <= '%s'", endTime))
......
This diff is collapsed.
...@@ -69,19 +69,19 @@ func (server *UserController) Login() { ...@@ -69,19 +69,19 @@ func (server *UserController) Login() {
claims, err := jose.Verify("https://api-auth.web3auth.io/jwks", loginRequest.Web3AuthPublicKey, loginRequest.IdToken) claims, err := jose.Verify("https://api-auth.web3auth.io/jwks", loginRequest.Web3AuthPublicKey, loginRequest.IdToken)
if err != nil { if err != nil {
server.respond(models.LoginFailed, "Web3Auth 验证失败") server.respond(models.LoginFailed, "Web3Auth verify failed")
return return
} }
if claims.Exp <= time.Now().Unix() { if claims.Exp <= time.Now().Unix() {
server.respond(models.LoginFailed, "Web3Auth 登录已超时") server.respond(models.LoginFailed, "Web3Auth login expire")
return return
} }
clientId, _ := beego.AppConfig.String("web3ClientId") clientId, _ := beego.AppConfig.String("web3ClientId")
if strings.Compare(clientId, claims.Aud) != 0 { if strings.Compare(clientId, claims.Aud) != 0 {
server.respond(models.LoginFailed, "web3auth clientId 错误") server.respond(models.LoginFailed, "web3auth clientId error")
return return
} }
...@@ -121,7 +121,7 @@ func (server *UserController) Login() { ...@@ -121,7 +121,7 @@ func (server *UserController) Login() {
duration := utils.DEFAULT_EXPIRE_SECONDS duration := utils.DEFAULT_EXPIRE_SECONDS
tokenString, err := utils.GenerateToken(checkUser, checkUser.Id, duration) tokenString, err := utils.GenerateToken(checkUser, checkUser.Id, duration)
if err != nil { if err != nil {
server.respond(models.LoginFailed, "登录失败") server.respond(models.LoginFailed, "failed")
return return
} }
//checkUserLevel := &models.UserLevel{Id: checkUser.LevelId} //checkUserLevel := &models.UserLevel{Id: checkUser.LevelId}
...@@ -164,7 +164,7 @@ func (server *UserController) Regisger() { ...@@ -164,7 +164,7 @@ func (server *UserController) Regisger() {
return return
} }
if len(user.Username) == 0 { if len(user.Username) == 0 {
server.respond(models.MissingParameter, "用户名不能为空") server.respond(models.MissingParameter, "Missing username parameter")
return return
} }
...@@ -204,7 +204,7 @@ func regisgerUser(user models.User) (*models.User, error) { ...@@ -204,7 +204,7 @@ func regisgerUser(user models.User) (*models.User, error) {
var count int64 var count int64
count, err = usernameQs.Count() count, err = usernameQs.Count()
if count > 0 { if count > 0 {
return nil, errors.New("用户已存在") return nil, errors.New("user is exist")
} }
//if len(user.CustomId) > 0 { //if len(user.CustomId) > 0 {
// customIdQs := qs.Filter("custom_id", user.CustomId) // customIdQs := qs.Filter("custom_id", user.CustomId)
...@@ -221,13 +221,13 @@ func regisgerUser(user models.User) (*models.User, error) { ...@@ -221,13 +221,13 @@ func regisgerUser(user models.User) (*models.User, error) {
_, err = mysql.GetMysqlInstace().Ormer.Insert(&user) _, err = mysql.GetMysqlInstace().Ormer.Insert(&user)
if err != nil { if err != nil {
return nil, errors.New("注册用户失败") return nil, errors.New("create user failed")
} }
checkUser := &models.User{Username: user.Username} checkUser := &models.User{Username: user.Username}
err = mysql.GetMysqlInstace().Ormer.Read(checkUser, "username") err = mysql.GetMysqlInstace().Ormer.Read(checkUser, "username")
if err != nil { if err != nil {
return nil, errors.New("注册用户失败") return nil, errors.New("create user failed")
} }
checkUser.CustomId = strconv.Itoa(checkUser.Id) checkUser.CustomId = strconv.Itoa(checkUser.Id)
......
...@@ -86,7 +86,7 @@ func (server *UserLevelController) AddLevel() { ...@@ -86,7 +86,7 @@ func (server *UserLevelController) AddLevel() {
logs.Debug("Levels = ", count) logs.Debug("Levels = ", count)
//var levels []*models.UserLevel //var levels []*models.UserLevel
if count > 0 { if count > 0 {
server.respond(models.BusinessFailed, "该等级已存在") server.respond(models.BusinessFailed, "level is exist")
return return
} }
...@@ -125,18 +125,18 @@ func (server *UserLevelController) UpdateLevel() { ...@@ -125,18 +125,18 @@ func (server *UserLevelController) UpdateLevel() {
} }
if request.Id == 0 { if request.Id == 0 {
server.respond(models.MissingParameter, "id 不能为空") server.respond(models.MissingParameter, "Missing id parameter")
return return
} }
checkLevel := models.UserLevel{Id: request.Id} checkLevel := models.UserLevel{Id: request.Id}
err = mysql.GetMysqlInstace().Ormer.Read(&checkLevel) err = mysql.GetMysqlInstace().Ormer.Read(&checkLevel)
if err != nil { if err != nil {
server.respond(models.BusinessFailed, "level 不存在") server.respond(models.BusinessFailed, "level not exist")
return return
} }
if checkLevel.Level != request.Level { if checkLevel.Level != request.Level {
server.respond(models.BusinessFailed, "等级字段不能修改") server.respond(models.BusinessFailed, "cannot modify level field")
return return
} }
...@@ -147,11 +147,11 @@ func (server *UserLevelController) UpdateLevel() { ...@@ -147,11 +147,11 @@ func (server *UserLevelController) UpdateLevel() {
request.UpdatedTime = time.Now() request.UpdatedTime = time.Now()
_, err = mysql.GetMysqlInstace().Ormer.Update(&request) _, err = mysql.GetMysqlInstace().Ormer.Update(&request)
if err != nil { if err != nil {
server.respond(models.BusinessFailed, "更新失败") server.respond(models.BusinessFailed, "failed")
return return
} }
server.respond(http.StatusOK, "更新成功") server.respond(http.StatusOK, "success")
} }
func (server *UserLevelController) DelLevel() { func (server *UserLevelController) DelLevel() {
...@@ -171,16 +171,16 @@ func (server *UserLevelController) DelLevel() { ...@@ -171,16 +171,16 @@ func (server *UserLevelController) DelLevel() {
} }
if request.Id == 0 { if request.Id == 0 {
server.respond(models.MissingParameter, "id 不能为空") server.respond(models.MissingParameter, "Missing id parameter")
return return
} }
if request.Level == 0 { if request.Level == 0 {
server.respond(models.MissingParameter, "默认等级不能删除") server.respond(models.MissingParameter, "cannot delete 0 level")
return return
} }
request.Deleted = 1 request.Deleted = 1
mysql.GetMysqlInstace().Ormer.Update(&request) mysql.GetMysqlInstace().Ormer.Update(&request)
server.respond(http.StatusOK, "删除成功") server.respond(http.StatusOK, "success")
} }
...@@ -22,7 +22,7 @@ func (server *WhitelistController) Lists() { ...@@ -22,7 +22,7 @@ func (server *WhitelistController) Lists() {
return return
} }
if !(info.Role == 1 || info.Role == 2) { if !(info.Role == 1 || info.Role == 2) {
server.respond(models.BusinessFailed, "只有系统管理员或超级管理员才能执行此操作") server.respond(models.BusinessFailed, "Only system administrators or super administrators can perform this operation")
return return
} }
body := server.Ctx.Input.RequestBody body := server.Ctx.Input.RequestBody
...@@ -65,7 +65,7 @@ func (server *WhitelistController) Add() { ...@@ -65,7 +65,7 @@ func (server *WhitelistController) Add() {
} }
if !(info.Role == 1 || info.Role == 2) { if !(info.Role == 1 || info.Role == 2) {
server.respond(models.BusinessFailed, "只有系统管理员或超级管理员才能执行此操作") server.respond(models.BusinessFailed, "Only system administrators or super administrators can perform this operation")
return return
} }
body := server.Ctx.Input.RequestBody body := server.Ctx.Input.RequestBody
...@@ -79,11 +79,11 @@ func (server *WhitelistController) Add() { ...@@ -79,11 +79,11 @@ func (server *WhitelistController) Add() {
} }
if request.ProfitAddress == "" { if request.ProfitAddress == "" {
server.respond(models.MissingParameter, "收益地址不能为空") server.respond(models.MissingParameter, "Missing Profit Address")
return return
} }
if request.NodeNum == 0 { if request.NodeNum == 0 {
server.respond(models.MissingParameter, "节点个数最少为1") server.respond(models.MissingParameter, "The minimum number of nodes is 1")
return return
} }
...@@ -99,7 +99,7 @@ func (server *WhitelistController) Add() { ...@@ -99,7 +99,7 @@ func (server *WhitelistController) Add() {
return return
} }
server.respond(http.StatusOK, "添加成功") server.respond(http.StatusOK, "success")
} }
func (server *WhitelistController) Update() { func (server *WhitelistController) Update() {
...@@ -110,7 +110,7 @@ func (server *WhitelistController) Update() { ...@@ -110,7 +110,7 @@ func (server *WhitelistController) Update() {
} }
if !(info.Role == 1 || info.Role == 2) { if !(info.Role == 1 || info.Role == 2) {
server.respond(models.BusinessFailed, "只有系统管理员或超级管理员才能执行此操作") server.respond(models.BusinessFailed, "Only system administrators or super administrators can perform this operation")
return return
} }
body := server.Ctx.Input.RequestBody body := server.Ctx.Input.RequestBody
...@@ -124,22 +124,22 @@ func (server *WhitelistController) Update() { ...@@ -124,22 +124,22 @@ func (server *WhitelistController) Update() {
} }
if request.Id == 0 { if request.Id == 0 {
server.respond(models.MissingParameter, "id 不能为空") server.respond(models.MissingParameter, "Missing id parameter")
return return
} }
if request.ProfitAddress == "" { if request.ProfitAddress == "" {
server.respond(models.MissingParameter, "收益地址不能为空") server.respond(models.MissingParameter, "Missing Profit Address")
return return
} }
if request.NodeNum == 0 { if request.NodeNum == 0 {
server.respond(models.MissingParameter, "节点个数最少为1") server.respond(models.MissingParameter, "The minimum number of nodes is 1")
return return
} }
check := models.Whitelist{Id: request.Id} check := models.Whitelist{Id: request.Id}
err = mysql.GetMysqlInstace().Ormer.Read(&check) err = mysql.GetMysqlInstace().Ormer.Read(&check)
if err != nil { if err != nil {
server.respond(models.BusinessFailed, "该白名单数据不存在") server.respond(models.BusinessFailed, "not found")
return return
} }
...@@ -165,7 +165,7 @@ func (server *WhitelistController) Update() { ...@@ -165,7 +165,7 @@ func (server *WhitelistController) Update() {
odysseus.SetWhiteListToRedis(&whitelist) odysseus.SetWhiteListToRedis(&whitelist)
server.respond(http.StatusOK, "更新成功") server.respond(http.StatusOK, "success")
} }
func (server *WhitelistController) Delete() { func (server *WhitelistController) Delete() {
...@@ -176,7 +176,7 @@ func (server *WhitelistController) Delete() { ...@@ -176,7 +176,7 @@ func (server *WhitelistController) Delete() {
} }
if !(info.Role == 1 || info.Role == 2) { if !(info.Role == 1 || info.Role == 2) {
server.respond(models.BusinessFailed, "只有系统管理员或超级管理员才能执行此操作") server.respond(models.BusinessFailed, "Only system administrators or super administrators can perform this operation")
return return
} }
body := server.Ctx.Input.RequestBody body := server.Ctx.Input.RequestBody
...@@ -190,13 +190,13 @@ func (server *WhitelistController) Delete() { ...@@ -190,13 +190,13 @@ func (server *WhitelistController) Delete() {
} }
if request.Id == 0 { if request.Id == 0 {
server.respond(models.MissingParameter, "id 不能为空") server.respond(models.MissingParameter, "Missing id parameter")
return return
} }
check := models.Whitelist{Id: request.Id} check := models.Whitelist{Id: request.Id}
err = mysql.GetMysqlInstace().Ormer.Read(&check) err = mysql.GetMysqlInstace().Ormer.Read(&check)
if err != nil { if err != nil {
server.respond(models.BusinessFailed, "该白名单数据不存在") server.respond(models.BusinessFailed, "not found")
return return
} }
...@@ -223,5 +223,5 @@ func (server *WhitelistController) Delete() { ...@@ -223,5 +223,5 @@ func (server *WhitelistController) Delete() {
odysseus.DeleteWhiteList(&whitelist) odysseus.DeleteWhiteList(&whitelist)
server.respond(http.StatusOK, "删除成功") server.respond(http.StatusOK, "success")
} }
...@@ -88,7 +88,7 @@ func Verify(url string, publicKey string, idToken string) (*AIClaims, error) { ...@@ -88,7 +88,7 @@ func Verify(url string, publicKey string, idToken string) (*AIClaims, error) {
} }
if len(cl.Wallets) > 0 { if len(cl.Wallets) > 0 {
if strings.Compare(cl.Wallets[0].PublicKey, publicKey) != 0 { if strings.Compare(cl.Wallets[0].PublicKey, publicKey) != 0 {
return nil, errors.New("公钥验证失败") return nil, errors.New("PublicKey verify failed")
} }
} }
//err = tok.Claims(*jwks, &cl) //err = tok.Claims(*jwks, &cl)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment