Merge remote-tracking branch 'origin/master'

eladmin-system/src/main/java/cn/ysk/cashier/controller/TbUserInfoController.java

@@ -16,18 +16,31 @@
 package cn.ysk.cashier.controller;
 
 import cn.ysk.cashier.annotation.Log;
+import cn.ysk.cashier.exception.BadRequestException;
 import cn.ysk.cashier.pojo.TbUserInfo;
+import cn.ysk.cashier.pojo.shop.TbMerchantAccount;
+import cn.ysk.cashier.repository.TbUserInfoRepository;
+import cn.ysk.cashier.repository.shop.TbMerchantAccountRepository;
 import cn.ysk.cashier.service.TbUserInfoService;
 import cn.ysk.cashier.dto.TbUserInfoQueryCriteria;
+import cn.ysk.cashier.utils.*;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.aliyun.dysmsapi20170525.models.SendSmsResponse;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.*;
 import java.io.IOException;
+import java.util.Map;
+import java.util.Objects;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
@@ -75,4 +88,98 @@ public class TbUserInfoController {
         tbUserInfoService.deleteAll(ids);
         return new ResponseEntity<>(HttpStatus.OK);
     }
+
+    @Autowired
+    ValidateCodeUtil validateCodeUtil;
+
+    @Autowired
+    RedisUtils redisUtils;
+
+    @GetMapping("sendMsg")
+    public Object sendMsg(){
+       Object o= SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+       if(Objects.isNull(o)){
+           throw new BadRequestException("用户登录信息失效");
+       }
+        JSONObject object=JSON.parseObject(JSON.toJSONString(o));
+        if(Objects.isNull(object)){
+            throw new BadRequestException("用户登录信息失效");
+        }
+        String regex="^\\d{11}$";
+
+        if(!object.containsKey("username")||Objects.isNull(object.getString("username"))||
+            !object.getString("username").matches(regex)
+        ){
+            throw new BadRequestException("用户登录信息失效");
+        }
+        String phone=object.getString("username");
+
+        String tempcode="SMS_244665149";
+
+        String random = StringUtil.random(6);
+        try {
+            validateCodeUtil.requestValidateCodeAli(phone, random,tempcode);
+            redisUtils.set(phone.concat("#").concat(tempcode),random,300L);
+            return "{\n" +
+                    "    \"code\": 0,\n" +
+                    "    \"msg\": \"成功\"\n" +
+                    "}";
+        } catch (Exception e) {
+            throw new RuntimeException(e.getMessage());
+        }
+
+    }
+
+
+    @Autowired
+    TbMerchantAccountRepository tbMerchantAccountRepository;
+
+
+    @RequestMapping(value = "modfiyUserInfo",method = RequestMethod.POST)
+    public  ResponseEntity<Object> modfiyUserInfo(@RequestBody Map<String,String> map){
+        Object o= SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        if(Objects.isNull(o)){
+            throw new BadRequestException("用户登录信息失效");
+        }
+        JSONObject object=JSON.parseObject(JSON.toJSONString(o));
+        if(Objects.isNull(object)){
+            throw new BadRequestException("用户登录信息失效");
+        }
+        String regex="^\\d{11}$";
+
+        if(!object.containsKey("username")||Objects.isNull(object.getString("username"))||
+                !object.getString("username").matches(regex)
+        ){
+            throw new BadRequestException("用户登录信息失效");
+        }
+
+        String tempcode="SMS_244665149";
+        String phone=object.getString("username");
+        Object redisCode= redisUtils.get(phone.concat("#").concat(tempcode));
+        if(Objects.isNull(redisCode)){
+            throw new BadRequestException("短信验证码已过期");
+        }
+
+
+        String code=  map.get("code");
+
+        if(!redisCode.toString().equals(code)){
+            throw new BadRequestException("短信验证码错误");
+        }
+        redisUtils.del(phone.concat("#").concat(tempcode));
+        String pwd= map.get("pwd");
+
+        TbMerchantAccount account= tbMerchantAccountRepository.findByAccount(phone);
+        if(Objects.isNull(account)){
+            throw new BadRequestException("账户不存在");
+        }
+
+        account.setPwd(MD5Utils.md5(pwd.concat(account.getAccount()).concat(account.getId().toString())));
+        account.setUpdatedAt(System.currentTimeMillis());
+        tbMerchantAccountRepository.save(account);
+
+
+        return  new ResponseEntity<>(HttpStatus.NO_CONTENT);
+
+    }
 }