diff --git a/bin/adminserver/config/users.json b/bin/adminserver/config/users.json index 85676fe7..0a0859c9 100644 --- a/bin/adminserver/config/users.json +++ b/bin/adminserver/config/users.json @@ -69,5 +69,17 @@ "api": ["xxx", "-xxx"], "ui": ["addannouncement", "editannouncement", "addaudit", "editaudit"] } + }, + { + "account_address": "0x0cf08c8661f87cbf823128d37ba75814cbcdf08b", + "__doc__": "test_admin", + "roles": [ + "admin", + "customer_service" + ], + "special": { + "api": ["xxx", "-xxx"], + "ui": ["addannouncement", "editannouncement", "addaudit", "editaudit"] + } } ] diff --git a/server/adminserver/api/v1/system/sys_user.go b/server/adminserver/api/v1/system/sys_user.go index 5a3e1ac2..2135ba37 100644 --- a/server/adminserver/api/v1/system/sys_user.go +++ b/server/adminserver/api/v1/system/sys_user.go @@ -17,6 +17,14 @@ type UserApi struct { } func (this *UserApi) Login(c *gin.Context) { + accountAddress := "0x0cf08c8661f87cbf823128d37ba75814cbcdf08b" + s := GetSessionMgr().AddSession(accountAddress, accountAddress) + c.JSON(http.StatusOK, gin.H{ + "code": 0, + "message": "登录成功", + //"data": user, + "token": s.GetToken(), + }) } func (this *UserApi) Info(c *gin.Context) { diff --git a/server/marketserver/api/v1/recharge/recharge.go b/server/marketserver/api/v1/recharge/recharge.go index d4fab214..8ec1efaf 100644 --- a/server/marketserver/api/v1/recharge/recharge.go +++ b/server/marketserver/api/v1/recharge/recharge.go @@ -66,7 +66,8 @@ func (this *RechargeApi) BuyWithEmail(c *gin.Context) { } func (this *RechargeApi) internalBuy(c *gin.Context, - netId int32, goodsId int32, goodsNum int32, accountAddress string, passportAddress string) { + netId int32, goodsId int32, goodsNum int32, accountAddress string, passportAddress string, + email string) { currencyMeta := mt.Table.Currency.Get(netId) if currencyMeta == nil { f5.RspErr(c, 2, "server internal error")