diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 0b806a0..e45a93c 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -14,9 +14,13 @@ + + + + diff --git a/bwie-auth/src/main/java/com/bwie/auth/constart/AddInfoQueue.java b/bwie-auth/src/main/java/com/bwie/auth/constart/AddInfoQueue.java new file mode 100644 index 0000000..3d0caa7 --- /dev/null +++ b/bwie-auth/src/main/java/com/bwie/auth/constart/AddInfoQueue.java @@ -0,0 +1,46 @@ +package com.bwie.auth.constart; + +import com.bwie.auth.feign.UserFeignService; +import com.bwie.common.constants.RabbitMQQueueConstants; +import com.bwie.common.domain.Info; +import com.rabbitmq.client.Channel; +import lombok.extern.log4j.Log4j2; +import org.springframework.amqp.core.Message; +import org.springframework.amqp.rabbit.annotation.Queue; +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Component; + +@Component +@Log4j2 +public class AddInfoQueue { + @Autowired + RedisTemplate redisTemplate; + @Autowired + UserFeignService userFeignService; + + @RabbitListener(queuesToDeclare = {@Queue(RabbitMQQueueConstants.LONG_LOG_QUEUE)}) + public void addInfo(Message message, Info info, Channel channel){ + log.info("开始记录日志"); + String messageId = message.getMessageProperties().getMessageId(); + try { + Long l = redisTemplate.opsForSet().add(RabbitMQQueueConstants.LONG_LOG_QUEUE,messageId); + if (l==1){ + userFeignService.addInfo(info); + channel.basicAck(message.getMessageProperties().getDeliveryTag(),false); + log.info("日志添加成功"); + }else{ + log.info("日志已添加,请勿重复添加"); + } + }catch (Exception e){ + try { + channel.basicReject(message.getMessageProperties().getDeliveryTag(),true); + redisTemplate.opsForSet().remove(RabbitMQQueueConstants.LONG_LOG_QUEUE,messageId); + }catch (Exception e1){ + e1.printStackTrace(); + } + e.printStackTrace(); + } + } +} diff --git a/bwie-auth/src/main/java/com/bwie/auth/feign/UserFeignService.java b/bwie-auth/src/main/java/com/bwie/auth/feign/UserFeignService.java index 1dabef3..c9be041 100644 --- a/bwie-auth/src/main/java/com/bwie/auth/feign/UserFeignService.java +++ b/bwie-auth/src/main/java/com/bwie/auth/feign/UserFeignService.java @@ -1,13 +1,18 @@ package com.bwie.auth.feign; +import com.bwie.common.domain.Info; import com.bwie.common.domain.User; import com.bwie.common.result.Result; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; @FeignClient("bwie-user") public interface UserFeignService { @GetMapping("/findByPhone/{phone}") public Result findByPhone(@PathVariable String phone); + @PostMapping("/addInfo") + public Result addInfo(@RequestBody Info info); } diff --git a/bwie-auth/src/main/java/com/bwie/auth/service/AuthServiceimpl.java b/bwie-auth/src/main/java/com/bwie/auth/service/AuthServiceimpl.java index cb49a33..562cbd2 100644 --- a/bwie-auth/src/main/java/com/bwie/auth/service/AuthServiceimpl.java +++ b/bwie-auth/src/main/java/com/bwie/auth/service/AuthServiceimpl.java @@ -1,12 +1,12 @@ package com.bwie.auth.service; -import cn.hutool.core.util.RandomUtil; import com.alibaba.fastjson.JSONObject; -import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A; import com.bwie.auth.feign.UserFeignService; import com.bwie.common.constants.JwtConstants; import com.bwie.common.constants.RabbitMQQueueConstants; import com.bwie.common.constants.TokenConstants; +import com.bwie.common.domain.AddInfo; +import com.bwie.common.domain.Info; import com.bwie.common.domain.User; import com.bwie.common.domain.request.LoginRequest; import com.bwie.common.domain.response.JwtResponse; @@ -19,6 +19,7 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; +import java.util.Date; import java.util.HashMap; import java.util.UUID; import java.util.concurrent.TimeUnit; @@ -58,34 +59,46 @@ public class AuthServiceimpl implements AuthService{ @Override public Result login(LoginRequest loginRequest) { + Info info = new Info(); + info.setCreateTime(new Date()); if (!vailPhone(loginRequest.getPhone())){ + addLog(loginRequest.getPhone(), AddInfo.LOG_INFO,"手机号格式错误"); return Result.error("手机号格式错误"); } Result byPhone = userFeignService.findByPhone(loginRequest.getPhone()); User user = byPhone.getData(); if (user==null){ + addLog(loginRequest.getPhone(),AddInfo.LOG_INFO,"手机号或密码不能为空"); return Result.error("手机号或密码不能为空"); } String code = redisTemplate.opsForValue().get(loginRequest.getPhone()); if (StringUtils.isEmpty(code)){ + addLog(loginRequest.getPhone(),AddInfo.LOG_INFO,"请注册"); return Result.error("请注册"); } if (!code.equals(loginRequest.getCode())){ + addLog(loginRequest.getPhone(),AddInfo.LOG_INFO,"验证码错误"); return Result.error("验证码错误"); } if (loginRequest.getUserPwd()==null){ + addLog(loginRequest.getPhone(),AddInfo.LOG_INFO,"密码不能为空"); return Result.error("密码不能为空"); } if (!vailPwd(loginRequest.getUserPwd())){ + addLog(loginRequest.getPhone(),AddInfo.LOG_INFO,"密码最少六位,包含一个大写字母和一个小写字母和一个数字和一个特殊字符"); return Result.error("密码最少六位,包含一个大写字母和一个小写字母和一个数字和一个特殊字符"); } if (vailPwd2(loginRequest.getUserPwd())){ + addLog(loginRequest.getPhone(),AddInfo.LOG_INFO,"密码不能为空"); return Result.error("密码不能为空"); } if (!user.getUserPwd().equals(loginRequest.getUserPwd())){ + addLog(loginRequest.getPhone(),AddInfo.LOG_INFO,"密码错误"); return Result.error("密码错误"); } + addLog(loginRequest.getPhone(),AddInfo.LOG_SUCCESS,"登陆成功"); + String userKey = UUID.randomUUID().toString().replaceAll("-", ""); HashMap claims = new HashMap<>(); claims.put(JwtConstants.USER_KEY,userKey); @@ -93,6 +106,8 @@ public class AuthServiceimpl implements AuthService{ redisTemplate.opsForValue().set(TokenConstants.LOGIN_TOKEN_KEY+userKey, JSONObject.toJSONString(user),30, TimeUnit.MINUTES); + + JwtResponse jwtResponse = new JwtResponse(); jwtResponse.setTime("30MIN"); jwtResponse.setToken(token); @@ -129,4 +144,16 @@ public class AuthServiceimpl implements AuthService{ return compile.matcher(userPwd).matches(); } + public void addLog(String userName,Integer isOk,String pormenInfo){ + Info info = new Info(); + info.setCreateTime(new Date()); + info.setUserName(userName); + info.setIsOk(isOk); + info.setPromenInfo(pormenInfo); + rabbitTemplate.convertAndSend(RabbitMQQueueConstants.LONG_LOG_QUEUE,info,message -> { + message.getMessageProperties().setMessageId(UUID.randomUUID().toString().replaceAll("-","")); + return message; + }); + } + } diff --git a/bwie-auth/target/bwie-auth-1.0-SNAPSHOT.jar b/bwie-auth/target/bwie-auth-1.0-SNAPSHOT.jar index a8babfe..02b6f9e 100644 Binary files a/bwie-auth/target/bwie-auth-1.0-SNAPSHOT.jar and b/bwie-auth/target/bwie-auth-1.0-SNAPSHOT.jar differ diff --git a/bwie-auth/target/classes/com/bwie/auth/constart/AddInfoQueue.class b/bwie-auth/target/classes/com/bwie/auth/constart/AddInfoQueue.class new file mode 100644 index 0000000..47318d9 Binary files /dev/null and b/bwie-auth/target/classes/com/bwie/auth/constart/AddInfoQueue.class differ diff --git a/bwie-auth/target/classes/com/bwie/auth/feign/UserFeignService.class b/bwie-auth/target/classes/com/bwie/auth/feign/UserFeignService.class index 6aea9af..b81dcc6 100644 Binary files a/bwie-auth/target/classes/com/bwie/auth/feign/UserFeignService.class and b/bwie-auth/target/classes/com/bwie/auth/feign/UserFeignService.class differ diff --git a/bwie-auth/target/classes/com/bwie/auth/service/AuthServiceimpl.class b/bwie-auth/target/classes/com/bwie/auth/service/AuthServiceimpl.class index 3ba83e6..67792f3 100644 Binary files a/bwie-auth/target/classes/com/bwie/auth/service/AuthServiceimpl.class and b/bwie-auth/target/classes/com/bwie/auth/service/AuthServiceimpl.class differ diff --git a/bwie-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/bwie-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 3ba0280..8e06483 100644 --- a/bwie-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/bwie-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,6 +1,7 @@ com\bwie\auth\config\ConfirmCallbackConfig.class com\bwie\auth\service\AuthServiceimpl.class com\bwie\auth\controller\AuthController.class +com\bwie\auth\constart\AddInfoQueue.class com\bwie\auth\feign\UserFeignService.class com\bwie\auth\AuthApp.class com\bwie\auth\service\AuthService.class diff --git a/bwie-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/bwie-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index a2ed063..6118cb1 100644 --- a/bwie-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/bwie-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -2,6 +2,7 @@ D:\zhuangao5\safeway\bwie-auth\src\main\java\com\bwie\auth\AuthApp.java D:\zhuangao5\safeway\bwie-auth\src\main\java\com\bwie\auth\config\ConfirmCallbackConfig.java D:\zhuangao5\safeway\bwie-auth\src\main\java\com\bwie\auth\feign\UserFeignService.java D:\zhuangao5\safeway\bwie-auth\src\main\java\com\bwie\auth\service\AuthService.java +D:\zhuangao5\safeway\bwie-auth\src\main\java\com\bwie\auth\constart\AddInfoQueue.java D:\zhuangao5\safeway\bwie-auth\src\main\java\com\bwie\auth\controller\AuthController.java D:\zhuangao5\safeway\bwie-auth\src\main\java\com\bwie\auth\service\AuthServiceimpl.java D:\zhuangao5\safeway\bwie-auth\src\main\java\com\bwie\auth\config\ReturnCallbackConfig.java diff --git a/bwie-common/src/main/java/com/bwie/common/domain/AddInfo.java b/bwie-common/src/main/java/com/bwie/common/domain/AddInfo.java new file mode 100644 index 0000000..3c0800b --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/AddInfo.java @@ -0,0 +1,6 @@ +package com.bwie.common.domain; + +public class AddInfo { + public static final Integer LOG_INFO=1; + public static final Integer LOG_SUCCESS=2; +} diff --git a/bwie-common/src/main/java/com/bwie/common/domain/Info.java b/bwie-common/src/main/java/com/bwie/common/domain/Info.java new file mode 100644 index 0000000..3682ea6 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/Info.java @@ -0,0 +1,15 @@ +package com.bwie.common.domain; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class Info implements Serializable { + private Integer id; + private String userName; + private Date createTime; + private Integer isOk; + private String promenInfo; +} diff --git a/bwie-common/src/main/java/com/bwie/common/domain/Provider.java b/bwie-common/src/main/java/com/bwie/common/domain/Provider.java new file mode 100644 index 0000000..08fe535 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/Provider.java @@ -0,0 +1,18 @@ +package com.bwie.common.domain; + +import lombok.Data; + +import java.util.Date; + +@Data +public class Provider { + private Integer listId; + private Integer merchId; + private String merchName; + private String merchType; + private Double merchPrice; + private Integer planNum; + private Date importDate; + private Integer providerId; + private String providerName; +} diff --git a/bwie-common/src/main/java/com/bwie/common/domain/request/ProviderRequest.java b/bwie-common/src/main/java/com/bwie/common/domain/request/ProviderRequest.java new file mode 100644 index 0000000..35aed1b --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/request/ProviderRequest.java @@ -0,0 +1,4 @@ +package com.bwie.common.domain.request; + +public class ProviderRequest { +} diff --git a/bwie-common/target/bwie-common-1.0-SNAPSHOT.jar b/bwie-common/target/bwie-common-1.0-SNAPSHOT.jar index 9bebf4e..9e1a8f0 100644 Binary files a/bwie-common/target/bwie-common-1.0-SNAPSHOT.jar and b/bwie-common/target/bwie-common-1.0-SNAPSHOT.jar differ diff --git a/bwie-common/target/classes/com/bwie/common/domain/AddInfo.class b/bwie-common/target/classes/com/bwie/common/domain/AddInfo.class new file mode 100644 index 0000000..92533a0 Binary files /dev/null and b/bwie-common/target/classes/com/bwie/common/domain/AddInfo.class differ diff --git a/bwie-common/target/classes/com/bwie/common/domain/Info.class b/bwie-common/target/classes/com/bwie/common/domain/Info.class new file mode 100644 index 0000000..6a251a0 Binary files /dev/null and b/bwie-common/target/classes/com/bwie/common/domain/Info.class differ diff --git a/bwie-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/bwie-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 61b2c7d..3e5fbbe 100644 --- a/bwie-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/bwie-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,23 +1,25 @@ -com\bwie\common\domain\Merch.class com\bwie\common\domain\request\VipRequest.class com\bwie\common\result\PageResult.class -com\bwie\common\domain\request\LoginRequest.class com\bwie\common\domain\User.class +com\bwie\common\utils\JwtUtils.class +com\bwie\common\constants\Constants.class +com\bwie\common\domain\Vip.class +com\bwie\common\domain\Info.class +com\bwie\common\domain\Customer.class +com\bwie\common\constants\RabbitName.class +com\bwie\common\domain\Merch.class +com\bwie\common\domain\request\LoginRequest.class com\bwie\common\utils\TelSmsUtils.class com\bwie\common\domain\request\CustomerRequest.class -com\bwie\common\utils\JwtUtils.class com\bwie\common\constants\RabbitMQQueueConstants.class com\bwie\common\utils\StringUtils.class com\bwie\common\constants\JwtConstants.class -com\bwie\common\constants\Constants.class +com\bwie\common\domain\AddInfo.class com\bwie\common\domain\request\MerchRequest.class com\bwie\common\constants\TokenConstants.class com\bwie\common\utils\OssUtil.class com\bwie\common\result\Result.class -com\bwie\common\domain\Vip.class com\bwie\common\domain\request\UserRequest.class com\bwie\common\config\RedisConfig.class -com\bwie\common\domain\Customer.class com\bwie\common\utils\FastUtil.class -com\bwie\common\constants\RabbitName.class com\bwie\common\domain\response\JwtResponse.class diff --git a/bwie-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/bwie-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index dbe0118..ef9b69b 100644 --- a/bwie-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/bwie-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,23 +1,25 @@ -D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\utils\OssUtil.java D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\domain\request\UserRequest.java D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\result\Result.java D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\utils\JwtUtils.java -D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\config\RedisConfig.java +D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\domain\AddInfo.java D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\utils\StringUtils.java D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\domain\request\CustomerRequest.java +D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\domain\request\VipRequest.java +D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\constants\RabbitName.java +D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\constants\Constants.java +D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\constants\JwtConstants.java +D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\domain\Info.java +D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\domain\Merch.java +D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\utils\OssUtil.java +D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\config\RedisConfig.java D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\domain\request\MerchRequest.java D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\domain\Vip.java D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\constants\RabbitMQQueueConstants.java -D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\domain\request\VipRequest.java D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\utils\FastUtil.java -D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\constants\RabbitName.java D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\domain\request\LoginRequest.java D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\domain\Customer.java -D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\constants\Constants.java D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\domain\response\JwtResponse.java -D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\constants\JwtConstants.java D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\constants\TokenConstants.java -D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\domain\Merch.java D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\domain\User.java D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\result\PageResult.java D:\zhuangao5\safeway\bwie-common\src\main\java\com\bwie\common\utils\TelSmsUtils.java diff --git a/bwie-gateway/src/main/java/com/bwie/gateway/filters/AuthFilter.java b/bwie-gateway/src/main/java/com/bwie/gateway/filters/AuthFilter.java index b833ce6..2f54eaa 100644 --- a/bwie-gateway/src/main/java/com/bwie/gateway/filters/AuthFilter.java +++ b/bwie-gateway/src/main/java/com/bwie/gateway/filters/AuthFilter.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.bwie.common.constants.TokenConstants; +import com.bwie.common.domain.User; import com.bwie.common.utils.JwtUtils; import com.bwie.common.utils.StringUtils; import com.bwie.gateway.config.IgnoreWhiteConfig; @@ -74,17 +75,7 @@ public class AuthFilter implements GlobalFilter, Ordered { if (null == hasKey || !hasKey) { return GatewayUtils.errorResponse(exchange, "token过期！"); } - redisTemplate.expire(TokenConstants.LOGIN_TOKEN_KEY + userKey, 15, TimeUnit.MINUTES); - // String jsonStr = redisTemplate.opsForValue().get(TokenConstants.LOGIN_TOKEN_KEY + userKey); - // SysUser sysUser = JSONObject.parseObject(jsonStr, SysUser.class); - - // Date lastLoginTime = sysUser.getLastLoginTime(); - - // long between = DateUtil.between(lastLoginTime, new Date(), DateUnit.MINUTE); - // if (between >= 10) { - // redisTemplate.expire(TokenConstants.LOGIN_TOKEN_KEY + userKey, 15, TimeUnit.MINUTES); - // } - // 验证通过放行 + redisTemplate.opsForValue().get(TokenConstants.LOGIN_TOKEN_KEY + userKey); return chain.filter(exchange); } diff --git a/bwie-gateway/target/bwie-gateway-1.0-SNAPSHOT.jar b/bwie-gateway/target/bwie-gateway-1.0-SNAPSHOT.jar index 2a03cd8..03d5e55 100644 Binary files a/bwie-gateway/target/bwie-gateway-1.0-SNAPSHOT.jar and b/bwie-gateway/target/bwie-gateway-1.0-SNAPSHOT.jar differ diff --git a/bwie-gateway/target/classes/com/bwie/gateway/filters/AuthFilter.class b/bwie-gateway/target/classes/com/bwie/gateway/filters/AuthFilter.class index 9c008d4..7f576c1 100644 Binary files a/bwie-gateway/target/classes/com/bwie/gateway/filters/AuthFilter.class and b/bwie-gateway/target/classes/com/bwie/gateway/filters/AuthFilter.class differ diff --git a/bwie-moudels/bwie-customer/target/bwie-customer-1.0-SNAPSHOT.jar b/bwie-moudels/bwie-customer/target/bwie-customer-1.0-SNAPSHOT.jar index b5af22f..5cdb385 100644 Binary files a/bwie-moudels/bwie-customer/target/bwie-customer-1.0-SNAPSHOT.jar and b/bwie-moudels/bwie-customer/target/bwie-customer-1.0-SNAPSHOT.jar differ diff --git a/bwie-moudels/bwie-merch/target/bwie-merch-1.0-SNAPSHOT.jar b/bwie-moudels/bwie-merch/target/bwie-merch-1.0-SNAPSHOT.jar index a619824..f6876d5 100644 Binary files a/bwie-moudels/bwie-merch/target/bwie-merch-1.0-SNAPSHOT.jar and b/bwie-moudels/bwie-merch/target/bwie-merch-1.0-SNAPSHOT.jar differ diff --git a/bwie-moudels/bwie-rabbit/target/bwie-rabbit-1.0-SNAPSHOT.jar b/bwie-moudels/bwie-rabbit/target/bwie-rabbit-1.0-SNAPSHOT.jar index 57ae450..ff0fab7 100644 Binary files a/bwie-moudels/bwie-rabbit/target/bwie-rabbit-1.0-SNAPSHOT.jar and b/bwie-moudels/bwie-rabbit/target/bwie-rabbit-1.0-SNAPSHOT.jar differ diff --git a/bwie-moudels/bwie-user/src/main/java/com/bwie/user/controller/UserController.java b/bwie-moudels/bwie-user/src/main/java/com/bwie/user/controller/UserController.java index c4ca028..f1b5b33 100644 --- a/bwie-moudels/bwie-user/src/main/java/com/bwie/user/controller/UserController.java +++ b/bwie-moudels/bwie-user/src/main/java/com/bwie/user/controller/UserController.java @@ -1,6 +1,7 @@ package com.bwie.user.controller; import com.alibaba.fastjson.JSONObject; +import com.bwie.common.domain.Info; import com.bwie.common.domain.User; import com.bwie.common.domain.request.UserRequest; import com.bwie.common.result.PageResult; @@ -94,4 +95,15 @@ public class UserController { request.getMethod(),JSONObject.toJSONString(result)); return result; } + + @PostMapping("/addInfo") + public Result addInfo(@RequestBody Info info){ + log.info("执行操作:添加日志,请求URL:{},请求方式:{},请求参数:{}",request.getRequestURI(), + request.getMethod(),JSONObject.toJSONString(info)); + Result result=Result.success(); + userService.addInfo(info); + log.info("执行操作:添加日志,请求URL:{},请求方式:{},请求参数:{}",request.getRequestURI(), + request.getMethod(),JSONObject.toJSONString(result)); + return result; + } } diff --git a/bwie-moudels/bwie-user/src/main/java/com/bwie/user/mapper/UserMapper.java b/bwie-moudels/bwie-user/src/main/java/com/bwie/user/mapper/UserMapper.java index adb02eb..9c31995 100644 --- a/bwie-moudels/bwie-user/src/main/java/com/bwie/user/mapper/UserMapper.java +++ b/bwie-moudels/bwie-user/src/main/java/com/bwie/user/mapper/UserMapper.java @@ -1,5 +1,6 @@ package com.bwie.user.mapper; +import com.bwie.common.domain.Info; import com.bwie.common.domain.User; import com.bwie.common.domain.request.UserRequest; import org.apache.ibatis.annotations.Mapper; @@ -23,4 +24,6 @@ public interface UserMapper { void deleteId(Integer userId); List list2(UserRequest userRequest); + + void addInfo(Info info); } diff --git a/bwie-moudels/bwie-user/src/main/java/com/bwie/user/service/UserService.java b/bwie-moudels/bwie-user/src/main/java/com/bwie/user/service/UserService.java index a1a9109..da17c00 100644 --- a/bwie-moudels/bwie-user/src/main/java/com/bwie/user/service/UserService.java +++ b/bwie-moudels/bwie-user/src/main/java/com/bwie/user/service/UserService.java @@ -1,5 +1,6 @@ package com.bwie.user.service; +import com.bwie.common.domain.Info; import com.bwie.common.domain.User; import com.bwie.common.domain.request.UserRequest; import com.bwie.common.result.PageResult; @@ -19,4 +20,6 @@ public interface UserService { void deleteId(Integer userId); Result> list2(UserRequest userRequest); + + void addInfo(Info info); } diff --git a/bwie-moudels/bwie-user/src/main/java/com/bwie/user/service/UserServiceimpl.java b/bwie-moudels/bwie-user/src/main/java/com/bwie/user/service/UserServiceimpl.java index e2833e4..3b7922f 100644 --- a/bwie-moudels/bwie-user/src/main/java/com/bwie/user/service/UserServiceimpl.java +++ b/bwie-moudels/bwie-user/src/main/java/com/bwie/user/service/UserServiceimpl.java @@ -2,6 +2,7 @@ package com.bwie.user.service; import com.alibaba.fastjson.JSONObject; import com.bwie.common.constants.TokenConstants; +import com.bwie.common.domain.Info; import com.bwie.common.domain.User; import com.bwie.common.domain.request.UserRequest; import com.bwie.common.result.PageResult; @@ -66,6 +67,11 @@ public class UserServiceimpl implements UserService{ return PageResult.toResult(info.getTotal(),list2); } + @Override + public void addInfo(Info info) { + userMapper.addInfo(info); + } + public User info() { String token = request.getHeader(TokenConstants.TOKEN); diff --git a/bwie-moudels/bwie-user/src/main/resources/mapper/UserMapper.xml b/bwie-moudels/bwie-user/src/main/resources/mapper/UserMapper.xml index 3639b37..9fa4ca1 100644 --- a/bwie-moudels/bwie-user/src/main/resources/mapper/UserMapper.xml +++ b/bwie-moudels/bwie-user/src/main/resources/mapper/UserMapper.xml @@ -30,6 +30,19 @@ now() ) + + insert into t_info( + user_name, + create_time, + is_ok, + promen_info + ) values ( + #{userName}, + #{createTime}, + #{isOk}, + #{promenInfo} + ) + update t_user set user_name=#{userName}, diff --git a/bwie-moudels/bwie-user/target/bwie-user-1.0-SNAPSHOT.jar b/bwie-moudels/bwie-user/target/bwie-user-1.0-SNAPSHOT.jar index 7311209..0c031fd 100644 Binary files a/bwie-moudels/bwie-user/target/bwie-user-1.0-SNAPSHOT.jar and b/bwie-moudels/bwie-user/target/bwie-user-1.0-SNAPSHOT.jar differ diff --git a/bwie-moudels/bwie-user/target/classes/com/bwie/user/controller/UserController.class b/bwie-moudels/bwie-user/target/classes/com/bwie/user/controller/UserController.class index a5d124d..c76e3e0 100644 Binary files a/bwie-moudels/bwie-user/target/classes/com/bwie/user/controller/UserController.class and b/bwie-moudels/bwie-user/target/classes/com/bwie/user/controller/UserController.class differ diff --git a/bwie-moudels/bwie-user/target/classes/com/bwie/user/mapper/UserMapper.class b/bwie-moudels/bwie-user/target/classes/com/bwie/user/mapper/UserMapper.class index eeaa3b7..02a25d0 100644 Binary files a/bwie-moudels/bwie-user/target/classes/com/bwie/user/mapper/UserMapper.class and b/bwie-moudels/bwie-user/target/classes/com/bwie/user/mapper/UserMapper.class differ diff --git a/bwie-moudels/bwie-user/target/classes/com/bwie/user/service/UserService.class b/bwie-moudels/bwie-user/target/classes/com/bwie/user/service/UserService.class index d2fd16e..f9cc727 100644 Binary files a/bwie-moudels/bwie-user/target/classes/com/bwie/user/service/UserService.class and b/bwie-moudels/bwie-user/target/classes/com/bwie/user/service/UserService.class differ diff --git a/bwie-moudels/bwie-user/target/classes/com/bwie/user/service/UserServiceimpl.class b/bwie-moudels/bwie-user/target/classes/com/bwie/user/service/UserServiceimpl.class index d630df0..96693f6 100644 Binary files a/bwie-moudels/bwie-user/target/classes/com/bwie/user/service/UserServiceimpl.class and b/bwie-moudels/bwie-user/target/classes/com/bwie/user/service/UserServiceimpl.class differ diff --git a/bwie-moudels/bwie-user/target/classes/mapper/UserMapper.xml b/bwie-moudels/bwie-user/target/classes/mapper/UserMapper.xml index 3639b37..9fa4ca1 100644 --- a/bwie-moudels/bwie-user/target/classes/mapper/UserMapper.xml +++ b/bwie-moudels/bwie-user/target/classes/mapper/UserMapper.xml @@ -30,6 +30,19 @@ now() ) + + insert into t_info( + user_name, + create_time, + is_ok, + promen_info + ) values ( + #{userName}, + #{createTime}, + #{isOk}, + #{promenInfo} + ) + update t_user set user_name=#{userName}, diff --git a/bwie-moudels/bwie-vip/target/bwie-vip-1.0-SNAPSHOT.jar b/bwie-moudels/bwie-vip/target/bwie-vip-1.0-SNAPSHOT.jar index 4f9e0ad..a5395b6 100644 Binary files a/bwie-moudels/bwie-vip/target/bwie-vip-1.0-SNAPSHOT.jar and b/bwie-moudels/bwie-vip/target/bwie-vip-1.0-SNAPSHOT.jar differ