diff --git a/cardsoonServer/PrintAPP b/cardsoonServer/PrintAPP new file mode 100644 index 0000000..d9d8bde Binary files /dev/null and b/cardsoonServer/PrintAPP differ diff --git a/cardsoonServer/cdjobs.db b/cardsoonServer/cdjobs.db new file mode 100644 index 0000000..326d075 Binary files /dev/null and b/cardsoonServer/cdjobs.db differ diff --git a/cardsoonServer/config.ini b/cardsoonServer/config.ini new file mode 100644 index 0000000..0fa115c --- /dev/null +++ b/cardsoonServer/config.ini @@ -0,0 +1,13 @@ +[system_setting] +downDevicePath=/dev/sr1 +downDeviceType=0 +end_time=cWL0ocEfX1NTQW0+hs3SGnKIgYkMeNru +logLevel=1 +retryFreq=2 +serverPath=/home/test/CDCache +server_name=127.0.0.1 +server_port=10010 +topDevicePath=/dev/sr0 +topDeviceType=0 +update_time=iWfJMJHeTnMCacgifeF9oACX0fK8UsnmNBUJgTgF2cs= + diff --git a/cardsoonServer/control.sh b/cardsoonServer/control.sh new file mode 100644 index 0000000..0b31290 --- /dev/null +++ b/cardsoonServer/control.sh @@ -0,0 +1,80 @@ +#!/bin/bash + + +# 路径 +HOME=$(cd $(dirname $0);pwd) + +# 启动 +start(){ +cd $HOME +# 将C++程序后台启动，并将启动日志指向springBootThree-1.0.log中 + spid=$(pgrep -f "controlServer") #$(ps -ef | grep "[m]controlServer" | grep -v grep | awk '{print $2}') +if [ -z "$spid" ] +then +./controlServer > /dev/null 2>&1 & +# 打印字符串 +echo "启动成功" +else +echo Application is already started +fi +} + +# 停止 +stop(){ + # 查询到项目的pid + tpid=$(pgrep -f "controlServer") #$(ps -ef | grep "[m]controlServer" | grep -v grep | awk '{print $2}') + # 判断是否为空 +if [ -z "$tpid" ] + then +# 如果为空 则打印这句话 + echo Application is already stoped + else +# 如果不为空则执行 + echo kill $tpid +# 关闭进程 + kill -9 $tpid + + echo "程序已关闭" +fi +} + +# 查看状态 +status(){ + # 获取pid的 + pid=$(pgrep -f "controlServer") #$(ps -ef | grep "[m]controlServer" | grep -v grep) + if [ -z "$pid" ] +then + echo "程序不存在" +else + echo $pid +fi +} + +# 查看日志信息 +log(){ +tail -f $HOME/CSPServer.log +} + +case $1 in + start) + start +;; +stop) + stop +;; +status) + status +;; +log) + log +;; +restart) + $0 stop + sleep 5 + $0 start +;; +*) + echo "只能是{start|stop|log|restart}" +;; +esac +exit 0 diff --git a/cardsoonServer/controlServer b/cardsoonServer/controlServer new file mode 100644 index 0000000..9ee3684 Binary files /dev/null and b/cardsoonServer/controlServer differ diff --git a/cardsoonServer/libQt5Core.so.5 b/cardsoonServer/libQt5Core.so.5 new file mode 100644 index 0000000..c0df8e7 Binary files /dev/null and b/cardsoonServer/libQt5Core.so.5 differ diff --git a/cardsoonServer/libQt5Network.so.5 b/cardsoonServer/libQt5Network.so.5 new file mode 100644 index 0000000..dbd4216 Binary files /dev/null and b/cardsoonServer/libQt5Network.so.5 differ diff --git a/cardsoonServer/libQt5Sql.so.5 b/cardsoonServer/libQt5Sql.so.5 new file mode 100644 index 0000000..8b7a014 Binary files /dev/null and b/cardsoonServer/libQt5Sql.so.5 differ diff --git a/cardsoonServer/libQt5WebSockets.so.5 b/cardsoonServer/libQt5WebSockets.so.5 new file mode 100644 index 0000000..2483e76 Binary files /dev/null and b/cardsoonServer/libQt5WebSockets.so.5 differ diff --git a/cardsoonServer/libarchive.so.20 b/cardsoonServer/libarchive.so.20 new file mode 100644 index 0000000..3d79868 Binary files /dev/null and b/cardsoonServer/libarchive.so.20 differ diff --git a/cardsoonServer/libbz2.so.1.0 b/cardsoonServer/libbz2.so.1.0 new file mode 100644 index 0000000..54b5e00 Binary files /dev/null and b/cardsoonServer/libbz2.so.1.0 differ diff --git a/cardsoonServer/libc.so.6 b/cardsoonServer/libc.so.6 new file mode 100644 index 0000000..05027ac Binary files /dev/null and b/cardsoonServer/libc.so.6 differ diff --git a/cardsoonServer/libcrypto.so.1.1 b/cardsoonServer/libcrypto.so.1.1 new file mode 100644 index 0000000..aa63543 Binary files /dev/null and b/cardsoonServer/libcrypto.so.1.1 differ diff --git a/cardsoonServer/libdl.so.2 b/cardsoonServer/libdl.so.2 new file mode 100644 index 0000000..09baaab Binary files /dev/null and b/cardsoonServer/libdl.so.2 differ diff --git a/cardsoonServer/libfreetype.so.6 b/cardsoonServer/libfreetype.so.6 new file mode 100644 index 0000000..f4bb581 Binary files /dev/null and b/cardsoonServer/libfreetype.so.6 differ diff --git a/cardsoonServer/libgcc_s.so.1 b/cardsoonServer/libgcc_s.so.1 new file mode 100644 index 0000000..7e9f9fd Binary files /dev/null and b/cardsoonServer/libgcc_s.so.1 differ diff --git a/cardsoonServer/libglib-2.0.so.0 b/cardsoonServer/libglib-2.0.so.0 new file mode 100644 index 0000000..e4dd699 Binary files /dev/null and b/cardsoonServer/libglib-2.0.so.0 differ diff --git a/cardsoonServer/libgraphite2.so.3 b/cardsoonServer/libgraphite2.so.3 new file mode 100644 index 0000000..ba91b95 Binary files /dev/null and b/cardsoonServer/libgraphite2.so.3 differ diff --git a/cardsoonServer/libharfbuzz.so.0 b/cardsoonServer/libharfbuzz.so.0 new file mode 100644 index 0000000..7b62aab Binary files /dev/null and b/cardsoonServer/libharfbuzz.so.0 differ diff --git a/cardsoonServer/libicudata.so.66 b/cardsoonServer/libicudata.so.66 new file mode 100644 index 0000000..7fa5b21 Binary files /dev/null and b/cardsoonServer/libicudata.so.66 differ diff --git a/cardsoonServer/libicui18n.so.66 b/cardsoonServer/libicui18n.so.66 new file mode 100644 index 0000000..e5f96af Binary files /dev/null and b/cardsoonServer/libicui18n.so.66 differ diff --git a/cardsoonServer/libicuuc.so.66 b/cardsoonServer/libicuuc.so.66 new file mode 100644 index 0000000..9ccb6c0 Binary files /dev/null and b/cardsoonServer/libicuuc.so.66 differ diff --git a/cardsoonServer/libisofs.so.6 b/cardsoonServer/libisofs.so.6 new file mode 100644 index 0000000..3d1dede Binary files /dev/null and b/cardsoonServer/libisofs.so.6 differ diff --git a/cardsoonServer/libjbig.so.0 b/cardsoonServer/libjbig.so.0 new file mode 100644 index 0000000..c2e29ca Binary files /dev/null and b/cardsoonServer/libjbig.so.0 differ diff --git a/cardsoonServer/libjpeg.so.8 b/cardsoonServer/libjpeg.so.8 new file mode 100644 index 0000000..38f2fd9 Binary files /dev/null and b/cardsoonServer/libjpeg.so.8 differ diff --git a/cardsoonServer/liblzma.so.5 b/cardsoonServer/liblzma.so.5 new file mode 100644 index 0000000..2f5a77f Binary files /dev/null and b/cardsoonServer/liblzma.so.5 differ diff --git a/cardsoonServer/libm.so.6 b/cardsoonServer/libm.so.6 new file mode 100644 index 0000000..2581ca2 Binary files /dev/null and b/cardsoonServer/libm.so.6 differ diff --git a/cardsoonServer/libopencv_core.so.409 b/cardsoonServer/libopencv_core.so.409 new file mode 100644 index 0000000..4ac7864 Binary files /dev/null and b/cardsoonServer/libopencv_core.so.409 differ diff --git a/cardsoonServer/libopencv_imgcodecs.so.409 b/cardsoonServer/libopencv_imgcodecs.so.409 new file mode 100644 index 0000000..39c5c98 Binary files /dev/null and b/cardsoonServer/libopencv_imgcodecs.so.409 differ diff --git a/cardsoonServer/libopencv_imgproc.so.409 b/cardsoonServer/libopencv_imgproc.so.409 new file mode 100644 index 0000000..b49ff29 Binary files /dev/null and b/cardsoonServer/libopencv_imgproc.so.409 differ diff --git a/cardsoonServer/libpcre.so.3 b/cardsoonServer/libpcre.so.3 new file mode 100644 index 0000000..e4d568a Binary files /dev/null and b/cardsoonServer/libpcre.so.3 differ diff --git a/cardsoonServer/libpcre2-16.so.0 b/cardsoonServer/libpcre2-16.so.0 new file mode 100644 index 0000000..6076360 Binary files /dev/null and b/cardsoonServer/libpcre2-16.so.0 differ diff --git a/cardsoonServer/libpng16.so.16 b/cardsoonServer/libpng16.so.16 new file mode 100644 index 0000000..ceca87c Binary files /dev/null and b/cardsoonServer/libpng16.so.16 differ diff --git a/cardsoonServer/libpthread.so.0 b/cardsoonServer/libpthread.so.0 new file mode 100644 index 0000000..55392ac Binary files /dev/null and b/cardsoonServer/libpthread.so.0 differ diff --git a/cardsoonServer/libstdc++.so.6 b/cardsoonServer/libstdc++.so.6 new file mode 100644 index 0000000..dbd3879 Binary files /dev/null and b/cardsoonServer/libstdc++.so.6 differ diff --git a/cardsoonServer/libtiff.so.5 b/cardsoonServer/libtiff.so.5 new file mode 100644 index 0000000..31e9575 Binary files /dev/null and b/cardsoonServer/libtiff.so.5 differ diff --git a/cardsoonServer/libudev.so.1 b/cardsoonServer/libudev.so.1 new file mode 100644 index 0000000..f185df1 Binary files /dev/null and b/cardsoonServer/libudev.so.1 differ diff --git a/cardsoonServer/libuuid.so.1 b/cardsoonServer/libuuid.so.1 new file mode 100644 index 0000000..18f6664 Binary files /dev/null and b/cardsoonServer/libuuid.so.1 differ diff --git a/cardsoonServer/libwebp.so.6 b/cardsoonServer/libwebp.so.6 new file mode 100644 index 0000000..ed90eba Binary files /dev/null and b/cardsoonServer/libwebp.so.6 differ diff --git a/cardsoonServer/libworkDllCD.so b/cardsoonServer/libworkDllCD.so new file mode 100644 index 0000000..91f0d45 Binary files /dev/null and b/cardsoonServer/libworkDllCD.so differ diff --git a/cardsoonServer/libxml2.so.2 b/cardsoonServer/libxml2.so.2 new file mode 100644 index 0000000..189d9dc Binary files /dev/null and b/cardsoonServer/libxml2.so.2 differ diff --git a/cardsoonServer/libz.so.1 b/cardsoonServer/libz.so.1 new file mode 100644 index 0000000..ed51a61 Binary files /dev/null and b/cardsoonServer/libz.so.1 differ diff --git a/cardsoonServer/libzint.so.2.13 b/cardsoonServer/libzint.so.2.13 new file mode 100644 index 0000000..c9a7b96 Binary files /dev/null and b/cardsoonServer/libzint.so.2.13 differ diff --git a/cardsoonServer/libzstd.so.1 b/cardsoonServer/libzstd.so.1 new file mode 100644 index 0000000..925e658 Binary files /dev/null and b/cardsoonServer/libzstd.so.1 differ diff --git a/cardsoonServer/simhei.ttf b/cardsoonServer/simhei.ttf new file mode 100644 index 0000000..60a4819 Binary files /dev/null and b/cardsoonServer/simhei.ttf differ diff --git a/cardsoonServer/simsun.ttc b/cardsoonServer/simsun.ttc new file mode 100644 index 0000000..23d5c4a Binary files /dev/null and b/cardsoonServer/simsun.ttc differ diff --git a/package.json b/package.json index 3afba18..fdb2638 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "main": "./dist/electron/main.js", "scripts": { "build": "node .electron-vue/build.js && electron-builder", + "build:linux": "node .electron-vue/build.js && electron-builder --linux", "build:dir": "node .electron-vue/build.js && electron-builder --dir", "build:clean": "cross-env BUILD_TARGET=clean node .electron-vue/build.js", "build:web": "cross-env BUILD_TARGET=web node .electron-vue/build.js", @@ -24,6 +25,16 @@ "build": { "productName": "soonworkerdisk", "appId": "com.kashu.soonworkerdisk", + "extraFiles": [ + { + "from": "./User Templates", + "to": "." + }, + { + "from": "./cardsoonServer", + "to": "." + } + ], "directories": { "output": "build" }, @@ -123,4 +134,4 @@ "webpack-hot-middleware": "^2.22.2", "webpack-merge": "^4.1.3" } -} +} \ No newline at end of file diff --git a/src/renderer/components/workAdd/workAdd.vue b/src/renderer/components/workAdd/workAdd.vue index e841ef0..e41d713 100644 --- a/src/renderer/components/workAdd/workAdd.vue +++ b/src/renderer/components/workAdd/workAdd.vue @@ -720,7 +720,8 @@ export default { }, // 获取模板文件列表 getTemplates() { - fs.readdir('User Templates', (err, files) => { + const filePath = path.join(process.cwd(), 'User Templates'); + fs.readdir(filePath, (err, files) => { if (err) { console.log(err) } else { diff --git a/src/renderer/main.js b/src/renderer/main.js index 8b289c9..25d3b48 100644 --- a/src/renderer/main.js +++ b/src/renderer/main.js @@ -9,7 +9,7 @@ import 'element-ui/lib/theme-chalk/index.css' import App from './App' import router from './router' import store from './store' -import { accAdd, accSub, accMul, accDiv, filterSize } from './utils' +import { accAdd, accSub, accMul, accDiv, filterSize, runCmd } from './utils' import i18n from './lang' // internationalization import './permission' // permission control @@ -24,6 +24,7 @@ Vue.prototype.$accSub = accSub Vue.prototype.$accMul = accMul Vue.prototype.$accDiv = accDiv Vue.prototype.$filterSize = filterSize +Vue.prototype.$runCmd = runCmd Vue.use(ElementUI, { size: Cookies.get('size') || 'medium', // set element-ui default size diff --git a/src/renderer/store/modules/chat.js b/src/renderer/store/modules/chat.js index 1669b54..4bf47a9 100644 --- a/src/renderer/store/modules/chat.js +++ b/src/renderer/store/modules/chat.js @@ -524,6 +524,10 @@ const actions = { closeWebsocket: () => { // 关闭 if (websock) websock.close() + }, + // 改变工作状态 + changeWorkStatus: ({ commit }, data) => { + commit('setData', { name: 'workStatus', data: data }) } } diff --git a/src/renderer/utils/index.js b/src/renderer/utils/index.js index e87e37e..10a4ab5 100644 --- a/src/renderer/utils/index.js +++ b/src/renderer/utils/index.js @@ -473,4 +473,20 @@ export const filterSize = (size) => { export const pow1024 = (num) => { return Math.pow(1024, num) +} + +// 执行脚本 +const { exec } = require('child_process'); +export const runCmd = (cmd) => { + return new Promise((resolve, reject) => { + exec(cmd, (err, stdout, stderr) => { + if (err) { + reject(err) + } + if (stderr) { + reject(stderr) + } + resolve(stdout) + }) + }) } \ No newline at end of file diff --git a/src/renderer/views/dashboard/index.vue b/src/renderer/views/dashboard/index.vue index dfd968a..35c9d79 100644 --- a/src/renderer/views/dashboard/index.vue +++ b/src/renderer/views/dashboard/index.vue @@ -1,5 +1,8 @@