Eric0718 2 years ago
parent
commit
b2f4430654

+ 12 - 1
blockchain/contract.go

@@ -6,6 +6,8 @@ import (
 	"ktogame/util"
 	"strconv"
 
+	"github.com/astaxie/beego/logs"
+
 	"github.com/go-xorm/xorm"
 )
 
@@ -13,6 +15,7 @@ func participate(engine *xorm.Engine, user, inviter, hash string, amount float64
 	var dui models.UserInfo
 	ok, err := engine.Id(inviter).Get(&dui)
 	if err != nil {
+		logs.Info(err)
 		return err
 	}
 	if !ok {
@@ -28,13 +31,14 @@ func participate(engine *xorm.Engine, user, inviter, hash string, amount float64
 	ui.Direct = inviter
 	ui.Indirect = dui.Direct
 	ui.Superiors = dui.Superiors + "," + strconv.FormatInt(dui.Id, 10)
-	ui.ParticipateAmount = float64(controller.ParticipateValue)
+	ui.ParticipateAmount = float64(controller.PARTICIPATEVALUE)
 	ui.State = 1
 	ui.CreateTime = util.NowTimeString()
 	ui.Hash = hash
 
 	_, err = engine.Insert(&ui)
 	if err != nil {
+		logs.Info(err)
 		return err
 	}
 
@@ -49,6 +53,7 @@ func participate(engine *xorm.Engine, user, inviter, hash string, amount float64
 	//update rewards pool
 	err = controller.UpdateRewardsPool(engine, amount)
 	if err != nil {
+		logs.Info(err)
 		return err
 	}
 
@@ -58,6 +63,7 @@ func participate(engine *xorm.Engine, user, inviter, hash string, amount float64
 	if ui.Direct != "" {
 		err := controller.UpdateAvailableRewards(engine, rewards, ui.Direct, true, true)
 		if err != nil {
+			logs.Info(err)
 			return err
 		}
 	}
@@ -65,6 +71,7 @@ func participate(engine *xorm.Engine, user, inviter, hash string, amount float64
 	if ui.Indirect != "" {
 		err := controller.UpdateAvailableRewards(engine, rewards, ui.Indirect, true, false)
 		if err != nil {
+			logs.Info(err)
 			return err
 		}
 	}
@@ -72,24 +79,28 @@ func participate(engine *xorm.Engine, user, inviter, hash string, amount float64
 	//update all supers performance (15%)
 	err = controller.UpdateSuperiorsPerformance(engine, ui.Superiors, amount)
 	if err != nil {
+		logs.Info(err)
 		return err
 	}
 
 	//update Community Gift(50%)
 	err = controller.UpdateCommunityGift(engine, amount, inviter)
 	if err != nil {
+		logs.Info(err)
 		return err
 	}
 
 	//Update Community Nodes(5%)
 	err = controller.UpdateCommunityNodes(engine, amount)
 	if err != nil {
+		logs.Info(err)
 		return err
 	}
 
 	//update Market(10%)
 	err = controller.UpdateMarket(engine, amount)
 	if err != nil {
+		logs.Info(err)
 		return err
 	}
 	return nil

+ 26 - 11
blockchain/scan.go

@@ -24,7 +24,7 @@ import (
 )
 
 var ktoClient pb.GreeterClient
-var ktoRpc = beego.AppConfig.String("hostHttp_mit_kto")
+var ktoRpc = beego.AppConfig.String("miner_node")
 var currentBlock uint64
 
 var TopsMap map[string]string
@@ -32,21 +32,22 @@ var TopsMap map[string]string
 func init() {
 	kc, err := grpc.Dial(ktoRpc, grpc.WithInsecure(), grpc.WithBlock())
 	if err != nil {
-		logs.Info(err)
+		logs.Error(err)
 		os.Exit(1)
 	}
 	ktoClient = pb.NewGreeterClient(kc)
 	utilAddress.SetNetWork("mainnet")
 
 	tm := make(map[string]string, 0)
-	tm[TopicParticipate] = COLLECT_PARTICIPATE
+	tm[TOPIC_PARTICIPATE] = COLLECT_PARTICIPATE
 	TopsMap = tm
 
 	go scanBlock()
-	go confirmClaimedTxs()
+	//go confirmClaimedTxs()
 }
 
 func scanBlock() {
+	logs.Info("scanBlock...")
 	var bi models.BlockInfo
 	ok, err := dbUtil.Engine.Id(1).Get(&bi)
 	if err != nil {
@@ -61,9 +62,10 @@ func scanBlock() {
 	//currentBlock =62203394
 	for {
 		time.Sleep(time.Second * 3)
+		logs.Info("currentBlock...", currentBlock)
 		res, err := ktoClient.GetMaxBlockHeight(context.Background(), &pb.ReqMaxBlockHeight{})
 		if err != nil {
-			fmt.Println("获取交易block number错误=", err)
+			logs.Error("获取交易block number错误=", err)
 			continue
 		}
 		if res.MaxHeight < currentBlock {
@@ -72,18 +74,22 @@ func scanBlock() {
 
 		bl, err := ktoClient.GetBlockByNum(context.Background(), &pb.ReqBlockByNumber{Height: currentBlock})
 		if err != nil || bl.Code != 0 {
-			fmt.Println("获取交易block错误=", err)
+			logs.Error("获取交易block错误=", err)
 			continue
 		}
 		blc, errs := block.Deserialize(bl.Data)
 		if errs != nil {
-			fmt.Println("解析blcock错误=", errs)
+			logs.Error("解析blcock错误=", errs)
 			continue
 		}
 		var ERR error
 		for _, v := range blc.Transactions {
+			if len(v.Input) == 0 {
+				continue
+			}
 			evm, err := transaction.DecodeEvmData(v.Input)
 			if err != nil {
+				logs.Error(err)
 				ERR = err
 				break
 			}
@@ -99,18 +105,22 @@ func scanBlock() {
 						var ev EventParticipate
 						abi, err := abi.JSON(strings.NewReader(Collect.CollectMetaData.ABI))
 						if err != nil {
+							logs.Error(err)
 							ERR = err
 							break
 						}
+						logs.Info("method=%+v,l.Data=%v\n ", method, l.Data)
 						err = abi.UnpackIntoInterface(&ev, method, l.Data)
 						if err != nil {
+							logs.Error(err)
 							ERR = err
 							break
 						}
-						fmt.Printf("participate event data=%+v\n ", ev)
+						logs.Info("participate data=%+v\n ", ev)
 						//handle user participate
-						err = participate(dbUtil.Engine, ev.User.String(), ev.Inviter.String(), v.HashToString(), float64(ev.Amount.Uint64()/controller.Decimals))
+						err = participate(dbUtil.Engine, ev.Participant.String(), ev.Inviter.String(), v.HashToString(), float64(ev.Amount.Uint64()/controller.Decimals))
 						if err != nil {
+							logs.Error(err)
 							ERR = err
 							break
 						}
@@ -118,11 +128,13 @@ func scanBlock() {
 						var evt EventClaim
 						abi, err := abi.JSON(strings.NewReader(Collect.CollectMetaData.ABI))
 						if err != nil {
+							logs.Error(err)
 							ERR = err
 							break
 						}
 						err = abi.UnpackIntoInterface(&evt, method, l.Data)
 						if err != nil {
+							logs.Error(err)
 							ERR = err
 							break
 						}
@@ -130,6 +142,7 @@ func scanBlock() {
 
 						err = checkClaim(dbUtil.Engine, evt.User.String(), v.HashToString(), hex.EncodeToString(evt.Signature), float64(evt.Amount.Uint64()/controller.Decimals))
 						if err != nil {
+							logs.Error(err)
 							ERR = err
 							break
 						}
@@ -138,17 +151,18 @@ func scanBlock() {
 
 			}
 			if ERR != nil {
+				logs.Error(err)
 				break
 			}
 		}
 		if ERR != nil {
-			fmt.Println("处理错误=", ERR)
+			logs.Error("处理错误=", ERR)
 			continue
 		}
 		bi.BlockNumber = int64(currentBlock)
 		_, err = dbUtil.Engine.ID(1).Update(&bi)
 		if err != nil {
-			fmt.Println("更新最新快高错误=", err)
+			logs.Error("更新最新快高错误=", err)
 			return
 		}
 		currentBlock++
@@ -162,6 +176,7 @@ func confirmClaimedTxs() {
 		var txs []models.ClaimedTxs
 		ok, err := dbUtil.Engine.Where("state = ?", 0).Where("droped = ?", 0).Where("id > ?", mark).Get(&txs)
 		if err != nil {
+			logs.Error(err)
 			continue
 		}
 		if !ok {

+ 6 - 6
blockchain/types.go

@@ -7,17 +7,17 @@ import (
 )
 
 const (
-	TopicParticipate     = "0xddd670a4142d06229b922c5d433d29131580e1a2952c86700b0a36ea9e8b87ee"
-	COLLECT_PARTICIPATE  = "participate"
+	TOPIC_PARTICIPATE    = "0x8ed860f76da405897619eab937f09dcb4d0d9b56cf68a3d489130a2489cf151f"
+	COLLECT_PARTICIPATE  = "Participate"
 	COLLECT_CLAIMREWARDS = "claimRewards"
-	COLLECTCONTRACT      = "0xaaaaaaaaaaaaaaaaa"
+	COLLECTCONTRACT      = "0xC6Ff5462e5409d11AF6B080ADC3dc0a17E94b0A6"
 	CONFIRMINTERVAL      = 450
 )
 
 type EventParticipate struct {
-	User    common.Address
-	Inviter common.Address
-	Amount  *big.Int
+	Participant common.Address
+	Inviter     common.Address
+	Amount      *big.Int
 }
 type EventClaim struct {
 	User      common.Address

+ 6 - 6
conf/app.conf

@@ -2,11 +2,11 @@
 httpport = 8080
 runmode = dev
 
-mysqluser = wallet
-mysqlpass = 1K91NDp%Y
-mysqlurls = localhost
+mysqluser = root
+mysqlpass = CFT^7ujm
+mysqlurls = 45.249.245.49
 mysqlport = 3306
-mysqldb   = server_fhl
+mysqldb   = ktogame
 
-hostHttp_mit_kto = 36.255.222.160:13869
-miner_eth = https://www.kortho-chain.com
+miner_node = 36.255.222.160:13869
+kto_rpc = https://www.kortho-chain.com

+ 163 - 183
contractgo/Collect/Collect.abi

@@ -13,12 +13,71 @@
 				"internalType": "uint256",
 				"name": "amount",
 				"type": "uint256"
+			},
+			{
+				"indexed": false,
+				"internalType": "bytes32",
+				"name": "signature",
+				"type": "bytes32"
 			}
 		],
 		"name": "Claim",
 		"type": "event"
 	},
 	{
+		"inputs": [
+			{
+				"internalType": "uint256",
+				"name": "claimValue",
+				"type": "uint256"
+			},
+			{
+				"internalType": "string",
+				"name": "signTime",
+				"type": "string"
+			},
+			{
+				"internalType": "bytes32",
+				"name": "signature",
+				"type": "bytes32"
+			}
+		],
+		"name": "claimRewards",
+		"outputs": [],
+		"stateMutability": "nonpayable",
+		"type": "function"
+	},
+	{
+		"inputs": [],
+		"name": "initialize",
+		"outputs": [],
+		"stateMutability": "nonpayable",
+		"type": "function"
+	},
+	{
+		"inputs": [
+			{
+				"internalType": "address",
+				"name": "community",
+				"type": "address"
+			},
+			{
+				"internalType": "address",
+				"name": "technical",
+				"type": "address"
+			},
+			{
+				"internalType": "address",
+				"name": "devAddress",
+				"type": "address"
+			}
+		],
+		"name": "initialize",
+		"outputs": [],
+		"stateMutability": "nonpayable",
+		"type": "function"
+	},
+	{
 		"anonymous": false,
 		"inputs": [
 			{
@@ -38,6 +97,19 @@
 		"type": "event"
 	},
 	{
+		"inputs": [
+			{
+				"internalType": "address",
+				"name": "inviter",
+				"type": "address"
+			}
+		],
+		"name": "participate",
+		"outputs": [],
+		"stateMutability": "payable",
+		"type": "function"
+	},
+	{
 		"anonymous": false,
 		"inputs": [
 			{
@@ -63,6 +135,19 @@
 		"type": "event"
 	},
 	{
+		"inputs": [
+			{
+				"internalType": "address",
+				"name": "_manager",
+				"type": "address"
+			}
+		],
+		"name": "removeManager",
+		"outputs": [],
+		"stateMutability": "nonpayable",
+		"type": "function"
+	},
+	{
 		"anonymous": false,
 		"inputs": [
 			{
@@ -76,6 +161,65 @@
 		"type": "event"
 	},
 	{
+		"inputs": [],
+		"name": "renounceOwnership",
+		"outputs": [],
+		"stateMutability": "nonpayable",
+		"type": "function"
+	},
+	{
+		"inputs": [
+			{
+				"internalType": "uint256",
+				"name": "baseReward",
+				"type": "uint256"
+			}
+		],
+		"name": "setBaseReward",
+		"outputs": [],
+		"stateMutability": "nonpayable",
+		"type": "function"
+	},
+	{
+		"inputs": [
+			{
+				"internalType": "uint256",
+				"name": "value",
+				"type": "uint256"
+			}
+		],
+		"name": "setBaseValue",
+		"outputs": [],
+		"stateMutability": "nonpayable",
+		"type": "function"
+	},
+	{
+		"inputs": [
+			{
+				"internalType": "string",
+				"name": "_digit",
+				"type": "string"
+			}
+		],
+		"name": "setDigit",
+		"outputs": [],
+		"stateMutability": "nonpayable",
+		"type": "function"
+	},
+	{
+		"inputs": [
+			{
+				"internalType": "address",
+				"name": "_manager",
+				"type": "address"
+			}
+		],
+		"name": "setManager",
+		"outputs": [],
+		"stateMutability": "nonpayable",
+		"type": "function"
+	},
+	{
 		"anonymous": false,
 		"inputs": [
 			{
@@ -89,16 +233,29 @@
 		"type": "event"
 	},
 	{
-		"inputs": [],
-		"name": "_baseDistribution",
-		"outputs": [
+		"inputs": [
+			{
+				"internalType": "address",
+				"name": "newOwner",
+				"type": "address"
+			}
+		],
+		"name": "transferOwnership",
+		"outputs": [],
+		"stateMutability": "nonpayable",
+		"type": "function"
+	},
+	{
+		"inputs": [
 			{
 				"internalType": "uint256",
-				"name": "",
+				"name": "amount",
 				"type": "uint256"
 			}
 		],
-		"stateMutability": "view",
+		"name": "withdraw",
+		"outputs": [],
+		"stateMutability": "nonpayable",
 		"type": "function"
 	},
 	{
@@ -193,29 +350,6 @@
 		"type": "function"
 	},
 	{
-		"inputs": [
-			{
-				"internalType": "uint256",
-				"name": "claimValue",
-				"type": "uint256"
-			},
-			{
-				"internalType": "string",
-				"name": "signTime",
-				"type": "string"
-			},
-			{
-				"internalType": "bytes32",
-				"name": "signature",
-				"type": "bytes32"
-			}
-		],
-		"name": "claimRewards",
-		"outputs": [],
-		"stateMutability": "nonpayable",
-		"type": "function"
-	},
-	{
 		"inputs": [],
 		"name": "getDigit",
 		"outputs": [
@@ -229,36 +363,6 @@
 		"type": "function"
 	},
 	{
-		"inputs": [],
-		"name": "initialize",
-		"outputs": [],
-		"stateMutability": "nonpayable",
-		"type": "function"
-	},
-	{
-		"inputs": [
-			{
-				"internalType": "address",
-				"name": "community",
-				"type": "address"
-			},
-			{
-				"internalType": "address",
-				"name": "technical",
-				"type": "address"
-			},
-			{
-				"internalType": "address",
-				"name": "devAddress",
-				"type": "address"
-			}
-		],
-		"name": "initialize",
-		"outputs": [],
-		"stateMutability": "nonpayable",
-		"type": "function"
-	},
-	{
 		"inputs": [
 			{
 				"internalType": "address",
@@ -293,117 +397,6 @@
 	{
 		"inputs": [
 			{
-				"internalType": "address",
-				"name": "inviter",
-				"type": "address"
-			}
-		],
-		"name": "participate",
-		"outputs": [],
-		"stateMutability": "payable",
-		"type": "function"
-	},
-	{
-		"inputs": [
-			{
-				"internalType": "address",
-				"name": "_manager",
-				"type": "address"
-			}
-		],
-		"name": "removeManager",
-		"outputs": [],
-		"stateMutability": "nonpayable",
-		"type": "function"
-	},
-	{
-		"inputs": [],
-		"name": "renounceOwnership",
-		"outputs": [],
-		"stateMutability": "nonpayable",
-		"type": "function"
-	},
-	{
-		"inputs": [
-			{
-				"internalType": "uint256",
-				"name": "dis",
-				"type": "uint256"
-			}
-		],
-		"name": "setBaseDistribution",
-		"outputs": [],
-		"stateMutability": "nonpayable",
-		"type": "function"
-	},
-	{
-		"inputs": [
-			{
-				"internalType": "uint256",
-				"name": "baseReward",
-				"type": "uint256"
-			}
-		],
-		"name": "setBaseReward",
-		"outputs": [],
-		"stateMutability": "nonpayable",
-		"type": "function"
-	},
-	{
-		"inputs": [
-			{
-				"internalType": "uint256",
-				"name": "value",
-				"type": "uint256"
-			}
-		],
-		"name": "setBaseValue",
-		"outputs": [],
-		"stateMutability": "nonpayable",
-		"type": "function"
-	},
-	{
-		"inputs": [
-			{
-				"internalType": "string",
-				"name": "_digit",
-				"type": "string"
-			}
-		],
-		"name": "setDigit",
-		"outputs": [],
-		"stateMutability": "nonpayable",
-		"type": "function"
-	},
-	{
-		"inputs": [
-			{
-				"internalType": "address",
-				"name": "_manager",
-				"type": "address"
-			}
-		],
-		"name": "setManager",
-		"outputs": [],
-		"stateMutability": "nonpayable",
-		"type": "function"
-	},
-	{
-		"inputs": [
-			{
-				"internalType": "address",
-				"name": "newOwner",
-				"type": "address"
-			}
-		],
-		"name": "transferOwnership",
-		"outputs": [],
-		"stateMutability": "nonpayable",
-		"type": "function"
-	},
-	{
-		"inputs": [
-			{
 				"internalType": "uint256",
 				"name": "amount",
 				"type": "uint256"
@@ -463,18 +456,5 @@
 		],
 		"stateMutability": "view",
 		"type": "function"
-	},
-	{
-		"inputs": [
-			{
-				"internalType": "uint256",
-				"name": "amount",
-				"type": "uint256"
-			}
-		],
-		"name": "withdraw",
-		"outputs": [],
-		"stateMutability": "nonpayable",
-		"type": "function"
 	}
-]
+]

File diff suppressed because it is too large
+ 0 - 0
contractgo/Collect/Collect.go


+ 0 - 2
controller/controller.go

@@ -192,7 +192,6 @@ func (uc *UserController) GetTeamList() {
 	res := models.Page{Limit: l, Size: s, Total: c, DataList: addrList}
 	TxObjectResponse(uc.Controller, res)
 }
-
 func (uc *UserController) GetPerformance() {
 	user := uc.GetString("address")
 	var per models.Performance
@@ -208,7 +207,6 @@ func (uc *UserController) GetPerformance() {
 	}
 	TxObjectResponse(uc.Controller, per)
 }
-
 func (uc *UserController) TotalUsers() {
 	var us models.UserInfo
 	ok, err := uc.engine.Desc("id").Get(&us)

+ 1 - 1
controller/types.go

@@ -6,7 +6,7 @@ type UserController struct {
 
 const (
 	Decimals         = 100000000000
-	ParticipateValue = 1030
+	PARTICIPATEVALUE = 1030
 	ModBase          = 100
 	CommunityLimit   = 1000
 	CommunityMarket  = 1000000

+ 3 - 2
dbUtil/dbCoon.go

@@ -19,9 +19,10 @@ func init() {
 	dbname := beego.AppConfig.String("mysqldb")
 	port := beego.AppConfig.String("mysqlport")
 
-	var err error
-	Engine, err = xorm.NewEngine("mysql", u+":"+p+"@tcp("+url+":+"+port+")/"+dbname+"?charset=utf8")
+	fmt.Println(u, p, url, dbname, port)
+	e, err := xorm.NewEngine("mysql", u+":"+p+"@tcp("+url+":+"+port+")/"+dbname+"?charset=utf8")
 	if err != nil {
 		log.Fatal("错误=", err)
 	}
+	Engine = e
 }

+ 0 - 40
dbUtil/mysql.go

@@ -1,40 +0,0 @@
-package dbUtil
-
-import (
-	"fmt"
-	"log"
-
-	_ "github.com/go-sql-driver/mysql"
-	"github.com/go-xorm/xorm"
-)
-
-var SqlEngine *xorm.Engine
-
-func init() {
-	var err error
-
-	// ip := beego.AppConfig.String("sqlIp")
-	// port := beego.AppConfig.String("sqlPort")
-	// user := beego.AppConfig.String("sqlUser")
-	// pwd := beego.AppConfig.String("sqlPwd")
-	// dbname := beego.AppConfig.String("sqlName")
-	// fmt.Println("ip", ip)
-	// Engine, err = xorm.NewEngine("mysql", user+":"+pwd+"@tcp("+ip+":+"+port+")/"+dbname+"?charset=utf8")
-
-	/* 	118.193.32.118
-	game,1K91NDp%Y */
-
-	Engine, err = xorm.NewEngine("mysql", "game:1K91NDp%Y@tcp(118.193.32.118:3306)/game?charset=utf8")
-	err = Engine.Ping()
-
-	if err != nil {
-		log.Fatal(err)
-	}
-	fmt.Println("==========Conn  Sqldb  SUCC==========")
-
-}
-
-//创建事务
-func NewSession() *xorm.Session {
-	return Engine.NewSession()
-}

+ 27 - 28
enums/CommonErrorResult.go

@@ -3,45 +3,45 @@ package enums
 type CommonErrorResult int
 
 const (
-	SUCCESSFUL      = 0
-	REQUEST_ERROR   = 100
-	SYS_ERROR   = 400
-	REGISTER_FAIL   = 1001
-	USER_LOGIN_FAIL = 1006
-	CHECK_SMS_FAIL  = 1002
-	REGISTER_PHONE_AGAIN = 1004
+	SUCCESSFUL                 = 0
+	REQUEST_ERROR              = 100
+	SYS_ERROR                  = 400
+	REGISTER_FAIL              = 1001
+	USER_LOGIN_FAIL            = 1006
+	CHECK_SMS_FAIL             = 1002
+	REGISTER_PHONE_AGAIN       = 1004
 	REGISTER_ORGCODE_NOTEXISTS = 1005
-	ETH_ACCESS_CREATE_ERROR = 1007
-	GET_USER_INFO_ERROR = 1008
-	ERROR_MSG_INFO = 1010
-	ORM_INSER_ERROR = 2001
-	ETH_DIAL_ERROR = 3001
-	GENERE_FALID      = 4202
+	ETH_ACCESS_CREATE_ERROR    = 1007
+	GET_USER_INFO_ERROR        = 1008
+	ERROR_MSG_INFO             = 1010
+	ORM_INSER_ERROR            = 2001
+	ETH_DIAL_ERROR             = 3001
+	GENERE_FALID               = 4202
 
-	MAX_FHL_BLOCK       = "max_fhl_block:"       //最大块号
-	USE_FHL_BLOCK       = "use_fhl_block:"       //当前处理块号
-	USE_SWAP_NFT       = "use_swap_nft:"       //当前处理块号
-	USE_WITHDRAWAL       = "use_withdrawal:"       //用户提取
+	MAX_FHL_BLOCK  = "max_fhl_block:"  //最大块号
+	USE_FHL_BLOCK  = "use_fhl_block:"  //当前处理块号
+	USE_SWAP_NFT   = "use_swap_nft:"   //当前处理块号
+	USE_WITHDRAWAL = "use_withdrawal:" //用户提取
 
-	USDRIDO = "Transfer" //转账
-	GDLIDO = "Approval" //授权
+	USDRIDO    = "Transfer"    //转账
+	GDLIDO     = "Approval"    //授权
 	WITHDRAWAL = "newWithdraw" //提取
-	NEWDEPOSIT = "newDeposit" //下注
+	NEWDEPOSIT = "newDeposit"  //下注
 	//WITHDRAWCONTRACT = "0x868c9fFfcA5483931219B624e4F6A3033Dfe7a3b"  //取款合约
-	WITHDRAWCONTRACT = "0x5620CA8Ed0636d967c511bBB47a48460a9327f84"  //测试取款合约
-	USDTMINTCONTRACT = "0x5620CA8Ed0636d967c511bBB47a48460a9327f84"//usdt正式申购
+	WITHDRAWCONTRACT = "0x5620CA8Ed0636d967c511bBB47a48460a9327f84" //测试取款合约
+	USDTMINTCONTRACT = "0x5620CA8Ed0636d967c511bBB47a48460a9327f84" //usdt正式申购
 	//USDTMINTCONTRACT = "0x3Aa22DA9B16D9BBCf60A45aC598508fB3F05e92c" //测试申购合约事件
 	//
-	AMOUNTCONTRACT = "0xb544f5Cef94fE0B2C3BB3a4886ea8918Bbe444f5"  //获取价格
+	AMOUNTCONTRACT = "0xb544f5Cef94fE0B2C3BB3a4886ea8918Bbe444f5" //获取价格
 	VERIFYCONTRACT = "0x8e437A9a89E16ED807Ab1841C029e5e9C4A82c74"
-	USDT = "0xa6ea066bae96432414ac62818e62e2ecaa570de3"   //usdt合约
+	USDT           = "0xa6ea066bae96432414ac62818e62e2ecaa570de3" //usdt合约
 	//GDLCONTRACT = "0x9830c7dbcff54eb564ef952e2e5634787fc1c5d8" //代币合约地址
-	KTOCONTRACT = "0x3850D46C0442A86AaDd41D99f635e316c8788269"  //kto合约地址
-	DIGIT = "0x8128156737e199741741741DDDDaAF70c665e95b43D010"       //签名验证的盐
+	KTOCONTRACT = "0x3850D46C0442A86AaDd41D99f635e316c8788269"                         //kto合约地址
+	DIGIT       = "0xc14771a70de44653a1fea2f9ab9eb3d69dbcbee7352bf3aee607c541955eb9ee" //签名验证的盐
 )
 
 func (c CommonErrorResult) String() string {
-	switch (c) {
+	switch c {
 	case SUCCESSFUL:
 		return "操作成功"
 	case SYS_ERROR:
@@ -74,4 +74,3 @@ func (c CommonErrorResult) String() string {
 		return "UNKNOWN"
 	}
 }
-

BIN
ktogame


+ 1 - 0
models/tables.go

@@ -43,6 +43,7 @@ type Performance struct {
 type BlockInfo struct {
 	Id          int64 //主键
 	BlockNumber int64
+	Hash        string
 }
 
 type RewardsPool struct {

+ 7 - 8
routers/routers.go

@@ -7,13 +7,12 @@ import (
 )
 
 func init() {
-	beego.Router("/api/GetUserInfo", &controller.UserController{}, "POST:GetUserInfo")
-	beego.Router("/api/BindAddress", &controller.UserController{}, "POST:BindAddress")
-	beego.Router("/api/TeamUser", &controller.UserController{}, "POST:TeamUser")
-	beego.Router("/api/BonusPool", &controller.UserController{}, "POST:BonusPool")
-	beego.Router("/api/Withdrawal", &controller.UserController{}, "POST:Withdrawal")
-	beego.Router("/api/Withdrawal2", &controller.UserController{}, "POST:Withdrawal2")
-	beego.Router("/api/GetUserAll", &controller.UserController{}, "POST:GetUserAll")
-	beego.Router("/api/UpdateAmountLv", &controller.UserController{}, "POST:UpdateAmountLv")
+	beego.Router("/api/GetUserInfo", &controller.UserController{}, "POST:Reinput")
+	beego.Router("/api/BindAddress", &controller.UserController{}, "POST:GetClaimSignature")
+	beego.Router("/api/TeamUser", &controller.UserController{}, "POST:SetClaimHash")
+	beego.Router("/api/BonusPool", &controller.UserController{}, "POST:GetUserInfo")
+	beego.Router("/api/Withdrawal", &controller.UserController{}, "POST:GetTeamList")
+	beego.Router("/api/Withdrawal2", &controller.UserController{}, "POST:GetPerformance")
+	beego.Router("/api/GetUserAll", &controller.UserController{}, "POST:TotalUsers")
 
 }

Some files were not shown because too many files changed in this diff