build

.env.docker

@@ -1,4 +1,4 @@
-APP_NAME=Dootask
+APP_NAME=DooTask
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true

README.md

@@ -13,7 +13,7 @@ Group No.: `546574618`
 
 - `Docker` & `Docker Compose v2.0+` must be installed
 - System: `Centos/Debian/Ubuntu/macOS`
-- Hardware suggestion: 2 cores and above 2G memory
+- Hardware suggestion: 2 cores and above 4G memory
 
 ### Deployment project
 
@@ -104,9 +104,10 @@ git pull
 ./cmd uninstall
 ./cmd install
 ./cmd mysql recovery
-./cmd artisan migrate
 ```
 
+If 502 after the upgrade please run `./cmd restart` restart the service.
+
 ## Uninstall
 
 ```bash

README_CN.md

@@ -13,7 +13,7 @@
 
 - 必须安装：`Docker` 和 `Docker Compose v2.0+`
 - 支持环境：`Centos/Debian/Ubuntu/macOS`
-- 硬件建议：2核2G以上
+- 硬件建议：2核4G以上
 
 ### 部署项目
 
@@ -105,9 +105,10 @@ git pull
 ./cmd uninstall
 ./cmd install
 ./cmd mysql recovery
-./cmd artisan migrate
 ```
 
+如果升级后出现502请运行 `./cmd restart` 重启服务即可。
+
 ## 卸载项目
 
 ```bash

electron/electron.js

@@ -8,7 +8,6 @@ const fsProm = require('fs/promises');
 const PDFDocument = require('pdf-lib').PDFDocument;
 const crc = require('crc');
 const zlib = require('zlib');
-const azip = require("adm-zip");
 const utils = require('./utils');
 const config = require('./package.json');
 
@@ -1123,26 +1122,6 @@ function unwatchFile(path) {
     return null
 }
 
-function unzip(path, output) {
-    let zip = new azip(path, {});
-    try {
-        zip.extractAllTo(output, true, false, null);
-        return true;
-    } catch (e) {
-        return false;
-    }
-}
-
-function relaunch() {
-    app.relaunch();
-    return null
-}
-
-function exit() {
-    app.exit();
-    return null
-}
-
 ipcMain.on("rendererReq", async (event, args) => {
     try {
         let ret = null;
@@ -1211,18 +1190,6 @@ ipcMain.on("rendererReq", async (event, args) => {
             case 'unwatchFile':
                 ret = await unwatchFile(args.path);
                 break;
-            case 'getAppPath':
-                ret = app.getAppPath();
-                break;
-            case 'unzip':
-                ret = unzip(args.path, args.output);
-                break;
-            case 'relaunch':
-                ret = relaunch();
-                break;
-            case 'exit':
-                ret = exit();
-                break;
         }
 
         event.reply('mainResp', {success: true, data: ret, reqId: args.reqId});

electron/entitlements.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+        <true/>
+    </dict>
+</plist>

electron/package.json

@@ -39,7 +39,6 @@
         "electron-builder": "^22.14.13"
     },
     "dependencies": {
-        "adm-zip": "^0.5.9",
         "axios": "^0.26.0",
         "crc": "^3.8.0",
         "electron-squirrel-startup": "^1.0.0",
@@ -50,31 +49,33 @@
     "build": {
         "appId": "com.dootask.task",
         "artifactName": "${productName}-v${version}-${os}-${arch}.${ext}",
+        "asar": true,
         "files": [
             "public/**/*",
             "electron-preload.js",
             "electron.js",
             "utils.js"
         ],
+        "npmRebuild": false,
+        "publish": {
+            "provider": "github"
+        },
         "mac": {
             "icon": "../resources/assets/statics/public/images/logo-app.png",
+            "entitlements": "entitlements.plist",
+            "entitlementsInherit": "entitlements.plist",
+            "category": "public.app-category.productivity",
             "target": [
                 "zip",
                 "dmg",
                 "pkg"
-            ],
-            "publish": [
-                "github"
             ]
         },
         "win": {
             "icon": "../resources/assets/statics/public/images/logo-app.ico",
             "target": [
                 "tar.gz",
                 "nsis"
-            ],
-            "publish": [
-                "github"
             ]
         },
         "nsis": {

public/js/build/206.js.LICENSE.txt

@@ -257,7 +257,7 @@
 /** @license
  *
  * jsPDF - PDF Document creation from JavaScript
- * Version 2.5.0 Built on 2021-12-21T09:44:51.866Z
+ * Version 2.5.1 Built on 2022-01-28T15:37:57.791Z
  *                      CommitID 00000000
  *
  * Copyright (c) 2010-2021 James Hall <james@parall.ax>, https://github.com/MrRio/jsPDF

public/js/build/304.js.LICENSE.txt

@@ -1,5 +1,5 @@
 /*!
- * clipboard.js v2.0.8
+ * clipboard.js v2.0.10
  * https://clipboardjs.com/
  *
  * Licensed MIT © Zeno Rocha

public/js/build/486.js.LICENSE.txt

@@ -257,7 +257,7 @@
 /** @license
  *
  * jsPDF - PDF Document creation from JavaScript
- * Version 2.5.0 Built on 2021-12-21T09:44:51.866Z
+ * Version 2.5.1 Built on 2022-01-28T15:37:57.791Z
  *                      CommitID 00000000
  *
  * Copyright (c) 2010-2021 James Hall <james@parall.ax>, https://github.com/MrRio/jsPDF

public/js/build/528.js.LICENSE.txt

@@ -257,7 +257,7 @@
 /** @license
  *
  * jsPDF - PDF Document creation from JavaScript
- * Version 2.5.0 Built on 2021-12-21T09:44:51.866Z
+ * Version 2.5.1 Built on 2022-01-28T15:37:57.791Z
  *                      CommitID 00000000
  *
  * Copyright (c) 2010-2021 James Hall <james@parall.ax>, https://github.com/MrRio/jsPDF

public/js/build/856.js.LICENSE.txt

@@ -1 +1 @@
-/*! @license DOMPurify 2.3.4 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/2.3.4/LICENSE */
+/*! @license DOMPurify 2.3.6 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/2.3.6/LICENSE */

public/js/build/889.js.LICENSE.txt

@@ -257,7 +257,7 @@
 /** @license
  *
  * jsPDF - PDF Document creation from JavaScript
- * Version 2.5.0 Built on 2021-12-21T09:44:51.866Z
+ * Version 2.5.1 Built on 2022-01-28T15:37:57.791Z
  *                      CommitID 00000000
  *
  * Copyright (c) 2010-2021 James Hall <james@parall.ax>, https://github.com/MrRio/jsPDF

public/js/build/149.js.LICENSE.txt → public/js/build/91.js.LICENSE.txt

@@ -1,5 +1,5 @@
 /*!
- * clipboard.js v2.0.8
+ * clipboard.js v2.0.10
  * https://clipboardjs.com/
  *
  * Licensed MIT © Zeno Rocha

public/js/build/954.js.LICENSE.txt

@@ -257,7 +257,7 @@
 /** @license
  *
  * jsPDF - PDF Document creation from JavaScript
- * Version 2.5.0 Built on 2021-12-21T09:44:51.866Z
+ * Version 2.5.1 Built on 2022-01-28T15:37:57.791Z
  *                      CommitID 00000000
  *
  * Copyright (c) 2010-2021 James Hall <james@parall.ax>, https://github.com/MrRio/jsPDF

resources/assets/js/pages/login.vue

@@ -31,13 +31,13 @@
                 </div>
             </div>
             <div class="login-bottom">
-                <Dropdown trigger="click" placement="bottom-start">
+                <Dropdown trigger="click" placement="top-start">
                     <div class="login-setting">
                         {{$L('设置')}}
                         <i class="taskfont">&#xe689;</i>
                     </div>
-                    <Dropdown-menu slot="list" class="login-setting-menu">
-                        <Dropdown placement="right" @on-click="setTheme">
+                    <DropdownMenu slot="list" class="login-setting-menu">
+                        <Dropdown placement="right-end" @on-click="setTheme">
                             <DropdownItem>
                                 <div class="login-setting-item">
                                     {{$L('主题皮肤')}}
@@ -48,7 +48,7 @@
                                 <Dropdown-item v-for="(item, key) in themeList" :key="key" :name="item.value" :selected="themeMode === item.value">{{$L(item.name)}}</Dropdown-item>
                             </DropdownMenu>
                         </Dropdown>
-                        <Dropdown placement="right" @on-click="setLanguage">
+                        <Dropdown placement="right-end" @on-click="setLanguage">
                             <DropdownItem divided>
                                 <div class="login-setting-item">
                                     {{currentLanguage}}
@@ -59,7 +59,7 @@
                                 <Dropdown-item v-for="(item, key) in languageList" :key="key" :name="key" :selected="getLanguage() === key">{{item}}</Dropdown-item>
                             </DropdownMenu>
                         </Dropdown>
-                    </Dropdown-menu>
+                    </DropdownMenu>
                 </Dropdown>
                 <div class="login-forgot">{{$L('忘记密码了？')}}<a href="javascript:void(0)" @click="forgotPassword">{{$L('重置密码')}}</a></div>
             </div>
@@ -137,7 +137,7 @@ export default {
         },
 
         welcomeTitle() {
-            let title = window.systemInfo.title || "Dootask";
+            let title = window.systemInfo.title || "DooTask";
             if (title == "PublicDooTask") {
                 return "Public DooTask"
             } else {