Compare commits

..

No commits in common. "87731a1e2c7dd1142d7431ad28007c05f63ed373" and "e2b274abbd2a368f32fcc414a534d6f51df699ff" have entirely different histories.

11 changed files with 191 additions and 35 deletions

2
.gitignore vendored
View File

@ -3,8 +3,8 @@ target/
!**/src/main/**/target/ !**/src/main/**/target/
!**/src/test/**/target/ !**/src/test/**/target/
node_modules/ node_modules/
### IntelliJ IDEA ### ### IntelliJ IDEA ###
.idea/
.idea/libraries/ .idea/libraries/
.idea/encodings.xml .idea/encodings.xml
.idea/misc.xml .idea/misc.xml

8
.idea/.gitignore vendored Normal file
View File

@ -0,0 +1,8 @@
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

12
.idea/dataSources.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DataSourceManagerImpl" format="xml" multifile-model="true">
<data-source source="LOCAL" name="152.136.182.168" uuid="b6419c62-9b1f-4a23-92b1-d7ccf4edfa97">
<driver-ref>sqlserver.ms</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc-driver>
<jdbc-url>jdbc:sqlserver://152.136.182.168;database=Elm</jdbc-url>
<working-dir>$ProjectFileDir$</working-dir>
</data-source>
</component>
</project>

6
.idea/sqldialects.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="SqlDialectMappings">
<file url="PROJECT" dialect="TSQL" />
</component>
</project>

124
.idea/uiDesigner.xml Normal file
View File

@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Palette2">
<group name="Swing">
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
</item>
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
</item>
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
</item>
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
<initial-values>
<property name="text" value="Button" />
</initial-values>
</item>
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="RadioButton" />
</initial-values>
</item>
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="CheckBox" />
</initial-values>
</item>
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
<initial-values>
<property name="text" value="Label" />
</initial-values>
</item>
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
</item>
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
</item>
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
<preferred-size width="-1" height="20" />
</default-constraints>
</item>
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
</item>
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
</item>
</group>
</component>
</project>

View File

@ -30,20 +30,38 @@ public class IndentItemView {
int flag = 0; int flag = 0;
while (!reader.hasNext("end")) { while (!reader.hasNext("end")) {
IndentItem IItem = new IndentItem(); IndentItem IItem = new IndentItem();
//菜名 String s;
IItem.setName(reader.next()); String[] sn;
//初始价格 while (!reader.hasNext("end")) {
IItem.setInitialPrice(reader.nextFloat()); s = reader.nextLine();
//折扣 sn = s.split("\\s+");
if (reader.hasNextFloat()) { //菜名
IItem.setDiscount(reader.nextFloat()); IItem.setName(sn[0]);
} else { //初始价格
IItem.setDiscount(-1F); IItem.setInitialPrice(Float.valueOf(sn[1]));
} //折扣
//描述 if (sn[3] != null) {
if (!reader.hasNext("end") && !reader.hasNext(" ")) { IItem.setDiscount(Float.valueOf(sn[2]));
IItem.setDescription(reader.next()); } else {
IItem.setDiscount(-1F);
}
//描述
if (sn[3] != null) {
IItem.setDescription(sn[3]);
}
} }
// IItem.setName(reader.next());
// IItem.setInitialPrice(reader.nextFloat());
// if (reader.hasNextFloat()) {
// IItem.setDiscount(reader.nextFloat());
// } else {
// IItem.setDiscount(-1F);
// }
// if (!reader.hasNext("end") && !Objects.equals(reader.nextLine(), " ")) {
// IItem.setDescription(reader.nextLine());
// }
//菜单ID //菜单ID
indentDAO indent = new indentDAO(); indentDAO indent = new indentDAO();
IItem.setIndentID(indent.searchID(indentID)); IItem.setIndentID(indent.searchID(indentID));

View File

@ -1,21 +1,12 @@
# Homework # Homework
- - - - - -
**Last Update Time : 2023-06-22 00:09** **Last Update Time : 2023-05-07 21:06**
日志文件:`log.md` 日志文件:`log.md`
- - - - - -
## 前端运行方式 ### 运行方式
```text ```text
UI -> package.json -> run dev src -> main -> java -> example -> App.run()
```
### 待修复bug
> 必须在地址栏手动输入路由地址
如:`localhost:5173/pages/index.html`
## 后端运行方式:
```text
JDBC-> src -> main -> java -> example -> App.run()
``` ```
### 待修复bug ### 待修复bug
- `userDAO`和`merchantsDAO`中`update`语句未传参 - `userDAO`和`merchantsDAO`中`update`语句未传参

View File

@ -1107,7 +1107,7 @@ video {
} }
.bg-\[url\(\'\/src\/assets\/img\/index_banner\.png\'\)\] { .bg-\[url\(\'\/src\/assets\/img\/index_banner\.png\'\)\] {
background-image: url('../assets/images/index_banner.png'); background-image: url('/src/assets/img/index_banner.png');
} }
.bg-cover { .bg-cover {

View File

@ -50,11 +50,11 @@
<!--支付方式--> <!--支付方式-->
<ul class="w-full"> <ul class="w-full">
<li class="PayWay"> <li class="PayWay">
<img class="w-[33vw] h-[8.9vw]" src="../assets/images/alipay.png" alt=""/> <img class="w-[33vw] h-[8.9vw]" src="../assets/images/alipay.png"/>
<br> <svg class="text-[#38CA73FF]" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24"><path fill="currentColor" d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10s10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5l1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"/></svg>
</li> </li>
<li class="PayWay"> <li class="PayWay">
<img class="w-[33vw] h-[8.9vw]" src="../assets/images/wechat.png" alt=""/> <img class="w-[33vw] h-[8.9vw]" src="../assets/images/wechat.png" />
</li> </li>
</ul> </ul>
<div class="w-full flex-col h-30 flex box-border pt-[4vw] px-[3vw] pb-0 justify-center items-center"> <div class="w-full flex-col h-30 flex box-border pt-[4vw] px-[3vw] pb-0 justify-center items-center">

View File

@ -1,6 +1,7 @@
module.exports = { module.exports = {
content: [ content: [
"./pages/index.html", "./index.html",
"./*.html",
"./pages/*.html", "./pages/*.html",
], ],
theme: { theme: {

4
log.md
View File

@ -1,10 +1,6 @@
# Homework # Homework
*网安实训作业* *网安实训作业*
## 203-06-22
前端结束了。。。
叭。。。
## 2023-06-15 ## 2023-06-15
前端开始了!!! 前端开始了!!!