Merge pull request 'feat(微服务流量控制): 微服务接入Sentinel' (#543) from otto/ruoyi-gitlink:dev_PMS into dev_PMS

2024-04-09 10:07:01 +08:00 · 2024-04-09 10:07:01 +08:00 · 966ec7c949
parent f024fd0c58 572364f564
commit 966ec7c949
33 changed files with 113 additions and 10 deletions
--- a/docker-gitlink/build.sh
+++ b/docker-gitlink/build.sh
@ -131,6 +131,7 @@ gen_docker_compose(){
  sed -i "s|#file_path|${file_path}|g" docker-compose.yml
  sed -i "s|#mapping_nacos_port|${mapping_nacos_port}|g" docker-compose.yml
  sed -i "s|#mapping_redis_port|${mapping_redis_port}|g" docker-compose.yml
+  sed -i "s|#mapping_sentinel_port|${mapping_sentinel_port}|g" docker-compose.yml
  sed -i "s|#mapping_gateway_port|${mapping_gateway_port}|g" docker-compose.yml
  sed -i "s|#mapping_project_front_port|${mapping_project_front_port}|g" docker-compose.yml
  sed -i "s|#db_password|${db_password}|g" docker-compose.yml
@ -184,6 +185,8 @@ replace_dockerfile_config(){
    rm -f dockerfile
    cp default_dockerfile dockerfile
    sed -i "s|#skywalking_backend_service|${skywalking_backend_service}|g" dockerfile
+    sed -i "s|#sentinel_ip|${sentinel_ip}|g" dockerfile
+    sed -i "s|#sentinel_port|${sentinel_port}|g" dockerfile
    sed -i "s|#nacos_ip|${nacos_ip}|g" dockerfile
    sed -i "s|#nacos_port|${nacos_port}|g" dockerfile
    sed -i "s|#base_image_version|${base_image_version}|g" dockerfile
--- a/docker-gitlink/default_docker-compose.yml
+++ b/docker-gitlink/default_docker-compose.yml
@ -15,6 +15,20 @@ services:
    ports:
      - "#mapping_mysql_port:3306"
    restart: always
+  gitlink-sentinel:
+    container_name: gitlink-sentinel
+    image: bladex/sentinel-dashboard:1.8.7
+    environment:
+      - TZ=Asia/Shanghai
+    ports:
+      - "#mapping_sentinel_port:8858"
+    volumes:
+      - #docker_data/gitlink/sentinel/logs/:/root/logs
+    deploy:
+      resources:
+        limits:
+          memory: 1500m
+    restart: always
  gitlink-nacos:
    container_name: gitlink-nacos
    image: nacos/nacos-server:v2.3.1
@ -98,10 +112,12 @@ services:
      - gitlink-redis
      - gitlink-nacos
      - gitlink-mysql
+      - gitlink-sentinel
    links:
      - gitlink-redis
      - gitlink-nacos
      - gitlink-mysql
+      - gitlink-sentinel
    deploy:
      resources:
        limits:
@ -118,10 +134,12 @@ services:
      - gitlink-redis
      - gitlink-nacos
      - gitlink-mysql
+      - gitlink-sentinel
    links:
      - gitlink-redis
      - gitlink-nacos
      - gitlink-mysql
+      - gitlink-sentinel
    deploy:
      resources:
        limits:
@ -138,10 +156,12 @@ services:
      - gitlink-redis
      - gitlink-nacos
      - gitlink-mysql
+      - gitlink-sentinel
    links:
      - gitlink-redis
      - gitlink-nacos
      - gitlink-mysql
+      - gitlink-sentinel
    deploy:
      resources:
        limits:
@ -160,10 +180,12 @@ services:
      - gitlink-redis
      - gitlink-nacos
      - gitlink-mysql
+      - gitlink-sentinel
    links:
      - gitlink-redis
      - gitlink-nacos
      - gitlink-mysql
+      - gitlink-sentinel
    deploy:
      resources:
        limits:
@ -180,10 +202,12 @@ services:
      - gitlink-redis
      - gitlink-nacos
      - gitlink-mysql
+      - gitlink-sentinel
    links:
      - gitlink-redis
      - gitlink-nacos
      - gitlink-mysql
+      - gitlink-sentinel
    deploy:
      resources:
        limits:
@ -200,10 +224,12 @@ services:
      - gitlink-redis
      - gitlink-nacos
      - gitlink-mysql
+      - gitlink-sentinel
    links:
      - gitlink-redis
      - gitlink-nacos
      - gitlink-mysql
+      - gitlink-sentinel
    deploy:
      resources:
        limits:
@ -222,10 +248,12 @@ services:
      - gitlink-redis
      - gitlink-nacos
      - gitlink-mysql
+      - gitlink-sentinel
    links:
      - gitlink-redis
      - gitlink-nacos
      - gitlink-mysql
+      - gitlink-sentinel
    deploy:
      resources:
        limits:
@ -241,11 +269,11 @@ services:
    depends_on:
      - gitlink-redis
      - gitlink-nacos
-#      - gitlink-mysql
+      - gitlink-sentinel
    links:
      - gitlink-redis
      - gitlink-nacos
-#      - gitlink-mysql
+      - gitlink-sentinel
    deploy:
      resources:
        limits:
--- a/docker-gitlink/deploy.sh
+++ b/docker-gitlink/deploy.sh
@ -33,12 +33,12 @@ mysql(){

 # 编译基础环境（必须）
 build_base(){
-	docker-compose build --no-cache gitlink-redis gitlink-nacos
+	docker-compose build --no-cache gitlink-redis gitlink-nacos gitlink-sentinel
 }

 # 启动基础环境（必须）
 base(){
-	docker-compose  --compatibility up -d gitlink-redis gitlink-nacos
+	docker-compose  --compatibility up -d gitlink-redis gitlink-nacos gitlink-sentinel
 }

 # 编译程序模块（必须）
--- a/docker-gitlink/dev_config.profile
+++ b/docker-gitlink/dev_config.profile
@ -15,6 +15,10 @@ NACOS_AUTH_IDENTITY_KEY=gitlink_key
 NACOS_AUTH_IDENTITY_VALUE=gitlink_value
 nacos_db_username=root
 nacos_db_password=123456
+## sentinel配置
+mapping_sentinel_port=8858
+sentinel_ip=gitlink-sentinel
+sentinel_port=8858
 ## 连接Nacos配置
 nacos_ip=127.0.0.1
 nacos_port=8848
--- a/docker-gitlink/gitlink/auth/default_dockerfile
+++ b/docker-gitlink/gitlink/auth/default_dockerfile
@ -7,6 +7,8 @@ COPY ./jar/ruoyi-auth.jar /home/gitlink/ruoyi-auth.jar
 ENTRYPOINT java -javaagent:/home/gitlink/skywalking-agent/skywalking-agent.jar \
    -Dskywalking.agent.service_name=#deploy_env::ruoyi-auth \
    -Dskywalking.collector.backend_service=#skywalking_backend_service \
+    -Dcsp.sentinel.dashboard.server=#sentinel_ip:#sentinel_port \
+    -Dcsp.sentinel.app.name=ruoyi-auth \
    -jar ruoyi-auth.jar \
    --nacos_ip=#nacos_ip \
    --nacos_port=#nacos_port \
--- a/docker-gitlink/gitlink/gateway/default_dockerfile
+++ b/docker-gitlink/gitlink/gateway/default_dockerfile
@ -6,6 +6,8 @@ COPY ./jar/ruoyi-gateway.jar /home/gitlink/ruoyi-gateway.jar
 ENTRYPOINT java -javaagent:/home/gitlink/skywalking-agent/skywalking-agent.jar \
    -Dskywalking.agent.service_name=#deploy_env::ruoyi-gateway \
    -Dskywalking.collector.backend_service=#skywalking_backend_service \
+    -Dcsp.sentinel.dashboard.server=#sentinel_ip:#sentinel_port \
+    -Dcsp.sentinel.app.name=ruoyi-gateway \
    -jar ruoyi-gateway.jar \
    --nacos_ip=#nacos_ip \
    --nacos_port=#nacos_port \
--- a/docker-gitlink/gitlink/modules/cms/default_dockerfile
+++ b/docker-gitlink/gitlink/modules/cms/default_dockerfile
@ -6,6 +6,8 @@ COPY ./jar/ruoyi-modules-cms.jar /home/gitlink/ruoyi-modules-cms.jar
 ENTRYPOINT java -javaagent:/home/gitlink/skywalking-agent/skywalking-agent.jar \
    -Dskywalking.agent.service_name=#deploy_env::ruoyi-modules-cms \
    -Dskywalking.collector.backend_service=#skywalking_backend_service \
+    -Dcsp.sentinel.dashboard.server=#sentinel_ip:#sentinel_port \
+    -Dcsp.sentinel.app.name=ruoyi-modules-cms \
    -jar ruoyi-modules-cms.jar \
    --nacos_ip=#nacos_ip \
    --nacos_port=#nacos_port \
--- a/docker-gitlink/gitlink/modules/file/default_dockerfile
+++ b/docker-gitlink/gitlink/modules/file/default_dockerfile
@ -6,6 +6,8 @@ COPY ./jar/ruoyi-modules-file.jar /home/gitlink/ruoyi-modules-file.jar
 ENTRYPOINT java -javaagent:/home/gitlink/skywalking-agent/skywalking-agent.jar \
    -Dskywalking.agent.service_name=#deploy_env::ruoyi-modules-file \
    -Dskywalking.collector.backend_service=#skywalking_backend_service \
+    -Dcsp.sentinel.dashboard.server=#sentinel_ip:#sentinel_port \
+    -Dcsp.sentinel.app.name=ruoyi-modules-file \
    -jar ruoyi-modules-file.jar \
    --nacos_ip=#nacos_ip \
    --nacos_port=#nacos_port \
--- a/docker-gitlink/gitlink/modules/job/default_dockerfile
+++ b/docker-gitlink/gitlink/modules/job/default_dockerfile
@ -6,6 +6,8 @@ COPY ./jar/ruoyi-modules-job.jar /home/gitlink/ruoyi-modules-job.jar
 ENTRYPOINT java -javaagent:/home/gitlink/skywalking-agent/skywalking-agent.jar \
    -Dskywalking.agent.service_name=#deploy_env::ruoyi-modules-job \
    -Dskywalking.collector.backend_service=#skywalking_backend_service \
+    -Dcsp.sentinel.dashboard.server=#sentinel_ip:#sentinel_port \
+    -Dcsp.sentinel.app.name=ruoyi-modules-job \
    -jar ruoyi-modules-job.jar \
    --nacos_ip=#nacos_ip \
    --nacos_port=#nacos_port \
--- a/docker-gitlink/gitlink/modules/pms/default_dockerfile
+++ b/docker-gitlink/gitlink/modules/pms/default_dockerfile
@ -6,6 +6,8 @@ COPY ./jar/ruoyi-modules-pms.jar /home/gitlink/ruoyi-modules-pms.jar
 ENTRYPOINT java -javaagent:/home/gitlink/skywalking-agent/skywalking-agent.jar \
    -Dskywalking.agent.service_name=#deploy_env::ruoyi-modules-pms \
    -Dskywalking.collector.backend_service=#skywalking_backend_service \
+    -Dcsp.sentinel.dashboard.server=#sentinel_ip:#sentinel_port \
+    -Dcsp.sentinel.app.name=ruoyi-modules-pms \
    -jar ruoyi-modules-pms.jar \
    --nacos_ip=#nacos_ip \
    --nacos_port=#nacos_port \
--- a/docker-gitlink/gitlink/modules/system/default_dockerfile
+++ b/docker-gitlink/gitlink/modules/system/default_dockerfile
@ -6,6 +6,8 @@ COPY ./jar/ruoyi-modules-system.jar /home/gitlink/ruoyi-modules-system.jar
 ENTRYPOINT java -javaagent:/home/gitlink/skywalking-agent/skywalking-agent.jar \
    -Dskywalking.agent.service_name=#deploy_env::ruoyi-modules-system \
    -Dskywalking.collector.backend_service=#skywalking_backend_service \
+    -Dcsp.sentinel.dashboard.server=#sentinel_ip:#sentinel_port \
+    -Dcsp.sentinel.app.name=ruoyi-modules-system \
    -jar ruoyi-modules-system.jar \
    --nacos_ip=#nacos_ip \
    --nacos_port=#nacos_port \
--- a/docker-gitlink/gitlink/modules/wiki/default_dockerfile
+++ b/docker-gitlink/gitlink/modules/wiki/default_dockerfile
@ -15,6 +15,8 @@ RUN apt-get -y autoremove && apt-get -y clean
 ENTRYPOINT java -javaagent:/home/gitlink/skywalking-agent/skywalking-agent.jar \
    -Dskywalking.agent.service_name=#deploy_env::ruoyi-modules-wiki \
    -Dskywalking.collector.backend_service=#skywalking_backend_service \
+    -Dcsp.sentinel.dashboard.server=#sentinel_ip:#sentinel_port \
+    -Dcsp.sentinel.app.name=ruoyi-modules-wiki \
    -jar ruoyi-modules-wiki.jar \
    --nacos_ip=#nacos_ip \
    --nacos_port=#nacos_port \
--- a/docker-gitlink/gitlink/modules/zone/default_dockerfile
+++ b/docker-gitlink/gitlink/modules/zone/default_dockerfile
@ -6,6 +6,8 @@ COPY ./jar/ruoyi-modules-zone.jar /home/gitlink/ruoyi-modules-zone.jar
 ENTRYPOINT java -javaagent:/home/gitlink/skywalking-agent/skywalking-agent.jar \
    -Dskywalking.agent.service_name=#deploy_env::ruoyi-modules-zone \
    -Dskywalking.collector.backend_service=#skywalking_backend_service \
+    -Dcsp.sentinel.dashboard.server=#sentinel_ip:#sentinel_port \
+    -Dcsp.sentinel.app.name=ruoyi-modules-zone \
    -jar ruoyi-modules-zone.jar \
    --nacos_ip=#nacos_ip \
    --nacos_port=#nacos_port \
--- a/docker-gitlink/prod_config.profile
+++ b/docker-gitlink/prod_config.profile
@ -15,6 +15,10 @@ NACOS_AUTH_IDENTITY_KEY=gitlink_key
 NACOS_AUTH_IDENTITY_VALUE=gitlink_value
 nacos_db_username=root
 nacos_db_password=hnxjy2024#
+## sentinel配置
+mapping_sentinel_port=8858
+sentinel_ip=gitlink-sentinel
+sentinel_port=8858
 ## 连接Nacos配置
 nacos_ip=gitlink-nacos
 nacos_port=8848
--- a/docker-gitlink/test_config.profile
+++ b/docker-gitlink/test_config.profile
@ -15,6 +15,10 @@ NACOS_AUTH_IDENTITY_KEY=gitlink_key
 NACOS_AUTH_IDENTITY_VALUE=gitlink_value
 nacos_username=nacos
 nacos_password=hnxjy2023
+## sentinel配置
+mapping_sentinel_port=8858
+sentinel_ip=gitlink-sentinel
+sentinel_port=8858
 ## 连接Nacos配置
 nacos_ip=gitlink-nacos
 nacos_port=8848
--- a/ruoyi-auth/src/main/resources/bootstrap-prod.yml
+++ b/ruoyi-auth/src/main/resources/bootstrap-prod.yml
@ -13,6 +13,9 @@ spring:
        on-profile:
          prod
  cloud:
+    sentinel:
+      # 取消控制台懒加载
+      eager: true
    nacos:
      discovery:
        # 服务注册地址
--- a/ruoyi-auth/src/main/resources/bootstrap.yml
+++ b/ruoyi-auth/src/main/resources/bootstrap.yml
@ -11,6 +11,9 @@ spring:
    # 环境配置
    active: dev
  cloud:
+    sentinel:
+      # 取消控制台懒加载
+      eager: true
    nacos:
      discovery:
        # 服务注册地址
--- a/ruoyi-gateway/src/main/resources/bootstrap-prod.yml
+++ b/ruoyi-gateway/src/main/resources/bootstrap-prod.yml
@ -32,9 +32,6 @@ spring:
    sentinel:
      # 取消控制台懒加载
      eager: true
-      transport:
-        # 控制台地址
-        dashboard: 127.0.0.1:8718
      # nacos配置持久化
      datasource:
        ds1:
--- a/ruoyi-gateway/src/main/resources/bootstrap.yml
+++ b/ruoyi-gateway/src/main/resources/bootstrap.yml
@ -30,9 +30,6 @@ spring:
    sentinel:
      # 取消控制台懒加载
      eager: true
-      transport:
-        # 控制台地址
-        dashboard: 127.0.0.1:8718
      # nacos配置持久化
      datasource:
        ds1:
--- a/ruoyi-modules/ruoyi-cms/src/main/resources/bootstrap-prod.yml
+++ b/ruoyi-modules/ruoyi-cms/src/main/resources/bootstrap-prod.yml
@ -13,6 +13,9 @@ spring:
        on-profile:
          prod
  cloud:
+    sentinel:
+      # 取消控制台懒加载
+      eager: true
    nacos:
      discovery:
        # 服务注册地址
--- a/ruoyi-modules/ruoyi-cms/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-cms/src/main/resources/bootstrap.yml
@ -11,6 +11,9 @@ spring:
    # 环境配置
    active: dev
  cloud:
+    sentinel:
+      # 取消控制台懒加载
+      eager: true
    nacos:
      discovery:
        # 服务注册地址
--- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-prod.yml
+++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-prod.yml
@ -13,6 +13,9 @@ spring:
        on-profile:
          prod
  cloud:
+    sentinel:
+      # 取消控制台懒加载
+      eager: true
    nacos:
      discovery:
        # 服务注册地址
--- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
@ -11,6 +11,9 @@ spring:
    # 环境配置
    active: dev
  cloud:
+    sentinel:
+      # 取消控制台懒加载
+      eager: true
    nacos:
      discovery:
        # 服务注册地址
--- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-prod.yml
+++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-prod.yml
@ -13,6 +13,9 @@ spring:
        on-profile:
          prod
  cloud:
+    sentinel:
+      # 取消控制台懒加载
+      eager: true
    nacos:
      discovery:
        # 服务注册地址
--- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml
@ -11,6 +11,9 @@ spring:
    # 环境配置
    active: dev
  cloud:
+    sentinel:
+      # 取消控制台懒加载
+      eager: true
    nacos:
      discovery:
        # 服务注册地址
--- a/ruoyi-modules/ruoyi-pms/src/main/resources/bootstrap-prod.yml
+++ b/ruoyi-modules/ruoyi-pms/src/main/resources/bootstrap-prod.yml
@ -13,6 +13,9 @@ spring:
        on-profile:
          prod
  cloud:
+    sentinel:
+      # 取消控制台懒加载
+      eager: true
    nacos:
      discovery:
        # 服务注册地址
--- a/ruoyi-modules/ruoyi-pms/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-pms/src/main/resources/bootstrap.yml
@ -11,6 +11,9 @@ spring:
    # 环境配置
    active: dev
  cloud:
+    sentinel:
+      # 取消控制台懒加载
+      eager: true
    nacos:
      discovery:
        # 服务注册地址
--- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-prod.yml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-prod.yml
@ -13,6 +13,9 @@ spring:
        on-profile:
          prod
  cloud:
+    sentinel:
+      # 取消控制台懒加载
+      eager: true
    nacos:
      discovery:
        # 服务注册地址
--- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@ -11,6 +11,9 @@ spring:
    # 环境配置
    active: dev
  cloud:
+    sentinel:
+      # 取消控制台懒加载
+      eager: true
    nacos:
      discovery:
        # 服务注册地址
--- a/ruoyi-modules/ruoyi-wiki/src/main/resources/bootstrap-prod.yml
+++ b/ruoyi-modules/ruoyi-wiki/src/main/resources/bootstrap-prod.yml
@ -13,6 +13,9 @@ spring:
        on-profile:
          prod
  cloud:
+    sentinel:
+      # 取消控制台懒加载
+      eager: true
    nacos:
      discovery:
        # 服务注册地址
--- a/ruoyi-modules/ruoyi-wiki/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-wiki/src/main/resources/bootstrap.yml
@ -11,6 +11,9 @@ spring:
    # 环境配置
    active: dev
  cloud:
+    sentinel:
+      # 取消控制台懒加载
+      eager: true
    nacos:
      discovery:
        # 服务注册地址
--- a/ruoyi-modules/ruoyi-zone/src/main/resources/bootstrap-prod.yml
+++ b/ruoyi-modules/ruoyi-zone/src/main/resources/bootstrap-prod.yml
@ -13,6 +13,9 @@ spring:
        on-profile:
          prod
  cloud:
+    sentinel:
+      # 取消控制台懒加载
+      eager: true
    nacos:
      discovery:
        # 服务注册地址
--- a/ruoyi-modules/ruoyi-zone/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-zone/src/main/resources/bootstrap.yml
@ -11,6 +11,9 @@ spring:
    # 环境配置
    active: dev
  cloud:
+    sentinel:
+      # 取消控制台懒加载
+      eager: true
    nacos:
      discovery:
        # 服务注册地址