Merge branch 'feat/databse' into 'develop_0621'

.npmrc

 electron_mirror=http://npm.taobao.org/mirrors/electron/
-registry=https://registry.npm.taobao.org
\ No newline at end of file
+registry=https://registry.npm.taobao.org
+# pnpm 配置
+shamefully-hoist=true
+auto-install-peers=true
+strict-peer-dependencies=false
\ No newline at end of file

package.json

@@ -7,18 +7,26 @@
     "compile": "cd ./front/lowcode && npm run dev",
     "start": "cross-env NODE_ENV=development electron .",
     "prod": "cross-env NODE_ENV=production electron .",
-    "start:watch": "nodemon --watch main.js --exec 'npm start'",
     "build:web": "cd ./front/lowcode && npm run build",
     "build:all": "electron-builder -m --x64",
-    "electron:generate-icons": "electron-icon-builder --input=./src/assets/paas_logo.png --output=./src/assets/ --flatten",
-    "build": "electron-packager . 'lowcode-electron' --platform=darwin --overwrite --arch=x64 --out=../out --ignore='front/lowcode|logs|baseServer/logs'",
-    "build:arm": "electron-packager . 'lowcode-electron' --platform=darwin --overwrite --arch=arm64 --out=../out --ignore='front/lowcode|logs|baseServer/logs'"
+    "build:win": "electron-builder --win --ia32",
+    "build:linux": "electron-builder --linux",
+    "build:mac": "electron-builder --mac",
+    "build": "electron-packager . 'lowcode-electron' --platform=win32 --overwrite --arch=x64 --out=./out --ignore='front/lowcode|logs|baseServer/logs'",
+    "build:arm": "electron-packager . 'lowcode-electron' --platform=darwin --overwrite --arch=arm64 --out=./out --ignore='front/lowcode|logs|baseServer/logs'"
   },
   "build": {
     "asar": false,
+    "productName": "SYC Lowcode",
     "nsis": {
       "oneClick": false,
-      "allowToChangeInstallationDirectory": true
+      "allowToChangeInstallationDirectory": true,
+      "createDesktopShortcut": true,
+      "createStartMenuShortcut": true,
+      "shortcutName": "SYC Paas",
+      "installerIcon": "./src/assets/paas_logo.png",
+      "uninstallerIcon": "./src/assets/paas_logo.png",
+      "deleteAppDataOnUninstall": true
     },
     "compression": "maximum",
     "mac": {
@@ -67,17 +75,15 @@
   "license": "CC0-1.0",
   "devDependencies": {
     "electron": "23.3.11",
-    "electron-builder": "^23.6.0",
-    "path-key": "^4.0.0"
+    "electron-packager": "^17.1.1",
+    "@electron/universal": "^1.3.4",
+    "electron-builder": "^23.6.0"
   },
   "dependencies": {
-    "@electron/universal": "^1.3.4",
     "cross-env": "^7.0.3",
     "cross-spawn": "^7.0.3",
     "detect-port": "^1.5.1",
-    "electron-icon-builder": "^2.0.1",
     "electron-log": "^5.0.0-beta.16",
-    "electron-packager": "^17.1.1",
     "electron-store": "^8.1.0",
     "express": "^4.18.2",
     "fs-extra": "^11.1.0",
@@ -85,10 +91,9 @@
     "ioredis": "^5.3.2",
     "kill-port": "^1.6.1",
     "lodash": "^4.17.21",
-    "nodemon": "^3.0.1",
     "open": "^8.4.2",
+    "path-key": "^4.0.0",
     "pg": "^8.11.1",
-    "shebang-command": "^2.0.0",
     "shelljs": "^0.8.5"
   }
 }
\ No newline at end of file

src/command/runtime.js

@@ -14,11 +14,16 @@ function killProcessServer(server, port) {
 }
 
 function javaServer(javaPath) {
+  let child = null
   // 判断平台
   log.info(javaPath, 'javaPath')
   log.info('正在启动JAVA runtime服务')
   shell.cd(javaPath)
-  const child = shell.exec('bash standalone.sh', { async: true })
+  if(isMac()){
+    child = shell.exec('bash standalone.sh', { async: true })
+  }else {
+    child = shell.exec('standalone.bat', { async: true })
+  }
   let isStart = false
   child.stdout.on('data', function (stdout) {
     log.info(stdout)

src/main.js

 // Modules to control application life and create native browser window
-const { app, BrowserWindow, ipcMain,Menu   } = require('electron')
+const { app, BrowserWindow, ipcMain, Menu } = require('electron')
 const path = require('path')
 const kill = require('kill-port')
 const { MainEvent, Process } = require('./sevice/index')
-const { MAIN, IPC,MESSAGE_TYPE } = require('./enum')
+const { MAIN, IPC, MESSAGE_TYPE } = require('./enum')
 const { setStore, getContext } = require('./store')
 const utils = require('./utils')
 const { handleMounted, handleClose } = require('./hook')
-const { spawn } = require('child_process');
-const server = spawn('node', [path.join(__dirname, './command/front.js')]);
 
 Menu.setApplicationMenu(null);
 class Main {
@@ -32,6 +30,7 @@ class Main {
   }
   init(mainWindow) {
     const process = new Process(mainWindow)
+    process.init()
     const mainEvent = new MainEvent()
     setStore('mainEvent', mainEvent)
     setStore('childProcess', process)
@@ -51,10 +50,11 @@ class Main {
       })
   }
   ready() {
-    
-    app.on('ready', () => {
-      app.dock.setIcon(path.join(__dirname, 'assets/paas_logo.png'));
-    });
+    if (utils.isMac()) {
+      app.on('ready', () => {
+        app.dock.setIcon(path.join(__dirname, 'assets/paas_logo.png'));
+      });
+    }
     app.whenReady().then(() => {
       handleMounted(app)
       this.startPage()
@@ -99,12 +99,12 @@ class Main {
       this.setWin(mainWindow)
 
       // todo 这里有优化空间
-      ipcMain.on('close', (event,arg) => {
-         // 向渲染进程发送消息，通知前端进行相应的操作
-         if(arg == MESSAGE_TYPE.DESIGN){
-           mainWindow.webContents.send('close');
-           mainWindow && mainWindow.loadURL(this.IDEPage());
-         }
+      ipcMain.on('close', (event, arg) => {
+        // 向渲染进程发送消息，通知前端进行相应的操作
+        if (arg == MESSAGE_TYPE.DESIGN) {
+          mainWindow.webContents.send('close');
+          mainWindow && mainWindow.loadURL(this.IDEPage());
+        }
       });
     }
     return mainWindow