From ce3c119364f6c8965b9c7dfd5182de449d53619e Mon Sep 17 00:00:00 2001
From: moonrailgun <moonrailgun@gmail.com>
Date: Fri, 23 Sep 2022 10:30:00 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E8=B0=83=E6=95=B4=E6=A1=8C=E9=9D=A2?=
 =?UTF-8?q?=E7=AB=AF=E6=89=93=E5=8C=85=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desktop/.erb/configs/webpack.config.base.ts |  4 ++++
 client/desktop/package.json                     | 11 ++++++-----
 client/desktop/src/main/main.ts                 | 17 +++++++++++++----
 client/web/src/init.tsx                         |  1 -
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/client/desktop/.erb/configs/webpack.config.base.ts b/client/desktop/.erb/configs/webpack.config.base.ts
index f1880d34..b3ec052f 100644
--- a/client/desktop/.erb/configs/webpack.config.base.ts
+++ b/client/desktop/.erb/configs/webpack.config.base.ts
@@ -53,6 +53,10 @@ const configuration: webpack.Configuration = {
   },
 
   plugins: [
+    new webpack.DefinePlugin({
+      'process.env.FE_URL': JSON.stringify(process.env.FE_URL),
+      'process.env.SERVICE_URL': JSON.stringify(process.env.SERVICE_URL),
+    }),
     new webpack.EnvironmentPlugin({
       NODE_ENV: 'production',
     }),
diff --git a/client/desktop/package.json b/client/desktop/package.json
index 95f53e86..849672db 100644
--- a/client/desktop/package.json
+++ b/client/desktop/package.json
@@ -35,16 +35,17 @@
   ],
   "main": "./src/main/main.ts",
   "scripts": {
-    "build": "concurrently \"npm run build:main\" \"npm run build:renderer\"",
+    "build": "concurrently \"yarn build:main\" \"yarn build:renderer\"",
     "build:main": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.main.prod.ts",
     "build:renderer": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.prod.ts",
     "postinstall": "ts-node .erb/scripts/check-native-dep.js && electron-builder install-app-deps",
     "lint": "cross-env NODE_ENV=development eslint . --ext .js,.jsx,.ts,.tsx",
-    "package": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish never",
-    "package:debug": "cross-env DEBUG_PROD=true yarn package --config.asar=false",
+    "package": "cross-env DEBUG_PROD=true yarn package:nodebug --config.asar=false",
+    "package:all": "yarn package:nodebug -mwl",
+    "package:nodebug": "ts-node ./.erb/scripts/clean.js dist && yarn build && electron-builder build --publish never",
     "rebuild": "electron-rebuild --parallel --types prod,dev,optional --module-dir release/app",
-    "start": "ts-node ./.erb/scripts/check-port-in-use.js && npm run start:renderer",
-    "start:dev": "cross-env SERVICE_URL=http://127.0.0.1:11000 npm run start",
+    "dev": "cross-env FE_URL=http://127.0.0.1:11011 SERVICE_URL=http://127.0.0.1:11000 yarn start",
+    "start": "ts-node ./.erb/scripts/check-port-in-use.js && yarn start:renderer",
     "start:main": "cross-env NODE_ENV=development electronmon -r ts-node/register/transpile-only .",
     "start:preload": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.preload.dev.ts",
     "start:renderer": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./.erb/configs/webpack.config.renderer.dev.ts",
diff --git a/client/desktop/src/main/main.ts b/client/desktop/src/main/main.ts
index 2fd33aab..f2f41aa8 100644
--- a/client/desktop/src/main/main.ts
+++ b/client/desktop/src/main/main.ts
@@ -114,12 +114,21 @@ const createWindow = async () => {
     // mainWindow.loadURL(url);
 
     // 方案二: 通过本地起一个http代理服务，然后electron访问http服务
-    log.info('Starting Local Http Server');
-    const url = await getMainWindowUrl();
-    log.info('Local Server started, entry:', url);
-    mainWindow.loadURL(url);
+    // log.info('Starting Local Http Server');
+    // const url = await getMainWindowUrl();
+    // log.info('Local Server started, entry:', url);
+
+    // 方案三: 直接访问远程服务
+    log.info('Start with remote server', {
+      FE_URL: process.env.FE_URL,
+      SERVICE_URL: process.env.SERVICE_URL,
+    });
+    const url = process.env.FE_URL || process.env.SERVICE_URL;
+
+    mainWindow.loadURL(url as string);
 
     /**
+     * 如果存在
      * 注入 SERVICE_URL
      */
     if (process.env.SERVICE_URL) {
diff --git a/client/web/src/init.tsx b/client/web/src/init.tsx
index c7c4b274..db491006 100644
--- a/client/web/src/init.tsx
+++ b/client/web/src/init.tsx
@@ -33,7 +33,6 @@ setTokenGetter(async () => {
 });
 
 const localStorageServiceUrl = window.localStorage.getItem('serviceUrl');
-
 if (localStorageServiceUrl) {
   setServiceUrl(() => localStorageServiceUrl);
 } else if (process.env.SERVICE_URL) {