更新开机解锁逻辑

pkg/app/process.go

@@ -149,21 +149,27 @@ func CornProcessJob(ticker *time.Ticker){
 				NodeError = getWalletInfo()
 				//解锁钱包
 				if NodeError == nil {
-					err := Unlock()
-					if err != nil {
-						tlog.Error("unlock wallet","err",err)
-					} else {
+
 					status ,err := GetWalletStatus()
 					if err != nil {
 						tlog.Error("GetWalletStatus","err",err)
-						} else if !status.IsAutoMining {
+					}
+					if !status.IsAutoMining {
 						err := AutoOpenTicket()
 						if  err != nil {
 							tlog.Error("AutoOpenTicket","err",err)
 						}
 					}
+					if status.IsHasSeed  {
+						if status.IsTicketLock && status.IsWalletLock{
+							err := Unlock()
+							if err != nil {
+								tlog.Error("unlock wallet","err",err)
+							}
+						}
 
 					}
+
 				}
 				//升级6.4.0bityuan
 				updateBityuan640()

service/pai_service/pai.go

@@ -31,6 +31,7 @@ type Pai struct {
 	WalletStatus *types.WalletStatus `json:"wallet_status"`
 	NetInfo *types.NodeNetInfo `json:"net_info"`
 	BtyVersion *types.VersionInfo `json:"bty_version"`
+	Err string `json:"err"`
 }
 
 type ReqUpdatePai struct {
@@ -38,6 +39,7 @@ type ReqUpdatePai struct {
 }
 
 func (p *Pai) SetPai() error {
+	p.Err = ""
 	p.GetConfig()
 	p.GetDevstatus()
 	p.GetBtyVersion()
@@ -48,6 +50,7 @@ func (p *Pai) GetBtyVersion() error {
 	client := &chain33.PaiClient{}
 	v,err := client.Version()
 	if err != nil {
+		p.Err = err.Error()
 		return err
 	}
 	p.BtyVersion = v
@@ -63,6 +66,7 @@ func (p *Pai) GetConfig() bool {
 	}
 	config ,err := getPaiConfig("cat","/proc/cpuinfo")
 	if err != nil {
+		p.Err = err.Error()
 		return false
 	}
 	if _,ok := config["serial"];ok {
@@ -79,6 +83,7 @@ func (p *Pai) GetDevstatus() error {
 	peerinfo,err := client.GetPeerInfo()
 	if err != nil {
 		tlog.Error("GetDevstatus peerinfo ","err",err)
+		p.Err = err.Error()
 		return err
 	}
 
@@ -92,18 +97,21 @@ func (p *Pai) GetDevstatus() error {
 	}
 	sync ,err := client.IsNtpClockSync()
 	if err != nil {
+		p.Err = err.Error()
 		tlog.Error("GetDevstatus IsNtpClockSync"," err",err)
 		return err
 	}
 	p.IsNtpSync = sync.IsOk
 	netinfo,err := client.GetNetInfo()
 	if err != nil {
+		p.Err = err.Error()
 		tlog.Error("GetDevstatus GetNetInfo"," err",err)
 		return err
 	}
 	p.NetInfo = netinfo
 	walletstatus,err := client.GetWalletStatus()
 	if err != nil {
+		p.Err = err.Error()
 		tlog.Error("GetDevstatus GetWalletStatus ","err",err)
 		return err
 	}