优化

doc/模版.md

@@ -459,6 +459,7 @@ menuTemplate(menus) ::= <<
 		<insert tableName="ms_menu">
 			<column name="id" value="$op.id$"/>
 			<column name="parent_id" value="$op.parentId$"/>
+			<column name="fun_id" value="$if(op.funId)$$op.funId$$else$null$endif$"/>
 			<column name="menu_name" value="$op.menuName$"/>
 			<column name="menu_type" value="$menuTypeAnnotations.(op.menuType)$"/>
 			<column name="client_type" value="$clientTypeAnnotations.(op.clientType)$"/>

pom.xml

@@ -75,18 +75,7 @@
             <artifactId>fastjson2</artifactId>
             <version>${fastjson2.version}</version>
         </dependency>
-        <!-- knife4j -->
+
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
-            <version>${knife4j.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springdoc</groupId>
-                    <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
@@ -150,4 +139,31 @@
             </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <!-- knife4j -->
+                <dependency>
+                    <groupId>com.github.xiaoymin</groupId>
+                    <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
+                    <version>${knife4j.version}</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>org.springdoc</groupId>
+                            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+            </dependencies>
+        </profile>
+
+        <profile>
+            <id>prod</id>
+        </profile>
+    </profiles>
 </project>

src/main/java/com/cczsa/xinghe/codegen/service/impl/FunItemServiceImpl.java

@@ -1,5 +1,6 @@
 package com.cczsa.xinghe.codegen.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.cczsa.xinghe.codegen.constant.CodegenConstant;
 import com.cczsa.xinghe.codegen.entity.FunItemEntity;
 import com.cczsa.xinghe.codegen.entity.FunModuleEntity;
@@ -15,7 +16,6 @@ import com.cczsa.xinghe.codegen.mapper.def.FunItemDef;
 import com.cczsa.xinghe.codegen.mapper.def.FunModuleDef;
 import com.cczsa.xinghe.codegen.service.FunItemService;
 import com.cczsa.xinghe.codegen.util.XResult;
-import com.github.xiaoymin.knife4j.core.util.StrUtil;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.core.util.ObjectUtil;
 import lombok.RequiredArgsConstructor;

src/main/java/com/cczsa/xinghe/codegen/service/impl/FunModuleServiceImpl.java

@@ -1,5 +1,6 @@
 package com.cczsa.xinghe.codegen.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.cczsa.xinghe.codegen.constant.CodegenConstant;
 import com.cczsa.xinghe.codegen.entity.FunItemEntity;
 import com.cczsa.xinghe.codegen.entity.FunModuleEntity;
@@ -18,7 +19,6 @@ import com.cczsa.xinghe.codegen.mapper.def.FunModuleDef;
 import com.cczsa.xinghe.codegen.mapper.def.FunOperationDef;
 import com.cczsa.xinghe.codegen.service.FunModuleService;
 import com.cczsa.xinghe.codegen.util.XResult;
-import com.github.xiaoymin.knife4j.core.util.StrUtil;
 import com.mybatisflex.core.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;

src/main/java/com/cczsa/xinghe/codegen/service/impl/FunOperationServiceImpl.java

@@ -1,5 +1,6 @@
 package com.cczsa.xinghe.codegen.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.cczsa.xinghe.codegen.entity.FunItemEntity;
 import com.cczsa.xinghe.codegen.entity.FunModuleEntity;
 import com.cczsa.xinghe.codegen.entity.FunOperationEntity;
@@ -16,7 +17,6 @@ import com.cczsa.xinghe.codegen.mapper.def.FunModuleDef;
 import com.cczsa.xinghe.codegen.mapper.def.FunOperationDef;
 import com.cczsa.xinghe.codegen.service.FunOperationService;
 import com.cczsa.xinghe.codegen.util.XResult;
-import com.github.xiaoymin.knife4j.core.util.StrUtil;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.core.util.CollectionUtil;
 import lombok.RequiredArgsConstructor;

src/main/java/com/cczsa/xinghe/codegen/service/impl/RoleServiceImpl.java

@@ -1,5 +1,6 @@
 package com.cczsa.xinghe.codegen.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.cczsa.xinghe.codegen.entity.FunOperationEntity;
 import com.cczsa.xinghe.codegen.entity.MenuEntity;
 import com.cczsa.xinghe.codegen.entity.RoleEntity;
@@ -23,7 +24,6 @@ import com.cczsa.xinghe.codegen.mapper.def.RoleDef;
 import com.cczsa.xinghe.codegen.mapper.def.RoleFunDef;
 import com.cczsa.xinghe.codegen.service.RoleService;
 import com.cczsa.xinghe.codegen.util.XResult;
-import com.github.xiaoymin.knife4j.core.util.StrUtil;
 import com.mybatisflex.core.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;

src/main/java/com/cczsa/xinghe/codegen/service/impl/TemplateServiceImpl.java

@@ -1,5 +1,6 @@
 package com.cczsa.xinghe.codegen.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.cczsa.xinghe.codegen.entity.TemplateEntity;
 import com.cczsa.xinghe.codegen.entity.enums.TemplateTypeEnum;
 import com.cczsa.xinghe.codegen.entity.req.template.TemplateAddReq;
@@ -10,7 +11,6 @@ import com.cczsa.xinghe.codegen.mapper.TemplateMapper;
 import com.cczsa.xinghe.codegen.mapper.def.TemplateDef;
 import com.cczsa.xinghe.codegen.service.TemplateService;
 import com.cczsa.xinghe.codegen.util.XResult;
-import com.github.xiaoymin.knife4j.core.util.StrUtil;
 import com.mybatisflex.core.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;