Merge pull request #21 from maxbad/v2.0

fix 一些使用问题

server/internal/cmd/tools.go

@@ -20,7 +20,7 @@ var (
 		Description: ``,
 		Func: func(ctx context.Context, parser *gcmd.Parser) (err error) {
 			flags := parser.GetOptAll()
-			g.Log().Debug(ctx, "flags:%+v", flags)
+			g.Log().Debugf(ctx, "flags:%+v", flags)
 			if len(flags) == 0 {
 				g.Log().Fatal(ctx, "工具参数不能为空")
 				return

server/internal/controller/admin/admin/post.go

@@ -28,7 +28,7 @@ func (c *cPost) Delete(ctx context.Context, req *post.DeleteReq) (res *post.Dele
 	}
 
 	err = service.AdminPost().Delete(ctx, in)
-	return res, nil
+	return
 }
 
 // Edit 修改/新增

server/internal/library/addons/install.go

@@ -35,7 +35,7 @@ func ScanInstall(m Module) (record *InstallRecord, err error) {
 func IsInstall(m Module) bool {
 	record, err := ScanInstall(m)
 	if err != nil {
-		g.Log().Debugf(m.Ctx(), err.Error())
+		g.Log().Debug(m.Ctx(), err.Error())
 		return false
 	}
 	if record == nil {

server/internal/library/cache/cache.go

@@ -37,7 +37,7 @@ func SetAdapter(ctx context.Context) {
 
 	if conf == nil {
 		conf = new(model.CacheConfig)
-		g.Log().Infof(ctx, "no cache driver is configured. default memory cache is used.")
+		g.Log().Info(ctx, "no cache driver is configured. default memory cache is used.")
 	}
 
 	switch conf.Adapter {
@@ -45,7 +45,7 @@ func SetAdapter(ctx context.Context) {
 		adapter = gcache.NewAdapterRedis(g.Redis())
 	case "file":
 		if conf.FileDir == "" {
-			g.Log().Fatalf(ctx, "file path must be configured for file caching.")
+			g.Log().Fatal(ctx, "file path must be configured for file caching.")
 			return
 		}
 

server/internal/library/contexts/context.go

@@ -34,7 +34,7 @@ func Get(ctx context.Context) *model.Context {
 func SetUser(ctx context.Context, user *model.Identity) {
 	c := Get(ctx)
 	if c == nil {
-		g.Log().Warningf(ctx, "contexts.SetUser,  c == nil ")
+		g.Log().Warning(ctx, "contexts.SetUser,  c == nil ")
 		return
 	}
 	c.User = user
@@ -44,7 +44,7 @@ func SetUser(ctx context.Context, user *model.Identity) {
 func SetResponse(ctx context.Context, response *model.Response) {
 	c := Get(ctx)
 	if c == nil {
-		g.Log().Warningf(ctx, "contexts.SetResponse,  c == nil ")
+		g.Log().Warning(ctx, "contexts.SetResponse,  c == nil ")
 		return
 	}
 	c.Response = response
@@ -54,7 +54,7 @@ func SetResponse(ctx context.Context, response *model.Response) {
 func SetModule(ctx context.Context, module string) {
 	c := Get(ctx)
 	if c == nil {
-		g.Log().Warningf(ctx, "contexts.SetModule,  c == nil ")
+		g.Log().Warning(ctx, "contexts.SetModule,  c == nil ")
 		return
 	}
 	c.Module = module
@@ -64,7 +64,7 @@ func SetModule(ctx context.Context, module string) {
 func SetTakeUpTime(ctx context.Context, takeUpTime int64) {
 	c := Get(ctx)
 	if c == nil {
-		g.Log().Warningf(ctx, "contexts.SetTakeUpTime,  c == nil ")
+		g.Log().Warning(ctx, "contexts.SetTakeUpTime,  c == nil ")
 		return
 	}
 	c.TakeUpTime = takeUpTime
@@ -120,7 +120,7 @@ func GetModule(ctx context.Context) string {
 func SetAddonName(ctx context.Context, name string) {
 	c := Get(ctx)
 	if c == nil {
-		g.Log().Warningf(ctx, "contexts.SetAddonName,  c == nil ")
+		g.Log().Warning(ctx, "contexts.SetAddonName,  c == nil ")
 		return
 	}
 	Get(ctx).AddonName = name

server/internal/library/hggen/views/column_default.go

@@ -109,7 +109,7 @@ func setDefault(field *sysin.GenCodesColumnListModel) {
 
 	setDefaultValue(field)
 
-	if field.IsAllowNull == "YES" {
+	if field.IsAllowNull == "NO" {
 		field.Required = true
 	}
 

server/internal/library/hgorm/handler/filter_auth.go

@@ -56,7 +56,7 @@ func FilterAuthWithField(filterField string) func(m *gdb.Model) *gdb.Model {
 		}
 
 		if role == nil {
-			g.Log().Panicf(ctx, "failed to role information roleModel == nil")
+			g.Log().Panic(ctx, "failed to role information roleModel == nil")
 		}
 
 		sq := g.Model("admin_member").Fields("id")
@@ -77,7 +77,7 @@ func FilterAuthWithField(filterField string) func(m *gdb.Model) *gdb.Model {
 		case consts.RoleDataSelfAndAllSub: // 自己和全部下级
 			m = m.WhereIn(filterField, GetSelfAndAllSub(co.User.Id))
 		default:
-			g.Log().Panicf(ctx, "dataScope is not registered")
+			g.Log().Panic(ctx, "dataScope is not registered")
 		}
 
 		return m

server/internal/library/location/location.go

@@ -174,7 +174,7 @@ func GetPublicIP(ctx context.Context) (ip string, err error) {
 	}
 
 	if data == nil {
-		g.Log().Infof(ctx, "publicIP address Parsing failure, check the network and firewall blocking.")
+		g.Log().Info(ctx, "publicIP address Parsing failure, check the network and firewall blocking.")
 		return "0.0.0.0", nil
 	}
 	return data.Ip, nil

server/internal/library/queue/init.go

@@ -81,7 +81,7 @@ func init() {
 	mqProducerInstanceMap = make(map[string]MqProducer)
 	mqConsumerInstanceMap = make(map[string]MqConsumer)
 	if err := g.Cfg().MustGet(ctx, "queue").Scan(&config); err != nil {
-		g.Log().Warning(ctx, "queue init err:%+v", err)
+		g.Log().Warningf(ctx, "queue init err:%+v", err)
 	}
 }
 

server/internal/logic/admin/menu.go

@@ -346,6 +346,15 @@ func (s *sAdminMenu) GetMenuList(ctx context.Context, memberId int64) (lists rol
 		if err != nil {
 			return role.DynamicRes{}, err
 		}
+		if len(array) > 0 {
+			pidList, err := dao.AdminMenu.Ctx(ctx).Fields("pid").WhereIn("id", array).Group("pid").Array()
+			if err != nil {
+				return role.DynamicRes{}, err
+			}
+			if len(pidList) > 0 {
+				array = append(pidList, array...)
+			}
+		}
 		mod = mod.Where("id", array)
 	}
 

server/internal/logic/middleware/limit_blacklist.go

@@ -16,7 +16,7 @@ func (s *sMiddleware) Blacklist(r *ghttp.Request) {
 			response.JsonExit(r, gcode.CodeServerBusy.Code(), "请求异常，已被封禁，如有疑问请联系管理员！")
 		}
 	} else {
-		g.Log().Infof(r.Context(), "blacklists uninitialized")
+		g.Log().Info(r.Context(), "blacklists uninitialized")
 	}
 
 	r.Middleware.Next()

server/internal/logic/sys/log.go

@@ -99,7 +99,7 @@ func (s *sSysLog) Export(ctx context.Context, in sysin.LogListInp) (err error) {
 
 // RealWrite 真实写入
 func (s *sSysLog) RealWrite(ctx context.Context, commonLog entity.SysLog) (err error) {
-	_, err = dao.SysLog.Ctx(ctx).Data(commonLog).Insert()
+	_, err = dao.SysLog.Ctx(ctx).Data(commonLog).FieldsEx(dao.SysLog.Columns().Id).Insert()
 	return
 }
 

server/internal/logic/sys/login_log.go

@@ -99,7 +99,7 @@ func (s *sSysLoginLog) List(ctx context.Context, in sysin.LoginLogListInp) (list
 	}
 
 	for _, v := range list {
-		g.DumpWithType(v)
+		//g.DumpWithType(v)
 		//// 获取省市编码对应的地区名称
 		//region, err := location.ParseRegion(ctx, v.SysLogProvinceId, v.SysLogCityId, 0)
 		//if err != nil {
@@ -191,6 +191,6 @@ func (s *sSysLoginLog) Push(ctx context.Context, in sysin.LoginLogPushInp) {
 
 // RealWrite 真实写入
 func (s *sSysLoginLog) RealWrite(ctx context.Context, models entity.SysLoginLog) (err error) {
-	_, err = dao.SysLoginLog.Ctx(ctx).Data(models).Insert()
+	_, err = dao.SysLoginLog.Ctx(ctx).Data(models).FieldsEx(dao.SysLoginLog.Columns().Id).Insert()
 	return
 }

server/internal/logic/sys/serve_log.go

@@ -144,6 +144,6 @@ func (s *sSysServeLog) View(ctx context.Context, in sysin.ServeLogViewInp) (res
 
 // RealWrite 真实写入
 func (s *sSysServeLog) RealWrite(ctx context.Context, models entity.SysServeLog) (err error) {
-	_, err = dao.SysServeLog.Ctx(ctx).Data(models).Insert()
+	_, err = dao.SysServeLog.Ctx(ctx).Data(models).FieldsEx(dao.SysServeLog.Columns().Id).Insert()
 	return
 }

server/internal/websocket/client_manager.go

@@ -291,7 +291,7 @@ func (manager *ClientManager) start() {
 				}
 			}
 		case <-manager.closeSignal:
-			g.Log().Infof(ctxManager, "websocket closeSignal quit..")
+			g.Log().Info(ctxManager, "websocket closeSignal quit..")
 			return
 		}
 

server/resource/generate/default/curd/api.go.template

@@ -33,7 +33,7 @@ type ExportReq struct {
 
 type ExportRes struct{}
 @{end}
-@{ if eq .options.Step.HasView true }
+@{ if or (eq .options.Step.HasView true) (eq .options.Step.HasEdit true) }
 // ViewReq 获取@{.tableComment}指定信息
 type ViewReq struct {
 	g.Meta `path:"/@{.varName | LcFirst}/view" method:"get" tags:"@{.tableComment}" summary:"获取@{.tableComment}指定信息"`

server/resource/generate/default/curd/controller.go.template

@@ -92,7 +92,7 @@ func (c *c@{.varName}) MaxSort(ctx context.Context, req *@{.varName | ToLower}.M
 	return
 }
 @{end}
-@{ if eq .options.Step.HasView true }
+@{ if or (eq .options.Step.HasView true) (eq .options.Step.HasEdit true) }
 // View 获取指定@{.tableComment}信息
 func (c *c@{.varName}) View(ctx context.Context, req *@{.varName | ToLower}.ViewReq) (res *@{.varName | ToLower}.ViewRes, err error) {
 	var in @{.templateGroup}in.@{.varName}ViewInp

server/resource/generate/default/curd/input.go.template

@@ -44,7 +44,7 @@ func (in *@{.varName}DeleteInp) Filter(ctx context.Context) (err error) {
 
 type @{.varName}DeleteModel struct{}
 @{end}
-@{ if eq .options.Step.HasView true }
+@{ if or (eq .options.Step.HasView true) (eq .options.Step.HasEdit true) }
 // @{.varName}ViewInp 获取指定@{.tableComment}信息
 type @{.varName}ViewInp struct {
 	@{.pk.GoName} @{.pk.GoType} `json:"@{.pk.TsName}" v:"required#@{.pk.Dc}不能为空" dc:"@{.pk.Dc}"`

server/resource/generate/default/curd/logic.go.template

@@ -125,7 +125,7 @@ func (s *s@{.servFunName}) MaxSort(ctx context.Context, in @{.templateGroup}in.@
 	return
 }
 @{end}
-@{ if eq .options.Step.HasView true }
+@{ if or (eq .options.Step.HasView true) (eq .options.Step.HasEdit true) }
 // View 获取@{.tableComment}指定信息
 func (s *s@{.servFunName}) View(ctx context.Context, in @{.templateGroup}in.@{.varName}ViewInp) (res *@{.templateGroup}in.@{.varName}ViewModel, err error) {
     err = s.Model(ctx).Where(dao.@{.daoName}.Columns().@{.pk.GoName}, in.@{.pk.GoName}).Scan(&res)

server/resource/generate/default/curd/source.sql.template

@@ -35,7 +35,7 @@ INSERT INTO `@{.menuTable}` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type
 
 
 SET @listId = LAST_INSERT_ID();
-@{ if eq .options.Step.HasView true }
+@{ if or (eq .options.Step.HasView true) (eq .options.Step.HasEdit true) }
 -- 详情
 INSERT INTO `@{.menuTable}` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @dirId, '@{.tableComment}详情', '@{.varName | LcFirst}View', 'view/:id?', '', '2', '', '/@{.apiPrefix}/view', '', '/@{.componentPrefix}/view', '0', '@{.varName | LcFirst}Index', '0', '0', '', '0', '1', '0', '2', '', '20', '', '1', @now, @now);
 @{end}

server/resource/generate/default/curd/web.api.ts.template

@@ -48,7 +48,7 @@ export function Switch(params) {
   });
 }
 @{end}
-@{ if eq .options.Step.HasView true }
+@{ if or (eq .options.Step.HasView true) (eq .options.Step.HasEdit true) }
 // 获取@{.tableComment}指定详情
 export function View(params) {
   return http.request({

server/resource/generate/default/curd/web.index.vue.template

@@ -92,11 +92,11 @@
 @{.apiImport}
   import { State, columns, schemas, options, newState } from './model';
 @{.iconsImport}
-@{ if eq .options.Step.HasView true }  import { useRouter } from 'vue-router';@{end}
+@{ if or (eq .options.Step.HasView true) (eq .options.Step.HasEdit true) }  import { useRouter } from 'vue-router';@{end}
   import { getOptionLabel } from '@/utils/hotgo';
 @{ if eq .options.Step.HasEdit true }  import Edit from './edit.vue';@{end}
   const { hasPermission } = usePermission();
-@{ if eq .options.Step.HasView true }  const router = useRouter();@{end}
+@{ if or (eq .options.Step.HasView true) (eq .options.Step.HasEdit true) }  const router = useRouter();@{end}
   const actionRef = ref();
   const dialog = useDialog();
   const message = useMessage();

server/utility/validate/validate.go

@@ -30,7 +30,7 @@ func IsDNSName(s string) bool {
 func IsHTTPS(ctx context.Context) bool {
 	r := ghttp.RequestFromCtx(ctx)
 	if r == nil {
-		g.Log().Infof(ctx, "IsHTTPS ctx not request")
+		g.Log().Info(ctx, "IsHTTPS ctx not request")
 		return false
 	}
 	var (

web/package.json

@@ -38,6 +38,7 @@
     "date-fns": "^2.28.0",
     "echarts": "^5.3.2",
     "element-resize-detector": "^1.2.4",
+    "highlight.js": "^11.8.0",
     "lodash": "^4.17.21",
     "lodash-es": "^4.17.21",
     "mitt": "^2.1.0",

web/src/utils/index.ts

@@ -118,7 +118,7 @@ export function getChildrenRouter(routerMap: Array<any>) {
  * 判断根路由 Router
  * */
 export function isRootRouter(item) {
-  if (item.meta?.alwaysShow != true && item.children?.length === 1) {
+  if (item.meta?.alwaysShow != true && item.children?.length === 0) {
     return true;
   }
 

web/src/views/apply/provinces/model.ts

@@ -99,3 +99,11 @@ export function newState(state: State | null): State {
 export const options = ref<Options>({
   sys_normal_disable: [],
 });
+
+async function loadOptions() {
+  options.value = await Dicts({
+    types: ['sys_normal_disable'],
+  });
+}
+
+await loadOptions();

web/src/views/develop/addons/index.vue

@@ -120,6 +120,7 @@
     NIcon,
     NTag,
     NIconWrapper,
+    NAvatar,
     useMessage,
     NImage,
     useDialog,
@@ -159,25 +160,13 @@
           });
         } else {
           return h(
-            NIconWrapper,
+            NAvatar,
             {
               size: 48,
-              borderRadius: 8,
+              color: '#2D8CF0',
             },
             {
-              default: () =>
+              default: () => h(getIconComponent(row.logo)),
-                h(
-                  NIcon,
-                  {
-                    size: 36,
-                    style: {
-                      marginTop: '-8px',
-                    },
-                  },
-                  {
-                    default: () => h(getIconComponent(row.logo)),
-                  }
-                ),
             }
           );
         }

web/src/views/develop/code/components/PreviewTab.vue

@@ -10,7 +10,7 @@
           {{ view.path }}
         </n-tag>
         <n-scrollbar class="code-scrollbar" trigger="none">
-          <n-code :code="view.content" />
+          <n-code :code="view.content" :hljs="hljs" language="goLang" show-line-numbers />
         </n-scrollbar>
       </n-tab-pane>
     </n-tabs>
@@ -19,6 +19,8 @@
 
 <script lang="ts" setup>
   import { computed } from 'vue';
+  import hljs from 'highlight.js/lib/core';
+  import goLang from 'highlight.js/lib/languages/go';
   import { cloneDeep } from 'lodash-es';
   import {
     CheckmarkCircle,
@@ -27,6 +29,7 @@
     HelpCircleOutline,
     RemoveCircleOutline,
   } from '@vicons/ionicons5';
+  hljs.registerLanguage('goLang', goLang);
 
   interface Props {
     previewModel: any;

web/src/views/permission/role/columns.ts

@@ -15,7 +15,6 @@ export const columns = [
           {
             ghost: true,
             strong: true,
-            tertiary: true,
             size: 'small',
             text: true,
             iconPlacement: 'right',