hotgo2.1.3版本发布

server/internal/logic/admin/notice.go

@@ -146,14 +146,17 @@ func (s *sAdminNotice) Status(ctx context.Context, in adminin.NoticeStatusInp) (
 }
 
 // MaxSort 最大排序
-func (s *sAdminNotice) MaxSort(ctx context.Context, in adminin.NoticeMaxSortInp) (*adminin.NoticeMaxSortModel, error) {
-	var res adminin.NoticeMaxSortModel
-	if err := s.Model(ctx).Order("sort desc").Scan(&res); err != nil {
-		err = gerror.Wrap(err, consts.ErrorORM)
-		return nil, err
+func (s *sAdminNotice) MaxSort(ctx context.Context, in adminin.NoticeMaxSortInp) (res *adminin.NoticeMaxSortModel, err error) {
+	if err = dao.AdminNotice.Ctx(ctx).Order("sort desc").Scan(&res); err != nil {
+		return
 	}
+
+	if res == nil {
+		res = new(adminin.NoticeMaxSortModel)
+	}
+
 	res.Sort = form.DefaultMaxSort(ctx, res.Sort)
-	return &res, nil
+	return
 }
 
 // View 获取指定字典类型信息

server/internal/logic/sys/config.go

@@ -13,6 +13,7 @@ import (
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
+	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gconv"
 	"hotgo/internal/consts"
 	"hotgo/internal/dao"
@@ -22,6 +23,13 @@ import (
 	"hotgo/internal/service"
 )
 
+var MaskDemoField = []string{
+	"smtpUser", "smtpPass", // 邮箱
+	"uploadUCloudPublicKey", "uploadUCloudPrivateKey", // 云存储
+	"geoAmapWebKey",                                    // 地图
+	"smsAliyunAccessKeyID", "smsAliyunAccessKeySecret", // 短信
+}
+
 type sSysConfig struct{}
 
 func NewSysConfig() *sSysConfig {
@@ -156,7 +164,12 @@ func (s *sSysConfig) GetConfigByGroup(ctx context.Context, in sysin.GetConfigInp
 				return nil, err
 			}
 			res.List[v.Key] = val
-			if isDemo.Bool() && (v.Key == "smtpUser" || v.Key == "smtpPass") {
+			//if isDemo.Bool() && (v.Key == "smtpUser" || v.Key == "smtpPass") {
+			//	res.List[v.Key] = consts.DemoTips
+			//	res.List[v.Key] = consts.DemoTips
+			//}
+
+			if isDemo.Bool() && gstr.InArray(MaskDemoField, v.Key) {
 				res.List[v.Key] = consts.DemoTips
 				res.List[v.Key] = consts.DemoTips
 			}

server/internal/logic/sys/gen_codes.go

@@ -162,6 +162,34 @@ func (s *sSysGenCodes) List(ctx context.Context, in sysin.GenCodesListInp) (list
 		return list, totalCount, err
 	}
 
+	typeSelect, err := hggen.GenTypeSelect(ctx)
+	if err != nil {
+		return
+	}
+
+	getTemplateGroup := func(row *sysin.GenCodesListModel) string {
+		if row == nil {
+			return ""
+		}
+		for _, v := range typeSelect {
+			if v.Value == int(row.GenType) {
+				for index, template := range v.Templates {
+					if index == row.GenTemplate {
+						return template.Label
+					}
+				}
+			}
+		}
+
+		return ""
+	}
+
+	if len(list) > 0 {
+		for _, v := range list {
+			v.GenTemplateGroup = getTemplateGroup(v)
+		}
+	}
+
 	return list, totalCount, err
 }