From 3238a7b3beed487e9219dcfeef2608dc5ff8bd25 Mon Sep 17 00:00:00 2001 From: xuecong <> Date: Tue, 11 Jan 2022 10:20:07 +0800 Subject: [PATCH] update more.. --- README.MD | 4 ++++ resource/db.sql | 1 - server/src/module/mp/controller/user/login.ts | 12 ++---------- server/src/module/mp/index.ts | 4 +--- server/src/module/pc/controller/ower/detail.ts | 1 - server/src/module/pc/controller/ower/list.ts | 1 - web/src/views/basic/ower/main/detail.vue | 10 ---------- web/src/views/basic/ower/main/list.vue | 6 ------ 8 files changed, 7 insertions(+), 32 deletions(-) diff --git a/README.MD b/README.MD index 4b80193..198e927 100644 --- a/README.MD +++ b/README.MD @@ -147,6 +147,10 @@ [欢迎反馈问题](https://github.com/chowa/ejyy/issues) [欢迎提交代码](https://github.com/chowa/ejyy/pulls) +## 特别声明 + +禁止将本项目的代码和资源进行任何形式的出售，产生的一切后果由侵权者自负!! + ## License ![AGPL](readme/agplv3.png) diff --git a/resource/db.sql b/resource/db.sql index 1cd3da3..4e96b88 100644 --- a/resource/db.sql +++ b/resource/db.sql @@ -1104,7 +1104,6 @@ CREATE TABLE `ejyy_wechat_mp_user` ( `avatar_url` varchar(256) DEFAULT '/avatar/default.png', `gender` tinyint(1) NOT NULL DEFAULT 0 COMMENT '1 男 2女 ', `signature` varchar(56) NOT NULL DEFAULT '不一定每天都很好，但每天都会有些小美好在等你', - `status` tinyint(1) NOT NULL DEFAULT 1 COMMENT '1 正常 0冻结', `intact` tinyint(4) NOT NULL DEFAULT 0 COMMENT '0 身份信息未补全； 1补全', `created_at` bigint(13) NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; diff --git a/server/src/module/mp/controller/user/login.ts b/server/src/module/mp/controller/user/login.ts index d9d7043..2aac410 100644 --- a/server/src/module/mp/controller/user/login.ts +++ b/server/src/module/mp/controller/user/login.ts @@ -11,8 +11,8 @@ */ import { Action } from '~/types/action'; -import { SUCCESS, WEHCAT_MP_LOGIN_ERROR, ACCOUNT_HAS_BEEN_FREEZE } from '~/constant/code'; -import { FREEZE_STATUS, INCOMPLETE_USER_INFO } from '~/constant/status'; +import { SUCCESS, WEHCAT_MP_LOGIN_ERROR } from '~/constant/code'; +import { INCOMPLETE_USER_INFO } from '~/constant/status'; import * as wechatService from '~/service/wechat'; import communityService from '~/service/community'; import utils from '~/utils'; @@ -86,7 +86,6 @@ const MpUserLoginAction = { 'ejyy_wechat_mp_user.gender', 'ejyy_wechat_mp_user.avatar_url', 'ejyy_wechat_mp_user.signature', - 'ejyy_wechat_mp_user.status', 'ejyy_wechat_mp_user.intact', 'ejyy_wechat_mp_user.created_at', 'ejyy_wechat_official_accounts_user.subscribed' @@ -117,13 +116,6 @@ const MpUserLoginAction = { token }); } else { - if (mpUserInfo.status === FREEZE_STATUS) { - return (ctx.body = { - code: ACCOUNT_HAS_BEEN_FREEZE, - message: '账号已被冻结' - }); - } - mpUserInfo.phone = utils.phone.hide(mpUserInfo.phone); await ctx.model diff --git a/server/src/module/mp/index.ts b/server/src/module/mp/index.ts index 7d42da4..b4edd70 100644 --- a/server/src/module/mp/index.ts +++ b/server/src/module/mp/index.ts @@ -18,7 +18,6 @@ import * as MpModuleRouter from './router'; import config from '~/config'; import validatorService from '~/service/validator'; import { PARAMS_ERROR, USER_INFO_UNINTACT } from '~/constant/code'; -import { FREEZE_STATUS } from '~/constant/status'; import cwlog from 'chowa-log'; function MpModule(appRouter: KoaRouter) { @@ -51,14 +50,13 @@ function MpModule(appRouter: KoaRouter) { 'ejyy_wechat_mp_user.gender', 'ejyy_wechat_mp_user.avatar_url', 'ejyy_wechat_mp_user.signature', - 'ejyy_wechat_mp_user.status', 'ejyy_wechat_mp_user.intact', 'ejyy_wechat_mp_user.created_at', 'ejyy_wechat_official_accounts_user.subscribed' ) .first(); - if (!ctx.mpUserInfo || ctx.mpUserInfo.status === FREEZE_STATUS) { + if (!ctx.mpUserInfo) { return (ctx.status = 401); } diff --git a/server/src/module/pc/controller/ower/detail.ts b/server/src/module/pc/controller/ower/detail.ts index 2436d3b..6cc6910 100644 --- a/server/src/module/pc/controller/ower/detail.ts +++ b/server/src/module/pc/controller/ower/detail.ts @@ -62,7 +62,6 @@ const PcOwerDetailAction = { 'ejyy_wechat_mp_user.avatar_url', 'ejyy_wechat_mp_user.signature', 'ejyy_wechat_mp_user.gender', - 'ejyy_wechat_mp_user.status', 'ejyy_wechat_mp_user.intact', 'ejyy_wechat_mp_user.created_at', 'ejyy_wechat_official_accounts_user.subscribed' diff --git a/server/src/module/pc/controller/ower/list.ts b/server/src/module/pc/controller/ower/list.ts index e2b58f5..d17ad1f 100644 --- a/server/src/module/pc/controller/ower/list.ts +++ b/server/src/module/pc/controller/ower/list.ts @@ -97,7 +97,6 @@ const PcOwerListAction = { 'ejyy_wechat_mp_user.real_name', 'ejyy_wechat_mp_user.nick_name', 'ejyy_wechat_mp_user.gender', - 'ejyy_wechat_mp_user.status', 'ejyy_wechat_mp_user.intact', 'ejyy_wechat_mp_user.created_at', 'ejyy_wechat_official_accounts_user.subscribed' diff --git a/web/src/views/basic/ower/main/detail.vue b/web/src/views/basic/ower/main/detail.vue index 1e37593..0ba9fa9 100644 --- a/web/src/views/basic/ower/main/detail.vue +++ b/web/src/views/basic/ower/main/detail.vue @@ -64,16 +64,6 @@ 暂无上传 - - - 账号状态 - -
- - {{ detail.info.status ? '正常' : '冻结' }} - -
- 是否关注公众号 diff --git a/web/src/views/basic/ower/main/list.vue b/web/src/views/basic/ower/main/list.vue index ea40e2e..3e6df72 100644 --- a/web/src/views/basic/ower/main/list.vue +++ b/web/src/views/basic/ower/main/list.vue @@ -117,12 +117,6 @@ export default { p.row.intact ? '已完善' : '未完善' ) }, - { - title: '账号状态', - minWidth: 80, - render: (h, p) => - h(Tag, { props: { color: p.row.status ? 'success' : 'error' } }, p.row.status ? '正常' : '冻结') - }, { title: '关注公众号', minWidth: 80,