From 89aa922622c42a26fcdac4870b91fb0dcafaa976 Mon Sep 17 00:00:00 2001
From: lecjy <565572696@qq.com>
Date: Sun, 15 Oct 2023 20:28:37 +0800
Subject: [PATCH] =?UTF-8?q?sentinel=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
containerization/docker-compose.yml | 396 ++++++++----------
.../dockerfiles/sentinel-dashboard-1.8.6 | 4 +
containerization/sample.env | 7 +-
containerization/scripts/build.sh | 8 +
.../cskefu-gateway/cskefu-web-gateway/pom.xml | 4 +
.../cskefu/CskefuWebGatewayApplication.java | 1 +
.../src/main/resources/application.properties | 11 +-
7 files changed, 213 insertions(+), 218 deletions(-)
create mode 100644 containerization/dockerfiles/sentinel-dashboard-1.8.6
diff --git a/containerization/docker-compose.yml b/containerization/docker-compose.yml
index 7c3cc096..dacb9144 100644
--- a/containerization/docker-compose.yml
+++ b/containerization/docker-compose.yml
@@ -1,214 +1,5 @@
version: "3"
services:
- cskefu-web-gateway:
- image: cskefu/cskefu-web-gateway
- # container_name: cskefu-web-gateway
- restart: always
- # ports:
- # - "${CSKEFU_WEB_GATEWAY_PORT:-8080}:8080"
- expose:
- - 8080
- volumes:
- - ./cskefu/logs:/cskefu/logs
- deploy:
- replicas: 3
- environment:
- - "JAVA_OPTS=-Xmx${CSKEFU_JAVA_XMX:-512m} -Xms${CSKEFU_JAVA_XMS:-512m} -XX:PermSize=128m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true --add-opens java.base/jdk.internal.misc=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true --illegal-access=warn"
- - LOGGING_LEVEL_ROOT=${LOGGING_LEVEL_ROOT:-INFO}
- - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/cskefu?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2B8
- - SPRING_DATASOURCE_USERNAME=root
- - SPRING_DATASOURCE_PASSWORD=${DB_PASSWD:-123456}
- # - SPRING_DATASOURCE_HIKARI_MAXIMUM_POOL_SIZE=100
- - SPRING_DATA_REDIS_HOST=redis
- - SPRING_DATA_REDIS_PORT=6379
- - SPRING_RABBITMQ_ADDRESSES=rabbitmq
- - SPRING_CLOUD_NACOS_DISCOVERY_SERVER_ADDR=nacos:8848
- - CACHE_SETUP_STRATEGY=${CACHE_SETUP_STRATEGY:-create_by_force}
- - BOT_THRESHOLD_FAQ_BEST_REPLY=${BOT_THRESHOLD_FAQ_BEST_REPLY:-0.9}
- - BOT_THRESHOLD_FAQ_SUGG_REPLY=${BOT_THRESHOLD_FAQ_SUGG_REPLY:-0.1}
- - TONGJI_BAIDU_SITEKEY=${TONGJI_BAIDU_SITEKEY:-placeholder}
- - EXTRAS_LOGIN_BANNER=${NOTICE_LOGIN_BANNER:-off}
- - EXTRAS_LOGIN_CHATBOX=${EXTRAS_LOGIN_CHATBOX:-off}
- - EXTRAS_AUTH_SUPER_ADMIN_PASS=${EXTRAS_AUTH_SUPER_ADMIN_PASS:-}
- - EXTRAS_LOG_REQUEST=${EXTRAS_LOG_REQUEST:-off}
- depends_on:
- - cskefu-auth-service
- - cskefu-manager-service
-
- cskefu-manager-service:
- image: cskefu/cskefu-manager-service
- # container_name: cskefu-manager-service
- restart: always
- # ports:
- # - "${CSKEFU_MANAGER_SERVICE_PORT:-8081}:8081"
- expose:
- - 8081
- volumes:
- - ./cskefu/logs:/cskefu/logs
- environment:
- - "JAVA_OPTS=-Xmx${CSKEFU_JAVA_XMX:-512m} -Xms${CSKEFU_JAVA_XMS:-512m} -XX:PermSize=128m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true --add-opens java.base/jdk.internal.misc=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true --illegal-access=warn"
- - LOGGING_LEVEL_ROOT=${LOGGING_LEVEL_ROOT:-INFO}
- - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/cskefu?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2B8
- - SPRING_DATASOURCE_USERNAME=root
- - SPRING_DATASOURCE_PASSWORD=${DB_PASSWD:-123456}
- # - SPRING_DATASOURCE_HIKARI_MAXIMUM_POOL_SIZE=100
- - SPRING_DATA_REDIS_HOST=redis
- - SPRING_DATA_REDIS_PORT=6379
- - SPRING_RABBITMQ_ADDRESSES=rabbitmq
- - SPRING_CLOUD_NACOS_DISCOVERY_SERVER_ADDR=nacos:8848
- - CACHE_SETUP_STRATEGY=${CACHE_SETUP_STRATEGY:-create_by_force}
- - BOT_THRESHOLD_FAQ_BEST_REPLY=${BOT_THRESHOLD_FAQ_BEST_REPLY:-0.9}
- - BOT_THRESHOLD_FAQ_SUGG_REPLY=${BOT_THRESHOLD_FAQ_SUGG_REPLY:-0.1}
- - TONGJI_BAIDU_SITEKEY=${TONGJI_BAIDU_SITEKEY:-placeholder}
- - EXTRAS_LOGIN_BANNER=${NOTICE_LOGIN_BANNER:-off}
- - EXTRAS_LOGIN_CHATBOX=${EXTRAS_LOGIN_CHATBOX:-off}
- - EXTRAS_AUTH_SUPER_ADMIN_PASS=${EXTRAS_AUTH_SUPER_ADMIN_PASS:-}
- - EXTRAS_LOG_REQUEST=${EXTRAS_LOG_REQUEST:-off}
- depends_on:
- - mysql
- - redis
- - nacos
- - rabbitmq
-
- cskefu-auth-service:
- image: cskefu/cskefu-auth-service
- # container_name: cskefu-auth-service
- restart: always
- # ports:
- # - "${CSKEFU_AUTH_SERVICE_PORT:-8082}:8082"
- expose:
- - 8082
- volumes:
- - ./cskefu/logs:/cskefu/logs
- environment:
- - "JAVA_OPTS=-Xmx${CSKEFU_JAVA_XMX:-512m} -Xms${CSKEFU_JAVA_XMS:-512m} -XX:PermSize=128m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true --add-opens java.base/jdk.internal.misc=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true --illegal-access=warn"
- - LOGGING_LEVEL_ROOT=${LOGGING_LEVEL_ROOT:-INFO}
- - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/cskefu?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2B8
- - SPRING_DATASOURCE_USERNAME=root
- - SPRING_DATASOURCE_PASSWORD=${DB_PASSWD:-123456}
- # - SPRING_DATASOURCE_HIKARI_MAXIMUM_POOL_SIZE=100
- - SPRING_DATA_REDIS_HOST=redis
- - SPRING_DATA_REDIS_PORT=6379
- - SPRING_RABBITMQ_ADDRESSES=rabbitmq
- - SPRING_CLOUD_NACOS_DISCOVERY_SERVER_ADDR=nacos:8848
- - CACHE_SETUP_STRATEGY=${CACHE_SETUP_STRATEGY:-create_by_force}
- - BOT_THRESHOLD_FAQ_BEST_REPLY=${BOT_THRESHOLD_FAQ_BEST_REPLY:-0.9}
- - BOT_THRESHOLD_FAQ_SUGG_REPLY=${BOT_THRESHOLD_FAQ_SUGG_REPLY:-0.1}
- - TONGJI_BAIDU_SITEKEY=${TONGJI_BAIDU_SITEKEY:-placeholder}
- - EXTRAS_LOGIN_BANNER=${NOTICE_LOGIN_BANNER:-off}
- - EXTRAS_LOGIN_CHATBOX=${EXTRAS_LOGIN_CHATBOX:-off}
- - EXTRAS_AUTH_SUPER_ADMIN_PASS=${EXTRAS_AUTH_SUPER_ADMIN_PASS:-}
- - EXTRAS_LOG_REQUEST=${EXTRAS_LOG_REQUEST:-off}
- depends_on:
- - mysql
- - redis
- - nacos
- - rabbitmq
-
- cskefu-plugin-service:
- image: cskefu/cskefu-plugin-service
- # container_name: cskefu-plugin-service
- restart: always
- # ports:
- # - "${CSKEFU_PLUGIN_SERVICE_PORT:-8083}:8083"
- expose:
- - 8083
- volumes:
- - ./cskefu/logs:/cskefu/logs
- environment:
- - "JAVA_OPTS=-Xmx${CSKEFU_JAVA_XMX:-512m} -Xms${CSKEFU_JAVA_XMS:-512m} -XX:PermSize=128m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true --add-opens java.base/jdk.internal.misc=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true --illegal-access=warn"
- - LOGGING_LEVEL_ROOT=${LOGGING_LEVEL_ROOT:-INFO}
- - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/cskefu?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2B8
- - SPRING_DATASOURCE_USERNAME=root
- - SPRING_DATASOURCE_PASSWORD=${DB_PASSWD:-123456}
- # - SPRING_DATASOURCE_HIKARI_MAXIMUM_POOL_SIZE=100
- - SPRING_DATA_REDIS_HOST=redis
- - SPRING_DATA_REDIS_PORT=6379
- - SPRING_RABBITMQ_ADDRESSES=rabbitmq
- - SPRING_CLOUD_NACOS_DISCOVERY_SERVER_ADDR=nacos:8848
- - CACHE_SETUP_STRATEGY=${CACHE_SETUP_STRATEGY:-create_by_force}
- - BOT_THRESHOLD_FAQ_BEST_REPLY=${BOT_THRESHOLD_FAQ_BEST_REPLY:-0.9}
- - BOT_THRESHOLD_FAQ_SUGG_REPLY=${BOT_THRESHOLD_FAQ_SUGG_REPLY:-0.1}
- - TONGJI_BAIDU_SITEKEY=${TONGJI_BAIDU_SITEKEY:-placeholder}
- - EXTRAS_LOGIN_BANNER=${NOTICE_LOGIN_BANNER:-off}
- - EXTRAS_LOGIN_CHATBOX=${EXTRAS_LOGIN_CHATBOX:-off}
- - EXTRAS_AUTH_SUPER_ADMIN_PASS=${EXTRAS_AUTH_SUPER_ADMIN_PASS:-}
- - EXTRAS_LOG_REQUEST=${EXTRAS_LOG_REQUEST:-off}
- depends_on:
- - mysql
- - redis
- - nacos
- - rabbitmq
-
- cskefu-channel-wechat-service:
- image: cskefu/cskefu-channel-wechat-service
- # container_name: cskefu-channel-wechat-service
- restart: always
- # ports:
- # - "${CSKEFU_CHANNEL_WECHAT_SERVICE_PORT:-8084}:8084"
- expose:
- - 8084
- volumes:
- - ./cskefu/logs:/cskefu/logs
- environment:
- - "JAVA_OPTS=-Xmx${CSKEFU_JAVA_XMX:-512m} -Xms${CSKEFU_JAVA_XMS:-512m} -XX:PermSize=128m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true --add-opens java.base/jdk.internal.misc=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true --illegal-access=warn"
- - LOGGING_LEVEL_ROOT=${LOGGING_LEVEL_ROOT:-INFO}
- - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/cskefu?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2B8
- - SPRING_DATASOURCE_USERNAME=root
- - SPRING_DATASOURCE_PASSWORD=${DB_PASSWD:-123456}
- # - SPRING_DATASOURCE_HIKARI_MAXIMUM_POOL_SIZE=100
- - SPRING_DATA_REDIS_HOST=redis
- - SPRING_DATA_REDIS_PORT=6379
- - SPRING_RABBITMQ_ADDRESSES=rabbitmq
- - SPRING_CLOUD_NACOS_DISCOVERY_SERVER_ADDR=nacos:8848
- - CACHE_SETUP_STRATEGY=${CACHE_SETUP_STRATEGY:-create_by_force}
- - BOT_THRESHOLD_FAQ_BEST_REPLY=${BOT_THRESHOLD_FAQ_BEST_REPLY:-0.9}
- - BOT_THRESHOLD_FAQ_SUGG_REPLY=${BOT_THRESHOLD_FAQ_SUGG_REPLY:-0.1}
- - TONGJI_BAIDU_SITEKEY=${TONGJI_BAIDU_SITEKEY:-placeholder}
- - EXTRAS_LOGIN_BANNER=${NOTICE_LOGIN_BANNER:-off}
- - EXTRAS_LOGIN_CHATBOX=${EXTRAS_LOGIN_CHATBOX:-off}
- - EXTRAS_AUTH_SUPER_ADMIN_PASS=${EXTRAS_AUTH_SUPER_ADMIN_PASS:-}
- - EXTRAS_LOG_REQUEST=${EXTRAS_LOG_REQUEST:-off}
- depends_on:
- - cskefu-auth-service
-
- cskefu-websocket-service:
- image: cskefu/cskefu-websocket-service
- # container_name: cskefu-websocket-service
- restart: always
- # ports:
- # - "${CSKEFU_WEBSOCKET_SERVICE_PORT:-10000}:10000"
- expose:
- - ${CSKEFU_WEBSOCKET_SERVICE_PORT:-10000}
- volumes:
- - ./cskefu/logs:/cskefu/logs
- deploy:
- replicas: 3
- environment:
- - "JAVA_OPTS=-Xmx${CSKEFU_JAVA_XMX:-512m} -Xms${CSKEFU_JAVA_XMS:-512m} -XX:PermSize=128m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true --add-opens java.base/jdk.internal.misc=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true --illegal-access=warn"
- - LOGGING_LEVEL_ROOT=${LOGGING_LEVEL_ROOT:-INFO}
- - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/cskefu?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2B8
- - SPRING_DATASOURCE_USERNAME=root
- - SPRING_DATASOURCE_PASSWORD=${DB_PASSWD:-123456}
- # - SPRING_DATASOURCE_HIKARI_MAXIMUM_POOL_SIZE=100
- - SPRING_DATA_REDIS_HOST=redis
- - SPRING_DATA_REDIS_PORT=6379
- - SPRING_RABBITMQ_ADDRESSES=rabbitmq
- - SPRING_CLOUD_NACOS_DISCOVERY_SERVER_ADDR=nacos:8848
- - CACHE_SETUP_STRATEGY=${CACHE_SETUP_STRATEGY:-create_by_force}
- - BOT_THRESHOLD_FAQ_BEST_REPLY=${BOT_THRESHOLD_FAQ_BEST_REPLY:-0.9}
- - BOT_THRESHOLD_FAQ_SUGG_REPLY=${BOT_THRESHOLD_FAQ_SUGG_REPLY:-0.1}
- - TONGJI_BAIDU_SITEKEY=${TONGJI_BAIDU_SITEKEY:-placeholder}
- - EXTRAS_LOGIN_BANNER=${NOTICE_LOGIN_BANNER:-off}
- - EXTRAS_LOGIN_CHATBOX=${EXTRAS_LOGIN_CHATBOX:-off}
- - EXTRAS_AUTH_SUPER_ADMIN_PASS=${EXTRAS_AUTH_SUPER_ADMIN_PASS:-}
- - EXTRAS_LOG_REQUEST=${EXTRAS_LOG_REQUEST:-off}
- depends_on:
- - mysql
- - redis
- - nacos
- - rabbitmq
-
mysql:
image: mysql:8.1
container_name: mysql
@@ -255,6 +46,24 @@ services:
depends_on:
- mysql
+ sentinel-dashboard:
+ image: cskefu/sentinel-dashboard
+ container_name: sentinel-dashboard
+ restart: always
+ hostname: sentinel-dashboard
+ ports:
+ - "${SENTINEL_DASHBOARD_PORT:-9850}:9850"
+ - "${SENTINEL_TRANSPORT_PORT:-9850}:9851"
+ expose:
+ - 9850
+ - 9851
+ environment:
+ - SPRING_CLOUD_SENTINEL_TRANSPORT_DASHBOARD=nacos:${SENTINEL_DASHBOARD_PORT:-9850}
+ - SPRING_CLOUD_SENTINEL_TRANSPORT_PORT=${SENTINEL_TRANSPORT_PORT:-9851}
+ depends_on:
+ - mysql
+ - nacos
+
redis:
image: redis:7.2.1-alpine3.18
container_name: redis
@@ -300,4 +109,171 @@ services:
- ./openresty/nginx.conf:/usr/local/openresty/nginx/conf/nginx.conf
depends_on:
- cskefu-web-gateway
- - cskefu-websocket-service
\ No newline at end of file
+ - cskefu-websocket-service
+
+ cskefu-web-gateway:
+ image: cskefu/cskefu-web-gateway
+ # container_name: cskefu-web-gateway
+ restart: always
+ # ports:
+ # - "${CSKEFU_WEB_GATEWAY_PORT:-8080}:8080"
+ expose:
+ - 8080
+ volumes:
+ - ./cskefu/logs:/cskefu/logs
+ deploy:
+ replicas: 3
+ environment:
+ - "JAVA_OPTS=-Xmx${CSKEFU_JAVA_XMX:-512m} -Xms${CSKEFU_JAVA_XMS:-512m} -XX:PermSize=128m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true --add-opens java.base/jdk.internal.misc=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true --illegal-access=warn"
+ - LOGGING_LEVEL_ROOT=${LOGGING_LEVEL_ROOT:-INFO}
+ - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/cskefu?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2B8
+ - SPRING_DATASOURCE_USERNAME=root
+ - SPRING_DATASOURCE_PASSWORD=${DB_PASSWD:-123456}
+ # - SPRING_DATASOURCE_HIKARI_MAXIMUM_POOL_SIZE=100
+ - SPRING_DATA_REDIS_HOST=redis
+ - SPRING_DATA_REDIS_PORT=6379
+ - SPRING_RABBITMQ_ADDRESSES=rabbitmq
+ - SPRING_RABBITMQ_PORT=${RABBITMQ_CLIENT_PORT:-5672}
+ - SPRING_CLOUD_NACOS_DISCOVERY_SERVER_ADDR=nacos:8848
+ depends_on:
+ - cskefu-auth-service
+ - cskefu-manager-service
+
+ cskefu-manager-service:
+ image: cskefu/cskefu-manager-service
+ # container_name: cskefu-manager-service
+ restart: always
+ # ports:
+ # - "${CSKEFU_MANAGER_SERVICE_PORT:-8081}:8081"
+ expose:
+ - 8081
+ volumes:
+ - ./cskefu/logs:/cskefu/logs
+ environment:
+ - "JAVA_OPTS=-Xmx${CSKEFU_JAVA_XMX:-512m} -Xms${CSKEFU_JAVA_XMS:-512m} -XX:PermSize=128m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true --add-opens java.base/jdk.internal.misc=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true --illegal-access=warn"
+ - LOGGING_LEVEL_ROOT=${LOGGING_LEVEL_ROOT:-INFO}
+ - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/cskefu?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2B8
+ - SPRING_DATASOURCE_USERNAME=root
+ - SPRING_DATASOURCE_PASSWORD=${DB_PASSWD:-123456}
+ # - SPRING_DATASOURCE_HIKARI_MAXIMUM_POOL_SIZE=100
+ - SPRING_DATA_REDIS_HOST=redis
+ - SPRING_DATA_REDIS_PORT=6379
+ - SPRING_RABBITMQ_ADDRESSES=rabbitmq
+ - SPRING_RABBITMQ_PORT=${RABBITMQ_CLIENT_PORT:-5672}
+ - SPRING_CLOUD_NACOS_DISCOVERY_SERVER_ADDR=nacos:8848
+ depends_on:
+ - mysql
+ - redis
+ - nacos
+ - rabbitmq
+
+ cskefu-auth-service:
+ image: cskefu/cskefu-auth-service
+ # container_name: cskefu-auth-service
+ restart: always
+ # ports:
+ # - "${CSKEFU_AUTH_SERVICE_PORT:-8082}:8082"
+ expose:
+ - 8082
+ volumes:
+ - ./cskefu/logs:/cskefu/logs
+ environment:
+ - "JAVA_OPTS=-Xmx${CSKEFU_JAVA_XMX:-512m} -Xms${CSKEFU_JAVA_XMS:-512m} -XX:PermSize=128m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true --add-opens java.base/jdk.internal.misc=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true --illegal-access=warn"
+ - LOGGING_LEVEL_ROOT=${LOGGING_LEVEL_ROOT:-INFO}
+ - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/cskefu?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2B8
+ - SPRING_DATASOURCE_USERNAME=root
+ - SPRING_DATASOURCE_PASSWORD=${DB_PASSWD:-123456}
+ # - SPRING_DATASOURCE_HIKARI_MAXIMUM_POOL_SIZE=100
+ - SPRING_DATA_REDIS_HOST=redis
+ - SPRING_DATA_REDIS_PORT=6379
+ - SPRING_RABBITMQ_ADDRESSES=rabbitmq
+ - SPRING_RABBITMQ_PORT=${RABBITMQ_CLIENT_PORT:-5672}
+ - SPRING_CLOUD_NACOS_DISCOVERY_SERVER_ADDR=nacos:8848
+ depends_on:
+ - mysql
+ - redis
+ - nacos
+ - rabbitmq
+
+ cskefu-plugin-service:
+ image: cskefu/cskefu-plugin-service
+ # container_name: cskefu-plugin-service
+ restart: always
+ # ports:
+ # - "${CSKEFU_PLUGIN_SERVICE_PORT:-8083}:8083"
+ expose:
+ - 8083
+ volumes:
+ - ./cskefu/logs:/cskefu/logs
+ environment:
+ - "JAVA_OPTS=-Xmx${CSKEFU_JAVA_XMX:-512m} -Xms${CSKEFU_JAVA_XMS:-512m} -XX:PermSize=128m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true --add-opens java.base/jdk.internal.misc=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true --illegal-access=warn"
+ - LOGGING_LEVEL_ROOT=${LOGGING_LEVEL_ROOT:-INFO}
+ - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/cskefu?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2B8
+ - SPRING_DATASOURCE_USERNAME=root
+ - SPRING_DATASOURCE_PASSWORD=${DB_PASSWD:-123456}
+ # - SPRING_DATASOURCE_HIKARI_MAXIMUM_POOL_SIZE=100
+ - SPRING_DATA_REDIS_HOST=redis
+ - SPRING_DATA_REDIS_PORT=6379
+ - SPRING_RABBITMQ_ADDRESSES=rabbitmq
+ - SPRING_RABBITMQ_PORT=${RABBITMQ_CLIENT_PORT:-5672}
+ - SPRING_CLOUD_NACOS_DISCOVERY_SERVER_ADDR=nacos:8848
+ depends_on:
+ - mysql
+ - redis
+ - nacos
+ - rabbitmq
+
+ cskefu-channel-wechat-service:
+ image: cskefu/cskefu-channel-wechat-service
+ # container_name: cskefu-channel-wechat-service
+ restart: always
+ # ports:
+ # - "${CSKEFU_CHANNEL_WECHAT_SERVICE_PORT:-8084}:8084"
+ expose:
+ - 8084
+ volumes:
+ - ./cskefu/logs:/cskefu/logs
+ environment:
+ - "JAVA_OPTS=-Xmx${CSKEFU_JAVA_XMX:-512m} -Xms${CSKEFU_JAVA_XMS:-512m} -XX:PermSize=128m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true --add-opens java.base/jdk.internal.misc=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true --illegal-access=warn"
+ - LOGGING_LEVEL_ROOT=${LOGGING_LEVEL_ROOT:-INFO}
+ - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/cskefu?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2B8
+ - SPRING_DATASOURCE_USERNAME=root
+ - SPRING_DATASOURCE_PASSWORD=${DB_PASSWD:-123456}
+ # - SPRING_DATASOURCE_HIKARI_MAXIMUM_POOL_SIZE=100
+ - SPRING_DATA_REDIS_HOST=redis
+ - SPRING_DATA_REDIS_PORT=6379
+ - SPRING_RABBITMQ_ADDRESSES=rabbitmq
+ - SPRING_RABBITMQ_PORT=${RABBITMQ_CLIENT_PORT:-5672}
+ - SPRING_CLOUD_NACOS_DISCOVERY_SERVER_ADDR=nacos:8848
+ depends_on:
+ - cskefu-auth-service
+
+ cskefu-websocket-service:
+ image: cskefu/cskefu-websocket-service
+ # container_name: cskefu-websocket-service
+ restart: always
+ # ports:
+ # - "${CSKEFU_WEBSOCKET_SERVICE_PORT:-10000}:10000"
+ expose:
+ - ${CSKEFU_WEBSOCKET_SERVICE_PORT:-10000}
+ volumes:
+ - ./cskefu/logs:/cskefu/logs
+ deploy:
+ replicas: 2
+ environment:
+ - "JAVA_OPTS=-Xmx${CSKEFU_JAVA_XMX:-512m} -Xms${CSKEFU_JAVA_XMS:-512m} -XX:PermSize=128m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true --add-opens java.base/jdk.internal.misc=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true --illegal-access=warn"
+ - LOGGING_LEVEL_ROOT=${LOGGING_LEVEL_ROOT:-INFO}
+ - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/cskefu?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2B8
+ - SPRING_DATASOURCE_USERNAME=root
+ - SPRING_DATASOURCE_PASSWORD=${DB_PASSWD:-123456}
+ # - SPRING_DATASOURCE_HIKARI_MAXIMUM_POOL_SIZE=100
+ - SPRING_DATA_REDIS_HOST=redis
+ - SPRING_DATA_REDIS_PORT=6379
+ - SPRING_RABBITMQ_ADDRESSES=rabbitmq
+ - SPRING_RABBITMQ_PORT=${RABBITMQ_CLIENT_PORT:-5672}
+ - SPRING_CLOUD_NACOS_DISCOVERY_SERVER_ADDR=nacos:8848
+ depends_on:
+ - mysql
+ - redis
+ - nacos
+ - rabbitmq
diff --git a/containerization/dockerfiles/sentinel-dashboard-1.8.6 b/containerization/dockerfiles/sentinel-dashboard-1.8.6
new file mode 100644
index 00000000..5a817158
--- /dev/null
+++ b/containerization/dockerfiles/sentinel-dashboard-1.8.6
@@ -0,0 +1,4 @@
+FROM cskefu/openjdk-21:debian-stretch-slim
+COPY sentinel-dashboard-1.8.6.jar sentinel-dashboard-1.8.6.jar
+
+ENTRYPOINT java -Dserver.port=9850 -jar sentinel-dashboard-1.8.6.jar
diff --git a/containerization/sample.env b/containerization/sample.env
index 5c824ba8..25c8ded7 100644
--- a/containerization/sample.env
+++ b/containerization/sample.env
@@ -18,6 +18,8 @@ LOGGING_LEVEL_ROOT=INFO
#CSKEFU_PLUGIN_SERVICE_PORT:-8083
#CSKEFU_CHANNEL_WECHAT_SERVICE_PORT:-8084
CSKEFU_WEBSOCKET_SERVICE_PORT:10000
+SENTINEL_DASHBOARD_PORT:8849
+SENTINEL_DASHBOARD_PORT:8849
NGINX_HTTP_PORT=80
NGINX_SSL_PORT=443
@@ -39,8 +41,3 @@ MYSQL_PASSWORD=123456
## https://docs.cskefu.com/docs/work-chatbot/
BOT_THRESHOLD_FAQ_BEST_REPLY=0.8
BOT_THRESHOLD_FAQ_SUGG_REPLY=0.6
-
-TONGJI_BAIDU_SITEKEY=placeholder
-EXTRAS_LOGIN_BANNER=""
-EXTRAS_LOGIN_CHATBOX=
-EXTRAS_AUTH_SUPER_ADMIN_PASS=
diff --git a/containerization/scripts/build.sh b/containerization/scripts/build.sh
index dcd8f954..c35ed86b 100644
--- a/containerization/scripts/build.sh
+++ b/containerization/scripts/build.sh
@@ -4,6 +4,14 @@ docker build -f openjdk-21-debian-stretch-slim -t openjdk-21:debian-stretch-slim
docker tag openjdk-21:debian-stretch-slim cskefu/openjdk-21:debian-stretch-slim
+
+docker build -f sentinel-dashboard-1.8.6 -t sentinel-dashboard:1.8.6 .
+
+docker tag sentinel-dashboard:1.8.6 cskefu/sentinel-dashboard:1.8.6
+
+docker tag sentinel-dashboard:1.8.6 cskefu/sentinel-dashboard:latest
+
docker login
+docker push cskefu/sentinel-dashboard:1.8.6
docker push cskefu/openjdk-21:debian-stretch-slim
diff --git a/cskefu-backend/cskefu-gateway/cskefu-web-gateway/pom.xml b/cskefu-backend/cskefu-gateway/cskefu-web-gateway/pom.xml
index 87cb97ab..e8eced01 100644
--- a/cskefu-backend/cskefu-gateway/cskefu-web-gateway/pom.xml
+++ b/cskefu-backend/cskefu-gateway/cskefu-web-gateway/pom.xml
@@ -22,6 +22,10 @@
com.alibaba.cloud
spring-cloud-starter-alibaba-nacos-discovery
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-sentinel
+
org.springframework.boot
spring-boot-starter-validation
diff --git a/cskefu-backend/cskefu-gateway/cskefu-web-gateway/src/main/java/com/cskefu/CskefuWebGatewayApplication.java b/cskefu-backend/cskefu-gateway/cskefu-web-gateway/src/main/java/com/cskefu/CskefuWebGatewayApplication.java
index 0b8a4a21..24e80318 100644
--- a/cskefu-backend/cskefu-gateway/cskefu-web-gateway/src/main/java/com/cskefu/CskefuWebGatewayApplication.java
+++ b/cskefu-backend/cskefu-gateway/cskefu-web-gateway/src/main/java/com/cskefu/CskefuWebGatewayApplication.java
@@ -3,6 +3,7 @@ package com.cskefu;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/cskefu-backend/cskefu-gateway/cskefu-web-gateway/src/main/resources/application.properties b/cskefu-backend/cskefu-gateway/cskefu-web-gateway/src/main/resources/application.properties
index 3a91d858..6afaf7f1 100644
--- a/cskefu-backend/cskefu-gateway/cskefu-web-gateway/src/main/resources/application.properties
+++ b/cskefu-backend/cskefu-gateway/cskefu-web-gateway/src/main/resources/application.properties
@@ -2,9 +2,14 @@ debug=true
server.port=8080
spring.application.name=cskefu-web-gateway
-spring.datasource.password=123456
+spring.cloud.nacos.server-addr=localhost:8848
-spring.cloud.nacos.discovery.server-addr=localhost:8848
+# ????
+spring.cloud.nacos.discovery.server-addr=${spring.cloud.nacos.server-addr}
+
+# sentinel
+spring.cloud.sentinel.transport.dashboard=localhost:9850
+spring.cloud.sentinel.transport.port=9851
spring.mvc.static-path-pattern=/smart-doc/**
-spring.web.resources.static-locations=classpath:/smart-doc
\ No newline at end of file
+spring.web.resources.static-locations=classpath:/smart-doc