From 74e48c7326b177138d2152b90e345d7a2b8834e5 Mon Sep 17 00:00:00 2001
From: npmrun <kk1549469775@gmail.com>
Date: Thu, 15 Dec 2022 15:09:41 +0800
Subject: [PATCH] fixed

---
 source/models/ha/user.ts      | 11 -----------
 source/models/ha/user_info.ts | 29 +++++++++++++++++++++++++++++
 source/plugins/index.ts       |  1 +
 types/global.d.ts             |  2 +-
 4 files changed, 31 insertions(+), 12 deletions(-)
 create mode 100644 source/models/ha/user_info.ts

diff --git a/source/models/ha/user.ts b/source/models/ha/user.ts
index d4438f4..4f47933 100644
--- a/source/models/ha/user.ts
+++ b/source/models/ha/user.ts
@@ -7,20 +7,9 @@ module.exports = function (sequelize: Sequelize, DataTypes: DT) {
             type: DataTypes.STRING,
             allowNull: false
         },
-        avatar: {
-            type: DataTypes.STRING,
-            allowNull: false
-        },
         password: {
             type: DataTypes.STRING,
             allowNull: false
-        },
-        nickname: {
-            type: DataTypes.STRING,
-            allowNull: false
-        },
-        email: {
-            type: DataTypes.STRING,
         }
     }, {
 
diff --git a/source/models/ha/user_info.ts b/source/models/ha/user_info.ts
new file mode 100644
index 0000000..90ed365
--- /dev/null
+++ b/source/models/ha/user_info.ts
@@ -0,0 +1,29 @@
+import { Sequelize, DataTypes } from "sequelize"
+
+type DT = typeof DataTypes
+module.exports = function (sequelize: Sequelize, DataTypes: DT) {
+    const UserInfo = sequelize.define('ha-user_info', {
+        nickname: {
+            type: DataTypes.STRING,
+            allowNull: false
+        },
+        email: {
+            type: DataTypes.STRING,
+        },
+        avatar: {
+            type: DataTypes.STRING,
+        },
+        tel: {
+            type: DataTypes.STRING,
+        }
+    }, {
+
+    });
+
+    // @ts-ignore
+    UserInfo.associate = function (models) {
+        models['ha-user'].hasOne(models['ha-user_info']);
+        models['ha-user_info'].belongsTo(models['ha-user'], { foreignKey: 'user_id' });
+    };
+    return UserInfo
+};
diff --git a/source/plugins/index.ts b/source/plugins/index.ts
index c8f0335..1e970b3 100644
--- a/source/plugins/index.ts
+++ b/source/plugins/index.ts
@@ -93,6 +93,7 @@ export default [
     plugin: HapiCrumb,
     options: {
         autoGenerate: true,
+        logUnauthorized: true,
         // skip: function(request, reply) {
         //     return true;
         // },
diff --git a/types/global.d.ts b/types/global.d.ts
index 7ef4c40..8ec5133 100644
--- a/types/global.d.ts
+++ b/types/global.d.ts
@@ -12,7 +12,7 @@ declare global {
 
 declare module '@hapi/hapi' {
     interface Request {
-        getModel(name: string): ModelCtor<Model<any, any>>
+        getModel<T extends {} = any, M extends {} = any>(name: string): ModelCtor<Model<T, M>>
     }
     interface ResponseToolkit {