diff --git a/src/main/java/com/peanut/modules/book/controller/MyUserController.java b/src/main/java/com/peanut/modules/book/controller/MyUserController.java index dac526f9..db5654f7 100644 --- a/src/main/java/com/peanut/modules/book/controller/MyUserController.java +++ b/src/main/java/com/peanut/modules/book/controller/MyUserController.java @@ -130,24 +130,32 @@ public class MyUserController { } /** - * 修改 + * 修改用户信息 */ @RequestMapping("/update") -// @RequiresPermissions("book:user:update") public R update(@RequestBody MyUserEntity user){ - - if (!StringUtils.isEmpty(user.getPassword())) { - String password = user.getPassword(); - String saltMD5 = MD5Utils.getSaltMD5(password); - user.setPassword(saltMD5); - userService.updateById(user); - }else{ - userService.update(user); - } - + userService.updateById(user); return R.ok(); } + /** + * 修改用户密码 + * @param user + * @return + */ + @RequestMapping("/updateUserPassword") + public R updateUserPassword(@RequestBody MyUserEntity user){ + String password = user.getPassword(); + if(password.equals(null)){ + return R.error("密码不能为空"); + } + String saltMD5 = MD5Utils.getSaltMD5(password); + user.setPassword(saltMD5); + userService.updateById(user); + return R.ok(); + } + + /** * 删除 */ diff --git a/src/main/java/com/peanut/modules/book/dao/MyUserDao.java b/src/main/java/com/peanut/modules/book/dao/MyUserDao.java index 5196da03..43b377d8 100644 --- a/src/main/java/com/peanut/modules/book/dao/MyUserDao.java +++ b/src/main/java/com/peanut/modules/book/dao/MyUserDao.java @@ -14,6 +14,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface MyUserDao extends BaseMapper { - void update(MyUserEntity user); } diff --git a/src/main/java/com/peanut/modules/book/service/MyUserService.java b/src/main/java/com/peanut/modules/book/service/MyUserService.java index 80569337..993788ed 100644 --- a/src/main/java/com/peanut/modules/book/service/MyUserService.java +++ b/src/main/java/com/peanut/modules/book/service/MyUserService.java @@ -42,7 +42,6 @@ public interface MyUserService extends IService { //电子书购买 String buyEbook(String userId, String bookId,String couponId); - void update (MyUserEntity user); //第三方微信登录 R getUserInfoByApp(UserAppAuthorEntity userAppAuthorEntity); diff --git a/src/main/java/com/peanut/modules/book/service/impl/MyUserServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/MyUserServiceImpl.java index da379880..8914ceaa 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/MyUserServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/MyUserServiceImpl.java @@ -352,16 +352,6 @@ public class MyUserServiceImpl extends ServiceImpl impl return "购买成功!"; } - /** - * 更新 - * - * @param user - */ - @Override - public void update(MyUserEntity user) { - myUserDao.update(user); - } - /** * 微信授权登录 diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index d2c33f8d..59ee7a6e 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -3,7 +3,7 @@ spring: redis: open: false # 是否开启redis缓存 true开启 false关闭 database: 0 - host: 127.0.0.1 + host: 39.106.36.183 port: 6379 # password: Jgll2015 # 密码(默认为空) timeout: 6000000ms # 连接超时时长(毫秒) diff --git a/src/main/resources/mapper/book/MyUserDao.xml b/src/main/resources/mapper/book/MyUserDao.xml index 72188018..4ce54c3e 100644 --- a/src/main/resources/mapper/book/MyUserDao.xml +++ b/src/main/resources/mapper/book/MyUserDao.xml @@ -27,15 +27,5 @@ - - - update user - - age = #{age}, sex = #{sex} ,avatar=#{avatar} ,nickname =#{nickname} - - where id = #{id} - - - \ No newline at end of file diff --git a/src/test/java/com/VxApiTest.java b/src/test/java/com/VxApiTest.java index 22ed370a..19eac407 100644 --- a/src/test/java/com/VxApiTest.java +++ b/src/test/java/com/VxApiTest.java @@ -1,5 +1,6 @@ package com; +import com.peanut.common.utils.MD5Utils; import com.peanut.modules.pay.weChatPay.config.WechatPayConfig; import com.peanut.modules.pay.weChatPay.dto.WechatPaymentInfo; import org.junit.Test; @@ -41,5 +42,18 @@ public class VxApiTest { System.out.println(wechatPaymentInfo.toString()); } + @Test + public void mmm(){ + String saltMD5 = MD5Utils.getSaltMD5("29698073wjl"); + System.out.println(saltMD5); + } + + @Test + public void mmmm(){ +// boolean saltverifyMD5 = MD5Utils.getSaltverifyMD5("29698073wjl", "15af9ed9b06a442b90b09e78d21a3635890e24196db1a61e"); + boolean saltverifyMD5 = MD5Utils.getSaltverifyMD5("29698073wjl", "f33643591f4e942d3918f582555719247f6e90131ea1dc0a"); + System.out.println(saltverifyMD5); + } + }