diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/util/AuthUtil.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/util/AuthUtil.java
deleted file mode 100644
index c2a9ea6..0000000
--- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/util/AuthUtil.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package cn.novalon.gym.manage.member.util;
-
-import cn.novalon.gym.manage.sys.security.JwtTokenProvider;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Component;
-import org.springframework.web.reactive.function.server.ServerRequest;
-import org.springframework.web.server.ResponseStatusException;
-
-@Slf4j
-@Component
-@RequiredArgsConstructor
-public class AuthUtil {
-
- private final JwtTokenProvider jwtTokenProvider;
-
- public String extractToken(ServerRequest request) {
- String authorization = request.headers().firstHeader(HttpHeaders.AUTHORIZATION);
- if (authorization == null || !authorization.startsWith("Bearer ")) return null;
- return authorization.substring(7);
- }
-
- public Long getMemberIdOrThrow(ServerRequest request) {
- String token = extractToken(request);
- if (token == null) throw new ResponseStatusException(HttpStatus.UNAUTHORIZED, "缺少 Token");
- if (!jwtTokenProvider.validateToken(token)) throw new ResponseStatusException(HttpStatus.UNAUTHORIZED, "Token 无效或已过期");
- if (jwtTokenProvider.getUserIdFromToken(token) <= 0L) throw new IllegalArgumentException("ID无效");
- return jwtTokenProvider.getUserIdFromToken(token);
- }
-}
\ No newline at end of file
diff --git a/gym-manage-api/manage-app/pom.xml b/gym-manage-api/manage-app/pom.xml
index 5eecb9d..fb5f6f4 100644
--- a/gym-manage-api/manage-app/pom.xml
+++ b/gym-manage-api/manage-app/pom.xml
@@ -43,11 +43,7 @@
gym-member
${project.version}
-
- cn.novalon.gym.manage
- gym-checkIn
- ${project.version}
-
+
org.springframework.boot
spring-boot-starter-webflux
diff --git a/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/SystemRouter.java b/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/SystemRouter.java
index 406ea19..665762e 100644
--- a/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/SystemRouter.java
+++ b/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/SystemRouter.java
@@ -1,6 +1,6 @@
package cn.novalon.gym.manage.app.config;
-import cn.novalon.gym.manage.checkIn.handler.CheckInHandler;
+
import cn.novalon.gym.manage.file.handler.SysFileHandler;
import cn.novalon.gym.manage.member.handler.MemberHandler;
import cn.novalon.gym.manage.member.handler.WechatAuthHandler;
@@ -56,8 +56,7 @@ public class SystemRouter {
SysPermissionHandler permissionHandler,
MemberHandler memberHandler,
WechatAuthHandler wechatAuthHandler,
- PasswordDiagnosticHandler passwordDiagnosticHandler,
- CheckInHandler checkInHandler) {
+ PasswordDiagnosticHandler passwordDiagnosticHandler) {
return route()
// ========== 诊断路由 ==========
@@ -217,9 +216,6 @@ public class SystemRouter {
.GET("/api/admin/members", memberHandler::searchMembers)
.GET("/api/admin/members/all", memberHandler::getAllMembers)
- // ========== 签到模块路由 ==========
- .POST("/api/checkin", checkInHandler::checkIn)
- .GET("/api/QRCode", checkInHandler::getQRCode)
.build();
}
}
diff --git a/gym-manage-api/manage-app/src/main/resources/application.yml b/gym-manage-api/manage-app/src/main/resources/application.yml
index a8e0ec4..9ff6e52 100644
--- a/gym-manage-api/manage-app/src/main/resources/application.yml
+++ b/gym-manage-api/manage-app/src/main/resources/application.yml
@@ -15,8 +15,8 @@ spring:
- org.springframework.boot.autoconfigure.cache.CacheAutoConfiguration
r2dbc:
url: r2dbc:postgresql://${DB_HOST:localhost}:${DB_PORT:55432}/${DB_NAME:manage_system}
- username: ${DB_USERNAME:novalon}
- password: ${DB_PASSWORD:novalon123}
+ username: ${DB_USERNAME:postgres}
+ password: ${DB_PASSWORD:postgres}
pool:
initial-size: 10
max-size: 50
@@ -24,9 +24,9 @@ spring:
max-life-time: 1h
acquire-timeout: 5s
datasource:
- url: jdbc:postgresql://${DB_HOST:localhost}:${DB_PORT:5432}/${DB_NAME:manage_system}
- username: ${DB_USERNAME:novalon}
- password: ${DB_PASSWORD:novalon123}
+ url: jdbc:postgresql://${DB_HOST:localhost}:${DB_PORT:55432}/${DB_NAME:manage_system}
+ username: ${DB_USERNAME:postgres}
+ password: ${DB_PASSWORD:postgres}
driver-class-name: org.postgresql.Driver
flyway:
enabled: false