Merge branch 'dev' of git.kingsome.cn:server/game2006go into dev

bin/adminserver/config/game_switch.json

@@ -99,6 +99,10 @@
     "switch_name": "ui.contribution.show",
     "switch_desc": "25-贡献点是否显示"
   },
+  {
+    "switch_name": "ui.activationCode",
+    "switch_desc": "26-激活码是否显示"
+  },
   {
     "switch_name": "only.allowed.superWhiteList",
     "switch_desc": "100-只允许至尊白名单用户登录登录"

database/confdb.sql

@@ -135,6 +135,42 @@ CREATE TABLE `t_super_whitelist` (
 ) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `t_whitelist`
+--
+
+DROP TABLE IF EXISTS `t_whitelist`;
+/*!40101 SET @saved_cs_client      = @@character_set_client */;
+/*!40101 SET character_set_client  = utf8 */;
+CREATE TABLE `t_whitelist` (
+  `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id',
+  `user_identity` varchar(60) NOT NULL COMMENT 'account_id or account_address or email',
+  `enable` int(11) NOT NULL DEFAULT '0' COMMENT '是否生效',
+  `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间',
+  `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间',
+  PRIMARY KEY (`idx`),
+  UNIQUE KEY `user_identity` (`user_identity`)
+) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `t_blacklist`
+--
+
+DROP TABLE IF EXISTS `t_blacklist`;
+/*!40101 SET @saved_cs_client      = @@character_set_client */;
+/*!40101 SET character_set_client  = utf8 */;
+CREATE TABLE `t_blacklist` (
+  `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id',
+  `user_identity` varchar(60) NOT NULL COMMENT 'account_id or account_address or email',
+  `enable` int(11) NOT NULL DEFAULT '0' COMMENT '是否生效',
+  `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间',
+  `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间',
+  PRIMARY KEY (`idx`),
+  UNIQUE KEY `user_identity` (`user_identity`)
+) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

server/marketserver/api/v1/recharge/recharge.go

@@ -101,9 +101,13 @@ func (this *RechargeApi) BuyWithEmail(c *gin.Context) {
 		CurrencyAddress string `json:"currency_address"`
 	}{}
 	if err := c.ShouldBindJSON(&reqJson); err != nil {
+		f5.GetSysLog().Info("BuyWithEmail passport_address:%s err:%s",
+			passportAddress, err)
 		f5.RspErr(c, 1, err.Error())
 		return
 	}
+	f5.GetSysLog().Info("BuyWithEmail passport_address:%s email:%s reqJson:%s",
+		passportAddress, email, q5.EncodeJson(&reqJson))
 	if email == "" {
 		f5.RspErr(c, 1, "email is empty")
 		return
@@ -119,28 +123,34 @@ func (this *RechargeApi) internalBuy(c *gin.Context,
 	passportAddress = strings.ToLower(passportAddress)
 	currencyMeta := mt.Table.Currency.GetByNetIdAddress(netId, currencyAddress)
 	if currencyMeta == nil {
+		f5.GetSysLog().Info("internalBuy error:1")
 		f5.RspErr(c, 2, "server internal error")
 		return
 	}
 	currencyContractMeta := currencyMeta.GetContract()
 	if currencyContractMeta == nil {
+		f5.GetSysLog().Info("internalBuy error:2")
 		f5.RspErr(c, 2, "server internal error")
 		return
 	}
 	goodsMeta := mt.Table.Recharge.GetById(q5.ToInt64(goodsId))
 	if goodsMeta == nil {
+		f5.GetSysLog().Info("internalBuy error:3")
 		f5.RspErr(c, 2, "goods id param error")
 		return
 	}
 	if goodsMeta.GetPrice() <= 0 {
+		f5.GetSysLog().Info("internalBuy error:4")
 		f5.RspErr(c, 2, "goods id param error")
 		return
 	}
 	if goodsNum <= 0 || goodsNum > goodsMeta.GetMaxBuyTimes() {
+		f5.GetSysLog().Info("internalBuy error:5")
 		f5.RspErr(c, 2, "num param error")
 		return
 	}
 	if email != "" && goodsMeta.GetCanEmailBuy() == 0 {
+		f5.GetSysLog().Info("internalBuy error:6")
 		f5.RspErr(c, 2, "cant email buy")
 		return
 	}
@@ -161,6 +171,7 @@ func (this *RechargeApi) internalBuy(c *gin.Context,
 		var err error
 		orderId, err = transId.ToString()
 		if err != nil {
+			f5.GetSysLog().Info("internalBuy error:6")
 			f5.RspErr(c, 2, "server internal error")
 			return
 		}
@@ -175,13 +186,16 @@ func (this *RechargeApi) internalBuy(c *gin.Context,
 	f5.GetSysLog().Info("recharge net_id:%d currency_name:%s decimal:%d srcPrice:%d bnPrice:%s",
 		netId, currencyMeta.GetCurrencyName(), currencyMeta.GetCurrencyDecimal(), srcPrice, bnPrice.String());
 	if bnPrice.Cmp(big.NewInt(0)) < 0 || bnPrice.Cmp(big.NewInt(srcPrice)) < 0 {
+		f5.GetSysLog().Info("internalBuy error:7")
 		f5.RspErr(c, 3, "server internal error")
 		return
 	}
 	if ok, err := service.User.InBlackList(accountAddress); err != nil {
+		f5.GetSysLog().Info("internalBuy error:8")
 		f5.RspErr(c, 500, "server internal error")
 		return
 	} else if ok {
+		f5.GetSysLog().Info("internalBuy error:9")
 		f5.RspErr(c, 501, "illegal user")
 		return
 	}
@@ -210,10 +224,12 @@ func (this *RechargeApi) internalBuy(c *gin.Context,
 		params,
 		func(rsp f5.HttpCliResponse) {
 			if rsp.GetErr() != nil {
+				f5.GetSysLog().Info("internalBuy error:a")
 				f5.RspErr(c, 500, "server internal error")
 				return
 			}
 			if q5.DecodeJson(rsp.GetRawData(), &jsonRspObj) != nil {
+				f5.GetSysLog().Info("internalBuy error:b")
 				f5.RspErr(c, 500, "server internal error")
 				return
 			}
@@ -236,9 +252,18 @@ func (this *RechargeApi) internalBuy(c *gin.Context,
 				diamond,
 				presentDiamond,
 				email) {
+				f5.GetSysLog().Info("internalBuy error:c")
 				f5.RspErr(c, 500, "server internal error")
 				return
 			}
+			f5.GetSysLog().Info("recharge net_id:%d currency_name:%s decimal:%d srcPrice:%d bnPrice:%s calls.len:%d jsonRsp:%s",
+				netId,
+				currencyMeta.GetCurrencyName(),
+				currencyMeta.GetCurrencyDecimal(),
+				srcPrice,
+				bnPrice.String(),
+				len(jsonRspObj.Calls),
+				q5.EncodeJson(&jsonRspObj));
 			c.JSON(200, jsonRspObj)
 		})
 }

server/marketserver/service/gameswitch.go

@@ -11,6 +11,13 @@ type gameSwitch struct {
 	time int64
 }
 
+func (this *gameSwitch) init() {
+	this.GetSwitchList()
+}
+
+func (this *gameSwitch) unInit() {
+}
+
 func (this *gameSwitch) GetSwitchList() map[string]int32 {
 	now := f5.GetApp().GetRealSeconds()
 	if now > this.time+30 {

server/marketserver/service/servicemgr.go

@@ -6,9 +6,11 @@ type serviceMgr struct {
 func (this *serviceMgr) Init() {
 	Contribution.init()
 	User.init()
+	GameSwitches.init()
 }
 
 func (this *serviceMgr) UnInit() {
 	Contribution.unInit()
 	User.unInit()
+	GameSwitches.unInit()
 }

server/marketserver/service/user.go

@@ -1,9 +1,9 @@
 package service
 
 import (
-	"f5"
+	//"f5"
-	"main/constant"
+	//"main/constant"
-	"q5"
+	//"q5"
 )
 
 //"strings"
@@ -18,6 +18,8 @@ func (this *user) unInit() {
 }
 
 func (this *user) InBlackList(userIdentity string) (bool, error) {
+	return false, nil
+	/*
 	if userIdentity == "" {
 		return true, nil
 	}
@@ -37,4 +39,5 @@ func (this *user) InBlackList(userIdentity string) (bool, error) {
 			blocked = ds.Next() && q5.SafeToInt32(ds.GetByName("blocked")) != 0 && q5.SafeToInt32(ds.GetByName("deleted")) == 0
 		})
 	return blocked, queryerr
+	*/
 }