diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 90a1b50c..a82a950d 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -49,7 +49,7 @@ server: # 日志配置 logging: level: - org.dromara: @logging.level@ + org.ruoyi: @logging.level@ org.springframework: warn org.mybatis.spring.mapper: error org.apache.fury: warn diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatSessionController.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatSessionController.java index 955bf5f9..946c12b6 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatSessionController.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatSessionController.java @@ -82,8 +82,10 @@ public class ChatSessionController extends BaseController { @Log(title = "会话管理", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody ChatSessionBo bo) { - return toAjax(chatSessionService.insertByBo(bo)); + public R add(@Validated(AddGroup.class) @RequestBody ChatSessionBo bo) { + chatSessionService.insertByBo(bo); + // 返回会话id + return R.ok(bo.getId()); } /** diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/util/VelocityUtils.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/util/VelocityUtils.java index 65ab7ea4..68ae42be 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/util/VelocityUtils.java +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/util/VelocityUtils.java @@ -285,8 +285,8 @@ public class VelocityUtils { } else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType())) { importList.add("java.math.BigDecimal"); } else if (!column.isSuperColumn() && "imageUpload".equals(column.getHtmlType())) { - importList.add("org.dromara.common.translation.annotation.Translation"); - importList.add("org.dromara.common.translation.constant.TransConstant"); + importList.add("org.ruoyi.common.translation.annotation.Translation"); + importList.add("org.ruoyi.common.translation.constant.TransConstant"); } } return importList;