upgrade

beastpu · Apr 10, 2021 · 3e1ef9c · 3e1ef9c
1 parent 8a6a343
commit 3e1ef9c
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 2 deletions.
diff --git a/assets/templates/gencode/gencode_init.html b/assets/templates/gencode/gencode_init.html
@@ -3,6 +3,7 @@
 <head>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
+<link href="bootstrap/js/jquery-confirm/jquery-confirm.min.css" rel="stylesheet">
 <link href="bootstrap/css/materialdesignicons.min.css" rel="stylesheet">
 <link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
 <link href="bootstrap/css/style.min.css" rel="stylesheet">
@@ -46,6 +47,7 @@
 
 <script type="text/javascript" src="bootstrap/js/jquery.min.js"></script>
 <script type="text/javascript" src="bootstrap/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="bootstrap/js/jquery-confirm/jquery-confirm.min.js"></script>
 <script type="text/javascript">
   $(document).ready(function() {
     $("#btnOk").click(function(){
@@ -58,9 +60,34 @@
         $("#resultDiv").text(data);
         $("#btnLoading").hide();
         $("#btnOk").show();
+
+        if (getQueryString("init")) {
+          $.alert({
+            title: '操作成功',
+            icon: 'mdi mdi-check-decagram',
+            type: 'green',
+            content: '初始化完成。',
+            buttons: {
+              okay: {
+                text: '系统首页',
+                action: function () {
+                  location.href = "/";
+                }
+              }
+            }
+          });
+        }
       })
 
-    })
+    });
+
+    function getQueryString(name) {
+      let reg = new RegExp('(?:(?:&|\\?)' + name + '=([^&]*))|(?:/' + name + '/([^/]*))', 'i');
+      let r = window.location.href.match(reg);
+      if (r != null)
+        return decodeURI(r[1] || r[2]);
+      return null;
+    }
   })
 </script>
 </body>

diff --git a/cmd/init/db/main.go b/cmd/init/db/main.go
@@ -4,6 +4,7 @@ import (
 	"flag"
 	"fmt"
 	"log"
+	"os"
 	"strings"
 
 	"github.com/xinliangnote/go-gin-api/cmd/init/db/mysql"
@@ -99,6 +100,13 @@ func main() {
 	}
 	fmt.Println("create admin table data success")
 
+	// 生成已完成 init 的标识，生成 init_db.lock
+	f, err := os.Create("cmd/init/db/init_db.lock")
+	if err != nil {
+		log.Fatal("create init_db.lock err: ", err.Error())
+	}
+	defer f.Close()
+
 	// 完成事务
 	tx.Commit()
 

diff --git a/configs/configs.go b/configs/configs.go
@@ -94,3 +94,7 @@ func ProjectPort() string {
 func ProjectLogFile() string {
 	return fmt.Sprintf("./logs/%s-access.log", ProjectName())
 }
+
+func InitDBLockFile() string {
+	return "cmd/init/db/init_db.lock"
+}
diff --git a/internal/router/router.go b/internal/router/router.go
@@ -1,13 +1,15 @@
 package router
 
 import (
+	"github.com/xinliangnote/go-gin-api/configs"
 	"github.com/xinliangnote/go-gin-api/internal/pkg/cache"
 	"github.com/xinliangnote/go-gin-api/internal/pkg/core"
 	"github.com/xinliangnote/go-gin-api/internal/pkg/db"
 	"github.com/xinliangnote/go-gin-api/internal/pkg/grpc"
 	"github.com/xinliangnote/go-gin-api/internal/pkg/metrics"
 	"github.com/xinliangnote/go-gin-api/internal/pkg/notify"
 	"github.com/xinliangnote/go-gin-api/internal/router/middleware"
+	"github.com/xinliangnote/go-gin-api/pkg/file"
 
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
@@ -23,13 +25,19 @@ type resource struct {
 }
 
 func NewHTTPMux(logger *zap.Logger, db db.Repo, cache cache.Repo, grpConn grpc.ClientConn) (core.Mux, error) {
+	var openBrowserUri = "http://127.0.0.1:9999"
+
+	_, ok := file.IsExists(configs.InitDBLockFile())
+	if !ok {
+		openBrowserUri = "http://127.0.0.1:9999/init?init=db"
+	}
 
 	if logger == nil {
 		return nil, errors.New("logger required")
 	}
 
 	mux, err := core.New(logger,
-		core.WithEnableOpenBrowser("http://127.0.0.1:9999"),
+		core.WithEnableOpenBrowser(openBrowserUri),
 		core.WithEnableCors(),
 		core.WithEnableRate(),
 		core.WithPanicNotify(notify.OnPanicNotify),

diff --git a/pkg/file/file.go b/pkg/file/file.go
@@ -23,6 +23,12 @@ type ReadLineFromEnd struct {
 	isFirst bool
 }
 
+// Exists
+func IsExists(path string) (os.FileInfo, bool) {
+	f, err := os.Stat(path)
+	return f, err == nil || os.IsExist(err)
+}
+
 // NewReadLineFromEnd
 func NewReadLineFromEnd(filename string) (rd *ReadLineFromEnd, err error) {
 	f, err := os.Open(filename)