注册

README.md

@@ -1,3 +1,3 @@
-# node_base_frame
+# AI Metaspace Dao
 
 这是一个以node为基础的框架

admin_node/HttpTest/Test.http

@@ -7,6 +7,6 @@ POST http://127.0.0.1:7001/api/user/register
 Content-Type: application/json
 
 {
-  "username": "test",
-  "password": "e10adc3949ba59abbe56e057f20f883e"
+  "wallet": "test",
+  "pid": 1
 }

admin_node/app/controller/api/User.ts

@@ -1,37 +0,0 @@
-import ApiController from './ApiController';
-
-class UserController extends ApiController {
-    async register() {
-        const createRule = {
-            username: {
-                type: 'string',
-                min: 4,
-                max: 32,
-                trim: true,
-            },
-            password: {
-                type: 'string',
-                min: 32,
-                max: 32,
-                trim: true,
-            },
-        };
-        const err = this.app.validator.validate(createRule, this.ctx.request.body);
-
-        if (err) {
-            return this.fail('不知道怎么返回');
-        }
-
-        const params = this.ctx.request.body;
-        const user = await this.ctx.model.User.create({
-            username: params.username,
-            name: '',
-            password: '123',
-            salt: '123',
-        });
-
-        return this.success(user);
-    }
-}
-
-export default UserController;

admin_node/app/controller/api/UserController.ts

@@ -0,0 +1,32 @@
+import ApiController from './ApiController';
+
+class UserController extends ApiController {
+    async register() {
+        const createRule = {
+            wallet: {
+                type: 'string',
+                trim: true,
+            },
+            pid: {
+                type: 'int',
+                trim: true,
+            },
+            sign: {
+                type: 'string',
+                trim: true,
+            },
+        };
+        const err = this.app.validator.validate(createRule, this.ctx.request.body);
+
+        if (err) {
+            const firstErr = err[0];
+            return this.fail(`参数: ${firstErr.field} 格式不正确`);
+        }
+
+        // TODO 验算签名用户是否是当前指定用户
+
+        return this.success({});
+    }
+}
+
+export default UserController;

admin_node/app/model/User.ts

@@ -1,6 +1,5 @@
 module.exports = app => {
     const { STRING, INTEGER, DATE } = app.Sequelize;
-
     const User = app.model.define('users', {
         id: {
             type: INTEGER,
@@ -10,49 +9,65 @@ module.exports = app => {
             notEmpty: true,
             comment: '用户ID',
         },
-        username: {
-            type: STRING(30),
-            notNull: true,
-            notEmpty: true,
-            comment: '用户名',
-        },
-        name: {
-            type: STRING(30),
+        wallet: {
+            type: STRING(64),
             notNull: true,
             notEmpty: true,
-            comment: '用户名',
+            comment: '钱包地址',
         },
-        password: {
-            type: STRING,
+        level: {
+            type: INTEGER,
             notNull: true,
             notEmpty: true,
-            defaultValue: '',
-            comment: '用户密码',
+            defaultValue: 0,
+            comment: '用户等级',
         },
-        salt: {
-            type: STRING(6),
+        hash_rate: {
+            type: INTEGER,
             notNull: true,
             notEmpty: true,
-            defaultValue: '',
-            comment: '用户密码盐',
+            defaultValue: 0,
+            comment: '用户算力',
         },
-        state: {
+        pid: {
             type: INTEGER,
             notNull: true,
             notEmpty: true,
-            defaultValue: 0,
-            comment: '用户状态: 二进制状态, 从右到左, 是否激活, 是否禁止登录, 是否禁用 0为正常状态',
+            comment: '父级ID',
         },
-        last_login: {
-            type: DATE,
+        path: {
+            type: STRING,
             notNull: true,
             notEmpty: true,
-            defaultValue: '1971-01-01 00:00',
-            comment: '最后登录时间',
+            comment: '用户邀请路径',
         },
         created_at: DATE,
         updated_at: DATE,
+    }, {
+        indexes: [
+            {
+                name: 'I_wallet',
+                fields: [ 'wallet' ],
+                using: 'BTREE',
+            },
+            {
+                name: 'I_level',
+                fields: [ 'level' ],
+                using: 'BTREE',
+            },
+            {
+                name: 'I_pid',
+                fields: [ 'pid' ],
+                using: 'BTREE',
+            },
+            {
+                name: 'I_path',
+                fields: [ 'path' ],
+                using: 'BTREE',
+            },
+        ],
     });
 
+    User.sync();
     return User;
 };

admin_node/app/router/api.ts

@@ -1,6 +1,13 @@
+// 共用模块
 module.exports = app => {
     const { router, controller } = app;
-    const subRouter = router.namespace('/api');
-    subRouter.get('/version', controller.api.apiController.version);
-    subRouter.post('/user/register', controller.api.user.register);
+    const ApiRouter = router.namespace('/api');
+    ApiRouter.get('/version', controller.api.apiController.version);
+    ApiRouter.post('/user/register', controller.api.userController.register);
 };
+
+// module.exports = app => {
+//     const { router, controller } = app;
+//     const ApiRouter = router.namespace('/api', app.middleware.Auth);
+//     const UserApiRouter = ApiRouter.namespace('/user');
+// };

admin_node/config/config.default.ts

@@ -17,7 +17,7 @@ export default (appInfo: EggAppInfo) => {
     config.keys = appInfo.name + process.env.SECURITY_KEY || '_1687254724720_1708';
 
     // add your egg config in here
-    config.middleware = [];
+    config.middleware = [ 'auth' ];
 
     // add your special config in here
     const bizConfig = {
@@ -34,13 +34,11 @@ export default (appInfo: EggAppInfo) => {
     };
     config.sequelize = {
         dialect: 'mysql',
-        host: process.env.DATABASE_HOST || '127.0.0.1',
-        port: process.env.DATABASE_PORT || 3306,
-        database: process.env.DATABASE_DATABASE || 'egg',
-        username: process.env.DATABASE_USERNAME || 'egg',
-        password: process.env.DATABASE_PWD || '1995',
-        underscored: true,
-        timezone: process.env.TZ || '+UTC',
+        host: process.env.DATABASE_HOST || '192.168.2.254',
+        port: process.env.DATABASE_PORT ? Number(process.env.DATABASE_PORT) : 3306,
+        database: process.env.DATABASE_DATABASE || 'ai_metaspace',
+        username: process.env.DATABASE_USERNAME || 'root',
+        password: process.env.DATABASE_PWD || 'hope',
         pool: {
             max: 5,
             min: 0,
@@ -48,27 +46,9 @@ export default (appInfo: EggAppInfo) => {
             idle: 10000,
         },
     };
-    // the return config will combines to EggAppConfig
+    // the return config will combine to EggAppConfig
     return {
         ...config,
         ...bizConfig,
     };
 };
-
-// 数据库链接
-exports.sequelize = {
-    dialect: 'mysql',
-    host: process.env.DATABASE_HOST || '127.0.0.1',
-    port: process.env.DATABASE_PORT || 3306,
-    database: process.env.DATABASE_DATABASE || 'egg',
-    username: process.env.DATABASE_USERNAME || 'egg',
-    password: process.env.DATABASE_PWD || '1995',
-    underscored: true,
-    timezone: process.env.TZ || '+UTC',
-    pool: {
-        max: 5,
-        min: 0,
-        acquire: 30000,
-        idle: 10000,
-    },
-};

admin_node/package.json

@@ -55,6 +55,6 @@
     "type": "git",
     "url": ""
   },
-  "author": "admin@zhangp.cn",
+  "author": "",
   "license": "MIT"
 }

admin_node/typings/config/plugin.d.ts

@@ -26,6 +26,7 @@ import 'egg-jwt';
 import 'egg-cors';
 import 'egg-router-plus';
 import 'egg-validate';
+import 'egg-sequelize';
 import { EggPluginItem } from 'egg';
 declare module 'egg' {
   interface EggPlugin {
@@ -52,5 +53,6 @@ declare module 'egg' {
     cors?: EggPluginItem;
     routerPlus?: EggPluginItem;
     validate?: EggPluginItem;
+    sequelize?: EggPluginItem;
   }
 }