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

src/main/resources/application-dev.yml

@@ -150,9 +150,9 @@ springdoc:
       paths-to-match: "/**"
       packages-to-scan:
         - com.youlai.boot.system.controller
-        - com.youlai.boot.platform.auth.controller
-        - com.youlai.boot.platform.file.controller
-        - com.youlai.boot.platform.generator.controller
+        - com.youlai.boot.module.auth.controller
+        - com.youlai.boot.module.file.controller
+        - com.youlai.boot.module.generator.controller
   default-flat-param-object: true
 
 # knife4j 接口文档配置

src/main/resources/application-prod.yml

@@ -134,9 +134,9 @@ springdoc:
       paths-to-match: "/**"
       packages-to-scan:
         - com.youlai.boot.system.controller
-        - com.youlai.boot.platform.auth.controller
-        - com.youlai.boot.platform.file.controller
-        - com.youlai.boot.platform.generator.controller
+        - com.youlai.boot.module.auth.controller
+        - com.youlai.boot.module.file.controller
+        - com.youlai.boot.module.generator.controller
   default-flat-param-object: true
 
 # knife4j 接口文档配置

src/main/resources/application.yml

@@ -5,7 +5,7 @@ spring:
     active: dev
 
 # 代码生成器配置
-generator:
+codegen:
   # 下载代码文件名称
   downloadFileName: youlai-admin-code.zip
   # 后端项目名称
@@ -23,43 +23,43 @@ generator:
   ## 模板配置
   templateConfigs:
     API:
-      templatePath: generator/api.ts.vm
+      templatePath: codegen/api.ts.vm
       subpackageName: api
       extension: .ts
     VIEW:
-      templatePath: generator/index.vue.vm
+      templatePath: codegen/index.vue.vm
       subpackageName: views
       extension: .vue
     Controller:
-      templatePath: generator/controller.java.vm
+      templatePath: codegen/controller.java.vm
       subpackageName: controller
     Service:
-      templatePath: generator/service.java.vm
+      templatePath: codegen/service.java.vm
       subpackageName: service
     ServiceImpl:
-      templatePath: generator/serviceImpl.java.vm
+      templatePath: codegen/serviceImpl.java.vm
       subpackageName: service.impl
     Mapper:
-      templatePath: generator/mapper.java.vm
+      templatePath: codegen/mapper.java.vm
       subpackageName: mapper
     MapperXml:
-      templatePath: generator/mapper.xml.vm
+      templatePath: codegen/mapper.xml.vm
       subpackageName: mapper
       extension: .xml
     Converter:
-      templatePath: generator/converter.java.vm
+      templatePath: codegen/converter.java.vm
       subpackageName: converter
     Query:
-      templatePath: generator/query.java.vm
+      templatePath: codegen/query.java.vm
       subpackageName: model.query
     Form:
-      templatePath: generator/form.java.vm
+      templatePath: codegen/form.java.vm
       subpackageName: model.form
     VO:
-      templatePath: generator/vo.java.vm
+      templatePath: codegen/vo.java.vm
       subpackageName: model.vo
     Entity:
-      templatePath: generator/entity.java.vm
+      templatePath: codegen/entity.java.vm
       subpackageName: model.entity
 
 

src/main/resources/mapper/DatabaseMapper.xml

@@ -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,

src/main/resources/mapper/GenConfigMapper.xml

@@ -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>

src/main/resources/mapper/GenFieldConfigMapper.xml

@@ -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>