From 0702c48c75bb909df85af96d162828b6b982bb10 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 26 Apr 2021 17:26:47 +0800
Subject: [PATCH] 验证码类常量
---
screen-api/src/main/resources/mapper/UserMapper.xml | 4 ++--
screen-api/src/main/java/com/moral/api/controller/LoginController.java | 22 +++++-----------------
screen-common/src/main/java/com/moral/constant/Constants.java | 18 ++++++++++--------
3 files changed, 17 insertions(+), 27 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/LoginController.java b/screen-api/src/main/java/com/moral/api/controller/LoginController.java
index a0f2a98..2f34eee 100644
--- a/screen-api/src/main/java/com/moral/api/controller/LoginController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/LoginController.java
@@ -72,28 +72,16 @@
return ResultMessage.ok();
}
- /**
- * @Description: ���������������������������
- * @Param: []
- * @return: com.moral.constant.ResultMessage
- * @Author: ���������
- * @Date: 2021/3/18
- */
-
@ApiOperation(value = "���������������������������", notes = "���������������������������")
@RequestMapping(value = "verificationCode/config", method = RequestMethod.GET)
- public void verifyConfig(HttpServletResponse response) {
+ public ResultMessage verifyConfig(HttpServletResponse response) {
QueryWrapper<SysConfig> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("type", Constants.VERIFICATION_TYPE);
+ queryWrapper.eq(Constants.FRONT_VERIFICATIONCODE_COLUMN, Constants.FRONT_ERIFICATIONCODE_VALUE);
SysConfig sysConfig = sysConfigService.getOne(queryWrapper);
- String code = sysConfig.getCode();
- if (Constants.VERFICATIONCODE_OPEN.equals(code)) {
- try {
- response.sendRedirect("/verificationCode/get");
- } catch (IOException e) {
- e.printStackTrace();
- }
+ if (Constants.VERFICATIONCODE_OPEN.equals(sysConfig.getCode())) {
+ return new ResultMessage(ResponseCodeEnum.VERIFICATION_OPEN,null);
}
+ return new ResultMessage(ResponseCodeEnum.VERIFICATION_CLOSE,null);
}
@ApiOperation(value = "���������������", notes = "���������������")
diff --git a/screen-api/src/main/resources/mapper/UserMapper.xml b/screen-api/src/main/resources/mapper/UserMapper.xml
index bf95aac..0dc1aca 100644
--- a/screen-api/src/main/resources/mapper/UserMapper.xml
+++ b/screen-api/src/main/resources/mapper/UserMapper.xml
@@ -25,7 +25,7 @@
<result column="id" property="id" jdbcType="INTEGER"/>
<result column="name" property="name" jdbcType="VARCHAR"/>
<result column="location_level_code" property="locationLevelCode"/>
- <result column="org_expire_ime" property="expireTime"/>
+ <result column="org_expire_time" property="expireTime"/>
</association>
<!--���������-->
<collection property="groups" ofType="com.moral.api.entity.Group" javaType="java.util.ArrayList">
@@ -37,7 +37,7 @@
<!--������������������������������������������-->
<select id="selectUserInfo" resultMap="userInfoMap">
SELECT u.id, u.account, u.password, u.user_name, u.email, u.mobile, u.wechat ,u.organization_id, u.expire_time, u.is_delete,u.is_Admin,
- o.name, o.location_level_code, o.expire_time org_expire_ime,
+ o.name, o.location_level_code, o.expire_time org_expire_time,
a.id group_id , a.group_name
FROM `user` u
LEFT JOIN
diff --git a/screen-common/src/main/java/com/moral/constant/Constants.java b/screen-common/src/main/java/com/moral/constant/Constants.java
index 6d04865..c7ae5cc 100644
--- a/screen-common/src/main/java/com/moral/constant/Constants.java
+++ b/screen-common/src/main/java/com/moral/constant/Constants.java
@@ -20,9 +20,19 @@
public static final String MANAGE_VERIFICATIONCODE_COLUMN = "type";
/*
+ * web������������������������������
+ * */
+ public static final String FRONT_VERIFICATIONCODE_COLUMN = "type";
+
+ /*
* ������������������������������������
* */
public static final String MANAGE_VERIFICATIONCODE_VALUE = "manage_verificationCode";
+
+ /*
+ * web������������������������
+ * */
+ public static final String FRONT_ERIFICATIONCODE_VALUE = "front_verificationCode";
/*
* ���������������������
@@ -55,11 +65,6 @@
public static final Integer WEB_CHANNEL = 1;
/*
- * web������������������������
- * */
- public static final String VERIFICATION_TYPE = "front_verificationCode";
-
- /*
* ������������������
* */
public static final String LOGIN_OPERTATE_TYPE = "0";
@@ -78,9 +83,6 @@
* ������������������
* */
public static final String DELETE_OPERATE_TYPE = "3";
-
-
-
}
--
Gitblit v1.8.0