From b19ae3a48a4d3a66100765a77d3bf68341ac7b40 Mon Sep 17 00:00:00 2001 From: Asur <1105713970@qq.com> Date: Tue, 16 Apr 2024 11:29:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?branch=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 51 ++++++++++------ .idea/.gitignore | 8 +++ .idea/.name | 1 + .idea/encodings.xml | 9 +++ .idea/misc.xml | 16 +++++ .idea/vcs.xml | 6 ++ README.en.md | 36 ----------- README.md | 40 ------------- maven_web/pom.xml | 59 +++++++++++++++++++ .../com/jisuanji/branch/branch.example.java | 6 ++ .../main/java/com/jisuanji/maven/Main.java | 19 ++++++ maven_web/src/main/webapp/WEB-INF/index.html | 14 +++++ maven_web/src/main/webapp/WEB-INF/web.xml | 6 ++ maven_web/src/test/java/test.java | 9 +++ pom.xml | 21 +++++++ src/main/java/com/jisuanji/maven/Main.java | 23 ++++++++ 16 files changed, 230 insertions(+), 94 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/.name create mode 100644 .idea/encodings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/vcs.xml delete mode 100644 README.en.md delete mode 100644 README.md create mode 100644 maven_web/pom.xml create mode 100644 maven_web/src/main/java/com/jisuanji/branch/branch.example.java create mode 100644 maven_web/src/main/java/com/jisuanji/maven/Main.java create mode 100644 maven_web/src/main/webapp/WEB-INF/index.html create mode 100644 maven_web/src/main/webapp/WEB-INF/web.xml create mode 100644 maven_web/src/test/java/test.java create mode 100644 pom.xml create mode 100644 src/main/java/com/jisuanji/maven/Main.java diff --git a/.gitignore b/.gitignore index a1c2a23..5ff6309 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,38 @@ -# Compiled class file -*.class +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ -# Log file -*.log +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr -# BlueJ files -*.ctxt +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache -# Mobile Tools for Java (J2ME) -.mtj.tmp/ +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar +### VS Code ### +.vscode/ -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -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 diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..99e944e --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +maven_test \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..041c81f --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..5d930b2 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + \ 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/README.en.md b/README.en.md deleted file mode 100644 index bd2cb73..0000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# 软件开发与管理 - -#### Description -{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**} - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index d63e54d..0000000 --- a/README.md +++ /dev/null @@ -1,40 +0,0 @@ -# 软件开发与管理课程 - Java EE - -## 基于Maven的JavaSE项目 - -#### 介绍 -在IDEA中创建基于Maven的JavaSE或Web项目，实现任意功能，并完成以下Maven功能的验证： - -* 添加JUnit（版本不限）依赖，指定Scope。 -* 运行Maven测试 -* 部署运行项目 -* 使用Javadoc插件生成项目文档 - - -## 基于Model2的登录功能 - -#### 介绍 -基于Model2的登录功能 -包括： -* 页面：Login.jsp，LoginSuccess(main).jsp -* Java类：LoginServlet.java，User.java -* 数据库：user表 - -## 基于Filter的用户登录验证 - -#### 介绍 -- 类：LoginFilter.java -- 要求：退出系统后不能访问main.jsp，跳转到login.jsp -- 方法：点击退出，清除session - -更复杂的验证例子，参考 -http://www.cnblogs.com/coderland/p/5902878.html - - -## 基于Listener完成在线人数和登陆用户统计 - -#### 介绍 -- 要求：显示在线人数和登陆用户数 -- 方法： -1. 使用监听器（HttpSessionListener）完成功能 -2. 加入用户退出功能 diff --git a/maven_web/pom.xml b/maven_web/pom.xml new file mode 100644 index 0000000..ed294a2 --- /dev/null +++ b/maven_web/pom.xml @@ -0,0 +1,59 @@ + + + 4.0.0 + + com.jisuanji.maven + maven_test + 1.0-SNAPSHOT + + war + + maven_web + + + 8 + 8 + UTF-8 + + + + org.junit.jupiter + junit-jupiter-api + 5.8.2 + test + + + org.testng + testng + RELEASE + compile + + + + org.projectlombok + lombok + 1.18.24 + provided + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.3.0 + + + generate-javadoc + prepare-package + + javadoc + + + + + + + \ No newline at end of file diff --git a/maven_web/src/main/java/com/jisuanji/branch/branch.example.java b/maven_web/src/main/java/com/jisuanji/branch/branch.example.java new file mode 100644 index 0000000..34c6de3 --- /dev/null +++ b/maven_web/src/main/java/com/jisuanji/branch/branch.example.java @@ -0,0 +1,6 @@ +import com.jisuanji.branch; + +public class branch{ + +} + diff --git a/maven_web/src/main/java/com/jisuanji/maven/Main.java b/maven_web/src/main/java/com/jisuanji/maven/Main.java new file mode 100644 index 0000000..82966db --- /dev/null +++ b/maven_web/src/main/java/com/jisuanji/maven/Main.java @@ -0,0 +1,19 @@ +package com.jisuanji.maven; + +// Press Shift twice to open the Search Everywhere dialog and type `show whitespaces`, +// then press Enter. You can now see whitespace characters in your code. +public class Main { + public static void main(String[] args) { + // Press Alt+Enter with your caret at the highlighted text to see how + // IntelliJ IDEA suggests fixing it. + System.out.printf("Hello and welcome!"); + + // Press Shift+F10 or click the green arrow button in the gutter to run the code. + for (int i = 1; i <= 5; i++) { + + // Press Shift+F9 to start debugging your code. We have set one breakpoint + // for you, but you can always add more by pressing Ctrl+F8. + System.out.println("i = " + i); + } + } +} \ No newline at end of file diff --git a/maven_web/src/main/webapp/WEB-INF/index.html b/maven_web/src/main/webapp/WEB-INF/index.html new file mode 100644 index 0000000..81c3757 --- /dev/null +++ b/maven_web/src/main/webapp/WEB-INF/index.html @@ -0,0 +1,14 @@ + + + + + 首页 + + +

学号：32309232

+

姓名：阿斯布尔

+

专业：人工智能

+

提交修改

+ + + diff --git a/maven_web/src/main/webapp/WEB-INF/web.xml b/maven_web/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..d80081d --- /dev/null +++ b/maven_web/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,6 @@ + + + \ No newline at end of file diff --git a/maven_web/src/test/java/test.java b/maven_web/src/test/java/test.java new file mode 100644 index 0000000..0576640 --- /dev/null +++ b/maven_web/src/test/java/test.java @@ -0,0 +1,9 @@ +import org.junit.jupiter.api.Assertions; + +public class test { + public static void main(String[] args) { + int a=50; + int b=40; + Assertions.assertEquals(a+b,100); + } +} diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..283d15e --- /dev/null +++ b/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + com.jisuanji.maven + maven_test + 1.0-SNAPSHOT + pom + + maven_web + + + + 8 + 8 + UTF-8 + + + \ No newline at end of file diff --git a/src/main/java/com/jisuanji/maven/Main.java b/src/main/java/com/jisuanji/maven/Main.java new file mode 100644 index 0000000..9bc4b62 --- /dev/null +++ b/src/main/java/com/jisuanji/maven/Main.java @@ -0,0 +1,23 @@ +package com.jisuanji.maven; + +// Press Shift twice to open the Search Everywhere dialog and type `show whitespaces`, +// then press Enter. You can now see whitespace characters in your code. +public class Main { + public static void main(String[] args) { + // Press Alt+Enter with your caret at the highlighted text to see how + // IntelliJ IDEA suggests fixing it. + System.out.printf("Hello and welcome!"); + + // Press Shift+F10 or click the green arrow button in the gutter to run the code. + for (int i = 1; i <= 5; i++) { + + // Press Shift+F9 to start debugging your code. We have set one breakpoint + // for you, but you can always add more by pressing Ctrl+F8. + System.out.println("i = " + i); + } + } + + public void example() { + System.out.printf("本功能由branch添加"); + } +} \ No newline at end of file -- Gitee From 7836e687d348912c166fdfc10afbe22cd1c664b7 Mon Sep 17 00:00:00 2001 From: Asur <1105713970@qq.com> Date: Tue, 16 Apr 2024 11:30:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?branch=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jisuanji/branch/branch.example.java | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 maven_web/src/main/java/com/jisuanji/branch/branch.example.java diff --git a/maven_web/src/main/java/com/jisuanji/branch/branch.example.java b/maven_web/src/main/java/com/jisuanji/branch/branch.example.java deleted file mode 100644 index 34c6de3..0000000 --- a/maven_web/src/main/java/com/jisuanji/branch/branch.example.java +++ /dev/null @@ -1,6 +0,0 @@ -import com.jisuanji.branch; - -public class branch{ - -} - -- Gitee