diff --git a/boot-service/pom.xml b/boot-service/pom.xml index 52a95b3..2698e50 100644 --- a/boot-service/pom.xml +++ b/boot-service/pom.xml @@ -10,17 +10,17 @@ 4.0.0 boot-service - - nexus - drore Team nexus - http://192.168.11.110:8081/nexus/content/groups/public + + nexus-aliyun + Nexus aliyun + http://maven.aliyun.com/nexus/content/groups/public - nexus - drore Team nexus - http://192.168.11.110:8081/nexus/content/groups/public + nexus-aliyun + Nexus aliyun + http://maven.aliyun.com/nexus/content/groups/public diff --git a/boot-service/src/main/java/com/xwbing/constant/CommonConstant.java b/boot-service/src/main/java/com/xwbing/constant/CommonConstant.java index bbb7445..8272042 100644 --- a/boot-service/src/main/java/com/xwbing/constant/CommonConstant.java +++ b/boot-service/src/main/java/com/xwbing/constant/CommonConstant.java @@ -2,11 +2,15 @@ package com.xwbing.constant; /** * 说明: 公共常量 - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/10 16:36 * 作者: xiangwb */ public class CommonConstant { + /** + * 验证码 + */ + public static final String KEY_CAPTCHA = "captchaCode"; /** * 顶级 */ diff --git a/boot-service/src/main/java/com/xwbing/constant/CommonEnum.java b/boot-service/src/main/java/com/xwbing/constant/CommonEnum.java index 30b8047..014e54d 100644 --- a/boot-service/src/main/java/com/xwbing/constant/CommonEnum.java +++ b/boot-service/src/main/java/com/xwbing/constant/CommonEnum.java @@ -5,7 +5,7 @@ import java.util.stream.Collectors; /** * 说明: 公共枚举 - * 项目名称: zdemo + * 项目名称: boot-module-demo * 创建日期: 2016年12月9日 上午9:50:30 * 作者: xiangwb */ diff --git a/boot-service/src/main/java/com/xwbing/domain/BaseEntity.java b/boot-service/src/main/java/com/xwbing/entity/BaseEntity.java similarity index 82% rename from boot-service/src/main/java/com/xwbing/domain/BaseEntity.java rename to boot-service/src/main/java/com/xwbing/entity/BaseEntity.java index 9449e38..02cabc9 100644 --- a/boot-service/src/main/java/com/xwbing/domain/BaseEntity.java +++ b/boot-service/src/main/java/com/xwbing/entity/BaseEntity.java @@ -1,4 +1,4 @@ -package com.xwbing.domain; +package com.xwbing.entity; import lombok.Data; @@ -10,7 +10,7 @@ import java.util.Date; /** * 说明: 基础类 - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/10 16:36 * 作者: xiangwb */ @@ -27,7 +27,4 @@ public class BaseEntity implements Serializable { private Date createTime; @Column(name = "modified_time") private Date modifiedTime; - @Column(name = "is_deleted") - private String isDeleted; - private Integer sort; } diff --git a/boot-service/src/main/java/com/xwbing/domain/SysAuthority.java b/boot-service/src/main/java/com/xwbing/entity/SysAuthority.java similarity index 51% rename from boot-service/src/main/java/com/xwbing/domain/SysAuthority.java rename to boot-service/src/main/java/com/xwbing/entity/SysAuthority.java index 476d7f7..8578a6e 100644 --- a/boot-service/src/main/java/com/xwbing/domain/SysAuthority.java +++ b/boot-service/src/main/java/com/xwbing/entity/SysAuthority.java @@ -1,17 +1,13 @@ -package com.xwbing.domain; +package com.xwbing.entity; import lombok.Data; import lombok.EqualsAndHashCode; -import org.hibernate.validator.constraints.Length; -import org.hibernate.validator.constraints.NotBlank; -import javax.persistence.Column; import javax.persistence.Entity; -import javax.validation.constraints.Pattern; /** * 说明: 权限 - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/10 16:36 * 作者: xiangwb */ @@ -24,21 +20,14 @@ public class SysAuthority extends BaseEntity { /** * 名称 */ - @NotBlank(message = "name不能为空") - @Length(min = 1, max = 10, message = "name长度为1-10") private String name; /** * 编号 */ - @NotBlank(message = "编号不能为空") - @Length(min = 6, max = 50, message = "编号长度为6-50") private String code; /** * 是否启用 */ - @NotBlank(message = "是否启用不能为空") - @Pattern(regexp = "Y|N",message = "是否启用格式应为Y|N") - @Column(name = "is_enable") private String isEnable; /** * url地址 @@ -47,9 +36,6 @@ public class SysAuthority extends BaseEntity { /** * 父ID */ - @NotBlank(message = "父ID不能为空") - @Length(min = 6, max = 50, message = "父ID长度为6-50") - @Column(name = "parent_id") private String parentId; /** * 类型 2按钮 1菜单 diff --git a/boot-service/src/main/java/com/xwbing/domain/SysConfig.java b/boot-service/src/main/java/com/xwbing/entity/SysConfig.java similarity index 90% rename from boot-service/src/main/java/com/xwbing/domain/SysConfig.java rename to boot-service/src/main/java/com/xwbing/entity/SysConfig.java index 7fb5d38..b9f6c57 100644 --- a/boot-service/src/main/java/com/xwbing/domain/SysConfig.java +++ b/boot-service/src/main/java/com/xwbing/entity/SysConfig.java @@ -1,4 +1,4 @@ -package com.xwbing.domain; +package com.xwbing.entity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,7 +11,7 @@ import javax.validation.constraints.Pattern; /** * 说明: 系统配置 - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/10 16:36 * 作者: xiangwb */ @@ -36,7 +36,7 @@ public class SysConfig extends BaseEntity { * 是否启用 */ @NotBlank(message = "是否启用不能为空") - @Pattern(regexp = "Y|N",message = "是否启用格式为Y|N") + @Pattern(regexp = "[Y|N]",message = "是否启用格式为Y|N") @Column(name = "is_enable") private String isEnable; /** @@ -45,5 +45,4 @@ public class SysConfig extends BaseEntity { @NotBlank(message = "配置项的name不能为空") @Length(min = 1, max = 10, message = "value长度为1-10") private String name; - } diff --git a/boot-service/src/main/java/com/xwbing/domain/SysRole.java b/boot-service/src/main/java/com/xwbing/entity/SysRole.java similarity index 59% rename from boot-service/src/main/java/com/xwbing/domain/SysRole.java rename to boot-service/src/main/java/com/xwbing/entity/SysRole.java index 824588e..d0d488f 100644 --- a/boot-service/src/main/java/com/xwbing/domain/SysRole.java +++ b/boot-service/src/main/java/com/xwbing/entity/SysRole.java @@ -1,17 +1,14 @@ -package com.xwbing.domain; +package com.xwbing.entity; import lombok.Data; import lombok.EqualsAndHashCode; -import org.hibernate.validator.constraints.Length; -import org.hibernate.validator.constraints.NotBlank; import javax.persistence.Column; import javax.persistence.Entity; -import javax.validation.constraints.Pattern; /** * 说明: 角色 - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/10 16:36 * 作者: xiangwb */ @@ -24,19 +21,14 @@ public class SysRole extends BaseEntity { /** * 角色名称 */ - @NotBlank(message = "角色名称不能为空") private String name; /** * 角色编码 */ - @NotBlank(message = "角色编码不能为空") - @Length(min = 6, max = 50, message = "长度为6-20") private String code; /** * 是否启用 */ - @NotBlank(message = "是否启用不能为空") - @Pattern(regexp = "Y|N",message = "是否启用格式应为Y|N") @Column(name = "is_enable") private String isEnable; /** diff --git a/boot-service/src/main/java/com/xwbing/domain/SysRoleAuthority.java b/boot-service/src/main/java/com/xwbing/entity/SysRoleAuthority.java similarity index 76% rename from boot-service/src/main/java/com/xwbing/domain/SysRoleAuthority.java rename to boot-service/src/main/java/com/xwbing/entity/SysRoleAuthority.java index 25cf406..5a82382 100644 --- a/boot-service/src/main/java/com/xwbing/domain/SysRoleAuthority.java +++ b/boot-service/src/main/java/com/xwbing/entity/SysRoleAuthority.java @@ -1,15 +1,14 @@ -package com.xwbing.domain; +package com.xwbing.entity; import lombok.Data; import lombok.EqualsAndHashCode; -import org.hibernate.validator.constraints.NotBlank; import javax.persistence.Column; import javax.persistence.Entity; /** * 说明: 角色权限关系 - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/10 16:36 * 作者: xiangwb */ @@ -22,13 +21,11 @@ public class SysRoleAuthority extends BaseEntity { /** * 角色主键 */ - @NotBlank(message = "角色主键不能为空") @Column(name = "role_id") private String roleId; /** * 权限主键 */ - @NotBlank(message = "权限主键不能为空") @Column(name = "authority_id") private String authorityId; } diff --git a/boot-service/src/main/java/com/xwbing/domain/SysUser.java b/boot-service/src/main/java/com/xwbing/entity/SysUser.java similarity index 79% rename from boot-service/src/main/java/com/xwbing/domain/SysUser.java rename to boot-service/src/main/java/com/xwbing/entity/SysUser.java index 4a38564..7e46ccb 100644 --- a/boot-service/src/main/java/com/xwbing/domain/SysUser.java +++ b/boot-service/src/main/java/com/xwbing/entity/SysUser.java @@ -1,4 +1,4 @@ -package com.xwbing.domain; +package com.xwbing.entity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -9,11 +9,10 @@ import org.hibernate.validator.constraints.NotBlank; import javax.persistence.Column; import javax.persistence.Entity; import javax.validation.constraints.Pattern; -import java.util.Date; /** * 说明: 用户 - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/10 16:36 * 作者: xiangwb */ @@ -45,6 +44,8 @@ public class SysUser extends BaseEntity { /** * 姓名 */ + @NotBlank(message = "姓名不能为空") + @Length(min = 1, max = 20, message = "长度为1-5") private String name; /** * 盐值 @@ -54,16 +55,6 @@ public class SysUser extends BaseEntity { * 密码 */ private String password; - /** - * 最后登录IP - */ - @Column(name = "last_login_ip") - private String lastLoginIp; - /** - * 最后登录时间 - */ - @Column(name = "last_login_time") - private Date lastLoginTime; /** * 邮箱 */ @@ -75,9 +66,4 @@ public class SysUser extends BaseEntity { @NotBlank @Pattern(regexp = "[01]", message = "性别格式为0|1,0代表女,1代表男") private String sex; - /** - * 是否管理员 - */ - @Column(name = "is_admin") - private String isAdmin; } diff --git a/boot-service/src/main/java/com/xwbing/domain/SysUserRole.java b/boot-service/src/main/java/com/xwbing/entity/SysUserRole.java similarity index 75% rename from boot-service/src/main/java/com/xwbing/domain/SysUserRole.java rename to boot-service/src/main/java/com/xwbing/entity/SysUserRole.java index d2ff42c..983455f 100644 --- a/boot-service/src/main/java/com/xwbing/domain/SysUserRole.java +++ b/boot-service/src/main/java/com/xwbing/entity/SysUserRole.java @@ -1,15 +1,14 @@ -package com.xwbing.domain; +package com.xwbing.entity; import lombok.Data; import lombok.EqualsAndHashCode; -import org.hibernate.validator.constraints.NotBlank; import javax.persistence.Column; import javax.persistence.Entity; /** * 说明: 用户角色关系 - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/10 16:36 * 作者: xiangwb */ @@ -22,13 +21,11 @@ public class SysUserRole extends BaseEntity { /** * 用户主键 */ - @NotBlank(message = "用户主键不能为空") @Column(name = "user_id") private String userId; /** * 角色主键 */ - @NotBlank(message = "角色主键不能为空") @Column(name = "role_id") private String roleId; } diff --git a/boot-service/src/main/java/com/xwbing/domain/model/EmailModel.java b/boot-service/src/main/java/com/xwbing/entity/model/EmailModel.java similarity index 97% rename from boot-service/src/main/java/com/xwbing/domain/model/EmailModel.java rename to boot-service/src/main/java/com/xwbing/entity/model/EmailModel.java index 38427e7..74d6c7e 100644 --- a/boot-service/src/main/java/com/xwbing/domain/model/EmailModel.java +++ b/boot-service/src/main/java/com/xwbing/entity/model/EmailModel.java @@ -1,10 +1,10 @@ -package com.xwbing.domain.model; +package com.xwbing.entity.model; import java.util.Date; /** * 说明: 邮箱属性 - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/10 16:36 * 作者: xiangwb */ diff --git a/boot-service/src/main/java/com/xwbing/domain/model/ValidateModel.java b/boot-service/src/main/java/com/xwbing/entity/model/ValidateModel.java similarity index 97% rename from boot-service/src/main/java/com/xwbing/domain/model/ValidateModel.java rename to boot-service/src/main/java/com/xwbing/entity/model/ValidateModel.java index adc46cf..7a0c1c2 100644 --- a/boot-service/src/main/java/com/xwbing/domain/model/ValidateModel.java +++ b/boot-service/src/main/java/com/xwbing/entity/model/ValidateModel.java @@ -1,4 +1,4 @@ -package com.xwbing.domain.model; +package com.xwbing.entity.model; import org.hibernate.validator.constraints.Email; import org.hibernate.validator.constraints.Length; @@ -14,7 +14,7 @@ import java.util.Date; /** * 说明: hibernate validate JSR303校验框架 * controller层新增或更新的实体前加@Valid注解 - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/17 16:13 * 作者: xiangwb */ diff --git a/boot-service/src/main/java/com/xwbing/exception/BusinessException.java b/boot-service/src/main/java/com/xwbing/exception/BusinessException.java index 3705069..af1fefc 100644 --- a/boot-service/src/main/java/com/xwbing/exception/BusinessException.java +++ b/boot-service/src/main/java/com/xwbing/exception/BusinessException.java @@ -2,7 +2,7 @@ package com.xwbing.exception; /** * 说明: 自定义业务异常 - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/10 16:36 * 作者: xiangwb */ diff --git a/boot-service/src/main/java/com/xwbing/exception/UserNotLoginException.java b/boot-service/src/main/java/com/xwbing/exception/UserNotLoginException.java index 31d95df..933f3ee 100644 --- a/boot-service/src/main/java/com/xwbing/exception/UserNotLoginException.java +++ b/boot-service/src/main/java/com/xwbing/exception/UserNotLoginException.java @@ -8,7 +8,7 @@ package com.xwbing.exception; /** * 说明: 用户系统中未登陆异常 - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/10 16:36 * 作者: xiangwb */ diff --git a/boot-service/src/main/java/com/xwbing/redis/RedisConfig.java b/boot-service/src/main/java/com/xwbing/redis/RedisConfig.java index 0c9c295..3358a67 100644 --- a/boot-service/src/main/java/com/xwbing/redis/RedisConfig.java +++ b/boot-service/src/main/java/com/xwbing/redis/RedisConfig.java @@ -10,7 +10,7 @@ import redis.clients.jedis.JedisPoolConfig; /** * 说明: redisConfig - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/5 16:44 * 作者: xiangwb */ diff --git a/boot-service/src/main/java/com/xwbing/redis/RedisService.java b/boot-service/src/main/java/com/xwbing/redis/RedisService.java index aebe11a..269f7e3 100644 --- a/boot-service/src/main/java/com/xwbing/redis/RedisService.java +++ b/boot-service/src/main/java/com/xwbing/redis/RedisService.java @@ -2,7 +2,7 @@ package com.xwbing.redis; /** * 说明: 封装redis 缓存服务器服务接口 - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/5 16:44 * 作者: xiangwb */ diff --git a/boot-service/src/main/java/com/xwbing/redis/RedisStartupInit.java b/boot-service/src/main/java/com/xwbing/redis/RedisStartupInit.java index c664a00..0dd85e0 100644 --- a/boot-service/src/main/java/com/xwbing/redis/RedisStartupInit.java +++ b/boot-service/src/main/java/com/xwbing/redis/RedisStartupInit.java @@ -13,7 +13,7 @@ import java.util.Set; /** * 说明: 启动时刷新redis缓存 - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/5 16:44 * 作者: xiangwb */ diff --git a/boot-service/src/main/java/com/xwbing/repository/AuthorityRepository.java b/boot-service/src/main/java/com/xwbing/repository/AuthorityRepository.java index dfce6b2..11fd93c 100644 --- a/boot-service/src/main/java/com/xwbing/repository/AuthorityRepository.java +++ b/boot-service/src/main/java/com/xwbing/repository/AuthorityRepository.java @@ -1,10 +1,13 @@ package com.xwbing.repository; -import com.xwbing.domain.SysAuthority; +import com.xwbing.entity.SysAuthority; import org.springframework.data.jpa.repository.JpaRepository; /** - * + * 说明: + * 项目名称: boot-module-demo + * 创建时间: 2017/5/5 16:44 + * 作者: xiangwb */ public interface AuthorityRepository extends JpaRepository { } diff --git a/boot-service/src/main/java/com/xwbing/repository/RoleRepository.java b/boot-service/src/main/java/com/xwbing/repository/RoleRepository.java index 6fdbece..2f76947 100644 --- a/boot-service/src/main/java/com/xwbing/repository/RoleRepository.java +++ b/boot-service/src/main/java/com/xwbing/repository/RoleRepository.java @@ -1,10 +1,13 @@ package com.xwbing.repository; -import com.xwbing.domain.SysRole; +import com.xwbing.entity.SysRole; import org.springframework.data.jpa.repository.JpaRepository; /** - * Created by admin on 2017/4/11. + * 说明: + * 项目名称: boot-module-demo + * 创建时间: 2017/5/5 16:44 + * 作者: xiangwb */ public interface RoleRepository extends JpaRepository { } diff --git a/boot-service/src/main/java/com/xwbing/repository/SysConfigRepository.java b/boot-service/src/main/java/com/xwbing/repository/SysConfigRepository.java index 3a1671a..1f41ea3 100644 --- a/boot-service/src/main/java/com/xwbing/repository/SysConfigRepository.java +++ b/boot-service/src/main/java/com/xwbing/repository/SysConfigRepository.java @@ -1,14 +1,13 @@ package com.xwbing.repository; -import com.xwbing.domain.SysConfig; +import com.xwbing.entity.SysConfig; import org.springframework.data.jpa.repository.JpaRepository; /** - * 浙江卓锐科技股份有限公司 版权所有 ? Copyright 2016
- * 说明:
- * 项目名称: ${project_name}
- * 创建日期: ${date} ${time}
- * 作者: wdz + * 说明: + * 项目名称: boot-module-demo + * 创建时间: 2017/5/5 16:44 + * 作者: xiangwb */ public interface SysConfigRepository extends JpaRepository { SysConfig findByCode(String code); diff --git a/boot-service/src/main/java/com/xwbing/repository/UserRepository.java b/boot-service/src/main/java/com/xwbing/repository/UserRepository.java index 473bb58..e9e5679 100644 --- a/boot-service/src/main/java/com/xwbing/repository/UserRepository.java +++ b/boot-service/src/main/java/com/xwbing/repository/UserRepository.java @@ -1,11 +1,13 @@ package com.xwbing.repository; -import com.xwbing.domain.SysUser; +import com.xwbing.entity.SysUser; import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - +/** + * 说明: + * 项目名称: boot-module-demo + * 创建时间: 2017/5/5 16:44 + * 作者: xiangwb + */ public interface UserRepository extends JpaRepository { - List findByUserName(String userName); - + SysUser findByUserName(String name); } diff --git a/boot-service/src/main/java/com/xwbing/service/BaseService.java b/boot-service/src/main/java/com/xwbing/service/BaseService.java index d142fa6..8c74c9a 100644 --- a/boot-service/src/main/java/com/xwbing/service/BaseService.java +++ b/boot-service/src/main/java/com/xwbing/service/BaseService.java @@ -9,7 +9,7 @@ import java.util.Objects; /** * 说明: - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/5 16:44 * 作者: xiangwb */ @@ -26,10 +26,10 @@ public class BaseService { RestMessage result=new RestMessage(); t=jpaRepository.save(t); if(Objects.isNull(t)){ - result.setMsg("保存数据失败"); + result.setMessage("保存数据失败"); }else { result.setSuccess(true); - result.setMsg("保存数据成功"); + result.setMessage("保存数据成功"); } return result; } @@ -43,7 +43,7 @@ public class BaseService { RestMessage result=new RestMessage(); jpaRepository.delete(id); result.setSuccess(true); - result.setMsg("删除数据成功"); + result.setMessage("删除数据成功"); return result; } diff --git a/boot-service/src/main/java/com/xwbing/service/MailService.java b/boot-service/src/main/java/com/xwbing/service/MailService.java index 80b939d..3b30a55 100644 --- a/boot-service/src/main/java/com/xwbing/service/MailService.java +++ b/boot-service/src/main/java/com/xwbing/service/MailService.java @@ -15,7 +15,7 @@ import javax.mail.internet.MimeMessage; import java.io.File; /** - * 项目名称: sb-demo + * 项目名称: boot-module-demo * 创建时间: 2017/9/18 11:31 * 作者: xiangwb * 说明: mail服务层 @@ -43,7 +43,7 @@ public class MailService { message.setText(content); mailSender.send(message); restMessage.setSuccess(true); - restMessage.setMsg("纯文本邮件已经发送"); + restMessage.setMessage("纯文本邮件已经发送"); return restMessage; } @@ -66,7 +66,7 @@ public class MailService { helper.setText(content, true);//启用html mailSender.send(message); restMessage.setSuccess(true); - restMessage.setMsg("html邮件已经发送!"); + restMessage.setMessage("html邮件已经发送!"); return restMessage; } catch (MessagingException e) { throw new BusinessException("发送html邮件时发生异常"); @@ -98,7 +98,7 @@ public class MailService { // 可以继续添加附件。。。。。 mailSender.send(message);//发送邮件 restMessage.setSuccess(true); - restMessage.setMsg("带附件的邮件已经发送!"); + restMessage.setMessage("带附件的邮件已经发送!"); return restMessage; } catch (MessagingException e) { throw new BusinessException("发送带附件的邮件时发生异常"); @@ -129,7 +129,7 @@ public class MailService { helper.addInline(rscId, res); mailSender.send(message); restMessage.setSuccess(true); - restMessage.setMsg("嵌入静态资源的邮件已经发送!"); + restMessage.setMessage("嵌入静态资源的邮件已经发送!"); return restMessage; } catch (MessagingException e) { throw new BusinessException("发送嵌入静态资源的邮件时发生异常！"); diff --git a/boot-service/src/main/java/com/xwbing/service/SysConfigService.java b/boot-service/src/main/java/com/xwbing/service/SysConfigService.java index ad19109..00739c4 100644 --- a/boot-service/src/main/java/com/xwbing/service/SysConfigService.java +++ b/boot-service/src/main/java/com/xwbing/service/SysConfigService.java @@ -1,6 +1,6 @@ package com.xwbing.service; -import com.xwbing.domain.SysConfig; +import com.xwbing.entity.SysConfig; import com.xwbing.exception.BusinessException; import com.xwbing.repository.SysConfigRepository; import com.xwbing.util.PassWordUtil; @@ -15,7 +15,7 @@ import java.util.Objects; /** * 说明: - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/5 16:44 * 作者: xiangwb */ @@ -39,9 +39,9 @@ public class SysConfigService { SysConfig one = sysConfigRepository.save(sysConfig); if (Objects.nonNull(one)) { result.setSuccess(true); - result.setMsg("保存配置成功"); + result.setMessage("保存配置成功"); } else { - result.setMsg("保存配置失败"); + result.setMessage("保存配置失败"); } return result; } @@ -55,7 +55,7 @@ public class SysConfigService { } sysConfigRepository.delete(old.getId()); result.setSuccess(true); - result.setMsg("删除配置成功"); + result.setMessage("删除配置成功"); return result; } diff --git a/boot-service/src/main/java/com/xwbing/service/UserService.java b/boot-service/src/main/java/com/xwbing/service/UserService.java index d8526a0..05239be 100644 --- a/boot-service/src/main/java/com/xwbing/service/UserService.java +++ b/boot-service/src/main/java/com/xwbing/service/UserService.java @@ -2,25 +2,25 @@ package com.xwbing.service; import com.alibaba.fastjson.JSONObject; import com.xwbing.constant.CommonConstant; -import com.xwbing.constant.CommonEnum; -import com.xwbing.domain.SysConfig; -import com.xwbing.domain.SysUser; -import com.xwbing.domain.model.EmailModel; +import com.xwbing.entity.SysConfig; +import com.xwbing.entity.SysUser; +import com.xwbing.entity.model.EmailModel; import com.xwbing.exception.BusinessException; import com.xwbing.repository.UserRepository; import com.xwbing.util.*; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; import java.util.Date; import java.util.List; import java.util.Objects; /** * 说明: - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/5 16:44 * 作者: xiangwb */ @@ -33,25 +33,24 @@ public class UserService { /** * 增 + * * @param sysUser * @return */ public RestMessage save(SysUser sysUser) { RestMessage result = new RestMessage(); SysUser old = findByUserName(sysUser.getUserName()); - if (Objects.nonNull(old)) { + if (old != null) { throw new BusinessException("已经存在此用户名"); } sysUser.setId(PassWordUtil.createId()); sysUser.setCreateTime(new Date()); - // 设置否管理员 - sysUser.setIsAdmin(CommonEnum.YesOrNo.NO.getCode()); // 获取初始密码 String[] res = PassWordUtil.getUserSecret(null, null); sysUser.setSalt(res[1]); sysUser.setPassword(res[2]); SysUser one = userRepository.save(sysUser); - if (Objects.isNull(one)) { + if (one == null) { throw new BusinessException("新增用户失败"); } SysConfig sysConfig = sysConfigService.findByCode(CommonConstant.SYSCONFIG_EMAILCONFIGKEY); @@ -77,18 +76,16 @@ public class UserService { /** * 删 + * * @param id * @return */ public RestMessage removeById(String id) { RestMessage result = new RestMessage(); - SysUser old=findOne(id); - if(Objects.isNull(old)){ + SysUser old = findOne(id); + if (old == null) { throw new BusinessException("该对象不存在"); } - if (CommonEnum.YesOrNo.YES.getCode().equalsIgnoreCase(old.getIsAdmin())) { - throw new BusinessException("不能对管理员进行删除操作"); - } userRepository.delete(id); result.setSuccess(true); return result; @@ -97,13 +94,14 @@ public class UserService { /** * 更新 + * * @param sysUser * @return */ - public RestMessage update(SysUser sysUser){ - RestMessage result=new RestMessage(); - SysUser old=findOne(sysUser.getId()); - if(Objects.isNull(old)){ + public RestMessage update(SysUser sysUser) { + RestMessage result = new RestMessage(); + SysUser old = findOne(sysUser.getId()); + if (old == null) { throw new BusinessException("该对象不存在"); } // 根据实际情况补充 @@ -111,17 +109,19 @@ public class UserService { old.setMail(sysUser.getMail()); old.setSex(sysUser.getSex()); old.setUserName(sysUser.getUserName()); - SysUser one=userRepository.save(old); - if(Objects.nonNull(one)){ - result.setMsg("更新用户成功"); + SysUser one = userRepository.save(old); + if (one == null) { + result.setMessage("更新用户成功"); result.setSuccess(true); - }else { - result.setMsg("更新用户失败"); + } else { + result.setMessage("更新用户失败"); } return result; } + /** * 单个查询 + * * @param id * @return */ @@ -131,12 +131,70 @@ public class UserService { /** * 列表查询 + * * @return */ public List findList() { - List list = null; - list = userRepository.findAll(); - return list; + return userRepository.findAll(); + } + + /** + * 修改密码 + * + * @param newPassWord + * @param oldPassWord + * @param loginUserId + * @return + */ + public RestMessage updatePassWord(String newPassWord, String oldPassWord, String loginUserId) { + RestMessage result = new RestMessage(); + SysUser sysUser = findOne(loginUserId); + if (sysUser == null) + throw new BusinessException("该用户不存在"); + boolean flag = checkPassWord(oldPassWord, sysUser.getPassword(), sysUser.getSalt()); + if (!flag) + throw new BusinessException("原密码错误，请重新输入"); + String[] str = PassWordUtil.getUserSecret(newPassWord, null); + sysUser.setSalt(str[1]); + sysUser.setPassword(str[2]); + SysUser one = userRepository.save(sysUser); + if (Objects.nonNull(one)) { + result.setMessage("更新密码成功"); + result.setSuccess(true); + } else { + result.setMessage("更新密码失败"); + } + return result; + } + + /** + * 登录 + * + * @param req + * @param userName + * @param passWord + * @param ckeckCode + * @return + */ + public RestMessage login(HttpServletRequest req, String userName, String passWord, String ckeckCode) { + RestMessage restMessage = new RestMessage(); + HttpSession session = req.getSession(); + String imgCode = (String) session.getAttribute(CommonConstant.KEY_CAPTCHA); + //验证验证码 + if (!ckeckCode.equalsIgnoreCase(imgCode) || StringUtils.isEmpty(ckeckCode)) { + throw new BusinessException("验证码错误"); + } + //验证账号,密码 + SysUser user = findByUserName(userName); + if (user == null) + throw new BusinessException("账号错误"); + boolean flag = checkPassWord(passWord, user.getPassword(), user.getSalt()); + if (!flag) + throw new BusinessException("密码错误"); + session.setAttribute(CommonConstant.SESSION_CURRENT_USER, userName); + restMessage.setSuccess(true); + restMessage.setMessage("登录成功"); + return restMessage; } /** @@ -145,39 +203,29 @@ public class UserService { * @param userName * @return */ - public SysUser findByUserName(String userName) { - SysUser sysUser = null; - List list = userRepository.findByUserName(userName); - if (CollectionUtils.isNotEmpty(list)) { - sysUser = list.get(0); - } - return sysUser; + private SysUser findByUserName(String userName) { + return userRepository.findByUserName(userName); } - public RestMessage updatePassWord(String newPassWord, String oldPassWord, - String loginUserId){ - RestMessage result=new RestMessage(); - SysUser sysUser=findOne(loginUserId); + + /** + * 校验密码 + * + * @param realPassWord + * @param passWord + * @param salt + * @return + */ + private boolean checkPassWord(String passWord, String realPassWord, String salt) { + boolean flag; // 根据密码盐值， 解码 - byte[] salt = EncodeUtils.hexDecode(sysUser.getSalt()); - byte[] hashPassword = Digests.sha1(oldPassWord.getBytes(), salt, + byte[] saltByte = EncodeUtils.hexDecode(salt); + byte[] hashPassword = Digests.sha1(passWord.getBytes(), saltByte, SysUser.HASH_INTERATIONS); // 密码 数据库中密码 String validatePassWord = EncodeUtils.hexEncode(hashPassword); - if (!Objects.equals(validatePassWord,sysUser.getPassword())) {// 如果不相等 - throw new BusinessException("原密码错误，请重新输入"); - } - String[] str = PassWordUtil.getUserSecret(newPassWord, null); - sysUser.setSalt(str[1]); - sysUser.setPassword(str[2]); - SysUser one=userRepository.save(sysUser); - if(Objects.nonNull(one)){ - result.setMsg("更新密码成功"); - result.setSuccess(true); - }else { - result.setMsg("更新密码失败"); - } - return result; - + //判断密码是否相同 + flag = realPassWord.equals(validatePassWord); + return flag; } } diff --git a/boot-service/src/main/java/com/xwbing/util/EmailUtil.java b/boot-service/src/main/java/com/xwbing/util/EmailUtil.java index 9838759..690b120 100644 --- a/boot-service/src/main/java/com/xwbing/util/EmailUtil.java +++ b/boot-service/src/main/java/com/xwbing/util/EmailUtil.java @@ -1,7 +1,7 @@ package com.xwbing.util; -import com.xwbing.domain.model.EmailModel; +import com.xwbing.entity.model.EmailModel; import com.xwbing.exception.BusinessException; import org.apache.commons.lang3.StringUtils; diff --git a/boot-service/src/main/java/com/xwbing/util/JSONObjResult.java b/boot-service/src/main/java/com/xwbing/util/JSONObjResult.java index a39c45e..52ed598 100644 --- a/boot-service/src/main/java/com/xwbing/util/JSONObjResult.java +++ b/boot-service/src/main/java/com/xwbing/util/JSONObjResult.java @@ -41,7 +41,7 @@ public class JSONObjResult { public static JSONObject toJSONObj(RestMessage rest) { JSONObjResult jsonObjResult = new JSONObjResult(); jsonObjResult.setSuccess(rest.isSuccess()); - jsonObjResult.setMessage(rest.getMsg()); + jsonObjResult.setMessage(rest.getMessage()); jsonObjResult.setData(JSONUtil.beanToMap(rest.getData())); jsonObjResult.setId(rest.getId()); return JSON.parseObject(JSON.toJSONString(jsonObjResult, SerializerFeature.WriteMapNullValue)); diff --git a/boot-service/src/main/java/com/xwbing/util/RestMessage.java b/boot-service/src/main/java/com/xwbing/util/RestMessage.java index 484315c..8fc2cc3 100644 --- a/boot-service/src/main/java/com/xwbing/util/RestMessage.java +++ b/boot-service/src/main/java/com/xwbing/util/RestMessage.java @@ -1,73 +1,19 @@ package com.xwbing.util; -import java.io.Serializable; +import lombok.Data; +import java.io.Serializable; /** * 说明:返回消息封装类 * 创建日期: 2017年3月3日 上午11:43:13 * 作者: xiangwb */ +@Data public class RestMessage implements Serializable { private static final long serialVersionUID = -4167591341943919542L; - private boolean isSuccess = false;// 默认false - private String msg;// 成功、错误返回提示信息 + private boolean success = false;// 默认false + private String message;// 成功、错误返回提示信息 private Object data;// 返回的数据 private String id;// 新增、修改主鍵返回id private Integer code;//错误码 - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getMsg() { - return msg; - } - - public void setMsg(String msg) { - this.msg = msg; - } - - public Object getData() { - return data; - } - - public void setData(Object data) { - this.data = data; - } - - public boolean isSuccess() { - return isSuccess; - } - - public void setSuccess(boolean isSuccess) { - this.isSuccess = isSuccess; - } - - public RestMessage() { - super(); - } - - public RestMessage(Object data) { - super(); - this.data = data; - } - - public Integer getCode() { - return code; - } - - public void setCode(Integer code) { - this.code = code; - } - - public RestMessage(boolean isSuccess, Object data) { - super(); - this.isSuccess = isSuccess; - this.data = data; - } - } diff --git a/boot-service/src/main/java/com/xwbing/util/captcah/CaptchaServlet.java b/boot-service/src/main/java/com/xwbing/util/captcah/CaptchaServlet.java index 0fc37eb..047d3d1 100644 --- a/boot-service/src/main/java/com/xwbing/util/captcah/CaptchaServlet.java +++ b/boot-service/src/main/java/com/xwbing/util/captcah/CaptchaServlet.java @@ -1,5 +1,7 @@ package com.xwbing.util.captcah; +import com.xwbing.constant.CommonConstant; + import javax.imageio.ImageIO; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -12,15 +14,10 @@ import java.io.OutputStream; /** * 说明: 创建验证码的servlet * 创建日期: 2016年8月29日 上午10:59:27 - * 作者: xiangwb + * 作者: xiangwbd */ public class CaptchaServlet extends HttpServlet { private static final long serialVersionUID = -124247581620199710L; - /* - * 存放session中的值 - */ - public static final String KEY_CAPTCHA = "SE_KEY_MM_CODE"; - @Override protected void service(HttpServletRequest req, HttpServletResponse res) { // 设置相应类型,告诉浏览器输出的内容为图片 @@ -34,8 +31,8 @@ public class CaptchaServlet extends HttpServlet { CaptchaUtil tool = new CaptchaUtil(); StringBuffer code = new StringBuffer(); BufferedImage image = tool.genRandomCodeImage(code); - session.removeAttribute(KEY_CAPTCHA); - session.setAttribute(KEY_CAPTCHA, code.toString()); + session.removeAttribute(CommonConstant.KEY_CAPTCHA); + session.setAttribute(CommonConstant.KEY_CAPTCHA, code.toString()); // 将内存中的图片通过流形式输出到客户端 OutputStream out = res.getOutputStream(); ImageIO.write(image, "JPEG", out); diff --git a/boot-web/pom.xml b/boot-web/pom.xml index d3e5ce7..b67dbfa 100644 --- a/boot-web/pom.xml +++ b/boot-web/pom.xml @@ -12,31 +12,31 @@ war - nexus - drore Team nexus - http://192.168.11.110:8081/nexus/content/groups/public + nexus-aliyun + Nexus aliyun + http://maven.aliyun.com/nexus/content/groups/public - nexus - drore Team nexus - http://192.168.11.110:8081/nexus/content/groups/public + nexus-aliyun + Nexus aliyun + http://maven.aliyun.com/nexus/content/groups/public - - - nexus-drore-team-3rd - http://192.168.11.110:8081/nexus/content/repositories/thirdparty/ - - + + + + + + com.xwbing boot-service - 1.0-SNAPSHOT + 1.0 @@ -85,32 +85,32 @@ - - org.apache.maven.plugins - maven-war-plugin - 2.4 - - ROOT - false - - + + + + + + + + + - - org.apache.maven.plugins - maven-source-plugin - 2.4 - - true - - - - compile - - jar - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/boot-web/src/main/java/com/xwbing/Application.java b/boot-web/src/main/java/com/xwbing/Application.java index 1bbe1b0..c42a3ad 100644 --- a/boot-web/src/main/java/com/xwbing/Application.java +++ b/boot-web/src/main/java/com/xwbing/Application.java @@ -8,7 +8,7 @@ import org.springframework.boot.web.support.SpringBootServletInitializer; /** * 项目名称: boot-module-demo * 创建时间: 2017/11/2 18:19 - * 作者: xiangwb + * 作者: boot-module-demo * 说明: 启动类 */ @SpringBootApplication diff --git a/boot-web/src/main/java/com/xwbing/annotation/LogInfo.java b/boot-web/src/main/java/com/xwbing/annotation/LogInfo.java index e326f97..10438cb 100644 --- a/boot-web/src/main/java/com/xwbing/annotation/LogInfo.java +++ b/boot-web/src/main/java/com/xwbing/annotation/LogInfo.java @@ -4,7 +4,7 @@ import java.lang.annotation.*; /** * 说明: 自定义日志信息注解 - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/10 16:36 * 作者: xiangwb */ diff --git a/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java b/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java index 95571b2..de1ca90 100644 --- a/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java +++ b/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java @@ -6,7 +6,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; /** * 说明: 程序上下文配置 - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/10 16:36 * 作者: xiangwb */ diff --git a/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java b/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java index a528116..c9e6703 100644 --- a/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java +++ b/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java @@ -1,6 +1,7 @@ package com.xwbing.configuration; import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; +import com.xwbing.handler.LoginInterceptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Bean; @@ -19,7 +20,7 @@ import java.util.List; /** * 说明: 程序配置 - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/10 16:36 * 作者: xiangwb */ @@ -37,7 +38,7 @@ public class DispatcherServletConfig extends WebMvcConfigurerAdapter { public void addInterceptors(InterceptorRegistry registry) { logger.info("addInterceptors......"); //拦截器1:登录判断 -// registry.addInterceptor(new LoginInterceptor()).addPathPatterns("/**"); + registry.addInterceptor(new LoginInterceptor()).addPathPatterns("/**"); // registry.addInterceptor(new LoginInterceptor()) // .addPathPatterns("/**").excludePathPatterns("/user/login", "/servlet/captchaCode", "/doc.html", "/swagger-ui.html"); //拦截器2... diff --git a/boot-web/src/main/java/com/xwbing/configuration/SchedulingConfig.java b/boot-web/src/main/java/com/xwbing/configuration/SchedulingConfig.java index a80890e..4028541 100644 --- a/boot-web/src/main/java/com/xwbing/configuration/SchedulingConfig.java +++ b/boot-web/src/main/java/com/xwbing/configuration/SchedulingConfig.java @@ -8,7 +8,7 @@ import org.springframework.scheduling.annotation.Scheduled; /** * 说明: 定时任务定时类 - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/10 16:36 * 作者: xiangwb */ diff --git a/boot-web/src/main/java/com/xwbing/configuration/ServletConfig.java b/boot-web/src/main/java/com/xwbing/configuration/ServletConfig.java index bd61307..30a0483 100644 --- a/boot-web/src/main/java/com/xwbing/configuration/ServletConfig.java +++ b/boot-web/src/main/java/com/xwbing/configuration/ServletConfig.java @@ -7,7 +7,7 @@ import org.springframework.context.annotation.Configuration; /** * 说明: 统一的servlet配置 - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/10 16:36 * 作者: xiangwb */ diff --git a/boot-web/src/main/java/com/xwbing/configuration/SwaggerConfig.java b/boot-web/src/main/java/com/xwbing/configuration/SwaggerConfig.java index f1518ad..d16000e 100644 --- a/boot-web/src/main/java/com/xwbing/configuration/SwaggerConfig.java +++ b/boot-web/src/main/java/com/xwbing/configuration/SwaggerConfig.java @@ -12,7 +12,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; /** * 说明: swagger config - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/10 16:36 * 作者: xiangwb */ diff --git a/boot-web/src/main/java/com/xwbing/controller/MailTestControl.java b/boot-web/src/main/java/com/xwbing/controller/MailTestControl.java index be4f48c..2c6d9d0 100644 --- a/boot-web/src/main/java/com/xwbing/controller/MailTestControl.java +++ b/boot-web/src/main/java/com/xwbing/controller/MailTestControl.java @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** - * 项目名称: sb-demo + * 项目名称: sb-boot-module-demo * 创建时间: 2017/9/18 13:42 * 作者: xiangwb * 说明:邮件测试控制层 diff --git a/boot-web/src/main/java/com/xwbing/controller/SysConfigControl.java b/boot-web/src/main/java/com/xwbing/controller/SysConfigControl.java index 9947d7a..18e1f0a 100644 --- a/boot-web/src/main/java/com/xwbing/controller/SysConfigControl.java +++ b/boot-web/src/main/java/com/xwbing/controller/SysConfigControl.java @@ -1,7 +1,7 @@ package com.xwbing.controller; import com.alibaba.fastjson.JSONObject; -import com.xwbing.domain.SysConfig; +import com.xwbing.entity.SysConfig; import com.xwbing.service.SysConfigService; import com.xwbing.util.JSONObjResult; import com.xwbing.util.RestMessage; @@ -20,7 +20,7 @@ import java.util.Objects; /** * 说明: 系统配置控制层 - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/10 16:36 * 作者: xiangwb */ diff --git a/boot-web/src/main/java/com/xwbing/controller/TestControl.java b/boot-web/src/main/java/com/xwbing/controller/TestControl.java index e076bb1..93fc362 100644 --- a/boot-web/src/main/java/com/xwbing/controller/TestControl.java +++ b/boot-web/src/main/java/com/xwbing/controller/TestControl.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController; /** * 说明: - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/5 9:21 * 作者: xiangwb */ diff --git a/boot-web/src/main/java/com/xwbing/controller/UserControl.java b/boot-web/src/main/java/com/xwbing/controller/UserControl.java index de5dcb2..47a4475 100644 --- a/boot-web/src/main/java/com/xwbing/controller/UserControl.java +++ b/boot-web/src/main/java/com/xwbing/controller/UserControl.java @@ -1,7 +1,7 @@ package com.xwbing.controller; import com.alibaba.fastjson.JSONObject; -import com.xwbing.domain.SysUser; +import com.xwbing.entity.SysUser; import com.xwbing.service.UserService; import com.xwbing.util.JSONObjResult; import com.xwbing.util.RestMessage; @@ -11,13 +11,14 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import java.util.List; import java.util.Objects; /** * 说明: user - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/10 16:36 * 作者: xiangwb */ @@ -53,7 +54,7 @@ public class UserControl { } @GetMapping("findById") - public JSONObject findById(String id) { + public JSONObject findById(@RequestParam String id) { if (StringUtils.isEmpty(id)) { return JSONObjResult.toJSONObj("主键不能为空"); } @@ -70,4 +71,25 @@ public class UserControl { return JSONObjResult.toJSONObj(list, true, ""); } + @GetMapping("login") + public JSONObject login(HttpServletRequest req, @RequestParam String userName, @RequestParam String passWord, String ckeckCode) { + if (StringUtils.isEmpty(userName)) + return JSONObjResult.toJSONObj("用户名不能为空"); + if (StringUtils.isEmpty(passWord)) + return JSONObjResult.toJSONObj("密码不能为空"); + RestMessage login = userService.login(req, userName, passWord, ckeckCode); + return JSONObjResult.toJSONObj(login); + } + + @GetMapping("updatePassWord") + public JSONObject updatePassWord(@RequestParam String newPassWord, @RequestParam String oldPassWord, @RequestParam String loginUserId) { + if (StringUtils.isEmpty(newPassWord)) + return JSONObjResult.toJSONObj("新密码不能为空"); + if (StringUtils.isEmpty(oldPassWord)) + return JSONObjResult.toJSONObj("旧密码不能为空"); + if (StringUtils.isEmpty(newPassWord)) + return JSONObjResult.toJSONObj("用户id不能为空"); + RestMessage restMessage = userService.updatePassWord(newPassWord, oldPassWord, loginUserId); + return JSONObjResult.toJSONObj(restMessage); + } } diff --git a/boot-web/src/main/java/com/xwbing/handler/GlobalExceptionHandler.java b/boot-web/src/main/java/com/xwbing/handler/GlobalExceptionHandler.java index f9a9885..c1e7654 100644 --- a/boot-web/src/main/java/com/xwbing/handler/GlobalExceptionHandler.java +++ b/boot-web/src/main/java/com/xwbing/handler/GlobalExceptionHandler.java @@ -19,7 +19,7 @@ import java.util.List; /** * 说明: GlobalExceptionHandler - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/10 16:36 * 作者: xiangwb */ diff --git a/boot-web/src/main/java/com/xwbing/handler/LoginInterceptor.java b/boot-web/src/main/java/com/xwbing/handler/LoginInterceptor.java index 87bde82..4c3906e 100644 --- a/boot-web/src/main/java/com/xwbing/handler/LoginInterceptor.java +++ b/boot-web/src/main/java/com/xwbing/handler/LoginInterceptor.java @@ -14,7 +14,7 @@ import java.util.Set; /** * 说明: 登录拦截器 - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/10 16:36 * 作者: xiangwb */ @@ -32,7 +32,7 @@ public class LoginInterceptor extends HandlerInterceptorAdapter { if(!set.contains(servletPath) && !servletPath.contains("login")){ HttpSession session = request.getSession(); if (session.getAttribute(CommonConstant.SESSION_CURRENT_USER)!=null) { - // TODO: 2017/5/15 + // TODO: 2017/10/3 return true; }else { // TODO: 2017/10/3 diff --git a/boot-web/src/main/java/com/xwbing/handler/WebLogAspect.java b/boot-web/src/main/java/com/xwbing/handler/WebLogAspect.java index f9eb5f5..7112aa1 100644 --- a/boot-web/src/main/java/com/xwbing/handler/WebLogAspect.java +++ b/boot-web/src/main/java/com/xwbing/handler/WebLogAspect.java @@ -15,7 +15,7 @@ import java.lang.reflect.Method; /** * 说明: web层日志记录切面 - * 项目名称: sbdemo + * 项目名称: boot-module-demo * 创建时间: 2017/5/10 16:34 * 作者: xiangwb */ diff --git a/boot-web/src/main/resources/log4j2.xml b/boot-web/src/main/resources/log4j2.xml index 65bf60c..6934283 100644 --- a/boot-web/src/main/resources/log4j2.xml +++ b/boot-web/src/main/resources/log4j2.xml @@ -14,7 +14,7 @@ %C : Java类名 %L : 日志输出所在行数 %M : 日志输出所在方法名 - %msg:日志消息 + %message:日志消息 -5:从左显示5个字符宽度 --> @@ -29,7 +29,7 @@ - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %L %-5p %class{36} %M : %msg%xEx%n + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %L %-5p %class{36} %M : %message%xEx%n @@ -39,7 +39,7 @@ filePattern="${LOG_HOME}/error.%d{yyyy-MM-dd}.log.gz"> - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %L %-5p %class{36} %M : %msg%xEx%n + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %L %-5p %class{36} %M : %message%xEx%n @@ -53,7 +53,7 @@ filePattern="${LOG_HOME}/info.%d{yyyy-MM-dd}.log.gz"> - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %L %-5p %class{36} %M : %msg%xEx%n + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %L %-5p %class{36} %M : %message%xEx%n diff --git a/pom.xml b/pom.xml index a0b282e..d0f41cb 100644 --- a/pom.xml +++ b/pom.xml @@ -18,17 +18,17 @@ - - nexus - drore Team nexus - http://192.168.11.110:8081/nexus/content/groups/public + + nexus-aliyun + Nexus aliyun + http://maven.aliyun.com/nexus/content/groups/public - nexus - drore Team nexus - http://192.168.11.110:8081/nexus/content/groups/public + nexus-aliyun + Nexus aliyun + http://maven.aliyun.com/nexus/content/groups/public