✨ Feat: 临时提交

bookMarkService/.gitignore

@@ -1,5 +1,6 @@
 HELP.md
 target
+static
 !.mvn/wrapper/maven-wrapper.jar
 
 ### STS ###

bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/constant/RedisConstant.java

@@ -0,0 +1,24 @@
+package com.fanxb.bookmark.business.user.constant;
+
+/**
+ * 类功能简述：
+ * 类功能详述：
+ *
+ * @author fanxb
+ * @date 2019/9/20 16:44
+ */
+public class RedisConstant {
+
+    /**
+     * 修改邮箱验证有效期
+     */
+    public static final int UPDATE_EMAIL_EXPIRE = 120;
+
+    /**
+     * 获取redis key
+     * @param code code
+     */
+    public static String getUpdateEmailKey(String code) {
+        return "update_email_" + code;
+    }
+}

bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/constant/ValidatedConstant.java

@@ -0,0 +1,29 @@
+package com.fanxb.bookmark.business.user.constant;
+
+/**
+ * 类功能简述：校验相关常量
+ * 类功能详述：
+ *
+ * @author fanxb
+ * @date 2019/9/20 14:49
+ */
+public interface ValidatedConstant {
+
+    /**
+     * 密码正则
+     */
+    String PASSWORD_REG = "^(?=.*?\\d+.*?)(?=.*?[a-zA-Z]+.*?)[\\da-zA-Z]{6,20}$";
+    /**
+     * 密码校验错误提示语
+     */
+    String PASSWORD_MESSAGE = "密码为6-20位数字和字母组合";
+
+    /**
+     * 用户名正则
+     */
+    String USERNAME_REG = "[\\da-zA-Z]{1,10}";
+    /**
+     * 用户名错误提示语
+     */
+    String USERNAME_MESSAGE = "用户名为1-10位的数字或字母组合";
+}

bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/controller/BaseInfoController.java

@@ -0,0 +1,75 @@
+package com.fanxb.bookmark.business.user.controller;
+
+import com.fanxb.bookmark.business.user.entity.EmailUpdateBody;
+import com.fanxb.bookmark.business.user.entity.UpdatePasswordBody;
+import com.fanxb.bookmark.business.user.entity.UsernameBody;
+import com.fanxb.bookmark.business.user.service.BaseInfoService;
+import com.fanxb.bookmark.common.entity.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+
+/**
+ * 类功能简述：用户基本信息相关功能
+ *
+ * @author fanxb
+ * @date 2019/9/18 15:53
+ */
+@RestController
+@RequestMapping("/baseInfo")
+@Validated
+public class BaseInfoController {
+
+    @Autowired
+    private BaseInfoService baseInfoService;
+
+    /**
+     * Description: 修改密码
+     *
+     * @param oldPass 旧密码
+     * @param newPass 新密码
+     * @return com.fanxb.bookmark.common.entity.Result
+     * @author fanxb
+     * @date 2019/9/18 15:49
+     */
+    @PostMapping("/password")
+    public Result changePassword(@Valid @RequestBody UpdatePasswordBody body) {
+        this.baseInfoService.changePassword(body);
+        return Result.success(null);
+    }
+
+
+    /**
+     * Description: 修改用户名
+     *
+     * @param body body
+     * @return com.fanxb.bookmark.common.entity.Result
+     * @author fanxb
+     * @date 2019/9/18 15:42
+     */
+    @PostMapping("/username")
+    public Result updateUsername(@Validated @RequestBody UsernameBody body) {
+        this.baseInfoService.updateUsername(body.getUsername());
+        return null;
+    }
+
+    /**
+     * Description: 修改邮箱，需要先确认密码,获取checkId，然后还需确认新邮箱
+     *
+     * @param email   新的邮箱地址
+     * @param checkId 确认id
+     * @return com.fanxb.bookmark.common.entity.Result
+     * @author fanxb
+     * @date 2019/9/18 15:41
+     */
+    @PostMapping("/email")
+    public Result updateEmail(@Validated @RequestBody EmailUpdateBody body) {
+        return null;
+    }
+}

bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/dao/UserDao.java

@@ -75,4 +75,26 @@ public interface UserDao {
      */
     @Update("update user set icon=#{icon} where userId=#{userId}")
     void updateUserIcon(@Param("userId") int userId, @Param("icon") String icon);
+
+    /**
+     * Description: 根据用户id修改密码
+     *
+     * @param userId  userId
+     * @param newPass newPass
+     * @author fanxb
+     * @date 2019/9/20 14:39
+     */
+    @Update("update user set password=#{password} where userId=#{userId}")
+    void updatePasswordByUserId(@Param("userId") int userId, @Param("password") String newPass);
+
+    /**
+     * Description: 根据用户id修改用户名
+     *
+     * @author fanxb
+     * @date 2019/9/20 16:22
+     * @param userId userId
+     * @param username username
+     */
+    @Update("update user set username=#{username} where userId=#{userId}")
+    void updateUsernameByUserId(@Param("userId") int userId, @Param("username") String username);
 }

bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/entity/EmailUpdateBody.java

@@ -0,0 +1,24 @@
+package com.fanxb.bookmark.business.user.entity;
+
+import com.fanxb.bookmark.business.user.constant.ValidatedConstant;
+import lombok.Data;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.Pattern;
+
+/**
+ * 类功能简述：修改邮箱表单
+ * 类功能详述：
+ *
+ * @author fanxb
+ * @date 2019/9/20 16:35
+ */
+@Data
+public class EmailUpdateBody {
+    @Pattern(regexp = ValidatedConstant.PASSWORD_REG, message = ValidatedConstant.PASSWORD_MESSAGE)
+    private String oldPass;
+    @Email
+    private String newEmail;
+
+    private String code;
+}

bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/entity/EmailUpdateRedis.java

@@ -0,0 +1,16 @@
+package com.fanxb.bookmark.business.user.entity;
+
+import lombok.Data;
+
+/**
+ * 类功能简述：
+ * 类功能详述：
+ *
+ * @author fanxb
+ * @date 2019/9/20 16:47
+ */
+@Data
+public class EmailUpdateRedis {
+    private int userId;
+    private String email;
+}

bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/entity/UpdatePasswordBody.java

@@ -0,0 +1,22 @@
+package com.fanxb.bookmark.business.user.entity;
+
+import com.fanxb.bookmark.business.user.constant.ValidatedConstant;
+import lombok.Data;
+
+import javax.validation.constraints.Pattern;
+
+/**
+ * 类功能简述：修改密码表单
+ * 类功能详述：
+ *
+ * @author fanxb
+ * @date 2019/9/20 16:13
+ */
+@Data
+public class UpdatePasswordBody {
+
+    @Pattern(regexp = ValidatedConstant.PASSWORD_MESSAGE, message = ValidatedConstant.PASSWORD_MESSAGE)
+    private String oldPass;
+    @Pattern(regexp = ValidatedConstant.PASSWORD_MESSAGE, message = ValidatedConstant.PASSWORD_MESSAGE)
+    private String newPass;
+}

bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/entity/UsernameBody.java

@@ -0,0 +1,20 @@
+package com.fanxb.bookmark.business.user.entity;
+
+import com.fanxb.bookmark.business.user.constant.ValidatedConstant;
+import lombok.Data;
+
+import javax.validation.constraints.Pattern;
+
+/**
+ * 类功能简述：
+ * 类功能详述：
+ *
+ * @author fanxb
+ * @date 2019/9/20 15:46
+ */
+@Data
+public class UsernameBody {
+
+    @Pattern(regexp = ValidatedConstant.USERNAME_REG, message = ValidatedConstant.USERNAME_MESSAGE)
+    private String username;
+}

bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/service/BaseInfoService.java

@@ -0,0 +1,60 @@
+package com.fanxb.bookmark.business.user.service;
+
+import com.fanxb.bookmark.business.user.dao.UserDao;
+import com.fanxb.bookmark.business.user.entity.EmailUpdateBody;
+import com.fanxb.bookmark.business.user.entity.UpdatePasswordBody;
+import com.fanxb.bookmark.common.constant.Constant;
+import com.fanxb.bookmark.common.entity.MailInfo;
+import com.fanxb.bookmark.common.exception.FormDataException;
+import com.fanxb.bookmark.common.util.HashUtil;
+import com.fanxb.bookmark.common.util.MailUtil;
+import com.fanxb.bookmark.common.util.UserContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 类功能简述：
+ * 类功能详述：
+ *
+ * @author fanxb
+ * @date 2019/9/18 15:54
+ */
+@Service
+public class BaseInfoService {
+
+    @Autowired
+    private UserDao userDao;
+
+    public void changePassword(UpdatePasswordBody body) {
+        int userId = UserContextHolder.get().getUserId();
+        String realOldPass = userDao.selectByUserId(userId).getPassword();
+        if (!realOldPass.equals(HashUtil.getPassword(body.getOldPass()))) {
+            throw new FormDataException("旧密码错误");
+        }
+        userDao.updatePasswordByUserId(userId, HashUtil.getPassword(body.getNewPass()));
+    }
+
+
+    /**
+     * Description: 修改用户名
+     *
+     * @param username 用户名
+     * @author fanxb
+     * @date 2019/9/20 16:18
+     */
+    public void updateUsername(String username) {
+        userDao.updateUsernameByUserId(UserContextHolder.get().getUserId(), username);
+    }
+
+    public void updateEmail(EmailUpdateBody body){
+        int userId = UserContextHolder.get().getUserId();
+        String realPass=userDao.selectByUserId(userId).getPassword();
+        if (!realPass.equals(HashUtil.getPassword(body.getOldPass()))) {
+            throw new FormDataException("旧密码错误");
+        }
+        MailInfo info = new MailInfo(body.getNewEmail(),"验证邮箱",);
+        MailUtil.sendTextMail();
+        Constant
+
+    }
+}

bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/service/UserService.java

@@ -149,7 +149,7 @@ public class UserService {
             throw new FormDataException("验证码错误");
         }
         RedisUtil.delete(codeKey);
-        String newPassword = HashUtil.sha1(HashUtil.md5(body.getPassword()));
+        String newPassword = HashUtil.getPassword(body.getPassword());
         userDao.resetPassword(newPassword, body.getEmail());
     }
 

bookMarkService/business/user/src/main/resources/mapper/user-userMapper.xml

@@ -35,11 +35,7 @@
     </update>
 
     <select id="selectByUserId" resultType="com.fanxb.bookmark.common.entity.User">
-        select
+        select *
-            userId,
-            username,
-            email,
-            icon
         from user
         where userId = #{userId}
     </select>

bookMarkService/common/src/main/java/com/fanxb/bookmark/common/constant/Constant.java

@@ -19,10 +19,6 @@ public class Constant {
      */
     public static final String JWT_KEY = "jwt-token";
 
-    /**
-     * jwt 过期时间，ms
-     */
-    public static int JWT_EXPIRE_TIME = 60 * 60 * 60 * 1000;
 
     /**
      * 验证码过期时间

bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/User.java

@@ -1,5 +1,6 @@
 package com.fanxb.bookmark.common.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 /**
@@ -16,6 +17,7 @@ public class User {
     private String username;
     private String email;
     private String icon;
+    @JsonIgnore
     private String password;
     private long createTime;
     private long lastLoginTime;

bookMarkService/common/src/main/java/com/fanxb/bookmark/common/exception/ExceptionHandle.java

@@ -3,6 +3,7 @@ package com.fanxb.bookmark.common.exception;
 import com.fanxb.bookmark.common.entity.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
@@ -21,7 +22,9 @@ public class ExceptionHandle {
     @ExceptionHandler(Exception.class)
     public Result handleException(Exception e) {
         CustomException ce;
-        if (e instanceof CustomException) {
+        if (e instanceof MethodArgumentNotValidException) {
+            ce = new FormDataException(((MethodArgumentNotValidException) e).getBindingResult().getFieldErrors().get(0).getDefaultMessage());
+        } else if (e instanceof CustomException) {
             logger.error("捕获到自定义错误:{}", e.getMessage(), e);
             ce = (CustomException) e;
         } else {

bookMarkService/common/src/main/java/com/fanxb/bookmark/common/util/HashUtil.java

@@ -1,88 +1,103 @@
-package com.fanxb.bookmark.common.util;
+package com.fanxb.bookmark.common.util;
-
+
-import com.fanxb.bookmark.common.exception.CustomException;
+import com.fanxb.bookmark.common.exception.CustomException;
-
+
-import java.security.MessageDigest;
+import java.security.MessageDigest;
-
+
-/**
+/**
- * 类功能简述：消息摘要计算
+ * 类功能简述：消息摘要计算
- * 类功能详述：
+ * 类功能详述：
- *
+ *
- * @author fanxb
+ * @author fanxb
- * @date 2019/7/6 14:31
+ * @date 2019/7/6 14:31
- */
+ */
-public class HashUtil {
+public class HashUtil {
-
+
-    /**
+    /**
-     * Description: md5 签名字符串
+     * Description: 生成密码
-     *
+     *
-     * @param str 16进制字符串
+     * @param pass 明文
-     * @return java.lang.String
+     * @return java.lang.String
-     * @author fanxb
+     * @author fanxb
-     * @date 2019/7/6 14:38
+     * @date 2019/9/20 14:34
-     */
+     */
-    public static String md5(String str) {
+    public static String getPassword(String pass) {
-        return hash(str, "MD5");
+        if (StringUtil.isEmpty(pass)) {
-    }
+            return "";
-
+        }
-    /**
+        return HashUtil.sha1(HashUtil.md5(pass));
-     * Description: 使用sha1签名字符串
+    }
-     *
+
-     * @param str sha1签名字符串
+    /**
-     * @return java.lang.String
+     * Description: md5 签名字符串
-     * @author fanxb
+     *
-     * @date 2019/7/6 14:40
+     * @param str 16进制字符串
-     */
+     * @return java.lang.String
-    public static String sha1(String str) {
+     * @author fanxb
-        return hash(str, "SHA1");
+     * @date 2019/7/6 14:38
-    }
+     */
-
+    public static String md5(String str) {
-    /**
+        return hash(str, "MD5");
-     * Description: 根据type签名str
+    }
-     *
+
-     * @param str  str
+    /**
-     * @param type 签名类别
+     * Description: 使用sha1签名字符串
-     * @return java.lang.String
+     *
-     * @author fanxb
+     * @param str sha1签名字符串
-     * @date 2019/7/6 14:40
+     * @return java.lang.String
-     */
+     * @author fanxb
-    public static String hash(String str, String type) {
+     * @date 2019/7/6 14:40
-        try {
+     */
-            MessageDigest md = MessageDigest.getInstance(type);
+    public static String sha1(String str) {
-            md.update(str.getBytes());
+        return hash(str, "SHA1");
-            return bytesToHexString(md.digest());
+    }
-        } catch (Exception e) {
+
-            throw new CustomException(e);
+    /**
-        }
+     * Description: 根据type签名str
-    }
+     *
-
+     * @param str  str
-
+     * @param type 签名类别
-    /**
+     * @return java.lang.String
-     * Description: 字节数组转16进制字符串
+     * @author fanxb
-     *
+     * @date 2019/7/6 14:40
-     * @param bits 字节数组
+     */
-     * @return java.lang.String
+    public static String hash(String str, String type) {
-     * @author fanxb
+        try {
-     * @date 2019/7/6 14:37
+            MessageDigest md = MessageDigest.getInstance(type);
-     */
+            md.update(str.getBytes());
-    public static String bytesToHexString(byte[] bits) {
+            return bytesToHexString(md.digest());
-        StringBuilder builder = new StringBuilder();
+        } catch (Exception e) {
-        for (int i = 0, length = bits.length; i < length; i++) {
+            throw new CustomException(e);
-            int k = bits[i];
+        }
-            if (k < 0) {
+    }
-                k += 256;
+
-            }
+
-            if (k < 16) {
+    /**
-                builder.append("0");
+     * Description: 字节数组转16进制字符串
-            }
+     *
-            builder.append(Integer.toHexString(k));
+     * @param bits 字节数组
-        }
+     * @return java.lang.String
-        return builder.toString();
+     * @author fanxb
-    }
+     * @date 2019/7/6 14:37
-
+     */
-    public static void main(String[] args){
+    public static String bytesToHexString(byte[] bits) {
-        System.out.println(md5("abc"));
+        StringBuilder builder = new StringBuilder();
-        System.out.println(sha1("abc"));
+        for (int i = 0, length = bits.length; i < length; i++) {
-    }
+            int k = bits[i];
-
+            if (k < 0) {
-}
+                k += 256;
+            }
+            if (k < 16) {
+                builder.append("0");
+            }
+            builder.append(Integer.toHexString(k));
+        }
+        return builder.toString();
+    }
+
+    public static void main(String[] args) {
+        System.out.println(md5("abc"));
+        System.out.println(sha1("abc"));
+    }
+
+}

bookMarkService/common/src/main/java/com/fanxb/bookmark/common/util/MailUtil.java

@@ -1,10 +1,12 @@
 package com.fanxb.bookmark.common.util;
 
 import com.fanxb.bookmark.common.entity.MailInfo;
+import com.fanxb.bookmark.common.exception.CustomException;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.mail.SimpleMailMessage;
 import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Component;
 
 /**
@@ -14,6 +16,7 @@ import org.springframework.stereotype.Component;
  * Time: 16:08
  */
 @Component
+@Slf4j
 public class MailUtil {
     private static JavaMailSender mailSender;
 
@@ -25,17 +28,29 @@ public class MailUtil {
     }
 
     @Value("${spring.mail.username}")
-    public void setFrom(String from){
+    public void setFrom(String from) {
         MailUtil.from = from;
     }
 
+    public static void sendMail(MailInfo info, boolean isHtml) {
+        try {
+
+            MimeMessageHelper helper = new MimeMessageHelper(mailSender.createMimeMessage());
+            helper.setFrom(from);
+            helper.setTo(info.getReceiver());
+            helper.setSubject(info.getSubject());
+            helper.setText(info.getContent(), isHtml);
+            mailSender.send(helper.getMimeMessage());
+        } catch (Exception e) {
+            throw new CustomException("发送邮件失败:" + e.getMessage(), e);
+        }
 
-    public static void sendTextMail(MailInfo info){
-        SimpleMailMessage simpleMailMessage = new SimpleMailMessage();
-        simpleMailMessage.setFrom(from);
-        simpleMailMessage.setTo(info.getReceiver());
-        simpleMailMessage.setSubject(info.getSubject());
-        simpleMailMessage.setText(info.getContent());
-        mailSender.send(simpleMailMessage);
     }
+
+
+    public static void sendTextMail(MailInfo info) {
+        sendMail(info, false);
+    }
+
+
 }