From 2501b43fcc3fde4ab361505e86855049e4649819 Mon Sep 17 00:00:00 2001 From: twinkle255 Date: Thu, 16 Mar 2023 00:50:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9README=EF=BC=8C=E9=A1=BA?= =?UTF-8?q?=E4=BE=BF=E6=B5=8B=E8=AF=95=E4=B8=80=E4=B8=8B=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 ++++- src/main/java/org/example/App.java | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f12bb70..8058fdb 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,5 @@ # Homework-Ele -网安实训作业，”山寨”饿了么 +*网安实训作业* + +20230316 +- 初始化项目 diff --git a/src/main/java/org/example/App.java b/src/main/java/org/example/App.java index 5f21d2e..a51a427 100644 --- a/src/main/java/org/example/App.java +++ b/src/main/java/org/example/App.java @@ -6,8 +6,7 @@ package org.example; */ public class App { - public static void main( String[] args ) - { + public static void main( String[] args ) { System.out.println( "Hello World!" ); } } From 018517af50c86ad8f2cc2f4995684cfa1ba8d737 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=9F=E4=BA=91=E6=B5=A9?= Date: Wed, 22 Mar 2023 09:10:15 +0000 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20.ide?= =?UTF-8?q?a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 8 -------- .idea/encodings.xml | 7 ------- .idea/misc.xml | 14 -------------- .idea/vcs.xml | 6 ------ 4 files changed, 35 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 35410ca..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# 默认忽略的文件 -/shelf/ -/workspace.xml -# 基于编辑器的 HTTP 客户端请求 -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index aa00ffa..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index adef0fb..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From cca9181b72b37039e204481042b1345e7c503317 Mon Sep 17 00:00:00 2001 From: twinkle255 Date: Sun, 26 Mar 2023 21:38:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 9 +++++++-- src/main/java/entities/Indent.java | 14 ++++++++++++++ src/main/java/entities/Merchants.java | 14 ++++++++++++++ src/main/java/entities/Users.java | 12 ++++++++++++ src/main/java/entities/indentItem.java | 11 +++++++++++ src/main/java/org/example/App.java | 8 +++----- 6 files changed, 61 insertions(+), 7 deletions(-) create mode 100644 src/main/java/entities/Indent.java create mode 100644 src/main/java/entities/Merchants.java create mode 100644 src/main/java/entities/Users.java create mode 100644 src/main/java/entities/indentItem.java diff --git a/README.md b/README.md index 8058fdb..05d692e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,10 @@ -# Homework-Ele +# Homework-entities *网安实训作业* -20230316 +# 20230316 - 初始化项目 +# 20230322 +- 增加实体类 +- 删除.idea文件 +# 20230326 +- 完善实体类 diff --git a/src/main/java/entities/Indent.java b/src/main/java/entities/Indent.java new file mode 100644 index 0000000..75cd81b --- /dev/null +++ b/src/main/java/entities/Indent.java @@ -0,0 +1,14 @@ +package entities; + +import lombok.Data; + +//订单类 +@Data +public class Indent { + private Long id;//订单ID + private indentItem indentItemID;//外键，菜品ID + private Users userID;//外键，下单用户ID + private Merchants merchantsID;//外键，餐厅ID + private Float allPrice;//菜品总价 + +} diff --git a/src/main/java/entities/Merchants.java b/src/main/java/entities/Merchants.java new file mode 100644 index 0000000..750d86a --- /dev/null +++ b/src/main/java/entities/Merchants.java @@ -0,0 +1,14 @@ +package entities; + +import lombok.Data; + +//商家类 +@Data +public class Merchants { + private Long id;//商家编号 + private String name;//店铺名字 + private String address;//店铺地址 + private Indent IndentID;//外键，订单ID + + +} diff --git a/src/main/java/entities/Users.java b/src/main/java/entities/Users.java new file mode 100644 index 0000000..4d1d91f --- /dev/null +++ b/src/main/java/entities/Users.java @@ -0,0 +1,12 @@ +package entities; + +import lombok.Data; + +//用户类 +@Data +public class Users { + private Long id; + private String name;//用户姓名 + private String phoneNumber;//用户联系方式 + private String address;//家庭住址 +} diff --git a/src/main/java/entities/indentItem.java b/src/main/java/entities/indentItem.java new file mode 100644 index 0000000..a4b12a2 --- /dev/null +++ b/src/main/java/entities/indentItem.java @@ -0,0 +1,11 @@ +package entities; + +import lombok.Data; + +@Data +public class indentItem { + private Long id;//菜品ID + private String name;//菜品名字 + private Float price;//菜品价格 + private String description;//菜品描述 +} diff --git a/src/main/java/org/example/App.java b/src/main/java/org/example/App.java index a51a427..38c5eef 100644 --- a/src/main/java/org/example/App.java +++ b/src/main/java/org/example/App.java @@ -2,11 +2,9 @@ package org.example; /** * Hello world! - * */ -public class App -{ - public static void main( String[] args ) { - System.out.println( "Hello World!" ); +public class App { + public static void main(String[] args) { + System.out.println("Hello World!"); } } From 2dde2403268624ac302665c5e923c84bb65ae2d6 Mon Sep 17 00:00:00 2001 From: twinkle255 Date: Sun, 26 Mar 2023 21:47:32 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/encodings.xml | 7 ++ .idea/misc.xml | 14 ++++ .idea/vcs.xml | 6 ++ .idea/workspace.xml | 197 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 224 insertions(+) create mode 100644 .idea/encodings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..aa00ffa --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..adef0fb --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..5e70234 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,197 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + C:\Users\subtle moon\AppData\Roaming\Subversion + + + + + 1678892387293 + + + 1678892550428 + + + 1678896264106 + + + 1678899023878 + + + 1678899528345 + + + 1679837922502 + + + + + + + + + + + + + + + \ No newline at end of file