From a88cb606b7b5c92305668b558e870a9d9a6a395d Mon Sep 17 00:00:00 2001
From: pqcqaq <905739777@qq.com>
Date: Fri, 29 Nov 2024 13:46:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BA=86=E5=87=A0=E5=A4=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/template.js                      | 7 ++++---
 src/template.ts                      | 2 +-
 templateExample/src/data/ogb0Data.ts | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/template.js b/lib/template.js
index 777f99a..fe3f103 100644
--- a/lib/template.js
+++ b/lib/template.js
@@ -61,6 +61,7 @@ function packageJsonContent({ name, version, description, cliName, cliBinName, i
     }
     const serverInitScript = isDev ? "cross-env NODE_ENV=development cross-env OAK_PLATFORM=server node scripts/initServer.js" : "cross-env OAK_PLATFORM=server node scripts/initServer.js";
     const serverStartScript = isDev ? "cross-env NODE_ENV=development cross-env OAK_PLATFORM=server node scripts/startServer.js" : "cross-env OAK_PLATFORM=server node scripts/startServer.js";
+    const serverStartWatchScript = isDev ? "cross-env NODE_ENV=development cross-env OAK_PLATFORM=server node --stack-size=65500 scripts/watchServer.js" : "cross-env OAK_PLATFORM=server node --stack-size=65500 scripts/watchServer.js";
     return `{
     "name": "${name}",
     "version": "${version}",
@@ -79,8 +80,7 @@ function packageJsonContent({ name, version, description, cliName, cliBinName, i
         "build-analyze:mp:staging": "${cliBinName} build --target mp --mode staging --analyze",
         "build:mp": "${cliBinName} build --target mp --mode production",
         "build-analyze:mp": "${cliBinName} build --target mp --mode production --analyze",
-        "build:watch": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && npm run copy-config-json && npm run watch:server",
-        "watch:server": "node --stack-size=65500 scripts/watchServer.js",
+        "build:watch": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && npm run copy-config-json && npm run server:start:watch",
         "start:web": "${cliBinName} start --target web --mode development  --devMode frontend",
         "start:web:server": "${cliBinName} start --target web --mode development",
         "start:native": "${cliBinName} start --target rn --mode development  --devMode frontend",
@@ -98,6 +98,7 @@ function packageJsonContent({ name, version, description, cliName, cliBinName, i
         "run:android": "oak-cli run -p android",
         "server:init": "${serverInitScript}",
         "server:start": "${serverStartScript}",
+        "server:start:watch": "${serverStartWatchScript}",
         "postinstall": "npm run make:dep"
     },
     "keywords": [],
@@ -268,7 +269,7 @@ function packageJsonContent({ name, version, description, cliName, cliBinName, i
         "webpack-manifest-plugin": "^4.0.2",
         "workbox-webpack-plugin": "^6.4.1",
         "chokidar": "^4.0.1",
-        "module-alias": "^2.2.3",
+        "module-alias": "^2.2.3"
     },
     "browserslist": {
         "production": [
diff --git a/src/template.ts b/src/template.ts
index 217c830..55697ab 100644
--- a/src/template.ts
+++ b/src/template.ts
@@ -277,7 +277,7 @@ export function packageJsonContent({
         "webpack-manifest-plugin": "^4.0.2",
         "workbox-webpack-plugin": "^6.4.1",
         "chokidar": "^4.0.1",
-        "module-alias": "^2.2.3",
+        "module-alias": "^2.2.3"
     },
     "browserslist": {
         "production": [
diff --git a/templateExample/src/data/ogb0Data.ts b/templateExample/src/data/ogb0Data.ts
index bf9cc28..aa4b90d 100644
--- a/templateExample/src/data/ogb0Data.ts
+++ b/templateExample/src/data/ogb0Data.ts
@@ -95,9 +95,9 @@ export const system: System[] = [
         description: '测试系统',
         config: {
             Map: {
-                amap: {
-                    webApiKey: '',
-                },
+                // amap: {
+                //     webApiKey: '',
+                // },
             },
             Cos: {
                 qiniu: {