From ca927d123ff5a716f36aded0c364cb60bc6181da Mon Sep 17 00:00:00 2001 From: LeJingS <157603342+LeJingS@users.noreply.github.com> Date: Sun, 22 Dec 2024 22:12:47 +0800 Subject: [PATCH] =?UTF-8?q?2024=E5=B9=B412=E6=9C=8822=E6=97=A522:12:45?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../font/nginx-1.20.2/logs/access.log | 79 +++++++++++++++++++ Sky_Delivery/font/nginx-1.20.2/logs/error.log | 6 ++ Sky_Delivery/font/nginx-1.20.2/logs/nginx.pid | 2 +- .../java/com/sky/annotation/AutoFill.java | 17 ++++ .../java/com/sky/aspect/AutoFillAspect.java | 74 +++++++++++++++++ .../java/com/sky/mapper/CategoryMapper.java | 3 + .../java/com/sky/mapper/EmployeeMapper.java | 5 +- .../sky/service/impl/CategoryServiceImpl.java | 20 ++--- .../sky/service/impl/EmployeeServiceImpl.java | 18 ++--- 9 files changed, 203 insertions(+), 21 deletions(-) create mode 100644 Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/annotation/AutoFill.java create mode 100644 Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/aspect/AutoFillAspect.java diff --git a/Sky_Delivery/font/nginx-1.20.2/logs/access.log b/Sky_Delivery/font/nginx-1.20.2/logs/access.log index 00532ef..bb95816 100644 --- a/Sky_Delivery/font/nginx-1.20.2/logs/access.log +++ b/Sky_Delivery/font/nginx-1.20.2/logs/access.log @@ -441,3 +441,82 @@ 127.0.0.1 - - [21/Dec/2024:22:22:09 +0800] "GET /api/workspace/overviewDishes HTTP/1.1" 404 112 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" 127.0.0.1 - - [21/Dec/2024:22:22:09 +0800] "GET /api/workspace/overviewOrders HTTP/1.1" 404 112 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" 127.0.0.1 - - [21/Dec/2024:22:22:09 +0800] "GET /api/workspace/overviewSetmeals HTTP/1.1" 404 114 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:24:19 +0800] "GET / HTTP/1.1" 200 2012 "-" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:24:19 +0800] "GET /css/app.fd9b670b.css HTTP/1.1" 200 364764 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:24:19 +0800] "GET /css/chunk-vendors.37cc3fbd.css HTTP/1.1" 200 7903 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:24:19 +0800] "GET /js/app.d0aa4eb3.js HTTP/1.1" 200 57032 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:24:19 +0800] "GET /css/404.6a750851.css HTTP/1.1" 200 5256 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:24:19 +0800] "GET /css/dashboard.8da8967e.css HTTP/1.1" 200 9605 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:24:19 +0800] "GET /css/login.f8377ced.css HTTP/1.1" 200 2533 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:24:19 +0800] "GET /js/dashboard.630a609e.js HTTP/1.1" 200 40566 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:24:19 +0800] "GET /css/shopTable.5fd29e98.css HTTP/1.1" 200 31547 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:24:19 +0800] "GET /js/login.90288d75.js HTTP/1.1" 200 3401 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:24:19 +0800] "GET /js/chunk-vendors.9b7e46a0.js HTTP/1.1" 200 2333478 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:24:19 +0800] "GET /js/404.c61770cf.js HTTP/1.1" 200 2120 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:24:19 +0800] "GET /js/shopTable.fe534d8f.js HTTP/1.1" 200 121212 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:24:19 +0800] "GET /img/login-l.6ef9d260.png HTTP/1.1" 200 1871310 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:24:19 +0800] "GET /img/icon_logo.38b01728.png HTTP/1.1" 200 12440 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:24:19 +0800] "GET /favicon.ico HTTP/1.1" 200 13342 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:24:19 +0800] "GET /manifest.json HTTP/1.1" 200 454 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:24:19 +0800] "GET /img/icons/favicon-32x32.png HTTP/1.1" 200 13342 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:24:19 +0800] "GET /img/icons/android-chrome-192x192.png HTTP/1.1" 200 2484 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:24:19 +0800] "GET /img/icons/favicon-16x16.png HTTP/1.1" 200 13342 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:24:20 +0800] "GET /fonts/element-icons.535877f5.woff HTTP/1.1" 200 28200 "http://127.0.0.1/css/app.fd9b670b.css" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:24:24 +0800] "POST /api/employee/login HTTP/1.1" 502 494 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:24:37 +0800] "POST /api/employee/login HTTP/1.1" 502 494 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:25:22 +0800] "POST /api/employee/login HTTP/1.1" 200 54 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:25:23 +0800] "POST /api/employee/login HTTP/1.1" 200 54 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:25:32 +0800] "POST /api/employee/login HTTP/1.1" 200 54 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:27:08 +0800] "POST /api/employee/login HTTP/1.1" 200 200 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:27:08 +0800] "GET /img/logo.38b01728.png HTTP/1.1" 200 12440 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:27:08 +0800] "GET /img/table_empty.885371bc.png HTTP/1.1" 200 73133 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:27:08 +0800] "GET /api/workspace/overviewSetmeals HTTP/1.1" 404 114 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:27:08 +0800] "GET /api/order/conditionSearch?page=1&pageSize=10&status=2 HTTP/1.1" 404 109 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:27:08 +0800] "GET /api/workspace/overviewDishes HTTP/1.1" 404 112 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:27:08 +0800] "GET /api/workspace/overviewOrders HTTP/1.1" 404 112 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:27:08 +0800] "GET /api/shop/status HTTP/1.1" 404 99 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:27:08 +0800] "GET /api/workspace/businessData HTTP/1.1" 404 110 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:27:08 +0800] "GET /media/preview.3f1fe127.mp3 HTTP/1.1" 206 103817 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:27:08 +0800] "GET /media/reminder.0a3849af.mp3 HTTP/1.1" 206 42807 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:27:08 +0800] "GET /ws/7d3e86y8rhx HTTP/1.1" 404 91 "-" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:27:14 +0800] "GET /api/report/turnoverStatistics?begin=2024-12-15&end=2024-12-21 HTTP/1.1" 404 113 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:27:14 +0800] "GET /api/report/userStatistics?begin=2024-12-15&end=2024-12-21 HTTP/1.1" 404 109 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:27:14 +0800] "GET /api/report/ordersStatistics?begin=2024-12-15&end=2024-12-21 HTTP/1.1" 404 111 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:27:14 +0800] "GET /api/report/top10?begin=2024-12-15&end=2024-12-21 HTTP/1.1" 404 100 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:27:15 +0800] "GET /api/order/conditionSearch?page=1&pageSize=10 HTTP/1.1" 404 109 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:27:16 +0800] "GET /api/setmeal/page?page=1&pageSize=10&status= HTTP/1.1" 404 100 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:27:16 +0800] "GET /api/category/list?type=2 HTTP/1.1" 200 354 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:27:17 +0800] "GET /api/dish/page?page=1&pageSize=10&status= HTTP/1.1" 404 97 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:27:17 +0800] "GET /api/category/list?type=1 HTTP/1.1" 200 1275 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:20:27:18 +0800] "GET /api/category/page?page=1&pageSize=10 HTTP/1.1" 200 1610 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:21:38:47 +0800] "GET /api/employee/page?page=1&pageSize=10 HTTP/1.1" 200 327 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:21:38:52 +0800] "GET /api/employee/page?page=1&pageSize=10 HTTP/1.1" 200 327 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:21:39:14 +0800] "GET /js/chunk-vendors.9b7e46a0.js.map HTTP/1.1" 200 10625104 "-" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:21:39:14 +0800] "GET /js/app.d0aa4eb3.js.map HTTP/1.1" 200 146598 "-" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:21:39:14 +0800] "GET /js/login.90288d75.js.map HTTP/1.1" 200 10106 "-" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:21:39:14 +0800] "GET /js/dashboard.630a609e.js.map HTTP/1.1" 200 112781 "-" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:21:39:14 +0800] "GET /js/shopTable.fe534d8f.js.map HTTP/1.1" 200 349196 "-" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:21:39:33 +0800] "POST /api/employee HTTP/1.1" 200 44 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:21:39:35 +0800] "GET /api/employee/page?page=1&pageSize=10 HTTP/1.1" 200 589 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:21:39:53 +0800] "GET /api/employee/2 HTTP/1.1" 200 276 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:21:40:09 +0800] "PUT /api/employee HTTP/1.1" 200 44 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:21:42:39 +0800] "GET /api/employee/page?page=1&pageSize=10 HTTP/1.1" 502 494 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:22:06:26 +0800] "GET /api/employee/page?page=1&pageSize=10 HTTP/1.1" 200 589 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:22:06:28 +0800] "GET /api/employee/2 HTTP/1.1" 200 276 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:22:06:33 +0800] "PUT /api/employee HTTP/1.1" 200 44 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:22:06:33 +0800] "GET /api/employee/page?page=1&pageSize=10 HTTP/1.1" 200 589 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:22:07:03 +0800] "POST /api/employee HTTP/1.1" 200 44 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:22:07:03 +0800] "GET /api/employee/page?page=1&pageSize=10 HTTP/1.1" 200 851 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:22:07:34 +0800] "POST /api/employee/logout HTTP/1.1" 200 44 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:22:07:50 +0800] "POST /api/employee/login HTTP/1.1" 200 200 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:22:07:50 +0800] "GET /api/workspace/overviewDishes HTTP/1.1" 404 112 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:22:07:50 +0800] "GET /api/order/conditionSearch?page=1&pageSize=10&status=2 HTTP/1.1" 404 109 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:22:07:50 +0800] "GET /api/shop/status HTTP/1.1" 404 99 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:22:07:50 +0800] "GET /api/workspace/overviewSetmeals HTTP/1.1" 404 114 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:22:07:50 +0800] "GET /api/workspace/businessData HTTP/1.1" 404 110 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:22:07:50 +0800] "GET /api/workspace/overviewOrders HTTP/1.1" 404 112 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:22:07:50 +0800] "GET /ws/fhq5xlvuc8p HTTP/1.1" 404 91 "-" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:22:07:52 +0800] "GET /api/employee/page?page=1&pageSize=10 HTTP/1.1" 200 851 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:22:07:56 +0800] "GET /api/employee/3 HTTP/1.1" 200 276 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:22:07:59 +0800] "PUT /api/employee HTTP/1.1" 200 44 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" +127.0.0.1 - - [22/Dec/2024:22:08:00 +0800] "GET /api/employee/page?page=1&pageSize=10 HTTP/1.1" 200 851 "http://127.0.0.1/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" diff --git a/Sky_Delivery/font/nginx-1.20.2/logs/error.log b/Sky_Delivery/font/nginx-1.20.2/logs/error.log index f730a86..59c42b6 100644 --- a/Sky_Delivery/font/nginx-1.20.2/logs/error.log +++ b/Sky_Delivery/font/nginx-1.20.2/logs/error.log @@ -5,3 +5,9 @@ 2024/12/18 09:27:35 [error] 7444#13152: *4 connect() failed (10061: No connection could be made because the target machine actively refused it) while connecting to upstream, client: 127.0.0.1, server: localhost, request: "POST /api/employee/login HTTP/1.1", upstream: "http://127.0.0.1:8080/admin/employee/login", host: "127.0.0.1", referrer: "http://127.0.0.1/" 2024/12/21 10:28:16 [alert] 11160#17668: worker process 22776 exited with code C0000142 2024/12/21 10:28:16 [alert] 11160#17668: could not respawn worker +2024/12/22 20:24:22 [error] 21656#10592: *1 connect() failed (10061: No connection could be made because the target machine actively refused it) while connecting to upstream, client: 127.0.0.1, server: localhost, request: "POST /api/employee/login HTTP/1.1", upstream: "http://127.0.0.1:8080/admin/employee/login", host: "127.0.0.1", referrer: "http://127.0.0.1/" +2024/12/22 20:24:24 [error] 21656#10592: *1 connect() failed (10061: No connection could be made because the target machine actively refused it) while connecting to upstream, client: 127.0.0.1, server: localhost, request: "POST /api/employee/login HTTP/1.1", upstream: "http://[::1]:8080/admin/employee/login", host: "127.0.0.1", referrer: "http://127.0.0.1/" +2024/12/22 20:24:35 [error] 21656#10592: *1 connect() failed (10061: No connection could be made because the target machine actively refused it) while connecting to upstream, client: 127.0.0.1, server: localhost, request: "POST /api/employee/login HTTP/1.1", upstream: "http://127.0.0.1:8080/admin/employee/login", host: "127.0.0.1", referrer: "http://127.0.0.1/" +2024/12/22 20:24:37 [error] 21656#10592: *1 connect() failed (10061: No connection could be made because the target machine actively refused it) while connecting to upstream, client: 127.0.0.1, server: localhost, request: "POST /api/employee/login HTTP/1.1", upstream: "http://[::1]:8080/admin/employee/login", host: "127.0.0.1", referrer: "http://127.0.0.1/" +2024/12/22 21:42:37 [error] 21656#10592: *51 connect() failed (10061: No connection could be made because the target machine actively refused it) while connecting to upstream, client: 127.0.0.1, server: localhost, request: "GET /api/employee/page?page=1&pageSize=10 HTTP/1.1", upstream: "http://127.0.0.1:8080/admin/employee/page?page=1&pageSize=10", host: "127.0.0.1", referrer: "http://127.0.0.1/" +2024/12/22 21:42:39 [error] 21656#10592: *51 connect() failed (10061: No connection could be made because the target machine actively refused it) while connecting to upstream, client: 127.0.0.1, server: localhost, request: "GET /api/employee/page?page=1&pageSize=10 HTTP/1.1", upstream: "http://[::1]:8080/admin/employee/page?page=1&pageSize=10", host: "127.0.0.1", referrer: "http://127.0.0.1/" diff --git a/Sky_Delivery/font/nginx-1.20.2/logs/nginx.pid b/Sky_Delivery/font/nginx-1.20.2/logs/nginx.pid index 5c895d1..3b11232 100644 --- a/Sky_Delivery/font/nginx-1.20.2/logs/nginx.pid +++ b/Sky_Delivery/font/nginx-1.20.2/logs/nginx.pid @@ -1 +1 @@ -13156 +23732 diff --git a/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/annotation/AutoFill.java b/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/annotation/AutoFill.java new file mode 100644 index 0000000..8dcdf2e --- /dev/null +++ b/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/annotation/AutoFill.java @@ -0,0 +1,17 @@ +package com.sky.annotation; +//自动填充注解 +//用于表示方法需要进行自动填充 + +import com.sky.enumeration.OperationType; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +public @interface AutoFill { +// 数据库操作类型，添加和修改 + OperationType value(); +} diff --git a/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/aspect/AutoFillAspect.java b/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/aspect/AutoFillAspect.java new file mode 100644 index 0000000..2cdee2e --- /dev/null +++ b/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/aspect/AutoFillAspect.java @@ -0,0 +1,74 @@ +package com.sky.aspect; + + +import com.sky.annotation.AutoFill; +import com.sky.context.BaseContext; +import com.sky.enumeration.OperationType; +import lombok.extern.slf4j.Slf4j; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.Signature; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.aspectj.lang.annotation.Pointcut; +import org.aspectj.lang.reflect.MethodSignature; +import org.springframework.stereotype.Component; + +import java.time.LocalDateTime; + +/* +* 自定义切面类,实现公共字段数据填充 +* */ +@Aspect +@Component +@Slf4j +public class AutoFillAspect { + /* + * 切入点 + * */ + @Pointcut("execution(* com.sky.mapper.*.*(..)) && @annotation(com.sky.annotation.AutoFill)") + public void autoFillPointCut(){} + /*前置通知*/ + @Before("autoFillPointCut()") + public void autoFill(JoinPoint joinPoint){ + log.info("开始进行公共字段填充···"); +// 获取到当前被拦截的方法上的数据库操作类型 + MethodSignature signature =(MethodSignature) joinPoint.getSignature();//方法的签名对象 + AutoFill autoFill = signature.getMethod().getAnnotation(AutoFill.class);//获得方法上的注解对象 + OperationType operationType = autoFill.value();//获得数据库操作类型 + +// 获取到被拦截的方法的实体对象 + Object[] args = joinPoint.getArgs(); + if(args == null || args.length == 0){ + return; + } + Object entity = args[0];//获得第一个参数，约定第一个参数为实体对象 + +// 准备赋值的数据时间和当前id + LocalDateTime now = LocalDateTime.now(); + Long currentId = BaseContext.getCurrentId(); + +// 根据不同的操作类型，为对应的属性通过反射来赋值 + if(operationType == OperationType.INSERT){ + try { + entity.getClass().getDeclaredMethod("setCreateTime",LocalDateTime.class).invoke(entity,now); + entity.getClass().getDeclaredMethod("setUpdateTime",LocalDateTime.class).invoke(entity,now); + entity.getClass().getDeclaredMethod("setCreateUser",Long.class).invoke(entity,currentId); + entity.getClass().getDeclaredMethod("setUpdateUser",Long.class).invoke(entity,currentId); + } catch (Exception e) { + e.printStackTrace(); + } + } + else if(operationType == OperationType.UPDATE){ + try { + entity.getClass().getDeclaredMethod("setUpdateTime",LocalDateTime.class).invoke(entity,now); + entity.getClass().getDeclaredMethod("setUpdateUser",Long.class).invoke(entity,currentId); + } catch (Exception e) { + e.printStackTrace(); + } + + } + + } + + +} diff --git a/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/mapper/CategoryMapper.java b/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/mapper/CategoryMapper.java index 56a34fd..ad2c36f 100644 --- a/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/mapper/CategoryMapper.java +++ b/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/mapper/CategoryMapper.java @@ -1,6 +1,7 @@ package com.sky.mapper; import com.github.pagehelper.Page; +import com.sky.annotation.AutoFill; import com.sky.enumeration.OperationType; import com.sky.dto.CategoryPageQueryDTO; import com.sky.entity.Category; @@ -19,6 +20,7 @@ public interface CategoryMapper { @Insert("insert into category(type, name, sort, status, create_time, update_time, create_user, update_user)" + " VALUES" + " (#{type}, #{name}, #{sort}, #{status}, #{createTime}, #{updateTime}, #{createUser}, #{updateUser})") + @AutoFill(value = OperationType.INSERT) void insert(Category category); /** @@ -39,6 +41,7 @@ public interface CategoryMapper { * 根据id修改分类 * @param category */ + @AutoFill(value = OperationType.UPDATE) void update(Category category); /** diff --git a/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/mapper/EmployeeMapper.java b/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/mapper/EmployeeMapper.java index 6f0da1b..4ef844e 100644 --- a/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/mapper/EmployeeMapper.java +++ b/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/mapper/EmployeeMapper.java @@ -1,8 +1,10 @@ package com.sky.mapper; import com.github.pagehelper.Page; +import com.sky.annotation.AutoFill; import com.sky.dto.EmployeePageQueryDTO; import com.sky.entity.Employee; +import com.sky.enumeration.OperationType; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; @@ -22,12 +24,13 @@ public interface EmployeeMapper { @Insert("insert into employee (name, username, password, phone, sex, id_number, create_time, update_time, create_user, update_user,status) " + "values "+ "(#{name},#{username},#{password},#{phone},#{sex},#{idNumber},#{createTime},#{updateTime},#{createUser},#{updateUser},#{status})" ) + @AutoFill(value = OperationType.INSERT) void insert(Employee employee); Page pageQuery(EmployeePageQueryDTO employeePageQueryDTO); - + @AutoFill(value = OperationType.UPDATE) void update(Employee employee); @Select("select * from employee where id = #{id}") diff --git a/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/service/impl/CategoryServiceImpl.java b/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/service/impl/CategoryServiceImpl.java index 1c98f80..c74c9cf 100644 --- a/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/service/impl/CategoryServiceImpl.java +++ b/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/service/impl/CategoryServiceImpl.java @@ -47,11 +47,11 @@ public class CategoryServiceImpl implements CategoryService { //分类状态默认为禁用状态0 category.setStatus(StatusConstant.DISABLE); - //设置创建时间、修改时间、创建人、修改人 - category.setCreateTime(LocalDateTime.now()); - category.setUpdateTime(LocalDateTime.now()); - category.setCreateUser(BaseContext.getCurrentId()); - category.setUpdateUser(BaseContext.getCurrentId()); +// //设置创建时间、修改时间、创建人、修改人 +// category.setCreateTime(LocalDateTime.now()); +// category.setUpdateTime(LocalDateTime.now()); +// category.setCreateUser(BaseContext.getCurrentId()); +// category.setUpdateUser(BaseContext.getCurrentId()); categoryMapper.insert(category); } @@ -99,9 +99,9 @@ public class CategoryServiceImpl implements CategoryService { Category category = new Category(); BeanUtils.copyProperties(categoryDTO,category); - //设置修改时间、修改人 - category.setUpdateTime(LocalDateTime.now()); - category.setUpdateUser(BaseContext.getCurrentId()); +// //设置修改时间、修改人 +// category.setUpdateTime(LocalDateTime.now()); +// category.setUpdateUser(BaseContext.getCurrentId()); categoryMapper.update(category); } @@ -115,8 +115,8 @@ public class CategoryServiceImpl implements CategoryService { Category category = Category.builder() .id(id) .status(status) - .updateTime(LocalDateTime.now()) - .updateUser(BaseContext.getCurrentId()) +// .updateTime(LocalDateTime.now()) +// .updateUser(BaseContext.getCurrentId()) .build(); categoryMapper.update(category); } diff --git a/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/service/impl/EmployeeServiceImpl.java b/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/service/impl/EmployeeServiceImpl.java index 13bd853..c86ca15 100644 --- a/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/service/impl/EmployeeServiceImpl.java +++ b/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/service/impl/EmployeeServiceImpl.java @@ -76,13 +76,13 @@ public class EmployeeServiceImpl implements EmployeeService { employee.setStatus(StatusConstant.ENABLE); // 设置默认密码 employee.setPassword(DigestUtils.md5DigestAsHex(PasswordConstant.DEFAULT_PASSWORD.getBytes())); -// 设置当前创建时间和修改时间 - employee.setCreateTime(LocalDateTime.now()); - employee.setUpdateTime(LocalDateTime.now()); -// 设置当前记录创建人的id和修改人的值 - - employee.setCreateUser(BaseContext.getCurrentId()); - employee.setUpdateUser(BaseContext.getCurrentId()); +//// 设置当前创建时间和修改时间 +// employee.setCreateTime(LocalDateTime.now()); +// employee.setUpdateTime(LocalDateTime.now()); +//// 设置当前记录创建人的id和修改人的值 +// +// employee.setCreateUser(BaseContext.getCurrentId()); +// employee.setUpdateUser(BaseContext.getCurrentId()); employeeMapper.insert(employee); } @@ -122,8 +122,8 @@ public class EmployeeServiceImpl implements EmployeeService { Employee employee = new Employee(); BeanUtils.copyProperties(employeeDTO,employee); - employee.setUpdateTime(LocalDateTime.now()); - employee.setUpdateUser(BaseContext.getCurrentId()); +// employee.setUpdateTime(LocalDateTime.now()); +// employee.setUpdateUser(BaseContext.getCurrentId()); employeeMapper.update(employee); }