Merge branch 'main' of http://th.local.t-aaron.com:13000/THENG/a-cloud-all

docker/nginx/conf/nginx.conf

@@ -20,21 +20,17 @@ http {
             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://ruoyi-gateway:8080/;
-
-            # 支持长时间命令执行
             proxy_connect_timeout 300s;
             proxy_send_timeout 300s;
             proxy_read_timeout 300s;
         }
 
-        # 避免actuator暴露
         if ($uri ~ "/actuator") {
             return 403;
         }

docker/ruoyi/modules/device/dockerfile

@@ -12,4 +12,4 @@ WORKDIR /home/ruoyi
 # 复制jar文件到路径
 COPY ./jar/tuoheng-device.jar /home/ruoyi/tuoheng-device.jar
 # 启动系统服务
-ENTRYPOINT ["java","-jar","tuoheng-device.jar"]
+ENTRYPOINT ["java","-jar","tuoheng-device.jar","--spring.flyway.validate-on-migrate=false"]