init

gm-server/.github/workflows/nodejs.yml

@@ -5,9 +5,13 @@ name: Node.js CI
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - main
+      - master
   pull_request:
-    branches: [ master ]
+    branches:
+      - main
+      - master
   schedule:
     - cron: '0 2 * * *'
 
@@ -31,7 +35,7 @@ jobs:
         node-version: ${{ matrix.node-version }}
 
     - name: Install Dependencies
-      run: npm i -g npminstall && npminstall
+      run: npm i -g npminstall@5 && npminstall
 
     - name: Continuous Integration
       run: npm run ci

gm-server/.travis.yml

@@ -3,7 +3,7 @@ language: node_js
 node_js:
   - '8'
 before_install:
-  - npm i npminstall -g
+  - npm i npminstall@5 -g
 install:
   - npminstall
 script:

gm-server/appveyor.yml

@@ -4,7 +4,7 @@ environment:
 
 install:
   - ps: Install-Product node $env:nodejs_version
-  - npm i npminstall && node_modules\.bin\npminstall
+  - npm i npminstall@5 && node_modules\.bin\npminstall
 
 test_script:
   - node --version

gm-server/package.json

@@ -40,12 +40,14 @@
     "exceljs": "^4.3.0",
     "form-data": "^4.0.0",
     "formstream": "^1.1.1",
+    "koa": "^2.13.4",
     "moment": "^2.29.0",
     "node-xlsx": "^0.23.0",
     "pump": "^3.0.0",
     "reflect-metadata": "^0.1.13",
     "stream-wormhole": "^1.1.0",
     "temp": "^0.9.1",
+    "tsconfig-paths": "^3.9.0",
     "underscore": "^1.12.0",
     "unzip-stream": "^0.3.0"
   },

gm-server/tsconfig.json

@@ -24,10 +24,10 @@
     "importHelpers": true,
     "baseUrl": ".",
     "paths": {
-      "@domain/*": ["app/domain/*"],
-      "@db/*": ["app/db/*"],
-      "@consts": ["app/consts"],
-      "@pubUtils/*": ["app/pubUtils/*"]
+      "@domain/*": ["../shared/domain/*"],
+      "@db/*": ["../shared/db/*"],
+      "@consts": ["../shared/consts"],
+      "@pubUtils/*": ["../shared/pubUtils/*"]
     },
   },
   "exclude": [

gm-server/typings/app/service/index.d.ts

@@ -12,8 +12,8 @@ import ExportGmUser from '../../../app/service/GmUser';
 import ExportLog from '../../../app/service/Log';
 import ExportMail from '../../../app/service/Mail';
 import ExportTest from '../../../app/service/Test';
-import ExportUtils from '../../../app/service/Utils';
 import ExportUsers from '../../../app/service/users';
+import ExportUtils from '../../../app/service/Utils';
 
 declare module 'egg' {
   interface IService {
@@ -23,7 +23,7 @@ declare module 'egg' {
     log: AutoInstanceType<typeof ExportLog>;
     mail: AutoInstanceType<typeof ExportMail>;
     test: AutoInstanceType<typeof ExportTest>;
-    utils: AutoInstanceType<typeof ExportUtils>;
     users: AutoInstanceType<typeof ExportUsers>;
+    utils: AutoInstanceType<typeof ExportUtils>;
   }
 }