From 25aeb531c8064ca768bb2d6f179ec7411b824b43 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 25 Mar 2021 17:33:27 +0800
Subject: [PATCH] 增加验证码配置常量，特殊字段名映射
---
screen-api/src/main/resources/mapper/UserMapper.xml | 2
screen-api/src/main/java/com/moral/api/controller/MenuController.java | 18 +----
screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java | 6 -
screen-api/src/main/java/com/moral/api/controller/LoginController.java | 15 ++--
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 15 ++--
screen-api/src/main/java/com/moral/api/controller/UserController.java | 29 +++++----
screen-manage/src/main/java/com/moral/api/entity/SysConfig.java | 4
screen-api/src/main/java/com/moral/api/controller/GroupController.java | 40 ++++--------
screen-api/src/main/java/com/moral/api/entity/SysConfig.java | 11 ++-
screen-api/src/main/java/com/moral/api/service/UserService.java | 4
screen-api/src/main/java/com/moral/api/mapper/UserMapper.java | 8 --
screen-api/src/main/java/com/moral/api/pojo/UserBO.java | 2
screen-common/src/main/java/com/moral/constant/Constants.java | 9 +++
13 files changed, 75 insertions(+), 88 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/GroupController.java b/screen-api/src/main/java/com/moral/api/controller/GroupController.java
index e4d3734..d1aa64d 100644
--- a/screen-api/src/main/java/com/moral/api/controller/GroupController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/GroupController.java
@@ -6,13 +6,12 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@@ -41,11 +40,10 @@
@ApiOperation(value = "���������", notes = "���������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "groupName", value = "������", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
@RequestMapping(value = "addGroup", method = RequestMethod.POST)
- private ResultMessage addGroup(Group group, HttpServletRequest request) {
+ private ResultMessage addGroup(@RequestBody Group group, HttpServletRequest request) {
if (group.getGroupName().isEmpty()) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
@@ -60,16 +58,16 @@
@ApiOperation(value = "���������", notes = "���������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "groupId", value = "���id", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
@RequestMapping(value = "deleteGroup", method = RequestMethod.POST)
- public ResultMessage deleteGroup(String groupId) {
- if (groupId == null) {
- return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ public ResultMessage deleteGroup(@RequestBody Map<String, Object> parameters) {
+ if (!parameters.containsKey("groupId")) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
QueryWrapper<Group> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id", groupId);
+ queryWrapper.eq("id", parameters.get("groupId"));
Group group = groupService.getOne(queryWrapper);
if (group == null) {
return ResultMessage.fail(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode(), ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
@@ -80,11 +78,10 @@
@ApiOperation(value = "���������������", notes = "���������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "groupName", value = "������", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
@RequestMapping(value = "updateGroup", method = RequestMethod.POST)
- public ResultMessage updateUser(Group group, HttpServletRequest request) {
+ public ResultMessage updateUser(@RequestBody Group group, HttpServletRequest request) {
String token = request.getHeader("token");
Map<String, Object> result = groupService.updateGroup(group, token);
if (!result.isEmpty()) {
@@ -95,15 +92,14 @@
@ApiOperation(value = "���������������������", notes = "���������������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "page", value = "���������", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "size", value = "������������", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "page", value = "���������", required = false, paramType = "query", dataType = "Integer"),
+ @ApiImplicitParam(name = "size", value = "������������", required = false, paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "order", value = "������������", required = false, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
@ApiImplicitParam(name = "groupName", value = "������������������", required = false, paramType = "query", dataType = "String")
})
@RequestMapping(value = "selectGroups", method = RequestMethod.POST)
- public ResultMessage selectGroups(HttpServletRequest request) {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ public ResultMessage selectGroups(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
parameters.put("token", request.getHeader("token"));
Page<Group> userPage = groupService.selectGroups(parameters);
PageResult<Group> pageResult = new PageResult<>(
@@ -114,23 +110,15 @@
@ApiOperation(value = "���������������", notes = "���������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "userId", value = "������id", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "groupIds", value = "���id,������������������", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
@RequestMapping(value = "allotGroups", method = RequestMethod.POST)
- public ResultMessage allotGroups(HttpServletRequest request) {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ public ResultMessage allotGroups(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
if (!parameters.containsKey("userId")) {
- return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
String token = request.getHeader("token");
- String[] groupIds = parameters.get("groupIds").toString().split(",");
- List<Integer> gIds = new ArrayList<>();
- for (String groupId : groupIds) {
- gIds.add(Integer.parseInt(groupId));
- }
- parameters.put("groupIds", gIds);
userGroupService.allotGroups(parameters, token);
return ResultMessage.ok();
}
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 cb1862a..dfb403e 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
@@ -45,7 +45,8 @@
@RequestMapping(value = "login", method = RequestMethod.POST)
public ResultMessage login(@RequestBody Map<String, Object> parameters) {
if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {
- return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
Map<String, Object> result = userService.login(parameters);
if (!result.containsKey("data")) {
@@ -57,15 +58,15 @@
@ApiOperation(value = "������", notes = "������")
@RequestMapping(value = "logout", method = RequestMethod.POST)
@ApiImplicitParams({
- @ApiImplicitParam(name = "uid", value = "������id", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
- public ResultMessage logout(String uid, HttpServletRequest request) {
- if (uid == null) {
- return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ public ResultMessage logout(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
+ if (!parameters.containsKey("uid")) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
String token = request.getHeader("token");
- TokenUtils.destoryToken(uid, token);
+ TokenUtils.destoryToken(parameters.get("uid").toString(), token);
return ResultMessage.ok();
}
@@ -84,7 +85,7 @@
queryWrapper.eq("type", Constants.VERIFICATION_TYPE);
SysConfig sysConfig = sysConfigService.getOne(queryWrapper);
String code = sysConfig.getCode();
- if (Constants.VERIFICATION_OPEN_CODE.equals(code)) {
+ if (Constants.VERFICATIONCODE_OPEN.equals(code)) {
try {
response.sendRedirect("/verificationCode/get");
} catch (IOException e) {
diff --git a/screen-api/src/main/java/com/moral/api/controller/MenuController.java b/screen-api/src/main/java/com/moral/api/controller/MenuController.java
index 10d52e6..1ee1f1a 100644
--- a/screen-api/src/main/java/com/moral/api/controller/MenuController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/MenuController.java
@@ -6,13 +6,12 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@@ -22,7 +21,6 @@
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.util.TokenUtils;
-import com.moral.util.WebUtils;
@Slf4j
@Api(tags = {"������"})
@@ -38,23 +36,15 @@
@ApiOperation(value = "���������������", notes = "���������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "groupId", value = "���id", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "menuIds", value = "������id,������������������", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
@RequestMapping(value = "allotMenus", method = RequestMethod.POST)
- public ResultMessage allotMenus(HttpServletRequest request) {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ public ResultMessage allotMenus(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
if (!parameters.containsKey("groupId")) {
- return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
String token = request.getHeader("token");
- String[] menuIds = parameters.get("menuIds").toString().split(",");
- List<Integer> mIds = new ArrayList<>();
- for (String menuId : menuIds) {
- mIds.add(Integer.parseInt(menuId));
- }
- parameters.put("menuIds", mIds);
groupMenuService.allotMenus(parameters, token);
return ResultMessage.ok();
}
diff --git a/screen-api/src/main/java/com/moral/api/controller/UserController.java b/screen-api/src/main/java/com/moral/api/controller/UserController.java
index 41e3d80..ceffe70 100644
--- a/screen-api/src/main/java/com/moral/api/controller/UserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/UserController.java
@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+
import lombok.extern.slf4j.Slf4j;
import java.util.Map;
@@ -23,7 +24,6 @@
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.util.PageResult;
-import com.moral.util.WebUtils;
@Slf4j
@Api(tags = {"������"})
@@ -54,18 +54,20 @@
@ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "userId", value = "������id", required = true, paramType = "query", dataType = "String")
+ @ApiImplicitParam(name = "userId", value = "������id", required = true, paramType = "query", dataType = "Integer")
})
@RequestMapping(value = "deleteUser", method = RequestMethod.POST)
- public ResultMessage deleteUser(String userId) {
- if (userId == null) {
- return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ public ResultMessage deleteUser(@RequestBody Map<String, Object> parameters) {
+ if (!parameters.containsKey("uid")) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
QueryWrapper<User> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id", userId);
+ queryWrapper.eq("id", parameters.get("uid"));
User user = userService.getOne(queryWrapper);
if (user == null) {
- return ResultMessage.fail(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode(), ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
+ return ResultMessage.fail(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode(),
+ ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
}
userService.deleteUser(user);
return ResultMessage.ok();
@@ -91,20 +93,19 @@
@ApiOperation(value = "������������������������", notes = "������������������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "page", value = "���������", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "size", value = "������������", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "page", value = "���������", required = false, paramType = "query", dataType = "Integer"),
+ @ApiImplicitParam(name = "size", value = "������������", required = false, paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "order", value = "������������", required = false, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
@ApiImplicitParam(name = "account", value = "������������������", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "userName", value = "���������������������", required = false, paramType = "header", dataType = "String"),
+ @ApiImplicitParam(name = "userName", value = "���������������������", required = false, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "mobile", value = "���������������������", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "email", value = "������������������", required = false, paramType = "header", dataType = "String"),
- @ApiImplicitParam(name = "wechat", value = "������������������", required = false, paramType = "header", dataType = "String"),
+ @ApiImplicitParam(name = "email", value = "������������������", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "wechat", value = "������������������", required = false, paramType = "query", dataType = "String"),
})
@RequestMapping(value = "selectUsers", method = RequestMethod.POST)
- public ResultMessage selectUsers(HttpServletRequest request) {
- Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ public ResultMessage selectUsers(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
parameters.put("token", request.getHeader("token"));
Page<User> userPage = userService.selectUsers(parameters);
PageResult<User> pageResult = new PageResult<>(
diff --git a/screen-api/src/main/java/com/moral/api/entity/SysConfig.java b/screen-api/src/main/java/com/moral/api/entity/SysConfig.java
index dd0a1f3..30d0e9d 100644
--- a/screen-api/src/main/java/com/moral/api/entity/SysConfig.java
+++ b/screen-api/src/main/java/com/moral/api/entity/SysConfig.java
@@ -1,10 +1,13 @@
package com.moral.api.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+
import java.io.Serializable;
+import java.util.Date;
+
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -36,22 +39,24 @@
/**
* ���������
*/
+ @TableField(value = "`code`")
private String code;
/**
* ������
*/
+ @TableField(value = "`desc`")
private String desc;
/**
* ������������
*/
- private LocalDateTime createTime;
+ private Date createTime;
/**
* ������������
*/
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* ������������
diff --git a/screen-api/src/main/java/com/moral/api/mapper/UserMapper.java b/screen-api/src/main/java/com/moral/api/mapper/UserMapper.java
index 4c42c13..e906e2c 100644
--- a/screen-api/src/main/java/com/moral/api/mapper/UserMapper.java
+++ b/screen-api/src/main/java/com/moral/api/mapper/UserMapper.java
@@ -1,11 +1,10 @@
package com.moral.api.mapper;
-import java.util.List;
import java.util.Map;
import com.moral.api.entity.User;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.moral.api.pojo.UserBo;
+import com.moral.api.pojo.UserBO;
/**
* <p>
@@ -17,9 +16,6 @@
*/
public interface UserMapper extends BaseMapper<User> {
- List<Map<String, Object>> selectUsers(Map<String, Object> parameters);
+ UserBO selectUserInfo(Map<String, Object> parameters);
- UserBo selectUserInfo(Map<String, Object> parameters);
-
- User selectUser(Map<String, Object> parameters);
}
diff --git a/screen-api/src/main/java/com/moral/api/pojo/UserBo.java b/screen-api/src/main/java/com/moral/api/pojo/UserBO.java
similarity index 92%
rename from screen-api/src/main/java/com/moral/api/pojo/UserBo.java
rename to screen-api/src/main/java/com/moral/api/pojo/UserBO.java
index 5afb5e9..f642a34 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/UserBo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/UserBO.java
@@ -14,7 +14,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
-public class UserBo extends User {
+public class UserBO extends User {
@Transient
private Organization organization;
diff --git a/screen-api/src/main/java/com/moral/api/service/UserService.java b/screen-api/src/main/java/com/moral/api/service/UserService.java
index 2af3654..1b2961c 100644
--- a/screen-api/src/main/java/com/moral/api/service/UserService.java
+++ b/screen-api/src/main/java/com/moral/api/service/UserService.java
@@ -7,7 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.User;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.moral.api.pojo.UserBo;
+import com.moral.api.pojo.UserBO;
/**
* <p>
@@ -31,6 +31,6 @@
Page<User> selectUsers(Map<String, Object> parameters);
- UserBo selectUserInfo(Map<String, Object> parameters);
+ UserBO selectUserInfo(Map<String, Object> parameters);
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
index 366b14d..ce249a6 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
@@ -133,10 +133,8 @@
} else {
queryWrapper.orderByAsc(order.toString(), "id");
}
- Page<Group> groupPage = groupMapper.selectPage(pageData, queryWrapper);
-
- pageData.setRecords(groupPage.getRecords());
- return groupPage;
+ groupMapper.selectPage(pageData, queryWrapper);
+ return pageData;
}
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index 8263599..fe6e20a 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -21,7 +21,7 @@
import com.moral.api.mapper.MenuMapper;
import com.moral.api.mapper.UserGroupMapper;
import com.moral.api.mapper.UserMapper;
-import com.moral.api.pojo.UserBo;
+import com.moral.api.pojo.UserBO;
import com.moral.api.service.UserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
@@ -60,13 +60,13 @@
private String AESKey;
@Override
- public UserBo selectUserInfo(Map<String, Object> parameters) {
+ public UserBO selectUserInfo(Map<String, Object> parameters) {
return userMapper.selectUserInfo(parameters);
}
@Override
public Map<String, Object> login(Map<String, Object> parameters) {
- UserBo userBo = selectUserInfo(parameters);
+ UserBO userBo = selectUserInfo(parameters);
Map<String, Object> result = new HashMap<>();
//������������
if (userBo == null) {
@@ -357,8 +357,8 @@
queryWrapper.like("wechat", wechat);
}
- int page = Integer.parseInt(parameters.get("page").toString());
- int size = Integer.parseInt(parameters.get("size").toString());
+ Integer page = (Integer) parameters.get("page");
+ Integer size = (Integer) parameters.get("size");
Page<User> pageData = new Page<>(page, size);
//������������,������id������
if (order == null) {
@@ -366,9 +366,8 @@
} else {
queryWrapper.orderByAsc(order.toString(), "id");
}
- Page<User> userPage = userMapper.selectPage(pageData, queryWrapper);
- pageData.setRecords(userPage.getRecords());
- return userPage;
+ userMapper.selectPage(pageData, queryWrapper);
+ return pageData;
}
}
diff --git a/screen-api/src/main/resources/mapper/UserMapper.xml b/screen-api/src/main/resources/mapper/UserMapper.xml
index b0852eb..532a523 100644
--- a/screen-api/src/main/resources/mapper/UserMapper.xml
+++ b/screen-api/src/main/resources/mapper/UserMapper.xml
@@ -19,7 +19,7 @@
<result column="is_delete" property="isDelete"/>
</resultMap>
- <resultMap id="userInfoMap" type="com.moral.api.pojo.UserBo" extends="BaseResultMap">
+ <resultMap id="userInfoMap" type="com.moral.api.pojo.UserBO" extends="BaseResultMap">
<!--������������-->
<association property="organization" javaType="com.moral.api.entity.Organization">
<result column="id" property="id" jdbcType="INTEGER"/>
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 7c1ed66..4a56f3f 100644
--- a/screen-common/src/main/java/com/moral/constant/Constants.java
+++ b/screen-common/src/main/java/com/moral/constant/Constants.java
@@ -49,5 +49,14 @@
* */
public static Integer DELETE_CHILDREN_ORG = 1;
+ /*
+ * web���������
+ * */
public static Integer WEB_CHANNEL = 1;
+
+ /*
+ * web������������������������
+ * */
+ public static String VERIFICATION_TYPE = "front_verificationCode";
+
}
diff --git a/screen-manage/src/main/java/com/moral/api/entity/SysConfig.java b/screen-manage/src/main/java/com/moral/api/entity/SysConfig.java
index f3f717d..0afcbde 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/SysConfig.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/SysConfig.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
import java.io.Serializable;
import java.util.Date;
@@ -39,12 +38,13 @@
/**
* ���������
*/
+ @TableField(value = "`code`")
private String code;
/**
* ������
*/
- @TableField("`desc`")
+ @TableField(value = "`desc`")
private String desc;
/**
--
Gitblit v1.8.0