change logo

Makefile

@@ -159,6 +159,7 @@ package_gui_mac_client:
 # launcher
 compile_launcher_win64:
 	@echo 'start compile win64 launcher'
+	@~/go/bin/rsrc -arch amd64 -manifest xdoc/main.manifest -ico xdoc/favicon.ico -o cmd/launcher/main.syso
 	@cd cmd/launcher && \
         CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ GOOS=windows GOARCH=amd64 \
 		${BUILD_CMD_WIN} -x -v \
@@ -167,6 +168,7 @@ compile_launcher_win64:
 
 compile_launcher_win32:
 	@echo 'start compile win32 launcher'
+	@~/go/bin/rsrc -arch 386 -manifest xdoc/main.manifest -ico xdoc/favicon.ico -o cmd/launcher/main.syso
 	@cd cmd/launcher && \
         CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ GOOS=windows GOARCH=386 \
 		${BUILD_CMD_WIN} -x -v \

client/forge.config.js

@@ -16,22 +16,35 @@ module.exports = {
         {
             name: '@electron-forge/maker-squirrel',
             config: {
-                name: 'zd'
+                name: 'zd',
+                options: {
+                    icon: "./ui/favicon.png"
+                }
             }
         },
-        {
-            name: '@electron-forge/maker-zip',
-            platforms: [
-                'darwin'
-            ]
-        },
         {
             name: '@electron-forge/maker-deb',
-            config: {}
+            config: {
+                name: 'zd',
+                options: {
+                    icon: "./ui/favicon.png"
+                }
+            }
         },
         {
             name: '@electron-forge/maker-rpm',
-            config: {}
+            config: {
+                name: 'zd',
+                options: {
+                    icon: "./ui/favicon.png"
+                }
+            }
+        },
+        {
+            name: '@electron-forge/maker-zip',
+            platforms: [
+                'darwin'
+            ]
         }
     ],
     plugins: [

client/src/app/app.js

@@ -60,8 +60,12 @@ export class ZdApp {
             webPreferences: {
                 nodeIntegration: true,
                 contextIsolation: false,
-            }
+            },
+            // icon: 'favicon.png'
         })
+        // logInfo(`__dirname=${__dirname}`)
+        // mainWin.setIcon(pth.join(__dirname, 'favicon.png'));
+
         // if (IS_MAC_OSX) {
         //     mainWin.setTrafficLightPosition && mainWin.setTrafficLightPosition({
         //         x: 10,

client/src/app/core/zd.js

@@ -121,7 +121,7 @@ export function killZdServer() {
     if (!IS_WINDOWS_OS) {
         logInfo(`>> not windows`);
 
-        const cmd = `ps -ef | grep ${uuid} | grep -v "grep" | awk '{print $2}' | xargs kill -9`
+        const cmd = `ps -ef | grep ${uuid} | grep -v "grep" | awk '{print $2}' | xargs -r kill -9`
         logInfo(`>> exit cmd: ${cmd}`);
 
         const cp = require('child_process');

xdoc/steup.txt

 go run src/zd.go -y demo/article.yaml -c 3 -head -s
 
 ~/go/bin/rsrc -manifest xdoc/main.manifest -ico xdoc/favicon.ico -o cmd/launcher/main.syso
+~/go/bin/rsrc -arch 386 -manifest xdoc/main.manifest -ico xdoc/favicon.ico -o cmd/launcher/main.syso
 ~/go/bin/rsrc -arch amd64 -manifest xdoc/main.manifest -ico xdoc/favicon.ico -o cmd/launcher/main.syso
 
 生成数据的地方：
@@ -40,4 +41,9 @@ openapi-generator-cli generate --skip-validate-spec \
 
 openapi-generator-cli generate --skip-validate-spec \
  -i /Users/aaron/out/input.json \
- -g python -o ~/out/python
\ No newline at end of file
+ -g python -o ~/out/python
+
+https://dl.cnezsoft.com/zd/3.1.0/win64/zd.zip
+https://dl.cnezsoft.com/zd/3.1.0/win32/zd.zip
+https://dl.cnezsoft.com/zd/3.1.0/linux/zd.zip
+https://dl.cnezsoft.com/zd/3.1.0/darwin/zd.zip
\ No newline at end of file