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

# Conflicts:
#	sql/mysql5/youlai_boot.sql
#	src/main/java/com/youlai/boot/module/websocket/service/MessageService.java
#	src/main/java/com/youlai/boot/module/websocket/service/WebsocketService.java
#	src/main/java/com/youlai/boot/module/websocket/service/impl/WebsocketServiceImpl.java
#	src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java
This commit is contained in:
胡少翔
2024-09-12 09:36:04 +08:00
71 changed files with 1040 additions and 1066 deletions

View File

@@ -2,10 +2,10 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.youlai.boot.platform.generator.mapper.DatabaseMapper">
<mapper namespace="com.youlai.boot.module.codegen.mapper.DatabaseMapper">
<!-- 查询数据库表分页 -->
<select id="getTablePage" resultType="com.youlai.boot.platform.generator.model.vo.TablePageVO">
<select id="getTablePage" resultType="com.youlai.boot.module.codegen.model.vo.TablePageVO">
SELECT
t1.TABLE_NAME ,
t1.TABLE_COMMENT ,
@@ -33,7 +33,7 @@
CREATE_TIME DESC
</select>
<select id="getTableMetadata" resultType="com.youlai.boot.platform.generator.model.bo.TableMetaData">
<select id="getTableMetadata" resultType="com.youlai.boot.module.codegen.model.bo.TableMetaData">
SELECT
TABLE_NAME ,
TABLE_COMMENT ,
@@ -47,7 +47,7 @@
AND TABLE_NAME = #{tableName}
</select>
<select id="getTableColumns" resultType="com.youlai.boot.platform.generator.model.bo.ColumnMetaData">
<select id="getTableColumns" resultType="com.youlai.boot.module.codegen.model.bo.ColumnMetaData">
SELECT
COLUMN_NAME,
DATA_TYPE,

View File

@@ -2,6 +2,6 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.youlai.boot.platform.generator.mapper.GenConfigMapper">
<mapper namespace="com.youlai.boot.module.codegen.mapper.GenConfigMapper">
</mapper>

View File

@@ -2,6 +2,6 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.youlai.boot.platform.generator.mapper.GenFieldConfigMapper">
<mapper namespace="com.youlai.boot.module.generator.mapper.GenFieldConfigMapper">
</mapper>