novalon/gym-manage
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复编译时错误 #44

Merged
liwentao merged 1 commits from feature/package-fix into dev 2026-06-28 16:43:29 +08:00
Conversation 0 Commits 1 Files Changed 4
+74 -961
4 changed files with 74 additions and 961 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gym-manage-api/gym-checkIn/src/test/java/cn/novalon/gym/manage/checkin/CheckInModuleTest.java
+1 -1
View File
@@ -127,7 +127,7 @@ class CheckInModuleTest {
when(redisUtil.get(eq(key))).thenReturn(Mono.just(qrData)); when(redisUtil.get(eq(key))).thenReturn(Mono.just(qrData));
when(memberCardRecordRepository.findById(1L)).thenReturn(Mono.just(mockMemberCardRecord)); when(memberCardRecordRepository.findById(1L)).thenReturn(Mono.just(mockMemberCardRecord));
when(memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(1L)).thenReturn(Flux.just(mockMemberCard)); when(memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(1L)).thenReturn(Mono.just(mockMemberCard));
when(signInRecordRepository.save(any(SignInRecord.class))).thenReturn(Mono.just(mockSignInRecord)); when(signInRecordRepository.save(any(SignInRecord.class))).thenReturn(Mono.just(mockSignInRecord));
when(redisUtil.set(any(String.class), any(Map.class))).thenReturn(Mono.just(true)); when(redisUtil.set(any(String.class), any(Map.class))).thenReturn(Mono.just(true));
when(groupCourseBookingService.getBookingsByMemberId(memberId)).thenReturn(Flux.empty()); when(groupCourseBookingService.getBookingsByMemberId(memberId)).thenReturn(Flux.empty());
gym-manage-api/log.text
+59 -946
View File
File diff suppressed because it is too large Load Diff
gym-manage-api/manage-app/src/main/resources/application-dev.yml
+7 -7
View File
@@ -2,9 +2,9 @@ spring:
cache: cache:
type: none type: none
r2dbc: r2dbc:
url: r2dbc:postgresql://localhost:5432/manage_system url: r2dbc:postgresql://localhost:55432/manage_system
username: postgres username: novalon
password: 123456 password: novalon123
pool: pool:
initial-size: 5 initial-size: 5
max-size: 20 max-size: 20
@@ -12,10 +12,10 @@ spring:
max-life-time: 30m max-life-time: 30m
acquire-timeout: 3s acquire-timeout: 3s
flyway: flyway:
url: jdbc:postgresql://localhost:5432/manage_system url: jdbc:postgresql://localhost:55432/manage_system
user: postgres user: novalon
password: 123456 password: novalon123
enabled: false enabled: true
locations: classpath:db/migration locations: classpath:db/migration
baseline-on-migrate: true baseline-on-migrate: true
validate-on-migrate: false validate-on-migrate: false
gym-manage-api/manage-app/src/main/resources/application.yml
+7 -7
View File
@@ -15,9 +15,9 @@ spring:
exclude: exclude:
- org.springframework.boot.autoconfigure.cache.CacheAutoConfiguration - org.springframework.boot.autoconfigure.cache.CacheAutoConfiguration
r2dbc: r2dbc:
url: r2dbc:postgresql://${DB_HOST:localhost}:${DB_PORT:5432}/${DB_NAME:manage_system} url: r2dbc:postgresql://${DB_HOST:localhost}:${DB_PORT:55432}/${DB_NAME:manage_system}
username: ${DB_USERNAME:postgres} username: ${DB_USERNAME:novalon}
password: ${DB_PASSWORD:123456} password: ${DB_PASSWORD:novalon123}
pool: pool:
initial-size: 10 initial-size: 10
max-size: 50 max-size: 50
@@ -25,12 +25,12 @@ spring:
max-life-time: 1h max-life-time: 1h
acquire-timeout: 5s acquire-timeout: 5s
datasource: datasource:
url: jdbc:postgresql://${DB_HOST:localhost}:${DB_PORT:5432}/${DB_NAME:manage_system} url: jdbc:postgresql://${DB_HOST:localhost}:${DB_PORT:55432}/${DB_NAME:manage_system}
username: ${DB_USERNAME:postgres} username: ${DB_USERNAME:novalon}
password: ${DB_PASSWORD:123456} password: ${DB_PASSWORD:novalon123}
driver-class-name: org.postgresql.Driver driver-class-name: org.postgresql.Driver
flyway: flyway:
enabled: false enabled: true
locations: classpath:db/migration locations: classpath:db/migration
baseline-on-migrate: true baseline-on-migrate: true
baseline-version: 0 baseline-version: 0