Ready to release 3.0.0

xieguo · May 22, 2019 · fd5f6ca · fd5f6ca
1 parent 7f225bb
commit fd5f6ca
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 16 deletions.
diff --git a/build/html/index.html b/build/html/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>tank-front-tmp</title><link href=/css/app.a576a8d2.css rel=preload as=style><link href=/css/chunk-vendors.cb22afd2.css rel=preload as=style><link href=/js/app.ce972e7b.js rel=preload as=script><link href=/js/chunk-vendors.220ccae9.js rel=preload as=script><link href=/css/chunk-vendors.cb22afd2.css rel=stylesheet><link href=/css/app.a576a8d2.css rel=stylesheet></head><body><noscript><strong>We're sorry but tank-front-tmp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.220ccae9.js></script><script src=/js/app.ce972e7b.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>tank-front-tmp</title><link href=/css/app.a576a8d2.css rel=preload as=style><link href=/css/chunk-vendors.cb22afd2.css rel=preload as=style><link href=/js/app.24a25fb1.js rel=preload as=script><link href=/js/chunk-vendors.220ccae9.js rel=preload as=script><link href=/css/chunk-vendors.cb22afd2.css rel=stylesheet><link href=/css/app.a576a8d2.css rel=stylesheet></head><body><noscript><strong>We're sorry but tank-front-tmp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.220ccae9.js></script><script src=/js/app.24a25fb1.js></script></body></html>
diff --git a/build/html/js/app.24a25fb1.js b/build/html/js/app.24a25fb1.js
diff --git a/build/html/js/app.24a25fb1.js.map b/build/html/js/app.24a25fb1.js.map
diff --git a/build/html/js/app.ce972e7b.js b/build/html/js/app.ce972e7b.js
diff --git a/build/html/js/app.ce972e7b.js.map b/build/html/js/app.ce972e7b.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.0.0.beta4
+SET VERSION_NAME=tank-3.0.0
 @REM  assign variable like Linux GOARCH=$(go env GOARCH) eg. amd64
 FOR /f %%i IN ('go env GOARCH') DO SET GOARCH=%%i
 ECHO GOARCH: %GOARCH%

diff --git a/build/pack/build.sh b/build/pack/build.sh
@@ -9,7 +9,7 @@
 #prepare the variables.
 
 # version name
-VERSION_NAME=tank-3.0.0.beta4
+VERSION_NAME=tank-3.0.0
 echo "VERSION_NAME: ${VERSION_NAME}"
 # eg. amd64
 GOARCH=$(go env GOARCH)

diff --git a/code/core/config.go b/code/core/config.go
@@ -12,7 +12,7 @@ const (
 	//db table's prefix. tank30_ means current version is tank:3.0.x
 	TABLE_PREFIX = "tank30_"
 
-	VERSION = "3.0.0.beta4"
+	VERSION = "3.0.0"
 )
 
 type Config interface {

diff --git a/code/rest/user_controller.go b/code/rest/user_controller.go
@@ -168,6 +168,7 @@ func (this *UserController) Edit(writer http.ResponseWriter, request *http.Reque
 	avatarUrl := request.FormValue("avatarUrl")
 	sizeLimitStr := request.FormValue("sizeLimit")
 	totalSizeLimitStr := request.FormValue("totalSizeLimit")
+	role := request.FormValue("role")
 
 	user := this.checkUser(request)
 	currentUser := this.userDao.CheckByUuid(uuid)
@@ -200,6 +201,10 @@ func (this *UserController) Edit(writer http.ResponseWriter, request *http.Reque
 		}
 		currentUser.TotalSizeLimit = totalSizeLimit
 
+		if role == USER_ROLE_USER || role == USER_ROLE_ADMINISTRATOR {
+			currentUser.Role = role
+		}
+
 	} else if user.Uuid != uuid {
 		panic(result.UNAUTHORIZED)
 	}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>tank-front-tmp</title><link href=/css/app.a576a8d2.css rel=preload as=style><link href=/css/chunk-vendors.cb22afd2.css rel=preload as=style><link href=/js/app.ce972e7b.js rel=preload as=script><link href=/js/chunk-vendors.220ccae9.js rel=preload as=script><link href=/css/chunk-vendors.cb22afd2.css rel=stylesheet><link href=/css/app.a576a8d2.css rel=stylesheet></head><body><noscript><strong>We're sorry but tank-front-tmp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.220ccae9.js></script><script src=/js/app.ce972e7b.js></script></body></html>
		<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>tank-front-tmp</title><link href=/css/app.a576a8d2.css rel=preload as=style><link href=/css/chunk-vendors.cb22afd2.css rel=preload as=style><link href=/js/app.24a25fb1.js rel=preload as=script><link href=/js/chunk-vendors.220ccae9.js rel=preload as=script><link href=/css/chunk-vendors.cb22afd2.css rel=stylesheet><link href=/css/app.a576a8d2.css rel=stylesheet></head><body><noscript><strong>We're sorry but tank-front-tmp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.220ccae9.js></script><script src=/js/app.24a25fb1.js></script></body></html>