update autonomy ci

plugin/dapp/autonomy/commands/proposal_board.go

@@ -191,7 +191,8 @@ func VoteProposalBoardCmd() *cobra.Command {
 func addVoteProposalBoardFlags(cmd *cobra.Command) {
 	cmd.Flags().StringP("proposalID", "p", "", "proposal ID")
 	cmd.MarkFlagRequired("proposalID")
-	cmd.Flags().Int32P("approve", "r", 1, "is approve, default true")
+
+	cmd.Flags().Int32P("approve", "r", 1, "1:approve, 2:oppose, 3:quit, default 1")
 	cmd.Flags().StringP("originAddr", "o", "", "origin address: addr1-addr2......addrN")
 }
 
@@ -203,12 +204,6 @@ func voteProposalBoard(cmd *cobra.Command, args []string) {
 	approve, _ := cmd.Flags().GetInt32("approve")
 	originAddr, _ := cmd.Flags().GetString("originAddr")
 
-	var isapp bool
-	if approve == 0 {
-		isapp = false
-	} else {
-		isapp = true
-	}
 	var originAddrs []string
 	if len(originAddr) > 0 {
 		originAddrs = strings.Split(originAddr, "-")
@@ -216,8 +211,8 @@ func voteProposalBoard(cmd *cobra.Command, args []string) {
 
 	params := &auty.VoteProposalBoard{
 		ProposalID: ID,
-		Approve:    isapp,
 		OriginAddr: originAddrs,
+		VoteOption: auty.AutonomyVoteOption(approve),
 	}
 	payLoad, err := json.Marshal(params)
 	if err != nil {

plugin/dapp/autonomy/commands/proposal_change.go

@@ -5,8 +5,6 @@
 package commands
 
 import (
-	"strings"
-
 	"encoding/json"
 
 	jsonrpc "github.com/33cn/chain33/rpc/jsonclient"
@@ -36,8 +34,8 @@ func addProposalChangeFlags(cmd *cobra.Command) {
 	cmd.Flags().Int64P("endBlock", "e", 0, "end block height")
 	cmd.MarkFlagRequired("endBlock")
 
-	cmd.Flags().StringP("changes", "c", "", "addr1-true*addr2-false*addr3-true*......*addrN-false (1<=N<20)")
-	cmd.MarkFlagRequired("changes")
+	cmd.Flags().StringP("change", "c", "", "addr")
+	cmd.MarkFlagRequired("change")
 }
 
 func proposalChange(cmd *cobra.Command, args []string) {
@@ -49,29 +47,12 @@ func proposalChange(cmd *cobra.Command, args []string) {
 
 	startBlock, _ := cmd.Flags().GetInt64("startBlock")
 	endBlock, _ := cmd.Flags().GetInt64("endBlock")
-	changestr, _ := cmd.Flags().GetString("changes")
-
-	changeStr := strings.Split(changestr, "*")
+	changeAddrstr, _ := cmd.Flags().GetString("change")
 
 	var changes []*auty.Change
-	for _, chStr := range changeStr {
-		per := strings.Split(chStr, "-")
-		if len(per) == 2 {
-			if per[1] == "true" {
-				change := &auty.Change{
-					Cancel: true,
-					Addr:   per[0],
-				}
-				changes = append(changes, change)
-			} else if per[1] == "false" {
-				change := &auty.Change{
-					Cancel: false,
-					Addr:   per[0],
-				}
-				changes = append(changes, change)
-			}
-		}
-	}
+	change := &auty.Change{Cancel: true, Addr: changeAddrstr}
+	changes = append(changes, change)
+
 	params := &auty.ProposalChange{
 		Year:             year,
 		Month:            month,
@@ -148,7 +129,7 @@ func VoteProposalChangeCmd() *cobra.Command {
 func addVoteProposalChangeFlags(cmd *cobra.Command) {
 	cmd.Flags().StringP("proposalID", "p", "", "proposal ID")
 	cmd.MarkFlagRequired("proposalID")
-	cmd.Flags().Int32P("approve", "r", 1, "is approve, default true")
+	cmd.Flags().Int32P("approve", "r", 1, "1:approve, 2:oppose, 3:quit, default 1")
 }
 
 func voteProposalChange(cmd *cobra.Command, args []string) {
@@ -157,16 +138,9 @@ func voteProposalChange(cmd *cobra.Command, args []string) {
 	ID, _ := cmd.Flags().GetString("proposalID")
 	approve, _ := cmd.Flags().GetInt32("approve")
 
-	var isapp bool
-	if approve == 0 {
-		isapp = false
-	} else {
-		isapp = true
-	}
-
 	params := &auty.VoteProposalChange{
 		ProposalID: ID,
-		Approve:    isapp,
+		Vote:       auty.AutonomyVoteOption(approve),
 	}
 	payLoad, err := json.Marshal(params)
 	if err != nil {

plugin/dapp/autonomy/commands/proposal_project.go

@@ -171,7 +171,7 @@ func VoteProposalProjectCmd() *cobra.Command {
 func addVoteProposalProjectFlags(cmd *cobra.Command) {
 	cmd.Flags().StringP("proposalID", "p", "", "proposal ID")
 	cmd.MarkFlagRequired("proposalID")
-	cmd.Flags().Int32P("approve", "r", 1, "is approve, default true")
+	cmd.Flags().Int32P("approve", "r", 1, "1:approve, 2:oppose, 3:quit, default 1")
 }
 
 func voteProposalProject(cmd *cobra.Command, args []string) {
@@ -180,16 +180,10 @@ func voteProposalProject(cmd *cobra.Command, args []string) {
 	rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
 	ID, _ := cmd.Flags().GetString("proposalID")
 	approve, _ := cmd.Flags().GetInt32("approve")
-	var isapp bool
-	if approve == 0 {
-		isapp = false
-	} else {
-		isapp = true
-	}
 
 	params := &auty.VoteProposalProject{
 		ProposalID: ID,
-		Approve:    isapp,
+		Vote:       auty.AutonomyVoteOption(approve),
 	}
 	payLoad, err := json.Marshal(params)
 	if err != nil {

plugin/dapp/autonomy/commands/proposal_rule.go

@@ -47,8 +47,8 @@ func addProposalRuleFlags(cmd *cobra.Command) {
 	cmd.Flags().Int64P("proposalAmount", "p", 0, "proposal cost amount")
 	cmd.Flags().Int64P("largeProjectAmount", "l", 0, "large project amount threshold")
 	cmd.Flags().Int32P("publicPeriod", "u", 0, "public time")
-	cmd.Flags().Int32P("pubAttendRatio", "a", 0, "public Attend")
-	cmd.Flags().Int32P("pubApproveRatio", "v", 0, "public Approve")
+	cmd.Flags().Int32P("pubAttendRatio", "a", 0, "public attend ratio(unit is %)")
+	cmd.Flags().Int32P("pubApproveRatio", "v", 0, "public approve ratio(unit is %)")
 }
 
 func proposalRule(cmd *cobra.Command, args []string) {
@@ -160,7 +160,7 @@ func VoteProposalRuleCmd() *cobra.Command {
 func addVoteProposalRuleFlags(cmd *cobra.Command) {
 	cmd.Flags().StringP("proposalID", "p", "", "proposal ID")
 	cmd.MarkFlagRequired("proposalID")
-	cmd.Flags().Int32P("approve", "r", 1, "is approve, default true")
+	cmd.Flags().Int32P("approve", "r", 1, "1:approve, 2:oppose, 3:quit, default 1")
 	cmd.Flags().StringP("originAddr", "o", "", "origin address: addr1-addr2......addrN")
 }
 
@@ -171,12 +171,6 @@ func voteProposalRule(cmd *cobra.Command, args []string) {
 	ID, _ := cmd.Flags().GetString("proposalID")
 	approve, _ := cmd.Flags().GetInt32("approve")
 	originAddr, _ := cmd.Flags().GetString("originAddr")
-	var isapp bool
-	if approve == 0 {
-		isapp = false
-	} else {
-		isapp = true
-	}
 
 	var originAddrs []string
 	if len(originAddr) > 0 {
@@ -185,8 +179,8 @@ func voteProposalRule(cmd *cobra.Command, args []string) {
 
 	params := &auty.VoteProposalRule{
 		ProposalID: ID,
-		Approve:    isapp,
 		OriginAddr: originAddrs,
+		Vote:       auty.AutonomyVoteOption(approve),
 	}
 	payLoad, err := json.Marshal(params)
 	if err != nil {