- 增加https参数

- 修复bug "「资产」无法通过「资产标签」过滤" close #33
- 修复bug "切換授權使用者登錄後，進入資產列表後會有錯誤" close #53

pkg/config/config.go

@@ -28,6 +28,8 @@ type Sqlite struct {
 
 type Server struct {
 	Addr string
+	Cert string
+	Key  string
 }
 
 func SetupConfig() (*Config, error) {
@@ -49,6 +51,8 @@ func SetupConfig() (*Config, error) {
 	pflag.String("mysql.database", "next_terminal", "mysql database")
 
 	pflag.String("server.addr", "", "server listen addr")
+	pflag.String("server.cert", "", "tls cert file")
+	pflag.String("server.key", "", "tls key file")
 
 	pflag.Parse()
 	_ = viper.BindPFlags(pflag.CommandLine)
@@ -68,6 +72,8 @@ func SetupConfig() (*Config, error) {
 		},
 		Server: &Server{
 			Addr: viper.GetString("server.addr"),
+			Cert: viper.GetString("server.cert"),
+			Key:  viper.GetString("server.key"),
 		},
 	}
 

pkg/model/asset.go

@@ -111,8 +111,13 @@ func FindPageAsset(pageIndex, pageSize int, name, protocol, tags string, account
 	if len(tags) > 0 {
 		tagArr := strings.Split(tags, ",")
 		for i := range tagArr {
-			db = db.Where("find_in_set(?, assets.tags)", tagArr[i])
-			dbCounter = dbCounter.Where("find_in_set(?, assets.tags)", tagArr[i])
+			if global.Config.DB == "sqlite" {
+				db = db.Where("(',' || assets.tags || ',') LIKE ?", "%,"+tagArr[i]+",%")
+				dbCounter = dbCounter.Where("(',' || assets.tags || ',') LIKE ?", "%,"+tagArr[i]+",%")
+			} else {
+				db = db.Where("find_in_set(?, assets.tags)", tagArr[i])
+				dbCounter = dbCounter.Where("find_in_set(?, assets.tags)", tagArr[i])
+			}
 		}
 	}
 

pkg/model/user-group.go

@@ -87,7 +87,8 @@ func FindUserGroupById(id string) (o UserGroup, err error) {
 }
 
 func FindUserGroupIdsByUserId(userId string) (o []string, err error) {
-	err = global.DB.Table("user_groups").Select("user_groups.id").Joins("right join user_group_members on user_groups.id = user_group_members.user_group_id").Where("user_group_members.user_id = ?", userId).Find(&o).Error
+	// 先查询用户所在的用户
+	err = global.DB.Table("user_group_members").Select("user_group_id").Where("user_id = ?", userId).Find(&o).Error
 	return
 }