From 6217b8e1f39375b43894f89043d1c75023d44fa0 Mon Sep 17 00:00:00 2001
From: xuecong <>
Date: Wed, 17 Nov 2021 01:00:43 +0800
Subject: [PATCH] fix code merge bug

---
 resource/db.sql               |  7 ------
 server/src/app.ts             |  2 ++
 server/src/middleware/init.ts | 45 +++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 7 deletions(-)
 create mode 100644 server/src/middleware/init.ts

diff --git a/resource/db.sql b/resource/db.sql
index 3a52e4b..e0fb6f8 100644
--- a/resource/db.sql
+++ b/resource/db.sql
@@ -1169,10 +1169,6 @@ ALTER TABLE `ejyy_ask_for_leave_flow`
   ADD KEY `parent_id` (`parent_id`),
   ADD KEY `step` (`step`);
 
-ALTER TABLE `ejyy_building_access`
-  ADD PRIMARY KEY (`id`),
-  ADD KEY `building_id` (`building_id`);
-
 ALTER TABLE `ejyy_building_info`
   ADD PRIMARY KEY (`id`),
   ADD KEY `community_id` (`community_id`);
@@ -1628,9 +1624,6 @@ ALTER TABLE `ejyy_ask_for_leave`
 ALTER TABLE `ejyy_ask_for_leave_flow`
   MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT;
 
-ALTER TABLE `ejyy_building_access`
-  MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT;
-
 ALTER TABLE `ejyy_building_info`
   MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
 
diff --git a/server/src/app.ts b/server/src/app.ts
index 6030ac4..eaf0bae 100644
--- a/server/src/app.ts
+++ b/server/src/app.ts
@@ -33,6 +33,7 @@ import ModelMiddleware from '~/middleware/model';
 import IpMiddleware from '~/middleware/ip';
 import HeaderMiddleware from '~/middleware/header';
 import WatcherMiddleware from '~/middleware/watcher';
+import InitMiddleware from '~/middleware/init';
 import * as iot from '~/iot';
 
 if (cluster.isMaster) {
@@ -87,6 +88,7 @@ if (cluster.isMaster) {
         .use(ModelMiddleware())
         .use(IpMiddleware())
         .use(HeaderMiddleware())
+        .use(InitMiddleware())
         .use(router.routes())
         .use(WatcherMiddleware());
 
diff --git a/server/src/middleware/init.ts b/server/src/middleware/init.ts
new file mode 100644
index 0000000..bfdced7
--- /dev/null
+++ b/server/src/middleware/init.ts
@@ -0,0 +1,45 @@
+/**
+ * +----------------------------------------------------------------------
+ * | 「e家宜业」 —— 助力物业服务升级，用心服务万千业主
+ * +----------------------------------------------------------------------
+ * | Copyright (c) 2020~2021 https://www.chowa.com All rights reserved.
+ * +----------------------------------------------------------------------
+ * | Licensed 未经许可不能去掉「e家宜业」和「卓瓦科技」相关版权
+ * +----------------------------------------------------------------------
+ * | Author: jixuecong@chowa.cn
+ * +----------------------------------------------------------------------
+ */
+
+import { Middleware, DefaultState, DefaultContext } from 'koa';
+import config from '~/config';
+import utils from '~/utils';
+import { SYSTEMT_NOT_INIT } from '~/constant/code';
+
+function InitMiddleware(): Middleware<DefaultState, DefaultContext> {
+    return async (ctx: DefaultContext, next) => {
+        const isInitAction = /^\/pc\/init\/\w+$/.test(ctx.request.path);
+
+        if (!config.inited && !/^\/pc\/upload\/sign$/.test(ctx.request.path)) {
+            const total = utils.sql.countReader(await ctx.model.from('ejyy_property_company_admin').count());
+
+            if (total === 0) {
+                if (!isInitAction) {
+                    return (ctx.body = {
+                        code: SYSTEMT_NOT_INIT,
+                        message: '系统未初始化'
+                    });
+                }
+            } else {
+                config.inited = true;
+            }
+        } else {
+            if (isInitAction) {
+                ctx.redirect('https://www.chowa.cn');
+            }
+        }
+
+        await next();
+    };
+}
+
+export default InitMiddleware;