Browse Source

no message

mac 2 years ago
parent
commit
4907ddb53d
2 changed files with 70 additions and 64 deletions
  1. 1 1
      db/Dockerfile
  2. 69 63
      docker-compose.yml

+ 1 - 1
db/Dockerfile

@@ -1,4 +1,4 @@
-FROM mysql/mysql-server:8.0.32
+FROM mysql/mysql-server:8.0.36
 
 ENV TZ=Asia/Shanghai
 

+ 69 - 63
docker-compose.yml

@@ -35,7 +35,7 @@ services:
       - MYSQL_SERVICE_USER=root
       - MYSQL_SERVICE_PASSWORD=root
       - MYSQL_SERVICE_DB_NAME=kxs_config
-      - MYSQL_SERVICE_DB_PARAM=characterEncoding=utf8&connectTimeout=10000&socketTimeout=30000&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true
+      - MYSQL_SERVICE_DB_PARAM=characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
       # 开启鉴权
       - NACOS_AUTH_ENABLE=true
       - NACOS_AUTH_IDENTITY_KEY=2222
@@ -47,6 +47,9 @@ services:
       - "8848:8848"
       - "9848:9848"
     restart: always
+    depends_on:
+      kxs-mysql:
+        condition: service_healthy
     networks:
       - kxs_cloud_network
 
@@ -60,68 +63,68 @@ services:
     networks:
       - kxs_cloud_network
 
-  kxs-gateway:
-    build:
-      context: ./kxs-gateway
-    restart: always
-    ports:
-      - 9999:9999
-    container_name: kxs-gateway
-    hostname: kxs-gateway
-    image: kxs-gateway
-    networks:
-      - kxs_cloud_network
-
-  kxs-system:
-    build:
-      context: ./kxs-system/kxs-system-biz
-    restart: always
-    container_name: kxs-system
-    hostname: kxs-system
-    image: kxs-system
-    volumes:
-      - ./logs/kxs-system-biz:/kxs-system-biz/logs
-    networks:
-      - kxs_cloud_network
-
-  kxs-codegen:
-    build:
-      context: ./kxs-codegen
-    restart: always
-    container_name: kxs-codegen
-    hostname: kxs-codegen
-    image: kxs-codegen
-    volumes:
-      - ./logs/kxs-codegen:/kxs-codegen/logs
-    networks:
-      - kxs_cloud_network
-
-  kxs-quartz:
-    build:
-      context: ./kxs-quartz
-    restart: always
-    image: kxs-quartz
-    container_name: kxs-quartz
-    networks:
-      - kxs_cloud_network
-
-  kxs-rabbitmq:
-    image: rabbitmq:3.12.8
-    container_name: kxs-rabbitmq
-    restart: always
-    volumes:
-      - "/usr/share/zoneinfo/Asia/Shanghai:/etc/localtime"        #设置系统时区
-      - "/usr/share/zoneinfo/Asia/Shanghai:/etc/timezone"  #设置时区
-      - "./data/rabbit/:/var/lib/rabbitmq/"
-      - "./logs/rabbit:/var/log/rabbitmq/"
-    ports:
-      - 5672:5672
-      - 15672:15672
-    environment:
-      - RABBITMQ_DEFAULT_USER=admin
-      - RABBITMQ_DEFAULT_PASS=admin
-    networks:
-      - kxs_cloud_network
+#  kxs-gateway:
+#    build:
+#      context: ./kxs-gateway
+#    restart: always
+#    ports:
+#      - 9999:9999
+#    container_name: kxs-gateway
+#    hostname: kxs-gateway
+#    image: kxs-gateway
+#    networks:
+#      - kxs_cloud_network
+#
+#  kxs-system:
+#    build:
+#      context: ./kxs-system/kxs-system-biz
+#    restart: always
+#    container_name: kxs-system
+#    hostname: kxs-system
+#    image: kxs-system
+#    volumes:
+#      - ./logs/kxs-system-biz:/kxs-system-biz/logs
+#    networks:
+#      - kxs_cloud_network
+#
+#  kxs-codegen:
+#    build:
+#      context: ./kxs-codegen
+#    restart: always
+#    container_name: kxs-codegen
+#    hostname: kxs-codegen
+#    image: kxs-codegen
+#    volumes:
+#      - ./logs/kxs-codegen:/kxs-codegen/logs
+#    networks:
+#      - kxs_cloud_network
+#
+#  kxs-quartz:
+#    build:
+#      context: ./kxs-quartz
+#    restart: always
+#    image: kxs-quartz
+#    container_name: kxs-quartz
+#    networks:
+#      - kxs_cloud_network
+#
+#  kxs-rabbitmq:
+#    image: rabbitmq:3.12.8
+#    container_name: kxs-rabbitmq
+#    restart: always
+#    volumes:
+#      - "/usr/share/zoneinfo/Asia/Shanghai:/etc/localtime"        #设置系统时区
+#      - "/usr/share/zoneinfo/Asia/Shanghai:/etc/timezone"  #设置时区
+#      - "./data/rabbit/:/var/lib/rabbitmq/"
+#      - "./logs/rabbit:/var/log/rabbitmq/"
+#    ports:
+#      - 5672:5672
+#      - 15672:15672
+#    environment:
+#      - RABBITMQ_DEFAULT_USER=admin
+#      - RABBITMQ_DEFAULT_PASS=admin
+#    networks:
+#      - kxs_cloud_network
 
 #  kxs-mongo:
 #    image: mongo:6.0.3
@@ -147,6 +150,8 @@ services:
     restart: always
     container_name: kxs-seata
     image: seataio/seata-server:1.8.0
+    depends_on:
+      - kxs-mysql
     ports:
       - "7091:7091"
       - "8091:8091"
@@ -168,3 +173,4 @@ services:
 
 networks:
   kxs_cloud_network:
+    name: kxs_cloud_network