修改证判断bug

xinjiayu · Aug 31, 2023 · 2c90312 · 2c90312
1 parent 2b3d876
commit 2c90312
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 23 deletions.
diff --git a/app.lic b/app.lic
diff --git a/cmd/CreateLic/aaa.json b/cmd/CreateLic/aaa.json
@@ -1,8 +1,8 @@
 {
-  "AppName":"SagooAPP",
+  "AppName":"SagooIOT",
   "AppCompany":"Shenyang Sagoo Education Technology Co., Ltd",
   "EncryptSalt":"afsrewfs2342423",
-  "AppUUID":"556677888",
+  "AppUUID":"55667788811111111111111111",
   "ObjUUID":"BF1E62B3-8FD0-5AC4-8E9E-C3672116EB33",
   "AuthorizedName":"XXXXX公司",
   "LimitedTime":"20240101"

diff --git a/examples/main.go b/examples/main.go
@@ -8,7 +8,7 @@ import (
 func main() {
 
 	//======================进行license控制作===========================================
-	lic, err := LicenseManager.ValidAppLic("app.lic", "558FEC81051A2020")
+	lic, err := LicenseManager.ValidAppLic("app.lic", "0123456789012345")
 	if lic {
 		if err != nil {
 			fmt.Println(err.Error())

diff --git a/lic.go b/lic.go
@@ -77,7 +77,7 @@ func ValidAppLic(appInfoFile, key string) (res bool, err error) {
 	//进行解密
 	tmpText = utils.AesDecrypt(tmpText, key)
 	conf := AppLicenseInfo{}
-	if err := json.Unmarshal([]byte(tmpText), &conf); err != nil {
+	if err := json.Unmarshal([]byte(tmpText), &conf); err == nil {
 		//获取本机的ID
 		id, err := machineid.ID()
 		if err != nil {
@@ -99,5 +99,5 @@ func ValidAppLic(appInfoFile, key string) (res bool, err error) {
 		}
 
 	}
-	return
+	return true, nil
 }
diff --git a/lic_test.go b/lic_test.go
@@ -9,27 +9,21 @@ func TestValidAppLic(t *testing.T) {
 
 	licFilePath := "app.lic"
 	lic, err := ValidAppLic(licFilePath, "1234567890123456")
-	if err != nil {
-		t.Log(err.Error())
-	}
 	if lic {
-		fmt.Println("License is valid!")
-	} else {
-		fmt.Println("License is invalid!")
+		if err != nil {
+			fmt.Println(err.Error())
+			return
+		}
+		// 授权成功
+		t.Log("授权有效")
+		return
 	}
-	t.Log("TestValidAppLic OK!")
+	t.Log("授权无效，请联系管理员！")
 }
 
 func TestEncryptLic(t *testing.T) {
-	lic, err := ValidAppLic("app.lic", "1234567890123456")
-	if err != nil {
-		t.Log(err.Error())
-	}
-	if lic {
-		fmt.Println("License is valid!")
-	} else {
-		fmt.Println("License is invalid!")
-	}
-	t.Log(lic)
 
+	licFilePath := "aaa.json"
+	EncryptLic(licFilePath, "1234567890123456")
+	t.Log("success")
 }