diff --git a/docs/src/admin/introduction.md b/docs/src/admin/introduction.md index 97ed0252..c514cbb3 100644 --- a/docs/src/admin/introduction.md +++ b/docs/src/admin/introduction.md @@ -23,11 +23,11 @@ 2、执行如下命令运行管理端 ```bash -$ cd magic +$ cd magic-admin $ npm run admin:run ``` -3、访问 http://localhost:80 +3、访问 http://localhost:80 (端口以实际启动的为准) ## 开发调试 diff --git a/magic-admin/README.md b/magic-admin/README.md index 74d9d011..483a72ad 100644 --- a/magic-admin/README.md +++ b/magic-admin/README.md @@ -23,11 +23,11 @@ 2、执行如下命令运行管理端 ```bash -$ cd magic +$ cd magic-admin $ npm run admin:run ``` -3、访问 http://localhost:80 +3、访问 http://localhost:80 (端口以实际启动的为准) ## 开发调试 diff --git a/magic-admin/package.json b/magic-admin/package.json index 0607dd17..7cc6d452 100644 --- a/magic-admin/package.json +++ b/magic-admin/package.json @@ -4,6 +4,7 @@ "description": "Magic Admin 可视化搭建平台管理端。magic-admin 为独立项目目录,分为 web 端和 server 端,请按照下面指引操作", "main": "index.js", "scripts": { + "admin:run": "chmod u+x setup.sh && ./setup.sh", "init": "npm run web:install && npm run server:install", "web:install": "cd web && npm install", "server:install": "cd server && npm install" diff --git a/magic-admin/setup.sh b/magic-admin/setup.sh old mode 100644 new mode 100755 index 7c725bea..6a3eb15a --- a/magic-admin/setup.sh +++ b/magic-admin/setup.sh @@ -5,23 +5,28 @@ WORKSPACE=$(dirname "$PWD") echo ${WORKSPACE} # 全局安装lerna -tnpm i lerna -g +npm i lerna -g # magic依赖安装和构建 cd ${WORKSPACE} -tnpm run reinstall -tnpm run build +npm run reinstall +npm run build echo "magic依赖安装完毕 & 打包完毕" # 移动runtime打包产物到web +rm -rf ${WORKSPACE}/magic-admin/web/public/runtime mv -f ${WORKSPACE}/playground/dist/runtime/ ${WORKSPACE}/magic-admin/web/public echo "移动runtime打包产物到web完毕" +# magic-admin依赖安装 +cd ${WORKSPACE}/magic-admin +npm run init + # web构建 cd ${WORKSPACE}/magic-admin/web -tnpm run build +npm run build echo "web依赖安装完毕" @@ -33,7 +38,6 @@ echo "移动web文件到server完毕" # 运行server cd ${WORKSPACE}/magic-admin/server -tnpm i pm2 -g -pm2-runtime start pm2.config.js --env production +npm run dev