diff --git a/pom.xml b/pom.xml
index a0a493c2..e5e80df9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,9 +8,8 @@
ruoyi
3.3.0
- ruoyi
- http://www.ruoyi.vip
- 若依微服务系统
+ 管理系统
+ 微服务系统
3.3.0
diff --git a/ruoyi-ui/src/views/business/english/word/index.vue b/ruoyi-ui/src/views/business/english/word/index.vue
index 77424fd3..39eb34e0 100644
--- a/ruoyi-ui/src/views/business/english/word/index.vue
+++ b/ruoyi-ui/src/views/business/english/word/index.vue
@@ -34,66 +34,61 @@
- 新增
-
-
-
- 修改
-
-
-
- 删除
-
-
-
- 导出
-
-
-
-
+
+
+
+
+
- 收藏夹
-
+ 导出
+
+
+
+ 收藏夹
+
+
+
+
@@ -137,7 +132,7 @@
:show-overflow-tooltip="true"/>
-
+
xjs-business-statistics
xjs-business-webmagic
xjs-business-blog
- xjs-business-srb
+ xjs-project-srb
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/XjsEnglishApp.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/XjsEnglishApp.java
index b69c2c72..950f735a 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/XjsEnglishApp.java
+++ b/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
- * @create 2021-12-29
+ * @since 2021-12-29
*/
@SpringBootApplication
@EnableCustomConfig
diff --git a/xjs-business/xjs-business-srb/pom.xml b/xjs-business/xjs-project-srb/pom.xml
similarity index 94%
rename from xjs-business/xjs-business-srb/pom.xml
rename to xjs-business/xjs-project-srb/pom.xml
index 6db1d741..42098506 100644
--- a/xjs-business/xjs-business-srb/pom.xml
+++ b/xjs-business/xjs-project-srb/pom.xml
@@ -15,7 +15,7 @@
pom
- xjs-business-srb
+ xjs-project-srb
11
diff --git a/xjs-business/xjs-business-srb/srb-service-base/pom.xml b/xjs-business/xjs-project-srb/srb-service-base/pom.xml
similarity index 91%
rename from xjs-business/xjs-business-srb/srb-service-base/pom.xml
rename to xjs-business/xjs-project-srb/srb-service-base/pom.xml
index 8a3e3194..b74ecb15 100644
--- a/xjs-business/xjs-business-srb/srb-service-base/pom.xml
+++ b/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">
- xjs-business-srb
+ xjs-project-srb
com.xjs
3.3.0
diff --git a/xjs-business/xjs-business-srb/srb-service-base/src/main/resources/rebel.xml b/xjs-business/xjs-project-srb/srb-service-base/src/main/resources/rebel.xml
similarity index 92%
rename from xjs-business/xjs-business-srb/srb-service-base/src/main/resources/rebel.xml
rename to xjs-business/xjs-project-srb/srb-service-base/src/main/resources/rebel.xml
index d6ace12b..3fae1828 100644
--- a/xjs-business/xjs-business-srb/srb-service-base/src/main/resources/rebel.xml
+++ b/xjs-business/xjs-project-srb/srb-service-base/src/main/resources/rebel.xml
@@ -9,7 +9,7 @@
srb-service-base
-
+
diff --git a/xjs-business/xjs-business-srb/srb-service-core/pom.xml b/xjs-business/xjs-project-srb/srb-service-core/pom.xml
similarity index 94%
rename from xjs-business/xjs-business-srb/srb-service-core/pom.xml
rename to xjs-business/xjs-project-srb/srb-service-core/pom.xml
index 3f1f2113..436af111 100644
--- a/xjs-business/xjs-business-srb/srb-service-core/pom.xml
+++ b/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">
- xjs-business-srb
+ xjs-project-srb
com.xjs
3.3.0
diff --git a/xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/XjsSrbCoreApp.java b/xjs-business/xjs-project-srb/srb-service-core/src/main/java/com/xjs/srb/core/XjsSrbCoreApp.java
similarity index 100%
rename from xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/XjsSrbCoreApp.java
rename to xjs-business/xjs-project-srb/srb-service-core/src/main/java/com/xjs/srb/core/XjsSrbCoreApp.java
diff --git a/xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/controller/BorrowInfoController.java b/xjs-business/xjs-project-srb/srb-service-core/src/main/java/com/xjs/srb/core/controller/BorrowInfoController.java
similarity index 100%
rename from xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/controller/BorrowInfoController.java
rename to xjs-business/xjs-project-srb/srb-service-core/src/main/java/com/xjs/srb/core/controller/BorrowInfoController.java
diff --git a/xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/controller/admin/IntegralGradeController.java b/xjs-business/xjs-project-srb/srb-service-core/src/main/java/com/xjs/srb/core/controller/admin/IntegralGradeController.java
similarity index 100%
rename from xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/controller/admin/IntegralGradeController.java
rename to xjs-business/xjs-project-srb/srb-service-core/src/main/java/com/xjs/srb/core/controller/admin/IntegralGradeController.java
diff --git a/xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/entity/BorrowInfo.java b/xjs-business/xjs-project-srb/srb-service-core/src/main/java/com/xjs/srb/core/entity/BorrowInfo.java
similarity index 100%
rename from xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/entity/BorrowInfo.java
rename to xjs-business/xjs-project-srb/srb-service-core/src/main/java/com/xjs/srb/core/entity/BorrowInfo.java
diff --git a/xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/entity/IntegralGrade.java b/xjs-business/xjs-project-srb/srb-service-core/src/main/java/com/xjs/srb/core/entity/IntegralGrade.java
similarity index 100%
rename from xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/entity/IntegralGrade.java
rename to xjs-business/xjs-project-srb/srb-service-core/src/main/java/com/xjs/srb/core/entity/IntegralGrade.java
diff --git a/xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/mapper/BorrowInfoMapper.java b/xjs-business/xjs-project-srb/srb-service-core/src/main/java/com/xjs/srb/core/mapper/BorrowInfoMapper.java
similarity index 100%
rename from xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/mapper/BorrowInfoMapper.java
rename to xjs-business/xjs-project-srb/srb-service-core/src/main/java/com/xjs/srb/core/mapper/BorrowInfoMapper.java
diff --git a/xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/mapper/IntegralGradeMapper.java b/xjs-business/xjs-project-srb/srb-service-core/src/main/java/com/xjs/srb/core/mapper/IntegralGradeMapper.java
similarity index 100%
rename from xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/mapper/IntegralGradeMapper.java
rename to xjs-business/xjs-project-srb/srb-service-core/src/main/java/com/xjs/srb/core/mapper/IntegralGradeMapper.java
diff --git a/xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/service/IBorrowInfoService.java b/xjs-business/xjs-project-srb/srb-service-core/src/main/java/com/xjs/srb/core/service/IBorrowInfoService.java
similarity index 100%
rename from xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/service/IBorrowInfoService.java
rename to xjs-business/xjs-project-srb/srb-service-core/src/main/java/com/xjs/srb/core/service/IBorrowInfoService.java
diff --git a/xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/service/IIntegralGradeService.java b/xjs-business/xjs-project-srb/srb-service-core/src/main/java/com/xjs/srb/core/service/IIntegralGradeService.java
similarity index 100%
rename from xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/service/IIntegralGradeService.java
rename to xjs-business/xjs-project-srb/srb-service-core/src/main/java/com/xjs/srb/core/service/IIntegralGradeService.java
diff --git a/xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/service/impl/BorrowInfoServiceImpl.java b/xjs-business/xjs-project-srb/srb-service-core/src/main/java/com/xjs/srb/core/service/impl/BorrowInfoServiceImpl.java
similarity index 100%
rename from xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/service/impl/BorrowInfoServiceImpl.java
rename to xjs-business/xjs-project-srb/srb-service-core/src/main/java/com/xjs/srb/core/service/impl/BorrowInfoServiceImpl.java
diff --git a/xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/service/impl/IntegralGradeServiceImpl.java b/xjs-business/xjs-project-srb/srb-service-core/src/main/java/com/xjs/srb/core/service/impl/IntegralGradeServiceImpl.java
similarity index 100%
rename from xjs-business/xjs-business-srb/srb-service-core/src/main/java/com/xjs/srb/core/service/impl/IntegralGradeServiceImpl.java
rename to xjs-business/xjs-project-srb/srb-service-core/src/main/java/com/xjs/srb/core/service/impl/IntegralGradeServiceImpl.java
diff --git a/xjs-business/xjs-business-srb/srb-service-core/src/main/resources/banner.txt b/xjs-business/xjs-project-srb/srb-service-core/src/main/resources/banner.txt
similarity index 100%
rename from xjs-business/xjs-business-srb/srb-service-core/src/main/resources/banner.txt
rename to xjs-business/xjs-project-srb/srb-service-core/src/main/resources/banner.txt
diff --git a/xjs-business/xjs-business-srb/srb-service-core/src/main/resources/bootstrap.yml b/xjs-business/xjs-project-srb/srb-service-core/src/main/resources/bootstrap.yml
similarity index 100%
rename from xjs-business/xjs-business-srb/srb-service-core/src/main/resources/bootstrap.yml
rename to xjs-business/xjs-project-srb/srb-service-core/src/main/resources/bootstrap.yml
diff --git a/xjs-business/xjs-business-srb/srb-service-core/src/main/resources/logback.xml b/xjs-business/xjs-project-srb/srb-service-core/src/main/resources/logback.xml
similarity index 100%
rename from xjs-business/xjs-business-srb/srb-service-core/src/main/resources/logback.xml
rename to xjs-business/xjs-project-srb/srb-service-core/src/main/resources/logback.xml
diff --git a/xjs-business/xjs-business-srb/srb-service-core/src/main/resources/mapper/BorrowInfoMapper.xml b/xjs-business/xjs-project-srb/srb-service-core/src/main/resources/mapper/BorrowInfoMapper.xml
similarity index 100%
rename from xjs-business/xjs-business-srb/srb-service-core/src/main/resources/mapper/BorrowInfoMapper.xml
rename to xjs-business/xjs-project-srb/srb-service-core/src/main/resources/mapper/BorrowInfoMapper.xml
diff --git a/xjs-business/xjs-business-srb/srb-service-core/src/main/resources/mapper/IntegralGradeMapper.xml b/xjs-business/xjs-project-srb/srb-service-core/src/main/resources/mapper/IntegralGradeMapper.xml
similarity index 100%
rename from xjs-business/xjs-business-srb/srb-service-core/src/main/resources/mapper/IntegralGradeMapper.xml
rename to xjs-business/xjs-project-srb/srb-service-core/src/main/resources/mapper/IntegralGradeMapper.xml
diff --git a/xjs-business/xjs-business-srb/srb-service-core/src/main/resources/rebel.xml b/xjs-business/xjs-project-srb/srb-service-core/src/main/resources/rebel.xml
similarity index 92%
rename from xjs-business/xjs-business-srb/srb-service-core/src/main/resources/rebel.xml
rename to xjs-business/xjs-project-srb/srb-service-core/src/main/resources/rebel.xml
index 3fdee43d..9b92aafd 100644
--- a/xjs-business/xjs-business-srb/srb-service-core/src/main/resources/rebel.xml
+++ b/xjs-business/xjs-project-srb/srb-service-core/src/main/resources/rebel.xml
@@ -9,7 +9,7 @@
srb-service-core
-
+
diff --git a/xjs-business/xjs-business-srb/srb-service-core/src/test/java/com/xjs/CodeGenerator.java b/xjs-business/xjs-project-srb/srb-service-core/src/test/java/com/xjs/CodeGenerator.java
similarity index 89%
rename from xjs-business/xjs-business-srb/srb-service-core/src/test/java/com/xjs/CodeGenerator.java
rename to xjs-business/xjs-project-srb/srb-service-core/src/test/java/com/xjs/CodeGenerator.java
index 7db2baa7..4a596747 100644
--- a/xjs-business/xjs-business-srb/srb-service-core/src/test/java/com/xjs/CodeGenerator.java
+++ b/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")