diff --git a/docker-compose.yml b/docker-compose.yml index 09a1dbe..823bb22 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -71,11 +71,8 @@ services: condition: service_healthy rustfs: condition: service_healthy - # NOTE: /actuator/health requires spring-boot-starter-actuator in pom.xml. - # Currently pom.xml does not include it. Either add the dependency (recommended) - # or replace this check with a simple TCP port check. healthcheck: - test: ["CMD", "wget", "--spider", "-q", "http://localhost:8080/actuator/health"] + test: ["CMD-SHELL", "wget -q --spider http://localhost:8080/actuator/health 2>/dev/null || exit 1"] interval: 30s timeout: 10s retries: 3 diff --git a/pom.xml b/pom.xml index edcfdb1..3ac5aa1 100644 --- a/pom.xml +++ b/pom.xml @@ -50,6 +50,12 @@ spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-actuator + + org.springframework.boot diff --git a/sql/init.sql b/sql/init.sql index bd2d4de..1824039 100644 --- a/sql/init.sql +++ b/sql/init.sql @@ -289,19 +289,19 @@ SELECT FROM sys_company c CROSS JOIN (VALUES ('admin', - '$2a$10$7EqJtq98hPqEX7fNZaFWoOe2Wo7qnrBCShP0e9r6xLuU3WnYjFWRa', + '$2a$10$B8iR5z43URiNPm.eut3JvufIPBuvGx5ZZmqyUqE1A1WdbZppX5bmi', '管理员', 'ADMIN'), ('reviewer01', - '$2a$10$LbyxRjSqPiN7z0bqQlLn5eL7ZjFQFJuDFMX3/ycVdDkZ5RNY2/7Oi', + '$2a$10$euOJZRfUtYNW7WHpfW1Ciee5b3rjkYFe3yQHT/uCQWrYVc0XQcukm', '审核员01', 'REVIEWER'), ('annotator01', - '$2a$10$Nrk2z1OdKfHE1j4Sq3JpCOP0K0i5q2jV5tICqX7c1W2YqEwPq8HHi', + '$2a$10$8UKwHPNASauKMTrqosR0Reg1X1gkFzFlGa/HBwNLXUELaj4e/zcqu', '标注员01', 'ANNOTATOR'), ('uploader01', - '$2a$10$3z5q9mLw4r0F6f8v1Xe3AO2bFdG9kK7m5pN1sT8uY4wZ6dH0jI2eR', + '$2a$10$o2d7jsT31vyxIJHUo50mUefoZLLvGqft97zaL9OQCjRxn9ie1H/1O', '上传员01', 'UPLOADER') ) AS u(username, password_hash, real_name, role)