From ba85c58e27cdd8d480dbbc16741d0932730ff0f5 Mon Sep 17 00:00:00 2001 From: Yiming Zeng Date: Mon, 31 Jul 2023 11:31:49 +0800 Subject: [PATCH 1/4] java juc --- .../src/main/java/com/hongyi/juc/Demo1.java | 47 +++++++++++++++++++ .../java/com/hongyi/juc/MyMonitorThread.java | 45 ++++++++++++++++++ .../juc/RejectedExecutionHandlerImpl.java | 16 +++++++ .../java/com/hongyi/juc/SimpleThreadPool.java | 24 ++++++++++ .../main/java/com/hongyi/juc/WorkerPool.java | 37 +++++++++++++++ .../java/com/hongyi/juc/WorkerThread.java | 37 +++++++++++++++ 6 files changed, 206 insertions(+) create mode 100644 javase/src/main/java/com/hongyi/juc/Demo1.java create mode 100644 javase/src/main/java/com/hongyi/juc/MyMonitorThread.java create mode 100644 javase/src/main/java/com/hongyi/juc/RejectedExecutionHandlerImpl.java create mode 100644 javase/src/main/java/com/hongyi/juc/SimpleThreadPool.java create mode 100644 javase/src/main/java/com/hongyi/juc/WorkerPool.java create mode 100644 javase/src/main/java/com/hongyi/juc/WorkerThread.java diff --git a/javase/src/main/java/com/hongyi/juc/Demo1.java b/javase/src/main/java/com/hongyi/juc/Demo1.java new file mode 100644 index 0000000..b2214ae --- /dev/null +++ b/javase/src/main/java/com/hongyi/juc/Demo1.java @@ -0,0 +1,47 @@ +package com.hongyi.juc; + +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + +/** + * @Author Kisugi Takumi + * @Date 2023/7/31 11:20 + * @Version 1.0 + */ +public class Demo1 { + static AtomicInteger threadId = new AtomicInteger(0); + + public static void main(String[] args) { + // 手动创建线程池 + // 创建有界阻塞队列 + ArrayBlockingQueue runnable = new ArrayBlockingQueue(2); + // 创建线程工厂 + ThreadFactory threadFactory = new ThreadFactory() { + @Override + public Thread newThread(Runnable r) { + return new Thread(r, "working_thread_" + threadId.getAndIncrement()); + } + }; + + // 手动创建线程池 + // 拒绝策略采用默认策略 + ThreadPoolExecutor executor = new ThreadPoolExecutor(5, 7, 10, TimeUnit.SECONDS, runnable, threadFactory); + + for (int i = 0; i < 20; i++) { + executor.execute(new Runnable() { + @Override + public void run() { + System.out.println(Thread.currentThread()); + try { + Thread.sleep(100000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + }); + } + } +} diff --git a/javase/src/main/java/com/hongyi/juc/MyMonitorThread.java b/javase/src/main/java/com/hongyi/juc/MyMonitorThread.java new file mode 100644 index 0000000..d8402ab --- /dev/null +++ b/javase/src/main/java/com/hongyi/juc/MyMonitorThread.java @@ -0,0 +1,45 @@ +package com.hongyi.juc; + +import java.util.concurrent.ThreadPoolExecutor; + +/** + * @Author Kisugi Takumi + * @Date 2023/7/31 11:03 + * @Version 1.0 + */ +public class MyMonitorThread implements Runnable { + private final ThreadPoolExecutor executor; + + private final int seconds; + + private boolean run = true; + + public MyMonitorThread(ThreadPoolExecutor executor, int delay) { + this.executor = executor; + this.seconds = delay; + } + + public void shutdown(){ + this.run = false; + } + + @Override + public void run() { + while(run){ + System.out.println( + String.format("[monitor] [%d/%d] Active: %d, Completed: %d, Task: %d, isShutdown: %s, isTerminated: %s", + this.executor.getPoolSize(), + this.executor.getCorePoolSize(), + this.executor.getActiveCount(), + this.executor.getCompletedTaskCount(), + this.executor.getTaskCount(), + this.executor.isShutdown(), + this.executor.isTerminated())); + try { + Thread.sleep(seconds * 1000L); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + } +} diff --git a/javase/src/main/java/com/hongyi/juc/RejectedExecutionHandlerImpl.java b/javase/src/main/java/com/hongyi/juc/RejectedExecutionHandlerImpl.java new file mode 100644 index 0000000..e9a828c --- /dev/null +++ b/javase/src/main/java/com/hongyi/juc/RejectedExecutionHandlerImpl.java @@ -0,0 +1,16 @@ +package com.hongyi.juc; + +import java.util.concurrent.RejectedExecutionHandler; +import java.util.concurrent.ThreadPoolExecutor; + +/** + * @Author Kisugi Takumi + * @Date 2023/7/31 11:04 + * @Version 1.0 + */ +public class RejectedExecutionHandlerImpl implements RejectedExecutionHandler { + @Override + public void rejectedExecution(Runnable r, ThreadPoolExecutor executor) { + System.out.println(r.toString() + " is rejected."); + } +} diff --git a/javase/src/main/java/com/hongyi/juc/SimpleThreadPool.java b/javase/src/main/java/com/hongyi/juc/SimpleThreadPool.java new file mode 100644 index 0000000..90c3c8d --- /dev/null +++ b/javase/src/main/java/com/hongyi/juc/SimpleThreadPool.java @@ -0,0 +1,24 @@ +package com.hongyi.juc; + +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +/** + * @Author Kisugi Takumi + * @Date 2023/7/31 10:52 + * @Version 1.0 + */ +public class SimpleThreadPool { + public static void main(String[] args) { + ExecutorService executor = Executors.newFixedThreadPool(5); + for (int i = 0; i < 10; i++) { + WorkerThread workerThread = new WorkerThread("" + i); + executor.submit(workerThread); + } + executor.shutdown(); + while (!executor.isTerminated()) { + + } + System.out.println("Finished all threads"); + } +} diff --git a/javase/src/main/java/com/hongyi/juc/WorkerPool.java b/javase/src/main/java/com/hongyi/juc/WorkerPool.java new file mode 100644 index 0000000..d1788ea --- /dev/null +++ b/javase/src/main/java/com/hongyi/juc/WorkerPool.java @@ -0,0 +1,37 @@ +package com.hongyi.juc; + +import java.util.concurrent.*; + +/** + * @Author Kisugi Takumi + * @Date 2023/7/31 11:05 + * @Version 1.0 + */ +public class WorkerPool { + public static void main(String[] args) throws InterruptedException { + // 拒绝策略 + RejectedExecutionHandlerImpl rejectionHandler = new RejectedExecutionHandlerImpl(); + // 线程工厂 + ThreadFactory threadFactory = Executors.defaultThreadFactory(); + ThreadPoolExecutor executorPool = new ThreadPoolExecutor( + 2, // 核心线程数 + 4, // 最大线程数 + 10, + TimeUnit.SECONDS, + new ArrayBlockingQueue<>(2), + threadFactory, + rejectionHandler); + // start the monitoring thread + MyMonitorThread monitor = new MyMonitorThread(executorPool, 3); + Thread monitorThread = new Thread(monitor); + monitorThread.start(); + //submit work to the thread pool + for(int i = 0; i < 10; i++){ + executorPool.execute(new WorkerThread("cmd" + i)); + } + Thread.sleep(30000); + executorPool.shutdown(); + Thread.sleep(5000); + monitor.shutdown(); + } +} diff --git a/javase/src/main/java/com/hongyi/juc/WorkerThread.java b/javase/src/main/java/com/hongyi/juc/WorkerThread.java new file mode 100644 index 0000000..a28e7b2 --- /dev/null +++ b/javase/src/main/java/com/hongyi/juc/WorkerThread.java @@ -0,0 +1,37 @@ +package com.hongyi.juc; + +import java.util.concurrent.TimeUnit; + +/** + * @Author Kisugi Takumi + * @Date 2023/7/31 10:49 + * @Version 1.0 + */ +public class WorkerThread implements Runnable{ + + private final String command; + + public WorkerThread(String command) { + this.command = command; + } + + @Override + public void run() { + System.out.println(Thread.currentThread().getName() + " Start.command = " + this.command); + processCommand(); + System.out.println(Thread.currentThread().getName() + " End."); + } + + private void processCommand() { + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + + @Override + public String toString() { + return this.command; + } +} -- Gitee From 3043aa75f47188d805bf3193396174e6c84a61d7 Mon Sep 17 00:00:00 2001 From: Yiming Zeng Date: Sun, 29 Oct 2023 13:56:10 +0800 Subject: [PATCH 2/4] redis project init --- hm-dianping-init/.gitignore | 33 ++ hm-dianping-init/README.md | 23 ++ hm-dianping-init/pom.xml | 79 +++++ .../java/com/hmdp/HmDianPingApplication.java | 15 + .../java/com/hmdp/config/MybatisConfig.java | 17 ++ .../com/hmdp/config/WebExceptionAdvice.java | 17 ++ .../controller/BlogCommentsController.java | 20 ++ .../com/hmdp/controller/BlogController.java | 83 +++++ .../com/hmdp/controller/FollowController.java | 20 ++ .../com/hmdp/controller/ShopController.java | 101 +++++++ .../hmdp/controller/ShopTypeController.java | 34 +++ .../com/hmdp/controller/UploadController.java | 63 ++++ .../com/hmdp/controller/UserController.java | 82 +++++ .../hmdp/controller/VoucherController.java | 57 ++++ .../controller/VoucherOrderController.java | 25 ++ .../main/java/com/hmdp/dto/LoginFormDTO.java | 10 + .../src/main/java/com/hmdp/dto/Result.java | 30 ++ .../main/java/com/hmdp/dto/ScrollResult.java | 12 + .../src/main/java/com/hmdp/dto/UserDTO.java | 10 + .../src/main/java/com/hmdp/entity/Blog.java | 95 ++++++ .../java/com/hmdp/entity/BlogComments.java | 81 +++++ .../src/main/java/com/hmdp/entity/Follow.java | 51 ++++ .../java/com/hmdp/entity/SeckillVoucher.java | 61 ++++ .../src/main/java/com/hmdp/entity/Shop.java | 109 +++++++ .../main/java/com/hmdp/entity/ShopType.java | 64 ++++ .../src/main/java/com/hmdp/entity/User.java | 66 ++++ .../main/java/com/hmdp/entity/UserInfo.java | 87 ++++++ .../main/java/com/hmdp/entity/Voucher.java | 105 +++++++ .../java/com/hmdp/entity/VoucherOrder.java | 81 +++++ .../com/hmdp/mapper/BlogCommentsMapper.java | 16 + .../main/java/com/hmdp/mapper/BlogMapper.java | 16 + .../java/com/hmdp/mapper/FollowMapper.java | 16 + .../com/hmdp/mapper/SeckillVoucherMapper.java | 16 + .../main/java/com/hmdp/mapper/ShopMapper.java | 16 + .../java/com/hmdp/mapper/ShopTypeMapper.java | 16 + .../java/com/hmdp/mapper/UserInfoMapper.java | 16 + .../main/java/com/hmdp/mapper/UserMapper.java | 16 + .../java/com/hmdp/mapper/VoucherMapper.java | 20 ++ .../com/hmdp/mapper/VoucherOrderMapper.java | 16 + .../hmdp/service/IBlogCommentsService.java | 16 + .../java/com/hmdp/service/IBlogService.java | 16 + .../java/com/hmdp/service/IFollowService.java | 16 + .../hmdp/service/ISeckillVoucherService.java | 16 + .../java/com/hmdp/service/IShopService.java | 16 + .../com/hmdp/service/IShopTypeService.java | 16 + .../com/hmdp/service/IUserInfoService.java | 16 + .../java/com/hmdp/service/IUserService.java | 16 + .../hmdp/service/IVoucherOrderService.java | 16 + .../com/hmdp/service/IVoucherService.java | 20 ++ .../service/impl/BlogCommentsServiceImpl.java | 20 ++ .../hmdp/service/impl/BlogServiceImpl.java | 20 ++ .../hmdp/service/impl/FollowServiceImpl.java | 20 ++ .../impl/SeckillVoucherServiceImpl.java | 20 ++ .../hmdp/service/impl/ShopServiceImpl.java | 20 ++ .../service/impl/ShopTypeServiceImpl.java | 20 ++ .../service/impl/UserInfoServiceImpl.java | 20 ++ .../hmdp/service/impl/UserServiceImpl.java | 20 ++ .../service/impl/VoucherOrderServiceImpl.java | 20 ++ .../hmdp/service/impl/VoucherServiceImpl.java | 51 ++++ .../java/com/hmdp/utils/PasswordEncoder.java | 34 +++ .../java/com/hmdp/utils/RedisConstants.java | 22 ++ .../main/java/com/hmdp/utils/RedisData.java | 11 + .../java/com/hmdp/utils/RegexPatterns.java | 24 ++ .../main/java/com/hmdp/utils/RegexUtils.java | 42 +++ .../java/com/hmdp/utils/SystemConstants.java | 8 + .../main/java/com/hmdp/utils/UserHolder.java | 19 ++ .../src/main/resources/application.yaml | 27 ++ .../src/main/resources/db/hmdp.sql | 284 ++++++++++++++++++ .../resources/mapper/SeckillVoucherMapper.xml | 5 + .../main/resources/mapper/VoucherMapper.xml | 13 + .../com/hmdp/HmDianPingApplicationTests.java | 9 + 71 files changed, 2588 insertions(+) create mode 100644 hm-dianping-init/.gitignore create mode 100644 hm-dianping-init/README.md create mode 100644 hm-dianping-init/pom.xml create mode 100644 hm-dianping-init/src/main/java/com/hmdp/HmDianPingApplication.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/config/MybatisConfig.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/config/WebExceptionAdvice.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/controller/BlogCommentsController.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/controller/BlogController.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/controller/FollowController.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/controller/ShopController.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/controller/ShopTypeController.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/controller/UploadController.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/controller/UserController.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/controller/VoucherController.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/controller/VoucherOrderController.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/dto/LoginFormDTO.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/dto/Result.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/dto/ScrollResult.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/dto/UserDTO.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/entity/Blog.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/entity/BlogComments.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/entity/Follow.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/entity/SeckillVoucher.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/entity/Shop.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/entity/ShopType.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/entity/User.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/entity/UserInfo.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/entity/Voucher.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/entity/VoucherOrder.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/mapper/BlogCommentsMapper.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/mapper/BlogMapper.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/mapper/FollowMapper.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/mapper/SeckillVoucherMapper.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/mapper/ShopMapper.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/mapper/ShopTypeMapper.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/mapper/UserInfoMapper.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/mapper/UserMapper.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/mapper/VoucherMapper.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/mapper/VoucherOrderMapper.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/service/IBlogCommentsService.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/service/IBlogService.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/service/IFollowService.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/service/ISeckillVoucherService.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/service/IShopService.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/service/IShopTypeService.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/service/IUserInfoService.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/service/IUserService.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/service/IVoucherOrderService.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/service/IVoucherService.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/service/impl/BlogCommentsServiceImpl.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/service/impl/BlogServiceImpl.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/service/impl/FollowServiceImpl.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/service/impl/SeckillVoucherServiceImpl.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/service/impl/ShopServiceImpl.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/service/impl/ShopTypeServiceImpl.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/service/impl/UserInfoServiceImpl.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/service/impl/UserServiceImpl.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/service/impl/VoucherOrderServiceImpl.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/service/impl/VoucherServiceImpl.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/utils/PasswordEncoder.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/utils/RedisConstants.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/utils/RedisData.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/utils/RegexPatterns.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/utils/RegexUtils.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/utils/SystemConstants.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/utils/UserHolder.java create mode 100644 hm-dianping-init/src/main/resources/application.yaml create mode 100644 hm-dianping-init/src/main/resources/db/hmdp.sql create mode 100644 hm-dianping-init/src/main/resources/mapper/SeckillVoucherMapper.xml create mode 100644 hm-dianping-init/src/main/resources/mapper/VoucherMapper.xml create mode 100644 hm-dianping-init/src/test/java/com/hmdp/HmDianPingApplicationTests.java diff --git a/hm-dianping-init/.gitignore b/hm-dianping-init/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/hm-dianping-init/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/hm-dianping-init/README.md b/hm-dianping-init/README.md new file mode 100644 index 0000000..8f2b449 --- /dev/null +++ b/hm-dianping-init/README.md @@ -0,0 +1,23 @@ +# 代码使用说明 +项目代码包含2个分支: +- master : 主分支,包含完整版代码,作为大家的编码参考使用 +- init : 初始化分支,实战篇的初始代码,建议大家以这个分支作为自己开发的基础代码 +## 1.下载 +克隆完整项目 +```git +git clone https://gitee.com/huyi612/hm-dianping.git +``` +切换分支 +```git +git checkout init +``` + +## 2.常见问题 +部分同学直接使用了master分支项目来启动,控制台会一直报错: +``` +NOGROUP No such key 'stream.orders' or consumer group 'g1' in XREADGROUP with GROUP option +``` +这是因为我们完整版代码会尝试访问Redis,连接Redis的Stream。建议同学切换到init分支来开发,如果一定要运行master分支,请先在Redis运行一下命令: +```text +XGROUP CREATE stream.orders g1 $ MKSTREAM +``` \ No newline at end of file diff --git a/hm-dianping-init/pom.xml b/hm-dianping-init/pom.xml new file mode 100644 index 0000000..f5a937f --- /dev/null +++ b/hm-dianping-init/pom.xml @@ -0,0 +1,79 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.3.12.RELEASE + + + com.hmdp + hm-dianping + 0.0.1-SNAPSHOT + hm-dianping + Demo project for Spring Boot + + 1.8 + + + + org.springframework.boot + spring-boot-starter-data-redis + + + org.apache.commons + commons-pool2 + + + org.springframework.boot + spring-boot-starter-web + + + + mysql + mysql-connector-java + runtime + 5.1.47 + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + com.baomidou + mybatis-plus-boot-starter + 3.4.3 + + + + cn.hutool + hutool-all + 5.7.17 + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + diff --git a/hm-dianping-init/src/main/java/com/hmdp/HmDianPingApplication.java b/hm-dianping-init/src/main/java/com/hmdp/HmDianPingApplication.java new file mode 100644 index 0000000..df2a1b0 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/HmDianPingApplication.java @@ -0,0 +1,15 @@ +package com.hmdp; + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@MapperScan("com.hmdp.mapper") +@SpringBootApplication +public class HmDianPingApplication { + + public static void main(String[] args) { + SpringApplication.run(HmDianPingApplication.class, args); + } + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/config/MybatisConfig.java b/hm-dianping-init/src/main/java/com/hmdp/config/MybatisConfig.java new file mode 100644 index 0000000..ffd08c4 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/config/MybatisConfig.java @@ -0,0 +1,17 @@ +package com.hmdp.config; + +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class MybatisConfig { + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); + return interceptor; + } +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/config/WebExceptionAdvice.java b/hm-dianping-init/src/main/java/com/hmdp/config/WebExceptionAdvice.java new file mode 100644 index 0000000..ae0da66 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/config/WebExceptionAdvice.java @@ -0,0 +1,17 @@ +package com.hmdp.config; + +import com.hmdp.dto.Result; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +@Slf4j +@RestControllerAdvice +public class WebExceptionAdvice { + + @ExceptionHandler(RuntimeException.class) + public Result handleRuntimeException(RuntimeException e) { + log.error(e.toString(), e); + return Result.fail("服务器异常"); + } +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/controller/BlogCommentsController.java b/hm-dianping-init/src/main/java/com/hmdp/controller/BlogCommentsController.java new file mode 100644 index 0000000..3408b71 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/controller/BlogCommentsController.java @@ -0,0 +1,20 @@ +package com.hmdp.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 前端控制器 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +@RestController +@RequestMapping("/blog-comments") +public class BlogCommentsController { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/controller/BlogController.java b/hm-dianping-init/src/main/java/com/hmdp/controller/BlogController.java new file mode 100644 index 0000000..0a2fa6c --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/controller/BlogController.java @@ -0,0 +1,83 @@ +package com.hmdp.controller; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hmdp.dto.Result; +import com.hmdp.dto.UserDTO; +import com.hmdp.entity.Blog; +import com.hmdp.entity.User; +import com.hmdp.service.IBlogService; +import com.hmdp.service.IUserService; +import com.hmdp.utils.SystemConstants; +import com.hmdp.utils.UserHolder; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + *

+ * 前端控制器 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +@RestController +@RequestMapping("/blog") +public class BlogController { + + @Resource + private IBlogService blogService; + @Resource + private IUserService userService; + + @PostMapping + public Result saveBlog(@RequestBody Blog blog) { + // 获取登录用户 + UserDTO user = UserHolder.getUser(); + blog.setUserId(user.getId()); + // 保存探店博文 + blogService.save(blog); + // 返回id + return Result.ok(blog.getId()); + } + + @PutMapping("/like/{id}") + public Result likeBlog(@PathVariable("id") Long id) { + // 修改点赞数量 + blogService.update() + .setSql("liked = liked + 1").eq("id", id).update(); + return Result.ok(); + } + + @GetMapping("/of/me") + public Result queryMyBlog(@RequestParam(value = "current", defaultValue = "1") Integer current) { + // 获取登录用户 + UserDTO user = UserHolder.getUser(); + // 根据用户查询 + Page page = blogService.query() + .eq("user_id", user.getId()).page(new Page<>(current, SystemConstants.MAX_PAGE_SIZE)); + // 获取当前页数据 + List records = page.getRecords(); + return Result.ok(records); + } + + @GetMapping("/hot") + public Result queryHotBlog(@RequestParam(value = "current", defaultValue = "1") Integer current) { + // 根据用户查询 + Page page = blogService.query() + .orderByDesc("liked") + .page(new Page<>(current, SystemConstants.MAX_PAGE_SIZE)); + // 获取当前页数据 + List records = page.getRecords(); + // 查询用户 + records.forEach(blog ->{ + Long userId = blog.getUserId(); + User user = userService.getById(userId); + blog.setName(user.getNickName()); + blog.setIcon(user.getIcon()); + }); + return Result.ok(records); + } +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/controller/FollowController.java b/hm-dianping-init/src/main/java/com/hmdp/controller/FollowController.java new file mode 100644 index 0000000..b4d67f3 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/controller/FollowController.java @@ -0,0 +1,20 @@ +package com.hmdp.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 前端控制器 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +@RestController +@RequestMapping("/follow") +public class FollowController { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/controller/ShopController.java b/hm-dianping-init/src/main/java/com/hmdp/controller/ShopController.java new file mode 100644 index 0000000..697c269 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/controller/ShopController.java @@ -0,0 +1,101 @@ +package com.hmdp.controller; + + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hmdp.dto.Result; +import com.hmdp.entity.Shop; +import com.hmdp.service.IShopService; +import com.hmdp.utils.SystemConstants; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + *

+ * 前端控制器 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +@RestController +@RequestMapping("/shop") +public class ShopController { + + @Resource + public IShopService shopService; + + /** + * 根据id查询商铺信息 + * @param id 商铺id + * @return 商铺详情数据 + */ + @GetMapping("/{id}") + public Result queryShopById(@PathVariable("id") Long id) { + return Result.ok(shopService.getById(id)); + } + + /** + * 新增商铺信息 + * @param shop 商铺数据 + * @return 商铺id + */ + @PostMapping + public Result saveShop(@RequestBody Shop shop) { + // 写入数据库 + shopService.save(shop); + // 返回店铺id + return Result.ok(shop.getId()); + } + + /** + * 更新商铺信息 + * @param shop 商铺数据 + * @return 无 + */ + @PutMapping + public Result updateShop(@RequestBody Shop shop) { + // 写入数据库 + shopService.updateById(shop); + return Result.ok(); + } + + /** + * 根据商铺类型分页查询商铺信息 + * @param typeId 商铺类型 + * @param current 页码 + * @return 商铺列表 + */ + @GetMapping("/of/type") + public Result queryShopByType( + @RequestParam("typeId") Integer typeId, + @RequestParam(value = "current", defaultValue = "1") Integer current + ) { + // 根据类型分页查询 + Page page = shopService.query() + .eq("type_id", typeId) + .page(new Page<>(current, SystemConstants.DEFAULT_PAGE_SIZE)); + // 返回数据 + return Result.ok(page.getRecords()); + } + + /** + * 根据商铺名称关键字分页查询商铺信息 + * @param name 商铺名称关键字 + * @param current 页码 + * @return 商铺列表 + */ + @GetMapping("/of/name") + public Result queryShopByName( + @RequestParam(value = "name", required = false) String name, + @RequestParam(value = "current", defaultValue = "1") Integer current + ) { + // 根据类型分页查询 + Page page = shopService.query() + .like(StrUtil.isNotBlank(name), "name", name) + .page(new Page<>(current, SystemConstants.MAX_PAGE_SIZE)); + // 返回数据 + return Result.ok(page.getRecords()); + } +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/controller/ShopTypeController.java b/hm-dianping-init/src/main/java/com/hmdp/controller/ShopTypeController.java new file mode 100644 index 0000000..3f34f6c --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/controller/ShopTypeController.java @@ -0,0 +1,34 @@ +package com.hmdp.controller; + + +import com.hmdp.dto.Result; +import com.hmdp.entity.ShopType; +import com.hmdp.service.IShopTypeService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + *

+ * 前端控制器 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +@RestController +@RequestMapping("/shop-type") +public class ShopTypeController { + @Resource + private IShopTypeService typeService; + + @GetMapping("list") + public Result queryTypeList() { + List typeList = typeService + .query().orderByAsc("sort").list(); + return Result.ok(typeList); + } +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/controller/UploadController.java b/hm-dianping-init/src/main/java/com/hmdp/controller/UploadController.java new file mode 100644 index 0000000..56d32e4 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/controller/UploadController.java @@ -0,0 +1,63 @@ +package com.hmdp.controller; + +import cn.hutool.core.io.FileUtil; +import cn.hutool.core.util.StrUtil; +import com.hmdp.dto.Result; +import com.hmdp.utils.SystemConstants; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.IOException; +import java.util.UUID; + +@Slf4j +@RestController +@RequestMapping("upload") +public class UploadController { + + @PostMapping("blog") + public Result uploadImage(@RequestParam("file") MultipartFile image) { + try { + // 获取原始文件名称 + String originalFilename = image.getOriginalFilename(); + // 生成新文件名 + String fileName = createNewFileName(originalFilename); + // 保存文件 + image.transferTo(new File(SystemConstants.IMAGE_UPLOAD_DIR, fileName)); + // 返回结果 + log.debug("文件上传成功,{}", fileName); + return Result.ok(fileName); + } catch (IOException e) { + throw new RuntimeException("文件上传失败", e); + } + } + + @GetMapping("/blog/delete") + public Result deleteBlogImg(@RequestParam("name") String filename) { + File file = new File(SystemConstants.IMAGE_UPLOAD_DIR, filename); + if (file.isDirectory()) { + return Result.fail("错误的文件名称"); + } + FileUtil.del(file); + return Result.ok(); + } + + private String createNewFileName(String originalFilename) { + // 获取后缀 + String suffix = StrUtil.subAfter(originalFilename, ".", true); + // 生成目录 + String name = UUID.randomUUID().toString(); + int hash = name.hashCode(); + int d1 = hash & 0xF; + int d2 = (hash >> 4) & 0xF; + // 判断目录是否存在 + File dir = new File(SystemConstants.IMAGE_UPLOAD_DIR, StrUtil.format("/blogs/{}/{}", d1, d2)); + if (!dir.exists()) { + dir.mkdirs(); + } + // 生成文件名 + return StrUtil.format("/blogs/{}/{}/{}.{}", d1, d2, name, suffix); + } +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/controller/UserController.java b/hm-dianping-init/src/main/java/com/hmdp/controller/UserController.java new file mode 100644 index 0000000..24545cb --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/controller/UserController.java @@ -0,0 +1,82 @@ +package com.hmdp.controller; + + +import com.hmdp.dto.LoginFormDTO; +import com.hmdp.dto.Result; +import com.hmdp.entity.UserInfo; +import com.hmdp.service.IUserInfoService; +import com.hmdp.service.IUserService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpSession; + +/** + *

+ * 前端控制器 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +@Slf4j +@RestController +@RequestMapping("/user") +public class UserController { + + @Resource + private IUserService userService; + + @Resource + private IUserInfoService userInfoService; + + /** + * 发送手机验证码 + */ + @PostMapping("code") + public Result sendCode(@RequestParam("phone") String phone, HttpSession session) { + // TODO 发送短信验证码并保存验证码 + return Result.fail("功能未完成"); + } + + /** + * 登录功能 + * @param loginForm 登录参数,包含手机号、验证码;或者手机号、密码 + */ + @PostMapping("/login") + public Result login(@RequestBody LoginFormDTO loginForm, HttpSession session){ + // TODO 实现登录功能 + return Result.fail("功能未完成"); + } + + /** + * 登出功能 + * @return 无 + */ + @PostMapping("/logout") + public Result logout(){ + // TODO 实现登出功能 + return Result.fail("功能未完成"); + } + + @GetMapping("/me") + public Result me(){ + // TODO 获取当前登录的用户并返回 + return Result.fail("功能未完成"); + } + + @GetMapping("/info/{id}") + public Result info(@PathVariable("id") Long userId){ + // 查询详情 + UserInfo info = userInfoService.getById(userId); + if (info == null) { + // 没有详情,应该是第一次查看详情 + return Result.ok(); + } + info.setCreateTime(null); + info.setUpdateTime(null); + // 返回 + return Result.ok(info); + } +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/controller/VoucherController.java b/hm-dianping-init/src/main/java/com/hmdp/controller/VoucherController.java new file mode 100644 index 0000000..328a0e6 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/controller/VoucherController.java @@ -0,0 +1,57 @@ +package com.hmdp.controller; + + +import com.hmdp.dto.Result; +import com.hmdp.entity.Voucher; +import com.hmdp.service.IVoucherService; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + *

+ * 前端控制器 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +@RestController +@RequestMapping("/voucher") +public class VoucherController { + + @Resource + private IVoucherService voucherService; + + /** + * 新增普通券 + * @param voucher 优惠券信息 + * @return 优惠券id + */ + @PostMapping + public Result addVoucher(@RequestBody Voucher voucher) { + voucherService.save(voucher); + return Result.ok(voucher.getId()); + } + + /** + * 新增秒杀券 + * @param voucher 优惠券信息,包含秒杀信息 + * @return 优惠券id + */ + @PostMapping("seckill") + public Result addSeckillVoucher(@RequestBody Voucher voucher) { + voucherService.addSeckillVoucher(voucher); + return Result.ok(voucher.getId()); + } + + /** + * 查询店铺的优惠券列表 + * @param shopId 店铺id + * @return 优惠券列表 + */ + @GetMapping("/list/{shopId}") + public Result queryVoucherOfShop(@PathVariable("shopId") Long shopId) { + return voucherService.queryVoucherOfShop(shopId); + } +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/controller/VoucherOrderController.java b/hm-dianping-init/src/main/java/com/hmdp/controller/VoucherOrderController.java new file mode 100644 index 0000000..2bfdee9 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/controller/VoucherOrderController.java @@ -0,0 +1,25 @@ +package com.hmdp.controller; + + +import com.hmdp.dto.Result; +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 虎哥 + * @since 2021-12-22 + */ +@RestController +@RequestMapping("/voucher-order") +public class VoucherOrderController { + @PostMapping("seckill/{id}") + public Result seckillVoucher(@PathVariable("id") Long voucherId) { + return Result.fail("功能未完成"); + } +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/dto/LoginFormDTO.java b/hm-dianping-init/src/main/java/com/hmdp/dto/LoginFormDTO.java new file mode 100644 index 0000000..f8f4016 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/dto/LoginFormDTO.java @@ -0,0 +1,10 @@ +package com.hmdp.dto; + +import lombok.Data; + +@Data +public class LoginFormDTO { + private String phone; + private String code; + private String password; +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/dto/Result.java b/hm-dianping-init/src/main/java/com/hmdp/dto/Result.java new file mode 100644 index 0000000..cc098e6 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/dto/Result.java @@ -0,0 +1,30 @@ +package com.hmdp.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class Result { + private Boolean success; + private String errorMsg; + private Object data; + private Long total; + + public static Result ok(){ + return new Result(true, null, null, null); + } + public static Result ok(Object data){ + return new Result(true, null, data, null); + } + public static Result ok(List data, Long total){ + return new Result(true, null, data, total); + } + public static Result fail(String errorMsg){ + return new Result(false, errorMsg, null, null); + } +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/dto/ScrollResult.java b/hm-dianping-init/src/main/java/com/hmdp/dto/ScrollResult.java new file mode 100644 index 0000000..530fcac --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/dto/ScrollResult.java @@ -0,0 +1,12 @@ +package com.hmdp.dto; + +import lombok.Data; + +import java.util.List; + +@Data +public class ScrollResult { + private List list; + private Long minTime; + private Integer offset; +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/dto/UserDTO.java b/hm-dianping-init/src/main/java/com/hmdp/dto/UserDTO.java new file mode 100644 index 0000000..4dd1802 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/dto/UserDTO.java @@ -0,0 +1,10 @@ +package com.hmdp.dto; + +import lombok.Data; + +@Data +public class UserDTO { + private Long id; + private String nickName; + private String icon; +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/entity/Blog.java b/hm-dianping-init/src/main/java/com/hmdp/entity/Blog.java new file mode 100644 index 0000000..f5c8872 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/entity/Blog.java @@ -0,0 +1,95 @@ +package com.hmdp.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("tb_blog") +public class Blog implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 商户id + */ + private Long shopId; + /** + * 用户id + */ + private Long userId; + /** + * 用户图标 + */ + @TableField(exist = false) + private String icon; + /** + * 用户姓名 + */ + @TableField(exist = false) + private String name; + /** + * 是否点赞过了 + */ + @TableField(exist = false) + private Boolean isLike; + + /** + * 标题 + */ + private String title; + + /** + * 探店的照片,最多9张,多张以","隔开 + */ + private String images; + + /** + * 探店的文字描述 + */ + private String content; + + /** + * 点赞数量 + */ + private Integer liked; + + /** + * 评论数量 + */ + private Integer comments; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 更新时间 + */ + private LocalDateTime updateTime; + + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/entity/BlogComments.java b/hm-dianping-init/src/main/java/com/hmdp/entity/BlogComments.java new file mode 100644 index 0000000..086f356 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/entity/BlogComments.java @@ -0,0 +1,81 @@ +package com.hmdp.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("tb_blog_comments") +public class BlogComments implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 用户id + */ + private Long userId; + + /** + * 探店id + */ + private Long blogId; + + /** + * 关联的1级评论id,如果是一级评论,则值为0 + */ + private Long parentId; + + /** + * 回复的评论id + */ + private Long answerId; + + /** + * 回复的内容 + */ + private String content; + + /** + * 点赞数 + */ + private Integer liked; + + /** + * 状态,0:正常,1:被举报,2:禁止查看 + */ + private Boolean status; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 更新时间 + */ + private LocalDateTime updateTime; + + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/entity/Follow.java b/hm-dianping-init/src/main/java/com/hmdp/entity/Follow.java new file mode 100644 index 0000000..4c8fd3b --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/entity/Follow.java @@ -0,0 +1,51 @@ +package com.hmdp.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("tb_follow") +public class Follow implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 用户id + */ + private Long userId; + + /** + * 关联的用户id + */ + private Long followUserId; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/entity/SeckillVoucher.java b/hm-dianping-init/src/main/java/com/hmdp/entity/SeckillVoucher.java new file mode 100644 index 0000000..a2d25ee --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/entity/SeckillVoucher.java @@ -0,0 +1,61 @@ +package com.hmdp.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * 秒杀优惠券表,与优惠券是一对一关系 + *

+ * + * @author 虎哥 + * @since 2022-01-04 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("tb_seckill_voucher") +public class SeckillVoucher implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 关联的优惠券的id + */ + @TableId(value = "voucher_id", type = IdType.INPUT) + private Long voucherId; + + /** + * 库存 + */ + private Integer stock; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 生效时间 + */ + private LocalDateTime beginTime; + + /** + * 失效时间 + */ + private LocalDateTime endTime; + + /** + * 更新时间 + */ + private LocalDateTime updateTime; + + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/entity/Shop.java b/hm-dianping-init/src/main/java/com/hmdp/entity/Shop.java new file mode 100644 index 0000000..2a3a626 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/entity/Shop.java @@ -0,0 +1,109 @@ +package com.hmdp.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("tb_shop") +public class Shop implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 商铺名称 + */ + private String name; + + /** + * 商铺类型的id + */ + private Long typeId; + + /** + * 商铺图片,多个图片以','隔开 + */ + private String images; + + /** + * 商圈,例如陆家嘴 + */ + private String area; + + /** + * 地址 + */ + private String address; + + /** + * 经度 + */ + private Double x; + + /** + * 维度 + */ + private Double y; + + /** + * 均价,取整数 + */ + private Long avgPrice; + + /** + * 销量 + */ + private Integer sold; + + /** + * 评论数量 + */ + private Integer comments; + + /** + * 评分,1~5分,乘10保存,避免小数 + */ + private Integer score; + + /** + * 营业时间,例如 10:00-22:00 + */ + private String openHours; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 更新时间 + */ + private LocalDateTime updateTime; + + + @TableField(exist = false) + private Double distance; +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/entity/ShopType.java b/hm-dianping-init/src/main/java/com/hmdp/entity/ShopType.java new file mode 100644 index 0000000..5d4f259 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/entity/ShopType.java @@ -0,0 +1,64 @@ +package com.hmdp.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("tb_shop_type") +public class ShopType implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 类型名称 + */ + private String name; + + /** + * 图标 + */ + private String icon; + + /** + * 顺序 + */ + private Integer sort; + + /** + * 创建时间 + */ + @JsonIgnore + private LocalDateTime createTime; + + /** + * 更新时间 + */ + @JsonIgnore + private LocalDateTime updateTime; + + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/entity/User.java b/hm-dianping-init/src/main/java/com/hmdp/entity/User.java new file mode 100644 index 0000000..29f0de7 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/entity/User.java @@ -0,0 +1,66 @@ +package com.hmdp.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("tb_user") +public class User implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 手机号码 + */ + private String phone; + + /** + * 密码,加密存储 + */ + private String password; + + /** + * 昵称,默认是随机字符 + */ + private String nickName; + + /** + * 用户头像 + */ + private String icon = ""; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 更新时间 + */ + private LocalDateTime updateTime; + + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/entity/UserInfo.java b/hm-dianping-init/src/main/java/com/hmdp/entity/UserInfo.java new file mode 100644 index 0000000..428be15 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/entity/UserInfo.java @@ -0,0 +1,87 @@ +package com.hmdp.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author 虎哥 + * @since 2021-12-24 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("tb_user_info") +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键,用户id + */ + @TableId(value = "user_id", type = IdType.AUTO) + private Long userId; + + /** + * 城市名称 + */ + private String city; + + /** + * 个人介绍,不要超过128个字符 + */ + private String introduce; + + /** + * 粉丝数量 + */ + private Integer fans; + + /** + * 关注的人的数量 + */ + private Integer followee; + + /** + * 性别,0:男,1:女 + */ + private Boolean gender; + + /** + * 生日 + */ + private LocalDate birthday; + + /** + * 积分 + */ + private Integer credits; + + /** + * 会员级别,0~9级,0代表未开通会员 + */ + private Boolean level; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 更新时间 + */ + private LocalDateTime updateTime; + + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/entity/Voucher.java b/hm-dianping-init/src/main/java/com/hmdp/entity/Voucher.java new file mode 100644 index 0000000..daffdee --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/entity/Voucher.java @@ -0,0 +1,105 @@ +package com.hmdp.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("tb_voucher") +public class Voucher implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 商铺id + */ + private Long shopId; + + /** + * 代金券标题 + */ + private String title; + + /** + * 副标题 + */ + private String subTitle; + + /** + * 使用规则 + */ + private String rules; + + /** + * 支付金额 + */ + private Long payValue; + + /** + * 抵扣金额 + */ + private Long actualValue; + + /** + * 优惠券类型 + */ + private Integer type; + + /** + * 优惠券类型 + */ + private Integer status; + /** + * 库存 + */ + @TableField(exist = false) + private Integer stock; + + /** + * 生效时间 + */ + @TableField(exist = false) + private LocalDateTime beginTime; + + /** + * 失效时间 + */ + @TableField(exist = false) + private LocalDateTime endTime; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + + /** + * 更新时间 + */ + private LocalDateTime updateTime; + + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/entity/VoucherOrder.java b/hm-dianping-init/src/main/java/com/hmdp/entity/VoucherOrder.java new file mode 100644 index 0000000..1e5f673 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/entity/VoucherOrder.java @@ -0,0 +1,81 @@ +package com.hmdp.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("tb_voucher_order") +public class VoucherOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "id", type = IdType.INPUT) + private Long id; + + /** + * 下单的用户id + */ + private Long userId; + + /** + * 购买的代金券id + */ + private Long voucherId; + + /** + * 支付方式 1:余额支付;2:支付宝;3:微信 + */ + private Integer payType; + + /** + * 订单状态,1:未支付;2:已支付;3:已核销;4:已取消;5:退款中;6:已退款 + */ + private Integer status; + + /** + * 下单时间 + */ + private LocalDateTime createTime; + + /** + * 支付时间 + */ + private LocalDateTime payTime; + + /** + * 核销时间 + */ + private LocalDateTime useTime; + + /** + * 退款时间 + */ + private LocalDateTime refundTime; + + /** + * 更新时间 + */ + private LocalDateTime updateTime; + + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/mapper/BlogCommentsMapper.java b/hm-dianping-init/src/main/java/com/hmdp/mapper/BlogCommentsMapper.java new file mode 100644 index 0000000..6d40ad0 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/mapper/BlogCommentsMapper.java @@ -0,0 +1,16 @@ +package com.hmdp.mapper; + +import com.hmdp.entity.BlogComments; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +public interface BlogCommentsMapper extends BaseMapper { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/mapper/BlogMapper.java b/hm-dianping-init/src/main/java/com/hmdp/mapper/BlogMapper.java new file mode 100644 index 0000000..ec3b62e --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/mapper/BlogMapper.java @@ -0,0 +1,16 @@ +package com.hmdp.mapper; + +import com.hmdp.entity.Blog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +public interface BlogMapper extends BaseMapper { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/mapper/FollowMapper.java b/hm-dianping-init/src/main/java/com/hmdp/mapper/FollowMapper.java new file mode 100644 index 0000000..926308a --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/mapper/FollowMapper.java @@ -0,0 +1,16 @@ +package com.hmdp.mapper; + +import com.hmdp.entity.Follow; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +public interface FollowMapper extends BaseMapper { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/mapper/SeckillVoucherMapper.java b/hm-dianping-init/src/main/java/com/hmdp/mapper/SeckillVoucherMapper.java new file mode 100644 index 0000000..3cf4af8 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/mapper/SeckillVoucherMapper.java @@ -0,0 +1,16 @@ +package com.hmdp.mapper; + +import com.hmdp.entity.SeckillVoucher; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 秒杀优惠券表,与优惠券是一对一关系 Mapper 接口 + *

+ * + * @author 虎哥 + * @since 2022-01-04 + */ +public interface SeckillVoucherMapper extends BaseMapper { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/mapper/ShopMapper.java b/hm-dianping-init/src/main/java/com/hmdp/mapper/ShopMapper.java new file mode 100644 index 0000000..d5694d4 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/mapper/ShopMapper.java @@ -0,0 +1,16 @@ +package com.hmdp.mapper; + +import com.hmdp.entity.Shop; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +public interface ShopMapper extends BaseMapper { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/mapper/ShopTypeMapper.java b/hm-dianping-init/src/main/java/com/hmdp/mapper/ShopTypeMapper.java new file mode 100644 index 0000000..b09890b --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/mapper/ShopTypeMapper.java @@ -0,0 +1,16 @@ +package com.hmdp.mapper; + +import com.hmdp.entity.ShopType; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +public interface ShopTypeMapper extends BaseMapper { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/mapper/UserInfoMapper.java b/hm-dianping-init/src/main/java/com/hmdp/mapper/UserInfoMapper.java new file mode 100644 index 0000000..77b9250 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/mapper/UserInfoMapper.java @@ -0,0 +1,16 @@ +package com.hmdp.mapper; + +import com.hmdp.entity.UserInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author 虎哥 + * @since 2021-12-24 + */ +public interface UserInfoMapper extends BaseMapper { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/mapper/UserMapper.java b/hm-dianping-init/src/main/java/com/hmdp/mapper/UserMapper.java new file mode 100644 index 0000000..adcebe3 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/mapper/UserMapper.java @@ -0,0 +1,16 @@ +package com.hmdp.mapper; + +import com.hmdp.entity.User; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +public interface UserMapper extends BaseMapper { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/mapper/VoucherMapper.java b/hm-dianping-init/src/main/java/com/hmdp/mapper/VoucherMapper.java new file mode 100644 index 0000000..2db21ed --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/mapper/VoucherMapper.java @@ -0,0 +1,20 @@ +package com.hmdp.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hmdp.entity.Voucher; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +public interface VoucherMapper extends BaseMapper { + + List queryVoucherOfShop(@Param("shopId") Long shopId); +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/mapper/VoucherOrderMapper.java b/hm-dianping-init/src/main/java/com/hmdp/mapper/VoucherOrderMapper.java new file mode 100644 index 0000000..e0cd90a --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/mapper/VoucherOrderMapper.java @@ -0,0 +1,16 @@ +package com.hmdp.mapper; + +import com.hmdp.entity.VoucherOrder; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +public interface VoucherOrderMapper extends BaseMapper { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/service/IBlogCommentsService.java b/hm-dianping-init/src/main/java/com/hmdp/service/IBlogCommentsService.java new file mode 100644 index 0000000..12dbee0 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/service/IBlogCommentsService.java @@ -0,0 +1,16 @@ +package com.hmdp.service; + +import com.hmdp.entity.BlogComments; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +public interface IBlogCommentsService extends IService { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/service/IBlogService.java b/hm-dianping-init/src/main/java/com/hmdp/service/IBlogService.java new file mode 100644 index 0000000..33ffd0e --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/service/IBlogService.java @@ -0,0 +1,16 @@ +package com.hmdp.service; + +import com.hmdp.entity.Blog; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +public interface IBlogService extends IService { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/service/IFollowService.java b/hm-dianping-init/src/main/java/com/hmdp/service/IFollowService.java new file mode 100644 index 0000000..767c12d --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/service/IFollowService.java @@ -0,0 +1,16 @@ +package com.hmdp.service; + +import com.hmdp.entity.Follow; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +public interface IFollowService extends IService { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/service/ISeckillVoucherService.java b/hm-dianping-init/src/main/java/com/hmdp/service/ISeckillVoucherService.java new file mode 100644 index 0000000..fb6642b --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/service/ISeckillVoucherService.java @@ -0,0 +1,16 @@ +package com.hmdp.service; + +import com.hmdp.entity.SeckillVoucher; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 秒杀优惠券表,与优惠券是一对一关系 服务类 + *

+ * + * @author 虎哥 + * @since 2022-01-04 + */ +public interface ISeckillVoucherService extends IService { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/service/IShopService.java b/hm-dianping-init/src/main/java/com/hmdp/service/IShopService.java new file mode 100644 index 0000000..09996f0 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/service/IShopService.java @@ -0,0 +1,16 @@ +package com.hmdp.service; + +import com.hmdp.entity.Shop; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +public interface IShopService extends IService { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/service/IShopTypeService.java b/hm-dianping-init/src/main/java/com/hmdp/service/IShopTypeService.java new file mode 100644 index 0000000..131626f --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/service/IShopTypeService.java @@ -0,0 +1,16 @@ +package com.hmdp.service; + +import com.hmdp.entity.ShopType; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +public interface IShopTypeService extends IService { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/service/IUserInfoService.java b/hm-dianping-init/src/main/java/com/hmdp/service/IUserInfoService.java new file mode 100644 index 0000000..e8df101 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/service/IUserInfoService.java @@ -0,0 +1,16 @@ +package com.hmdp.service; + +import com.hmdp.entity.UserInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author 虎哥 + * @since 2021-12-24 + */ +public interface IUserInfoService extends IService { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/service/IUserService.java b/hm-dianping-init/src/main/java/com/hmdp/service/IUserService.java new file mode 100644 index 0000000..23e740a --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/service/IUserService.java @@ -0,0 +1,16 @@ +package com.hmdp.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.hmdp.entity.User; + +/** + *

+ * 服务类 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +public interface IUserService extends IService { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/service/IVoucherOrderService.java b/hm-dianping-init/src/main/java/com/hmdp/service/IVoucherOrderService.java new file mode 100644 index 0000000..218cc13 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/service/IVoucherOrderService.java @@ -0,0 +1,16 @@ +package com.hmdp.service; + +import com.hmdp.entity.VoucherOrder; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +public interface IVoucherOrderService extends IService { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/service/IVoucherService.java b/hm-dianping-init/src/main/java/com/hmdp/service/IVoucherService.java new file mode 100644 index 0000000..c8f0b08 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/service/IVoucherService.java @@ -0,0 +1,20 @@ +package com.hmdp.service; + +import com.hmdp.dto.Result; +import com.hmdp.entity.Voucher; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +public interface IVoucherService extends IService { + + Result queryVoucherOfShop(Long shopId); + + void addSeckillVoucher(Voucher voucher); +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/service/impl/BlogCommentsServiceImpl.java b/hm-dianping-init/src/main/java/com/hmdp/service/impl/BlogCommentsServiceImpl.java new file mode 100644 index 0000000..4224ff9 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/service/impl/BlogCommentsServiceImpl.java @@ -0,0 +1,20 @@ +package com.hmdp.service.impl; + +import com.hmdp.entity.BlogComments; +import com.hmdp.mapper.BlogCommentsMapper; +import com.hmdp.service.IBlogCommentsService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +@Service +public class BlogCommentsServiceImpl extends ServiceImpl implements IBlogCommentsService { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/service/impl/BlogServiceImpl.java b/hm-dianping-init/src/main/java/com/hmdp/service/impl/BlogServiceImpl.java new file mode 100644 index 0000000..dc85c57 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/service/impl/BlogServiceImpl.java @@ -0,0 +1,20 @@ +package com.hmdp.service.impl; + +import com.hmdp.entity.Blog; +import com.hmdp.mapper.BlogMapper; +import com.hmdp.service.IBlogService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +@Service +public class BlogServiceImpl extends ServiceImpl implements IBlogService { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/service/impl/FollowServiceImpl.java b/hm-dianping-init/src/main/java/com/hmdp/service/impl/FollowServiceImpl.java new file mode 100644 index 0000000..c044b79 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/service/impl/FollowServiceImpl.java @@ -0,0 +1,20 @@ +package com.hmdp.service.impl; + +import com.hmdp.entity.Follow; +import com.hmdp.mapper.FollowMapper; +import com.hmdp.service.IFollowService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +@Service +public class FollowServiceImpl extends ServiceImpl implements IFollowService { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/service/impl/SeckillVoucherServiceImpl.java b/hm-dianping-init/src/main/java/com/hmdp/service/impl/SeckillVoucherServiceImpl.java new file mode 100644 index 0000000..485860f --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/service/impl/SeckillVoucherServiceImpl.java @@ -0,0 +1,20 @@ +package com.hmdp.service.impl; + +import com.hmdp.entity.SeckillVoucher; +import com.hmdp.mapper.SeckillVoucherMapper; +import com.hmdp.service.ISeckillVoucherService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 秒杀优惠券表,与优惠券是一对一关系 服务实现类 + *

+ * + * @author 虎哥 + * @since 2022-01-04 + */ +@Service +public class SeckillVoucherServiceImpl extends ServiceImpl implements ISeckillVoucherService { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/service/impl/ShopServiceImpl.java b/hm-dianping-init/src/main/java/com/hmdp/service/impl/ShopServiceImpl.java new file mode 100644 index 0000000..8702842 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/service/impl/ShopServiceImpl.java @@ -0,0 +1,20 @@ +package com.hmdp.service.impl; + +import com.hmdp.entity.Shop; +import com.hmdp.mapper.ShopMapper; +import com.hmdp.service.IShopService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +@Service +public class ShopServiceImpl extends ServiceImpl implements IShopService { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/service/impl/ShopTypeServiceImpl.java b/hm-dianping-init/src/main/java/com/hmdp/service/impl/ShopTypeServiceImpl.java new file mode 100644 index 0000000..811b89a --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/service/impl/ShopTypeServiceImpl.java @@ -0,0 +1,20 @@ +package com.hmdp.service.impl; + +import com.hmdp.entity.ShopType; +import com.hmdp.mapper.ShopTypeMapper; +import com.hmdp.service.IShopTypeService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +@Service +public class ShopTypeServiceImpl extends ServiceImpl implements IShopTypeService { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/service/impl/UserInfoServiceImpl.java b/hm-dianping-init/src/main/java/com/hmdp/service/impl/UserInfoServiceImpl.java new file mode 100644 index 0000000..402977f --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/service/impl/UserInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.hmdp.service.impl; + +import com.hmdp.entity.UserInfo; +import com.hmdp.mapper.UserInfoMapper; +import com.hmdp.service.IUserInfoService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author 虎哥 + * @since 2021-12-24 + */ +@Service +public class UserInfoServiceImpl extends ServiceImpl implements IUserInfoService { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/service/impl/UserServiceImpl.java b/hm-dianping-init/src/main/java/com/hmdp/service/impl/UserServiceImpl.java new file mode 100644 index 0000000..938954f --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/service/impl/UserServiceImpl.java @@ -0,0 +1,20 @@ +package com.hmdp.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.hmdp.entity.User; +import com.hmdp.mapper.UserMapper; +import com.hmdp.service.IUserService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +@Service +public class UserServiceImpl extends ServiceImpl implements IUserService { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/service/impl/VoucherOrderServiceImpl.java b/hm-dianping-init/src/main/java/com/hmdp/service/impl/VoucherOrderServiceImpl.java new file mode 100644 index 0000000..8e1750d --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/service/impl/VoucherOrderServiceImpl.java @@ -0,0 +1,20 @@ +package com.hmdp.service.impl; + +import com.hmdp.entity.VoucherOrder; +import com.hmdp.mapper.VoucherOrderMapper; +import com.hmdp.service.IVoucherOrderService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +@Service +public class VoucherOrderServiceImpl extends ServiceImpl implements IVoucherOrderService { + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/service/impl/VoucherServiceImpl.java b/hm-dianping-init/src/main/java/com/hmdp/service/impl/VoucherServiceImpl.java new file mode 100644 index 0000000..ae4cf2a --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/service/impl/VoucherServiceImpl.java @@ -0,0 +1,51 @@ +package com.hmdp.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.hmdp.dto.Result; +import com.hmdp.entity.Voucher; +import com.hmdp.mapper.VoucherMapper; +import com.hmdp.entity.SeckillVoucher; +import com.hmdp.service.ISeckillVoucherService; +import com.hmdp.service.IVoucherService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author 虎哥 + * @since 2021-12-22 + */ +@Service +public class VoucherServiceImpl extends ServiceImpl implements IVoucherService { + + @Resource + private ISeckillVoucherService seckillVoucherService; + + @Override + public Result queryVoucherOfShop(Long shopId) { + // 查询优惠券信息 + List vouchers = getBaseMapper().queryVoucherOfShop(shopId); + // 返回结果 + return Result.ok(vouchers); + } + + @Override + @Transactional + public void addSeckillVoucher(Voucher voucher) { + // 保存优惠券 + save(voucher); + // 保存秒杀信息 + SeckillVoucher seckillVoucher = new SeckillVoucher(); + seckillVoucher.setVoucherId(voucher.getId()); + seckillVoucher.setStock(voucher.getStock()); + seckillVoucher.setBeginTime(voucher.getBeginTime()); + seckillVoucher.setEndTime(voucher.getEndTime()); + seckillVoucherService.save(seckillVoucher); + } +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/utils/PasswordEncoder.java b/hm-dianping-init/src/main/java/com/hmdp/utils/PasswordEncoder.java new file mode 100644 index 0000000..1360e38 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/utils/PasswordEncoder.java @@ -0,0 +1,34 @@ +package com.hmdp.utils; + + +import cn.hutool.core.util.RandomUtil; +import org.springframework.util.DigestUtils; + +import java.nio.charset.StandardCharsets; + +public class PasswordEncoder { + + public static String encode(String password) { + // 生成盐 + String salt = RandomUtil.randomString(20); + // 加密 + return encode(password,salt); + } + private static String encode(String password, String salt) { + // 加密 + return salt + "@" + DigestUtils.md5DigestAsHex((password + salt).getBytes(StandardCharsets.UTF_8)); + } + public static Boolean matches(String encodedPassword, String rawPassword) { + if (encodedPassword == null || rawPassword == null) { + return false; + } + if(!encodedPassword.contains("@")){ + throw new RuntimeException("密码格式不正确!"); + } + String[] arr = encodedPassword.split("@"); + // 获取盐 + String salt = arr[0]; + // 比较 + return encodedPassword.equals(encode(rawPassword, salt)); + } +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/utils/RedisConstants.java b/hm-dianping-init/src/main/java/com/hmdp/utils/RedisConstants.java new file mode 100644 index 0000000..a8f529c --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/utils/RedisConstants.java @@ -0,0 +1,22 @@ +package com.hmdp.utils; + +public class RedisConstants { + public static final String LOGIN_CODE_KEY = "login:code:"; + public static final Long LOGIN_CODE_TTL = 2L; + public static final String LOGIN_USER_KEY = "login:token:"; + public static final Long LOGIN_USER_TTL = 36000L; + + public static final Long CACHE_NULL_TTL = 2L; + + public static final Long CACHE_SHOP_TTL = 30L; + public static final String CACHE_SHOP_KEY = "cache:shop:"; + + public static final String LOCK_SHOP_KEY = "lock:shop:"; + public static final Long LOCK_SHOP_TTL = 10L; + + public static final String SECKILL_STOCK_KEY = "seckill:stock:"; + public static final String BLOG_LIKED_KEY = "blog:liked:"; + public static final String FEED_KEY = "feed:"; + public static final String SHOP_GEO_KEY = "shop:geo:"; + public static final String USER_SIGN_KEY = "sign:"; +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/utils/RedisData.java b/hm-dianping-init/src/main/java/com/hmdp/utils/RedisData.java new file mode 100644 index 0000000..8f777fc --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/utils/RedisData.java @@ -0,0 +1,11 @@ +package com.hmdp.utils; + +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +public class RedisData { + private LocalDateTime expireTime; + private Object data; +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/utils/RegexPatterns.java b/hm-dianping-init/src/main/java/com/hmdp/utils/RegexPatterns.java new file mode 100644 index 0000000..2276859 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/utils/RegexPatterns.java @@ -0,0 +1,24 @@ +package com.hmdp.utils; + +/** + * @author 虎哥 + */ +public abstract class RegexPatterns { + /** + * 手机号正则 + */ + public static final String PHONE_REGEX = "^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\\d{8}$"; + /** + * 邮箱正则 + */ + public static final String EMAIL_REGEX = "^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)+$"; + /** + * 密码正则。4~32位的字母、数字、下划线 + */ + public static final String PASSWORD_REGEX = "^\\w{4,32}$"; + /** + * 验证码正则, 6位数字或字母 + */ + public static final String VERIFY_CODE_REGEX = "^[a-zA-Z\\d]{6}$"; + +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/utils/RegexUtils.java b/hm-dianping-init/src/main/java/com/hmdp/utils/RegexUtils.java new file mode 100644 index 0000000..8936b56 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/utils/RegexUtils.java @@ -0,0 +1,42 @@ +package com.hmdp.utils; + +import cn.hutool.core.util.StrUtil; + +/** + * @author 虎哥 + */ +public class RegexUtils { + /** + * 是否是无效手机格式 + * @param phone 要校验的手机号 + * @return true:符合,false:不符合 + */ + public static boolean isPhoneInvalid(String phone){ + return mismatch(phone, RegexPatterns.PHONE_REGEX); + } + /** + * 是否是无效邮箱格式 + * @param email 要校验的邮箱 + * @return true:符合,false:不符合 + */ + public static boolean isEmailInvalid(String email){ + return mismatch(email, RegexPatterns.EMAIL_REGEX); + } + + /** + * 是否是无效验证码格式 + * @param code 要校验的验证码 + * @return true:符合,false:不符合 + */ + public static boolean isCodeInvalid(String code){ + return mismatch(code, RegexPatterns.VERIFY_CODE_REGEX); + } + + // 校验是否不符合正则格式 + private static boolean mismatch(String str, String regex){ + if (StrUtil.isBlank(str)) { + return true; + } + return !str.matches(regex); + } +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/utils/SystemConstants.java b/hm-dianping-init/src/main/java/com/hmdp/utils/SystemConstants.java new file mode 100644 index 0000000..691fb00 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/utils/SystemConstants.java @@ -0,0 +1,8 @@ +package com.hmdp.utils; + +public class SystemConstants { + public static final String IMAGE_UPLOAD_DIR = "D:\\lesson\\nginx-1.18.0\\html\\hmdp\\imgs\\"; + public static final String USER_NICK_NAME_PREFIX = "user_"; + public static final int DEFAULT_PAGE_SIZE = 5; + public static final int MAX_PAGE_SIZE = 10; +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/utils/UserHolder.java b/hm-dianping-init/src/main/java/com/hmdp/utils/UserHolder.java new file mode 100644 index 0000000..cc944f6 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/utils/UserHolder.java @@ -0,0 +1,19 @@ +package com.hmdp.utils; + +import com.hmdp.dto.UserDTO; + +public class UserHolder { + private static final ThreadLocal tl = new ThreadLocal<>(); + + public static void saveUser(UserDTO user){ + tl.set(user); + } + + public static UserDTO getUser(){ + return tl.get(); + } + + public static void removeUser(){ + tl.remove(); + } +} diff --git a/hm-dianping-init/src/main/resources/application.yaml b/hm-dianping-init/src/main/resources/application.yaml new file mode 100644 index 0000000..c7ea43a --- /dev/null +++ b/hm-dianping-init/src/main/resources/application.yaml @@ -0,0 +1,27 @@ +server: + port: 8081 +spring: + application: + name: hmdp + datasource: + driver-class-name: com.mysql.jdbc.Driver + url: jdbc:mysql://127.0.0.1:3306/hmdp?useSSL=false&serverTimezone=UTC + username: root + password: 123 + redis: + host: 192.168.150.101 + port: 6379 + password: 123321 + lettuce: + pool: + max-active: 10 + max-idle: 10 + min-idle: 1 + time-between-eviction-runs: 10s + jackson: + default-property-inclusion: non_null # JSON处理时忽略非空字段 +mybatis-plus: + type-aliases-package: com.hmdp.entity # 别名扫描包 +logging: + level: + com.hmdp: debug \ No newline at end of file diff --git a/hm-dianping-init/src/main/resources/db/hmdp.sql b/hm-dianping-init/src/main/resources/db/hmdp.sql new file mode 100644 index 0000000..91747d0 --- /dev/null +++ b/hm-dianping-init/src/main/resources/db/hmdp.sql @@ -0,0 +1,284 @@ +/* + Navicat Premium Data Transfer + + Source Server : local + Source Server Type : MySQL + Source Server Version : 50622 + Source Host : localhost:3306 + Source Schema : hmdp + + Target Server Type : MySQL + Target Server Version : 50622 + File Encoding : 65001 + + Date: 14/03/2022 21:38:11 +*/ + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for tb_blog +-- ---------------------------- +DROP TABLE IF EXISTS `tb_blog`; +CREATE TABLE `tb_blog` ( + `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', + `shop_id` bigint(20) NOT NULL COMMENT '商户id', + `user_id` bigint(20) UNSIGNED NOT NULL COMMENT '用户id', + `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '标题', + `images` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '探店的照片,最多9张,多张以\",\"隔开', + `content` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '探店的文字描述', + `liked` int(8) UNSIGNED NULL DEFAULT 0 COMMENT '点赞数量', + `comments` int(8) UNSIGNED NULL DEFAULT NULL COMMENT '评论数量', + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 23 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of tb_blog +-- ---------------------------- +INSERT INTO `tb_blog` VALUES (4, 4, 2, '无尽浪漫的夜晚丨在万花丛中摇晃着红酒杯🍷品战斧牛排🥩', '/imgs/blogs/7/14/4771fefb-1a87-4252-816c-9f7ec41ffa4a.jpg,/imgs/blogs/4/10/2f07e3c9-ddce-482d-9ea7-c21450f8d7cd.jpg,/imgs/blogs/2/6/b0756279-65da-4f2d-b62a-33f74b06454a.jpg,/imgs/blogs/10/7/7e97f47d-eb49-4dc9-a583-95faa7aed287.jpg,/imgs/blogs/1/2/4a7b496b-2a08-4af7-aa95-df2c3bd0ef97.jpg,/imgs/blogs/14/3/52b290eb-8b5d-403b-8373-ba0bb856d18e.jpg', '生活就是一半烟火·一半诗意
手执烟火谋生活·心怀诗意以谋爱·
当然
\r\n男朋友给不了的浪漫要学会自己给🍒
\n无法重来的一生·尽量快乐.

🏰「小筑里·神秘浪漫花园餐厅」🏰

\n💯这是一家最最最美花园的西餐厅·到处都是花餐桌上是花前台是花 美好无处不在\n品一口葡萄酒,维亚红酒马瑟兰·微醺上头工作的疲惫消失无际·生如此多娇🍃

📍地址:延安路200号(家乐福面)

🚌交通:地铁①号线定安路B口出右转过下通道右转就到啦~

--------------🥣菜品详情🥣---------------

「战斧牛排]
\n超大一块战斧牛排经过火焰的炙烤发出阵阵香,外焦里嫩让人垂涎欲滴,切开牛排的那一刻,牛排的汁水顺势流了出来,分熟的牛排肉质软,简直细嫩到犯规,一刻都等不了要放入嘴里咀嚼~

「奶油培根意面」
太太太好吃了💯
我真的无法形容它的美妙,意面混合奶油香菇的香味真的太太太香了,我真的舔盘了,一丁点美味都不想浪费‼️


「香菜汁烤鲈鱼」
这个酱是辣的 真的绝好吃‼️
鲈鱼本身就很嫩没什么刺,烤过之后外皮酥酥的,鱼肉蘸上酱料根本停不下来啊啊啊啊
能吃辣椒的小伙伴一定要尝尝

非常可 好吃子🍽\n
--------------🍃个人感受🍃---------------

【👩🏻‍🍳服务】
小姐姐特别耐心的给我们介绍彩票
推荐特色菜品,拍照需要帮忙也是尽心尽力配合,太爱他们了

【🍃环境】
比较有格调的西餐厅 整个餐厅的布局可称得上的万花丛生 有种在人间仙境的感觉🌸
集美食美酒与鲜花为一体的风格店铺 令人向往
烟火皆是生活 人间皆是浪漫
', 1, 104, '2021-12-28 19:50:01', '2022-03-10 14:26:34'); +INSERT INTO `tb_blog` VALUES (5, 1, 2, '人均30💰杭州这家港式茶餐厅我疯狂打call‼️', '/imgs/blogs/4/7/863cc302-d150-420d-a596-b16e9232a1a6.jpg,/imgs/blogs/11/12/8b37d208-9414-4e78-b065-9199647bb3e3.jpg,/imgs/blogs/4/1/fa74a6d6-3026-4cb7-b0b6-35abb1e52d11.jpg,/imgs/blogs/9/12/ac2ce2fb-0605-4f14-82cc-c962b8c86688.jpg,/imgs/blogs/4/0/26a7cd7e-6320-432c-a0b4-1b7418f45ec7.jpg,/imgs/blogs/15/9/cea51d9b-ac15-49f6-b9f1-9cf81e9b9c85.jpg', '又吃到一家好吃的茶餐厅🍴环境是怀旧tvb港风📺边吃边拍照片📷几十种菜品均价都在20+💰可以是很平价了!
·
店名:九记冰厅(远洋店)
地址:杭州市丽水路远洋乐堤港负一楼(溜冰场旁边)
·
✔️黯然销魂饭(38💰)
这碗饭我吹爆!米饭上盖满了甜甜的叉烧 还有两颗溏心蛋🍳每一粒米饭都裹着浓郁的酱汁 光盘了
·
✔️铜锣湾漏奶华(28💰)
黄油吐司烤的脆脆的 上面洒满了可可粉🍫一刀切开 奶盖流心像瀑布一样流出来 满足
·
✔️神仙一口西多士士(16💰)
简简单单却超级好吃!西多士烤的很脆 黄油味浓郁 面包体超级柔软 上面淋了炼乳
·
✔️怀旧五柳炸蛋饭(28💰)
四个鸡蛋炸成蓬松的炸蛋!也太好吃了吧!还有大块鸡排 上淋了酸甜的酱汁 太合我胃口了!!
·
✔️烧味双拼例牌(66💰)
选了烧鹅➕叉烧 他家烧腊品质真的惊艳到我!据说是每日广州发货 到店现烧现卖的黑棕鹅 每口都是正宗的味道!肉质很嫩 皮超级超级酥脆!一口爆油!叉烧肉也一点都不柴 甜甜的很入味 搭配梅子酱很解腻 !
·
✔️红烧脆皮乳鸽(18.8💰)
乳鸽很大只 这个价格也太划算了吧, 肉质很有嚼劲 脆皮很酥 越吃越香~
·
✔️大满足小吃拼盘(25💰)
翅尖➕咖喱鱼蛋➕蝴蝶虾➕盐酥鸡
zui喜欢里面的咖喱鱼!咖喱酱香甜浓郁!鱼蛋很q弹~
·
✔️港式熊仔丝袜奶茶(19💰)
小熊🐻造型的奶茶冰也太可爱了!颜值担当 很地道的丝袜奶茶 茶味特别浓郁~
·', 1, 0, '2021-12-28 20:57:49', '2022-03-10 09:21:39'); +INSERT INTO `tb_blog` VALUES (6, 10, 1, '杭州周末好去处|💰50就可以骑马啦🐎', '/imgs/blogs/blog1.jpg', '杭州周末好去处|💰50就可以骑马啦🐎', 1, 0, '2022-01-11 16:05:47', '2022-03-10 09:21:41'); +INSERT INTO `tb_blog` VALUES (7, 10, 1, '杭州周末好去处|💰50就可以骑马啦🐎', '/imgs/blogs/blog1.jpg', '杭州周末好去处|💰50就可以骑马啦🐎', 1, 0, '2022-01-11 16:05:47', '2022-03-10 09:21:42'); + +-- ---------------------------- +-- Table structure for tb_blog_comments +-- ---------------------------- +DROP TABLE IF EXISTS `tb_blog_comments`; +CREATE TABLE `tb_blog_comments` ( + `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', + `user_id` bigint(20) UNSIGNED NOT NULL COMMENT '用户id', + `blog_id` bigint(20) UNSIGNED NOT NULL COMMENT '探店id', + `parent_id` bigint(20) UNSIGNED NOT NULL COMMENT '关联的1级评论id,如果是一级评论,则值为0', + `answer_id` bigint(20) UNSIGNED NOT NULL COMMENT '回复的评论id', + `content` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '回复的内容', + `liked` int(8) UNSIGNED NULL DEFAULT NULL COMMENT '点赞数', + `status` tinyint(1) UNSIGNED NULL DEFAULT NULL COMMENT '状态,0:正常,1:被举报,2:禁止查看', + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of tb_blog_comments +-- ---------------------------- + +-- ---------------------------- +-- Table structure for tb_follow +-- ---------------------------- +DROP TABLE IF EXISTS `tb_follow`; +CREATE TABLE `tb_follow` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', + `user_id` bigint(20) UNSIGNED NOT NULL COMMENT '用户id', + `follow_user_id` bigint(20) UNSIGNED NOT NULL COMMENT '关联的用户id', + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of tb_follow +-- ---------------------------- + +-- ---------------------------- +-- Table structure for tb_seckill_voucher +-- ---------------------------- +DROP TABLE IF EXISTS `tb_seckill_voucher`; +CREATE TABLE `tb_seckill_voucher` ( + `voucher_id` bigint(20) UNSIGNED NOT NULL COMMENT '关联的优惠券的id', + `stock` int(8) NOT NULL COMMENT '库存', + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `begin_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '生效时间', + `end_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '失效时间', + `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + PRIMARY KEY (`voucher_id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '秒杀优惠券表,与优惠券是一对一关系' ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of tb_seckill_voucher +-- ---------------------------- + +-- ---------------------------- +-- Table structure for tb_shop +-- ---------------------------- +DROP TABLE IF EXISTS `tb_shop`; +CREATE TABLE `tb_shop` ( + `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', + `name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商铺名称', + `type_id` bigint(20) UNSIGNED NOT NULL COMMENT '商铺类型的id', + `images` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商铺图片,多个图片以\',\'隔开', + `area` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商圈,例如陆家嘴', + `address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '地址', + `x` double UNSIGNED NOT NULL COMMENT '经度', + `y` double UNSIGNED NOT NULL COMMENT '维度', + `avg_price` bigint(10) UNSIGNED NULL DEFAULT NULL COMMENT '均价,取整数', + `sold` int(10) UNSIGNED ZEROFILL NOT NULL COMMENT '销量', + `comments` int(10) UNSIGNED ZEROFILL NOT NULL COMMENT '评论数量', + `score` int(2) UNSIGNED ZEROFILL NOT NULL COMMENT '评分,1~5分,乘10保存,避免小数', + `open_hours` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '营业时间,例如 10:00-22:00', + `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE, + INDEX `foreign_key_type`(`type_id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 15 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of tb_shop +-- ---------------------------- +INSERT INTO `tb_shop` VALUES (1, '103茶餐厅', 1, 'https://qcloud.dpfile.com/pc/jiclIsCKmOI2arxKN1Uf0Hx3PucIJH8q0QSz-Z8llzcN56-_QiKuOvyio1OOxsRtFoXqu0G3iT2T27qat3WhLVEuLYk00OmSS1IdNpm8K8sG4JN9RIm2mTKcbLtc2o2vfCF2ubeXzk49OsGrXt_KYDCngOyCwZK-s3fqawWswzk.jpg,https://qcloud.dpfile.com/pc/IOf6VX3qaBgFXFVgp75w-KKJmWZjFc8GXDU8g9bQC6YGCpAmG00QbfT4vCCBj7njuzFvxlbkWx5uwqY2qcjixFEuLYk00OmSS1IdNpm8K8sG4JN9RIm2mTKcbLtc2o2vmIU_8ZGOT1OjpJmLxG6urQ.jpg', '大关', '金华路锦昌文华苑29号', 120.149192, 30.316078, 80, 0000004215, 0000003035, 37, '10:00-22:00', '2021-12-22 18:10:39', '2022-01-13 17:32:19'); +INSERT INTO `tb_shop` VALUES (2, '蔡馬洪涛烤肉·老北京铜锅涮羊肉', 1, 'https://p0.meituan.net/bbia/c1870d570e73accbc9fee90b48faca41195272.jpg,http://p0.meituan.net/mogu/397e40c28fc87715b3d5435710a9f88d706914.jpg,https://qcloud.dpfile.com/pc/MZTdRDqCZdbPDUO0Hk6lZENRKzpKRF7kavrkEI99OxqBZTzPfIxa5E33gBfGouhFuzFvxlbkWx5uwqY2qcjixFEuLYk00OmSS1IdNpm8K8sG4JN9RIm2mTKcbLtc2o2vmIU_8ZGOT1OjpJmLxG6urQ.jpg', '拱宸桥/上塘', '上塘路1035号(中国工商银行旁)', 120.151505, 30.333422, 85, 0000002160, 0000001460, 46, '11:30-03:00', '2021-12-22 19:00:13', '2022-01-11 16:12:26'); +INSERT INTO `tb_shop` VALUES (3, '新白鹿餐厅(运河上街店)', 1, 'https://p0.meituan.net/biztone/694233_1619500156517.jpeg,https://img.meituan.net/msmerchant/876ca8983f7395556eda9ceb064e6bc51840883.png,https://img.meituan.net/msmerchant/86a76ed53c28eff709a36099aefe28b51554088.png', '运河上街', '台州路2号运河上街购物中心F5', 120.151954, 30.32497, 61, 0000012035, 0000008045, 47, '10:30-21:00', '2021-12-22 19:10:05', '2022-01-11 16:12:42'); +INSERT INTO `tb_shop` VALUES (4, 'Mamala(杭州远洋乐堤港店)', 1, 'https://img.meituan.net/msmerchant/232f8fdf09050838bd33fb24e79f30f9606056.jpg,https://qcloud.dpfile.com/pc/rDe48Xe15nQOHCcEEkmKUp5wEKWbimt-HDeqYRWsYJseXNncvMiXbuED7x1tXqN4uzFvxlbkWx5uwqY2qcjixFEuLYk00OmSS1IdNpm8K8sG4JN9RIm2mTKcbLtc2o2vmIU_8ZGOT1OjpJmLxG6urQ.jpg', '拱宸桥/上塘', '丽水路66号远洋乐堤港商城2期1层B115号', 120.146659, 30.312742, 290, 0000013519, 0000009529, 49, '11:00-22:00', '2021-12-22 19:17:15', '2022-01-11 16:12:51'); +INSERT INTO `tb_shop` VALUES (5, '海底捞火锅(水晶城购物中心店)', 1, 'https://img.meituan.net/msmerchant/054b5de0ba0b50c18a620cc37482129a45739.jpg,https://img.meituan.net/msmerchant/59b7eff9b60908d52bd4aea9ff356e6d145920.jpg,https://qcloud.dpfile.com/pc/Qe2PTEuvtJ5skpUXKKoW9OQ20qc7nIpHYEqJGBStJx0mpoyeBPQOJE4vOdYZwm9AuzFvxlbkWx5uwqY2qcjixFEuLYk00OmSS1IdNpm8K8sG4JN9RIm2mTKcbLtc2o2vmIU_8ZGOT1OjpJmLxG6urQ.jpg', '大关', '上塘路458号水晶城购物中心F6', 120.15778, 30.310633, 104, 0000004125, 0000002764, 49, '10:00-07:00', '2021-12-22 19:20:58', '2022-01-11 16:13:01'); +INSERT INTO `tb_shop` VALUES (6, '幸福里老北京涮锅(丝联店)', 1, 'https://img.meituan.net/msmerchant/e71a2d0d693b3033c15522c43e03f09198239.jpg,https://img.meituan.net/msmerchant/9f8a966d60ffba00daf35458522273ca658239.jpg,https://img.meituan.net/msmerchant/ef9ca5ef6c05d381946fe4a9aa7d9808554502.jpg', '拱宸桥/上塘', '金华南路189号丝联166号', 120.148603, 30.318618, 130, 0000009531, 0000007324, 46, '11:00-13:50,17:00-20:50', '2021-12-22 19:24:53', '2022-01-11 16:13:09'); +INSERT INTO `tb_shop` VALUES (7, '炉鱼(拱墅万达广场店)', 1, 'https://img.meituan.net/msmerchant/909434939a49b36f340523232924402166854.jpg,https://img.meituan.net/msmerchant/32fd2425f12e27db0160e837461c10303700032.jpg,https://img.meituan.net/msmerchant/f7022258ccb8dabef62a0514d3129562871160.jpg', '北部新城', '杭行路666号万达商业中心4幢2单元409室(铺位号4005)', 120.124691, 30.336819, 85, 0000002631, 0000001320, 47, '00:00-24:00', '2021-12-22 19:40:52', '2022-01-11 16:13:19'); +INSERT INTO `tb_shop` VALUES (8, '浅草屋寿司(运河上街店)', 1, 'https://img.meituan.net/msmerchant/cf3dff697bf7f6e11f4b79c4e7d989e4591290.jpg,https://img.meituan.net/msmerchant/0b463f545355c8d8f021eb2987dcd0c8567811.jpg,https://img.meituan.net/msmerchant/c3c2516939efaf36c4ccc64b0e629fad587907.jpg', '运河上街', '拱墅区金华路80号运河上街B1', 120.150526, 30.325231, 88, 0000002406, 0000001206, 46, ' 11:00-21:30', '2021-12-22 19:51:06', '2022-01-11 16:13:25'); +INSERT INTO `tb_shop` VALUES (9, '羊老三羊蝎子牛仔排北派炭火锅(运河上街店)', 1, 'https://p0.meituan.net/biztone/163160492_1624251899456.jpeg,https://img.meituan.net/msmerchant/e478eb16f7e31a7f8b29b5e3bab6de205500837.jpg,https://img.meituan.net/msmerchant/6173eb1d18b9d70ace7fdb3f2dd939662884857.jpg', '运河上街', '台州路2号运河上街购物中心F5', 120.150598, 30.325251, 101, 0000002763, 0000001363, 44, '11:00-21:30', '2021-12-22 19:53:59', '2022-01-11 16:13:34'); +INSERT INTO `tb_shop` VALUES (10, '开乐迪KTV(运河上街店)', 2, 'https://p0.meituan.net/joymerchant/a575fd4adb0b9099c5c410058148b307-674435191.jpg,https://p0.meituan.net/merchantpic/68f11bf850e25e437c5f67decfd694ab2541634.jpg,https://p0.meituan.net/dpdeal/cb3a12225860ba2875e4ea26c6d14fcc197016.jpg', '运河上街', '台州路2号运河上街购物中心F4', 120.149093, 30.324666, 67, 0000026891, 0000000902, 37, '00:00-24:00', '2021-12-22 20:25:16', '2021-12-22 20:25:16'); +INSERT INTO `tb_shop` VALUES (11, 'INLOVE KTV(水晶城店)', 2, 'https://p0.meituan.net/dpmerchantpic/53e74b200211d68988a4f02ae9912c6c1076826.jpg,https://qcloud.dpfile.com/pc/4iWtIvzLzwM2MGgyPu1PCDb4SWEaKqUeHm--YAt1EwR5tn8kypBcqNwHnjg96EvT_Gd2X_f-v9T8Yj4uLt25Gg.jpg,https://qcloud.dpfile.com/pc/WZsJWRI447x1VG2x48Ujgu7vwqksi_9WitdKI4j3jvIgX4MZOpGNaFtM93oSSizbGybIjx5eX6WNgCPvcASYAw.jpg', '水晶城', '上塘路458号水晶城购物中心6层', 120.15853, 30.310002, 75, 0000035977, 0000005684, 47, '11:30-06:00', '2021-12-22 20:29:02', '2021-12-22 20:39:00'); +INSERT INTO `tb_shop` VALUES (12, '魅(杭州远洋乐堤港店)', 2, 'https://p0.meituan.net/dpmerchantpic/63833f6ba0393e2e8722420ef33f3d40466664.jpg,https://p0.meituan.net/dpmerchantpic/ae3c94cc92c529c4b1d7f68cebed33fa105810.png,', '远洋乐堤港', '丽水路58号远洋乐堤港F4', 120.14983, 30.31211, 88, 0000006444, 0000000235, 46, '10:00-02:00', '2021-12-22 20:34:34', '2021-12-22 20:34:34'); +INSERT INTO `tb_shop` VALUES (13, '讴K拉量贩KTV(北城天地店)', 2, 'https://p1.meituan.net/merchantpic/598c83a8c0d06fe79ca01056e214d345875600.jpg,https://qcloud.dpfile.com/pc/HhvI0YyocYHRfGwJWqPQr34hRGRl4cWdvlNwn3dqghvi4WXlM2FY1te0-7pE3Wb9_Gd2X_f-v9T8Yj4uLt25Gg.jpg,https://qcloud.dpfile.com/pc/F5ZVzZaXFE27kvQzPnaL4V8O9QCpVw2nkzGrxZE8BqXgkfyTpNExfNG5CEPQX4pjGybIjx5eX6WNgCPvcASYAw.jpg', 'D32天阳购物中心', '湖州街567号北城天地5层', 120.130453, 30.327655, 58, 0000018997, 0000001857, 41, '12:00-02:00', '2021-12-22 20:38:54', '2021-12-22 20:40:04'); +INSERT INTO `tb_shop` VALUES (14, '星聚会KTV(拱墅区万达店)', 2, 'https://p0.meituan.net/dpmerchantpic/f4cd6d8d4eb1959c3ea826aa05a552c01840451.jpg,https://p0.meituan.net/dpmerchantpic/2efc07aed856a8ab0fc75c86f4b9b0061655777.jpg,https://qcloud.dpfile.com/pc/zWfzzIorCohKT0bFwsfAlHuayWjI6DBEMPHHncmz36EEMU9f48PuD9VxLLDAjdoU_Gd2X_f-v9T8Yj4uLt25Gg.jpg', '北部新城', '杭行路666号万达广场C座1-2F', 120.128958, 30.337252, 60, 0000017771, 0000000685, 47, '10:00-22:00', '2021-12-22 20:48:54', '2021-12-22 20:48:54'); + +-- ---------------------------- +-- Table structure for tb_shop_type +-- ---------------------------- +DROP TABLE IF EXISTS `tb_shop_type`; +CREATE TABLE `tb_shop_type` ( + `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', + `name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '类型名称', + `icon` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '图标', + `sort` int(3) UNSIGNED NULL DEFAULT NULL COMMENT '顺序', + `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 11 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of tb_shop_type +-- ---------------------------- +INSERT INTO `tb_shop_type` VALUES (1, '美食', '/types/ms.png', 1, '2021-12-22 20:17:47', '2021-12-23 11:24:31'); +INSERT INTO `tb_shop_type` VALUES (2, 'KTV', '/types/KTV.png', 2, '2021-12-22 20:18:27', '2021-12-23 11:24:31'); +INSERT INTO `tb_shop_type` VALUES (3, '丽人·美发', '/types/lrmf.png', 3, '2021-12-22 20:18:48', '2021-12-23 11:24:31'); +INSERT INTO `tb_shop_type` VALUES (4, '健身运动', '/types/jsyd.png', 10, '2021-12-22 20:19:04', '2021-12-23 11:24:31'); +INSERT INTO `tb_shop_type` VALUES (5, '按摩·足疗', '/types/amzl.png', 5, '2021-12-22 20:19:27', '2021-12-23 11:24:31'); +INSERT INTO `tb_shop_type` VALUES (6, '美容SPA', '/types/spa.png', 6, '2021-12-22 20:19:35', '2021-12-23 11:24:31'); +INSERT INTO `tb_shop_type` VALUES (7, '亲子游乐', '/types/qzyl.png', 7, '2021-12-22 20:19:53', '2021-12-23 11:24:31'); +INSERT INTO `tb_shop_type` VALUES (8, '酒吧', '/types/jiuba.png', 8, '2021-12-22 20:20:02', '2021-12-23 11:24:31'); +INSERT INTO `tb_shop_type` VALUES (9, '轰趴馆', '/types/hpg.png', 9, '2021-12-22 20:20:08', '2021-12-23 11:24:31'); +INSERT INTO `tb_shop_type` VALUES (10, '美睫·美甲', '/types/mjmj.png', 4, '2021-12-22 20:21:46', '2021-12-23 11:24:31'); + +-- ---------------------------- +-- Table structure for tb_sign +-- ---------------------------- +DROP TABLE IF EXISTS `tb_sign`; +CREATE TABLE `tb_sign` ( + `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', + `user_id` bigint(20) UNSIGNED NOT NULL COMMENT '用户id', + `year` year NOT NULL COMMENT '签到的年', + `month` tinyint(2) NOT NULL COMMENT '签到的月', + `date` date NOT NULL COMMENT '签到的日期', + `is_backup` tinyint(1) UNSIGNED NULL DEFAULT NULL COMMENT '是否补签', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of tb_sign +-- ---------------------------- + +-- ---------------------------- +-- Table structure for tb_user +-- ---------------------------- +DROP TABLE IF EXISTS `tb_user`; +CREATE TABLE `tb_user` ( + `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', + `phone` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '手机号码', + `password` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '密码,加密存储', + `nick_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '昵称,默认是用户id', + `icon` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '人物头像', + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE INDEX `uniqe_key_phone`(`phone`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1010 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of tb_user +-- ---------------------------- +INSERT INTO `tb_user` VALUES (1, '13686869696', '', '小鱼同学', '/imgs/blogs/blog1.jpg', '2021-12-24 10:27:19', '2022-01-11 16:04:00'); +INSERT INTO `tb_user` VALUES (2, '13838411438', '', '可可今天不吃肉', '/imgs/icons/kkjtbcr.jpg', '2021-12-24 15:14:39', '2021-12-28 19:58:04'); +INSERT INTO `tb_user` VALUES (4, '13456789011', '', 'user_slxaxy2au9f3tanffaxr', '', '2022-01-07 12:07:53', '2022-01-07 12:07:53'); +INSERT INTO `tb_user` VALUES (5, '13456789001', '', '可爱多', '/imgs/icons/user5-icon.png', '2022-01-07 16:11:33', '2022-03-11 09:09:20'); +INSERT INTO `tb_user` VALUES (6, '13456762069', '', 'user_xn5wr3hpsv', '', '2022-02-07 17:54:10', '2022-02-07 17:54:10'); + +-- ---------------------------- +-- Table structure for tb_user_info +-- ---------------------------- +DROP TABLE IF EXISTS `tb_user_info`; +CREATE TABLE `tb_user_info` ( + `user_id` bigint(20) UNSIGNED NOT NULL COMMENT '主键,用户id', + `city` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '城市名称', + `introduce` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '个人介绍,不要超过128个字符', + `fans` int(8) UNSIGNED NULL DEFAULT 0 COMMENT '粉丝数量', + `followee` int(8) UNSIGNED NULL DEFAULT 0 COMMENT '关注的人的数量', + `gender` tinyint(1) UNSIGNED NULL DEFAULT 0 COMMENT '性别,0:男,1:女', + `birthday` date NULL DEFAULT NULL COMMENT '生日', + `credits` int(8) UNSIGNED NULL DEFAULT 0 COMMENT '积分', + `level` tinyint(1) UNSIGNED NULL DEFAULT 0 COMMENT '会员级别,0~9级,0代表未开通会员', + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + PRIMARY KEY (`user_id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of tb_user_info +-- ---------------------------- + +-- ---------------------------- +-- Table structure for tb_voucher +-- ---------------------------- +DROP TABLE IF EXISTS `tb_voucher`; +CREATE TABLE `tb_voucher` ( + `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', + `shop_id` bigint(20) UNSIGNED NULL DEFAULT NULL COMMENT '商铺id', + `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '代金券标题', + `sub_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '副标题', + `rules` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '使用规则', + `pay_value` bigint(10) UNSIGNED NOT NULL COMMENT '支付金额,单位是分。例如200代表2元', + `actual_value` bigint(10) NOT NULL COMMENT '抵扣金额,单位是分。例如200代表2元', + `type` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '0,普通券;1,秒杀券', + `status` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '1,上架; 2,下架; 3,过期', + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 10 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of tb_voucher +-- ---------------------------- +INSERT INTO `tb_voucher` VALUES (1, 1, '50元代金券', '周一至周日均可使用', '全场通用\\n无需预约\\n可无限叠加\\不兑现、不找零\\n仅限堂食', 4750, 5000, 0, 1, '2022-01-04 09:42:39', '2022-01-04 09:43:31'); + +-- ---------------------------- +-- Table structure for tb_voucher_order +-- ---------------------------- +DROP TABLE IF EXISTS `tb_voucher_order`; +CREATE TABLE `tb_voucher_order` ( + `id` bigint(20) NOT NULL COMMENT '主键', + `user_id` bigint(20) UNSIGNED NOT NULL COMMENT '下单的用户id', + `voucher_id` bigint(20) UNSIGNED NOT NULL COMMENT '购买的代金券id', + `pay_type` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '支付方式 1:余额支付;2:支付宝;3:微信', + `status` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '订单状态,1:未支付;2:已支付;3:已核销;4:已取消;5:退款中;6:已退款', + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '下单时间', + `pay_time` timestamp NULL DEFAULT NULL COMMENT '支付时间', + `use_time` timestamp NULL DEFAULT NULL COMMENT '核销时间', + `refund_time` timestamp NULL DEFAULT NULL COMMENT '退款时间', + `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of tb_voucher_order +-- ---------------------------- + +SET FOREIGN_KEY_CHECKS = 1; diff --git a/hm-dianping-init/src/main/resources/mapper/SeckillVoucherMapper.xml b/hm-dianping-init/src/main/resources/mapper/SeckillVoucherMapper.xml new file mode 100644 index 0000000..8736463 --- /dev/null +++ b/hm-dianping-init/src/main/resources/mapper/SeckillVoucherMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/hm-dianping-init/src/main/resources/mapper/VoucherMapper.xml b/hm-dianping-init/src/main/resources/mapper/VoucherMapper.xml new file mode 100644 index 0000000..f87a13b --- /dev/null +++ b/hm-dianping-init/src/main/resources/mapper/VoucherMapper.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/hm-dianping-init/src/test/java/com/hmdp/HmDianPingApplicationTests.java b/hm-dianping-init/src/test/java/com/hmdp/HmDianPingApplicationTests.java new file mode 100644 index 0000000..bf82f64 --- /dev/null +++ b/hm-dianping-init/src/test/java/com/hmdp/HmDianPingApplicationTests.java @@ -0,0 +1,9 @@ +package com.hmdp; + +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class HmDianPingApplicationTests { + + +} -- Gitee From f32d6cf9f499cbdc14bf456e7b7fc9fa9ceb2e9b Mon Sep 17 00:00:00 2001 From: Yiming Zeng Date: Thu, 2 Nov 2023 11:44:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api-integration/.gitignore | 33 ++ .../.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 62547 bytes .../.mvn/wrapper/maven-wrapper.properties | 2 + api-integration/mvnw | 308 ++++++++++++++++++ api-integration/mvnw.cmd | 205 ++++++++++++ api-integration/pom.xml | 63 ++++ .../ApiIntegrationApplication.java | 13 + .../controller/UserController.java | 26 ++ .../hongyi/apiintegration/dao/UserDao.java | 13 + .../apiintegration/dao/impl/UserDaoImpl.java | 18 + .../hongyi/apiintegration/entity/User.java | 16 + .../apiintegration/result/ResponseResult.java | 44 +++ .../apiintegration/result/ResponseStatus.java | 26 ++ .../apiintegration/service/IUserService.java | 14 + .../service/impl/UserServiceImpl.java | 25 ++ .../src/main/resources/application.yml | 2 + .../ApiIntegrationApplicationTests.java | 13 + 17 files changed, 821 insertions(+) create mode 100644 api-integration/.gitignore create mode 100644 api-integration/.mvn/wrapper/maven-wrapper.jar create mode 100644 api-integration/.mvn/wrapper/maven-wrapper.properties create mode 100644 api-integration/mvnw create mode 100644 api-integration/mvnw.cmd create mode 100644 api-integration/pom.xml create mode 100644 api-integration/src/main/java/com/hongyi/apiintegration/ApiIntegrationApplication.java create mode 100644 api-integration/src/main/java/com/hongyi/apiintegration/controller/UserController.java create mode 100644 api-integration/src/main/java/com/hongyi/apiintegration/dao/UserDao.java create mode 100644 api-integration/src/main/java/com/hongyi/apiintegration/dao/impl/UserDaoImpl.java create mode 100644 api-integration/src/main/java/com/hongyi/apiintegration/entity/User.java create mode 100644 api-integration/src/main/java/com/hongyi/apiintegration/result/ResponseResult.java create mode 100644 api-integration/src/main/java/com/hongyi/apiintegration/result/ResponseStatus.java create mode 100644 api-integration/src/main/java/com/hongyi/apiintegration/service/IUserService.java create mode 100644 api-integration/src/main/java/com/hongyi/apiintegration/service/impl/UserServiceImpl.java create mode 100644 api-integration/src/main/resources/application.yml create mode 100644 api-integration/src/test/java/com/hongyi/apiintegration/ApiIntegrationApplicationTests.java diff --git a/api-integration/.gitignore b/api-integration/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/api-integration/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/api-integration/.mvn/wrapper/maven-wrapper.jar b/api-integration/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..cb28b0e37c7d206feb564310fdeec0927af4123a GIT binary patch literal 62547 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 A?*IS* literal 0 HcmV?d00001 diff --git a/api-integration/.mvn/wrapper/maven-wrapper.properties b/api-integration/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..5f0536e --- /dev/null +++ b/api-integration/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/api-integration/mvnw b/api-integration/mvnw new file mode 100644 index 0000000..66df285 --- /dev/null +++ b/api-integration/mvnw @@ -0,0 +1,308 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.2.0 +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "$(uname)" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME + else + JAVA_HOME="/Library/Java/Home"; export JAVA_HOME + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=$(java-config --jre-home) + fi +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --unix "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --unix "$CLASSPATH") +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && + JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="$(which javac)" + if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=$(which readlink) + if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then + if $darwin ; then + javaHome="$(dirname "\"$javaExecutable\"")" + javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac" + else + javaExecutable="$(readlink -f "\"$javaExecutable\"")" + fi + javaHome="$(dirname "\"$javaExecutable\"")" + javaHome=$(expr "$javaHome" : '\(.*\)/bin') + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=$(cd "$wdir/.." || exit 1; pwd) + fi + # end of workaround + done + printf '%s' "$(cd "$basedir" || exit 1; pwd)" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + # Remove \r in case we run on Windows within Git Bash + # and check out the repository with auto CRLF management + # enabled. Otherwise, we may read lines that are delimited with + # \r\n and produce $'-Xarg\r' rather than -Xarg due to word + # splitting rules. + tr -s '\r\n' ' ' < "$1" + fi +} + +log() { + if [ "$MVNW_VERBOSE" = true ]; then + printf '%s\n' "$1" + fi +} + +BASE_DIR=$(find_maven_basedir "$(dirname "$0")") +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR +log "$MAVEN_PROJECTBASEDIR" + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" +if [ -r "$wrapperJarPath" ]; then + log "Found $wrapperJarPath" +else + log "Couldn't find $wrapperJarPath, downloading it ..." + + if [ -n "$MVNW_REPOURL" ]; then + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + fi + while IFS="=" read -r key value; do + # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) + safeValue=$(echo "$value" | tr -d '\r') + case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; + esac + done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" + log "Downloading from: $wrapperUrl" + + if $cygwin; then + wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + fi + + if command -v wget > /dev/null; then + log "Found wget ... using wget" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + log "Found curl ... using curl" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + else + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + fi + else + log "Falling back to using Java to download" + javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaSource=$(cygpath --path --windows "$javaSource") + javaClass=$(cygpath --path --windows "$javaClass") + fi + if [ -e "$javaSource" ]; then + if [ ! -e "$javaClass" ]; then + log " - Compiling MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/javac" "$javaSource") + fi + if [ -e "$javaClass" ]; then + log " - Running MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +# If specified, validate the SHA-256 sum of the Maven wrapper jar file +wrapperSha256Sum="" +while IFS="=" read -r key value; do + case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; + esac +done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" +if [ -n "$wrapperSha256Sum" ]; then + wrapperSha256Result=false + if command -v sha256sum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + elif command -v shasum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." + echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." + exit 1 + fi + if [ $wrapperSha256Result = false ]; then + echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 + echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 + echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 + exit 1 + fi +fi + +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --windows "$CLASSPATH") + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +# shellcheck disable=SC2086 # safe args +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/api-integration/mvnw.cmd b/api-integration/mvnw.cmd new file mode 100644 index 0000000..95ba6f5 --- /dev/null +++ b/api-integration/mvnw.cmd @@ -0,0 +1,205 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.2.0 +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %WRAPPER_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file +SET WRAPPER_SHA_256_SUM="" +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B +) +IF NOT %WRAPPER_SHA_256_SUM%=="" ( + powershell -Command "&{"^ + "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ + "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ + " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ + " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ + " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ + " exit 1;"^ + "}"^ + "}" + if ERRORLEVEL 1 goto error +) + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/api-integration/pom.xml b/api-integration/pom.xml new file mode 100644 index 0000000..d0a569f --- /dev/null +++ b/api-integration/pom.xml @@ -0,0 +1,63 @@ + + + 4.0.0 + + 15 + 15 + + + org.springframework.boot + spring-boot-starter-parent + 2.6.3 + + + com.hongyi + api-integration + 0.0.1-SNAPSHOT + api-integration + api-integration + + + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-configuration-processor + true + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + diff --git a/api-integration/src/main/java/com/hongyi/apiintegration/ApiIntegrationApplication.java b/api-integration/src/main/java/com/hongyi/apiintegration/ApiIntegrationApplication.java new file mode 100644 index 0000000..b472001 --- /dev/null +++ b/api-integration/src/main/java/com/hongyi/apiintegration/ApiIntegrationApplication.java @@ -0,0 +1,13 @@ +package com.hongyi.apiintegration; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ApiIntegrationApplication { + + public static void main(String[] args) { + SpringApplication.run(ApiIntegrationApplication.class, args); + } + +} diff --git a/api-integration/src/main/java/com/hongyi/apiintegration/controller/UserController.java b/api-integration/src/main/java/com/hongyi/apiintegration/controller/UserController.java new file mode 100644 index 0000000..0ee1f7a --- /dev/null +++ b/api-integration/src/main/java/com/hongyi/apiintegration/controller/UserController.java @@ -0,0 +1,26 @@ +package com.hongyi.apiintegration.controller; + +import com.hongyi.apiintegration.entity.User; +import com.hongyi.apiintegration.result.ResponseResult; +import com.hongyi.apiintegration.service.IUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +/** + * @Author Kisugi Takumi + * @Date 2023/11/2 10:58 + * @Version 1.0 + */ +@RestController +@RequestMapping("/user") +public class UserController { + + @Autowired + private IUserService userService; + + @GetMapping("query/{name}") + public ResponseResult getUserByName(@PathVariable("name") String name) { + return ResponseResult.success(userService.getUserByName(name)); + } +} diff --git a/api-integration/src/main/java/com/hongyi/apiintegration/dao/UserDao.java b/api-integration/src/main/java/com/hongyi/apiintegration/dao/UserDao.java new file mode 100644 index 0000000..65589d7 --- /dev/null +++ b/api-integration/src/main/java/com/hongyi/apiintegration/dao/UserDao.java @@ -0,0 +1,13 @@ +package com.hongyi.apiintegration.dao; + +import com.hongyi.apiintegration.entity.User; +import org.springframework.stereotype.Repository; + +/** + * @Author Kisugi Takumi + * @Date 2023/11/2 10:51 + * @Version 1.0 + */ +public interface UserDao { + User getUserByName(String name); +} diff --git a/api-integration/src/main/java/com/hongyi/apiintegration/dao/impl/UserDaoImpl.java b/api-integration/src/main/java/com/hongyi/apiintegration/dao/impl/UserDaoImpl.java new file mode 100644 index 0000000..4789d9a --- /dev/null +++ b/api-integration/src/main/java/com/hongyi/apiintegration/dao/impl/UserDaoImpl.java @@ -0,0 +1,18 @@ +package com.hongyi.apiintegration.dao.impl; + +import com.hongyi.apiintegration.dao.UserDao; +import com.hongyi.apiintegration.entity.User; +import org.springframework.stereotype.Repository; + +/** + * @Author Kisugi Takumi + * @Date 2023/11/2 11:30 + * @Version 1.0 + */ +@Repository +public class UserDaoImpl implements UserDao { + @Override + public User getUserByName(String name) { + return new User(name, 20); + } +} diff --git a/api-integration/src/main/java/com/hongyi/apiintegration/entity/User.java b/api-integration/src/main/java/com/hongyi/apiintegration/entity/User.java new file mode 100644 index 0000000..b9b7de1 --- /dev/null +++ b/api-integration/src/main/java/com/hongyi/apiintegration/entity/User.java @@ -0,0 +1,16 @@ +package com.hongyi.apiintegration.entity; + +import lombok.AllArgsConstructor; +import lombok.Data; + +/** + * @Author Kisugi Takumi + * @Date 2023/11/2 10:50 + * @Version 1.0 + */ +@Data +@AllArgsConstructor +public class User { + private String name; + private int age; +} diff --git a/api-integration/src/main/java/com/hongyi/apiintegration/result/ResponseResult.java b/api-integration/src/main/java/com/hongyi/apiintegration/result/ResponseResult.java new file mode 100644 index 0000000..8e1e347 --- /dev/null +++ b/api-integration/src/main/java/com/hongyi/apiintegration/result/ResponseResult.java @@ -0,0 +1,44 @@ +package com.hongyi.apiintegration.result; + +import lombok.Builder; +import lombok.Data; +import java.io.Serializable; + +/** + * @Author Kisugi Takumi + * @Date 2023/11/2 10:55 + * @Version 1.0 + */ +@Data +@Builder +public class ResponseResult { + + private long timestamp; + private String status; + private String message; + private T data; + + public static ResponseResult success() { + return success(null); + } + + public static ResponseResult success(T data) { + return ResponseResult.builder().data(data) + .message(ResponseStatus.SUCCESS.getDescription()) + .status(ResponseStatus.SUCCESS.getResponseCode()) + .timestamp(System.currentTimeMillis()) + .build(); + } + + public static ResponseResult fail(String message) { + return fail(null, message); + } + + public static ResponseResult fail(T data, String message) { + return ResponseResult.builder().data(data) + .message(message) + .status(ResponseStatus.FAIL.getResponseCode()) + .timestamp(System.currentTimeMillis()) + .build(); + } +} diff --git a/api-integration/src/main/java/com/hongyi/apiintegration/result/ResponseStatus.java b/api-integration/src/main/java/com/hongyi/apiintegration/result/ResponseStatus.java new file mode 100644 index 0000000..6adfaa7 --- /dev/null +++ b/api-integration/src/main/java/com/hongyi/apiintegration/result/ResponseStatus.java @@ -0,0 +1,26 @@ +package com.hongyi.apiintegration.result; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; + +/** + * @Author Kisugi Takumi + * @Date 2023/11/2 10:53 + * @Version 1.0 + */ +@Getter +@AllArgsConstructor +public enum ResponseStatus { + SUCCESS("200", "success"), + FAIL("500", "failed"), + HTTP_STATUS_200("200", "ok"), + HTTP_STATUS_400("400", "request error"), + HTTP_STATUS_401("401", "no authentication"), + HTTP_STATUS_403("403", "no authorities"), + HTTP_STATUS_500("500", "server error"); + + private final String ResponseCode; + + private final String description; +} diff --git a/api-integration/src/main/java/com/hongyi/apiintegration/service/IUserService.java b/api-integration/src/main/java/com/hongyi/apiintegration/service/IUserService.java new file mode 100644 index 0000000..a86bfd6 --- /dev/null +++ b/api-integration/src/main/java/com/hongyi/apiintegration/service/IUserService.java @@ -0,0 +1,14 @@ +package com.hongyi.apiintegration.service; + +import com.hongyi.apiintegration.entity.User; +import com.hongyi.apiintegration.result.ResponseResult; +import org.springframework.stereotype.Service; + +/** + * @Author Kisugi Takumi + * @Date 2023/11/2 10:51 + * @Version 1.0 + */ +public interface IUserService { + User getUserByName(String name); +} diff --git a/api-integration/src/main/java/com/hongyi/apiintegration/service/impl/UserServiceImpl.java b/api-integration/src/main/java/com/hongyi/apiintegration/service/impl/UserServiceImpl.java new file mode 100644 index 0000000..5ea5a3f --- /dev/null +++ b/api-integration/src/main/java/com/hongyi/apiintegration/service/impl/UserServiceImpl.java @@ -0,0 +1,25 @@ +package com.hongyi.apiintegration.service.impl; + +import com.hongyi.apiintegration.dao.UserDao; +import com.hongyi.apiintegration.entity.User; +import com.hongyi.apiintegration.result.ResponseResult; +import com.hongyi.apiintegration.service.IUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @Author Kisugi Takumi + * @Date 2023/11/2 10:51 + * @Version 1.0 + */ +@Service +public class UserServiceImpl implements IUserService { + + @Autowired + private UserDao userDao; + + @Override + public User getUserByName(String name) { + return userDao.getUserByName("Hongyi"); + } +} diff --git a/api-integration/src/main/resources/application.yml b/api-integration/src/main/resources/application.yml new file mode 100644 index 0000000..750a066 --- /dev/null +++ b/api-integration/src/main/resources/application.yml @@ -0,0 +1,2 @@ +server: + port: 80 diff --git a/api-integration/src/test/java/com/hongyi/apiintegration/ApiIntegrationApplicationTests.java b/api-integration/src/test/java/com/hongyi/apiintegration/ApiIntegrationApplicationTests.java new file mode 100644 index 0000000..58560d0 --- /dev/null +++ b/api-integration/src/test/java/com/hongyi/apiintegration/ApiIntegrationApplicationTests.java @@ -0,0 +1,13 @@ +package com.hongyi.apiintegration; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class ApiIntegrationApplicationTests { + + @Test + void contextLoads() { + } + +} -- Gitee From 989b1ef4fead05cf989cf713a02a6bb626988e04 Mon Sep 17 00:00:00 2001 From: Yiming Zeng Date: Thu, 2 Nov 2023 18:00:54 +0800 Subject: [PATCH 4/4] redis --- .../main/java/com/hmdp/config/MvcConfig.java | 33 ++++ .../com/hmdp/controller/UserController.java | 39 ++++- .../controller/VoucherOrderController.java | 9 +- .../java/com/hmdp/service/IUserService.java | 10 ++ .../hmdp/service/IVoucherOrderService.java | 3 +- .../hmdp/service/impl/UserServiceImpl.java | 159 ++++++++++++++++++ .../service/impl/VoucherOrderServiceImpl.java | 59 +++++++ .../java/com/hmdp/utils/LoginInterceptor.java | 22 +++ .../java/com/hmdp/utils/RedisIdWorker.java | 38 +++++ .../hmdp/utils/RefreshTokenInterceptor.java | 54 ++++++ .../src/main/resources/application.yaml | 8 +- 11 files changed, 422 insertions(+), 12 deletions(-) create mode 100644 hm-dianping-init/src/main/java/com/hmdp/config/MvcConfig.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/utils/LoginInterceptor.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/utils/RedisIdWorker.java create mode 100644 hm-dianping-init/src/main/java/com/hmdp/utils/RefreshTokenInterceptor.java diff --git a/hm-dianping-init/src/main/java/com/hmdp/config/MvcConfig.java b/hm-dianping-init/src/main/java/com/hmdp/config/MvcConfig.java new file mode 100644 index 0000000..181d9e4 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/config/MvcConfig.java @@ -0,0 +1,33 @@ +package com.hmdp.config; + +import com.hmdp.utils.LoginInterceptor; +import com.hmdp.utils.RefreshTokenInterceptor; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import javax.annotation.Resource; + +@Configuration +public class MvcConfig implements WebMvcConfigurer { + + @Resource + private StringRedisTemplate stringRedisTemplate; + + @Override + public void addInterceptors(InterceptorRegistry registry) { + // 登录拦截器 + registry.addInterceptor(new LoginInterceptor()) + .excludePathPatterns( + "/shop/**", + "/voucher/**", + "/shop-type/**", + "/upload/**", + "/blog/hot", + "/user/code", + "/user/login" + ).order(1); + // token刷新的拦截器 + registry.addInterceptor(new RefreshTokenInterceptor(stringRedisTemplate)).addPathPatterns("/**").order(0); + } +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/controller/UserController.java b/hm-dianping-init/src/main/java/com/hmdp/controller/UserController.java index 24545cb..2beca35 100644 --- a/hm-dianping-init/src/main/java/com/hmdp/controller/UserController.java +++ b/hm-dianping-init/src/main/java/com/hmdp/controller/UserController.java @@ -1,11 +1,15 @@ package com.hmdp.controller; +import cn.hutool.core.bean.BeanUtil; import com.hmdp.dto.LoginFormDTO; import com.hmdp.dto.Result; +import com.hmdp.dto.UserDTO; +import com.hmdp.entity.User; import com.hmdp.entity.UserInfo; import com.hmdp.service.IUserInfoService; import com.hmdp.service.IUserService; +import com.hmdp.utils.UserHolder; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; @@ -36,8 +40,8 @@ public class UserController { */ @PostMapping("code") public Result sendCode(@RequestParam("phone") String phone, HttpSession session) { - // TODO 发送短信验证码并保存验证码 - return Result.fail("功能未完成"); + // 发送短信验证码并保存验证码 + return userService.sendCode(phone, session); } /** @@ -46,8 +50,8 @@ public class UserController { */ @PostMapping("/login") public Result login(@RequestBody LoginFormDTO loginForm, HttpSession session){ - // TODO 实现登录功能 - return Result.fail("功能未完成"); + // 实现登录功能 + return userService.login(loginForm, session); } /** @@ -62,8 +66,9 @@ public class UserController { @GetMapping("/me") public Result me(){ - // TODO 获取当前登录的用户并返回 - return Result.fail("功能未完成"); + // 获取当前登录的用户并返回 + UserDTO user = UserHolder.getUser(); + return Result.ok(user); } @GetMapping("/info/{id}") @@ -79,4 +84,26 @@ public class UserController { // 返回 return Result.ok(info); } + + @GetMapping("/{id}") + public Result queryUserById(@PathVariable("id") Long userId){ + // 查询详情 + User user = userService.getById(userId); + if (user == null) { + return Result.ok(); + } + UserDTO userDTO = BeanUtil.copyProperties(user, UserDTO.class); + // 返回 + return Result.ok(userDTO); + } + + @PostMapping("/sign") + public Result sign(){ + return userService.sign(); + } + + @GetMapping("/sign/count") + public Result signCount(){ + return userService.signCount(); + } } diff --git a/hm-dianping-init/src/main/java/com/hmdp/controller/VoucherOrderController.java b/hm-dianping-init/src/main/java/com/hmdp/controller/VoucherOrderController.java index 2bfdee9..96cc0d1 100644 --- a/hm-dianping-init/src/main/java/com/hmdp/controller/VoucherOrderController.java +++ b/hm-dianping-init/src/main/java/com/hmdp/controller/VoucherOrderController.java @@ -2,11 +2,14 @@ package com.hmdp.controller; import com.hmdp.dto.Result; +import com.hmdp.service.IVoucherOrderService; 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; +import javax.annotation.Resource; + /** *

* 前端控制器 @@ -18,8 +21,12 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/voucher-order") public class VoucherOrderController { + + @Resource + private IVoucherOrderService voucherOrderService; + @PostMapping("seckill/{id}") public Result seckillVoucher(@PathVariable("id") Long voucherId) { - return Result.fail("功能未完成"); + return voucherOrderService.seckillVoucher(voucherId); } } diff --git a/hm-dianping-init/src/main/java/com/hmdp/service/IUserService.java b/hm-dianping-init/src/main/java/com/hmdp/service/IUserService.java index 23e740a..aa20954 100644 --- a/hm-dianping-init/src/main/java/com/hmdp/service/IUserService.java +++ b/hm-dianping-init/src/main/java/com/hmdp/service/IUserService.java @@ -1,8 +1,12 @@ package com.hmdp.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.hmdp.dto.LoginFormDTO; +import com.hmdp.dto.Result; import com.hmdp.entity.User; +import javax.servlet.http.HttpSession; + /** *

* 服务类 @@ -12,5 +16,11 @@ import com.hmdp.entity.User; * @since 2021-12-22 */ public interface IUserService extends IService { + Result sendCode(String phone, HttpSession session); + + Result login(LoginFormDTO loginForm, HttpSession session); + + Result sign(); + Result signCount(); } diff --git a/hm-dianping-init/src/main/java/com/hmdp/service/IVoucherOrderService.java b/hm-dianping-init/src/main/java/com/hmdp/service/IVoucherOrderService.java index 218cc13..b8034da 100644 --- a/hm-dianping-init/src/main/java/com/hmdp/service/IVoucherOrderService.java +++ b/hm-dianping-init/src/main/java/com/hmdp/service/IVoucherOrderService.java @@ -1,5 +1,6 @@ package com.hmdp.service; +import com.hmdp.dto.Result; import com.hmdp.entity.VoucherOrder; import com.baomidou.mybatisplus.extension.service.IService; @@ -12,5 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService; * @since 2021-12-22 */ public interface IVoucherOrderService extends IService { - + Result seckillVoucher(Long voucherId); } diff --git a/hm-dianping-init/src/main/java/com/hmdp/service/impl/UserServiceImpl.java b/hm-dianping-init/src/main/java/com/hmdp/service/impl/UserServiceImpl.java index 938954f..6aacf59 100644 --- a/hm-dianping-init/src/main/java/com/hmdp/service/impl/UserServiceImpl.java +++ b/hm-dianping-init/src/main/java/com/hmdp/service/impl/UserServiceImpl.java @@ -1,11 +1,36 @@ package com.hmdp.service.impl; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import cn.hutool.core.lang.UUID; +import cn.hutool.core.util.RandomUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.hmdp.dto.LoginFormDTO; +import com.hmdp.dto.Result; +import com.hmdp.dto.UserDTO; import com.hmdp.entity.User; import com.hmdp.mapper.UserMapper; import com.hmdp.service.IUserService; +import com.hmdp.utils.RegexUtils; +import com.hmdp.utils.UserHolder; +import lombok.extern.slf4j.Slf4j; +import org.springframework.data.redis.connection.BitFieldSubCommands; +import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import javax.servlet.http.HttpSession; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; + +import static com.hmdp.utils.RedisConstants.*; +import static com.hmdp.utils.RedisConstants.USER_SIGN_KEY; +import static com.hmdp.utils.SystemConstants.USER_NICK_NAME_PREFIX; + /** *

* 服务实现类 @@ -14,7 +39,141 @@ import org.springframework.stereotype.Service; * @author 虎哥 * @since 2021-12-22 */ +@Slf4j @Service public class UserServiceImpl extends ServiceImpl implements IUserService { + @Resource + private StringRedisTemplate stringRedisTemplate; + + @Override + public Result sendCode(String phone, HttpSession session) { + // 1.校验手机号 + if (RegexUtils.isPhoneInvalid(phone)) { + // 2.如果不符合,返回错误信息 + return Result.fail("手机号格式错误!"); + } + // 3.符合,生成验证码 + String code = RandomUtil.randomNumbers(6); + + // 4.保存验证码到 session + stringRedisTemplate.opsForValue().set(LOGIN_CODE_KEY + phone, code, LOGIN_CODE_TTL, TimeUnit.MINUTES); + + // 5.发送验证码 + log.debug("发送短信验证码成功,验证码:{}", code); + // 返回ok + return Result.ok(code); + } + + @Override + public Result login(LoginFormDTO loginForm, HttpSession session) { + // 1.校验手机号 + String phone = loginForm.getPhone(); + if (RegexUtils.isPhoneInvalid(phone)) { + // 2.如果不符合,返回错误信息 + return Result.fail("手机号格式错误!"); + } + // 3.从redis获取验证码并校验 + String cacheCode = stringRedisTemplate.opsForValue().get(LOGIN_CODE_KEY + phone); + String code = loginForm.getCode(); + if (cacheCode == null || !cacheCode.equals(code)) { + // 不一致,报错 + return Result.fail("验证码错误"); + } + + // 4.一致,根据手机号查询用户 select * from tb_user where phone = ? + User user = query().eq("phone", phone).one(); + + // 5.判断用户是否存在 + if (user == null) { + // 6.不存在,创建新用户并保存 + user = createUserWithPhone(phone); + } + + // 7.保存用户信息到 redis中 + // 7.1.随机生成token,作为登录令牌 + String token = UUID.randomUUID().toString(true); + // 7.2.将User对象转为HashMap存储 + UserDTO userDTO = BeanUtil.copyProperties(user, UserDTO.class); + Map userMap = BeanUtil.beanToMap(userDTO, new HashMap<>(), + CopyOptions.create() + .setIgnoreNullValue(true) + .setFieldValueEditor((fieldName, fieldValue) -> fieldValue.toString())); + // 7.3.存储 + String tokenKey = LOGIN_USER_KEY + token; + stringRedisTemplate.opsForHash().putAll(tokenKey, userMap); + // 7.4.设置token有效期 + stringRedisTemplate.expire(tokenKey, LOGIN_USER_TTL, TimeUnit.MINUTES); + + // 8.返回token + return Result.ok(token); + } + + @Override + public Result sign() { + // 1.获取当前登录用户 + Long userId = UserHolder.getUser().getId(); + // 2.获取日期 + LocalDateTime now = LocalDateTime.now(); + // 3.拼接key + String keySuffix = now.format(DateTimeFormatter.ofPattern(":yyyyMM")); + String key = USER_SIGN_KEY + userId + keySuffix; + // 4.获取今天是本月的第几天 + int dayOfMonth = now.getDayOfMonth(); + // 5.写入Redis SETBIT key offset 1 + stringRedisTemplate.opsForValue().setBit(key, dayOfMonth - 1, true); + return Result.ok(); + } + + @Override + public Result signCount() { + // 1.获取当前登录用户 + Long userId = UserHolder.getUser().getId(); + // 2.获取日期 + LocalDateTime now = LocalDateTime.now(); + // 3.拼接key + String keySuffix = now.format(DateTimeFormatter.ofPattern(":yyyyMM")); + String key = USER_SIGN_KEY + userId + keySuffix; + // 4.获取今天是本月的第几天 + int dayOfMonth = now.getDayOfMonth(); + // 5.获取本月截止今天为止的所有的签到记录,返回的是一个十进制的数字 BITFIELD sign:5:202203 GET u14 0 + List result = stringRedisTemplate.opsForValue().bitField( + key, + BitFieldSubCommands.create() + .get(BitFieldSubCommands.BitFieldType.unsigned(dayOfMonth)).valueAt(0) + ); + if (result == null || result.isEmpty()) { + // 没有任何签到结果 + return Result.ok(0); + } + Long num = result.get(0); + if (num == null || num == 0) { + return Result.ok(0); + } + // 6.循环遍历 + int count = 0; + while (true) { + // 6.1.让这个数字与1做与运算,得到数字的最后一个bit位 // 判断这个bit位是否为0 + if ((num & 1) == 0) { + // 如果为0,说明未签到,结束 + break; + }else { + // 如果不为0,说明已签到,计数器+1 + count++; + } + // 把数字右移一位,抛弃最后一个bit位,继续下一个bit位 + num >>>= 1; + } + return Result.ok(count); + } + + private User createUserWithPhone(String phone) { + // 1.创建用户 + User user = new User(); + user.setPhone(phone); + user.setNickName(USER_NICK_NAME_PREFIX + RandomUtil.randomString(10)); + // 2.保存用户 + save(user); + return user; + } } diff --git a/hm-dianping-init/src/main/java/com/hmdp/service/impl/VoucherOrderServiceImpl.java b/hm-dianping-init/src/main/java/com/hmdp/service/impl/VoucherOrderServiceImpl.java index 8e1750d..a6a3703 100644 --- a/hm-dianping-init/src/main/java/com/hmdp/service/impl/VoucherOrderServiceImpl.java +++ b/hm-dianping-init/src/main/java/com/hmdp/service/impl/VoucherOrderServiceImpl.java @@ -1,10 +1,21 @@ package com.hmdp.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.hmdp.dto.Result; +import com.hmdp.entity.SeckillVoucher; import com.hmdp.entity.VoucherOrder; import com.hmdp.mapper.VoucherOrderMapper; +import com.hmdp.service.ISeckillVoucherService; import com.hmdp.service.IVoucherOrderService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.hmdp.utils.RedisIdWorker; +import com.hmdp.utils.UserHolder; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.time.LocalDateTime; /** *

@@ -17,4 +28,52 @@ import org.springframework.stereotype.Service; @Service public class VoucherOrderServiceImpl extends ServiceImpl implements IVoucherOrderService { + @Resource + private ISeckillVoucherService seckillVoucherService; + + @Resource + private RedisIdWorker redisIdWorker; + + @Transactional + @Override + public Result seckillVoucher(Long voucherId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + //1. 查询优惠券 + queryWrapper.eq(SeckillVoucher::getVoucherId, voucherId); + SeckillVoucher seckillVoucher = seckillVoucherService.getOne(queryWrapper); + //2. 判断秒杀时间是否开始 + if (LocalDateTime.now().isBefore(seckillVoucher.getBeginTime())) { + return Result.fail("秒杀还未开始,请耐心等待"); + } + //3. 判断秒杀时间是否结束 + if (LocalDateTime.now().isAfter(seckillVoucher.getEndTime())) { + return Result.fail("秒杀已经结束!"); + } + //4. 判断库存是否充足 + if (seckillVoucher.getStock() < 1) { + return Result.fail("优惠券已被抢光了哦,下次记得手速快点"); + } + //5. 扣减库存 + boolean success = seckillVoucherService.update() + .setSql("stock = stock - 1") + .eq("voucher_id",voucherId) + .update(); + if (!success) { + return Result.fail("库存不足"); + } + //6. 创建订单 + VoucherOrder voucherOrder = new VoucherOrder(); + //6.1 设置订单id + long orderId = redisIdWorker.nextId("order"); + //6.2 设置用户id + Long id = UserHolder.getUser().getId(); + //6.3 设置代金券id + voucherOrder.setVoucherId(voucherId); + voucherOrder.setId(orderId); + voucherOrder.setUserId(id); + //7. 将订单数据保存到表中 + save(voucherOrder); + //8. 返回订单id + return Result.ok(orderId); + } } diff --git a/hm-dianping-init/src/main/java/com/hmdp/utils/LoginInterceptor.java b/hm-dianping-init/src/main/java/com/hmdp/utils/LoginInterceptor.java new file mode 100644 index 0000000..9e8b7e1 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/utils/LoginInterceptor.java @@ -0,0 +1,22 @@ +package com.hmdp.utils; + +import org.springframework.web.servlet.HandlerInterceptor; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class LoginInterceptor implements HandlerInterceptor { + + @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { + // 1.判断是否需要拦截(ThreadLocal中是否有用户) + if (UserHolder.getUser() == null) { + // 没有,需要拦截,设置状态码 + response.setStatus(401); + // 拦截 + return false; + } + // 有用户,则放行 + return true; + } +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/utils/RedisIdWorker.java b/hm-dianping-init/src/main/java/com/hmdp/utils/RedisIdWorker.java new file mode 100644 index 0000000..272b8b7 --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/utils/RedisIdWorker.java @@ -0,0 +1,38 @@ +package com.hmdp.utils; + +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.time.format.DateTimeFormatter; + +/** + * @Author Kisugi Takumi + * @Date 2023/11/2 16:51 + * @Version 1.0 + */ +@Component +public class RedisIdWorker { + @Resource + private StringRedisTemplate stringRedisTemplate; + + //设置起始时间,我这里设定的是2022.01.01 00:00:00 + public static final Long BEGIN_TIMESTAMP = 1640995200L; + + //序列号长度 + public static final Long COUNT_BIT = 32L; + + public long nextId(String keyPrefix){ + //1. 生成时间戳 + LocalDateTime now = LocalDateTime.now(); + long currentSecond = now.toEpochSecond(ZoneOffset.UTC); + long timeStamp = currentSecond - BEGIN_TIMESTAMP; + //2. 生成序列号 + String date = now.format(DateTimeFormatter.ofPattern("yyyy:MM:dd")); + long count = stringRedisTemplate.opsForValue().increment("inc:" + keyPrefix + ":" + date); + //3. 拼接并返回,简单位运算 + return timeStamp << COUNT_BIT | count; + } +} diff --git a/hm-dianping-init/src/main/java/com/hmdp/utils/RefreshTokenInterceptor.java b/hm-dianping-init/src/main/java/com/hmdp/utils/RefreshTokenInterceptor.java new file mode 100644 index 0000000..e05d3de --- /dev/null +++ b/hm-dianping-init/src/main/java/com/hmdp/utils/RefreshTokenInterceptor.java @@ -0,0 +1,54 @@ +package com.hmdp.utils; + +import cn.hutool.core.bean.BeanUtil; +import com.hmdp.dto.UserDTO; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.web.servlet.HandlerInterceptor; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Map; +import java.util.concurrent.TimeUnit; + +/** + * @Author Kisugi Takumi + * @Date 2023/11/2 17:28 + * @Version 1.0 + */ +public class RefreshTokenInterceptor implements HandlerInterceptor { + private final StringRedisTemplate stringRedisTemplate; + + public RefreshTokenInterceptor(StringRedisTemplate stringRedisTemplate) { + this.stringRedisTemplate = stringRedisTemplate; + } + + @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { + // 获取请求头中的token + String token = request.getHeader("authorization"); + if (token == null) { + return true; + } + // 完整的token + String keyToken = RedisConstants.LOGIN_USER_KEY + token; + // 基于token获取redis中的用户 + Map userMap = stringRedisTemplate.opsForHash().entries(keyToken); + // 判断用户是否存在 + if (userMap.isEmpty()) { + return true; + } + // 将hash数据转为UserDTO对象 + UserDTO userDTO = BeanUtil.fillBeanWithMap(userMap, new UserDTO(), false); + // 将用户将用户信息保存到ThreadLocal + UserHolder.saveUser(userDTO); + // 刷新token的有效期 + stringRedisTemplate.expire(keyToken, 30, TimeUnit.MINUTES); + return true; + } + + @Override + public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception { + // 移除用户 + UserHolder.removeUser(); + } +} diff --git a/hm-dianping-init/src/main/resources/application.yaml b/hm-dianping-init/src/main/resources/application.yaml index c7ea43a..3d6de68 100644 --- a/hm-dianping-init/src/main/resources/application.yaml +++ b/hm-dianping-init/src/main/resources/application.yaml @@ -5,13 +5,13 @@ spring: name: hmdp datasource: driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/hmdp?useSSL=false&serverTimezone=UTC + url: jdbc:mysql://127.0.0.1:3306/redis_demo?useSSL=false&serverTimezone=UTC username: root - password: 123 + password: 12345678 redis: - host: 192.168.150.101 + host: 127.0.0.1 port: 6379 - password: 123321 + password: lettuce: pool: max-active: 10 -- Gitee