Merge remote-tracking branch 'origin/v2' into v2

engine/apiengine.go

@@ -4,8 +4,6 @@ import (
 	"fmt"
 	"time"
 
-	"git.qianqiusoft.com/qianqiusoft/light-apiengine/middleware/logger"
-
 	//"github.com/gin-contrib/sessions"
 	//"github.com/gin-contrib/sessions/memstore"
 	//"github.com/gin-contrib/sessions/cookie"
@@ -69,7 +67,7 @@ func NewApiEngine(driverName, dataSourceName string, addr string) *ApiEngine {
 	engine.GinEngine = gin.Default()
 
 	engine.GinEngine.Use(gzip.Gzip(gzip.DefaultCompression))
-	engine.GinEngine.Use(logger.LoggerMiddleware())
+	// engine.GinEngine.Use(logger.LoggerMiddleware())
 
 	//启动session
 	//store := sessions.NewCookieStore([]byte("secret"))

engine/system_init.go

@@ -23,8 +23,8 @@ func createDatabase(orm *xorm.Engine) {
 			db, _ := xorm.NewEngine(orm.DriverName(), strings[1]+"/")
 			db.ShowSQL(true)
 			db.SetConnMaxLifetime(10 * time.Minute)
-			db.SetMaxIdleConns(10)
-			db.SetMaxOpenConns(80)
+			db.SetMaxIdleConns(30)
+			db.SetMaxOpenConns(1000)
 			_, err := db.Sql("CREATE DATABASE IF NOT EXISTS `" + dbname + "` default charset utf8 COLLATE utf8_general_ci").Execute()
 			if err != nil {
 				fmt.Println("create database error", err)

sqlconfig/system_controller/system_find_menu_page_count.tpl

@@ -1,33 +1,34 @@
 select
-    count(distinct sys_menu.id) records
-from
-    sys_menu
-LEFT JOIN
-    sys_role_menu
-ON
-    sys_menu.id = sys_role_menu.menu_id
-LEFT JOIN
-    sys_user_role
-ON
-    sys_role_menu.role_id = sys_user_role.role_id
-LEFT JOIN
-    sys_user
-ON
-    sys_user_role.user_id = sys_user.id
-where
-    sys_menu.del_flag = 0
+    count(sys_menu.id) records
+FROM
+	sys_menu
+{{if ne .user_id ""}}
+INNER JOIN (
+	SELECT DISTINCT
+		sys_role_menu.menu_id
+	FROM
+		sys_role_menu,
+		sys_user_role,
+		sys_user
+	WHERE
+		sys_role_menu.del_flag = 0
+	AND sys_user_role.del_flag = 0
+    AND sys_user.id = '{{.user_id}}'
+	AND sys_role_menu.role_id = sys_user_role.role_id
+	AND sys_user_role.user_id = sys_user.id
+) sys_role_menu ON sys_menu.id = sys_role_menu.menu_id
+{{end}}
+WHERE
+	sys_menu.del_flag = 0
 {{if ne .name ""}}
-    and sys_menu.name like '%{{.name}}%'
+    AND sys_menu.name like '%{{.name}}%'
 {{end}}
 {{if ne .code ""}}
-    and sys_menu.code like '%{{.code}}%'
+    AND sys_menu.code like '%{{.code}}%'
 {{end}}
 {{if ne .cn_id ""}}
-    and sys_menu.inheritance like '%{{.cn_id}}%'
+    AND sys_menu.inheritance like '%{{.cn_id}}%'
 {{end}}
 {{if ne .type_op ""}}
-    and sys_menu.type {{.type_op}} {{.type}}
-{{end}}
-{{if ne .user_id ""}}
-    and sys_user.id = '{{.user_id}}'
+    AND sys_menu.type {{.type_op}} {{.type}}
 {{end}}

sqlconfig/system_controller/system_find_menu_page_select.tpl

@@ -1,38 +1,37 @@
-
-select
-    distinct sys_menu.*
-from
-    sys_menu
-LEFT JOIN
-    sys_role_menu
-ON
-    sys_menu.id = sys_role_menu.menu_id
-LEFT JOIN
-    sys_user_role
-ON
-    sys_role_menu.role_id = sys_user_role.role_id
-LEFT JOIN
-    sys_user
-ON
-    sys_user_role.user_id = sys_user.id
-where
-    sys_menu.del_flag = 0
+SELECT
+	sys_menu.*
+FROM
+	sys_menu
+{{if ne .user_id ""}}
+INNER JOIN (
+	SELECT DISTINCT
+		sys_role_menu.menu_id
+	FROM
+		sys_role_menu,
+		sys_user_role,
+		sys_user
+	WHERE
+		sys_role_menu.del_flag = 0
+	AND sys_user_role.del_flag = 0
+    AND sys_user.id = '{{.user_id}}'
+	AND sys_role_menu.role_id = sys_user_role.role_id
+	AND sys_user_role.user_id = sys_user.id
+) sys_role_menu ON sys_menu.id = sys_role_menu.menu_id
+{{end}}
+WHERE
+	sys_menu.del_flag = 0
 {{if ne .name ""}}
-    and sys_menu.name like '%{{.name}}%'
+    AND sys_menu.name like '%{{.name}}%'
 {{end}}
 {{if ne .code ""}}
-    and sys_menu.code like '%{{.code}}%'
+    AND sys_menu.code like '%{{.code}}%'
 {{end}}
 {{if ne .cn_id ""}}
-    and sys_menu.inheritance like '%{{.cn_id}}%'
+    AND sys_menu.inheritance like '%{{.cn_id}}%'
 {{end}}
 {{if ne .type_op ""}}
-    and sys_menu.type {{.type_op}} {{.type}}
-{{end}}
-{{if ne .user_id ""}}
-    and sys_user.id = '{{.user_id}}'
-{{else}}
-    group by sys_menu.id
+    AND sys_menu.type {{.type_op}} {{.type}}
 {{end}}
-order by order_num
-LIMIT {{.rows}} OFFSET {{.offset}}
+ORDER BY
+	sys_menu.order_num, sys_menu.id
+LIMIT {{.rows}} OFFSET {{.offset}}