diff --git a/xsnb-auth/src/main/java/com/xsnb/auth/service/impl/AuthServiceImpl.java b/xsnb-auth/src/main/java/com/xsnb/auth/service/impl/AuthServiceImpl.java index f3d0013..7c2c378 100644 --- a/xsnb-auth/src/main/java/com/xsnb/auth/service/impl/AuthServiceImpl.java +++ b/xsnb-auth/src/main/java/com/xsnb/auth/service/impl/AuthServiceImpl.java @@ -39,8 +39,10 @@ public class AuthServiceImpl implements AuthService { @Override public Result login(RequestUser requestUser) { + log.info("获取的前台登录数值是:{}",requestUser.toString()); String phone = requestUser.getPhone(); String captcha = requestUser.getCaptcha(); + if (null == phone || null == captcha) { return Result.error("联系管理员"); } diff --git a/xsnb-modules/xsnb-system/src/main/java/com/xsnb/system/controller/DomeController.java b/xsnb-modules/xsnb-system/src/main/java/com/xsnb/system/controller/DomeController.java index 6688f98..9ed5b09 100644 --- a/xsnb-modules/xsnb-system/src/main/java/com/xsnb/system/controller/DomeController.java +++ b/xsnb-modules/xsnb-system/src/main/java/com/xsnb/system/controller/DomeController.java @@ -6,6 +6,7 @@ import com.xsnb.system.domain.Mail; import com.xsnb.system.service.MailService; import org.springframework.beans.factory.annotation.Autowired; 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; @@ -22,7 +23,7 @@ import java.util.List; */ @RestController -@RequestMapping("/test") +@RequestMapping("/mail") public class DomeController { @@ -42,7 +43,7 @@ public class DomeController { } //添加邮件,通过邮箱实体类来创建邮箱,也就是邮箱发送 @PostMapping("/addMail") - public Result addMail(Mail mail){ + public Result addMail(@RequestBody Mail mail){ return mailService.addMail(mail); } diff --git a/xsnb-modules/xsnb-system/src/main/java/com/xsnb/system/controller/UserController.java b/xsnb-modules/xsnb-system/src/main/java/com/xsnb/system/controller/UserController.java index ac1c8ae..42bc7dc 100644 --- a/xsnb-modules/xsnb-system/src/main/java/com/xsnb/system/controller/UserController.java +++ b/xsnb-modules/xsnb-system/src/main/java/com/xsnb/system/controller/UserController.java @@ -5,10 +5,9 @@ import com.xsnb.common.domain.User; import com.xsnb.common.result.Result; import com.xsnb.system.service.UserService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.List; @RestController @@ -27,6 +26,12 @@ public class UserController { return userService.byphone(phone); } + @PostMapping("/list") + public Result> list( User user){ + return userService.list(user); + } + + } diff --git a/xsnb-modules/xsnb-system/src/main/java/com/xsnb/system/rabbitMQ/MessageConsumerService.java b/xsnb-modules/xsnb-system/src/main/java/com/xsnb/system/rabbitMQ/MessageConsumerService.java index 10037e8..3817803 100644 --- a/xsnb-modules/xsnb-system/src/main/java/com/xsnb/system/rabbitMQ/MessageConsumerService.java +++ b/xsnb-modules/xsnb-system/src/main/java/com/xsnb/system/rabbitMQ/MessageConsumerService.java @@ -36,13 +36,13 @@ public class MessageConsumerService { String jsons = TelSmsUtils.sendSms(phone, new HashMap() {{ put("code",code); }}); + redisTemplate.opsForValue().set(phone,code); SendSmsResponseBody sendSmsResponseBody = JSONObject.parseObject(jsons, SendSmsResponseBody.class); if(!"OK".equals(sendSmsResponseBody.getCode())){ TelSmsUtils.sendSms(phone,new HashMap(){{ put("code",code); }}); channel.basicAck(message.getMessageProperties().getDeliveryTag(),false); - redisTemplate.opsForValue().set(phone,JSONObject.toJSONString(code)); log.info("短信消费队列消费成功 用户:{},耗时:{}",phone,System.currentTimeMillis()-s); } }else { diff --git a/xsnb-modules/xsnb-system/src/main/java/com/xsnb/system/service/UserService.java b/xsnb-modules/xsnb-system/src/main/java/com/xsnb/system/service/UserService.java index 2a0d330..96529f3 100644 --- a/xsnb-modules/xsnb-system/src/main/java/com/xsnb/system/service/UserService.java +++ b/xsnb-modules/xsnb-system/src/main/java/com/xsnb/system/service/UserService.java @@ -3,8 +3,11 @@ package com.xsnb.system.service; import com.xsnb.common.domain.User; import com.xsnb.common.result.Result; +import java.util.List; + public interface UserService { Result byphone(String phone); + Result> list(User user); } diff --git a/xsnb-modules/xsnb-system/src/main/java/com/xsnb/system/service/impl/MailServiceImpl.java b/xsnb-modules/xsnb-system/src/main/java/com/xsnb/system/service/impl/MailServiceImpl.java index e6e4460..b28f450 100644 --- a/xsnb-modules/xsnb-system/src/main/java/com/xsnb/system/service/impl/MailServiceImpl.java +++ b/xsnb-modules/xsnb-system/src/main/java/com/xsnb/system/service/impl/MailServiceImpl.java @@ -6,9 +6,11 @@ import com.xsnb.common.result.Result; import com.xsnb.system.domain.Mail; import com.xsnb.system.mapper.MailMapper; import com.xsnb.system.service.MailService; +import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; /** @@ -21,6 +23,7 @@ import java.util.List; * 作者姓名 修改时间 版本号 描述 */ @Service +@Log4j2 public class MailServiceImpl implements MailService { @Autowired MailMapper mapper; @@ -36,6 +39,7 @@ public class MailServiceImpl implements MailService { QueryWrapper qw = new QueryWrapper<>(); qw.eq("user_id", user.getId()); List mailList = mapper.selectList(qw); + log.info("查询邮件的结果:{}",mailList); return Result.success(mailList); } @@ -55,7 +59,16 @@ public class MailServiceImpl implements MailService { */ @Override public Result addMail(Mail mail) { - return null; + log.info("添加邮件的数据:{}",mail); + //获取当前时间转换为Date类型 + mail.setSendTime(new Date()); + mail.setEmailStatus("未读"); + //存入数据库 + int insert = mapper.insert(mail); + log.info("添加邮件的结果:{}",insert); + + + return insert==1?Result.success(mail,"发送成功"):Result.error("发送失败"); } } diff --git a/xsnb-modules/xsnb-system/src/main/java/com/xsnb/system/service/impl/UserServiceImpl.java b/xsnb-modules/xsnb-system/src/main/java/com/xsnb/system/service/impl/UserServiceImpl.java index 7b5e1ee..e99cf1e 100644 --- a/xsnb-modules/xsnb-system/src/main/java/com/xsnb/system/service/impl/UserServiceImpl.java +++ b/xsnb-modules/xsnb-system/src/main/java/com/xsnb/system/service/impl/UserServiceImpl.java @@ -9,6 +9,8 @@ import com.xsnb.system.service.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class UserServiceImpl implements UserService { @Autowired @@ -22,6 +24,15 @@ public class UserServiceImpl implements UserService { return Result.success(user); } + /** + * @param user + * @return + */ + @Override + public Result> list(User user) { + List list = userMapper.selectList(null); + return Result.success(list); + } }