commit fc60eca2cb3bc6826175d522f39542638289acec Author: zhang chengzhi <3144712872@qq.com> Date: Wed Jul 31 08:51:11 2024 +0800 周考7.30 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3e403e3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,35 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store diff --git a/bwie-auth/pom.xml b/bwie-auth/pom.xml new file mode 100644 index 0000000..d5d8d49 --- /dev/null +++ b/bwie-auth/pom.xml @@ -0,0 +1,51 @@ + + + 4.0.0 + + com.bwie + week_7.30_house + 1.0-SNAPSHOT + + + bwie-auth + + + 17 + 17 + UTF-8 + + + + + + com.bwie + bwie-common + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.boot + spring-boot-starter-test + test + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + + + + + org.springframework.kafka + spring-kafka + + + + + diff --git a/bwie-auth/src/main/java/com/bwie/auth/AuthApplication.java b/bwie-auth/src/main/java/com/bwie/auth/AuthApplication.java new file mode 100644 index 0000000..b1220cc --- /dev/null +++ b/bwie-auth/src/main/java/com/bwie/auth/AuthApplication.java @@ -0,0 +1,22 @@ +package com.bwie.auth; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.auth + * @Project：week_7.30_house + * @name：AuthApplication + * @Date：2024/7/30 9:38 + */ +@SpringBootApplication +@EnableFeignClients +public class AuthApplication { + + public static void main(String[] args) { + SpringApplication.run(AuthApplication.class); + } + +} diff --git a/bwie-auth/src/main/java/com/bwie/auth/config/ConfirmCallbackConfig.java b/bwie-auth/src/main/java/com/bwie/auth/config/ConfirmCallbackConfig.java new file mode 100644 index 0000000..496c331 --- /dev/null +++ b/bwie-auth/src/main/java/com/bwie/auth/config/ConfirmCallbackConfig.java @@ -0,0 +1,39 @@ +package com.bwie.auth.config; + +import org.springframework.amqp.rabbit.connection.CorrelationData; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; + +@Component +public class ConfirmCallbackConfig implements RabbitTemplate.ConfirmCallback { + + @Autowired + private RabbitTemplate rabbitTemplate; + + /** + * 当前bean初始化的时候执行 + */ + @PostConstruct + public void init() { + this.rabbitTemplate.setConfirmCallback(this); + } + + /** + * 确认方法 + * @param correlationData correlation data for the callback. + * @param ack true for ack, false for nack + * @param cause An optional cause, for nack, when available, otherwise null. + */ + @Override + public void confirm(CorrelationData correlationData, boolean ack, String cause) { + if (ack) { + System.out.println("消息发送到 broker 成功"); + } else { + System.out.println("消息发送到 broker 失败，失败的原因：" + cause); + } + } + +} diff --git a/bwie-auth/src/main/java/com/bwie/auth/config/InitPasswordEncode.java b/bwie-auth/src/main/java/com/bwie/auth/config/InitPasswordEncode.java new file mode 100644 index 0000000..bc203b7 --- /dev/null +++ b/bwie-auth/src/main/java/com/bwie/auth/config/InitPasswordEncode.java @@ -0,0 +1,21 @@ +package com.bwie.auth.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.stereotype.Component; + +/** + * @Author：zcz + * @Package：com.bwie.auth.config + * @Project：zuoye4.9 + * @name：InitPasswordEncode + * @Date：2024/4/10 7:36 + */ +@Component +public class InitPasswordEncode { + + @Bean + public BCryptPasswordEncoder bCryptPasswordEncoder(){ + return new BCryptPasswordEncoder(); + } +} diff --git a/bwie-auth/src/main/java/com/bwie/auth/config/RabbitAdminConfig.java b/bwie-auth/src/main/java/com/bwie/auth/config/RabbitAdminConfig.java new file mode 100644 index 0000000..d2abf6c --- /dev/null +++ b/bwie-auth/src/main/java/com/bwie/auth/config/RabbitAdminConfig.java @@ -0,0 +1,53 @@ +package com.bwie.auth.config; + +import org.springframework.amqp.rabbit.connection.CachingConnectionFactory; +import org.springframework.amqp.rabbit.connection.ConnectionFactory; +import org.springframework.amqp.rabbit.core.RabbitAdmin; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * RabbitAdmin是RabbitMQ的一个Java客户端库，它提供了管理RabbitMQ资源的功能。它是通过与RabbitMQ服务器进行交互来执行管理操作的。 + */ +@Configuration +public class RabbitAdminConfig { + + @Value("${spring.rabbitmq.host}") + private String host; + @Value("${spring.rabbitmq.username}") + private String username; + @Value("${spring.rabbitmq.password}") + private String password; + @Value("${spring.rabbitmq.virtualhost}") + private String virtualhost; + + /** + * 构建 RabbitMQ的连接工厂 + * @return + */ + @Bean + public ConnectionFactory connectionFactory() { + CachingConnectionFactory connectionFactory = new CachingConnectionFactory(); + connectionFactory.setAddresses(host); + connectionFactory.setUsername(username); + connectionFactory.setPassword(password); + connectionFactory.setVirtualHost(virtualhost); + // 配置发送确认回调时，次配置必须配置，否则即使在RabbitTemplate配置了ConfirmCallback也不会生效 + connectionFactory.setPublisherConfirmType(CachingConnectionFactory.ConfirmType.CORRELATED); + connectionFactory.setPublisherReturns(true); + return connectionFactory; + } + + /** + * 自己初始化 RabbitAdmin + * @param connectionFactory + * @return + */ + @Bean + public RabbitAdmin rabbitAdmin(ConnectionFactory connectionFactory) { + RabbitAdmin rabbitAdmin = new RabbitAdmin(connectionFactory); + rabbitAdmin.setAutoStartup(true); + return rabbitAdmin; + } +} diff --git a/bwie-auth/src/main/java/com/bwie/auth/config/RabbitmqConfig.java b/bwie-auth/src/main/java/com/bwie/auth/config/RabbitmqConfig.java new file mode 100644 index 0000000..1e00413 --- /dev/null +++ b/bwie-auth/src/main/java/com/bwie/auth/config/RabbitmqConfig.java @@ -0,0 +1,22 @@ +package com.bwie.auth.config; + +import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter; +import org.springframework.amqp.support.converter.MessageConverter; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * 自定义消息转换器 + */ +@Configuration +public class RabbitmqConfig { + /** + * 消息转换配置 + * + * @return + */ + @Bean + public MessageConverter jsonMessageConverter() { + return new Jackson2JsonMessageConverter(); + } +} diff --git a/bwie-auth/src/main/java/com/bwie/auth/config/ReturnCallbackConfig.java b/bwie-auth/src/main/java/com/bwie/auth/config/ReturnCallbackConfig.java new file mode 100644 index 0000000..a06ebdc --- /dev/null +++ b/bwie-auth/src/main/java/com/bwie/auth/config/ReturnCallbackConfig.java @@ -0,0 +1,36 @@ +package com.bwie.auth.config; + +import org.springframework.amqp.core.ReturnedMessage; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; + +/** + * 消息发送到 队列的回调 + */ +@Component +public class ReturnCallbackConfig implements RabbitTemplate.ReturnsCallback { + + @Autowired + private RabbitTemplate rabbitTemplate; + + @PostConstruct + public void init() { + rabbitTemplate.setReturnsCallback(this); + } + + /** + * 消息发送到 队列失败的时候执行 + * + * @param returnedMessage the returned message and metadata. + */ + @Override + public void returnedMessage(ReturnedMessage returnedMessage) { + System.out.println("消息" + returnedMessage.getMessage().toString() + + "被交换机" + returnedMessage.getExchange() + "回退！" + + "退回原因为：" + returnedMessage.getReplyText()); + // TODO 补偿机制 记录日志 添加到数据库 建一张表 消息发送记录表 + } +} diff --git a/bwie-auth/src/main/java/com/bwie/auth/controller/AuthController.java b/bwie-auth/src/main/java/com/bwie/auth/controller/AuthController.java new file mode 100644 index 0000000..921958b --- /dev/null +++ b/bwie-auth/src/main/java/com/bwie/auth/controller/AuthController.java @@ -0,0 +1,30 @@ +package com.bwie.auth.controller; + +import com.bwie.auth.service.AuthService; +import com.bwie.common.domain.User; +import com.bwie.common.result.Result; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.auth.controller + * @Project：week_7.30_house + * @name：AuthController + * @Date：2024/7/30 9:35 + */ +@RestController +@RequestMapping("/auth") +public class AuthController { + +@Autowired + private AuthService authService; + +@PostMapping("/login") + public Result login(@RequestBody User user){ + + return authService.login(user); +} + + +} diff --git a/bwie-auth/src/main/java/com/bwie/auth/feign/SystemRemote.java b/bwie-auth/src/main/java/com/bwie/auth/feign/SystemRemote.java new file mode 100644 index 0000000..7c91382 --- /dev/null +++ b/bwie-auth/src/main/java/com/bwie/auth/feign/SystemRemote.java @@ -0,0 +1,28 @@ +package com.bwie.auth.feign; + +import com.bwie.auth.feign.falltry.SystemRemoteService; +import com.bwie.common.domain.User; +import com.bwie.common.result.Result; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.auth.feign + * @Project：week_7.30_house + * @name：SystemRemote + * @Date：2024/7/30 11:19 + */ +@FeignClient(value = "bwie-system" ,fallbackFactory = SystemRemoteService.class) +public interface SystemRemote { + + + @PostMapping("/user/login/{userPhone}") + public Result login(@PathVariable String userPhone); + + @PostMapping("/user/getOnlineuser") + public Result getOnlineuser(); + + +} diff --git a/bwie-auth/src/main/java/com/bwie/auth/feign/falltry/SystemRemoteService.java b/bwie-auth/src/main/java/com/bwie/auth/feign/falltry/SystemRemoteService.java new file mode 100644 index 0000000..191149e --- /dev/null +++ b/bwie-auth/src/main/java/com/bwie/auth/feign/falltry/SystemRemoteService.java @@ -0,0 +1,36 @@ +package com.bwie.auth.feign.falltry; + +import com.bwie.auth.feign.SystemRemote; +import com.bwie.common.domain.User; +import com.bwie.common.result.Result; +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.auth.feign.falltry + * @Project：week_7.30_house + * @name：SystemRemoteService + * @Date：2024/7/30 11:21 + */ +@Component +public class SystemRemoteService implements FallbackFactory { + + + @Override + public SystemRemote create(Throwable cause) { + + + return new SystemRemote() { + @Override + public Result login(String userPhone) { + return Result.error(cause.getMessage()); + } + + @Override + public Result getOnlineuser() { + return Result.error(cause.getMessage()); + } + }; + } +} diff --git a/bwie-auth/src/main/java/com/bwie/auth/service/AuthService.java b/bwie-auth/src/main/java/com/bwie/auth/service/AuthService.java new file mode 100644 index 0000000..7b0750d --- /dev/null +++ b/bwie-auth/src/main/java/com/bwie/auth/service/AuthService.java @@ -0,0 +1,16 @@ +package com.bwie.auth.service; + +import com.bwie.common.domain.User; +import com.bwie.common.result.Result; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.auth.service + * @Project：week_7.30_house + * @name：AuthService + * @Date：2024/7/30 9:37 + */ +public interface AuthService { + + Result login(User user); +} diff --git a/bwie-auth/src/main/java/com/bwie/auth/service/impl/AuthServiceImpl.java b/bwie-auth/src/main/java/com/bwie/auth/service/impl/AuthServiceImpl.java new file mode 100644 index 0000000..0deee34 --- /dev/null +++ b/bwie-auth/src/main/java/com/bwie/auth/service/impl/AuthServiceImpl.java @@ -0,0 +1,79 @@ +package com.bwie.auth.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.bwie.auth.feign.SystemRemote; +import com.bwie.auth.feign.falltry.SystemRemoteService; +import com.bwie.auth.service.AuthService; +import com.bwie.common.constants.JwtConstants; +import com.bwie.common.constants.TokenConstants; +import com.bwie.common.domain.User; +import com.bwie.common.domain.response.JwtResponse; +import com.bwie.common.result.Result; +import com.bwie.common.utils.JwtUtils; +import com.bwie.common.utils.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.stereotype.Service; + +import java.util.LinkedHashMap; +import java.util.Objects; +import java.util.UUID; +import java.util.concurrent.TimeUnit; +import java.util.function.ToDoubleBiFunction; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.auth.service.impl + * @Project：week_7.30_house + * @name：AuthServiceImpl + * @Date：2024/7/30 9:37 + */ +@Service +public class AuthServiceImpl implements AuthService { + + + @Autowired + private StringRedisTemplate redisTemplate; + + @Autowired + private SystemRemote systemRemote; + + @Override + public Result login(User user) { + + if (StringUtils.isAnyBlank(user.getUserPhone(),user.getUserPwd())){ + return Result.error("手机号或密码不能为空"); + } + + + Result result = systemRemote.login(user.getUserPhone()); + + User userlogin = result.getData(); + + if (null==userlogin){ + return Result.error("手机号错误"); + } + + if (!user.getUserPwd().equals(userlogin.getUserPwd())){ + return Result.error("密码错误"); + } + + String userKey = UUID.randomUUID().toString().replace("-", ""); + + LinkedHashMap map = new LinkedHashMap<>(); + + map.put(JwtConstants.USER_KEY,userKey); + + String token = JwtUtils.createToken(map); + + redisTemplate.opsForValue().set(TokenConstants.LOGIN_TOKEN_KEY+userKey, JSONObject.toJSONString(userlogin),30, TimeUnit.MINUTES); + + JwtResponse jwtResponse = new JwtResponse(); + + jwtResponse.setToken(token); + + jwtResponse.setExpireTimeStr("30Min"); + + return Result.success(jwtResponse); + } +} diff --git a/bwie-auth/src/main/java/com/bwie/auth/utils/DLXQueue.java b/bwie-auth/src/main/java/com/bwie/auth/utils/DLXQueue.java new file mode 100644 index 0000000..d76e2c2 --- /dev/null +++ b/bwie-auth/src/main/java/com/bwie/auth/utils/DLXQueue.java @@ -0,0 +1,77 @@ +package com.bwie.auth.utils; + +import org.springframework.amqp.core.Binding; +import org.springframework.amqp.core.BindingBuilder; +import org.springframework.amqp.core.DirectExchange; +import org.springframework.amqp.core.Queue; +import org.springframework.amqp.rabbit.core.RabbitAdmin; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; + +@Component +public class DLXQueue { + // routingKey + private static final String DEAD_ROUTING_KEY = "dead.routingkey"; + private static final String ROUTING_KEY = "routingkey"; + private static final String DEAD_EXCHANGE = "dead.exchange"; + private static final String EXCHANGE = "common.exchange"; + @Autowired + RabbitTemplate rabbitTemplate; + @Resource + RabbitAdmin rabbitAdmin; + + /** + * 发送死信队列，过期后进入死信交换机，进入死信队列 + * + * @param queueName 队列名称 + * @param deadQueueName 死信队列名称 + * @param params 消息内容 + * @param expiration 过期时间 毫秒 + */ + public void sendDLXQueue(String queueName, String deadQueueName, Object params, Integer expiration) { + /** + * ----------------------------------先创建一个ttl队列和死信队列-------------------------------------------- + */ + Map map = new HashMap<>(); + // 队列设置存活时间，单位ms, 必须是整形数据。 + map.put("x-message-ttl", expiration); + // 设置死信交换机 + map.put("x-dead-letter-exchange", DEAD_EXCHANGE); + // 设置死信交换器路由 + map.put("x-dead-letter-routing-key", DEAD_ROUTING_KEY); + /*参数1：队列名称 参数2：持久化 参数3：是否排他 参数4：自动删除队列 参数5：队列参数*/ + Queue queue = new Queue(queueName, true, false, false, map); + rabbitAdmin.declareQueue(queue); + /** + * ---------------------------------创建交换机--------------------------------------------- + */ + DirectExchange directExchange = new DirectExchange(EXCHANGE, true, false); + rabbitAdmin.declareExchange(directExchange); + /** + * ---------------------------------队列绑定交换机--------------------------------------------- + */ + Binding binding = BindingBuilder.bind(queue).to(directExchange).with(ROUTING_KEY); + rabbitAdmin.declareBinding(binding); + /** + * ---------------------------------在创建一个死信交换机和队列，接收死信队列--------------------------------------------- + */ + DirectExchange deadExchange = new DirectExchange(DEAD_EXCHANGE, true, false); + rabbitAdmin.declareExchange(deadExchange); + + Queue deadQueue = new Queue(deadQueueName, true, false, false); + rabbitAdmin.declareQueue(deadQueue); + /** + * ---------------------------------队列绑定死信交换机--------------------------------------------- + */ + // 将队列和交换机绑定 + Binding deadbinding = BindingBuilder.bind(deadQueue).to(deadExchange).with(DEAD_ROUTING_KEY); + rabbitAdmin.declareBinding(deadbinding); + // 发送消息 + rabbitTemplate.convertAndSend(EXCHANGE, ROUTING_KEY, params); + } +} diff --git a/bwie-auth/src/main/java/com/bwie/auth/utils/DelayedQueue.java b/bwie-auth/src/main/java/com/bwie/auth/utils/DelayedQueue.java new file mode 100644 index 0000000..0df9f49 --- /dev/null +++ b/bwie-auth/src/main/java/com/bwie/auth/utils/DelayedQueue.java @@ -0,0 +1,79 @@ +package com.bwie.auth.utils; + +import org.springframework.amqp.core.Binding; +import org.springframework.amqp.core.BindingBuilder; +import org.springframework.amqp.core.CustomExchange; +import org.springframework.amqp.core.Queue; +import org.springframework.amqp.rabbit.core.RabbitAdmin; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +/** + * 发送延迟队列的工具类 + */ +@Component +public class DelayedQueue { + + // routingKey + private static final String DELAYED_ROUTING_KEY = "delayed.routingkey"; + + // 延迟队列交换机 + private static final String DELAYED_EXCHANGE = "delayed.exchange"; + + @Autowired + RabbitTemplate rabbitTemplate; + + @Resource + RabbitAdmin rabbitAdmin; + + /** + * 发送延迟队列 + * + * @param queueName 队列名称 + * @param params 消息内容 + * @param expiration 延迟时间 毫秒 + */ + public void sendDelayedQueue(String queueName, Object params, Integer expiration) { + // 先创建一个队列 + Queue queue = new Queue(queueName); + rabbitAdmin.declareQueue(queue); + + // 创建延迟队列交换机 + CustomExchange customExchange = createCustomExchange(); + rabbitAdmin.declareExchange(customExchange); + + // 将队列和交换机绑定 + Binding binding = BindingBuilder.bind(queue).to(customExchange).with(DELAYED_ROUTING_KEY).noargs(); + rabbitAdmin.declareBinding(binding); + + // 发送延迟消息 + rabbitTemplate.convertAndSend(DELAYED_EXCHANGE, DELAYED_ROUTING_KEY, params, msg -> { + // 发送消息的时候 延迟时长 + msg.getMessageProperties().setMessageId(UUID.randomUUID().toString().replaceAll("-", "")); + msg.getMessageProperties().setDelay(expiration); + return msg; + }); + } + + private CustomExchange createCustomExchange() { + Map arguments = new HashMap<>(); + /** + * 参数说明： + * 1.交换机的名称 + * 2.交换机的类型 + * 3.是否需要持久化 + * 4.是否自动删除 + * 5.其它参数 + */ + arguments.put("x-delayed-type", "direct"); + return new CustomExchange(DELAYED_EXCHANGE, "x-delayed-message", true, false, arguments); + } + +} + diff --git a/bwie-auth/src/main/java/com/bwie/auth/utils/TtlQueue.java b/bwie-auth/src/main/java/com/bwie/auth/utils/TtlQueue.java new file mode 100644 index 0000000..51db22d --- /dev/null +++ b/bwie-auth/src/main/java/com/bwie/auth/utils/TtlQueue.java @@ -0,0 +1,66 @@ +package com.bwie.auth.utils; + +import org.springframework.amqp.core.Binding; +import org.springframework.amqp.core.BindingBuilder; +import org.springframework.amqp.core.DirectExchange; +import org.springframework.amqp.core.Queue; +import org.springframework.amqp.rabbit.core.RabbitAdmin; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; + +/** + * 发送TTL队列 设置 消息的存活时间 如果超过了存活时间 + * 该条消息还没有被消费 则自动从队列中消息 ，如果配置了死信队列则消息会进入死信队列 + */ +@Component +public class TtlQueue { + // routingKey + private static final String TTL_KEY = "ttl.routingkey"; + private static final String TTL_EXCHANGE = "ttl.exchange"; + + @Autowired + RabbitTemplate rabbitTemplate; + + @Resource + RabbitAdmin rabbitAdmin; + + /** + * 发送TTL队列 + * + * @param queueName 队列名称 + * @param params 消息内容 + * @param expiration 过期时间 毫秒 + */ + public void sendTtlQueue(String queueName, Object params, Integer expiration) { + /** + * ----------------------------------先创建一个ttl队列-------------------------------------------- + */ + Map map = new HashMap<>(); + // 队列设置存活时间，单位ms,必须是整形数据。 + map.put("x-message-ttl", expiration); + /*参数1：队列名称 参数2：持久化 参数3：是否排他 参数4：自动删除队列 参数5：队列参数*/ + Queue queue = new Queue(queueName, true, false, false, map); + rabbitAdmin.declareQueue(queue); + + /** + * ---------------------------------创建交换机--------------------------------------------- + */ + DirectExchange directExchange = new DirectExchange(TTL_EXCHANGE, true, false); + rabbitAdmin.declareExchange(directExchange); + /** + * ---------------------------------队列绑定交换机--------------------------------------------- + */ + // 将队列和交换机绑定 + Binding binding = BindingBuilder.bind(queue).to(directExchange).with(TTL_KEY); + rabbitAdmin.declareBinding(binding); + + // 发送消息 + rabbitTemplate.convertAndSend(TTL_EXCHANGE, TTL_KEY, params); + } +} + diff --git a/bwie-auth/src/main/resources/bootstrap.yml b/bwie-auth/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..99b36b4 --- /dev/null +++ b/bwie-auth/src/main/resources/bootstrap.yml @@ -0,0 +1,121 @@ +# Tomcat +server: + port: 9001 + +#开启熔断 +feign: + sentinel: + enabled: true + +# Spring +spring: + main: + allow-circular-references: true + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + application: + # 应用名称 + name: bwie-auth + kafka: + producer: + # Kafka服务器 + bootstrap-servers: 106.54.199.209:9092 + # 开启事务，必须在开启了事务的方法中发送，否则报错 + transaction-id-prefix: kafkaTx- + # 发生错误后，消息重发的次数，开启事务必须设置大于0。 + retries: 3 + # acks=0 ： 生产者在成功写入消息之前不会等待任何来自服务器的响应。 + # acks=1 ： 只要集群的首领节点收到消息，生产者就会收到一个来自服务器成功响应。 + # acks=all ：只有当所有参与复制的节点全部收到消息时，生产者才会收到一个来自服务器的成功响应。 + # 开启事务时，必须设置为all + acks: all + # 当有多个消息需要被发送到同一个分区时，生产者会把它们放在同一个批次里。该参数指定了一个批次可以使用的内存大小，按照字节数计算。 + batch-size: 16384 + # 生产者内存缓冲区的大小。 + buffer-memory: 1024000 + # 键的序列化方式 + key-serializer: org.springframework.kafka.support.serializer.JsonSerializer + # 值的序列化方式（建议使用Json，这种序列化方式可以无需额外配置传输实体类） + value-serializer: org.springframework.kafka.support.serializer.JsonSerializer + + consumer: + # Kafka服务器 + bootstrap-servers: 106.54.199.209:9092 + group-id: firstGroup + # 自动提交的时间间隔 在spring boot 2.X 版本中这里采用的是值的类型为Duration 需要符合特定的格式，如1S,1M,2H,5D + #auto-commit-interval: 2s + # 该属性指定了消费者在读取一个没有偏移量的分区或者偏移量无效的情况下该作何处理： + # earliest：当各分区下有已提交的offset时，从提交的offset开始消费；无提交的offset时，从头开始消费分区的记录 + # latest：当各分区下有已提交的offset时，从提交的offset开始消费；无提交的offset时，消费新产生的该分区下的数据（在消费者启动之后生成的记录） + # none：当各分区都存在已提交的offset时，从提交的offset开始消费；只要有一个分区不存在已提交的offset，则抛出异常 + auto-offset-reset: latest + # 是否自动提交偏移量，默认值是true，为了避免出现重复数据和数据丢失，可以把它设置为false，然后手动提交偏移量 + enable-auto-commit: false + # 键的反序列化方式 + #key-deserializer: org.apache.kafka.common.serialization.StringDeserializer + key-deserializer: org.springframework.kafka.support.serializer.JsonDeserializer + # 值的反序列化方式（建议使用Json，这种序列化方式可以无需额外配置传输实体类） + value-deserializer: org.springframework.kafka.support.serializer.JsonDeserializer + # 配置消费者的 Json 反序列化的可信赖包，反序列化实体类需要 + properties: + spring: + json: + trusted: + packages: "*" + # 这个参数定义了poll方法最多可以拉取多少条消息，默认值为500。如果在拉取消息的时候新消息不足500条，那有多少返回多少；如果超过500条，每次只返回500。 + # 这个默认值在有些场景下太大，有些场景很难保证能够在5min内处理完500条消息， + # 如果消费者无法在5分钟内处理完500条消息的话就会触发reBalance, + # 然后这批消息会被分配到另一个消费者中，还是会处理不完，这样这批消息就永远也处理不完。 + # 要避免出现上述问题，提前评估好处理一条消息最长需要多少时间，然后覆盖默认的max.poll.records参数 + # 注：需要开启BatchListener批量监听才会生效，如果不开启BatchListener则不会出现reBalance情况 + max-poll-records: 3 + properties: + # 两次poll之间的最大间隔，默认值为5分钟。如果超过这个间隔会触发reBalance + max: + poll: + interval: + ms: 600000 + # 当broker多久没有收到consumer的心跳请求后就触发reBalance，默认值是10s + session: + timeout: + ms: 10000 + listener: + # 在侦听器容器中运行的线程数，一般设置为 机器数*分区数 + concurrency: 4 + # 自动提交关闭，需要设置手动消息确认 + ack-mode: manual_immediate + # 消费监听接口监听的主题不存在时，默认会报错，所以设置为false忽略错误 + missing-topics-fatal: false + # 两次poll之间的最大间隔，默认值为5分钟。如果超过这个间隔会触发reBalance + poll-timeout: 600000 + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 106.54.199.209:8848 + config: + # 配置中心地址 + server-addr: 106.54.199.209:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + rabbitmq: + username: guest + password: guest + virtualHost: / + port: 5672 + host: 106.54.199.209 + listener: + simple: + prefetch: 1 # 默认每次取出一条消息消费， 消费完成取下一条 + acknowledge-mode: manual # 设置消费端手动ack确认 + retry: + enabled: true # 是否支持重试 + publisher-confirm-type: correlated #确认消息已发送到交换机(Exchange) + publisher-returns: true #确认消息已发送到队列(Queue) diff --git a/bwie-common/pom.xml b/bwie-common/pom.xml new file mode 100644 index 0000000..036eb4a --- /dev/null +++ b/bwie-common/pom.xml @@ -0,0 +1,115 @@ + + + 4.0.0 + + com.bwie + week_7.30_house + 1.0-SNAPSHOT + + + bwie-common + + + 17 + 17 + UTF-8 + + + + + + + javax.servlet + javax.servlet-api + + + org.springframework.cloud + spring-cloud-starter-bootstrap + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + org.springframework.cloud + spring-cloud-starter-loadbalancer + + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + + io.jsonwebtoken + jjwt + 0.9.1 + + + + com.alibaba + fastjson + 1.2.80 + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + org.springframework.boot + spring-boot-starter-validation + + + + org.apache.commons + commons-lang3 + + + + org.projectlombok + lombok + + + + cn.hutool + hutool-all + 5.8.3 + + + + com.aliyun + dysmsapi20170525 + 2.0.1 + + + + org.springframework.boot + spring-boot-starter-amqp + + + + com.aliyun.oss + aliyun-sdk-oss + 3.12.0 + + + + + + diff --git a/bwie-common/src/main/java/com/bwie/common/constants/Constants.java b/bwie-common/src/main/java/com/bwie/common/constants/Constants.java new file mode 100644 index 0000000..2fdc9fe --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/constants/Constants.java @@ -0,0 +1,18 @@ +package com.bwie.common.constants; + +/** + * @description: 系统常量 + * @author DongZl + */ +public class Constants { + /** + * 成功标记 + */ + public static final Integer SUCCESS = 200; + public static final String SUCCESS_MSG = "操作成功"; + /** + * 失败标记 + */ + public static final Integer ERROR = 500; + public static final String ERROR_MSG = "操作异常"; +} diff --git a/bwie-common/src/main/java/com/bwie/common/constants/JwtConstants.java b/bwie-common/src/main/java/com/bwie/common/constants/JwtConstants.java new file mode 100644 index 0000000..03692c1 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/constants/JwtConstants.java @@ -0,0 +1,29 @@ +package com.bwie.common.constants; + +/** + * @author DongZl + * @description: Jwt常量 + */ +public class JwtConstants { + + /** + * 用户ID字段 + */ + public static final String DETAILS_USER_ID = "user_id"; + + /** + * 用户名字段 + */ + public static final String DETAILS_USERNAME = "username"; + + /** + * 用户标识 + */ + public static final String USER_KEY = "user_key"; + + /** + * 令牌秘钥 + */ + public final static String SECRET = "abcdefghijklmnopqrstuvwxyz"; + +} diff --git a/bwie-common/src/main/java/com/bwie/common/constants/QueueConstants.java b/bwie-common/src/main/java/com/bwie/common/constants/QueueConstants.java new file mode 100644 index 0000000..2c4c3c2 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/constants/QueueConstants.java @@ -0,0 +1,15 @@ +package com.bwie.common.constants; + +/** + * @Project boot-month + * @Author 张子豪 + * @Date 2023/9/6 10:06-+ + * @Description + */ +public class QueueConstants { + + public static final String SEND_CODE_QUEUE = "send_code_queue"; + public static final String SEND_CODE_PREVENT_REPEAT_ID = "send_code_prevent_repeat_id:"; + public static final String BLOG_UPDATE_QUEUE = "blog_update_queue"; + public static final String BLOG_UPDATE_PREVENT_REPEAT_ID = "blog_update_prevent_repeat_id:"; +} diff --git a/bwie-common/src/main/java/com/bwie/common/constants/RabbitMQOneConstants.java b/bwie-common/src/main/java/com/bwie/common/constants/RabbitMQOneConstants.java new file mode 100644 index 0000000..a05740c --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/constants/RabbitMQOneConstants.java @@ -0,0 +1,18 @@ +package com.bwie.common.constants; + +/** + * Clazz:2103A + * Name :FYSN + * Desc :世界上只有一种英雄主义。那就是认清生活的真相后，仍然热爱生活。--罗曼·罗兰 + * Date :2023-08-20 20:37:02 + */ + +public class RabbitMQOneConstants { + + //发送短消息队列名称 + public static final String SEND_SHORT_MESSAGE_QUEUE_NAME = "send_short_message"; + + //查看的日志队列名称 + public static final String QUERY_LOG_QUEUE_NAME = "query_log_message"; + +} diff --git a/bwie-common/src/main/java/com/bwie/common/constants/RabbitMQTwoConstants.java b/bwie-common/src/main/java/com/bwie/common/constants/RabbitMQTwoConstants.java new file mode 100644 index 0000000..95361f1 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/constants/RabbitMQTwoConstants.java @@ -0,0 +1,18 @@ +package com.bwie.common.constants; + +/** + * Clazz:2103A + * Name :FYSN + * Desc :世界上只有一种英雄主义。那就是认清生活的真相后，仍然热爱生活。--罗曼·罗兰 + * Date :2023-08-20 20:37:02 + */ + +public class RabbitMQTwoConstants { + + //发送消息队列名称 + public static final String SEND_SMS_QUEUE = "send_sms_queue"; + + //添加消息队列名称日志 + public static final String ADD_MESSAGE_QUEUE_NAME_LOG = "add_message_log"; + +} diff --git a/bwie-common/src/main/java/com/bwie/common/constants/TokenConstants.java b/bwie-common/src/main/java/com/bwie/common/constants/TokenConstants.java new file mode 100644 index 0000000..1871fb7 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/constants/TokenConstants.java @@ -0,0 +1,24 @@ +package com.bwie.common.constants; + +/** + * @author DongZl + * @description: 令牌常量 + */ +public class TokenConstants { + /** + * 缓存有效期，默认720（分钟） + */ + public final static long EXPIRATION = 720; + /** + * 缓存刷新时间，默认120（分钟） + */ + public final static long REFRESH_TIME = 120; + /** + * 权限缓存前缀 + */ + public final static String LOGIN_TOKEN_KEY = "login_tokens:"; + /** + * token标识 + */ + public static final String TOKEN = "token"; +} diff --git a/bwie-common/src/main/java/com/bwie/common/domain/House.java b/bwie-common/src/main/java/com/bwie/common/domain/House.java new file mode 100644 index 0000000..b066201 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/House.java @@ -0,0 +1,23 @@ +package com.bwie.common.domain; + +import lombok.Data; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.common.domain + * @Project：week_7.30_house + * @name：House + * @Date：2024/7/30 10:06 + */ +@Data +public class House { + +private Integer houseId; +private String houseName; +private String rentWay; +private String houseArea; +private String housePic; +private Integer monthCost; + + +} diff --git a/bwie-common/src/main/java/com/bwie/common/domain/Logs.java b/bwie-common/src/main/java/com/bwie/common/domain/Logs.java new file mode 100644 index 0000000..cd6db43 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/Logs.java @@ -0,0 +1,51 @@ +package com.bwie.common.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.common.domain + * @Project：week_7.30_house + * @name：Logs + * @Date：2024/7/30 10:10 + */ +@Data +public class Logs { + +private Integer logsId; +private Integer houseId; +@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") +@DateTimeFormat(pattern = "yyyy-MM-dd:HH:mm:ss") +private Date logsDate; +private Integer typeId; +private Integer logsCost; +private Integer logsStatus; +private String logsText; +private Integer userId; + +private String rentWay; + +//列表 +private String typeName; + +private Double typeDiscount; + +private String userName; + +private String userPhone; + + //性别 +private String userSex; + //年龄 +private String userAge; + + //租房信用 + private Integer userCredit; + + private String houseName; + +} diff --git a/bwie-common/src/main/java/com/bwie/common/domain/Type.java b/bwie-common/src/main/java/com/bwie/common/domain/Type.java new file mode 100644 index 0000000..8952457 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/Type.java @@ -0,0 +1,21 @@ +package com.bwie.common.domain; + +import lombok.Data; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.common.domain + * @Project：week_7.30_house + * @name：Type + * @Date：2024/7/30 10:08 + */ +@Data +public class Type { + + private Integer typeId; + + private String typeName; + + private Double typeDiscount; + +} diff --git a/bwie-common/src/main/java/com/bwie/common/domain/User.java b/bwie-common/src/main/java/com/bwie/common/domain/User.java new file mode 100644 index 0000000..5746d3d --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/User.java @@ -0,0 +1,30 @@ +package com.bwie.common.domain; + +import lombok.Data; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.common.domain + * @Project：week_7.30_house + * @name：User + * @Date：2024/7/30 9:40 + */ +@Data +public class User { + +private Integer userId; +private String userName; +private String userPhone; + //租房次数 +private Integer userNum; +//租房信用 +private Integer userCredit; +//总租房金额 +private String userMoney; +//性别 +private String userSex; +//年龄 +private String userAge; +private String userPwd; + +} diff --git a/bwie-common/src/main/java/com/bwie/common/domain/request/HouseReq.java b/bwie-common/src/main/java/com/bwie/common/domain/request/HouseReq.java new file mode 100644 index 0000000..6b17990 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/request/HouseReq.java @@ -0,0 +1,29 @@ +package com.bwie.common.domain.request; + +import lombok.Data; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.common.domain + * @Project：week_7.30_house + * @name：HouseReq + * @Date：2024/7/30 10:17 + */ +@Data +public class HouseReq { + + private String rentWay; + + private Integer MinPrice; + + private Integer MaxPrice; + + + private String houseName; + + + + + + +} diff --git a/bwie-common/src/main/java/com/bwie/common/domain/response/JwtResponse.java b/bwie-common/src/main/java/com/bwie/common/domain/response/JwtResponse.java new file mode 100644 index 0000000..d14b7ca --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/response/JwtResponse.java @@ -0,0 +1,24 @@ +package com.bwie.common.domain.response; + +import lombok.Data; + +/** + * @ClassName: + * @Description: 登录相应实体类 + * @Author: zhuwenqiang + * @Date: 2024/2/24 + */ +@Data +public class JwtResponse { + + /** + * token 令牌 + */ + private String token; + + /** + * 过期时间 + */ + private String expireTimeStr; + +} diff --git a/bwie-common/src/main/java/com/bwie/common/exception/GlobalException.java b/bwie-common/src/main/java/com/bwie/common/exception/GlobalException.java new file mode 100644 index 0000000..862962a --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/exception/GlobalException.java @@ -0,0 +1,41 @@ +package com.bwie.common.exception; + +import com.bwie.common.result.Result; +import lombok.extern.log4j.Log4j2; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.house + * @Project：week_7.30_house + * @name：GlobalException + * @Date：2024/7/30 11:54 + */ +@RestControllerAdvice +@Log4j2 +public class GlobalException { + + + +@ExceptionHandler(RuntimeException.class) + public Result globalException(Throwable e){ + + String message = e.getMessage(); + StackTraceElement stackTraceElement = e.getStackTrace()[0]; + String className = stackTraceElement.getClassName(); + String methodName = stackTraceElement.getMethodName(); + + log.info("报错信息:"+message+",报错的类:"+className+",报错的方法:"+methodName); + + return Result.success("报错信息:"+message+",报错的类:"+className+",报错的方法:"+methodName); +} + + + + + + + +} diff --git a/bwie-common/src/main/java/com/bwie/common/result/PageResult.java b/bwie-common/src/main/java/com/bwie/common/result/PageResult.java new file mode 100644 index 0000000..af973af --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/result/PageResult.java @@ -0,0 +1,34 @@ +package com.bwie.common.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author：zhangchengzhi + * @description: 列表返回结果集 + */ +@Data +public class PageResult implements Serializable { + /** + * 总条数 + */ + private long total; + /** + * 结果集合 + */ + private List list; + public PageResult() { + } + public PageResult(long total, List list) { + this.total = total; + this.list = list; + } + public static PageResult toPageResult(long total, List list){ + return new PageResult(total , list); + } + public static Result> toResult(long total, List list){ + return Result.success(PageResult.toPageResult(total,list)); + } +} diff --git a/bwie-common/src/main/java/com/bwie/common/result/Result.java b/bwie-common/src/main/java/com/bwie/common/result/Result.java new file mode 100644 index 0000000..8c9f982 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/result/Result.java @@ -0,0 +1,76 @@ +package com.bwie.common.result; + +import com.bwie.common.constants.Constants; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author：zhangchengzhi + * @description: 响应信息主体 + */ +@Data +public class Result implements Serializable { + + private static final long serialVersionUID = 1L; + /** + * 成功 + */ + public static final int SUCCESS = Constants.SUCCESS; + /** + * 失败 + */ + public static final int FAIL = Constants.ERROR; + /** + * 返回状态码 + */ + private int code; + /** + * 响应信息 + */ + private String msg; + /** + * 响应数据 + */ + private T data; + + public static Result success() { + return restResult(null, SUCCESS, Constants.SUCCESS_MSG); + } + + public static Result success(T data) { + return restResult(data, SUCCESS, Constants.SUCCESS_MSG); + } + + public static Result success(T data, String msg) { + return restResult(data, SUCCESS, msg); + } + + public static Result error() { + return restResult(null, FAIL, Constants.ERROR_MSG); + } + + public static Result error(String msg) { + return restResult(null, FAIL, msg); + } + + public static Result error(T data) { + return restResult(data, FAIL, Constants.ERROR_MSG); + } + + public static Result error(T data, String msg) { + return restResult(data, FAIL, msg); + } + + public static Result error(int code, String msg) { + return restResult(null, code, msg); + } + + private static Result restResult(T data, int code, String msg) { + Result apiResult = new Result<>(); + apiResult.setCode(code); + apiResult.setData(data); + apiResult.setMsg(msg); + return apiResult; + } +} diff --git a/bwie-common/src/main/java/com/bwie/common/utils/HttpPost.java b/bwie-common/src/main/java/com/bwie/common/utils/HttpPost.java new file mode 100644 index 0000000..93380f0 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/utils/HttpPost.java @@ -0,0 +1,77 @@ +package com.bwie.common.utils; + + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.MalformedURLException; +import java.net.URL; + + +public class HttpPost { + public static void main(String[] args) { + //你的本地地址 配你的项目地址 这个是我电脑本地的地址 + String doGet = doGet("http://127.0.0.1:8081/sell/list"); + System.out.println("----------SSSS---DDS--S--"+doGet); + } + public static String doGet(String httpUrl){ + //链接 + HttpURLConnection connection=null; + + InputStream is=null; + BufferedReader br = null; + StringBuffer result=new StringBuffer(); + try { + //创建连接 + URL url=new URL(httpUrl); + connection= (HttpURLConnection) url.openConnection(); + //设置请求方式 + connection.setRequestMethod("GET"); + //设置连接超时时间 + connection.setConnectTimeout(15000); + //设置读取超时时间 + connection.setReadTimeout(15000); + + //开始连接 + connection.connect(); + //获取响应数据 + if(connection.getResponseCode()==200){ + //获取返回的数据 + is=connection.getInputStream(); + if(is!=null){ + br=new BufferedReader(new InputStreamReader(is,"UTF-8")); + String temp = null; + while ((temp=br.readLine())!=null){ + result.append(temp); + } + } + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + }finally { + if(br!=null){ + try { + br.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + if(is!=null){ + try { + is.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + connection.disconnect();// 关闭远程连接 + } + return result.toString(); + } + + + +} diff --git a/bwie-common/src/main/java/com/bwie/common/utils/HttpUtils.java b/bwie-common/src/main/java/com/bwie/common/utils/HttpUtils.java new file mode 100644 index 0000000..1c7e2f3 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/utils/HttpUtils.java @@ -0,0 +1,310 @@ +package com.bwie.common.utils; + +import org.apache.http.HttpResponse; +import org.apache.http.NameValuePair; +import org.apache.http.client.HttpClient; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.HttpDelete; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.client.methods.HttpPut; +import org.apache.http.conn.ClientConnectionManager; +import org.apache.http.conn.scheme.Scheme; +import org.apache.http.conn.scheme.SchemeRegistry; +import org.apache.http.conn.ssl.SSLSocketFactory; +import org.apache.http.entity.ByteArrayEntity; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.message.BasicNameValuePair; + +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.security.KeyManagementException; +import java.security.NoSuchAlgorithmException; +import java.security.cert.X509Certificate; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +public class HttpUtils { + /** + * get + * + * @param host + * @param path + * @param method + * @param headers + * @param querys + * @return + * @throws Exception + */ + public static HttpResponse doGet(String host, String path, String method, + Map headers, + Map querys) + throws Exception { + HttpClient httpClient = wrapClient(host); + + HttpGet request = new HttpGet(buildUrl(host, path, querys)); + for (Map.Entry e : headers.entrySet()) { + request.addHeader(e.getKey(), e.getValue()); + } + + return httpClient.execute(request); + } + + /** + * post form + * + * @param host + * @param path + * @param method + * @param headers + * @param querys + * @param bodys + * @return + * @throws Exception + */ + public static HttpResponse doPost(String host, String path, String method, + Map headers, + Map querys, + Map bodys) + throws Exception { + HttpClient httpClient = wrapClient(host); + + HttpPost request = new HttpPost(buildUrl(host, path, querys)); + for (Map.Entry e : headers.entrySet()) { + request.addHeader(e.getKey(), e.getValue()); + } + + if (bodys != null) { + List nameValuePairList = new ArrayList(); + + for (String key : bodys.keySet()) { + nameValuePairList.add(new BasicNameValuePair(key, bodys.get(key))); + } + UrlEncodedFormEntity formEntity = new UrlEncodedFormEntity(nameValuePairList, "utf-8"); + formEntity.setContentType("application/x-www-form-urlencoded; charset=UTF-8"); + request.setEntity(formEntity); + } + + return httpClient.execute(request); + } + + /** + * Post String + * + * @param host + * @param path + * @param method + * @param headers + * @param querys + * @param body + * @return + * @throws Exception + */ + public static HttpResponse doPost(String host, String path, String method, + Map headers, + Map querys, + String body) + throws Exception { + HttpClient httpClient = wrapClient(host); + + HttpPost request = new HttpPost(buildUrl(host, path, querys)); + for (Map.Entry e : headers.entrySet()) { + request.addHeader(e.getKey(), e.getValue()); + } + + if (StringUtils.isNotBlank(body)) { + request.setEntity(new StringEntity(body, "utf-8")); + } + + return httpClient.execute(request); + } + + /** + * Post stream + * + * @param host + * @param path + * @param method + * @param headers + * @param querys + * @param body + * @return + * @throws Exception + */ + public static HttpResponse doPost(String host, String path, String method, + Map headers, + Map querys, + byte[] body) + throws Exception { + HttpClient httpClient = wrapClient(host); + + HttpPost request = new HttpPost(buildUrl(host, path, querys)); + for (Map.Entry e : headers.entrySet()) { + request.addHeader(e.getKey(), e.getValue()); + } + + if (body != null) { + request.setEntity(new ByteArrayEntity(body)); + } + + return httpClient.execute(request); + } + + /** + * Put String + * @param host + * @param path + * @param method + * @param headers + * @param querys + * @param body + * @return + * @throws Exception + */ + public static HttpResponse doPut(String host, String path, String method, + Map headers, + Map querys, + String body) + throws Exception { + HttpClient httpClient = wrapClient(host); + + HttpPut request = new HttpPut(buildUrl(host, path, querys)); + for (Map.Entry e : headers.entrySet()) { + request.addHeader(e.getKey(), e.getValue()); + } + + if (StringUtils.isNotBlank(body)) { + request.setEntity(new StringEntity(body, "utf-8")); + } + + return httpClient.execute(request); + } + + /** + * Put stream + * @param host + * @param path + * @param method + * @param headers + * @param querys + * @param body + * @return + * @throws Exception + */ + public static HttpResponse doPut(String host, String path, String method, + Map headers, + Map querys, + byte[] body) + throws Exception { + HttpClient httpClient = wrapClient(host); + + HttpPut request = new HttpPut(buildUrl(host, path, querys)); + for (Map.Entry e : headers.entrySet()) { + request.addHeader(e.getKey(), e.getValue()); + } + + if (body != null) { + request.setEntity(new ByteArrayEntity(body)); + } + + return httpClient.execute(request); + } + + /** + * Delete + * + * @param host + * @param path + * @param method + * @param headers + * @param querys + * @return + * @throws Exception + */ + public static HttpResponse doDelete(String host, String path, String method, + Map headers, + Map querys) + throws Exception { + HttpClient httpClient = wrapClient(host); + + HttpDelete request = new HttpDelete(buildUrl(host, path, querys)); + for (Map.Entry e : headers.entrySet()) { + request.addHeader(e.getKey(), e.getValue()); + } + + return httpClient.execute(request); + } + + private static String buildUrl(String host, String path, Map querys) throws UnsupportedEncodingException { + StringBuilder sbUrl = new StringBuilder(); + sbUrl.append(host); + if (!StringUtils.isBlank(path)) { + sbUrl.append(path); + } + if (null != querys) { + StringBuilder sbQuery = new StringBuilder(); + for (Map.Entry query : querys.entrySet()) { + if (0 < sbQuery.length()) { + sbQuery.append("&"); + } + if (StringUtils.isBlank(query.getKey()) && !StringUtils.isBlank(query.getValue())) { + sbQuery.append(query.getValue()); + } + if (!StringUtils.isBlank(query.getKey())) { + sbQuery.append(query.getKey()); + if (!StringUtils.isBlank(query.getValue())) { + sbQuery.append("="); + sbQuery.append(URLEncoder.encode(query.getValue(), "utf-8")); + } + } + } + if (0 < sbQuery.length()) { + sbUrl.append("?").append(sbQuery); + } + } + + return sbUrl.toString(); + } + + private static HttpClient wrapClient(String host) { + HttpClient httpClient = new DefaultHttpClient(); + if (host.startsWith("https://")) { + sslClient(httpClient); + } + + return httpClient; + } + + private static void sslClient(HttpClient httpClient) { + try { + SSLContext ctx = SSLContext.getInstance("TLS"); + X509TrustManager tm = new X509TrustManager() { + public X509Certificate[] getAcceptedIssuers() { + return null; + } + public void checkClientTrusted(X509Certificate[] xcs, String str) { + + } + public void checkServerTrusted(X509Certificate[] xcs, String str) { + + } + }; + ctx.init(null, new TrustManager[] { tm }, null); + SSLSocketFactory ssf = new SSLSocketFactory(ctx); + ssf.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER); + ClientConnectionManager ccm = httpClient.getConnectionManager(); + SchemeRegistry registry = ccm.getSchemeRegistry(); + registry.register(new Scheme("https", 443, ssf)); + } catch (KeyManagementException ex) { + throw new RuntimeException(ex); + } catch (NoSuchAlgorithmException ex) { + throw new RuntimeException(ex); + } + } + +} diff --git a/bwie-common/src/main/java/com/bwie/common/utils/JwtUtils.java b/bwie-common/src/main/java/com/bwie/common/utils/JwtUtils.java new file mode 100644 index 0000000..ff72bd2 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/utils/JwtUtils.java @@ -0,0 +1,109 @@ +package com.bwie.common.utils; + +import com.bwie.common.constants.JwtConstants; +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.SignatureAlgorithm; + +import java.util.Map; + +/** + * @description: Jwt工具类 + * @Author：zhangchengzhi + */ +public class JwtUtils { + + /** + * 秘钥 + */ + public static String secret = JwtConstants.SECRET; + + /** + * 从数据声明生成令牌 + * + * @param claims 数据声明 + * @return 令牌 + */ + public static String createToken(Map claims){ + String token = Jwts.builder().setClaims(claims).signWith(SignatureAlgorithm.HS512, secret).compact(); + return token; + } + + /** + * 从令牌中获取数据声明 + * + * @param token 令牌 + * @return 数据声明 + */ + public static Claims parseToken(String token){ + return Jwts.parser().setSigningKey(secret).parseClaimsJws(token).getBody(); + } + /** + * 根据令牌获取用户标识 + * + * @param token 令牌 + * @return 用户ID + */ + public static String getUserKey(String token){ + Claims claims = parseToken(token); + return getValue(claims, JwtConstants.USER_KEY); + } + /** + * 根据令牌获取用户标识 + * + * @param claims 身份信息 + * @return 用户ID + */ + public static String getUserKey(Claims claims){ + return getValue(claims, JwtConstants.USER_KEY); + } + /** + * 根据令牌获取用户ID + * + * @param token 令牌 + * @return 用户ID + */ + public static String getUserId(String token){ + Claims claims = parseToken(token); + return getValue(claims, JwtConstants.DETAILS_USER_ID); + } + /** + * 根据身份信息获取用户ID + * + * @param claims 身份信息 + * @return 用户ID + */ + public static String getUserId(Claims claims){ + return getValue(claims, JwtConstants.DETAILS_USER_ID); + } + /** + * 根据令牌获取用户名 + * + * @param token 令牌 + * @return 用户名 + */ + public static String getUserName(String token){ + Claims claims = parseToken(token); + return getValue(claims, JwtConstants.DETAILS_USERNAME); + } + /** + * 根据身份信息获取用户名 + * + * @param claims 身份信息 + * @return 用户名 + */ + public static String getUserName(Claims claims){ + return getValue(claims, JwtConstants.DETAILS_USERNAME); + } + /** + * 根据身份信息获取键值 + * + * @param claims 身份信息 + * @param key 键 + * @return 值 + */ + public static String getValue(Claims claims, String key){ + Object obj = claims.get(key); + return obj == null ? "" : obj.toString(); + } +} diff --git a/bwie-common/src/main/java/com/bwie/common/utils/MsgUitl.java b/bwie-common/src/main/java/com/bwie/common/utils/MsgUitl.java new file mode 100644 index 0000000..995e42c --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/utils/MsgUitl.java @@ -0,0 +1,76 @@ +package com.bwie.common.utils; + +import org.apache.http.HttpResponse; +import org.apache.http.util.EntityUtils; +import org.springframework.cache.annotation.CachePut; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.stereotype.Component; + +import java.util.HashMap; +import java.util.Map; + +/** + * @Author：zhangchengzhi + * @version 1.0.0 + * @ClassName MsgUitl.java + * @Description TODO + * @createTime 2022年07月22日 15:38:00 + */ +@Component +public class MsgUitl { + + public static String sendMsg(String phone,String code) { + String host = "https://gyytz.market.alicloudapi.com"; + String path = "/sms/smsSend"; + String method = "POST"; + String appcode = "b491bc5d56bb4fa59171e19aaab030bb"; + Map headers = new HashMap(); + //最后在header中的格式(中间是英文空格)为Authorization:APPCODE 83359fd73fe94948385f570e3c139105 + headers.put("Authorization", "APPCODE " + appcode); + Map querys = new HashMap(); + querys.put("mobile", phone); + querys.put("param", "code"+code); + querys.put("smsSignId", "2e65b1bb3d054466b82f0c9d125465e2"); + querys.put("templateId", "908e94ccf08b4476ba6c876d13f084ad"); + Map bodys = new HashMap(); + + String message=""; + try { + /** + * 重要提示如下: + * HttpUtils请从 + * https://github.com/aliyun/api-gateway-demo-sign-java/blob/master/src/main/java/com/aliyun/api/gateway/demo/util/HttpUtils.java + * 下载 + * + * 相应的依赖请参照 + * https://github.com/aliyun/api-gateway-demo-sign-java/blob/master/pom.xml + */ + HttpResponse response = HttpUtils.doPost(host, path, method, headers, querys, bodys); + System.out.println(response.toString()); +// 获取response的body + message = EntityUtils.toString(response.getEntity()); + System.out.println(EntityUtils.toString(response.getEntity())); + + } catch (Exception e) { + e.printStackTrace(); + } + return message; + } + + @CachePut(value="aaa", key="#mobile") + public String saveCode(String mobile,String code){ + return code; + } + + /** + * 获得验证码 + * @param mobile + * @return + */ + + @Cacheable(value="aaa", key="#mobile") + public String getCode(String mobile){ + return "1234"; + } + +} diff --git a/bwie-common/src/main/java/com/bwie/common/utils/OssUtil.java b/bwie-common/src/main/java/com/bwie/common/utils/OssUtil.java new file mode 100644 index 0000000..59b0724 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/utils/OssUtil.java @@ -0,0 +1,162 @@ +package com.bwie.orders.utils; + +import com.aliyun.oss.OSS; +import com.aliyun.oss.OSSClientBuilder; +import com.aliyun.oss.model.GetObjectRequest; +import com.aliyun.oss.model.PutObjectRequest; +import lombok.extern.log4j.Log4j2; +import org.springframework.web.multipart.MultipartFile; + +import java.io.*; +import java.time.LocalDateTime; +import java.util.UUID; + +/** + * Oss服务调用 + */ +@Log4j2 +public class OssUtil { + + /** + * Endpoint 存储对象概述 阿里云主账号AccessKey，accessKeySecret拥有所有API的访问权限 访问路径前缀 存储对象概述 + */ + private static String endPoint = "oss-cn-shanghai.aliyuncs.com"; + private static String accessKeyId = "LTAI5tDbRqXkC5i3SMrCSDcX"; + private static String accessKeySecret = "XUzMZoHPLsjNLafHsdQnMElBWZATsu"; + private static String accessPre = "https://mall-bw.oss-cn-shanghai.aliyuncs.com/"; + + /** + * bucket名称 + * + * @return + */ + private static String bucketName = "mall-bw"; + + private static OSS ossClient; + + static { + ossClient = new OSSClientBuilder().build( + endPoint, + accessKeyId, + accessKeySecret); + log.info("oss服务连接成功！"); + } + + /** + * 默认路径上传本地文件 + * + * @param filePath + */ + public static String uploadFile(String filePath) { + return uploadFileForBucket(bucketName, getOssFilePath(filePath), filePath); + } + + /** + * 默认路径上传multipartFile文件 + * + * @param multipartFile + */ + public static String uploadMultipartFile(MultipartFile multipartFile) { + return uploadMultipartFile(bucketName, getOssFilePath(multipartFile.getOriginalFilename()), multipartFile); + } + + /** + * 上传 multipartFile 类型文件 + * + * @param bucketName + * @param ossPath + * @param multipartFile + */ + public static String uploadMultipartFile(String bucketName, String ossPath, MultipartFile multipartFile) { + InputStream inputStream = null; + try { + inputStream = multipartFile.getInputStream(); + } catch (IOException e) { + e.printStackTrace(); + } + uploadFileInputStreamForBucket(bucketName, ossPath, inputStream); + return accessPre + ossPath; + } + + /** + * 使用File上传PutObject上传文件 ** 程序默认使用次方法上传 + * + * @param bucketName 实例名称 + * @param ossPath oss存储路径 + * @param filePath 本地文件路径 + */ + public static String uploadFileForBucket(String bucketName, String ossPath, String filePath) { + // 创建PutObjectRequest对象。 + PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, ossPath, new File(filePath)); + + // 上传 + ossClient.putObject(putObjectRequest); + return accessPre + ossPath; + } + + /** + * 使用文件流上传到指定的bucket实例 + * + * @param bucketName 实例名称 + * @param ossPath oss存储路径 + * @param filePath 本地文件路径 + */ + public static String uploadFileInputStreamForBucket(String bucketName, String ossPath, String filePath) { + + // 填写本地文件的完整路径。如果未指定本地路径，则默认从示例程序所属项目对应本地路径中上传文件流。 + InputStream inputStream = null; + try { + inputStream = new FileInputStream(filePath); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + // 填写Bucket名称和Object完整路径。Object完整路径中不能包含Bucket名称。 + uploadFileInputStreamForBucket(bucketName, ossPath, inputStream); + return accessPre + ossPath; + } + + public static void uploadFileInputStreamForBucket(String bucketName, String ossPath, InputStream inputStream) { + ossClient.putObject(bucketName, ossPath, inputStream); + } + + /** + * 下载 + * + * @param ossFilePath + * @param filePath + */ + public static void downloadFile(String ossFilePath, String filePath) { + downloadFileForBucket(bucketName, ossFilePath, filePath); + } + + /** + * 下载 + * + * @param bucketName 实例名称 + * @param ossFilePath oss存储路径 + * @param filePath 本地文件路径 + */ + public static void downloadFileForBucket(String bucketName, String ossFilePath, String filePath) { + ossClient.getObject(new GetObjectRequest(bucketName, ossFilePath), new File(filePath)); + } + + /** + * @return + */ + public static String getOssDefaultPath() { + LocalDateTime now = LocalDateTime.now(); + String url = + now.getYear() + "/" + + now.getMonth() + "/" + + now.getDayOfMonth() + "/" + + now.getHour() + "/" + + now.getMinute() + "/"; + return url; + } + + public static String getOssFilePath(String filePath) { + String fileSuf = filePath.substring(filePath.indexOf(".") + 1); + return getOssDefaultPath() + UUID.randomUUID().toString() + "." + fileSuf; + } + +} diff --git a/bwie-common/src/main/java/com/bwie/common/utils/SendSmsResponse.java b/bwie-common/src/main/java/com/bwie/common/utils/SendSmsResponse.java new file mode 100644 index 0000000..05e4810 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/utils/SendSmsResponse.java @@ -0,0 +1,52 @@ +// +// Source code recreated from a .class file by IntelliJ IDEA +// (powered by Fernflower decompiler) +// + +package com.bwie.common.utils; + +import com.aliyun.dysmsapi20170525.models.SendSmsResponseBody; +import com.aliyun.tea.NameInMap; +import com.aliyun.tea.TeaModel; +import com.aliyun.tea.Validation; + +import java.util.Map; + +public class SendSmsResponse extends TeaModel { + @NameInMap("headers") + @Validation( + required = true + ) + public Map headers; + @NameInMap("body") + @Validation( + required = true + ) + public SendSmsResponseBody body; + + public SendSmsResponse() { + } + + public static SendSmsResponse build(Map map) throws Exception { + SendSmsResponse self = new SendSmsResponse(); + return (SendSmsResponse)TeaModel.build(map, self); + } + + public SendSmsResponse setHeaders(Map headers) { + this.headers = headers; + return this; + } + + public Map getHeaders() { + return this.headers; + } + + public SendSmsResponse setBody(SendSmsResponseBody body) { + this.body = body; + return this; + } + + public SendSmsResponseBody getBody() { + return this.body; + } +} diff --git a/bwie-common/src/main/java/com/bwie/common/utils/SmsResponse.java b/bwie-common/src/main/java/com/bwie/common/utils/SmsResponse.java new file mode 100644 index 0000000..de9f0af --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/utils/SmsResponse.java @@ -0,0 +1,21 @@ +package com.bwie.common.utils; + +import lombok.Data; + +/** + * @Author：zhangchengzhi + * @version 1.0 + * @description: TODO + * @date 2023/8/8 16:27 + */ +@Data +public class SmsResponse { + + private String msg; + + private String smsid; + + private String code; + + private String balance; +} diff --git a/bwie-common/src/main/java/com/bwie/common/utils/StringUtils.java b/bwie-common/src/main/java/com/bwie/common/utils/StringUtils.java new file mode 100644 index 0000000..518c30d --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/utils/StringUtils.java @@ -0,0 +1,68 @@ +package com.bwie.common.utils; + +import org.springframework.util.AntPathMatcher; + +import java.util.Collection; +import java.util.List; + +/** + * @Author：zhangchengzhi + * @description: 字符串处理工具类 + */ +public class StringUtils extends org.apache.commons.lang3.StringUtils { + + /** + * * 判断一个对象是否为空 + * + * @param object Object + * @return true：为空 false：非空 + */ + public static boolean isNull(Object object) { + return object == null; + } + + /** + * * 判断一个Collection是否为空， 包含List，Set，Queue + * + * @param coll 要判断的Collection + * @return true：为空 false：非空 + */ + public static boolean isEmpty(Collection coll) { + return isNull(coll) || coll.isEmpty(); + } + + /** + * 查找指定字符串是否匹配指定字符串列表中的任意一个字符串 + * + * @param str 指定字符串 + * @param strs 需要检查的字符串数组 + * @return 是否匹配 + */ + public static boolean matches(String str, List strs) { + if (isEmpty(str) || isEmpty(strs)) { + return false; + } + for (String pattern : strs) { + if (isMatch(pattern, str)) + { + return true; + } + } + return false; + } + + /** + * 判断url是否与规则配置: + * ? 表示单个字符; + * * 表示一层路径内的任意字符串，不可跨层级; + * ** 表示任意层路径; + * + * @param pattern 匹配规则 + * @param url 需要匹配的url + * @return + */ + public static boolean isMatch(String pattern, String url) { + AntPathMatcher matcher = new AntPathMatcher(); + return matcher.match(pattern, url); + } +} diff --git a/bwie-common/src/main/java/com/bwie/common/utils/TelSmsUtils.java b/bwie-common/src/main/java/com/bwie/common/utils/TelSmsUtils.java new file mode 100644 index 0000000..2b554f3 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/utils/TelSmsUtils.java @@ -0,0 +1,96 @@ +package com.bwie.common.utils; + +import com.alibaba.fastjson.JSONObject; +import com.aliyun.dysmsapi20170525.Client; +import com.aliyun.dysmsapi20170525.models.SendSmsRequest; +import com.aliyun.dysmsapi20170525.models.SendSmsResponse; +import com.aliyun.dysmsapi20170525.models.SendSmsResponseBody; +import com.aliyun.teaopenapi.models.Config; +import lombok.extern.log4j.Log4j2; + +import java.util.Map; + +/** + * 短信工具类 + */ +@Log4j2 +public class TelSmsUtils { + + /** + * 阿里云主账号AccessKey，accessKeySecret拥有所有API的访问权限 + */ + private static String accessKeyId = "LTAI5tDbRqXkC5i3SMrCSDcX"; + + private static String accessKeySecret = "XUzMZoHPLsjNLafHsdQnMElBWZATsu"; + + /** + * 短信访问域名 + */ + private static String endpoint = "dysmsapi.aliyuncs.com"; + + /** + * 短信签名 + */ + private static String signName = "乐优购"; + + /** + * 模板编号 + */ + private static String templateCode = "SMS_163851467"; + + /** + * 实例化短信对象 + */ + private static Client client; + + static { + log.info("初始化短信服务开始"); + long startTime = System.currentTimeMillis(); + try { + client = initClient(); + log.info("初始化短信成功：{}", signName); + } catch (Exception e) { + e.printStackTrace(); + } + log.info("初始化短信服务结束：耗时：{}MS", (System.currentTimeMillis() - startTime)); + } + + /** + * 初始化短信对象 + * + * @return + * @throws Exception + */ + private static Client initClient() throws Exception { + Config config = new Config() + // 您的AccessKey ID + .setAccessKeyId(accessKeyId) + // 您的AccessKey Secret + .setAccessKeySecret(accessKeySecret); + // 访问的域名 + config.endpoint = endpoint; + return new Client(config); + } + + /** + * 发送单条短信 + * + * @param tel + */ + public static SendSmsResponseBody sendSms(String tel, Map sendDataMap) { + SendSmsRequest sendSmsRequest = new SendSmsRequest() + .setPhoneNumbers(tel) + .setSignName(signName) + .setTemplateCode(templateCode) + .setTemplateParam(JSONObject.toJSONString(sendDataMap)); + SendSmsResponse sendSmsResponse = null; + try { + log.info("发送短信验证码：消息内容是：【{}】", JSONObject.toJSONString(sendDataMap)); + sendSmsResponse = client.sendSms(sendSmsRequest); + } catch (Exception e) { + log.error("短信发送异常，手机号：【{}】，短信内容：【{}】，异常信息：【{}】", tel, sendDataMap, e); + } + return sendSmsResponse.getBody(); + } + +} diff --git a/bwie-gateway/pom.xml b/bwie-gateway/pom.xml new file mode 100644 index 0000000..4ddd5e7 --- /dev/null +++ b/bwie-gateway/pom.xml @@ -0,0 +1,45 @@ + + + 4.0.0 + + com.bwie + week_7.30_house + 1.0-SNAPSHOT + + + bwie-gateway + + + 17 + 17 + UTF-8 + + + + + + com.bwie + bwie-common + + + + + org.springframework.cloud + spring-cloud-starter-gateway + + + + com.alibaba.cloud + spring-cloud-alibaba-sentinel-gateway + + + + com.alibaba.csp + sentinel-spring-cloud-gateway-adapter + + + + + diff --git a/bwie-gateway/src/main/java/com/bwie/gateway/GatewayApplication.java b/bwie-gateway/src/main/java/com/bwie/gateway/GatewayApplication.java new file mode 100644 index 0000000..8bf3f37 --- /dev/null +++ b/bwie-gateway/src/main/java/com/bwie/gateway/GatewayApplication.java @@ -0,0 +1,18 @@ +package com.bwie.gateway; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.gateway + * @Project：week_7.30_house + * @name：GatewayApplication + * @Date：2024/7/30 9:43 + */ +@SpringBootApplication +public class GatewayApplication { + public static void main(String[] args) { + SpringApplication.run(GatewayApplication.class); + } +} diff --git a/bwie-gateway/src/main/java/com/bwie/gateway/config/IgnoreWhiteConfig.java b/bwie-gateway/src/main/java/com/bwie/gateway/config/IgnoreWhiteConfig.java new file mode 100644 index 0000000..6aacf9e --- /dev/null +++ b/bwie-gateway/src/main/java/com/bwie/gateway/config/IgnoreWhiteConfig.java @@ -0,0 +1,32 @@ +package com.bwie.gateway.config; + +import com.alibaba.fastjson.JSONObject; +import lombok.Data; +import lombok.extern.log4j.Log4j2; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.context.annotation.Configuration; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: 放行白名单配置 + * @Author：zhangchengzhi + */ +@Configuration +@RefreshScope +@ConfigurationProperties(prefix = "ignore") +@Data +@Log4j2 +public class IgnoreWhiteConfig { + /** + * 放行白名单配置，网关不校验此处的白名单 + */ + private List whites = new ArrayList<>(); + + public void setWhites(List whites) { + log.info("加载网关路径白名单:{}", JSONObject.toJSONString(whites)); + this.whites = whites; + } +} diff --git a/bwie-gateway/src/main/java/com/bwie/gateway/filters/GateWayFilter.java b/bwie-gateway/src/main/java/com/bwie/gateway/filters/GateWayFilter.java new file mode 100644 index 0000000..b0b3b8b --- /dev/null +++ b/bwie-gateway/src/main/java/com/bwie/gateway/filters/GateWayFilter.java @@ -0,0 +1,72 @@ +package com.bwie.gateway.filters; + +import com.bwie.common.constants.TokenConstants; +import com.bwie.common.utils.JwtUtils; +import com.bwie.common.utils.StringUtils; +import com.bwie.gateway.config.IgnoreWhiteConfig; +import com.bwie.gateway.utils.GatewayUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.gateway.filter.GatewayFilterChain; +import org.springframework.cloud.gateway.filter.GlobalFilter; +import org.springframework.core.Ordered; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.stereotype.Component; +import org.springframework.web.server.ServerWebExchange; +import reactor.core.publisher.Mono; + +import java.util.List; +import java.util.concurrent.TimeUnit; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.gateway.filters + * @Project：week_7.30_house + * @name：GlobalFilter + * @Date：2024/7/30 9:43 + */ +@Component +public class GateWayFilter implements GlobalFilter,Ordered { + + @Autowired + private StringRedisTemplate redisTemplate; + + @Autowired + private IgnoreWhiteConfig ignoreWhiteConfig; + + @Override + public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) { + + ServerHttpRequest request = exchange.getRequest(); + + String path = request.getURI().getPath(); + + List whites = ignoreWhiteConfig.getWhites(); + + if (StringUtils.matches(path,whites)){ + return chain.filter(exchange); + } + + String token = request.getHeaders().getFirst(TokenConstants.TOKEN); + + try { + JwtUtils.parseToken(token); + } catch (Exception e) { + return GatewayUtils.errorResponse(exchange,"token不合法"); + } + + String userKey = JwtUtils.getUserKey(token); + + if (!redisTemplate.hasKey(TokenConstants.LOGIN_TOKEN_KEY+userKey)){ + return GatewayUtils.errorResponse(exchange,"token已过期"); + }else { + redisTemplate.expire(TokenConstants.LOGIN_TOKEN_KEY+userKey,30, TimeUnit.MINUTES); + } + return chain.filter(exchange); + } + + @Override + public int getOrder() { + return 0; + } +} diff --git a/bwie-gateway/src/main/java/com/bwie/gateway/utils/GatewayUtils.java b/bwie-gateway/src/main/java/com/bwie/gateway/utils/GatewayUtils.java new file mode 100644 index 0000000..5db7583 --- /dev/null +++ b/bwie-gateway/src/main/java/com/bwie/gateway/utils/GatewayUtils.java @@ -0,0 +1,98 @@ +package com.bwie.gateway.utils; + +import com.alibaba.fastjson.JSONObject; +import com.bwie.common.result.Result; +import com.bwie.common.utils.StringUtils; +import lombok.extern.log4j.Log4j2; +import org.springframework.core.io.buffer.DataBuffer; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.http.server.reactive.ServerHttpResponse; +import org.springframework.web.server.ServerWebExchange; +import reactor.core.publisher.Mono; + +/** + * @author DongZl + * @description: 网关处理工具类 + */ +@Log4j2 +public class GatewayUtils { + /** + * 添加请求头参数 + * @param mutate 修改对象 + * @param key 键 + * @param value 值 + */ + public static void addHeader(ServerHttpRequest.Builder mutate, String key, Object value) { + if (StringUtils.isEmpty(key)){ + log.warn("添加请求头参数键不可以为空"); + return; + } + if (value == null) { + log.warn("添加请求头参数：[{}]值为空",key); + return; + } + String valueStr = value.toString(); + mutate.header(key, valueStr); + log.info("添加请求头参数成功 - 键:[{}] , 值:[{}]", key , value); + } + + /** + * 删除请求头参数 + * @param mutate 修改对象 + * @param key 键 + */ + public static void removeHeader(ServerHttpRequest.Builder mutate, String key) { + if (StringUtils.isEmpty(key)){ + log.warn("删除请求头参数键不可以为空"); + return; + } + mutate.headers(httpHeaders -> httpHeaders.remove(key)).build(); + log.info("删除请求头参数 - 键:[{}]",key); + } + + /** + * 错误结果响应 + * @param exchange 响应上下文 + * @param msg 响应消息 + * @return + */ + public static Mono errorResponse(ServerWebExchange exchange, String msg, HttpStatus httpStatus) { + ServerHttpResponse response = exchange.getResponse(); + //设置HTTP响应头状态 + response.setStatusCode(httpStatus); + //设置HTTP响应头文本格式 + response.getHeaders().add(HttpHeaders.CONTENT_TYPE, "application/json"); + //定义响应内容 + Result result = Result.error(msg); + String resultJson = JSONObject.toJSONString(result); + log.error("[鉴权异常处理]请求路径:[{}]，异常信息：[{}]，响应结果：[{}]", exchange.getRequest().getPath(), msg, resultJson); + DataBuffer dataBuffer = response.bufferFactory().wrap(resultJson.getBytes()); + //进行响应 + return response.writeWith(Mono.just(dataBuffer)); + } + + /** + * 错误结果响应 + * @param exchange 响应上下文 + * @param msg 响应消息 + * @return + */ + public static Mono errorResponse(ServerWebExchange exchange, String msg) { + ServerHttpResponse response = exchange.getResponse(); + //设置HTTP响应头状态 + response.setStatusCode(HttpStatus.OK); + //设置HTTP响应头文本格式 + response.getHeaders().add(HttpHeaders.CONTENT_TYPE, "application/json"); + //定义响应内容 + Result result = Result.error(50008,msg); + String resultJson = JSONObject.toJSONString(result); + log.error("[鉴权异常处理]请求路径:[{}]，异常信息：[{}]，响应结果：[{}]", exchange.getRequest().getPath(), msg, resultJson); + DataBuffer dataBuffer = response.bufferFactory().wrap(resultJson.getBytes()); + //进行响应 + return response.writeWith(Mono.just(dataBuffer)); + } + + +} diff --git a/bwie-gateway/src/main/resources/bootstrap.yml b/bwie-gateway/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..28b1ca6 --- /dev/null +++ b/bwie-gateway/src/main/resources/bootstrap.yml @@ -0,0 +1,29 @@ +# Tomcat +server: + port: 18080 +# Spring +spring: + application: + # 应用名称 + name: bwie-gateway + profiles: + # 环境配置 + active: dev + main: + # 允许使用循环引用 + allow-circular-references: true + # 允许定义相同的bean对象 去覆盖原有的 + allow-bean-definition-overriding: true + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 106.54.199.209:8848 + config: + # 配置中心地址 + server-addr: 106.54.199.209:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/bwie-modules/bwie-house/pom.xml b/bwie-modules/bwie-house/pom.xml new file mode 100644 index 0000000..40802b0 --- /dev/null +++ b/bwie-modules/bwie-house/pom.xml @@ -0,0 +1,70 @@ + + + 4.0.0 + + com.bwie + bwie-modules + 1.0-SNAPSHOT + + + bwie-house + + + 17 + 17 + UTF-8 + + + + + + com.bwie + bwie-common + + + + org.springframework.boot + spring-boot-starter-web + + + + com.alibaba + druid-spring-boot-starter + 1.2.8 + + + + mysql + mysql-connector-java + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 2.2.2 + + + + com.github.pagehelper + pagehelper-spring-boot-starter + 1.4.1 + + + + org.springframework.boot + spring-boot-starter-test + test + + + com.github.tobato + fastdfs-client + 1.26.5 + + + + + + + diff --git a/bwie-modules/bwie-house/src/main/java/com/bwie/house/HouseApplication.java b/bwie-modules/bwie-house/src/main/java/com/bwie/house/HouseApplication.java new file mode 100644 index 0000000..1bc76cc --- /dev/null +++ b/bwie-modules/bwie-house/src/main/java/com/bwie/house/HouseApplication.java @@ -0,0 +1,25 @@ +package com.bwie.house; + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.scheduling.annotation.EnableScheduling; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.house + * @Project：week_7.30_house + * @name：House + * @Date：2024/7/30 10:05 + */ +@EnableFeignClients +@SpringBootApplication +@MapperScan("com.bwie.house.mapper") +@EnableScheduling +public class HouseApplication { + public static void main(String[] args) { + SpringApplication.run(HouseApplication.class); + } +} diff --git a/bwie-modules/bwie-house/src/main/java/com/bwie/house/config/ConfirmCallbackConfig.java b/bwie-modules/bwie-house/src/main/java/com/bwie/house/config/ConfirmCallbackConfig.java new file mode 100644 index 0000000..a94b140 --- /dev/null +++ b/bwie-modules/bwie-house/src/main/java/com/bwie/house/config/ConfirmCallbackConfig.java @@ -0,0 +1,39 @@ +package com.bwie.house.config; + +import org.springframework.amqp.rabbit.connection.CorrelationData; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; + +@Component +public class ConfirmCallbackConfig implements RabbitTemplate.ConfirmCallback { + + @Autowired + private RabbitTemplate rabbitTemplate; + + /** + * 当前bean初始化的时候执行 + */ + @PostConstruct + public void init() { + this.rabbitTemplate.setConfirmCallback(this); + } + + /** + * 确认方法 + * @param correlationData correlation data for the callback. + * @param ack true for ack, false for nack + * @param cause An optional cause, for nack, when available, otherwise null. + */ + @Override + public void confirm(CorrelationData correlationData, boolean ack, String cause) { + if (ack) { + System.out.println("消息发送到 broker 成功"); + } else { + System.out.println("消息发送到 broker 失败，失败的原因：" + cause); + } + } + +} diff --git a/bwie-modules/bwie-house/src/main/java/com/bwie/house/config/InitPasswordEncode.java b/bwie-modules/bwie-house/src/main/java/com/bwie/house/config/InitPasswordEncode.java new file mode 100644 index 0000000..aabffec --- /dev/null +++ b/bwie-modules/bwie-house/src/main/java/com/bwie/house/config/InitPasswordEncode.java @@ -0,0 +1,21 @@ +package com.bwie.house.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.stereotype.Component; + +/** + * @Author：zcz + * @Package：com.bwie.auth.config + * @Project：zuoye4.9 + * @name：InitPasswordEncode + * @Date：2024/4/10 7:36 + */ +@Component +public class InitPasswordEncode { + + @Bean + public BCryptPasswordEncoder bCryptPasswordEncoder(){ + return new BCryptPasswordEncoder(); + } +} diff --git a/bwie-modules/bwie-house/src/main/java/com/bwie/house/config/RabbitAdminConfig.java b/bwie-modules/bwie-house/src/main/java/com/bwie/house/config/RabbitAdminConfig.java new file mode 100644 index 0000000..a0581c4 --- /dev/null +++ b/bwie-modules/bwie-house/src/main/java/com/bwie/house/config/RabbitAdminConfig.java @@ -0,0 +1,53 @@ +package com.bwie.house.config; + +import org.springframework.amqp.rabbit.connection.CachingConnectionFactory; +import org.springframework.amqp.rabbit.connection.ConnectionFactory; +import org.springframework.amqp.rabbit.core.RabbitAdmin; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * RabbitAdmin是RabbitMQ的一个Java客户端库，它提供了管理RabbitMQ资源的功能。它是通过与RabbitMQ服务器进行交互来执行管理操作的。 + */ +@Configuration +public class RabbitAdminConfig { + + @Value("${spring.rabbitmq.host}") + private String host; + @Value("${spring.rabbitmq.username}") + private String username; + @Value("${spring.rabbitmq.password}") + private String password; + @Value("${spring.rabbitmq.virtualhost}") + private String virtualhost; + + /** + * 构建 RabbitMQ的连接工厂 + * @return + */ + @Bean + public ConnectionFactory connectionFactory() { + CachingConnectionFactory connectionFactory = new CachingConnectionFactory(); + connectionFactory.setAddresses(host); + connectionFactory.setUsername(username); + connectionFactory.setPassword(password); + connectionFactory.setVirtualHost(virtualhost); + // 配置发送确认回调时，次配置必须配置，否则即使在RabbitTemplate配置了ConfirmCallback也不会生效 + connectionFactory.setPublisherConfirmType(CachingConnectionFactory.ConfirmType.CORRELATED); + connectionFactory.setPublisherReturns(true); + return connectionFactory; + } + + /** + * 自己初始化 RabbitAdmin + * @param connectionFactory + * @return + */ + @Bean + public RabbitAdmin rabbitAdmin(ConnectionFactory connectionFactory) { + RabbitAdmin rabbitAdmin = new RabbitAdmin(connectionFactory); + rabbitAdmin.setAutoStartup(true); + return rabbitAdmin; + } +} diff --git a/bwie-modules/bwie-house/src/main/java/com/bwie/house/config/RabbitmqConfig.java b/bwie-modules/bwie-house/src/main/java/com/bwie/house/config/RabbitmqConfig.java new file mode 100644 index 0000000..01c51c8 --- /dev/null +++ b/bwie-modules/bwie-house/src/main/java/com/bwie/house/config/RabbitmqConfig.java @@ -0,0 +1,22 @@ +package com.bwie.house.config; + +import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter; +import org.springframework.amqp.support.converter.MessageConverter; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * 自定义消息转换器 + */ +@Configuration +public class RabbitmqConfig { + /** + * 消息转换配置 + * + * @return + */ + @Bean + public MessageConverter jsonMessageConverter() { + return new Jackson2JsonMessageConverter(); + } +} diff --git a/bwie-modules/bwie-house/src/main/java/com/bwie/house/config/ReturnCallbackConfig.java b/bwie-modules/bwie-house/src/main/java/com/bwie/house/config/ReturnCallbackConfig.java new file mode 100644 index 0000000..13e9362 --- /dev/null +++ b/bwie-modules/bwie-house/src/main/java/com/bwie/house/config/ReturnCallbackConfig.java @@ -0,0 +1,36 @@ +package com.bwie.house.config; + +import org.springframework.amqp.core.ReturnedMessage; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; + +/** + * 消息发送到 队列的回调 + */ +@Component +public class ReturnCallbackConfig implements RabbitTemplate.ReturnsCallback { + + @Autowired + private RabbitTemplate rabbitTemplate; + + @PostConstruct + public void init() { + rabbitTemplate.setReturnsCallback(this); + } + + /** + * 消息发送到 队列失败的时候执行 + * + * @param returnedMessage the returned message and metadata. + */ + @Override + public void returnedMessage(ReturnedMessage returnedMessage) { + System.out.println("消息" + returnedMessage.getMessage().toString() + + "被交换机" + returnedMessage.getExchange() + "回退！" + + "退回原因为：" + returnedMessage.getReplyText()); + // TODO 补偿机制 记录日志 添加到数据库 建一张表 消息发送记录表 + } +} diff --git a/bwie-modules/bwie-house/src/main/java/com/bwie/house/controller/HouseController.java b/bwie-modules/bwie-house/src/main/java/com/bwie/house/controller/HouseController.java new file mode 100644 index 0000000..c78982f --- /dev/null +++ b/bwie-modules/bwie-house/src/main/java/com/bwie/house/controller/HouseController.java @@ -0,0 +1,73 @@ +package com.bwie.house.controller; + +import com.bwie.common.domain.House; +import com.bwie.common.domain.User; +import com.bwie.common.domain.request.HouseReq; +import com.bwie.common.result.Result; +import com.bwie.house.service.HouseService; +import com.bwie.house.service.LogsService; +import com.bwie.house.service.TypeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.house.controller + * @Project：week_7.30_house + * @name：HouseController + * @Date：2024/7/30 9:58 + */ +@RestController +@RequestMapping("/house") +public class HouseController { + +@Autowired +private LogsService logsService; + +@Autowired + private HouseService houseService; + +//列表 + + +@PostMapping("/houseList") + public Result> houseList(@RequestBody HouseReq houseReq){ + + List list = houseService.houseList(houseReq); + + + return Result.success(list); +} + + +//通过id回显house请求 + + @PostMapping("/findHouseById/{houseId}") + public Result findHouseById(@PathVariable Integer houseId){ + + //点击租房判断此用户是否已经租房，如果已经存在租房记录，并且未到期，则不可以再次进行租房 + User onlieUser = logsService.getOnlieUser(); +//统计用户的租房 + Integer i = logsService.findlogsByUserId(onlieUser.getUserId()); + + if (0!=i){ + //不为0时 说明用户不符合租房要求 + return Result.error("用户不符合租房要求"); + } + + House house = houseService.findHouseById(houseId); + + + + + return Result.success(house); + } + + + + + + +} diff --git a/bwie-modules/bwie-house/src/main/java/com/bwie/house/controller/LogsController.java b/bwie-modules/bwie-house/src/main/java/com/bwie/house/controller/LogsController.java new file mode 100644 index 0000000..1049b9c --- /dev/null +++ b/bwie-modules/bwie-house/src/main/java/com/bwie/house/controller/LogsController.java @@ -0,0 +1,85 @@ +package com.bwie.house.controller; + +import com.bwie.common.domain.Logs; +import com.bwie.common.domain.User; +import com.bwie.common.result.Result; +import com.bwie.house.feign.SystemRemote; +import com.bwie.house.service.LogsService; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.transaction.annotation.Transactional; +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 java.util.List; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.house.controller + * @Project：week_7.30_house + * @name：LogsController + * @Date：2024/7/30 10:03 + */ +@RestController +@RequestMapping("/logs") +public class LogsController { + +@Autowired + private LogsService logsService; + +@Autowired +private SystemRemote systemRemote; + +@PostMapping("/logsList") + public Result> logsList(){ + + + List list = logsService.logsList(); + + + return Result.success(list); +} + + +/** + * 租房请求 + */ + +@Transactional +@PostMapping("/addLogs") + public Result addLogs(@RequestBody Logs logs){ + +User user = logsService.getOnlieUser(); + +logs.setUserId(user.getUserId()); +//添加租房记录 + int i = logsService.addLogs(logs); + + //修改用户租房次数记录优惠次数 如果用户为第二次租房，则不再享受优惠 + if (0 logsList = logsService.logsList(); + + + +} + + +} diff --git a/bwie-modules/bwie-house/src/main/java/com/bwie/house/controller/TypeController.java b/bwie-modules/bwie-house/src/main/java/com/bwie/house/controller/TypeController.java new file mode 100644 index 0000000..a9497b5 --- /dev/null +++ b/bwie-modules/bwie-house/src/main/java/com/bwie/house/controller/TypeController.java @@ -0,0 +1,63 @@ +package com.bwie.house.controller; + +import com.alibaba.fastjson.JSONObject; +import com.bwie.common.domain.Type; +import com.bwie.common.result.Result; +import com.bwie.house.service.TypeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.house.controller + * @Project：week_7.30_house + * @name：TypeController + * @Date：2024/7/30 10:00 + */ +@RestController +@RequestMapping("/type") +public class TypeController { + +@Autowired + private TypeService typeService; + +@Autowired +private StringRedisTemplate redisTemplate; + +//查询签约时长 + + @PostMapping("/typeList") + public Result> typeList(){ + + if (redisTemplate.hasKey("type")){ + + List stringList = redisTemplate.opsForList().range("type", 0, -1); + ArrayList arrayList = new ArrayList<>(); + + for (String string : stringList) { + Type type = JSONObject.parseObject(string, Type.class); + arrayList.add(type); + } +return Result.success(arrayList); + } + + +List list = typeService.typeList(); + + for (Type type : list) { + redisTemplate.opsForList().rightPush("type",JSONObject.toJSONString(type)); + } + + + return Result.success(list); + } + + + +} diff --git a/bwie-modules/bwie-house/src/main/java/com/bwie/house/feign/SystemRemote.java b/bwie-modules/bwie-house/src/main/java/com/bwie/house/feign/SystemRemote.java new file mode 100644 index 0000000..f94a1b7 --- /dev/null +++ b/bwie-modules/bwie-house/src/main/java/com/bwie/house/feign/SystemRemote.java @@ -0,0 +1,31 @@ +package com.bwie.house.feign; + + +import com.bwie.common.domain.User; +import com.bwie.common.result.Result; +import com.bwie.house.feign.falltry.SystemRemoteService; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.auth.feign + * @Project：week_7.30_house + * @name：SystemRemote + * @Date：2024/7/30 11:19 + */ +@FeignClient(value = "bwie-system" ,fallbackFactory = SystemRemoteService.class) +public interface SystemRemote { + + + @PostMapping("/user/login/{userPhone}") + public Result login(@PathVariable String userPhone); + + @PostMapping("/user/getOnlineuser") + public Result getOnlineuser(); + + @PostMapping("/user/updateUserBYId/{userId}") + public Result updateUserBYId(@PathVariable Integer userId); + +} diff --git a/bwie-modules/bwie-house/src/main/java/com/bwie/house/feign/falltry/SystemRemoteService.java b/bwie-modules/bwie-house/src/main/java/com/bwie/house/feign/falltry/SystemRemoteService.java new file mode 100644 index 0000000..b6ad669 --- /dev/null +++ b/bwie-modules/bwie-house/src/main/java/com/bwie/house/feign/falltry/SystemRemoteService.java @@ -0,0 +1,42 @@ +package com.bwie.house.feign.falltry; + + +import com.bwie.common.domain.User; +import com.bwie.common.result.Result; +import com.bwie.house.feign.SystemRemote; +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.auth.feign.falltry + * @Project：week_7.30_house + * @name：SystemRemoteService + * @Date：2024/7/30 11:21 + */ +@Component +public class SystemRemoteService implements FallbackFactory { + + + @Override + public SystemRemote create(Throwable cause) { + + + return new SystemRemote() { + @Override + public Result login(String userPhone) { + return Result.error(cause.getMessage()); + } + + @Override + public Result getOnlineuser() { + return Result.error(cause.getMessage()); + } + + @Override + public Result updateUserBYId(Integer userId) { + return Result.error(cause.getMessage()); + } + }; + } +} diff --git a/bwie-modules/bwie-house/src/main/java/com/bwie/house/mapper/HouseMapper.java b/bwie-modules/bwie-house/src/main/java/com/bwie/house/mapper/HouseMapper.java new file mode 100644 index 0000000..6c21f24 --- /dev/null +++ b/bwie-modules/bwie-house/src/main/java/com/bwie/house/mapper/HouseMapper.java @@ -0,0 +1,20 @@ +package com.bwie.house.mapper; + +import com.bwie.common.domain.House; +import com.bwie.common.domain.request.HouseReq; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.house.mapper + * @Project：week_7.30_house + * @name：HouseMapper + * @Date：2024/7/30 9:59 + */ +public interface HouseMapper { + List houseList(HouseReq houseReq); + + House findHouseById(@Param("houseId") Integer houseId); +} diff --git a/bwie-modules/bwie-house/src/main/java/com/bwie/house/mapper/LogsMapper.java b/bwie-modules/bwie-house/src/main/java/com/bwie/house/mapper/LogsMapper.java new file mode 100644 index 0000000..6967fc7 --- /dev/null +++ b/bwie-modules/bwie-house/src/main/java/com/bwie/house/mapper/LogsMapper.java @@ -0,0 +1,21 @@ +package com.bwie.house.mapper; + +import com.bwie.common.domain.Logs; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.house.mapper + * @Project：week_7.30_house + * @name：LogsMapper + * @Date：2024/7/30 10:04 + */ +public interface LogsMapper { + List logsList(); + + Integer findlogsByUserId(@Param("userId") Integer userId); + + int addLogs(Logs logs); +} diff --git a/bwie-modules/bwie-house/src/main/java/com/bwie/house/mapper/TypeMapper.java b/bwie-modules/bwie-house/src/main/java/com/bwie/house/mapper/TypeMapper.java new file mode 100644 index 0000000..5e75c53 --- /dev/null +++ b/bwie-modules/bwie-house/src/main/java/com/bwie/house/mapper/TypeMapper.java @@ -0,0 +1,19 @@ +package com.bwie.house.mapper; + +import com.bwie.common.domain.Type; +import com.bwie.common.result.Result; + +import java.util.List; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.house.mapper + * @Project：week_7.30_house + * @name：TypeMapper + * @Date：2024/7/30 10:02 + */ +public interface TypeMapper { + + + List typeList(); +} diff --git a/bwie-modules/bwie-house/src/main/java/com/bwie/house/service/HouseService.java b/bwie-modules/bwie-house/src/main/java/com/bwie/house/service/HouseService.java new file mode 100644 index 0000000..5c480d5 --- /dev/null +++ b/bwie-modules/bwie-house/src/main/java/com/bwie/house/service/HouseService.java @@ -0,0 +1,19 @@ +package com.bwie.house.service; + +import com.bwie.common.domain.House; +import com.bwie.common.domain.request.HouseReq; + +import java.util.List; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.house.service + * @Project：week_7.30_house + * @name：HouseService + * @Date：2024/7/30 9:59 + */ +public interface HouseService { + List houseList(HouseReq houseReq); + + House findHouseById(Integer houseId); +} diff --git a/bwie-modules/bwie-house/src/main/java/com/bwie/house/service/LogsService.java b/bwie-modules/bwie-house/src/main/java/com/bwie/house/service/LogsService.java new file mode 100644 index 0000000..4abed6a --- /dev/null +++ b/bwie-modules/bwie-house/src/main/java/com/bwie/house/service/LogsService.java @@ -0,0 +1,24 @@ +package com.bwie.house.service; + +import com.bwie.common.domain.Logs; +import com.bwie.common.domain.User; + +import java.util.List; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.house.service + * @Project：week_7.30_house + * @name：LogsService + * @Date：2024/7/30 10:04 + */ +public interface LogsService { + List logsList(); + + int addLogs(Logs logs); + + User getOnlieUser(); + + Integer findlogsByUserId(Integer userId); + +} diff --git a/bwie-modules/bwie-house/src/main/java/com/bwie/house/service/TypeService.java b/bwie-modules/bwie-house/src/main/java/com/bwie/house/service/TypeService.java new file mode 100644 index 0000000..b4b0b95 --- /dev/null +++ b/bwie-modules/bwie-house/src/main/java/com/bwie/house/service/TypeService.java @@ -0,0 +1,20 @@ +package com.bwie.house.service; + +import com.bwie.common.domain.Type; +import com.bwie.common.result.Result; + +import java.util.List; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.house.service + * @Project：week_7.30_house + * @name：TypeService + * @Date：2024/7/30 10:01 + */ +public interface TypeService { + + + List typeList(); + +} diff --git a/bwie-modules/bwie-house/src/main/java/com/bwie/house/service/impl/HouseServiceImpl.java b/bwie-modules/bwie-house/src/main/java/com/bwie/house/service/impl/HouseServiceImpl.java new file mode 100644 index 0000000..8c2a556 --- /dev/null +++ b/bwie-modules/bwie-house/src/main/java/com/bwie/house/service/impl/HouseServiceImpl.java @@ -0,0 +1,35 @@ +package com.bwie.house.service.impl; + +import com.bwie.common.domain.House; +import com.bwie.common.domain.request.HouseReq; +import com.bwie.house.mapper.HouseMapper; +import com.bwie.house.service.HouseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.house.service.impl + * @Project：week_7.30_house + * @name：HouseServiceImpl + * @Date：2024/7/30 9:59 + */ +@Service +public class HouseServiceImpl implements HouseService { + +@Autowired + private HouseMapper houseMapper; + + + @Override + public List houseList(HouseReq houseReq) { + return houseMapper.houseList(houseReq); + } + + @Override + public House findHouseById(Integer houseId) { + return houseMapper.findHouseById(houseId); + } +} diff --git a/bwie-modules/bwie-house/src/main/java/com/bwie/house/service/impl/LogsServiceImpl.java b/bwie-modules/bwie-house/src/main/java/com/bwie/house/service/impl/LogsServiceImpl.java new file mode 100644 index 0000000..bbb5db1 --- /dev/null +++ b/bwie-modules/bwie-house/src/main/java/com/bwie/house/service/impl/LogsServiceImpl.java @@ -0,0 +1,73 @@ +package com.bwie.house.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.bwie.common.constants.TokenConstants; +import com.bwie.common.domain.Logs; +import com.bwie.common.domain.User; +import com.bwie.common.utils.JwtUtils; +import com.bwie.house.mapper.LogsMapper; +import com.bwie.house.service.LogsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.house.service.impl + * @Project：week_7.30_house + * @name：LogsServiceImpl + * @Date：2024/7/30 10:04 + */ +@Service +public class LogsServiceImpl implements LogsService { + + @Autowired + private LogsMapper logsMapper; + + + @Override + public List logsList() { + return logsMapper.logsList(); + } + + + @Autowired + private HttpServletRequest request; + @Autowired + private StringRedisTemplate redisTemplate; + + @Override + public int addLogs(Logs logs) { + + int i = logsMapper.addLogs(logs); + + + + return i; + } + + @Override + public User getOnlieUser() { + String token = request.getHeader(TokenConstants.TOKEN); + + String userKey = JwtUtils.getUserKey(token); + + String string = redisTemplate.opsForValue().get(TokenConstants.LOGIN_TOKEN_KEY + userKey); + + User user = JSONObject.parseObject(string, User.class); + + return user; + + } + + @Override + public Integer findlogsByUserId(Integer userId) { + + return logsMapper.findlogsByUserId(userId); + } + + +} diff --git a/bwie-modules/bwie-house/src/main/java/com/bwie/house/service/impl/TypeServiceImpl.java b/bwie-modules/bwie-house/src/main/java/com/bwie/house/service/impl/TypeServiceImpl.java new file mode 100644 index 0000000..6de06bc --- /dev/null +++ b/bwie-modules/bwie-house/src/main/java/com/bwie/house/service/impl/TypeServiceImpl.java @@ -0,0 +1,35 @@ +package com.bwie.house.service.impl; + +import com.bwie.common.domain.Type; +import com.bwie.common.result.Result; +import com.bwie.house.mapper.TypeMapper; +import com.bwie.house.service.TypeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.house.service.impl + * @Project：week_7.30_house + * @name：TypeServiceImpl + * @Date：2024/7/30 10:01 + */ +@Service +public class TypeServiceImpl implements TypeService { + +@Autowired + private TypeMapper typeMapper; +@Autowired + + + @Override + public List typeList() { + + List list = typeMapper.typeList(); + + + return list; + } +} diff --git a/bwie-modules/bwie-house/src/main/java/com/bwie/house/util/FastUtil.java b/bwie-modules/bwie-house/src/main/java/com/bwie/house/util/FastUtil.java new file mode 100644 index 0000000..03ff314 --- /dev/null +++ b/bwie-modules/bwie-house/src/main/java/com/bwie/house/util/FastUtil.java @@ -0,0 +1,55 @@ +package com.bwie.house.util; + +import org.springframework.stereotype.Component; +import com.github.tobato.fastdfs.domain.fdfs.StorePath; +import com.github.tobato.fastdfs.service.FastFileStorageClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.util.StringUtils; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; + +/** + * @BelongsProject: 0107day02 + * @BelongsPackage: com.bw.config + * @Author: zhupengfei + * @CreateTime: 2023-02-01 08:52 + */ +@Component +public class FastUtil { + private static final Logger log = LoggerFactory.getLogger(FastUtil.class); + + @Resource + private FastFileStorageClient storageClient ; + + /** + * 上传文件 + */ + public String upload(MultipartFile multipartFile) throws Exception{ + String originalFilename = multipartFile.getOriginalFilename(). + substring(multipartFile.getOriginalFilename(). + lastIndexOf(".") + 1); + StorePath storePath = this.storageClient.uploadImageAndCrtThumbImage( + multipartFile.getInputStream(), + multipartFile.getSize(),originalFilename , null); + return storePath.getFullPath() ; + } + /** + * 删除文件 + */ + public String deleteFile(String fileUrl) { + if (StringUtils.isEmpty(fileUrl)) { + log.info("fileUrl == >>文件路径为空..."); + return "文件路径不能为空"; + } + try { + StorePath storePath = StorePath.parseFromUrl(fileUrl); + storageClient.deleteFile(storePath.getGroup(), storePath.getPath()); + } catch (Exception e) { + log.error(e.getMessage()); + } + return "删除成功"; + } + +} diff --git a/bwie-modules/bwie-house/src/main/resources/bootstrap.yml b/bwie-modules/bwie-house/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..5b34436 --- /dev/null +++ b/bwie-modules/bwie-house/src/main/resources/bootstrap.yml @@ -0,0 +1,57 @@ +# Tomcat +server: + port: 9010 +# Spring +spring: + main: + allow-circular-references: true + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + application: + # 应用名称 + name: bwie-house + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 106.54.199.209:8848 + config: + # 配置中心地址 + server-addr: 106.54.199.209:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + rabbitmq: + username: guest + password: guest + virtualHost: / + port: 5672 + host: 106.54.199.209 + listener: + simple: + prefetch: 1 # 默认每次取出一条消息消费， 消费完成取下一条 + acknowledge-mode: manual # 设置消费端手动ack确认 + retry: + enabled: true # 是否支持重试 + publisher-confirm-type: correlated #确认消息已发送到交换机(Exchange) + publisher-returns: true #确认消息已发送到队列(Queue) + +fdfs: + so-timeout: 1500 # socket 连接时长 + connect-timeout: 600 # 连接 tracker 服务器超时时长 + # 这两个是你服务器的 IP 地址，注意 23000 端口也要打开，阿里云服务器记得配置安全组。tracker 要和 stroage 服务进行交流 + tracker-list: 106.54.199.209:22122 + web-server-url: 106.54.199.209:8888 + pool: + jmx-enabled: false + # 生成缩略图 + thumb-image: + height: 500 + width: 500 + diff --git a/bwie-modules/bwie-house/src/main/resources/mapper/Logsmapper.xml b/bwie-modules/bwie-house/src/main/resources/mapper/Logsmapper.xml new file mode 100644 index 0000000..048b7c9 --- /dev/null +++ b/bwie-modules/bwie-house/src/main/resources/mapper/Logsmapper.xml @@ -0,0 +1,34 @@ + + + + + + INSERT INTO `house_7.30_week`.`logs` (`house_id`, `logs_date`, `type_id`, `logs_cost`, `logs_status`, `logs_text`, `user_id` ) + VALUES + ( #{houseId},now(),#{typeId},#{logsCost},#{logsStatus},#{logsText},#{userId}); + + + + + + diff --git a/bwie-modules/bwie-house/src/main/resources/mapper/housemapper.xml b/bwie-modules/bwie-house/src/main/resources/mapper/housemapper.xml new file mode 100644 index 0000000..48c51d1 --- /dev/null +++ b/bwie-modules/bwie-house/src/main/resources/mapper/housemapper.xml @@ -0,0 +1,28 @@ + + + + + + + diff --git a/bwie-modules/bwie-house/src/main/resources/mapper/typemapper.xml b/bwie-modules/bwie-house/src/main/resources/mapper/typemapper.xml new file mode 100644 index 0000000..356a0dc --- /dev/null +++ b/bwie-modules/bwie-house/src/main/resources/mapper/typemapper.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/bwie-modules/bwie-system/pom.xml b/bwie-modules/bwie-system/pom.xml new file mode 100644 index 0000000..784ae5a --- /dev/null +++ b/bwie-modules/bwie-system/pom.xml @@ -0,0 +1,71 @@ + + + 4.0.0 + + com.bwie + bwie-modules + 1.0-SNAPSHOT + + + bwie-system + + + 17 + 17 + UTF-8 + + + + + + + com.bwie + bwie-common + + + + org.springframework.boot + spring-boot-starter-web + + + + com.alibaba + druid-spring-boot-starter + 1.2.8 + + + + mysql + mysql-connector-java + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 2.2.2 + + + + com.github.pagehelper + pagehelper-spring-boot-starter + 1.4.1 + + + + org.springframework.boot + spring-boot-starter-test + test + + + com.github.tobato + fastdfs-client + 1.26.5 + + + + + + + diff --git a/bwie-modules/bwie-system/src/main/java/com/bwie/system/SystemApplication.java b/bwie-modules/bwie-system/src/main/java/com/bwie/system/SystemApplication.java new file mode 100644 index 0000000..4ad8022 --- /dev/null +++ b/bwie-modules/bwie-system/src/main/java/com/bwie/system/SystemApplication.java @@ -0,0 +1,20 @@ +package com.bwie.system; + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.system + * @Project：week_7.30_house + * @name：SystemApplication + * @Date：2024/7/30 9:56 + */ +@SpringBootApplication +@MapperScan("com.bwie.system.mapper") +public class SystemApplication { + public static void main(String[] args) { + SpringApplication.run(SystemApplication.class); + } +} diff --git a/bwie-modules/bwie-system/src/main/java/com/bwie/system/controller/UserController.java b/bwie-modules/bwie-system/src/main/java/com/bwie/system/controller/UserController.java new file mode 100644 index 0000000..982a9be --- /dev/null +++ b/bwie-modules/bwie-system/src/main/java/com/bwie/system/controller/UserController.java @@ -0,0 +1,63 @@ +package com.bwie.system.controller; + +import com.bwie.common.domain.User; +import com.bwie.common.result.Result; +import com.bwie.system.service.UserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.system.controller + * @Project：week_7.30_house + * @name：UserController + * @Date：2024/7/30 9:53 + */ +@RestController +@RequestMapping("/user") +public class UserController { + + @Autowired + private UserService userService; + + + @PostMapping("/login/{userPhone}") + public Result login(@PathVariable String userPhone){ + + User user = userService.login(userPhone); + + return Result.success(user); + }; + + /** + * 获取当前用户信息 + * @return + */ + @PostMapping("/getOnlineuser") + public Result getOnlineuser(){ + + User user = userService.getOnlineuser(); + + + return Result.success(user); + } + + /** + * 修改用户信息 + */ + @PostMapping("/updateUserBYId/{userId}") + public Result updateUserBYId(@PathVariable Integer userId){ + + + Integer i = userService.updateUserBYId(userId); + + + return Result.success(); + } + + + +} diff --git a/bwie-modules/bwie-system/src/main/java/com/bwie/system/mapper/UserMapper.java b/bwie-modules/bwie-system/src/main/java/com/bwie/system/mapper/UserMapper.java new file mode 100644 index 0000000..ece00d0 --- /dev/null +++ b/bwie-modules/bwie-system/src/main/java/com/bwie/system/mapper/UserMapper.java @@ -0,0 +1,19 @@ +package com.bwie.system.mapper; + +import com.bwie.common.domain.User; +import org.apache.ibatis.annotations.Param; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.system.mapper + * @Project：week_7.30_house + * @name：UserMapper + * @Date：2024/7/30 9:55 + */ +public interface UserMapper { + User login(@Param("userPhone") String userPhone); + + User findUserById(@Param("userId") Integer userId); + + Integer updateUserBYId(@Param("userId") Integer userId); +} diff --git a/bwie-modules/bwie-system/src/main/java/com/bwie/system/service/UserService.java b/bwie-modules/bwie-system/src/main/java/com/bwie/system/service/UserService.java new file mode 100644 index 0000000..d238f83 --- /dev/null +++ b/bwie-modules/bwie-system/src/main/java/com/bwie/system/service/UserService.java @@ -0,0 +1,18 @@ +package com.bwie.system.service; + +import com.bwie.common.domain.User; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.system.service + * @Project：week_7.30_house + * @name：UserService + * @Date：2024/7/30 9:54 + */ +public interface UserService { + User login(String userPhone); + + User getOnlineuser(); + + Integer updateUserBYId(Integer userId); +} diff --git a/bwie-modules/bwie-system/src/main/java/com/bwie/system/service/impl/UserServiceImpl.java b/bwie-modules/bwie-system/src/main/java/com/bwie/system/service/impl/UserServiceImpl.java new file mode 100644 index 0000000..1e2899c --- /dev/null +++ b/bwie-modules/bwie-system/src/main/java/com/bwie/system/service/impl/UserServiceImpl.java @@ -0,0 +1,67 @@ +package com.bwie.system.service.impl; + +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.system.mapper.UserMapper; +import com.bwie.system.service.UserService; +import org.apache.commons.collections.map.HashedMap; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletRequest; + +/** + * @Author：zhangchengzhi + * @Package：com.bwie.system.service.impl + * @Project：week_7.30_house + * @name：UserServiceImpl + * @Date：2024/7/30 9:54 + */ +@Service +public class UserServiceImpl implements UserService { + +@Autowired + private UserMapper userMapper; + + + @Override + public User login(String userPhone) { + + + return userMapper.login(userPhone); + } + + @Autowired + private HttpServletRequest request; + + @Autowired + private StringRedisTemplate redisTemplate; + + @Override + public User getOnlineuser() { + + String token = request.getHeader(TokenConstants.TOKEN); + + String userKey = JwtUtils.getUserKey(token); + + String string = redisTemplate.opsForValue().get(TokenConstants.LOGIN_TOKEN_KEY + userKey); + + User user = JSONObject.parseObject(string, User.class); + + Integer userId = user.getUserId(); + + User userOnline= userMapper.findUserById(userId); + + + return userOnline; + + } + + @Override + public Integer updateUserBYId(Integer userId) { + return userMapper.updateUserBYId(userId); + } +} diff --git a/bwie-modules/bwie-system/src/main/java/com/bwie/system/util/FastUtil.java b/bwie-modules/bwie-system/src/main/java/com/bwie/system/util/FastUtil.java new file mode 100644 index 0000000..e1a4d1a --- /dev/null +++ b/bwie-modules/bwie-system/src/main/java/com/bwie/system/util/FastUtil.java @@ -0,0 +1,55 @@ +package com.bwie.system.util; + +import org.springframework.stereotype.Component; +import com.github.tobato.fastdfs.domain.fdfs.StorePath; +import com.github.tobato.fastdfs.service.FastFileStorageClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.util.StringUtils; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; + +/** + * @BelongsProject: 0107day02 + * @BelongsPackage: com.bw.config + * @Author: zhupengfei + * @CreateTime: 2023-02-01 08:52 + */ +@Component +public class FastUtil { + private static final Logger log = LoggerFactory.getLogger(FastUtil.class); + + @Resource + private FastFileStorageClient storageClient ; + + /** + * 上传文件 + */ + public String upload(MultipartFile multipartFile) throws Exception{ + String originalFilename = multipartFile.getOriginalFilename(). + substring(multipartFile.getOriginalFilename(). + lastIndexOf(".") + 1); + StorePath storePath = this.storageClient.uploadImageAndCrtThumbImage( + multipartFile.getInputStream(), + multipartFile.getSize(),originalFilename , null); + return storePath.getFullPath() ; + } + /** + * 删除文件 + */ + public String deleteFile(String fileUrl) { + if (StringUtils.isEmpty(fileUrl)) { + log.info("fileUrl == >>文件路径为空..."); + return "文件路径不能为空"; + } + try { + StorePath storePath = StorePath.parseFromUrl(fileUrl); + storageClient.deleteFile(storePath.getGroup(), storePath.getPath()); + } catch (Exception e) { + log.error(e.getMessage()); + } + return "删除成功"; + } + +} diff --git a/bwie-modules/bwie-system/src/main/resources/bootstrap.yml b/bwie-modules/bwie-system/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..ac4eafd --- /dev/null +++ b/bwie-modules/bwie-system/src/main/resources/bootstrap.yml @@ -0,0 +1,41 @@ +# Tomcat +server: + port: 9004 +# Spring +spring: + main: + allow-circular-references: true + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + application: + # 应用名称 + name: bwie-system + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 106.54.199.209:8848 + config: + # 配置中心地址 + server-addr: 106.54.199.209:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +fdfs: + so-timeout: 1500 # socket 连接时长 + connect-timeout: 600 # 连接 tracker 服务器超时时长 + # 这两个是你服务器的 IP 地址，注意 23000 端口也要打开，阿里云服务器记得配置安全组。tracker 要和 stroage 服务进行交流 + tracker-list: 106.54.199.209:22122 + web-server-url: 106.54.199.209:8888 + pool: + jmx-enabled: false + # 生成缩略图 + thumb-image: + height: 500 + width: 500 diff --git a/bwie-modules/bwie-system/src/main/resources/mapper/usermapper.xml b/bwie-modules/bwie-system/src/main/resources/mapper/usermapper.xml new file mode 100644 index 0000000..70e3af4 --- /dev/null +++ b/bwie-modules/bwie-system/src/main/resources/mapper/usermapper.xml @@ -0,0 +1,20 @@ + + + + + UPDATE `house_7.30_week`.`user` + SET + `user_num` = `user_num` + 1 + + WHERE + `user_id` = #{userId}; + + + + + + diff --git a/bwie-modules/pom.xml b/bwie-modules/pom.xml new file mode 100644 index 0000000..cc200c9 --- /dev/null +++ b/bwie-modules/pom.xml @@ -0,0 +1,25 @@ + + + 4.0.0 + + com.bwie + week_7.30_house + 1.0-SNAPSHOT + + + bwie-modules + pom + + bwie-system + bwie-house + + + + 17 + 17 + UTF-8 + + + diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..a1415da --- /dev/null +++ b/pom.xml @@ -0,0 +1,66 @@ + + + 4.0.0 + + com.bwie + week_7.30_house + 1.0-SNAPSHOT + pom + + bwie-common + bwie-auth + bwie-gateway + bwie-modules + + + + 17 + 17 + UTF-8 + + + + + spring-boot-starter-parent + org.springframework.boot + 2.6.2 + + + + + + + + org.springframework.cloud + spring-cloud-dependencies + 2021.0.0 + pom + import + + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + 2021.1 + pom + import + + + + com.alibaba.nacos + nacos-client + 2.0.4 + + + + + com.bwie + bwie-common + 1.0-SNAPSHOT + + + + + diff --git a/前台/src/App.vue b/前台/src/App.vue new file mode 100644 index 0000000..ec9032c --- /dev/null +++ b/前台/src/App.vue @@ -0,0 +1,11 @@ + + + diff --git a/前台/src/api/table.js b/前台/src/api/table.js new file mode 100644 index 0000000..bb503a2 --- /dev/null +++ b/前台/src/api/table.js @@ -0,0 +1,48 @@ +import request from '@/utils/request' + +export function getList(params) { + return request({ + url: '/vue-admin-template/table/list', + method: 'get', + params + }) +} + +export function getHouseList(data) { + return request({ + url: '/house/house/houseList', + method: 'post', + data + }) +} + +export function getlogsList() { + return request({ + url: '/house/logs/logsList', + method: 'post', + }) +} + + +export function getTypeList() { + return request({ + url: '/house/type/typeList', + method: 'post', + }) +} + +export function findHouseById(houseId) { + return request({ + url: '/house/house/findHouseById/'+houseId, + method: 'post', + }) +} +export function addLogs(data) { + return request({ + url: '/house/logs/addLogs', + method: 'post', + data + }) +} + + diff --git a/前台/src/api/user.js b/前台/src/api/user.js new file mode 100644 index 0000000..547f937 --- /dev/null +++ b/前台/src/api/user.js @@ -0,0 +1,29 @@ +import request from '@/utils/request' + +export function login(data) { + return request({ + url: '/auth/auth/login', + method: 'post', + data + }) +} +export function getOnlineuser() { + return request({ + url: '/system/user/getOnlineuser', + method: 'post', + }) +} +// export function getInfo(token) { +// return request({ +// url: '/vue-admin-template/user/info', +// method: 'get', +// params: { token } +// }) +// } + +export function logout() { + return request({ + url: '/vue-admin-template/user/logout', + method: 'post' + }) +} diff --git a/前台/src/assets/404_images/404.png b/前台/src/assets/404_images/404.png new file mode 100644 index 0000000..3d8e230 Binary files /dev/null and b/前台/src/assets/404_images/404.png differ diff --git a/前台/src/assets/404_images/404_cloud.png b/前台/src/assets/404_images/404_cloud.png new file mode 100644 index 0000000..c6281d0 Binary files /dev/null and b/前台/src/assets/404_images/404_cloud.png differ diff --git a/前台/src/components/Breadcrumb/index.vue b/前台/src/components/Breadcrumb/index.vue new file mode 100644 index 0000000..29f9a04 --- /dev/null +++ b/前台/src/components/Breadcrumb/index.vue @@ -0,0 +1,78 @@ + + + + + diff --git a/前台/src/components/Hamburger/index.vue b/前台/src/components/Hamburger/index.vue new file mode 100644 index 0000000..368b002 --- /dev/null +++ b/前台/src/components/Hamburger/index.vue @@ -0,0 +1,44 @@ + + + + + diff --git a/前台/src/components/SvgIcon/index.vue b/前台/src/components/SvgIcon/index.vue new file mode 100644 index 0000000..b07ded2 --- /dev/null +++ b/前台/src/components/SvgIcon/index.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/前台/src/icons/index.js b/前台/src/icons/index.js new file mode 100644 index 0000000..2c6b309 --- /dev/null +++ b/前台/src/icons/index.js @@ -0,0 +1,9 @@ +import Vue from 'vue' +import SvgIcon from '@/components/SvgIcon'// svg component + +// register globally +Vue.component('svg-icon', SvgIcon) + +const req = require.context('./svg', false, /\.svg$/) +const requireAll = requireContext => requireContext.keys().map(requireContext) +requireAll(req) diff --git a/前台/src/icons/svg/dashboard.svg b/前台/src/icons/svg/dashboard.svg new file mode 100644 index 0000000..5317d37 --- /dev/null +++ b/前台/src/icons/svg/dashboard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/前台/src/icons/svg/example.svg b/前台/src/icons/svg/example.svg new file mode 100644 index 0000000..46f42b5 --- /dev/null +++ b/前台/src/icons/svg/example.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/前台/src/icons/svg/eye-open.svg b/前台/src/icons/svg/eye-open.svg new file mode 100644 index 0000000..88dcc98 --- /dev/null +++ b/前台/src/icons/svg/eye-open.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/前台/src/icons/svg/eye.svg b/前台/src/icons/svg/eye.svg new file mode 100644 index 0000000..16ed2d8 --- /dev/null +++ b/前台/src/icons/svg/eye.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/前台/src/icons/svg/form.svg b/前台/src/icons/svg/form.svg new file mode 100644 index 0000000..dcbaa18 --- /dev/null +++ b/前台/src/icons/svg/form.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/前台/src/icons/svg/link.svg b/前台/src/icons/svg/link.svg new file mode 100644 index 0000000..48197ba --- /dev/null +++ b/前台/src/icons/svg/link.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/前台/src/icons/svg/nested.svg b/前台/src/icons/svg/nested.svg new file mode 100644 index 0000000..06713a8 --- /dev/null +++ b/前台/src/icons/svg/nested.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/前台/src/icons/svg/password.svg b/前台/src/icons/svg/password.svg new file mode 100644 index 0000000..e291d85 --- /dev/null +++ b/前台/src/icons/svg/password.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/前台/src/icons/svg/table.svg b/前台/src/icons/svg/table.svg new file mode 100644 index 0000000..0e3dc9d --- /dev/null +++ b/前台/src/icons/svg/table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/前台/src/icons/svg/tree.svg b/前台/src/icons/svg/tree.svg new file mode 100644 index 0000000..dd4b7dd --- /dev/null +++ b/前台/src/icons/svg/tree.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/前台/src/icons/svg/user.svg b/前台/src/icons/svg/user.svg new file mode 100644 index 0000000..0ba0716 --- /dev/null +++ b/前台/src/icons/svg/user.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/前台/src/icons/svgo.yml b/前台/src/icons/svgo.yml new file mode 100644 index 0000000..d11906a --- /dev/null +++ b/前台/src/icons/svgo.yml @@ -0,0 +1,22 @@ +# replace default config + +# multipass: true +# full: true + +plugins: + + # - name + # + # or: + # - name: false + # - name: true + # + # or: + # - name: + # param1: 1 + # param2: 2 + +- removeAttrs: + attrs: + - 'fill' + - 'fill-rule' diff --git a/前台/src/layout/components/AppMain.vue b/前台/src/layout/components/AppMain.vue new file mode 100644 index 0000000..f6a3286 --- /dev/null +++ b/前台/src/layout/components/AppMain.vue @@ -0,0 +1,40 @@ + + + + + + + diff --git a/前台/src/layout/components/Navbar.vue b/前台/src/layout/components/Navbar.vue new file mode 100644 index 0000000..0ca5cf6 --- /dev/null +++ b/前台/src/layout/components/Navbar.vue @@ -0,0 +1,139 @@ + + + + + diff --git a/前台/src/layout/components/Sidebar/FixiOSBug.js b/前台/src/layout/components/Sidebar/FixiOSBug.js new file mode 100644 index 0000000..bc14856 --- /dev/null +++ b/前台/src/layout/components/Sidebar/FixiOSBug.js @@ -0,0 +1,26 @@ +export default { + computed: { + device() { + return this.$store.state.app.device + } + }, + mounted() { + // In order to fix the click on menu on the ios device will trigger the mouseleave bug + // https://github.com/PanJiaChen/vue-element-admin/issues/1135 + this.fixBugIniOS() + }, + methods: { + fixBugIniOS() { + const $subMenu = this.$refs.subMenu + if ($subMenu) { + const handleMouseleave = $subMenu.handleMouseleave + $subMenu.handleMouseleave = (e) => { + if (this.device === 'mobile') { + return + } + handleMouseleave(e) + } + } + } + } +} diff --git a/前台/src/layout/components/Sidebar/Item.vue b/前台/src/layout/components/Sidebar/Item.vue new file mode 100644 index 0000000..aa1f5da --- /dev/null +++ b/前台/src/layout/components/Sidebar/Item.vue @@ -0,0 +1,41 @@ + + + diff --git a/前台/src/layout/components/Sidebar/Link.vue b/前台/src/layout/components/Sidebar/Link.vue new file mode 100644 index 0000000..530b3d5 --- /dev/null +++ b/前台/src/layout/components/Sidebar/Link.vue @@ -0,0 +1,43 @@ + + + diff --git a/前台/src/layout/components/Sidebar/Logo.vue b/前台/src/layout/components/Sidebar/Logo.vue new file mode 100644 index 0000000..040fab6 --- /dev/null +++ b/前台/src/layout/components/Sidebar/Logo.vue @@ -0,0 +1,82 @@ + + + + + diff --git a/前台/src/layout/components/Sidebar/SidebarItem.vue b/前台/src/layout/components/Sidebar/SidebarItem.vue new file mode 100644 index 0000000..a418c3d --- /dev/null +++ b/前台/src/layout/components/Sidebar/SidebarItem.vue @@ -0,0 +1,95 @@ + + + diff --git a/前台/src/layout/components/Sidebar/index.vue b/前台/src/layout/components/Sidebar/index.vue new file mode 100644 index 0000000..da39034 --- /dev/null +++ b/前台/src/layout/components/Sidebar/index.vue @@ -0,0 +1,56 @@ + + + diff --git a/前台/src/layout/components/index.js b/前台/src/layout/components/index.js new file mode 100644 index 0000000..97ee3cd --- /dev/null +++ b/前台/src/layout/components/index.js @@ -0,0 +1,3 @@ +export { default as Navbar } from './Navbar' +export { default as Sidebar } from './Sidebar' +export { default as AppMain } from './AppMain' diff --git a/前台/src/layout/index.vue b/前台/src/layout/index.vue new file mode 100644 index 0000000..db22a7b --- /dev/null +++ b/前台/src/layout/index.vue @@ -0,0 +1,93 @@ + + + + + diff --git a/前台/src/layout/mixin/ResizeHandler.js b/前台/src/layout/mixin/ResizeHandler.js new file mode 100644 index 0000000..e8d0df8 --- /dev/null +++ b/前台/src/layout/mixin/ResizeHandler.js @@ -0,0 +1,45 @@ +import store from '@/store' + +const { body } = document +const WIDTH = 992 // refer to Bootstrap's responsive design + +export default { + watch: { + $route(route) { + if (this.device === 'mobile' && this.sidebar.opened) { + store.dispatch('app/closeSideBar', { withoutAnimation: false }) + } + } + }, + beforeMount() { + window.addEventListener('resize', this.$_resizeHandler) + }, + beforeDestroy() { + window.removeEventListener('resize', this.$_resizeHandler) + }, + mounted() { + const isMobile = this.$_isMobile() + if (isMobile) { + store.dispatch('app/toggleDevice', 'mobile') + store.dispatch('app/closeSideBar', { withoutAnimation: true }) + } + }, + methods: { + // use $_ for mixins properties + // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential + $_isMobile() { + const rect = body.getBoundingClientRect() + return rect.width - 1 < WIDTH + }, + $_resizeHandler() { + if (!document.hidden) { + const isMobile = this.$_isMobile() + store.dispatch('app/toggleDevice', isMobile ? 'mobile' : 'desktop') + + if (isMobile) { + store.dispatch('app/closeSideBar', { withoutAnimation: true }) + } + } + } + } +} diff --git a/前台/src/main.js b/前台/src/main.js new file mode 100644 index 0000000..01cba2f --- /dev/null +++ b/前台/src/main.js @@ -0,0 +1,43 @@ +import Vue from 'vue' + +import 'normalize.css/normalize.css' // A modern alternative to CSS resets + +import ElementUI from 'element-ui' +import 'element-ui/lib/theme-chalk/index.css' +import locale from 'element-ui/lib/locale/lang/en' // lang i18n + +import '@/styles/index.scss' // global css + +import App from './App' +import store from './store' +import router from './router' + +import '@/icons' // icon +import '@/permission' // permission control + +/** + * If you don't want to use mock-server + * you want to use MockJs for mock api + * you can execute: mockXHR() + * + * Currently MockJs will be used in the production environment, + * please remove it before going online ! ! ! + */ +if (process.env.NODE_ENV === 'production') { + const { mockXHR } = require('../mock') + mockXHR() +} + +// set ElementUI lang to EN +Vue.use(ElementUI, { locale }) +// 如果想要中文版 element-ui，按如下方式声明 +// Vue.use(ElementUI) + +Vue.config.productionTip = false + +new Vue({ + el: '#app', + router, + store, + render: h => h(App) +}) diff --git a/前台/src/permission.js b/前台/src/permission.js new file mode 100644 index 0000000..fa1ea19 --- /dev/null +++ b/前台/src/permission.js @@ -0,0 +1,64 @@ +import router from './router' +import store from './store' +import { Message } from 'element-ui' +import NProgress from 'nprogress' // progress bar +import 'nprogress/nprogress.css' // progress bar style +import { getToken } from '@/utils/auth' // get token from cookie +import getPageTitle from '@/utils/get-page-title' + +NProgress.configure({ showSpinner: false }) // NProgress Configuration + +const whiteList = ['/login'] // no redirect whitelist + +router.beforeEach(async(to, from, next) => { + // start progress bar + NProgress.start() + + // set page title + document.title = getPageTitle(to.meta.title) + + // determine whether the user has logged in + const hasToken = getToken() + + if (hasToken) { + if (to.path === '/login') { + // if is logged in, redirect to the home page + next({ path: '/' }) + NProgress.done() + } else { + const hasGetUserInfo = store.getters.name + if (hasGetUserInfo) { + next() + } else { + try { + // get user info + await store.dispatch('user/getInfo') + + next() + } catch (error) { + // remove token and go to login page to re-login + await store.dispatch('user/resetToken') + Message.error(error || 'Has Error') + next(`/login?redirect=${to.path}`) + NProgress.done() + } + } + } + } else { + /* has no token*/ + + if (whiteList.indexOf(to.path) !== -1) { + // in the free login whitelist, go directly + next() + } else { + // other pages that do not have permission to access are redirected to the login page. + next(`/login?redirect=${to.path}`) + NProgress.done() + } + } +}) + +router.afterEach(() => { + // finish progress bar + NProgress.done() +}) diff --git a/前台/src/router/index.js b/前台/src/router/index.js new file mode 100644 index 0000000..d0b74ce --- /dev/null +++ b/前台/src/router/index.js @@ -0,0 +1,192 @@ +import Vue from 'vue' +import Router from 'vue-router' + +Vue.use(Router) + +/* Layout */ +import Layout from '@/layout' + +/** + * Note: sub-menu only appear when route children.length >= 1 + * Detail see: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html + * + * hidden: true if set true, item will not show in the sidebar(default is false) + * alwaysShow: true if set true, will always show the root menu + * if not set alwaysShow, when item has more than one children route, + * it will becomes nested mode, otherwise not show the root menu + * redirect: noRedirect if set noRedirect will no redirect in the breadcrumb + * name:'router-name' the name is used by (must set!!!) + * meta : { + roles: ['admin','editor'] control the page roles (you can set multiple roles) + title: 'title' the name show in sidebar and breadcrumb (recommend set) + icon: 'svg-name'/'el-icon-x' the icon show in the sidebar + breadcrumb: false if set false, the item will hidden in breadcrumb(default is true) + activeMenu: '/example/list' if set path, the sidebar will highlight the path you set + } + */ + +/** + * constantRoutes + * a base page that does not have permission requirements + * all roles can be accessed + */ +export const constantRoutes = [ + { + path: '/login', + component: () => import('@/views/login/index'), + hidden: true + }, + + { + path: '/404', + component: () => import('@/views/404'), + hidden: true + }, + + { + path: '/', + component: Layout, + redirect: '/dashboard', + children: [{ + path: 'dashboard', + name: 'Dashboard', + component: () => import('@/views/dashboard/index'), + meta: { title: 'Dashboard', icon: 'dashboard' } + }] + }, + + { + path: '/example', + component: Layout, + redirect: '/example/table', + name: 'Example', + meta: { title: 'Example', icon: 'el-icon-s-help' }, + children: [ + { + path: 'table', + name: 'Table', + component: () => import('@/views/table/index'), + meta: { title: 'Table', icon: 'table' } + }, + { + path: 'tree', + name: 'Tree', + component: () => import('@/views/tree/index'), + meta: { title: 'Tree', icon: 'tree' } + } + ] + }, + + { + path: '/form', + component: Layout, + children: [ + { + path: 'index', + name: 'Form', + component: () => import('@/views/form/index'), + meta: { title: 'Form', icon: 'form' } + } + ] + }, + { + path: '/list', + component: Layout, + children: [ + { + path: 'index', + name: 'list', + component: () => import('@/views/list/index'), + meta: { title: '列表', icon: 'form' } + } + ] + }, + { + path: '/nested', + component: Layout, + redirect: '/nested/menu1', + name: 'Nested', + meta: { + title: 'Nested', + icon: 'nested' + }, + children: [ + { + path: 'menu1', + component: () => import('@/views/nested/menu1/index'), // Parent router-view + name: 'Menu1', + meta: { title: 'Menu1' }, + children: [ + { + path: 'menu1-1', + component: () => import('@/views/nested/menu1/menu1-1'), + name: 'Menu1-1', + meta: { title: 'Menu1-1' } + }, + { + path: 'menu1-2', + component: () => import('@/views/nested/menu1/menu1-2'), + name: 'Menu1-2', + meta: { title: 'Menu1-2' }, + children: [ + { + path: 'menu1-2-1', + component: () => import('@/views/nested/menu1/menu1-2/menu1-2-1'), + name: 'Menu1-2-1', + meta: { title: 'Menu1-2-1' } + }, + { + path: 'menu1-2-2', + component: () => import('@/views/nested/menu1/menu1-2/menu1-2-2'), + name: 'Menu1-2-2', + meta: { title: 'Menu1-2-2' } + } + ] + }, + { + path: 'menu1-3', + component: () => import('@/views/nested/menu1/menu1-3'), + name: 'Menu1-3', + meta: { title: 'Menu1-3' } + } + ] + }, + { + path: 'menu2', + component: () => import('@/views/nested/menu2/index'), + name: 'Menu2', + meta: { title: 'menu2' } + } + ] + }, + + { + path: 'external-link', + component: Layout, + children: [ + { + path: 'https://panjiachen.github.io/vue-element-admin-site/#/', + meta: { title: 'External Link', icon: 'link' } + } + ] + }, + + // 404 page must be placed at the end !!! + { path: '*', redirect: '/404', hidden: true } +] + +const createRouter = () => new Router({ + // mode: 'history', // require service support + scrollBehavior: () => ({ y: 0 }), + routes: constantRoutes +}) + +const router = createRouter() + +// Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465 +export function resetRouter() { + const newRouter = createRouter() + router.matcher = newRouter.matcher // reset router +} + +export default router diff --git a/前台/src/settings.js b/前台/src/settings.js new file mode 100644 index 0000000..ae3c494 --- /dev/null +++ b/前台/src/settings.js @@ -0,0 +1,16 @@ +module.exports = { + + title: 'Vue Admin Template', + + /** + * @type {boolean} true | false + * @description Whether fix the header + */ + fixedHeader: false, + + /** + * @type {boolean} true | false + * @description Whether show the logo in sidebar + */ + sidebarLogo: false +} diff --git a/前台/src/store/getters.js b/前台/src/store/getters.js new file mode 100644 index 0000000..5ab7b4c --- /dev/null +++ b/前台/src/store/getters.js @@ -0,0 +1,8 @@ +const getters = { + sidebar: state => state.app.sidebar, + device: state => state.app.device, + token: state => state.user.token, + avatar: state => state.user.avatar, + name: state => state.user.name +} +export default getters diff --git a/前台/src/store/index.js b/前台/src/store/index.js new file mode 100644 index 0000000..6be466a --- /dev/null +++ b/前台/src/store/index.js @@ -0,0 +1,19 @@ +import Vue from 'vue' +import Vuex from 'vuex' +import getters from './getters' +import app from './modules/app' +import settings from './modules/settings' +import user from './modules/user' + +Vue.use(Vuex) + +const store = new Vuex.Store({ + modules: { + app, + settings, + user + }, + getters +}) + +export default store diff --git a/前台/src/store/modules/app.js b/前台/src/store/modules/app.js new file mode 100644 index 0000000..7ea7e33 --- /dev/null +++ b/前台/src/store/modules/app.js @@ -0,0 +1,48 @@ +import Cookies from 'js-cookie' + +const state = { + sidebar: { + opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true, + withoutAnimation: false + }, + device: 'desktop' +} + +const mutations = { + TOGGLE_SIDEBAR: state => { + state.sidebar.opened = !state.sidebar.opened + state.sidebar.withoutAnimation = false + if (state.sidebar.opened) { + Cookies.set('sidebarStatus', 1) + } else { + Cookies.set('sidebarStatus', 0) + } + }, + CLOSE_SIDEBAR: (state, withoutAnimation) => { + Cookies.set('sidebarStatus', 0) + state.sidebar.opened = false + state.sidebar.withoutAnimation = withoutAnimation + }, + TOGGLE_DEVICE: (state, device) => { + state.device = device + } +} + +const actions = { + toggleSideBar({ commit }) { + commit('TOGGLE_SIDEBAR') + }, + closeSideBar({ commit }, { withoutAnimation }) { + commit('CLOSE_SIDEBAR', withoutAnimation) + }, + toggleDevice({ commit }, device) { + commit('TOGGLE_DEVICE', device) + } +} + +export default { + namespaced: true, + state, + mutations, + actions +} diff --git a/前台/src/store/modules/settings.js b/前台/src/store/modules/settings.js new file mode 100644 index 0000000..b3f33f8 --- /dev/null +++ b/前台/src/store/modules/settings.js @@ -0,0 +1,32 @@ +import defaultSettings from '@/settings' + +const { showSettings, fixedHeader, sidebarLogo } = defaultSettings + +const state = { + showSettings: showSettings, + fixedHeader: fixedHeader, + sidebarLogo: sidebarLogo +} + +const mutations = { + CHANGE_SETTING: (state, { key, value }) => { + // eslint-disable-next-line no-prototype-builtins + if (state.hasOwnProperty(key)) { + state[key] = value + } + } +} + +const actions = { + changeSetting({ commit }, data) { + commit('CHANGE_SETTING', data) + } +} + +export default { + namespaced: true, + state, + mutations, + actions +} + diff --git a/前台/src/store/modules/user.js b/前台/src/store/modules/user.js new file mode 100644 index 0000000..9817699 --- /dev/null +++ b/前台/src/store/modules/user.js @@ -0,0 +1,97 @@ +import { login, logout, getInfo } from '@/api/user' +import { getToken, setToken, removeToken } from '@/utils/auth' +import { resetRouter } from '@/router' + +const getDefaultState = () => { + return { + token: getToken(), + name: '', + avatar: '' + } +} + +const state = getDefaultState() + +const mutations = { + RESET_STATE: (state) => { + Object.assign(state, getDefaultState()) + }, + SET_TOKEN: (state, token) => { + state.token = token + }, + SET_NAME: (state, name) => { + state.name = name + }, + SET_AVATAR: (state, avatar) => { + state.avatar = avatar + } +} + +const actions = { + // user login + login({ commit }, userInfo) { + const { userPhone, userPwd } = userInfo + return new Promise((resolve, reject) => { + login({ userPhone: userPhone.trim(), userPwd: userPwd }).then(response => { + const { data } = response + commit('SET_TOKEN', data.token) + setToken(data.token) + resolve() + }).catch(error => { + reject(error) + }) + }) + }, + + // get user info + // getInfo({ commit, state }) { + // return new Promise((resolve, reject) => { + // getInfo(state.token).then(response => { + // const { data } = response + // + // if (!data) { + // return reject('Verification failed, please Login again.') + // } + // + // const { name, avatar } = data + // + // commit('SET_NAME', name) + // commit('SET_AVATAR', avatar) + // resolve(data) + // }).catch(error => { + // reject(error) + // }) + // }) + // }, + + // user logout + logout({ commit, state }) { + return new Promise((resolve, reject) => { + logout(state.token).then(() => { + removeToken() // must remove token first + resetRouter() + commit('RESET_STATE') + resolve() + }).catch(error => { + reject(error) + }) + }) + }, + + // remove token + resetToken({ commit }) { + return new Promise(resolve => { + removeToken() // must remove token first + commit('RESET_STATE') + resolve() + }) + } +} + +export default { + namespaced: true, + state, + mutations, + actions +} + diff --git a/前台/src/styles/element-ui.scss b/前台/src/styles/element-ui.scss new file mode 100644 index 0000000..0062411 --- /dev/null +++ b/前台/src/styles/element-ui.scss @@ -0,0 +1,49 @@ +// cover some element-ui styles + +.el-breadcrumb__inner, +.el-breadcrumb__inner a { + font-weight: 400 !important; +} + +.el-upload { + input[type="file"] { + display: none !important; + } +} + +.el-upload__input { + display: none; +} + + +// to fixed https://github.com/ElemeFE/element/issues/2461 +.el-dialog { + transform: none; + left: 0; + position: relative; + margin: 0 auto; +} + +// refine element ui upload +.upload-container { + .el-upload { + width: 100%; + + .el-upload-dragger { + width: 100%; + height: 200px; + } + } +} + +// dropdown +.el-dropdown-menu { + a { + display: block + } +} + +// to fix el-date-picker css style +.el-range-separator { + box-sizing: content-box; +} diff --git a/前台/src/styles/index.scss b/前台/src/styles/index.scss new file mode 100644 index 0000000..3b4da51 --- /dev/null +++ b/前台/src/styles/index.scss @@ -0,0 +1,65 @@ +@import './variables.scss'; +@import './mixin.scss'; +@import './transition.scss'; +@import './element-ui.scss'; +@import './sidebar.scss'; + +body { + height: 100%; + -moz-osx-font-smoothing: grayscale; + -webkit-font-smoothing: antialiased; + text-rendering: optimizeLegibility; + font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; +} + +label { + font-weight: 700; +} + +html { + height: 100%; + box-sizing: border-box; +} + +#app { + height: 100%; +} + +*, +*:before, +*:after { + box-sizing: inherit; +} + +a:focus, +a:active { + outline: none; +} + +a, +a:focus, +a:hover { + cursor: pointer; + color: inherit; + text-decoration: none; +} + +div:focus { + outline: none; +} + +.clearfix { + &:after { + visibility: hidden; + display: block; + font-size: 0; + content: " "; + clear: both; + height: 0; + } +} + +// main-container global css +.app-container { + padding: 20px; +} diff --git a/前台/src/styles/mixin.scss b/前台/src/styles/mixin.scss new file mode 100644 index 0000000..36b74bb --- /dev/null +++ b/前台/src/styles/mixin.scss @@ -0,0 +1,28 @@ +@mixin clearfix { + &:after { + content: ""; + display: table; + clear: both; + } +} + +@mixin scrollBar { + &::-webkit-scrollbar-track-piece { + background: #d3dce6; + } + + &::-webkit-scrollbar { + width: 6px; + } + + &::-webkit-scrollbar-thumb { + background: #99a9bf; + border-radius: 20px; + } +} + +@mixin relative { + position: relative; + width: 100%; + height: 100%; +} diff --git a/前台/src/styles/sidebar.scss b/前台/src/styles/sidebar.scss new file mode 100644 index 0000000..94760cc --- /dev/null +++ b/前台/src/styles/sidebar.scss @@ -0,0 +1,226 @@ +#app { + + .main-container { + min-height: 100%; + transition: margin-left .28s; + margin-left: $sideBarWidth; + position: relative; + } + + .sidebar-container { + transition: width 0.28s; + width: $sideBarWidth !important; + background-color: $menuBg; + height: 100%; + position: fixed; + font-size: 0px; + top: 0; + bottom: 0; + left: 0; + z-index: 1001; + overflow: hidden; + + // reset element-ui css + .horizontal-collapse-transition { + transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out; + } + + .scrollbar-wrapper { + overflow-x: hidden !important; + } + + .el-scrollbar__bar.is-vertical { + right: 0px; + } + + .el-scrollbar { + height: 100%; + } + + &.has-logo { + .el-scrollbar { + height: calc(100% - 50px); + } + } + + .is-horizontal { + display: none; + } + + a { + display: inline-block; + width: 100%; + overflow: hidden; + } + + .svg-icon { + margin-right: 16px; + } + + .sub-el-icon { + margin-right: 12px; + margin-left: -2px; + } + + .el-menu { + border: none; + height: 100%; + width: 100% !important; + } + + // menu hover + .submenu-title-noDropdown, + .el-submenu__title { + &:hover { + background-color: $menuHover !important; + } + } + + .is-active>.el-submenu__title { + color: $subMenuActiveText !important; + } + + & .nest-menu .el-submenu>.el-submenu__title, + & .el-submenu .el-menu-item { + min-width: $sideBarWidth !important; + background-color: $subMenuBg !important; + + &:hover { + background-color: $subMenuHover !important; + } + } + } + + .hideSidebar { + .sidebar-container { + width: 54px !important; + } + + .main-container { + margin-left: 54px; + } + + .submenu-title-noDropdown { + padding: 0 !important; + position: relative; + + .el-tooltip { + padding: 0 !important; + + .svg-icon { + margin-left: 20px; + } + + .sub-el-icon { + margin-left: 19px; + } + } + } + + .el-submenu { + overflow: hidden; + + &>.el-submenu__title { + padding: 0 !important; + + .svg-icon { + margin-left: 20px; + } + + .sub-el-icon { + margin-left: 19px; + } + + .el-submenu__icon-arrow { + display: none; + } + } + } + + .el-menu--collapse { + .el-submenu { + &>.el-submenu__title { + &>span { + height: 0; + width: 0; + overflow: hidden; + visibility: hidden; + display: inline-block; + } + } + } + } + } + + .el-menu--collapse .el-menu .el-submenu { + min-width: $sideBarWidth !important; + } + + // mobile responsive + .mobile { + .main-container { + margin-left: 0px; + } + + .sidebar-container { + transition: transform .28s; + width: $sideBarWidth !important; + } + + &.hideSidebar { + .sidebar-container { + pointer-events: none; + transition-duration: 0.3s; + transform: translate3d(-$sideBarWidth, 0, 0); + } + } + } + + .withoutAnimation { + + .main-container, + .sidebar-container { + transition: none; + } + } +} + +// when menu collapsed +.el-menu--vertical { + &>.el-menu { + .svg-icon { + margin-right: 16px; + } + .sub-el-icon { + margin-right: 12px; + margin-left: -2px; + } + } + + .nest-menu .el-submenu>.el-submenu__title, + .el-menu-item { + &:hover { + // you can use $subMenuHover + background-color: $menuHover !important; + } + } + + // the scroll bar appears when the subMenu is too long + >.el-menu--popup { + max-height: 100vh; + overflow-y: auto; + + &::-webkit-scrollbar-track-piece { + background: #d3dce6; + } + + &::-webkit-scrollbar { + width: 6px; + } + + &::-webkit-scrollbar-thumb { + background: #99a9bf; + border-radius: 20px; + } + } +} diff --git a/前台/src/styles/transition.scss b/前台/src/styles/transition.scss new file mode 100644 index 0000000..4cb27cc --- /dev/null +++ b/前台/src/styles/transition.scss @@ -0,0 +1,48 @@ +// global transition css + +/* fade */ +.fade-enter-active, +.fade-leave-active { + transition: opacity 0.28s; +} + +.fade-enter, +.fade-leave-active { + opacity: 0; +} + +/* fade-transform */ +.fade-transform-leave-active, +.fade-transform-enter-active { + transition: all .5s; +} + +.fade-transform-enter { + opacity: 0; + transform: translateX(-30px); +} + +.fade-transform-leave-to { + opacity: 0; + transform: translateX(30px); +} + +/* breadcrumb transition */ +.breadcrumb-enter-active, +.breadcrumb-leave-active { + transition: all .5s; +} + +.breadcrumb-enter, +.breadcrumb-leave-active { + opacity: 0; + transform: translateX(20px); +} + +.breadcrumb-move { + transition: all .5s; +} + +.breadcrumb-leave-active { + position: absolute; +} diff --git a/前台/src/styles/variables.scss b/前台/src/styles/variables.scss new file mode 100644 index 0000000..be55772 --- /dev/null +++ b/前台/src/styles/variables.scss @@ -0,0 +1,25 @@ +// sidebar +$menuText:#bfcbd9; +$menuActiveText:#409EFF; +$subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951 + +$menuBg:#304156; +$menuHover:#263445; + +$subMenuBg:#1f2d3d; +$subMenuHover:#001528; + +$sideBarWidth: 210px; + +// the :export directive is the magic sauce for webpack +// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass +:export { + menuText: $menuText; + menuActiveText: $menuActiveText; + subMenuActiveText: $subMenuActiveText; + menuBg: $menuBg; + menuHover: $menuHover; + subMenuBg: $subMenuBg; + subMenuHover: $subMenuHover; + sideBarWidth: $sideBarWidth; +} diff --git a/前台/src/utils/auth.js b/前台/src/utils/auth.js new file mode 100644 index 0000000..059af18 --- /dev/null +++ b/前台/src/utils/auth.js @@ -0,0 +1,15 @@ +import Cookies from 'js-cookie' + +const TokenKey = 'vue_admin_template_token' + +export function getToken() { + return Cookies.get(TokenKey) +} + +export function setToken(token) { + return Cookies.set(TokenKey, token) +} + +export function removeToken() { + return Cookies.remove(TokenKey) +} diff --git a/前台/src/utils/get-page-title.js b/前台/src/utils/get-page-title.js new file mode 100644 index 0000000..a6de99d --- /dev/null +++ b/前台/src/utils/get-page-title.js @@ -0,0 +1,10 @@ +import defaultSettings from '@/settings' + +const title = defaultSettings.title || 'Vue Admin Template' + +export default function getPageTitle(pageTitle) { + if (pageTitle) { + return `${pageTitle} - ${title}` + } + return `${title}` +} diff --git a/前台/src/utils/index.js b/前台/src/utils/index.js new file mode 100644 index 0000000..4830c04 --- /dev/null +++ b/前台/src/utils/index.js @@ -0,0 +1,117 @@ +/** + * Created by PanJiaChen on 16/11/18. + */ + +/** + * Parse the time to string + * @param {(Object|string|number)} time + * @param {string} cFormat + * @returns {string | null} + */ +export function parseTime(time, cFormat) { + if (arguments.length === 0 || !time) { + return null + } + const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}' + let date + if (typeof time === 'object') { + date = time + } else { + if ((typeof time === 'string')) { + if ((/^[0-9]+$/.test(time))) { + // support "1548221490638" + time = parseInt(time) + } else { + // support safari + // https://stackoverflow.com/questions/4310953/invalid-date-in-safari + time = time.replace(new RegExp(/-/gm), '/') + } + } + + if ((typeof time === 'number') && (time.toString().length === 10)) { + time = time * 1000 + } + date = new Date(time) + } + const formatObj = { + y: date.getFullYear(), + m: date.getMonth() + 1, + d: date.getDate(), + h: date.getHours(), + i: date.getMinutes(), + s: date.getSeconds(), + a: date.getDay() + } + const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => { + const value = formatObj[key] + // Note: getDay() returns 0 on Sunday + if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value ] } + return value.toString().padStart(2, '0') + }) + return time_str +} + +/** + * @param {number} time + * @param {string} option + * @returns {string} + */ +export function formatTime(time, option) { + if (('' + time).length === 10) { + time = parseInt(time) * 1000 + } else { + time = +time + } + const d = new Date(time) + const now = Date.now() + + const diff = (now - d) / 1000 + + if (diff < 30) { + return '刚刚' + } else if (diff < 3600) { + // less 1 hour + return Math.ceil(diff / 60) + '分钟前' + } else if (diff < 3600 * 24) { + return Math.ceil(diff / 3600) + '小时前' + } else if (diff < 3600 * 24 * 2) { + return '1天前' + } + if (option) { + return parseTime(time, option) + } else { + return ( + d.getMonth() + + 1 + + '月' + + d.getDate() + + '日' + + d.getHours() + + '时' + + d.getMinutes() + + '分' + ) + } +} + +/** + * @param {string} url + * @returns {Object} + */ +export function param2Obj(url) { + const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ') + if (!search) { + return {} + } + const obj = {} + const searchArr = search.split('&') + searchArr.forEach(v => { + const index = v.indexOf('=') + if (index !== -1) { + const name = v.substring(0, index) + const val = v.substring(index + 1, v.length) + obj[name] = val + } + }) + return obj +} diff --git a/前台/src/utils/request.js b/前台/src/utils/request.js new file mode 100644 index 0000000..88ddf75 --- /dev/null +++ b/前台/src/utils/request.js @@ -0,0 +1,85 @@ +import axios from 'axios' +import { MessageBox, Message } from 'element-ui' +import store from '@/store' +import { getToken } from '@/utils/auth' + +// create an axios instance +const service = axios.create({ + baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url + // withCredentials: true, // send cookies when cross-domain requests + timeout: 50000 // request timeout +}) + +// request interceptor +service.interceptors.request.use( + config => { + // do something before request is sent + + if (store.getters.token) { + // let each request carry token + // ['X-Token'] is a custom headers key + // please modify it according to the actual situation + config.headers['token'] = getToken() + } + return config + }, + error => { + // do something with request error + console.log(error) // for debug + return Promise.reject(error) + } +) + +// response interceptor +service.interceptors.response.use( + /** + * If you want to get http information such as headers or status + * Please return response => response + */ + + /** + * Determine the request status by custom code + * Here is just an example + * You can also judge the status by HTTP Status Code + */ + response => { + const res = response.data + + // if the custom code is not 20000, it is judged as an error. + if (res.code !== 200) { + Message({ + message: res.msg || 'Error', + type: 'error', + duration: 5 * 1000 + }) + + // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired; + if (res.code === 50008 || res.code === 50012 || res.code === 50014) { + // to re-login + MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', { + confirmButtonText: 'Re-Login', + cancelButtonText: 'Cancel', + type: 'warning' + }).then(() => { + store.dispatch('user/resetToken').then(() => { + location.reload() + }) + }) + } + return Promise.reject(new Error(res.msg || 'Error')) + } else { + return res + } + }, + error => { + console.log('err' + error) // for debug + Message({ + message: error.message, + type: 'error', + duration: 5 * 1000 + }) + return Promise.reject(error) + } +) + +export default service diff --git a/前台/src/utils/validate.js b/前台/src/utils/validate.js new file mode 100644 index 0000000..8d962ad --- /dev/null +++ b/前台/src/utils/validate.js @@ -0,0 +1,20 @@ +/** + * Created by PanJiaChen on 16/11/18. + */ + +/** + * @param {string} path + * @returns {Boolean} + */ +export function isExternal(path) { + return /^(https?:|mailto:|tel:)/.test(path) +} + +/** + * @param {string} str + * @returns {Boolean} + */ +export function validUsername(str) { + const valid_map = ['admin', 'editor'] + return valid_map.indexOf(str.trim()) >= 0 +} diff --git a/前台/src/views/404.vue b/前台/src/views/404.vue new file mode 100644 index 0000000..1791f55 --- /dev/null +++ b/前台/src/views/404.vue @@ -0,0 +1,228 @@ + + + + + diff --git a/前台/src/views/dashboard/index.vue b/前台/src/views/dashboard/index.vue new file mode 100644 index 0000000..33e5ab6 --- /dev/null +++ b/前台/src/views/dashboard/index.vue @@ -0,0 +1,30 @@ + + + + + diff --git a/前台/src/views/form/index.vue b/前台/src/views/form/index.vue new file mode 100644 index 0000000..f4d66d3 --- /dev/null +++ b/前台/src/views/form/index.vue @@ -0,0 +1,85 @@ + + + + + + diff --git a/前台/src/views/list/index.vue b/前台/src/views/list/index.vue new file mode 100644 index 0000000..f8c7ab0 --- /dev/null +++ b/前台/src/views/list/index.vue @@ -0,0 +1,400 @@ + + + + diff --git a/前台/src/views/login/index.vue b/前台/src/views/login/index.vue new file mode 100644 index 0000000..6d996af --- /dev/null +++ b/前台/src/views/login/index.vue @@ -0,0 +1,223 @@ + + + + + + + diff --git a/前台/src/views/nested/menu1/index.vue b/前台/src/views/nested/menu1/index.vue new file mode 100644 index 0000000..30cb670 --- /dev/null +++ b/前台/src/views/nested/menu1/index.vue @@ -0,0 +1,7 @@ + diff --git a/前台/src/views/nested/menu1/menu1-1/index.vue b/前台/src/views/nested/menu1/menu1-1/index.vue new file mode 100644 index 0000000..27e173a --- /dev/null +++ b/前台/src/views/nested/menu1/menu1-1/index.vue @@ -0,0 +1,7 @@ + diff --git a/前台/src/views/nested/menu1/menu1-2/index.vue b/前台/src/views/nested/menu1/menu1-2/index.vue new file mode 100644 index 0000000..0c86276 --- /dev/null +++ b/前台/src/views/nested/menu1/menu1-2/index.vue @@ -0,0 +1,7 @@ + diff --git a/前台/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue b/前台/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue new file mode 100644 index 0000000..f87d88f --- /dev/null +++ b/前台/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue @@ -0,0 +1,5 @@ + diff --git a/前台/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue b/前台/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue new file mode 100644 index 0000000..d88789f --- /dev/null +++ b/前台/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue @@ -0,0 +1,5 @@ + diff --git a/前台/src/views/nested/menu1/menu1-3/index.vue b/前台/src/views/nested/menu1/menu1-3/index.vue new file mode 100644 index 0000000..f7cd073 --- /dev/null +++ b/前台/src/views/nested/menu1/menu1-3/index.vue @@ -0,0 +1,5 @@ + diff --git a/前台/src/views/nested/menu2/index.vue b/前台/src/views/nested/menu2/index.vue new file mode 100644 index 0000000..19dd48f --- /dev/null +++ b/前台/src/views/nested/menu2/index.vue @@ -0,0 +1,5 @@ + diff --git a/前台/src/views/table/index.vue b/前台/src/views/table/index.vue new file mode 100644 index 0000000..a1ed847 --- /dev/null +++ b/前台/src/views/table/index.vue @@ -0,0 +1,79 @@ + + + diff --git a/前台/src/views/tree/index.vue b/前台/src/views/tree/index.vue new file mode 100644 index 0000000..89c6b01 --- /dev/null +++ b/前台/src/views/tree/index.vue @@ -0,0 +1,78 @@ + + + +