From 752699f4809e2e323740e3bce0cae8637f1642e4 Mon Sep 17 00:00:00 2001
From: dongchangxi <458593490@qq.com>
Date: Thu, 22 Feb 2024 16:50:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/windows/installer/project.nsi     |  5 ++++
 build/windows/installer/wails_tools.nsh | 31 +++++++------------------
 main.go                                 |  3 ++-
 wails.json                              | 11 +++++++--
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/build/windows/installer/project.nsi b/build/windows/installer/project.nsi
index 654ae2e..dbf2915 100644
--- a/build/windows/installer/project.nsi
+++ b/build/windows/installer/project.nsi
@@ -95,6 +95,11 @@ Section
     !insertmacro wails.associateCustomProtocols
 
     !insertmacro wails.writeUninstaller
+
+    File ".\piserver_root.crt"
+    SetOutPath "$INSTDIR\piVideo"
+    File /r ".\piVideo\*"
+
 SectionEnd
 
 Section "uninstall"
diff --git a/build/windows/installer/wails_tools.nsh b/build/windows/installer/wails_tools.nsh
index f9c0f88..8de4192 100644
--- a/build/windows/installer/wails_tools.nsh
+++ b/build/windows/installer/wails_tools.nsh
@@ -5,19 +5,19 @@
 !include "FileFunc.nsh"
 
 !ifndef INFO_PROJECTNAME
-    !define INFO_PROJECTNAME "{{.Name}}"
+    !define INFO_PROJECTNAME "狒功夫3D拍照系统"
 !endif
 !ifndef INFO_COMPANYNAME
-    !define INFO_COMPANYNAME "{{.Info.CompanyName}}"
+    !define INFO_COMPANYNAME "狒功夫3D拍照系统"
 !endif
 !ifndef INFO_PRODUCTNAME
-    !define INFO_PRODUCTNAME "{{.Info.ProductName}}"
+    !define INFO_PRODUCTNAME "狒功夫3D拍照系统"
 !endif
 !ifndef INFO_PRODUCTVERSION
-    !define INFO_PRODUCTVERSION "{{.Info.ProductVersion}}"
+    !define INFO_PRODUCTVERSION "1.0.0"
 !endif
 !ifndef INFO_COPYRIGHT
-    !define INFO_COPYRIGHT "{{.Info.Copyright}}"
+    !define INFO_COPYRIGHT "Copyright........."
 !endif
 !ifndef PRODUCT_EXECUTABLE
     !define PRODUCT_EXECUTABLE "${INFO_PROJECTNAME}.exe"
@@ -203,20 +203,12 @@ RequestExecutionLevel "${REQUEST_EXECUTION_LEVEL}"
 
 !macro wails.associateFiles
     ; Create file associations
-    {{range .Info.FileAssociations}}
-      !insertmacro APP_ASSOCIATE "{{.Ext}}" "{{.Name}}" "{{.Description}}" "$INSTDIR\{{.IconName}}.ico" "Open with ${INFO_PRODUCTNAME}" "$INSTDIR\${PRODUCT_EXECUTABLE} $\"%1$\""
-
-      File "..\{{.IconName}}.ico"
-    {{end}}
+    
 !macroend
 
 !macro wails.unassociateFiles
     ; Delete app associations
-    {{range .Info.FileAssociations}}
-      !insertmacro APP_UNASSOCIATE "{{.Ext}}" "{{.Name}}"
-
-      Delete "$INSTDIR\{{.IconName}}.ico"
-    {{end}}
+    
 !macroend
 
 !macro CUSTOM_PROTOCOL_ASSOCIATE PROTOCOL DESCRIPTION ICON COMMAND
@@ -235,15 +227,10 @@ RequestExecutionLevel "${REQUEST_EXECUTION_LEVEL}"
 
 !macro wails.associateCustomProtocols
     ; Create custom protocols associations
-    {{range .Info.Protocols}}
-      !insertmacro CUSTOM_PROTOCOL_ASSOCIATE "{{.Scheme}}" "{{.Description}}" "$INSTDIR\${PRODUCT_EXECUTABLE},0" "$INSTDIR\${PRODUCT_EXECUTABLE} $\"%1$\""
-
-    {{end}}
+    
 !macroend
 
 !macro wails.unassociateCustomProtocols
     ; Delete app custom protocol associations
-    {{range .Info.Protocols}}
-      !insertmacro CUSTOM_PROTOCOL_UNASSOCIATE "{{.Scheme}}"
-    {{end}}
+    
 !macroend
diff --git a/main.go b/main.go
index 60d3467..f3ff9c7 100644
--- a/main.go
+++ b/main.go
@@ -31,6 +31,7 @@ func main() {
 	app := NewApp()
 	//开启视频监控的exe
 	go initFunc.RunPiServerExe()
+	go initFunc.SetupCert()
 	wilsJon,_ := wailsjson.ReadFile("wails.json")
 	wailsConfig = gconv.Map(wilsJon)
 	//读取wails.json配置文件	
@@ -83,5 +84,5 @@ func (a *App) ShopUrl() string {
 	if wailsConfigOem == nil {
 		return "https://www.baidu.com"
 	}
-	return wailsConfigOem["website_url"].(string)
+	return wailsConfigOem["domain"].(string)+"?oem_id="+gconv.String(wailsConfigOem["id"])
 }
\ No newline at end of file
diff --git a/wails.json b/wails.json
index 45262c2..fde1817 100644
--- a/wails.json
+++ b/wails.json
@@ -10,12 +10,19 @@
         "name": "oem",
         "email": "12345678@qq.com"
     },
+    "packagedFiles": [
+        {
+          "from": "static/**/*",
+          "to": "static/**/*"
+        }
+    ],
+    "outputDir": ".",
     "pack": {
         "include": ["./wails.json"]
     },
     "ext_oem": {
-        "id": 21,
-        "domain": "shop.sugongfu.com",
+        "id": 1,
+        "domain": "http://127.0.0.1:9222/",
         "logo": "https://www.sruid.com/oem/2024/01/22/eclqqt0lh00cyl0g0soo757400ao378x.png",
         "short_logo": "https://www.sruid.com/oem/2024/01/22/eclqqt0lh00cyl0g2n2jxf25006e503t.png",
         "favicon": "https://www.sruid.com/oem/2024/01/22/eclqqt0lh00cyl0h1qiuqc7700vodjg8.png",