Merge branch '20172'
# Conflicts: # README.md # src/main/java/org/example/App.java
This commit is contained in:
twinkle255
commit
9ae538fdb3
8
.idea/.gitignore
generated
vendored
8
.idea/.gitignore
generated
vendored
@ -1,8 +0,0 @@
|
||||
# 默认忽略的文件
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
# 基于编辑器的 HTTP 客户端请求
|
||||
/httpRequests/
|
||||
# Datasource local storage ignored files
|
||||
/dataSources/
|
||||
/dataSources.local.xml
|
||||
197
.idea/workspace.xml
generated
Normal file
197
.idea/workspace.xml
generated
Normal file
@ -0,0 +1,197 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="AutoImportSettings">
|
||||
<option name="autoReloadType" value="SELECTIVE" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="9e837299-3ff7-44a4-ad1c-8ef52c6303b1" name="变更" comment="修改完善实体类" />
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||
</component>
|
||||
<component name="FileTemplateManagerImpl">
|
||||
<option name="RECENT_TEMPLATES">
|
||||
<list>
|
||||
<option value="Class" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
<excluded-from-favorite>
|
||||
<branch-storage>
|
||||
<map>
|
||||
<entry type="REMOTE">
|
||||
<value>
|
||||
<list>
|
||||
<branch-info repo="$PROJECT_DIR$" source="origin/master" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</branch-storage>
|
||||
</excluded-from-favorite>
|
||||
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
||||
<map>
|
||||
<entry key="$PROJECT_DIR$" value="20172" />
|
||||
</map>
|
||||
</option>
|
||||
<option name="RESET_MODE" value="MIXED" />
|
||||
</component>
|
||||
<component name="GithubDefaultAccount">
|
||||
<option name="defaultAccountId" value="390cb902-6305-4793-b9da-303abf343f13" />
|
||||
</component>
|
||||
<component name="MarkdownSettingsMigration">
|
||||
<option name="stateVersion" value="1" />
|
||||
</component>
|
||||
<component name="MavenImportPreferences">
|
||||
<option name="generalSettings">
|
||||
<MavenGeneralSettings>
|
||||
<option name="useMavenConfig" value="true" />
|
||||
</MavenGeneralSettings>
|
||||
</option>
|
||||
<option name="importingSettings">
|
||||
<MavenImportingSettings>
|
||||
<option name="workspaceImportEnabled" value="true" />
|
||||
</MavenImportingSettings>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectId" id="2N3UiHPYKaPHKzPkFhEQkXccC5Q" />
|
||||
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
||||
<component name="ProjectViewState">
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent"><![CDATA[{
|
||||
"keyToString": {
|
||||
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"SHARE_PROJECT_CONFIGURATION_FILES": "true",
|
||||
"WebServerToolWindowFactoryState": "false",
|
||||
"last_opened_file_path": "C:/_Codes/CodeFiles_IDEA/Project02/JavaEle",
|
||||
"node.js.detected.package.eslint": "true",
|
||||
"node.js.detected.package.tslint": "true",
|
||||
"node.js.selected.package.eslint": "(autodetect)",
|
||||
"node.js.selected.package.tslint": "(autodetect)",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"settings.editor.selected.configurable": "preferences.lookFeel",
|
||||
"vue.rearranger.settings.migration": "true"
|
||||
}
|
||||
}]]></component>
|
||||
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
|
||||
<component name="SvnConfiguration">
|
||||
<configuration>C:\Users\subtle moon\AppData\Roaming\Subversion</configuration>
|
||||
</component>
|
||||
<component name="TaskManager">
|
||||
<task active="true" id="Default" summary="默认任务">
|
||||
<changelist id="9e837299-3ff7-44a4-ad1c-8ef52c6303b1" name="变更" comment="" />
|
||||
<created>1678892387293</created>
|
||||
<option name="number" value="Default" />
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1678892387293</updated>
|
||||
<workItem from="1678892388346" duration="4040000" />
|
||||
<workItem from="1678897062549" duration="2131000" />
|
||||
<workItem from="1678899224230" duration="899000" />
|
||||
<workItem from="1679472958970" duration="421000" />
|
||||
<workItem from="1679473394519" duration="2779000" />
|
||||
<workItem from="1679476329767" duration="1665000" />
|
||||
<workItem from="1679825333033" duration="4243000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="初始化项目">
|
||||
<created>1678892550428</created>
|
||||
<option name="number" value="00001" />
|
||||
<option name="presentableId" value="LOCAL-00001" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1678892550428</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00002" summary="初始化">
|
||||
<created>1678896264106</created>
|
||||
<option name="number" value="00002" />
|
||||
<option name="presentableId" value="LOCAL-00002" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1678896264106</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00003" summary="修改README，顺便测试一下推送功能">
|
||||
<created>1678899023878</created>
|
||||
<option name="number" value="00003" />
|
||||
<option name="presentableId" value="LOCAL-00003" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1678899023878</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00004" summary="修改README">
|
||||
<created>1678899528345</created>
|
||||
<option name="number" value="00004" />
|
||||
<option name="presentableId" value="LOCAL-00004" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1678899528345</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00005" summary="修改完善实体类">
|
||||
<created>1679837922502</created>
|
||||
<option name="number" value="00005" />
|
||||
<option name="presentableId" value="LOCAL-00005" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1679837922502</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="6" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
<option name="version" value="3" />
|
||||
</component>
|
||||
<component name="Vcs.Log.Tabs.Properties">
|
||||
<option name="TAB_STATES">
|
||||
<map>
|
||||
<entry key="6283924f-d4c5-4581-9059-06fc02532ae9">
|
||||
<value>
|
||||
<State>
|
||||
<option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" />
|
||||
<option name="FILTERS">
|
||||
<map>
|
||||
<entry key="branch">
|
||||
<value>
|
||||
<list>
|
||||
<option value="HEAD" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="roots">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$PROJECT_DIR$" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</option>
|
||||
</State>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="MAIN">
|
||||
<value>
|
||||
<State>
|
||||
<option name="FILTERS">
|
||||
<map>
|
||||
<entry key="branch">
|
||||
<value>
|
||||
<list>
|
||||
<option value="20172" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</option>
|
||||
</State>
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</option>
|
||||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<MESSAGE value="初始化项目" />
|
||||
<MESSAGE value="初始化" />
|
||||
<MESSAGE value="修改README，顺便测试一下推送功能" />
|
||||
<MESSAGE value="修改README" />
|
||||
<MESSAGE value="修改完善实体类" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="修改完善实体类" />
|
||||
</component>
|
||||
</project>
|
||||
@ -1,6 +1,2 @@
|
||||
# Homework-Ele
|
||||
网安实训作业，”山寨”饿了么
|
||||
___
|
||||
__20230315__
|
||||
- 初始化项目
|
||||
- 上传到GitHub和Gitee
|
||||
14
src/main/java/entities/Indent.java
Normal file
14
src/main/java/entities/Indent.java
Normal file
@ -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;//菜品总价
|
||||
|
||||
}
|
||||
14
src/main/java/entities/Merchants.java
Normal file
14
src/main/java/entities/Merchants.java
Normal file
@ -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
|
||||
|
||||
|
||||
}
|
||||
12
src/main/java/entities/Users.java
Normal file
12
src/main/java/entities/Users.java
Normal file
@ -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;//家庭住址
|
||||
}
|
||||
11
src/main/java/entities/indentItem.java
Normal file
11
src/main/java/entities/indentItem.java
Normal file
@ -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;//菜品描述
|
||||
}
|
||||
@ -6,7 +6,8 @@ package org.example;
|
||||
*/
|
||||
public class App
|
||||
{
|
||||
public static void main( String[] args ) {
|
||||
public static void main( String[] args )
|
||||
{
|
||||
System.out.println( "Hello World!" );
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user