HelloWorld521 · tasnim-nz · Aug 21, 2025 · Aug 21, 2025 · Aug 21, 2025 · Aug 21, 2025
diff --git a/IMOOCSpider/.project b/IMOOCSpider/.project
@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1755784219326</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/JspChat/.project b/JspChat/.project
@@ -33,4 +33,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1755784219392</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/Kaptcha/.project b/Kaptcha/.project
@@ -33,4 +33,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1755784219419</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/ServletAjax/.project b/ServletAjax/.project
@@ -41,4 +41,15 @@
 		<nature>com.genuitec.eclipse.j2eedt.core.webnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1755784219483</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/ServletAjax/WebRoot/WEB-INF/classes/com/hjy/SearchServlet.class b/ServletAjax/WebRoot/WEB-INF/classes/com/hjy/SearchServlet.class
diff --git a/checkcode/.project b/checkcode/.project
@@ -33,4 +33,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1755784219512</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/estore/.project b/estore/.project
@@ -33,4 +33,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1755784219558</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/estore/build/classes/com/briup/bean/Book.class b/estore/build/classes/com/briup/bean/Book.class
diff --git a/estore/build/classes/com/briup/bean/BookMapper.class b/estore/build/classes/com/briup/bean/BookMapper.class
diff --git a/estore/build/classes/com/briup/bean/Customer.class b/estore/build/classes/com/briup/bean/Customer.class
diff --git a/estore/build/classes/com/briup/bean/CustomerMapper.class b/estore/build/classes/com/briup/bean/CustomerMapper.class
diff --git a/estore/build/classes/com/briup/bean/OrderLine.class b/estore/build/classes/com/briup/bean/OrderLine.class
diff --git a/estore/build/classes/com/briup/bean/OrderLineMapper.class b/estore/build/classes/com/briup/bean/OrderLineMapper.class
diff --git a/estore/build/classes/com/briup/bean/Orderform.class b/estore/build/classes/com/briup/bean/Orderform.class
diff --git a/estore/build/classes/com/briup/bean/OrderformMapper.class b/estore/build/classes/com/briup/bean/OrderformMapper.class
diff --git a/estore/build/classes/com/briup/bean/ShoppingCart.class b/estore/build/classes/com/briup/bean/ShoppingCart.class
diff --git a/estore/build/classes/com/briup/common/BeanFactory.class b/estore/build/classes/com/briup/common/BeanFactory.class
diff --git a/estore/build/classes/com/briup/common/MybatisSessionFactory.class b/estore/build/classes/com/briup/common/MybatisSessionFactory.class
diff --git a/estore/build/classes/com/briup/common/exception/CustomerServiceException.class b/estore/build/classes/com/briup/common/exception/CustomerServiceException.class
diff --git a/estore/build/classes/com/briup/common/exception/OrderServiceException.class b/estore/build/classes/com/briup/common/exception/OrderServiceException.class
diff --git a/estore/build/classes/com/briup/dao/ICustomerDao.class b/estore/build/classes/com/briup/dao/ICustomerDao.class
diff --git a/estore/build/classes/com/briup/dao/IOrderDao.class b/estore/build/classes/com/briup/dao/IOrderDao.class
diff --git a/estore/build/classes/com/briup/dao/impl/CustomerDaoImpl.class b/estore/build/classes/com/briup/dao/impl/CustomerDaoImpl.class
diff --git a/estore/build/classes/com/briup/dao/impl/OrderDaoImpl.class b/estore/build/classes/com/briup/dao/impl/OrderDaoImpl.class
diff --git a/estore/build/classes/com/briup/service/ICustomerService.class b/estore/build/classes/com/briup/service/ICustomerService.class
diff --git a/estore/build/classes/com/briup/service/IOrderService.class b/estore/build/classes/com/briup/service/IOrderService.class
diff --git a/estore/build/classes/com/briup/service/impl/CustomerServiceImpl.class b/estore/build/classes/com/briup/service/impl/CustomerServiceImpl.class
diff --git a/estore/build/classes/com/briup/service/impl/OrderServiceImpl.class b/estore/build/classes/com/briup/service/impl/OrderServiceImpl.class
diff --git a/estore/build/classes/com/briup/web/filter/AuthFilter.class b/estore/build/classes/com/briup/web/filter/AuthFilter.class
diff --git a/estore/build/classes/com/briup/web/filter/EncodeFilter.class b/estore/build/classes/com/briup/web/filter/EncodeFilter.class
diff --git a/estore/build/classes/com/briup/web/listener/ContextListener.class b/estore/build/classes/com/briup/web/listener/ContextListener.class
diff --git a/estore/build/classes/com/briup/web/listener/SessionListener.class b/estore/build/classes/com/briup/web/listener/SessionListener.class
diff --git a/estore/build/classes/com/briup/web/servlet/AddOrderLineServlet.class b/estore/build/classes/com/briup/web/servlet/AddOrderLineServlet.class
diff --git a/estore/build/classes/com/briup/web/servlet/LoginServlet.class b/estore/build/classes/com/briup/web/servlet/LoginServlet.class
diff --git a/estore/build/classes/com/briup/web/servlet/ModifiCartServlet.class b/estore/build/classes/com/briup/web/servlet/ModifiCartServlet.class
diff --git a/estore/build/classes/com/briup/web/servlet/RegisterServlet.class b/estore/build/classes/com/briup/web/servlet/RegisterServlet.class
diff --git a/estore/build/classes/com/briup/web/servlet/RemoveProductServlet.class b/estore/build/classes/com/briup/web/servlet/RemoveProductServlet.class
diff --git a/estore/build/classes/com/briup/web/servlet/SaveOrderServlet.class b/estore/build/classes/com/briup/web/servlet/SaveOrderServlet.class
diff --git a/estore/src/com/briup/web/servlet/Calculator.java b/estore/src/com/briup/web/servlet/Calculator.java
@@ -0,0 +1,22 @@
+public class Calculator {
+   /*  public int add(int a, int b) { 
+    return a + b + 10;   // modified in main branch
+}*/
+public int add(int a, int b) { 
+    return a + b + 5;   // modified in feature branch
+}
+
+
+
+
+    public int subtract(int a, int b) { 
+        return a - b; 
+    }
+    public int multiply(int a, int b) { 
+        return a * b; 
+    }
+    public int divide(int a, int b) {
+        if (b == 0) throw new IllegalArgumentException("Cannot divide by zero");
+        return a / b;
+    }
+}
diff --git a/estore/src/com/briup/web/servlet/Student.java b/estore/src/com/briup/web/servlet/Student.java
@@ -0,0 +1,18 @@
+public class Student {
+    private String name;
+    private int age;
+
+    // Constructor
+    public Student(String name, int age) {
+        this.name = name;
+        this.age = age;
+    }
+
+    // Getters
+    public String getName() { return name; }
+    public int getAge() { return age; }
+
+    // Setters
+    public void setName(String name) { this.name = name; }
+    public void setAge(int age) { this.age = age; }
+}
diff --git a/seckill/target/classes/org/seckill/dao/SeckillDao.class b/seckill/target/classes/org/seckill/dao/SeckillDao.class
diff --git a/seckill/target/classes/org/seckill/dao/SuccessKilledDao.class b/seckill/target/classes/org/seckill/dao/SuccessKilledDao.class
diff --git a/seckill/target/classes/org/seckill/dto/ExposerRsp.class b/seckill/target/classes/org/seckill/dto/ExposerRsp.class
diff --git a/seckill/target/classes/org/seckill/dto/SeckillExecutionRsp.class b/seckill/target/classes/org/seckill/dto/SeckillExecutionRsp.class
diff --git a/seckill/target/classes/org/seckill/dto/SeckillResult.class b/seckill/target/classes/org/seckill/dto/SeckillResult.class
diff --git a/seckill/target/classes/org/seckill/entity/Seckill.class b/seckill/target/classes/org/seckill/entity/Seckill.class
diff --git a/seckill/target/classes/org/seckill/entity/SuccessKilled.class b/seckill/target/classes/org/seckill/entity/SuccessKilled.class
diff --git a/seckill/target/classes/org/seckill/enums/SeckillStatEnum.class b/seckill/target/classes/org/seckill/enums/SeckillStatEnum.class
diff --git a/seckill/target/classes/org/seckill/exception/RepeatKillException.class b/seckill/target/classes/org/seckill/exception/RepeatKillException.class
diff --git a/seckill/target/classes/org/seckill/exception/SeckillCloseException.class b/seckill/target/classes/org/seckill/exception/SeckillCloseException.class
diff --git a/seckill/target/classes/org/seckill/exception/SeckillException.class b/seckill/target/classes/org/seckill/exception/SeckillException.class
diff --git a/seckill/target/classes/org/seckill/service/SeckillService.class b/seckill/target/classes/org/seckill/service/SeckillService.class
diff --git a/seckill/target/classes/org/seckill/service/impl/SeckillServiceImpl.class b/seckill/target/classes/org/seckill/service/impl/SeckillServiceImpl.class
diff --git a/seckill/target/classes/org/seckill/web/SeckillController.class b/seckill/target/classes/org/seckill/web/SeckillController.class
diff --git a/seckill/target/test-classes/org/seckill/dao/SeckillDaoTest.class b/seckill/target/test-classes/org/seckill/dao/SeckillDaoTest.class
diff --git a/seckill/target/test-classes/org/seckill/dao/SuccessKilledDaoTest.class b/seckill/target/test-classes/org/seckill/dao/SuccessKilledDaoTest.class
diff --git a/seckill/target/test-classes/org/seckill/service/SeckillServiceTest.class b/seckill/target/test-classes/org/seckill/service/SeckillServiceTest.class
diff --git a/springboot-shiro/bin/.gitignore b/springboot-shiro/bin/.gitignore
@@ -0,0 +1,26 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+/build/
diff --git a/springboot-shiro/bin/.mvn/wrapper/MavenWrapperDownloader.class b/springboot-shiro/bin/.mvn/wrapper/MavenWrapperDownloader.class
diff --git a/springboot-shiro/bin/.mvn/wrapper/maven-wrapper.jar b/springboot-shiro/bin/.mvn/wrapper/maven-wrapper.jar
diff --git a/springboot-shiro/bin/.mvn/wrapper/maven-wrapper.properties b/springboot-shiro/bin/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip