Merge pull request #59 from kongying-tavern/feat/image-api

feat: image alist host

Author: boxsnake

.gitignore

@@ -46,6 +46,9 @@ database/**/.back_*
 application-datasource-dev.yml
 application-datasource-prod.yml
 application-datasource-uat.yml
+application-image-dev.yml
+application-image-prod.yml
+application-image-uat.yml
 
 ### Docker ###
 docker/.env

docker/Makefile.toml

@@ -34,19 +34,9 @@ check_env
 ENV_FILE = get_env ENV_FILE
 PROJECT_NAME = get_env PROJECT_NAME
 
-# Generate datasource YAML
-yaml_ds_tpl = readfile ./config/api/application-datasource-tpl.yml
-yaml_ds_slots = json_parse --collection "[\"PGSQL_USER\", \"PGSQL_PASS\", \"PGSQL_DB\", \"PGSQL_SCHEMA\"]"
-yaml_ds_content = replace_env_value ${yaml_ds_tpl} ${yaml_ds_slots}
-release ${yaml_ds_slots}
-writefile ./cache/application-datasource.yml "${yaml_ds_content}"
-
-# Generate nacos YAML
-yaml_nacos_tpl = readfile ./config/api/application-nacos-tpl.yml
-yaml_nacos_slots = json_parse --collection "[\"NACOS_USER\", \"NACOS_PASS\"]"
-yaml_nacos_content = replace_env_value ${yaml_nacos_tpl} ${yaml_nacos_slots}
-release ${yaml_nacos_slots}
-writefile ./cache/application-nacos.yml "${yaml_nacos_content}"
+replace_env_values_in_file ${ENV_FILE} ./config/api/application-datasource-tpl.yml ./cache/application-datasource.yml
+replace_env_values_in_file ${ENV_FILE} ./config/api/application-nacos-tpl.yml ./cache/application-nacos.yml
+replace_env_values_in_file ${ENV_FILE} ./config/api/application-image-tpl.yml ./cache/application-image.yml
 
 docker_build "${ENV_FILE}" "${PROJECT_NAME}" "./composer/docker-compose.dev-build.yml"
 '''

docker/composer/docker-compose.dataenv.yml

@@ -20,11 +20,10 @@ services:
     restart: always
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -h localhost -p 5432 -U \"${PGSQL_USER}\" | grep accept || exit 1"]
-      interval: 5m
-      timeout: 60s
+      interval: 30s
+      timeout: 30s
       retries: 3
-      start_period: 30s
-      start_interval: 5s
+      start_period: 2m
   nacos:
     container_name: gsapi-nacos
     hostname: gsapi-nacos
@@ -42,8 +41,7 @@ services:
     restart: always
     healthcheck:
       test: ["CMD-SHELL", "curl -f 'http://localhost:8848/nacos' || exit 1"]
-      interval: 5m
-      timeout: 60s
+      interval: 30s
+      timeout: 30s
       retries: 3
-      start_period: 60s
-      start_interval: 5s
+      start_period: 2m

docker/composer/docker-compose.dev-api.yml

@@ -16,6 +16,9 @@ services:
       gsapi-api:
         aliases:
           - api.local
+      gsapi-img-alist:
+        aliases:
+          - img-alist.local
     volumes:
       - ${DATA_DIR}/api/logs:/data/logs
     ports:

docker/composer/docker-compose.dev-build.Dockerfile

@@ -17,6 +17,7 @@ ADD docker/cache docker/cache
 RUN --mount=type=cache,target=/root/.m2,rw \
     cp -f ./docker/cache/application-datasource.yml ./genshin-map-config/src/main/resources-dev/application-datasource-dev.yml && \
     cp -f ./docker/cache/application-nacos.yml ./genshin-map-config/src/main/resources-dev/application-nacos-dev.yml && \
+    cp -f ./docker/cache/application-image.yml ./genshin-map-config/src/main/resources-dev/application-image-dev.yml && \
     cp -f ./docker/cache/application-nacos.yml ./genshin-map-ability/genshin-map-ability-gateway/src/main/resources/application.yml && \
     mvn clean package -s ./docker/config/maven.xml -P dev -f pom.xml && \
     mkdir -p ./dist && \

docker/composer/docker-compose.img-alist-run.yml

@@ -19,11 +19,10 @@ services:
     restart: always
     healthcheck:
       test: ["CMD", "redis-cli", "ping"]
-      interval: 1m
-      timeout: 60s
+      interval: 30s
+      timeout: 30s
       retries: 3
-      start_period: 15s
-      start_interval: 10s
+      start_period: 2m
   minio:
     container_name: gsapi-minio
     hostname: gsapi-minio
@@ -45,11 +44,10 @@ services:
     restart: always
     healthcheck:
       test: ["CMD", "bash", "/minio/healthcheck.sh"]
-      interval: 1m
-      timeout: 60s
-      retries: 5
-      start_period: 30s
-      start_interval: 5s
+      interval: 30s
+      timeout: 30s
+      retries: 3
+      start_period: 2m
   minio-proxy:
     container_name: gsapi-minio-proxy
     hostname: gsapi-minio-proxy
@@ -110,11 +108,10 @@ services:
     restart: always
     healthcheck:
       test: ["CMD", "bash", "/alist/healthcheck.sh"]
-      interval: 1m
-      timeout: 60s
+      interval: 30s
+      timeout: 30s
       retries: 3
-      start_period: 15s
-      start_interval: 10s
+      start_period: 2m
 
   # Initialization services
   minio-init:

docker/config/api/api-core.service

@@ -8,7 +8,7 @@ Wants=network-online.target
 Type=simple
 User=root
 WorkingDirectory=/data/
-ExecStart=/bin/java -server -jar /data/genshin-map-api-core-core-1.0.jar
+ExecStart=/bin/java -server -Dfile.encoding=UTF-8 -jar /data/genshin-map-api-core-core-1.0.jar
 ExecStop=/bin/kill -s QUIT $MAINPID
 Restart=always
 StandOutput=syslog

docker/config/api/api-gateway.service

@@ -8,7 +8,7 @@ Wants=network-online.target
 Type=simple
 User=root
 WorkingDirectory=/data/
-ExecStart=/bin/java -server -jar /data/genshin-map-ability-gateway-1.0.jar
+ExecStart=/bin/java -server -Dfile.encoding=UTF-8 -jar /data/genshin-map-ability-gateway-1.0.jar
 ExecStop=/bin/kill -s QUIT $MAINPID
 Restart=always
 StandOutput=syslog

docker/config/api/application-image-tpl.yml

@@ -0,0 +1,7 @@
+image:
+  minio:
+    endpoint: http://minio-proxy.local:80
+    key: {{MINIO_KEY}}
+    secret: {{MINIO_SECRET}}
+    bucket: {{MINIO_BUCKET_IMAGE}}
+    static-url-template: http://localhost:{{MINIO_PORT_PROXY}}/[[fullPath]]

docker/config/img-alist-builder/minio-init/init.sh

@@ -10,6 +10,9 @@ function step_init_minio () {
   mc admin user svcacct add \
     --access-key "${MINIO_KEY}" \
     --secret-key "${MINIO_SECRET}" \
+    --policy /data/policy/uploadService.json \
+    --name "UploadSvc" \
+    --description "Image Upload Service" \
     minio "${MINIO_ROOT_USERNAME}"
 }