Merge pull request #309 from jumpserver/dev

baijiangjie · web-flow · commit dbd53196a8a4 · 2025-12-18T17:37:26.000+08:00
v4.10.14
diff --git a/Dockerfile-ee b/Dockerfile-ee
@@ -1,5 +1,5 @@
 ARG VERSION=dev
-FROM jumpserver/web-static:20251120_103310 AS static
+FROM jumpserver/web-static:20251218_093045 AS static
 FROM jumpserver/web:${VERSION}-ce
 
 COPY --from=static /opt/ /opt/
diff --git a/default.conf b/default.conf
@@ -47,7 +47,7 @@ server {
     }
 
     location @redirect_oss {
-        rewrite ^/download/(.*)$ http://static.jumpserver.org/download/$1 permanent;
+        rewrite ^/download/(.*)$ https://static.jumpserver.org/download/$1 permanent;
     }
 
     location / {
diff --git a/versions.txt b/versions.txt
@@ -11,4 +11,4 @@ OPENSSH_VERSION=v9.4.0.0
 MONGOSH_VERSION=2.2.12
 TINKER_VERSION=v0.2.2
 VIDEO_PLAYER_VERSION=0.6.0
-CLIENT_VERSION=4.0.0
+CLIENT_VERSION=4.1.0

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ server {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`location @redirect_oss {`
`50`		`- rewrite ^/download/(.*)$ http://static.jumpserver.org/download/$1 permanent;`
	`50`	`+ rewrite ^/download/(.*)$ https://static.jumpserver.org/download/$1 permanent;`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`location / {`