1、项目模块结构调整

pom.xml

@@ -8,9 +8,8 @@
     <artifactId>ruoyi</artifactId>
     <version>3.3.0</version>
 
-    <name>ruoyi</name>
+    <name>管理系统</name>
-    <url>http://www.ruoyi.vip</url>
+    <description>微服务系统</description>
-    <description>若依微服务系统</description>
 
     <properties>
         <ruoyi.version>3.3.0</ruoyi.version>

ruoyi-ui/src/views/business/english/word/index.vue

@@ -34,66 +34,61 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
+        <el-button-group>
-          type="primary"
+          <el-button
-          plain
+            type="primary"
-          icon="el-icon-plus"
+            plain
-          size="mini"
+            icon="el-icon-plus"
-          @click="handleAdd"
+            size="small"
-          v-hasPermi="['english:word:add']"
+            @click="handleAdd"
-        >新增
+            v-hasPermi="['english:word:add']"
-        </el-button>
+          >
-      </el-col>
+          </el-button>
-      <el-col :span="1.5">
+          <el-button
-        <el-button
+            type="success"
-          type="success"
+            plain
-          plain
+            icon="el-icon-edit"
-          icon="el-icon-edit"
+            size="small"
-          size="mini"
+            :disabled="single"
-          :disabled="single"
+            @click="handleUpdate"
-          @click="handleUpdate"
+            v-hasPermi="['english:word:edit']"
-          v-hasPermi="['english:word:edit']"
+          >
-        >修改
+          </el-button>
-        </el-button>
+          <el-button
-      </el-col>
+            type="danger"
-      <el-col :span="1.5">
+            plain
-        <el-button
+            icon="el-icon-delete"
-          type="danger"
+            size="small"
-          plain
+            :disabled="multiple"
-          icon="el-icon-delete"
+            @click="handleDelete"
-          size="mini"
+            v-hasPermi="['english:word:remove']"
-          :disabled="multiple"
+          >
-          @click="handleDelete"
+          </el-button>
-          v-hasPermi="['english:word:remove']"
-        >删除
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['english:word:export']"
-        >导出
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <router-link :to="'/business/english/collect/'" class="link-type">
           <el-button
             type="warning"
             plain
-            icon="el-icon-star-off"
+            icon="el-icon-download"
-            size="mini"
+            size="small"
-            @click="handleCollect"
+            @click="handleExport"
-            v-hasPermi="['english:word:collect']"
+            v-hasPermi="['english:word:export']"
-          >
+          >导出
-            收藏夹
           </el-button>
-        </router-link>
+          <router-link :to="'/business/english/collect/'" class="link-type">
+            <el-button
+              type="info"
+              plain
+              icon="el-icon-star-off"
+              size="small"
+              @click="handleCollect"
+              v-hasPermi="['english:word:collect']"
+            >
+              收藏夹
+            </el-button>
+          </router-link>
+        </el-button-group>
 
       </el-col>
+
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -137,7 +132,7 @@
                        :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-tooltip class="item" effect="dark" content="点击查看详情" placement="top-start">
+          <el-tooltip class="item" effect="dark" content="点击查看详情" placement="left-start" :hide-after="3000" :enterable="false">
             <el-button circle
                        type=""
                        icon="el-icon-view"
@@ -389,8 +384,8 @@ export default {
 
     dateQuery() {
       //清空时间参数
-      this.queryParams.createTime=null
+      this.queryParams.createTime = null
-      this.queryParams.endCreateTime=null
+      this.queryParams.endCreateTime = null
 
       this.handleQuery();
     },
@@ -472,9 +467,9 @@ export default {
       this.queryParams.createTime = null
       this.queryParams.endCreateTime = null
 
-      this.sortStatus=false
+      this.sortStatus = false
       this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)//拿到默认排序
-      this.sortStatus=true
+      this.sortStatus = true
 
       this.resetForm("queryForm");
       this.handleQuery();

xjs-business/pom.xml

@@ -24,7 +24,7 @@
         <module>xjs-business-statistics</module>
         <module>xjs-business-webmagic</module>
         <module>xjs-business-blog</module>
-        <module>xjs-business-srb</module>
+        <module>xjs-project-srb</module>
     </modules>
 
     <properties>

xjs-business/xjs-business-english/src/main/java/com/xjs/XjsEnglishApp.java

@@ -7,9 +7,9 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 /**
+ * 英语模块启动器
  * @author xiejs
- * @desc
+ * @since  2021-12-29
- * @create 2021-12-29
  */
 @SpringBootApplication
 @EnableCustomConfig

xjs-business/xjs-project-srb/pom.xml

@@ -15,7 +15,7 @@
     </modules>
     <packaging>pom</packaging>
 
-    <artifactId>xjs-business-srb</artifactId>
+    <artifactId>xjs-project-srb</artifactId>
 
     <properties>
         <maven.compiler.source>11</maven.compiler.source>

xjs-business/xjs-project-srb/srb-service-base/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>xjs-business-srb</artifactId>
+        <artifactId>xjs-project-srb</artifactId>
         <groupId>com.xjs</groupId>
         <version>3.3.0</version>
     </parent>

xjs-business/xjs-project-srb/srb-service-base/src/main/resources/rebel.xml

@@ -9,7 +9,7 @@
 	<id>srb-service-base</id>
 
 	<classpath>
-		<dir name="D:/Dev/IdeaPerject/GitHub/RuoYi-Cloud/xjs-business/xjs-business-srb/srb-service-base/target/classes">
+		<dir name="D:/Dev/IdeaPerject/GitHub/RuoYi-Cloud/xjs-business/xjs-project-srb/srb-service-base/target/classes">
 		</dir>
 	</classpath>
 

xjs-business/xjs-project-srb/srb-service-core/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>xjs-business-srb</artifactId>
+        <artifactId>xjs-project-srb</artifactId>
         <groupId>com.xjs</groupId>
         <version>3.3.0</version>
     </parent>

xjs-business/xjs-project-srb/srb-service-core/src/main/resources/rebel.xml

@@ -9,7 +9,7 @@
 	<id>srb-service-core</id>
 
 	<classpath>
-		<dir name="D:/Dev/IdeaPerject/GitHub/RuoYi-Cloud/xjs-business/xjs-business-srb/srb-service-core/target/classes">
+		<dir name="D:/Dev/IdeaPerject/GitHub/RuoYi-Cloud/xjs-business/xjs-project-srb/srb-service-core/target/classes">
 		</dir>
 	</classpath>
 

xjs-business/xjs-project-srb/srb-service-core/src/test/java/com/xjs/CodeGenerator.java

@@ -18,12 +18,12 @@ public class CodeGenerator {
                     builder.author("xiejs") // 设置作者
                             .enableSwagger() // 开启 swagger 模式
                             .fileOverride() // 覆盖已生成文件
-                            .outputDir("D:\\Dev\\IdeaPerject\\GitHub\\RuoYi-Cloud\\xjs-business\\xjs-business-srb\\srb-service-core\\src\\main\\java"); // 指定输出目录
+                            .outputDir("D:\\Dev\\IdeaPerject\\GitHub\\RuoYi-Cloud\\xjs-business\\xjs-project-srb\\srb-service-core\\src\\main\\java"); // 指定输出目录
                 })
                 .packageConfig(builder -> {
                     builder.parent("com.xjs.srb") // 设置父包名
                             .moduleName("core") // 设置父包模块名
-                            .pathInfo(Collections.singletonMap(OutputFile.mapperXml, "D:\\Dev\\IdeaPerject\\GitHub\\RuoYi-Cloud\\xjs-business\\xjs-business-srb\\srb-service-core\\src\\main\\resources\\mapper")); // 设置mapperXml生成路径
+                            .pathInfo(Collections.singletonMap(OutputFile.mapperXml, "D:\\Dev\\IdeaPerject\\GitHub\\RuoYi-Cloud\\xjs-business\\xjs-project-srb\\srb-service-core\\src\\main\\resources\\mapper")); // 设置mapperXml生成路径
                 })
                 .strategyConfig(builder -> {
                     builder.addInclude("integral_grade")