diff --git a/admin-framework/admin-convert-pdf/pom.xml b/admin-framework/admin-convert-pdf/pom.xml index 8701ab87..07b2dd2c 100644 --- a/admin-framework/admin-convert-pdf/pom.xml +++ b/admin-framework/admin-convert-pdf/pom.xml @@ -48,7 +48,7 @@ aspose-cells 20.7 system - ${project.basedir}/src/main/resources/lib/aspose-cells-20.7.jar + ${project.basedir}/src/main/resources/lib/aspose-cells-20.7-crack.jar diff --git a/admin-framework/admin-convert-pdf/src/main/resources/lib/aspose-cells-20.7.jar b/admin-framework/admin-convert-pdf/src/main/resources/lib/aspose-cells-20.7-crack.jar similarity index 100% rename from admin-framework/admin-convert-pdf/src/main/resources/lib/aspose-cells-20.7.jar rename to admin-framework/admin-convert-pdf/src/main/resources/lib/aspose-cells-20.7-crack.jar diff --git a/web/tianze.conf b/web/tianze.conf index 68a15b70..5b0a4bd5 100644 --- a/web/tianze.conf +++ b/web/tianze.conf @@ -1,31 +1,39 @@ server { - listen 8080; - server_name 116.205.131.177; + listen 80; + server_name zycloud.sztzjy.com; client_max_body_size 100M; - - - location /static/ { - alias /www/wwwroot/tianze/static/; - } - - location / { - try_files $uri $uri/ @router; - root /www/wwwroot/tianze; - index index.html index.htm; + + # 后台资源文件存放位置 + location /server/filesystem/ { + alias /data/dev/web/filesystem/; } location /server { - proxy_pass http://127.0.0.1:9090/server/; - proxy_set_header Host $proxy_host; - proxy_set_header X-Real-IP $remote_addr; + proxy_pass http://127.0.0.1:9090/server; + proxy_set_header Host $proxy_host; + proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; + proxy_set_header Upgrade $http_upgrade; + } + + location / { + try_files $uri $uri/ @router ; + root /www/wwwroot/tianze/dist; + index index.html index.htm; } + location /static { + alias /www/wwwroot/tianze/dist/static/; + } + + # 前台资源文件存放位置 + location /filesystem/ { + alias /data/dev/web/filesystem/; + } + location @router { rewrite ^.*$ /index.html last; }