feat: 简化工程启动方式，优化部分交互内容

README.md

@@ -81,11 +81,12 @@ git clone http://github.com/didi/xiaoju-survey
 ### 安装依赖
 ```shell
 cd server
-sh init.sh
 ```
 
 ### 启动
 ```shell
+npm run local // 无需安装mongo
+或
 npm run dev
 ```
 

server/package.json

@@ -4,15 +4,16 @@
   "description": "survey server template",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
     "copy": "cp -rf ./src/ ./build/",
     "build": "tsc",
-    "launch": "npm run build && SERVER_ENV=local node ./build/index.js",
+    "launch:local": "npm run build && SERVER_ENV=local node ./build/index.js",
-    "start:stable": "SERVER_ENV=stable node ./build/index.js",
+    "launch:dev": "npm run build && SERVER_ENV=dev node ./build/index.js",
-    "start:preonline": "SERVER_ENV=preonline node ./build/index.js",
+    "start:stable": "npm run copy && npm run build && SERVER_ENV=stable node ./build/index.js",
-    "start:online": "SERVER_ENV=online node ./build/index.js",
+    "start:preonline": "npm run copy && npm run build && SERVER_ENV=preonline node ./build/index.js",
-    "start": "npm run copy && npm run launch",
+    "start:online": "npm run copy && npm run build && SERVER_ENV=online node ./build/index.js",
-    "dev": "npm run copy && nodemon -e js,mjs,json,ts  --exec 'npm run launch' --watch ./src"
+    "start": "npm run start:online",
+    "local": "npm run copy && nodemon -e js,mjs,json,ts  --exec 'npm run launch:local' --watch ./src",
+    "dev": "npm run copy && nodemon -e js,mjs,json,ts  --exec 'npm run launch:dev' --watch ./src"
   },
   "devDependencies": {
     "nodemon": "^2.0.20",
@@ -22,13 +23,19 @@
     "@types/koa": "^2.13.8",
     "@types/koa-bodyparser": "^4.3.10",
     "@types/koa-router": "^7.4.4",
+    "joi": "^17.9.2",
+    "jsonwebtoken": "^9.0.1",
     "koa": "^2.14.2",
     "koa-bodyparser": "^4.4.1",
     "koa-pino-logger": "^4.0.0",
-    "koa-router": "^12.0.0"
+    "koa-router": "^12.0.0",
+    "lodash": "^4.17.21",
+    "moment": "^2.29.4",
+    "mongodb": "^5.7.0",
+    "mongodb-memory-server": "^9.0.1"
   },
   "engines": {
-    "node": ">=14.15.4",
+    "node": ">=14.21.0",
-    "npm": ">=6.14.10"
+    "npm": ">=6.14.17"
   }
 }

server/src/apps/security/db/mongo.ts

@@ -1,5 +1,6 @@
 import { Collection, MongoClient, ObjectId } from 'mongodb'
 import { getConfig } from '../config/index'
+import { getMongoMemoryUri } from '../../../getMongoMemoryUri'
 
 const config = getConfig()
 
@@ -9,7 +10,12 @@ class mongoService {
     constructor() {
         this.client = new MongoClient(config.mongo.url);
     }
+
     async getCollection({ collectionName }): Promise<Collection> {
+        if (process.env.SERVER_ENV === 'local') {
+            const uri = await getMongoMemoryUri()
+            this.client = new MongoClient(uri);
+        }
         await this.client.connect()
         return this.client.db(config.mongo.dbName).collection(collectionName)
     }

server/src/apps/security/package.json

@@ -1,10 +0,0 @@
-{
-  "name": "sceurity",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "dependencies": {
-    "mongodb": "^5.7.0"
-  },
-  "devDependencies": {}
-}

server/src/apps/surveyManage/db/mongo.ts

@@ -1,5 +1,6 @@
 import { Collection, MongoClient, ObjectId } from 'mongodb'
 import { getConfig } from '../config/index'
+import { getMongoMemoryUri } from '../../../getMongoMemoryUri'
 
 const config = getConfig()
 
@@ -9,7 +10,12 @@ class mongoService {
     constructor() {
         this.client = new MongoClient(config.mongo.url);
     }
+
     async getCollection({ collectionName }): Promise<Collection> {
+        if (process.env.SERVER_ENV === 'local') {
+            const uri = await getMongoMemoryUri()
+            this.client = new MongoClient(uri);
+        }
         await this.client.connect()
         return this.client.db(config.mongo.dbName).collection(collectionName)
     }

server/src/apps/surveyManage/package.json

@@ -1,13 +0,0 @@
-{
-  "name": "survey_manage",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "dependencies": {
-    "joi": "^17.9.2",
-    "lodash": "^4.17.21",
-    "moment": "^2.29.4",
-    "mongodb": "^5.7.0"
-  },
-  "devDependencies": {}
-}

server/src/apps/surveyPublish/db/mongo.ts

@@ -1,5 +1,6 @@
 import { Collection, MongoClient, ObjectId } from 'mongodb'
 import { getConfig } from '../config/index'
+import { getMongoMemoryUri } from '../../../getMongoMemoryUri'
 
 const config = getConfig()
 
@@ -9,7 +10,12 @@ class mongoService {
     constructor() {
         this.client = new MongoClient(config.mongo.url);
     }
+
     async getCollection({ collectionName }): Promise<Collection> {
+        if (process.env.SERVER_ENV === 'local') {
+            const uri = await getMongoMemoryUri()
+            this.client = new MongoClient(uri);
+        }
         await this.client.connect()
         return this.client.db(config.mongo.dbName).collection(collectionName)
     }

server/src/apps/surveyPublish/package.json

@@ -1,13 +0,0 @@
-{
-  "name": "survey_publish",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "dependencies": {
-    "joi": "^17.9.2",
-    "lodash": "^4.17.21",
-    "moment": "^2.29.4",
-    "mongodb": "^5.7.0"
-  },
-  "devDependencies": {}
-}

server/src/apps/ui/package.json

@@ -1,7 +0,0 @@
-{
-  "name": "ui",
-  "version": "1.0.0",
-  "main": "index.js",
-  "license": "MIT",
-  "dependencies": {}
-}

server/src/apps/user/db/mongo.ts

@@ -1,5 +1,6 @@
 import { Collection, MongoClient, ObjectId } from 'mongodb'
 import { getConfig } from '../config/index'
+import { getMongoMemoryUri } from '../../../getMongoMemoryUri'
 
 const config = getConfig()
 
@@ -9,7 +10,12 @@ class mongoService {
     constructor() {
         this.client = new MongoClient(config.mongo.url);
     }
+    
     async getCollection({ collectionName }): Promise<Collection> {
+        if (process.env.SERVER_ENV === 'local') {
+            const uri = await getMongoMemoryUri()
+            this.client = new MongoClient(uri);
+        }
         await this.client.connect()
         return this.client.db(config.mongo.dbName).collection(collectionName)
     }

server/src/apps/user/package.json

@@ -1,13 +0,0 @@
-{
-  "name": "user",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "dependencies": {
-    "joi": "^17.9.2",
-    "jsonwebtoken": "^9.0.1",
-    "lodash": "^4.17.21",
-    "mongodb": "^5.7.0"
-  },
-  "devDependencies": {}
-}

server/src/getMongoMemoryUri.ts

@@ -0,0 +1,10 @@
+import { MongoMemoryServer } from 'mongodb-memory-server'
+
+let mongoMemeryInstance
+export async function getMongoMemoryUri () {
+  if (!mongoMemeryInstance) {
+    mongoMemeryInstance =  await MongoMemoryServer.create()
+  }
+  
+  return mongoMemeryInstance.getUri()
+}

server/src/index.ts

@@ -16,6 +16,6 @@ app.use(KoaBodyparser({
 }))
 
 app.use(getRouter().routes())
-const port = 8080
+const port = process.env.PORT || 3000
 app.listen(port)
 process.stdout.write(`${os.EOL}server run: http://127.0.0.1:${port} ${os.EOL}`)

web/package.json

@@ -21,7 +21,6 @@
     "moment": "^2.29.4",
     "qrcode": "^1.5.3",
     "vue": "^2.7.14",
-    "vue-demi": "^0.14.5",
     "vue-router": "^3.5.1",
     "vuedraggable": "^2.24.3",
     "vuex": "^3.6.2",
@@ -50,7 +49,7 @@
     "vue-template-compiler": "^2.7.14"
   },
   "engines": {
-    "node": ">=16.11.1",
+    "node": ">=14.21.0",
-    "npm": ">=8.0.0"
+    "npm": ">=6.14.17"
   }
 }

web/src/management/api/base.js

@@ -2,13 +2,15 @@ import axios from 'axios';
 import store from '@/management/store/index';
 import router from '@/management/router/index';
 import _get from 'lodash/get';
+import { Message } from 'element-ui';
 
 const instance = axios.create({
   baseURL: '/api',
   timeout: 3000,
 });
 
-instance.interceptors.response.use((response) => {
+instance.interceptors.response.use(
+  (response) => {
     if (response.status !== 200) {
       throw new Error('http请求出错');
     }
@@ -21,7 +23,12 @@ instance.interceptors.response.use((response) => {
     } else {
       return res;
     }
-});
+  },
+  (err) => {
+    Message.error(err || 'http请求出错');
+    throw new Error(err);
+  }
+);
 
 instance.interceptors.request.use((config) => {
   const hasLogined = _get(store, 'state.user.hasLogined');

web/src/management/pages/login/index.vue

@@ -3,7 +3,7 @@
     class="login-page"
     :style="{
       background: `url('/imgs/create/background.jpg') no-repeat bottom right`,
-      'background-size': 'cover'
+      'background-size': 'cover',
     }"
   >
     <div class="login-top">
@@ -29,13 +29,18 @@
 
         <el-form-item class="button-group">
           <el-button
+            :loading="loginPending"
             size="small"
             type="primary"
             class="button"
             @click="submitForm('ruleForm', 'login')"
             >登录</el-button
           >
-          <el-button size="small" class="button register-button" @click="submitForm('ruleForm', 'register')"
+          <el-button
+            :loading="registerPending"
+            size="small"
+            class="button register-button"
+            @click="submitForm('ruleForm', 'register')"
             >注册</el-button
           >
         </el-form-item>
@@ -74,6 +79,8 @@ export default {
           },
         ],
       },
+      loginPending: false,
+      registerPending: false,
     };
   },
   methods: {
@@ -85,10 +92,12 @@ export default {
               login,
               register,
             };
+            this[`${type}Pending`] = true;
             const res = await submitTypes[type]({
               username: this.ruleForm.name,
               password: this.ruleForm.password,
             });
+            this[`${type}Pending`] = false;
             if (res.code !== CODE_MAP.SUCCESS) {
               this.$message.error(res.errmsg);
               throw new Error('登录/注册失败' + res.errmsg);
@@ -105,6 +114,7 @@ export default {
             }
             this.$router.replace(redirect);
           } catch (error) {
+            this[`${type}Pending`] = false;
             console.log(error);
           }
           return true;

web/vue.config.js

@@ -27,10 +27,21 @@ module.exports = defineConfig({
   devServer: {
     proxy: {
       '/api': {
-        target: 'http://localhost:8080',
+        target: 'http://localhost:3000',
         changeOrigin: true,
+        pathRewrite: false,
       },
     },
+    setupMiddlewares(middlewares, devServer) {
+      if (!devServer) {
+        throw new Error('webpack-dev-server is not defined');
+      }
+      devServer.app.get('/', function (req, res) {
+        res.redirect('/management');
+      });
+      return middlewares;
+    },
+    open: true,
   },
   chainWebpack: (config) => {
     config.module