增加大屏部署

docker-compose-dbapi.yml

@@ -10,6 +10,11 @@ services:
       - DB_DRIVER=com.mysql.cj.jdbc.Driver
       - IOT_TWINBORN_FILE_LOCATION=/upload
       - IOT_CONFIG_DATASOURCE=classpath:ds.xml
+      - IOT_V3_DATASOURCE_URL=jdbc:postgresql://192.168.10.23:32910/hsiotdb
+      - IOT_V3_DATASOURCE_PASSWORD=huansi.net@v3
+      - IOT_V3_DATASOURCE_USERNAME=postgres
+      - IOT_V3_REDIS_HOST=192.168.10.23
+      - IOT_V3_REDIS_PORT=6380
     volumes:
       - ./upload:/upload
     ports:

docker-compose-web.yml

@@ -6,3 +6,12 @@ services:
     ports:
       - "8521:80"
     restart: always
+  
+  sdhl-dashboard:
+    image: 47.110.145.204:8084/huansiyl/sdhl-iot/hengli-dashboard:dev
+    container_name: sdhl-dashboard
+    ports:
+      - "8525:80"
+    volumes:
+      - ./web-conf/nginx.conf:/etc/nginx/nginx.conf
+    restart: always
\ No newline at end of file

web-conf/nginx.conf

@@ -15,35 +15,37 @@ http {
   access_log  /var/log/nginx/access.log  main;
   sendfile        on;
   keepalive_timeout  65;
-  client_max_body_size 10m;
+  client_max_body_size 500m;
+
 
-  upstream hscloudApi {
-    server htwin-dbapi:8520;
-  }
 
   server {
       listen       80;
       server_name  127.0.0.1;
+
+      # compression-webpack-plugin 配置
+      gzip on;
+      gzip_min_length 1k;
+      gzip_comp_level 9;
+      gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
+      gzip_vary on;
+      # 配置禁用 gzip 条件，支持正则，此处表示 ie6 及以下不启用 gzip（因为ie低版本不支持）
+      gzip_disable "MSIE [1-6]\.";
+
+
       location / {
-      root   /app;
+          root   /usr/share/nginx/html;
           index  index.html;
           try_files $uri $uri/ /index.html;
       }
       
       # 代理配置，解决跨域问题
-      location /api/ {
+      location /prod/ {
           proxy_set_header Host $host;
           proxy_set_header X-Real-IP $remote_addr;
           proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-          proxy_pass http://hscloudApi/;
+          proxy_pass http://htwin-dbapi:8520/;
       }    
-        location /test-api/ {
-         proxy_set_header Host $host;
-         proxy_set_header X-Real-IP $remote_addr;
-         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-          proxy_pass http://hscloudApi/;
-        }
-      
     
       error_page   500 502 503 504  /50x.html;
       location = /50x.html {