From 7bc79359a52c805a7edbe707eb86c6cb5c3cea06 Mon Sep 17 00:00:00 2001 From: lsy <18332763730@163.com> Date: Tue, 9 Jan 2018 15:08:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8jackson=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E6=8E=89=E7=A9=BA=E5=80=BC=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../upms/controller/UpmsUserController.java | 1 + .../UpmsExceptionHandlerController.java | 13 +++++++++ .../micro/fast/upms/dao/UpmsUserMapper.java | 12 +++------ .../com/micro/fast/upms/pojo/UpmsUser.java | 6 +++++ .../service/impl/UpmsUserServiceImpl.java | 6 +++++ .../main/resources/mappers/UpmsUserMapper.xml | 27 ++++++++++--------- 6 files changed, 45 insertions(+), 20 deletions(-) create mode 100644 ms/upms/src/main/java/com/micro/fast/upms/controller/handler/UpmsExceptionHandlerController.java diff --git a/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsUserController.java b/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsUserController.java index 80ce50a..4ab540e 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsUserController.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsUserController.java @@ -5,6 +5,7 @@ import com.micro.fast.common.response.ServerResponse; import com.micro.fast.upms.pojo.UpmsUser; import com.micro.fast.upms.service.UpmsUserService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.validation.BindingResult; import org.springframework.validation.FieldError; import org.springframework.web.bind.annotation.PostMapping; diff --git a/ms/upms/src/main/java/com/micro/fast/upms/controller/handler/UpmsExceptionHandlerController.java b/ms/upms/src/main/java/com/micro/fast/upms/controller/handler/UpmsExceptionHandlerController.java new file mode 100644 index 0000000..765f06f --- /dev/null +++ b/ms/upms/src/main/java/com/micro/fast/upms/controller/handler/UpmsExceptionHandlerController.java @@ -0,0 +1,13 @@ +package com.micro.fast.upms.controller.handler; + +import com.micro.fast.common.exception.handler.BaseExceptionHandlerController; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +/** + * upms异常处理基类 + * @author lsy + */ +@RestControllerAdvice(basePackages = {"com.micro.fast.upms.controller"}) +public class UpmsExceptionHandlerController extends BaseExceptionHandlerController{ + +} diff --git a/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserMapper.java b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserMapper.java index ede245a..9e7099c 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserMapper.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserMapper.java @@ -11,12 +11,14 @@ public interface UpmsUserMapper { int insert(UpmsUser record); - - int insertSelective(UpmsUser record); UpmsUser selectByPrimaryKey(Integer id); + int updateByPrimaryKeySelective(UpmsUser record); + + int updateByPrimaryKey(UpmsUser record); + /** * 根据用户名查找用户 * @param username 用户名 @@ -37,10 +39,4 @@ public interface UpmsUserMapper { * @return */ int countEmail(String email); - - int updateByPrimaryKeySelective(UpmsUser record); - - int updateByPrimaryKey(UpmsUser record); - - } \ No newline at end of file diff --git a/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUser.java b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUser.java index d5fe1d8..d8c4536 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUser.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUser.java @@ -1,23 +1,28 @@ package com.micro.fast.upms.pojo; +import com.fasterxml.jackson.annotation.JsonInclude; import com.micro.fast.common.response.BaseConst; import org.hibernate.validator.constraints.Email; +import org.hibernate.validator.constraints.NotBlank; import javax.validation.constraints.Pattern; import java.io.Serializable; +@JsonInclude(JsonInclude.Include.NON_EMPTY) public class UpmsUser implements Serializable { private Integer id; /** * 用户名必须为6-16位字母或数字的组合 */ + @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请按要求输入用户名") @Pattern(regexp = "^[a-z,A-Z,0-9]{6,16}$",message = BaseConst.BASEMSG_PREFIX+"请按要求输入用户名") private String username; /** * 密码必须为6-16位字母或数字的组合 */ + @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请按要求输入密码") @Pattern(regexp = "^[a-z,A-Z,0-9]{6,16}$",message = BaseConst.BASEMSG_PREFIX+"请按要求输入密码") private String password; @@ -29,6 +34,7 @@ public class UpmsUser implements Serializable { private String phone; + @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请按要求输入邮箱") @Email(message = BaseConst.BASEMSG_PREFIX+"邮箱格式不正确") private String email; diff --git a/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserServiceImpl.java b/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserServiceImpl.java index 8760cde..5ad62ef 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserServiceImpl.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserServiceImpl.java @@ -8,6 +8,7 @@ import com.micro.fast.upms.pojo.UpmsUser; import com.micro.fast.upms.service.UpmsUserService; import com.micro.fast.util.ExceptionUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import com.micro.fast.common.response.BaseConst.*; @@ -17,6 +18,9 @@ import com.micro.fast.common.response.BaseConst.*; @Service(value = "upmsUserServiceImpl") public class UpmsUserServiceImpl implements UpmsUserService { + @Autowired + private PasswordEncoder passwordEncoder; + @Autowired private UpmsUserMapper upmsUserMapper; @@ -45,6 +49,8 @@ public class UpmsUserServiceImpl implements UpmsUserService { ,UserResponse.EMAIL_IS_HAVE.getMsg())); } upmsUser.setCtime(Long.valueOf(System.currentTimeMillis())); + //对密码进行加密处理 + upmsUser.setPassword(passwordEncoder.encode(upmsUser.getPassword())); int i = upmsUserMapper.insertSelective(upmsUser); //是否插入成功 if (i<1){ diff --git a/ms/upms/src/main/resources/mappers/UpmsUserMapper.xml b/ms/upms/src/main/resources/mappers/UpmsUserMapper.xml index 4246b0f..250b8bb 100644 --- a/ms/upms/src/main/resources/mappers/UpmsUserMapper.xml +++ b/ms/upms/src/main/resources/mappers/UpmsUserMapper.xml @@ -25,18 +25,6 @@ from upms_user where id = #{id,jdbcType=INTEGER} - - - delete from upms_user where id = #{id,jdbcType=INTEGER} @@ -174,4 +162,19 @@ ctime = #{ctime,jdbcType=BIGINT} where id = #{id,jdbcType=INTEGER} + + + + + + \ No newline at end of file