Merge branch 'master' of https://gitee.com/youlaiorg/youlai-boot into feature/noticews

# Conflicts:
#	src/main/java/com/youlai/boot/module/websocket/service/OnlineUserService.java

src/main/resources/application-dev.yml

@@ -20,7 +20,6 @@ spring:
       port: 6379
       # 如果Redis 服务未设置密码，需要将password删掉或注释，而不是设置为空字符串
       password: 123456
-
       timeout: 10s
       lettuce:
         pool:
@@ -152,7 +151,7 @@ springdoc:
         - com.youlai.boot.system.controller
         - com.youlai.boot.module.auth.controller
         - com.youlai.boot.module.file.controller
-        - com.youlai.boot.module.generator.controller
+        - com.youlai.boot.module.codegen.controller
   default-flat-param-object: true
 
 # knife4j 接口文档配置

src/main/resources/application-prod.yml

@@ -56,7 +56,6 @@ mybatis-plus:
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
-
 # 安全配置
 security:
   # JWT 配置
@@ -136,7 +135,7 @@ springdoc:
         - com.youlai.boot.system.controller
         - com.youlai.boot.module.auth.controller
         - com.youlai.boot.module.file.controller
-        - com.youlai.boot.module.generator.controller
+        - com.youlai.boot.module.codegen.controller
   default-flat-param-object: true
 
 # knife4j 接口文档配置

src/main/resources/mapper/LogMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.youlai.boot.system.mapper.LogMapper">
 
     <!-- 日志分页列表 -->
-    <select id="listPagedLogs" resultType="com.youlai.boot.system.model.vo.LogPageVO">
+    <select id="getLogPage" resultType="com.youlai.boot.system.model.vo.LogPageVO">
         SELECT
             t1.id,
             t1.module,

src/main/resources/templates/codegen/controller.java.vm

@@ -43,7 +43,7 @@ public class ${entityName}Controller  {
     @Operation(summary = "新增${businessName}")
     @PostMapping
     @PreAuthorize("@ss.hasPerm('${moduleName}:${lowerFirstEntityName}:add')")
-    public Result save${entityName}(@RequestBody @Valid ${entityName}Form formData ) {
+    public Result<Void> save${entityName}(@RequestBody @Valid ${entityName}Form formData ) {
         boolean result = ${lowerFirstEntityName}Service.save${entityName}(formData);
         return Result.judge(result);
     }
@@ -61,7 +61,7 @@ public class ${entityName}Controller  {
     @Operation(summary = "修改${businessName}")
     @PutMapping(value = "/{id}")
     @PreAuthorize("@ss.hasPerm('${moduleName}:${lowerFirstEntityName}:edit')")
-    public Result update${entityName}(
+    public Result<Void> update${entityName}(
             @Parameter(description = "$!{businessName}ID") @PathVariable Long id,
             @RequestBody @Validated ${entityName}Form formData
     ) {
@@ -72,7 +72,7 @@ public class ${entityName}Controller  {
     @Operation(summary = "删除${businessName}")
     @DeleteMapping("/{ids}")
     @PreAuthorize("@ss.hasPerm('${moduleName}:${lowerFirstEntityName}:delete')")
-    public Result delete${entityName}s(
+    public Result<Void> delete${entityName}s(
         @Parameter(description = "$!{businessName}ID，多个以英文逗号(,)分割") @PathVariable String ids
     ) {
         boolean result = ${lowerFirstEntityName}Service.delete${entityName}s(ids);

src/main/resources/templates/codegen/index.vue.vm

@@ -177,8 +177,6 @@
                       <el-input
                           v-model="formData.$fieldConfig.fieldName"
                           placeholder="$fieldConfig.fieldComment"
-                          clearable
-                          @keyup.enter="handleQuery()"
                       />
                     #elseif($fieldConfig.formType == "SELECT")
                         #if($fieldConfig.dictType != "")

src/main/resources/templates/codegen/query.java.vm

@@ -1,6 +1,6 @@
 package ${packageName}.${moduleName}.${subpackageName};
 
-import com.youlai.boot.common.base.BasePageQuery;
+import ${packageName}.common.base.BasePageQuery;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
@@ -23,8 +23,6 @@ import java.math.BigDecimal;
 @Setter
 public class ${entityName}Query extends BasePageQuery {
 
-    private static final long serialVersionUID = 1L;
-
 #if($fieldConfigs)
     #foreach($fieldConfig in ${fieldConfigs})
         #if($fieldConfig.isShowInQuery)