From 771c38f9fed7ab50b5b7ea4f0669dac2f378e5e4 Mon Sep 17 00:00:00 2001 From: kerwincui <164770707@qq.com> Date: Mon, 25 Mar 2024 10:10:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0docker=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/data/docker-compose-emqx.yml | 117 ------------------ .../{wumei-admin.jar => fastbee-admin.jar} | Bin docker/data/java/放置server.jar包.txt | 1 - docker/data/nginx/nginx-emqx.conf | 91 -------------- 4 files changed, 209 deletions(-) delete mode 100644 docker/data/docker-compose-emqx.yml rename docker/data/java/{wumei-admin.jar => fastbee-admin.jar} (100%) delete mode 100644 docker/data/java/放置server.jar包.txt delete mode 100644 docker/data/nginx/nginx-emqx.conf diff --git a/docker/data/docker-compose-emqx.yml b/docker/data/docker-compose-emqx.yml deleted file mode 100644 index e33883c3..00000000 --- a/docker/data/docker-compose-emqx.yml +++ /dev/null @@ -1,117 +0,0 @@ -version: '2' - -networks: - network: - ipam: - driver: default - config: - - subnet: '177.7.0.0/16' - -services: - redis: - image: redis:7.0.0 - container_name: redis - ports: - - 6379:6379 - privileged: true - networks: - network: - ipv4_address: 177.7.0.10 - volumes: - - /var/data/redis:/usr/local/etc/redis - - /var/data/redis/data:/data - command: [ '-- requirepass fastbee', '-- appendonly yes' ] - - mysql: - image: mysql:5.7 - container_name: mysql - ports: - - 3306:3306 - privileged: true - networks: - network: - ipv4_address: 177.7.0.11 - volumes: - - /var/data/mysql/mysql:/var/lib/mysql - - /var/data/mysql/mysql.cnf:/etc/mysql/conf.d/mysql.cnf - - /var/data/mysql/initdb:/docker-entrypoint-initdb.d - environment: - MYSQL_DATABASE: fastbee - MYSQL_ROOT_PASSWORD: fastbee - command: - [ - 'mysqld', - '--character-set-server=utf8', - '--collation-server=utf8_unicode_ci', - '--default-time-zone=+8:00', - '--lower-case-table-names=1' - ] - - emqx: - image: emqx:5.1 - container_name: emqx - ports: - - 1883:1883 - - 8083:8083 - - 8084:8084 - - 18083:18083 - privileged: true - networks: - network: - ipv4_address: 177.7.0.12 - volumes: - - /etc/localtime:/etc/localtime - - /var/data/emqx/etc/emqx.conf:/opt/emqx/etc/emqx.conf - - /var/data/emqx/etc/acl.conf:/opt/emqx/etc/acl.conf - - /var/data/emqx/etc/log:/opt/emqx/log - - /var/data/emqx/data/:/opt/emqx/data - environment: - SET_CONTAINER_TIMEZONE: "true" - CONTAINER_TIMEZONE: Asia/Shanghai - - java: - image: openjdk:8-jre - container_name: java - ports: - - 8080:8080 - - 8888:8888 - - 8889:8889/udp - - 5061:5061/udp - privileged: true - networks: - network: - ipv4_address: 177.7.0.13 - depends_on: - - emqx - - redis - - mysql - - tdengine - volumes: - - /var/data/java/fastbee-admin.jar:/server.jar - - /var/data/java/libtaos.so:/usr/lib/libtaos.so - - /var/data/java/uploadPath:/uploadPath - - /var/data/java/logs:/logs - - /etc/localtime:/etc/localtime - environment: - TZ: Asia/Shanghai - entrypoint: java -jar /server.jar - - nginx: - image: nginx:stable - container_name: nginx - ports: - - 80:80 - - 443:443 - privileged: true - networks: - network: - ipv4_address: 177.7.0.15 - depends_on: - - java - volumes: - - /var/data/nginx/vue:/usr/share/nginx/html - - /var/data/nginx/h5:/usr/share/nginx/h5 - - /var/data/nginx/www:/usr/share/nginx/www - - /var/data/nginx/ssl:/usr/share/nginx/ssl - - /var/data/nginx/nginx-emqx.conf:/etc/nginx/nginx.conf - - /var/data/nginx:/var/log/nginx diff --git a/docker/data/java/wumei-admin.jar b/docker/data/java/fastbee-admin.jar similarity index 100% rename from docker/data/java/wumei-admin.jar rename to docker/data/java/fastbee-admin.jar diff --git a/docker/data/java/放置server.jar包.txt b/docker/data/java/放置server.jar包.txt deleted file mode 100644 index 6528d00f..00000000 --- a/docker/data/java/放置server.jar包.txt +++ /dev/null @@ -1 +0,0 @@ -springboot打包后的文件改名为server.jar diff --git a/docker/data/nginx/nginx-emqx.conf b/docker/data/nginx/nginx-emqx.conf deleted file mode 100644 index ac928c83..00000000 --- a/docker/data/nginx/nginx-emqx.conf +++ /dev/null @@ -1,91 +0,0 @@ -worker_processes 1; - -events { - worker_connections 1024; -} - -http { - include mime.types; - default_type application/octet-stream; - sendfile on; - keepalive_timeout 65; - - gzip on; - gzip_min_length 1k; - gzip_buffers 16 64K; - gzip_http_version 1.1; - gzip_comp_level 5; - gzip_types text/plain application/javascript application/x-javascript text/javascript text/css application/xml; - gzip_vary on; - gzip_proxied expired no-cache no-store private auth; - gzip_disable "MSIE [1-6]\."; - - # Http跳转Https - # server { - # listen 80; - # server_name localhost; - # location / { - # rewrite ^(.*) https://$server_name$1 permanent; - # } - # } - - server { - listen 80; - - # SSL 默认访问端口号为443 - listen 443 ssl; - server_name localhost; - charset utf-8; - - # 证书文件的路径 - ssl_certificate /usr/share/nginx/ssl/fastbee.crt; - # 私钥文件的路径 - ssl_certificate_key /usr/share/nginx/ssl/fastbee.key; - ssl_session_timeout 10m; - # 请按照以下协议配置 - ssl_protocols TLSv1.2 TLSv1.3; - # 请按照以下套件配置，配置加密套件，写法遵循openssl 标准 - ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4; - ssl_prefer_server_ciphers on; - - # 前端 - location / { - root /usr/share/nginx/html; - try_files $uri $uri/ /index.html; - index index.html index.htm; - } - - # H5移动端 - location /h5 { - alias /usr/share/nginx/h5/; - try_files $uri $uri/ /index.html; - index index.html index.htm; - } - - # 后端接口 - location /prod-api/ { - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header REMOTE-HOST $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://java:8080/; - } - - # wss连接代理到ws - location /mqtt { - proxy_pass http://emqx:8083/mqtt; - proxy_read_timeout 60s; - proxy_set_header Host $host; - proxy_set_header X-Real_IP $remote_addr; - proxy_set_header X-Forwarded-for $remote_addr; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'Upgrade'; - } - - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root html; - } - } -} \ No newline at end of file