fix: 合并代码解决冲突

src/command/shell.js

@@ -4,12 +4,8 @@ const kill = require('kill-port')
 const detect = require('detect-port');
 const { MESSAGE_TYPE } = require('../enum')
 const { getContext } = require('../store/index')
-<<<<<<< HEAD
-const { cwd,isMac } = require('../utils')
-=======
 const { ipcRenderer } = require('electron')
 const { cwd, isMac } = require('../utils')
->>>>>>> 8937ca225933c6e9746666bb6ae3fc47decfb7c5
 
 const log = getContext().log
 const port = 7012
@@ -30,34 +26,13 @@ function javaServer() {
   log.info('正在启动JAVA服务')
   shell.cd(shellPath)
   let exePath = path.join('.', '/jre/bin/java')
-<<<<<<< HEAD
-  if (!isMac()){
-    exePath = exePath + '.exe'
-  }
-  
-  log.info(shell.ls())
-  // const child = shell.exec('jre/bin/java -jar syc-paas-standalone-biz.jar -spring.config.location=file:./baseServer/config/boostrap.yml &', { async: true })
-  // const child = shell.exec('.\\jre\\bin\\java.exe -jar syc-paas-standalone-biz.jar -spring.config.location=file:./baseServer/config/boostrap.yml &', { async: true })
-  const child = shell.exec(exePath + ' -jar syc-paas-standalone-biz.jar -spring.config.location=file:./baseServer/config/boostrap.yml &', { async: true })
-  
-  let isStart = false
-  child.stdout.on('data', function (stdout) {    
-    log.info(stdout,'----')
-    if (stdout.includes('Started Application in') && !isStart) {
-      process.send('close')
-=======
   if (!isMac()) {
     exePath = exePath + '.exe'
   }
 
   log.info(shell.ls())
-  let child = null
+  const child = shell.exec(exePath + ' -jar syc-paas-standalone-biz.jar -spring.config.location=file:./baseServer/config/boostrap.yml &', { async: true })
 
-  if (!isMac()) {
-    child = shell.exec(exePath + ' -jar syc-paas-standalone-biz.jar -spring.config.location=file:./baseServer/config/boostrap.yml &', { async: true })
-  } else {
-    child = shell.exec('./jre/bin/java -jar syc-paas-standalone-biz.jar -spring.config.location=file:./baseServer/config/boostrap.yml &', { async: true })
-  }
 
   let isStart = false
   child.stdout.on('data', function (stdout) {
@@ -68,7 +43,6 @@ function javaServer() {
       } else {
         ipcRenderer.send("close", MESSAGE_TYPE.DESIGN);
       }
->>>>>>> 8937ca225933c6e9746666bb6ae3fc47decfb7c5
       isStart = true
     }
   })

src/sevice/process.js

@@ -5,12 +5,8 @@ const { utilityProcess } = require('electron')
 const { MESSAGE_TYPE } = require('../enum')
 const { getContext } = require('../store')
 const utils = require('../utils')
-<<<<<<< HEAD
-const {fork} = require('child_process')
-=======
 const { fork } = require('child_process')
 const { cwd, } = require('../utils')
->>>>>>> 8937ca225933c6e9746666bb6ae3fc47decfb7c5
 
 // 执行进程命令，需使用nodejs启动，否则会不可控
 class ProcessActivity {