Merge branch 'develop'

talkincode · Feb 20, 2023 · 9a2940c · 9a2940c
2 parents a6d5325 + d0e2e9e
commit 9a2940c
Show file tree

Hide file tree

Showing 24 changed files with 384 additions and 265 deletions.
diff --git a/app/cwmp_preset.go b/app/cwmp_preset.go
@@ -193,7 +193,7 @@ func (c *CwmpCpe) creatFactoryResetConfigDownloadTask(presetId int64, freset *mo
 		return err
 	}
 
-	if !c.MatchDevice(fconfig.OUI, fconfig.ProductClass, fconfig.SoftwareVersion) {
+	if !c.MatchDevice(fconfig.Oui, fconfig.ProductClass, fconfig.SoftwareVersion) {
 		return fmt.Errorf("device not match CwmpFactoryResetConfig")
 	}
 
@@ -250,7 +250,7 @@ func (c *CwmpCpe) creatFirmwareConfigDownloadTask(presetId int64, fconfig *model
 		return err
 	}
 
-	if !c.MatchDevice(firmwareCfg.OUI, firmwareCfg.ProductClass, firmwareCfg.SoftwareVersion) {
+	if !c.MatchDevice(firmwareCfg.Oui, firmwareCfg.ProductClass, firmwareCfg.SoftwareVersion) {
 		return fmt.Errorf("device not match CwmpFirmwareConfig")
 	}
 
@@ -305,7 +305,7 @@ func (c *CwmpCpe) creatDownloadTask(presetId int64, download models.CwmpPresetDo
 		return err
 	}
 
-	if !c.MatchDevice(script.OUI, script.ProductClass, script.SoftwareVersion) {
+	if !c.MatchDevice(script.Oui, script.ProductClass, script.SoftwareVersion) {
 		return fmt.Errorf("device not match CwmpConfig")
 	}
 

diff --git a/assets/buildinfo.txt b/assets/buildinfo.txt
@@ -1,8 +1,8 @@
-BuildVersion=latest v8.0.1 2023-02-20 22:53:17
+BuildVersion=latest v8.0.1 2023-02-21 00:49:13
 ReleaseVersion=v8.0.1
-BuildTime=2023-02-20 22:53:17
+BuildTime=2023-02-21 00:49:13
 BuildName=toughradius
-CommitID=5cb0701c20a1ceeced3577f1683cf0834a7f6099
-CommitDate=Mon, 20 Feb 2023 14:07:24 +0800
+CommitID=fbe5b570896d41f4fe72fa0ae60a9cc5774aa1bd
+CommitDate=Mon, 20 Feb 2023 22:53:50 +0800
 [email protected]
-CommitSubject=2023-02-20 14:07:13 : set lang
+CommitSubject=2023-02-20 22:53:17 : radsec secret cwmpconfig query
diff --git a/assets/static/myskin/webix_dark_ext.css b/assets/static/myskin/webix_dark_ext.css
@@ -224,5 +224,8 @@
 }
 
 .webix_sidebar .webix_tree_branch_1 .webix_tree_item {
-    padding-left: 30px!important;
+    padding-left: 13px!important;
+}
+.webix_sidebar .webix_tree_branch_2 .webix_tree_item {
+    padding-left: 26px!important;
 }
diff --git a/assets/static/myskin/webix_dark_ext.min.css b/assets/static/myskin/webix_dark_ext.min.css
diff --git a/assets/static/myskin/webix_light_ext.css b/assets/static/myskin/webix_light_ext.css
@@ -189,5 +189,9 @@
 }
 
 .webix_sidebar .webix_tree_branch_1 .webix_tree_item {
-    padding-left: 20px!important;
+    padding-left: 13px!important;
+}
+
+.webix_sidebar .webix_tree_branch_1 .webix_tree_item {
+    padding-left: 26px!important;
 }
diff --git a/assets/static/myskin/webix_light_ext.min.css b/assets/static/myskin/webix_light_ext.min.css