Merge pull request eyebluecn#175 from eyebluecn/v3.1.6

V3.1.6
myvoyage · May 1, 2022 · 60c8843 · 60c8843
2 parents 6626afa + f779053
commit 60c8843
Show file tree

Hide file tree

Showing 17 changed files with 38 additions and 25 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -27,7 +27,7 @@ docker container prune
 # 构建新版本 (最后的.不能少)
 docker build -t eyeblue/tank:x.x.x .
 # 本地测试
-docker run --name dockermysql -p 13306:3306 -e MYSQL_ROOT_PASSWORD=123456 -e MYSQL_DATABASE=tank -e MYSQL_USER=tank -e MYSQL_PASSWORD=tank123 -v ~/data/dockermysql:/var/lib/mysql -d mysql:5.7
+docker run --name dockermysql -p 13306:3306 -e MYSQL_ROOT_PASSWORD=123456 -e MYSQL_DATABASE=tank -e MYSQL_USER=tank -e MYSQL_PASSWORD=tank123 -v ~/data/dockermysql:/var/lib/mysql -e TZ=Asia/Shanghai -d mysql:5.7 --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
 docker run --name tank -p 6010:6010 --link dockermysql:mysql -v ~/data/dockermatter:/data/build/matter -d eyeblue/tank:x.x.x
 # 没问题后，推送到远程
 docker push eyeblue/tank:x.x.x

diff --git a/Dockerfile b/Dockerfile
@@ -16,6 +16,10 @@ VOLUME /data/build/matter
 # proxy
 ENV GOPROXY=https://goproxy.cn
 
+# Handle time-zone
+ENV TZ=Asia/Shanghai
+RUN apt-get install -y tzdata
+
 # prepare the config file
 RUN go build \
     && cp -r /data/tank /data/build

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [English Version](https://tank-doc.eyeblue.cn/en)
 
-# 蓝眼云盘（3.1.5）
+# 蓝眼云盘（3.1.6）
 [在线Demo](https://tanker.eyeblue.cn) (体验账号： demo 密码：123456)
 
 蓝眼云盘是蓝眼开源系列代表作品之一，致力于打造精致，优雅，简约的云盘。核心功能如下：

diff --git a/build/html/asset-manifest.json b/build/html/asset-manifest.json
@@ -1,7 +1,7 @@
 {
   "files": {
-    "main.css": "/static/css/main.8994a208.css",
-    "main.js": "/static/js/main.7a2a6dcd.js",
+    "main.css": "/static/css/main.b03c51fb.css",
+    "main.js": "/static/js/main.b94b1947.js",
     "static/media/logo.png": "/static/media/logo.847e54ef7fb4b744fad4.png",
     "static/media/empty.svg": "/static/media/empty.20ceb38d310075aa4c3cdaae210afb65.svg",
     "static/media/psd.svg": "/static/media/psd.bf2ac5411c0132f292787f45855934f2.svg",
@@ -18,11 +18,11 @@
     "static/media/folder.svg": "/static/media/folder.0bdd7430280c98bf4970b6af5a061c2c.svg",
     "static/media/archive.svg": "/static/media/archive.684c1e42f233aa9d53a8910d4fee091e.svg",
     "index.html": "/index.html",
-    "main.8994a208.css.map": "/static/css/main.8994a208.css.map",
-    "main.7a2a6dcd.js.map": "/static/js/main.7a2a6dcd.js.map"
+    "main.b03c51fb.css.map": "/static/css/main.b03c51fb.css.map",
+    "main.b94b1947.js.map": "/static/js/main.b94b1947.js.map"
   },
   "entrypoints": [
-    "static/css/main.8994a208.css",
-    "static/js/main.7a2a6dcd.js"
+    "static/css/main.b03c51fb.css",
+    "static/js/main.b94b1947.js"
   ]
 }
diff --git a/build/html/index.html b/build/html/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="eyeblue tank"/><title>EyeblueTank</title><script defer="defer" src="/static/js/main.7a2a6dcd.js"></script><link href="/static/css/main.8994a208.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run EyeblueTank.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="eyeblue tank"/><title>EyeblueTank</title><script defer="defer" src="/static/js/main.b94b1947.js"></script><link href="/static/css/main.b03c51fb.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run EyeblueTank.</noscript><div id="root"></div></body></html>
diff --git a/build/html/static/css/main.8994a208.css b/build/html/static/css/main.8994a208.css
diff --git a/build/html/static/css/main.8994a208.css.map b/build/html/static/css/main.8994a208.css.map
diff --git a/build/html/static/css/main.b03c51fb.css b/build/html/static/css/main.b03c51fb.css
diff --git a/build/html/static/css/main.b03c51fb.css.map b/build/html/static/css/main.b03c51fb.css.map
diff --git a/build/html/static/js/main.7a2a6dcd.js → build/html/static/js/main.b94b1947.js b/build/html/static/js/main.7a2a6dcd.js → build/html/static/js/main.b94b1947.js
diff --git a/...ml/static/js/main.7a2a6dcd.js.LICENSE.txt → ...ml/static/js/main.b94b1947.js.LICENSE.txt b/...ml/static/js/main.7a2a6dcd.js.LICENSE.txt → ...ml/static/js/main.b94b1947.js.LICENSE.txt
diff --git a/build/html/static/js/main.7a2a6dcd.js.map → build/html/static/js/main.b94b1947.js.map b/build/html/static/js/main.7a2a6dcd.js.map → build/html/static/js/main.b94b1947.js.map
diff --git a/build/pack/build.bat b/build/pack/build.bat
@@ -11,7 +11,7 @@
 @REM prepare the variables.
 
 @REM  version name
-SET VERSION_NAME=tank-3.1.5
+SET VERSION_NAME=tank-3.1.6
 ECHO VERSION_NAME: %VERSION_NAME%
 @REM  golang proxy
 SET GOPROXY=https://goproxy.cn

diff --git a/build/pack/build.sh b/build/pack/build.sh
@@ -10,7 +10,7 @@ set -e
 #prepare the variables.
 
 # version name
-VERSION_NAME=tank-3.1.5
+VERSION_NAME=tank-3.1.6
 echo "VERSION_NAME: ${VERSION_NAME}"
 #  golang proxy
 GOPROXY=https://goproxy.cn

diff --git a/code/core/config.go b/code/core/config.go
@@ -14,7 +14,7 @@ const (
 	//db table's prefix. tank31_ means current version is tank:3.1.x
 	TABLE_PREFIX = "tank31_"
 
-	VERSION = "3.1.5"
+	VERSION = "3.1.6"
 )
 
 type Config interface {

diff --git a/code/rest/share_controller.go b/code/rest/share_controller.go
@@ -278,6 +278,10 @@ func (this *ShareController) Browse(writer http.ResponseWriter, request *http.Re
 	user := this.findUser(request)
 	share := this.shareService.CheckShare(request, shareUuid, code, user)
 	bridges := this.bridgeDao.FindByShareUuid(share.Uuid)
+	shareOwner := this.userDao.FindByUuid(share.UserUuid)
+	if shareOwner.Status == USER_STATUS_DISABLED {
+		panic(result.BadRequestI18n(request, i18n.UserDisabled))
+	}
 
 	if puuid == MATTER_ROOT {
 

diff --git a/code/rest/share_service.go b/code/rest/share_service.go
@@ -92,6 +92,11 @@ func (this *ShareService) ValidateMatter(request *http.Request, shareUuid string
 
 	share := this.CheckShare(request, shareUuid, code, user)
 
+	shareOwner := this.userDao.FindByUuid(share.UserUuid)
+	if shareOwner.Status == USER_STATUS_DISABLED {
+		panic(result.BadRequestI18n(request, i18n.UserDisabled))
+	}
+
 	//if shareRootUuid is root. Bridge must has record.
 	if shareRootUuid == MATTER_ROOT {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="eyeblue tank"/><title>EyeblueTank</title><script defer="defer" src="/static/js/main.7a2a6dcd.js"></script><link href="/static/css/main.8994a208.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run EyeblueTank.</noscript><div id="root"></div></body></html>
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="eyeblue tank"/><title>EyeblueTank</title><script defer="defer" src="/static/js/main.b94b1947.js"></script><link href="/static/css/main.b03c51fb.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run EyeblueTank.</noscript><div id="root"></div></body></html>