diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf index f0804e77..602a07f8 100644 --- a/docker/nginx/default.conf +++ b/docker/nginx/default.conf @@ -28,7 +28,7 @@ server { allow all; } - location =/ws { + location =/api/ws { proxy_http_version 1.1; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-PORT $remote_port; diff --git a/electron/index.html b/electron/index.html new file mode 100644 index 00000000..eb222f30 --- /dev/null +++ b/electron/index.html @@ -0,0 +1,51 @@ + + + + + + + + + + + + Dootask + + + + + + + + + + + +
+
+
+
PAGE LOADING
+ + + + + + + +
+
+
+ + + + + + diff --git a/electron/main.js b/electron/main.js index 46c39395..e7d43c8d 100644 --- a/electron/main.js +++ b/electron/main.js @@ -15,7 +15,7 @@ function createWindow () { }) // and load the index.html of the app. - mainWindow.loadFile('../public/index_electron.html').then(r => { + mainWindow.loadFile('./index.html').then(r => { }) diff --git a/resources/assets/js/components/Flow.vue b/resources/assets/js/components/Flow.vue index e14c4f6c..43a851cc 100644 --- a/resources/assets/js/components/Flow.vue +++ b/resources/assets/js/components/Flow.vue @@ -114,7 +114,7 @@ language = 'zh' break; } - this.url = './js/grapheditor/' + (this.readOnly ? 'viewer' : 'index') + '.html?lang=' + language; + this.url = $A.originUrl('js/grapheditor/' + (this.readOnly ? 'viewer' : 'index') + '.html?lang=' + language); }, mounted() { window.addEventListener('message', this.handleMessage) diff --git a/resources/assets/js/components/LuckySheet.vue b/resources/assets/js/components/LuckySheet.vue index 27292ac5..6650be74 100644 --- a/resources/assets/js/components/LuckySheet.vue +++ b/resources/assets/js/components/LuckySheet.vue @@ -51,13 +51,13 @@ export default { }, mounted() { $A.loadScriptS([ - './js/luckysheet/plugins/css/pluginsCss.css', - './js/luckysheet/plugins/plugins.css', - './js/luckysheet/css/luckysheet.css', - './js/luckysheet/assets/iconfont/iconfont.css', + 'js/luckysheet/plugins/css/pluginsCss.css', + 'js/js/luckysheet/plugins/plugins.css', + 'js/js/luckysheet/css/luckysheet.css', + 'js/js/luckysheet/assets/iconfont/iconfont.css', // - './js/luckysheet/plugins/js/plugin.js', - './js/luckysheet/luckysheet.umd.js', + 'js/js/luckysheet/plugins/js/plugin.js', + 'js/js/luckysheet/luckysheet.umd.js', ], () => { this.loadIng = false; this.bakValue = JSON.stringify(this.value); diff --git a/resources/assets/js/components/MDEditor/index.vue b/resources/assets/js/components/MDEditor/index.vue index a6c7c91d..98ef6b91 100755 --- a/resources/assets/js/components/MDEditor/index.vue +++ b/resources/assets/js/components/MDEditor/index.vue @@ -227,7 +227,7 @@ } }, htmlOk() { - $A.loadScript(window.location.origin + '/js/html2md.js', () => { + $A.loadScript('js/html2md.js', () => { if (typeof toMarkdown !== 'function') { $A.modalAlert("组件加载失败！"); return; diff --git a/resources/assets/js/components/TEditor.vue b/resources/assets/js/components/TEditor.vue index 8358a51c..cbe40a8f 100755 --- a/resources/assets/js/components/TEditor.vue +++ b/resources/assets/js/components/TEditor.vue @@ -212,7 +212,7 @@ return { inline: isFull ? false : this.inline, selector: (isFull ? '#T_' : '#') + this.id, - base_url: './js/tinymce', + base_url: $A.originUrl('js/tinymce'), language: "zh_CN", toolbar: this.toolbar, plugins: this.plugin(isFull), diff --git a/resources/assets/js/functions/common.js b/resources/assets/js/functions/common.js index def3853d..55080735 100755 --- a/resources/assets/js/functions/common.js +++ b/resources/assets/js/functions/common.js @@ -3,8 +3,6 @@ */ (function (window, $, undefined) { - let serverUrl = window.location.origin + '/'; - /** * ============================================================================= * ************************** 基础函数类 ************************** @@ -209,7 +207,7 @@ * @param str * @returns {string} */ - serverUrl: function (str) { + originUrl: function (str) { if (str.substring(0, 2) === "//" || str.substring(0, 7) === "http://" || str.substring(0, 8) === "https://" || @@ -217,7 +215,11 @@ str.substring(0, 1) === "/") { return str; } - return serverUrl + str; + if (window.systemInformation && typeof window.systemInformation.origin === "string") { + return window.systemInformation.origin + str; + } else { + return window.location.origin + "/" + str; + } }, /** @@ -878,6 +880,7 @@ * @param callback */ loadScript(url, callback) { + url = $A.originUrl(url); if (this.rightExists(url, '.css')) { this.loadCss(url, callback) return; @@ -928,6 +931,7 @@ * @param callback */ loadCss(url, callback) { + url = $A.originUrl(url); if (this.rightExists(url, '.js')) { this.loadScript(url, callback) return; @@ -936,7 +940,7 @@ typeof callback === "function" && callback(); return; } - var script = document.createElement('link'); + let script = document.createElement('link'); if (script.readyState) { script.onreadystatechange = () => { if (script.readyState == 'loaded' || script.readyState == 'complete') { diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue index 4191975d..7dd01f26 100644 --- a/resources/assets/js/pages/manage.vue +++ b/resources/assets/js/pages/manage.vue @@ -296,7 +296,7 @@ export default { } this._notificationId = id; this.notificationClass.replaceOptions({ - icon: './images/logo.png', + icon: $A.originUrl('images/logo.png'), body: body, data: data, tag: "dialog", diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js index 8a006a5b..81eec302 100644 --- a/resources/assets/js/store/actions.js +++ b/resources/assets/js/store/actions.js @@ -1422,12 +1422,10 @@ export default { } return; } - let url = window.webSocketConfig.URL; - if (!url) { - url = state.method.apiUrl('/ws'); - url = url.replace("https://", "wss://"); - url = url.replace("http://", "ws://"); - } + // + let url = state.method.apiUrl('ws'); + url = url.replace("https://", "wss://"); + url = url.replace("http://", "ws://"); url += "?action=web&token=" + state.userToken; // state.ws = new WebSocket(url); diff --git a/resources/assets/js/store/state.js b/resources/assets/js/store/state.js index 0daace60..099aecb0 100644 --- a/resources/assets/js/store/state.js +++ b/resources/assets/js/store/state.js @@ -1,19 +1,16 @@ const method = { apiUrl(str) { - let origin; - origin = window.location.origin; - origin = 'http://127.0.0.1:2222'; - // if (str.substring(0, 2) === "//" || str.substring(0, 7) === "http://" || str.substring(0, 8) === "https://" || - str.substring(0, 6) === "ftp://") { + str.substring(0, 6) === "ftp://" || + str.substring(0, 1) === "/") { return str; } - if (str.substring(0, 1) == "/") { - return origin + str; + if (window.systemInformation && typeof window.systemInformation.apiUrl === "string") { + return window.systemInformation.apiUrl + str; } else { - return origin + "/api/" + str; + return window.location.origin + "/api/" + str; } }, diff --git a/resources/views/main.blade.php b/resources/views/main.blade.php index 0b66b083..8e7340ed 100755 --- a/resources/views/main.blade.php +++ b/resources/views/main.blade.php @@ -19,8 +19,7 @@