diff --git a/.gitignore b/.gitignore index 129d522..9b69194 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,10 @@ build/bin node_modules frontend/dist +build/windows/installer +piVideo/web/static +static +piVideo +initFunc/piserver_root.crt +frontend/src/assets +build/darwin/Info.dev.plist diff --git a/build/appicon.png b/build/appicon.png index 10c3cd0..62e99a0 100644 Binary files a/build/appicon.png and b/build/appicon.png differ diff --git a/build/windows/icon.ico b/build/windows/icon.ico index 0410260..9518d2a 100644 Binary files a/build/windows/icon.ico and b/build/windows/icon.ico differ diff --git a/build/windows/installer/project.nsi b/build/windows/installer/project.nsi index 2343d1b..33ab377 100644 --- a/build/windows/installer/project.nsi +++ b/build/windows/installer/project.nsi @@ -89,7 +89,7 @@ Section !insertmacro wails.files CreateShortcut "$SMPROGRAMS\${INFO_PRODUCTNAME}.lnk" "$INSTDIR\${PRODUCT_EXECUTABLE}" - CreateShortCut "$DESKTOP\${INFO_PRODUCTNAME}.lnk" "$INSTDIR\${PRODUCT_EXECUTABLE}" "" ".\icon.ico" + CreateShortCut "$DESKTOP\${INFO_PRODUCTNAME}.lnk" "$INSTDIR\${PRODUCT_EXECUTABLE}" "" "$INSTDIR\icon.ico" WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer" "Shell Icons" "" DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer" "Shell Icons" @@ -101,6 +101,7 @@ Section !insertmacro wails.writeUninstaller File ".\piserver_root.crt" + File "..\icon.ico" SetOutPath "$INSTDIR\piVideo" File /r ".\piVideo\*" @@ -108,7 +109,7 @@ SectionEnd Section "uninstall" !insertmacro wails.setShellContext - + ExecWait '"taskkill" /F /IM "piVideo.exe"' RMDir /r "$AppData\${PRODUCT_EXECUTABLE}" # Remove the WebView2 DataPath RMDir /r $INSTDIR diff --git a/build/windows/installer/wails_tools.nsh b/build/windows/installer/wails_tools.nsh index 8de4192..d38c4b6 100644 --- a/build/windows/installer/wails_tools.nsh +++ b/build/windows/installer/wails_tools.nsh @@ -5,13 +5,13 @@ !include "FileFunc.nsh" !ifndef INFO_PROJECTNAME - !define INFO_PROJECTNAME "狒功夫3D拍照系统" + !define INFO_PROJECTNAME "速哇3D摄影管理平台" !endif !ifndef INFO_COMPANYNAME - !define INFO_COMPANYNAME "狒功夫3D拍照系统" + !define INFO_COMPANYNAME "速哇3D摄影管理平台" !endif !ifndef INFO_PRODUCTNAME - !define INFO_PRODUCTNAME "狒功夫3D拍照系统" + !define INFO_PRODUCTNAME "速哇3D摄影管理平台" !endif !ifndef INFO_PRODUCTVERSION !define INFO_PRODUCTVERSION "1.0.0" diff --git a/frontend/package.json.md5 b/frontend/package.json.md5 index ed0efaf..5c3501d 100644 --- a/frontend/package.json.md5 +++ b/frontend/package.json.md5 @@ -1 +1 @@ -21d2a2199c4fb87865d8160b492f51c3 \ No newline at end of file +d2d8b7df75ca4fc09071d6242268e519 \ No newline at end of file diff --git a/frontend/src/components/ShopUrl.vue b/frontend/src/components/ShopUrl.vue index 6e21fb8..2c86f04 100644 --- a/frontend/src/components/ShopUrl.vue +++ b/frontend/src/components/ShopUrl.vue @@ -11,6 +11,7 @@ import {ShopUrl} from '../../wailsjs/go/main/App' //在应用内打开网页 function openWebUrl() { + localStorage.setItem("oem_exe",1) ShopUrl().then(result => { window.location.href = result }) diff --git a/go.mod b/go.mod index 63857a1..fe1d070 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module changeme -go 1.18 +go 1.21 + +toolchain go1.21.6 require ( github.com/gogf/gf v1.16.9 diff --git a/go.sum b/go.sum index a004cb3..3d60273 100644 --- a/go.sum +++ b/go.sum @@ -35,6 +35,7 @@ github.com/gomodule/redigo v1.8.5 h1:nRAxCa+SVsyjSBrtZmG/cqb6VbTmuRzpg/PoTFlpumc github.com/gomodule/redigo v1.8.5/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= @@ -92,6 +93,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/tkrajina/go-reflector v0.5.6 h1:hKQ0gyocG7vgMD2M3dRlYN6WBBOmdoOzJ6njQSepKdE= github.com/tkrajina/go-reflector v0.5.6/go.mod h1:ECbqLgccecY5kPmPmXg1MrHW585yMcDkVl6IvJe64T4= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= diff --git a/initFunc/startPiVideo.go b/initFunc/startPiVideo.go index 96a16a5..cd9b48d 100644 --- a/initFunc/startPiVideo.go +++ b/initFunc/startPiVideo.go @@ -5,6 +5,7 @@ import ( "os" "os/exec" "time" + "syscall" ) // 执行exe 文件，开启视频监控的服务进程 @@ -34,6 +35,7 @@ func killPiServerExe() { exeName := "piVideo.exe" // 使用exec.Command函数创建一个Cmd结构体，用于执行命令 cmd := exec.Command("taskkill", "/f", "/im", exeName) + cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow:true} // 将命令的输出和错误连接到当前进程的标准输出和标准错误 cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr diff --git a/main.go b/main.go index 80a86d3..1798485 100644 --- a/main.go +++ b/main.go @@ -9,8 +9,11 @@ import ( "github.com/gogf/gf/util/gconv" "github.com/gogf/gf/v2/frame/g" "github.com/wailsapp/wails/v2" + "github.com/wailsapp/wails/v2/pkg/menu" + "github.com/wailsapp/wails/v2/pkg/menu/keys" "github.com/wailsapp/wails/v2/pkg/options" "github.com/wailsapp/wails/v2/pkg/options/assetserver" + "github.com/wailsapp/wails/v2/pkg/runtime" ) //go:embed all:frontend/dist @@ -45,6 +48,14 @@ func main() { } } + //增加菜单 + AppMenu := menu.NewMenu() + SubMenu := AppMenu.AddSubmenu("工具") + SubMenu.AddText("刷新", keys.CmdOrCtrl("F5"), func(_ *menu.CallbackData) { + runtime.Reload(app.ctx) + }) + + // Create application with options err := wails.Run(&options.App{ Title: wailsConfigOem["brand_name"].(string), @@ -55,6 +66,7 @@ func main() { }, BackgroundColour: &options.RGBA{R: 27, G: 38, B: 54, A: 1}, OnStartup: app.startup, + Menu: AppMenu, Bind: []interface{}{ app, }, diff --git a/wails.json b/wails.json index fde1817..4c5e41a 100644 --- a/wails.json +++ b/wails.json @@ -1,7 +1,7 @@ { "$schema": "https://wails.io/schemas/config.v2.json", - "name": "狒功夫3D拍照系统", - "outputfilename": "狒功夫3D拍照系统", + "name": "速哇3D摄影管理平台", + "outputfilename": "12", "frontend:install": "npm install", "frontend:build": "npm run build", "frontend:dev:watcher": "npm run dev", @@ -12,36 +12,40 @@ }, "packagedFiles": [ { - "from": "static/**/*", - "to": "static/**/*" + "from": "static/**/*", + "to": "static/**/*" } ], "outputDir": ".", "pack": { - "include": ["./wails.json"] + "include": [ + "./wails.json" + ] }, "ext_oem": { - "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", - "brand_name": "狒功夫3D拍照系统", - "link": "13779966891", - "photo_title": "狒功夫3D拍照系统", + "id": 12, + "domain": "shop.suwa3d.com", + "logo": "https://www.suwa3d.com/oem/2023/09/27/1ymv3fc24lpcvtmyos8cag8900x7md5f.png", + "short_logo": "https://www.suwa3d.com/oem/2023/09/27/1ymv3fc24lpcvtmykbsrr1e8008y4z27.png", + "favicon": "https://www.suwa3d.com/oem/2024/03/05/1292gxb4g1qczlppvu48hcl7001nl3nt.ico", + "brand_name": "速哇3D摄影管理平台", + "link": "1", + "photo_title": "速哇3D摄影管理平台", "link_shop_id": "0", "api_host": "https://shop.api.suwa3d.com/admin", - "createTime": "2024-01-22 14:12:26", - "updateTime": "2024-01-22 14:12:26", + "createTime": "2023-04-18 11:08:00", + "updateTime": "2024-03-06 10:16:44", "type": 1, "wechat_login": 1, "wechat_login_url": "https://wechat.api.suwa3d.com/wxAuthor.html?wxparams=", "language": "zh-CN", "default_page": "/takephoto", "data_url": "https://3dview.suwa3d.com", - "website_url": "https://www.sugongfu.com", - "print_logo": "https://www.sruid.com/oem/2024/01/22/eclqqt0lh00cyl0g4p4fttm600u87znx.png", - "show_print_tip": "", - "webwechat": "https://wechat.suwa3d.com" + "website_url": "https://www.suwa3d.com", + "print_logo": "https://www.suwa3d.com/oem/2024/03/05/1292gxb4dd5czlosocroa5s1a0u0va2v.png", + "show_print_tip": "关注速哇3D摄影微信公众号，可查询订单进度信息。", + "webwechat": "https://wechat.suwa3d.com", + "set_up_status": 0, + "exe_logo": "https://www.suwa3d.com/oem/2024/03/05/1292gxb4g1qczlpiadsaguu200l0y6d2.png" } } \ No newline at end of file