fix(backend): Restore service flow and admin management integration

2026-04-18 18:20:58 +08:00
parent 92a139e470
commit 3adb088eca
83 changed files with 1696 additions and 703 deletions
@@ -3,6 +3,8 @@
 -- 注意：tenant_id 为空字符串 '' 表示 public 命名空间
 -- Nacos 2.x 版本需要 encrypted_data_key 字段

+USE nacos_config;
+
 -- ============================================
 -- 1. 公共基础配置 (common.yaml)
 -- ============================================
@@ -63,7 +65,11 @@ feign:
 logging:
  level:
    com.nuaa.video: info
-    org.springframework.security: info', '', '', 'nacos', '');
+    org.springframework.security: info
+
+service:
+  auth:
+    token: ${SERVICE_AUTH_TOKEN}', '', '', 'nacos', '');

 -- ============================================
 -- 2. 开发环境 Redis 配置 (common-redis-dev.yaml)
@@ -76,7 +82,7 @@ spring:
    redis:
      host: ${REDIS_HOST:5.180.253.115}
      port: ${REDIS_PORT:6379}
-      password: ${REDIS_PASSWORD:redis_EsJ8FX}', '', '', 'nacos', '');
+      password: ${REDIS_PASSWORD}', '', '', 'nacos', '');

 -- ============================================
 -- 3. 高可用环境 Redis 配置 (common-redis-ha.yaml)
@@ -87,11 +93,11 @@ INSERT INTO config_info (data_id, group_id, content, tenant_id, app_name, src_us
 spring:
  data:
    redis:
-      password: ${REDIS_PASSWORD:redis_HA_Cluster_2024}
+      password: ${REDIS_PASSWORD}
      sentinel:
        master: mymaster
-        nodes: ${REDIS_SENTINEL_NODES:192.168.1.101:26379,192.168.1.102:26379,192.168.1.103:26379}
-        password: ${REDIS_PASSWORD:redis_HA_Cluster_2024}', '', '', 'nacos', '');
+        nodes: ${REDIS_SENTINEL_NODES}
+        password: ${REDIS_PASSWORD}', '', '', 'nacos', '');

 -- ============================================
 -- 4. Gateway 服务配置 (video-gateway.yaml)
@@ -147,13 +153,28 @@ gateway:
      - /**/auth/login
      - /**/auth/register
      - /**/auth/captcha
+      - /auth/username/**
      - /content/video/public/**
      - /content/category/tree
      - /content/category/list
+      - /content/tag/list
+      - /content/tag/page
+      - /content/danmaku/all/**
+      - /content/danmaku/time
+      - /content/stat/**
+      - /user/profile/public/**
+      - /user/profile/search
+      - /user/follow/following/**
+      - /user/follow/followers/**
      - /comment/reply/public/**
      - /comment/public/**
      - /admin/auth/captcha
-      - /admin/auth/login', '', '', 'nacos', '');
+      - /admin/auth/login
+
+jwt:
+  secret: ${USER_JWT_SECRET}
+  token-header: Authorization
+  token-prefix: "Bearer "', '', '', 'nacos', '');

 -- ============================================
 -- 5. Auth 服务配置 (video-auth.yaml)
@@ -164,7 +185,7 @@ spring:
  datasource:
    url: jdbc:mysql://${MYSQL_HOST:mysql}:${MYSQL_PORT:3306}/video_auth?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&allowMultiQueries=true
    username: root
-    password: ${MYSQL_ROOT_PASSWORD:root123456}
+    password: ${MYSQL_ROOT_PASSWORD}
  data:
    redis:
      database: 0
@@ -180,8 +201,8 @@ mybatis-plus:
  type-aliases-package: com.nuaa.video.auth.entity

 jwt:
-  secret: video-platform-secret-key-2024-nuaa
-  expiration: 86400
+  secret: ${USER_JWT_SECRET}
+  expiration: ${JWT_EXPIRATION}
  token-header: Authorization
  token-prefix: "Bearer "', '', '', 'nacos', '');

@@ -194,7 +215,7 @@ spring:
  datasource:
    url: jdbc:mysql://${MYSQL_HOST:mysql}:${MYSQL_PORT:3306}/video_user?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&allowMultiQueries=true
    username: root
-    password: ${MYSQL_ROOT_PASSWORD:root123456}
+    password: ${MYSQL_ROOT_PASSWORD}
  data:
    redis:
      database: 1
@@ -215,10 +236,16 @@ auth:
    - /user/profile/init
    - /actuator/**

+jwt:
+  secret: ${USER_JWT_SECRET}
+  expiration: ${JWT_EXPIRATION}
+  token-header: Authorization
+  token-prefix: "Bearer "
+
 minio:
  endpoint: http://${MINIO_HOST:minio}:${MINIO_PORT:9000}
-  accessKey: minioadmin
-  secretKey: minioadmin123
+  accessKey: ${MINIO_ACCESS_KEY}
+  secretKey: ${MINIO_SECRET_KEY}
  bucketName: video-platform', '', '', 'nacos', '');

 -- ============================================
@@ -230,7 +257,7 @@ spring:
  datasource:
    url: jdbc:mysql://${MYSQL_HOST:mysql}:${MYSQL_PORT:3306}/video_content?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&allowMultiQueries=true
    username: root
-    password: ${MYSQL_ROOT_PASSWORD:root123456}
+    password: ${MYSQL_ROOT_PASSWORD}
  data:
    redis:
      database: 2
@@ -259,9 +286,9 @@ mybatis-plus:

 minio:
  endpoint: http://${MINIO_HOST:minio}:${MINIO_PORT:9000}
-  accessKey: ${MINIO_ACCESS_KEY:minioadmin}
-  secretKey: ${MINIO_SECRET_KEY:minioadmin123}
-  bucketName: ${MINIO_BUCKET:video-platform}
+  accessKey: ${MINIO_ACCESS_KEY}
+  secretKey: ${MINIO_SECRET_KEY}
+  bucketName: ${MINIO_BUCKET}

 ffmpeg:
  binary:
@@ -279,8 +306,8 @@ auth:
    - /actuator/**

 jwt:
-  secret: video-platform-secret-key-2024-nuaa
-  expiration: 86400
+  secret: ${USER_JWT_SECRET}
+  expiration: ${JWT_EXPIRATION}
  token-header: Authorization
  token-prefix: "Bearer "', '', '', 'nacos', '');

@@ -293,7 +320,7 @@ spring:
  datasource:
    url: jdbc:mysql://${MYSQL_HOST:mysql}:${MYSQL_PORT:3306}/video_comment?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&allowMultiQueries=true
    username: root
-    password: ${MYSQL_ROOT_PASSWORD:root123456}
+    password: ${MYSQL_ROOT_PASSWORD}
  data:
    redis:
      database: 3
@@ -320,8 +347,8 @@ comment:
    enabled: false

 jwt:
-  secret: video-platform-secret-key-2024-nuaa
-  expiration: 86400
+  secret: ${USER_JWT_SECRET}
+  expiration: ${JWT_EXPIRATION}
  token-header: Authorization
  token-prefix: "Bearer "

@@ -339,7 +366,7 @@ spring:
  datasource:
    url: jdbc:mysql://${MYSQL_HOST:mysql}:${MYSQL_PORT:3306}/video_recommend?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&allowMultiQueries=true
    username: root
-    password: ${MYSQL_ROOT_PASSWORD:root123456}
+    password: ${MYSQL_ROOT_PASSWORD}
  data:
    redis:
      database: 4
@@ -381,8 +408,8 @@ recommend:
      complete-watch: 4

 jwt:
-  secret: video-platform-secret-key-2024-nuaa
-  expiration: 86400
+  secret: ${USER_JWT_SECRET}
+  expiration: ${JWT_EXPIRATION}
  token-header: Authorization
  token-prefix: "Bearer "

@@ -401,7 +428,7 @@ spring:
  datasource:
    url: jdbc:mysql://${MYSQL_HOST:mysql}:${MYSQL_PORT:3306}/video_admin?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&allowMultiQueries=true
    username: root
-    password: ${MYSQL_ROOT_PASSWORD:root123456}
+    password: ${MYSQL_ROOT_PASSWORD}
  data:
    redis:
      database: 5
@@ -422,8 +449,8 @@ mybatis-plus:
      logic-not-delete-value: 1

 jwt:
-  secret: video-platform-admin-secret-key-2024-nuaa
-  expiration: 86400
+  secret: ${ADMIN_JWT_SECRET}
+  expiration: ${JWT_EXPIRATION}
  token-header: Authorization
  token-prefix: "Bearer "

@@ -437,4 +464,8 @@ operation-log:
    - /admin/auth/login
    - /admin/auth/logout
    - /admin/auth/captcha
-    - /actuator/**', '', '', 'nacos', '');
+    - /actuator/**
+
+app:
+  init:
+    admin-password: ${ADMIN_INIT_PASSWORD}', '', '', 'nacos', '');