00

examples/licenser/test2.go

@@ -33,6 +33,7 @@ func test2() {
 		licenser := licenser_normal.MakeLicenser(appName, appCode, hardsn, pub_key)
 		lic_data := licenser_normal.MakeLicenserData(appCode, hardsn)
 
+		lic_data.AppName = appName
 		lic_data.CompanyName = CompanyName
 		lic_data.MaxNum = maxNum
 		lic_data.Copyright = Copyright
@@ -46,10 +47,27 @@ func test2() {
 		} else {
 
 			lic_data.Sign = sign
-			lic_data.PubKey = pub_key
+			//lic_data.PubKey = pub_key
+
+			lic_data_str111, err_json := lic_data.ToJson()
+			if err_json != nil {
+				fmt.Println("err_json ", err_json.Error())
+				continue
+			}
+
+			bret := licenser.SetData(lic_data_str111, func(data *licenser_normal.LicenserData) {
+
+			})
+			if bret != nil {
+				fmt.Println("-----------text:", lic_data_str)
+				fmt.Println("-----------pub_key:", pub_key)
+				fmt.Println("-----------sign:", sign)
+			}
 
-			bret := licenser.EccVerifySign(lic_data_str, sign, pub_key)
 			fmt.Println("bret =", i, bret)
+			fmt.Println("------------------------------------------------")
+			fmt.Println("------------------------------------------------")
+			fmt.Println("------------------------------------------------")
 		}
 	}
 

tools/licenser_normal/licenser.go

@@ -18,8 +18,7 @@ type Licenser struct {
 	PublishKey string //公钥
 	is_demo    bool   //演示版
 
-	Data      *LicenserData
-	callbacks []LicenserUpdateCallback //更新回调列表
+	Data *LicenserData
 }
 
 func MakeLicenser(appname, appcode, hardsn string, publish_key string) *Licenser {
@@ -41,37 +40,10 @@ func MakeLicenser(appname, appcode, hardsn string, publish_key string) *Licenser
 		Data:       licenserData,
 		is_demo:    true,
 	}
-
 	return licenser
 }
 
-/*
-func (this *Licenser) LoadFromFile(filename string) error {
-
-	data, err := ioutil.ReadFile(filename)
-	if err != nil {
-		return err
-	}
-
-	err = this.LoadData(string(data))
-	return err
-}
-
-func (this *Licenser) SaveToFile(filename string) error {
-
-	license_str := this.Data.ToString()
-
-	err := ioutil.WriteFile(filename, []byte(license_str), 0666) //写入文件(字节数组)
-
-	return err
-}
-*/
-
-func (this *Licenser) SetCallback(cb LicenserUpdateCallback) {
-	this.callbacks = append(this.callbacks, cb)
-}
-
-func (this *Licenser) LoadData(lic_data string) error {
+func (this *Licenser) SetData(lic_data string, call_back func(data *LicenserData)) error {
 
 	license_data := &LicenserData{}
 
@@ -92,9 +64,7 @@ func (this *Licenser) LoadData(lic_data string) error {
 	this.Data = license_data
 
 	// 4. 通知生效
-	for _, val := range this.callbacks {
-		val()
-	}
+	call_back(license_data)
 
 	return nil
 }
@@ -121,6 +91,9 @@ func (this *Licenser) checkData(license_data *LicenserData) error {
 	text := license_data.ToString()
 	ret := this.EccVerifySign(text, license_data.Sign, this.PublishKey)
 	if ret == false {
+		fmt.Println("text:[", text, "]")
+		fmt.Println("sign:[", license_data.Sign, "]")
+		fmt.Println("pub_key:[", this.PublishKey, "]")
 		return errors.New("验签名失败")
 	}