delete .idea file

bugfix:读取描述时会读取下一行
bugfix merge remote了以后出现了玄学问题，服了
2023-12-04 02:01:09 +08:00 · 2023-06-25 13:18:24 +08:00 · 2023-06-25 12:01:53 +08:00 · 2023-06-22 00:16:22 +08:00 · 2023-06-22 00:16:01 +08:00 · 2023-06-22 00:05:02 +08:00
11 changed files with 35 additions and 191 deletions
--- a/.gitignore
+++ b/.gitignore
@ -3,8 +3,8 @@ target/
 !**/src/main/**/target/
 !**/src/test/**/target/
 node_modules/
-
 ### IntelliJ IDEA ###
+.idea/
 .idea/libraries/
 .idea/encodings.xml
 .idea/misc.xml
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@ -1,12 +0,0 @@
-<?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>
--- a/.idea/sqldialects.xml
+++ b/.idea/sqldialects.xml
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="SqlDialectMappings">
-    <file url="PROJECT" dialect="TSQL" />
-  </component>
-</project>
--- a/.idea/uiDesigner.xml
+++ b/.idea/uiDesigner.xml
@ -1,124 +0,0 @@
-<?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>
--- a/JDBC/src/main/java/view/IndentItemView.java
+++ b/JDBC/src/main/java/view/IndentItemView.java
@ -30,38 +30,20 @@ public class IndentItemView {
        int flag = 0;
        while (!reader.hasNext("end")) {
            IndentItem IItem = new IndentItem();
-            String s;
-            String[] sn;
-            while (!reader.hasNext("end")) {
-                s = reader.nextLine();
-                sn = s.split("\\s+");
-                //菜名
-                IItem.setName(sn[0]);
-                //初始价格
-                IItem.setInitialPrice(Float.valueOf(sn[1]));
-                //折扣
-                if (sn[3] != null) {
-                    IItem.setDiscount(Float.valueOf(sn[2]));
-                } 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") && !reader.hasNext(" ")) {
+                IItem.setDescription(reader.next());
            }
-//            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
            indentDAO indent = new indentDAO();
            IItem.setIndentID(indent.searchID(indentID));
--- a/README.md
+++ b/README.md
@ -1,12 +1,21 @@
 # Homework
 - - -
-**Last Update Time : 2023-05-07 21:06**
+**Last Update Time : 2023-06-22 00:09**

 日志文件：`log.md`
 - - -
-### 运行方式：
+## 前端运行方式
 ```text
-src -> main -> java -> example -> App.run()
+UI -> package.json -> run dev
+```
+### 待修复bug
+> 必须在地址栏手动输入路由地址
+
+如：`localhost:5173/pages/index.html`
+
+## 后端运行方式：
+```text
+JDBC-> src -> main -> java -> example -> App.run()
 ```
 ### 待修复bug
 - `userDAO`和`merchantsDAO`中`update`语句未传参
--- a/UI/css/output.css
+++ b/UI/css/output.css
@ -1107,7 +1107,7 @@ video {
 }

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

 .bg-cover {
--- a/UI/pages/payment.html
+++ b/UI/pages/payment.html
@ -50,11 +50,11 @@
        <!--支付方式-->
        <ul class="w-full">
            <li class="PayWay">
-                <img class="w-[33vw] h-[8.9vw]" src="../assets/images/alipay.png"/>
-                <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>
+                <img class="w-[33vw] h-[8.9vw]" src="../assets/images/alipay.png" alt=""/>
+                <br>
            </li>
            <li class="PayWay">
-                <img class="w-[33vw] h-[8.9vw]" src="../assets/images/wechat.png" />
+                <img class="w-[33vw] h-[8.9vw]" src="../assets/images/wechat.png"  alt=""/>
            </li>
        </ul>
        <div class="w-full flex-col h-30 flex box-border pt-[4vw] px-[3vw] pb-0 justify-center items-center">
--- a/UI/tailwind.config.js
+++ b/UI/tailwind.config.js
@ -1,7 +1,6 @@
 module.exports = {
  content: [
-    "./index.html",
-    "./*.html",
+    "./pages/index.html",
    "./pages/*.html",
  ],
  theme: {
--- a/log.md
+++ b/log.md
@ -1,6 +1,10 @@
 # Homework

 *网安实训作业*
+## 203-06-22
+前端结束了。。。
+叭。。。
+
 ## 2023-06-15
 前端开始了！！！
Author	SHA1	Message	Date
myh	87731a1e2c	delete .idea file	2023-12-04 02:01:09 +08:00
twinkle255	a773d804f8	bugfix:读取描述时会读取下一行	2023-06-25 13:18:24 +08:00
twinkle255	52c3c4fd50	bugfix merge remote了以后出现了玄学问题，服了	2023-06-25 12:01:53 +08:00
twinkle255	131e44eac3	自述文件和日志更新	2023-06-22 00:16:22 +08:00
twinkle255	2a6c850548	bug fix	2023-06-22 00:16:01 +08:00
twinkle255	3fea3ed181	忽略提交node_modules	2023-06-22 00:05:02 +08:00
myh	ca1f8e8338	忽略文件更新	2023-06-21 17:43:18 +08:00
myh	6f223e2276	修改了个小bug	2023-06-21 17:32:33 +08:00
myh	9a9dc34987	修改了个小bug	2023-06-21 17:32:03 +08:00
myh	d7f53e5d15	Merge remote-tracking branch 'GiteeElm/20172' into 20172	2023-06-21 17:24:03 +08:00
myh	3d5798330d	改了页面好多bug，整合了一部分代码，提高了代码复用性	2023-06-21 17:16:37 +08:00
twinkle255	81ea40ddcf	小bug修改，添加了整理了scss样式	2023-06-21 00:02:09 +08:00
twinkle255	511a8b2eaa	项目基本完成	2023-06-20 23:35:50 +08:00
myh	36fb46cdf8	日志更新	2023-06-15 21:23:47 +08:00
myh	07fe182f01	项目初始化	2023-06-15 21:21:48 +08:00
myh	bcb0a13caf	项目目录修改	2023-06-08 02:14:20 +08:00
myh	a3275155bf	项目目录修改	2023-06-07 19:43:45 +08:00
myh	b0e70dc3eb	小bug修改	2023-05-14 21:48:59 +08:00
twinkle255	1fbd2a6553	完善DAO层，重构代码，添加了登录功能，修改了一堆bug，具体见日志	2023-05-07 21:07:58 +08:00
twinkle255	96d55c83c3	重构代码，DAO层全部完成	2023-05-07 14:29:18 +08:00
twinkle255	f9c276e0ed	Bug fixed，调整了项目结构。还有就是我恨DDL	2023-05-05 23:09:56 +08:00
twinkle255	3dc0a891fb	Bug Fixed。完成ShellUI、UserDAO、merchantsDAO，测试通过	2023-05-05 20:06:44 +08:00
twinkle255	135e2156dd	UserDAO以及MerchantsDAO抽象接口的实现，ShellUI的部分功能	2023-05-05 14:18:39 +08:00