From 0107eb05f7b9521de9023448f597b30e6c7af1ef Mon Sep 17 00:00:00 2001
From: cym1102 <cym1102@qq.com>
Date: Tue, 10 Sep 2024 11:59:37 +0800
Subject: [PATCH] 1

---
 README.md                                     | 14 +--
 pom.xml                                       | 86 -------------------
 .../java/com/cym/service/ExampleService.java  |  2 +-
 .../resources/templates/example/index.html    |  2 +-
 4 files changed, 10 insertions(+), 94 deletions(-)

diff --git a/README.md b/README.md
index a70aa94..a011d29 100644
--- a/README.md
+++ b/README.md
@@ -8,12 +8,6 @@ jpaHelper的使用说明看这个页面: https://gitee.com/cym1102/jpaHelper 主
 
 网页框架用的jquery + layui官网说明: https://layui.dev/
 
-### 测试账号
-
-用户名:admin
-
-密码:admin
-
 ### java文件说明
 
 com.cym.CdnWebUI.java : 主启动类
@@ -46,6 +40,14 @@ src/main/resources/application.yml : 主配置文件
 
 src/main/resources/application-dev.yml : 开发配置文件
 
+### 测试说明
+
+访问地址: http://127.0.0.1:8000/index
+
+用户名:admin
+
+密码:admin
+
 ### 开发说明
 
 开发新模块时, 请尽量参照ExampleController这个模块进行开发, 新开发的模块可在menu.html里面添加菜单进行访问, 方便测试人员进行测试.
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e2c56b1..9d6b08d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,29 +62,6 @@
 		</dependency>
 
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-quartz</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.github.binance</groupId>
-			<artifactId>binance-connector-java</artifactId>
-			<version>3.2.0</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.github.odiszapc</groupId>
-			<artifactId>nginxparser</artifactId>
-			<version>0.9.6</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.clickhouse</groupId>
-			<artifactId>clickhouse-jdbc</artifactId>
-			<version>0.6.2</version>
-			<classifier>all</classifier>
-		</dependency>
-
 		<dependency>
 			<groupId>cn.hutool</groupId>
 			<artifactId>hutool-all</artifactId>
@@ -102,78 +79,15 @@
 			<artifactId>expiringmap</artifactId>
 			<version>0.5.11</version>
 		</dependency>
-		<dependency>
-			<groupId>com.sun.mail</groupId>
-			<artifactId>javax.mail</artifactId>
-			<version>1.6.2</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.huaweicloud.sdk</groupId>
-			<artifactId>huaweicloud-sdk-dns</artifactId>
-			<version>3.1.104</version>
-		</dependency>
-		<dependency>
-			<groupId>com.alipay.sdk</groupId>
-			<artifactId>alipay-sdk-java</artifactId>
-			<version>4.38.28.ALL</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.google.zxing</groupId>
-			<artifactId>core</artifactId>
-			<version>3.3.0</version>
-		</dependency>
-		<dependency>
-			<groupId>com.google.zxing</groupId>
-			<artifactId>javase</artifactId>
-			<version>3.3.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.axis</groupId>
-			<artifactId>axis</artifactId>
-			<version>1.4</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jsoup</groupId>
-			<artifactId>jsoup</artifactId>
-			<version>1.16.2</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.github.xiaoymin</groupId>
-			<artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
-			<version>4.5.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
 			<optional>true</optional>
 		</dependency>
 
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>21.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-		</dependency>
 
 
-		<!--curator-recipes -->
-		<dependency>
-			<groupId>org.apache.curator</groupId>
-			<artifactId>curator-recipes</artifactId>
-			<version>5.6.0</version>
-		</dependency>
 
-		<dependency>
-			<groupId>com.upyun</groupId>
-			<artifactId>java-sdk</artifactId>
-			<version>4.2.3</version>
-		</dependency>
 
 
 	</dependencies>
diff --git a/src/main/java/com/cym/service/ExampleService.java b/src/main/java/com/cym/service/ExampleService.java
index f3dedfb..c119837 100644
--- a/src/main/java/com/cym/service/ExampleService.java
+++ b/src/main/java/com/cym/service/ExampleService.java
@@ -21,7 +21,7 @@ public class ExampleService {
 			conditionAndWrapper.like(Example::getName, keyword);
 		}
 
-		page = jpaHelper.findPageByQuery(page, Example.class);
+		page = jpaHelper.findPageByQuery(conditionAndWrapper, page, Example.class);
 
 		return page;
 	}
diff --git a/src/main/resources/templates/example/index.html b/src/main/resources/templates/example/index.html
index dd9aa00..005855d 100644
--- a/src/main/resources/templates/example/index.html
+++ b/src/main/resources/templates/example/index.html
@@ -26,7 +26,7 @@
 					<legend>演示模块</legend>
 				</fieldset>
 
-				<form action="${ctx}/examplePage/example" id="searchForm" method="post">
+				<form action="${ctx}/adminPage/example" id="searchForm" method="post">
 					<div class="layui-form">
 						<div class="layui-inline">
 							<button type="button" class="layui-btn layui-btn-normal layui-btn-sm" onclick="add()">添加模块</button>