程旭源 1 год назад
Родитель
Сommit
2f73654ba5

+ 12 - 0
admin_node/HttpTest/Test.http

@@ -0,0 +1,12 @@
+### 获取版本
+GET http://127.0.0.1:7001/api/version
+Content-Type: application/json
+
+### 注册用户
+POST http://127.0.0.1:7001/api/user/register
+Content-Type: application/json
+
+{
+  "username": "test",
+  "password": "e10adc3949ba59abbe56e057f20f883e"
+}

+ 9 - 2
admin_node/app/controller/api/User.ts

@@ -1,7 +1,7 @@
 import ApiController from './ApiController';
 
 class UserController extends ApiController {
-    register() {
+    async register() {
         const createRule = {
             username: {
                 type: 'string',
@@ -16,13 +16,20 @@ class UserController extends ApiController {
                 trim: true,
             },
         };
-
         const err = this.app.validator.validate(createRule, this.ctx.request.body);
 
         if (err) {
             console.log(err);
             return this.fail('不知道怎么返回');
         }
+        console.log(this);
+        // const params = this.ctx.request.body;
+        // const user = await this.app.model.User.create({
+        //     username: params.username,
+        //     name: '',
+        //     password: '123',
+        //     salt: '123',
+        // });
 
         return this.success([]);
     }

+ 4 - 4
admin_node/config/config.default.ts

@@ -1,5 +1,5 @@
 import { EggAppConfig, EggAppInfo, PowerPartial } from 'egg';
-import * as process from 'process';
+// import * as process from 'process';
 require('dotenv').config(); // 加载dotenv配置文件用于支持 env
 
 
@@ -42,10 +42,10 @@ export default (appInfo: EggAppInfo) => {
 // 数据库链接
 exports.sequelize = {
     dialect: 'mysql',
-    host: process.env.DATABASE_HOST || '127.0.0.1',
+    host: process.env.DATABASE_HOST || '192.168.2.254',
     port: process.env.DATABASE_PORT || 3306,
-    database: process.env.DATABASE_DATABASE || 'test',
-    username: process.env.DATABASE_USERNAME || 'root',
+    database: process.env.DATABASE_DATABASE || 'test_egg',
+    username: process.env.DATABASE_USERNAME || 'test_egg',
     password: process.env.DATABASE_PWD || '123456',
     underscored: true,
     timezone: process.env.TZ || '+UTC',

+ 12 - 4
admin_node/config/plugin.ts

@@ -41,16 +41,24 @@ const plugin: EggPlugin = {
         enable: true,
         package: 'egg-router-plus',
     },
+    validate: {
+        enable: true,
+        package: 'egg-validate',
+    },
+    sequelize: {
+        enable: true,
+        package: 'egg-sequelize',
+    },
 };
 
 
 export default plugin;
 
 
-exports.sequelize = {
-    enable: true,
-    package: 'egg-sequelize',
-};
+// exports.sequelize = {
+//     enable: true,
+//     package: 'egg-sequelize',
+// };
 // exports.routerPlus = {
 //     enable: true,
 //     package: 'egg-router-plus',

+ 23 - 0
admin_node/database/config.json

@@ -0,0 +1,23 @@
+{
+  "development": {
+    "username": "test_egg",
+    "password": "123456",
+    "database": "test_egg",
+    "host": "192.168.2.254",
+    "dialect": "mysql"
+  },
+  "test": {
+    "username": "test_egg",
+    "password": "123456",
+    "database": "test_egg",
+    "host": "192.168.2.254",
+    "dialect": "mysql"
+  },
+  "production": {
+    "username": "test_egg",
+    "password": "123456",
+    "database": "test_egg",
+    "host": "192.168.2.254",
+    "dialect": "mysql"
+  }
+}

+ 1 - 0
admin_node/package.json

@@ -33,6 +33,7 @@
     "egg-scripts": "^2.17.0",
     "egg-sequelize": "^6.0.0",
     "egg-tracer": "^2.0.0",
+    "egg-validate": "^2.0.2",
     "mysql2": "^3.4.0"
   },
   "devDependencies": {

+ 13 - 1
admin_node/yarn.lock

@@ -2544,6 +2544,13 @@ egg-utils@^2.4.1:
     mkdirp "^0.5.1"
     utility "^1.15.0"
 
+egg-validate@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.npmmirror.com/egg-validate/-/egg-validate-2.0.2.tgz#c236c730a3730fe4e0655e1a2799398178ab3dd3"
+  integrity sha512-pUTfMTHQSpzDKAWkH19ZpyQBK22UToAwNWIgW1eXCAMpz+qvULuI5ey7dgqGQ/ZNwV2w/Stg96BrzW5uigCuVg==
+  dependencies:
+    parameter "^3.0.0"
+
 egg-view@^2.1.3:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/egg-view/-/egg-view-2.1.4.tgz#c583b62f6d320eee9470dcbd1de42a6ca1d425be"
@@ -5117,6 +5124,11 @@ param-case@^2.1.0:
   dependencies:
     no-case "^2.2.0"
 
+parameter@^3.0.0:
+  version "3.7.0"
+  resolved "https://registry.npmmirror.com/parameter/-/parameter-3.7.0.tgz#614518b2242ea79cf5ffa24d1151dfd36576630d"
+  integrity sha512-CRSlKBPn5pI1HQpdhyjVojTq9OyZFXcejkqt6vhkjmAwvZ4w0nK6Od/vNyniWY8wC3FwIPG+DUc59vG3FmkINg==
+
 parent-module@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
@@ -5631,7 +5643,7 @@ seq-queue@^0.0.5:
 
 sequelize-cli@^6.6.1:
   version "6.6.1"
-  resolved "https://registry.yarnpkg.com/sequelize-cli/-/sequelize-cli-6.6.1.tgz#ab86fc8de79f56bf1d1c4e3bbb1104aee4a5eaf4"
+  resolved "https://registry.npmmirror.com/sequelize-cli/-/sequelize-cli-6.6.1.tgz#ab86fc8de79f56bf1d1c4e3bbb1104aee4a5eaf4"
   integrity sha512-C3qRpy1twBsFa855qOQFSYWer8ngiaZP05/OAsT1QCUwtc6UxVNNiQ0CGUt98T9T1gi5D3TGWL6le8HWUKELyw==
   dependencies:
     cli-color "^2.0.3"