From 98624e66e583a9722205de485a41d79188b952af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Mon, 10 May 2021 15:34:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E5=8F=91=E5=B8=83=201.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 20 +- ruoyi-admin/pom.xml | 4 +- .../src/main/resources/application.yml | 4 +- ruoyi-common/pom.xml | 4 +- ruoyi-demo/pom.xml | 4 +- .../demo/controller/FeignTestController.java | 5 + .../ruoyi/demo/feign/FeignTestService.java | 5 + .../feign/fallback/FeignTestFallback.java | 5 + ruoyi-framework/pom.xml | 4 +- .../framework/config/AdminServerConfig.java | 5 + .../ruoyi/framework/config/FeignConfig.java | 5 + .../framework/config/MybatisPlusConfig.java | 5 + .../framework/config/ValidatorConfig.java | 5 + ruoyi-generator/pom.xml | 4 +- ruoyi-quartz/pom.xml | 4 +- ruoyi-system/pom.xml | 4 +- ruoyi-ui/package.json | 8 +- .../src/layout/components/Sidebar/Logo.vue | 2 +- ruoyi-ui/src/settings.js | 2 +- ruoyi-ui/src/views/index.vue | 465 +----------------- ruoyi-ui/src/views/login.vue | 2 +- ruoyi-ui/vue.config.js | 2 +- 22 files changed, 87 insertions(+), 481 deletions(-) diff --git a/pom.xml b/pom.xml index 82cf791bb..43443e106 100644 --- a/pom.xml +++ b/pom.xml @@ -5,15 +5,15 @@ 4.0.0 com.ruoyi - ruoyi - 3.4.0 + ruoyi-vue-plus + ${ruoyi-vue-plus.version} RuoYi-Vue-Plus https://gitee.com/JavaLionLi/RuoYi-Vue-Plus - 若依管理系统 + RuoYi-Vue-Plus后台管理系统 - 3.4.0 + 1.0.0 UTF-8 UTF-8 1.8 @@ -168,42 +168,42 @@ com.ruoyi ruoyi-quartz - ${ruoyi.version} + ${ruoyi-vue-plus.version} com.ruoyi ruoyi-generator - ${ruoyi.version} + ${ruoyi-vue-plus.version} com.ruoyi ruoyi-framework - ${ruoyi.version} + ${ruoyi-vue-plus.version} com.ruoyi ruoyi-system - ${ruoyi.version} + ${ruoyi-vue-plus.version} com.ruoyi ruoyi-common - ${ruoyi.version} + ${ruoyi-vue-plus.version} com.ruoyi ruoyi-demo - ${ruoyi.version} + ${ruoyi-vue-plus.version} diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 32977f3e9..d1b62316e 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -3,9 +3,9 @@ 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"> - ruoyi + ruoyi-vue-plus com.ruoyi - 3.4.0 + ${ruoyi-vue-plus.version} 4.0.0 jar diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 9a0def6d8..44bc43779 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -1,9 +1,9 @@ # 项目相关配置 ruoyi: # 名称 - name: RuoYi + name: RuoYi-Vue-Plus # 版本 - version: 3.4.0 + version: ${ruoyi-vue-plus.version} # 版权年份 copyrightYear: 2021 # 实例演示开关 diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 62de11a15..19f00745b 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -3,9 +3,9 @@ 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"> - ruoyi + ruoyi-vue-plus com.ruoyi - 3.4.0 + ${ruoyi-vue-plus.version} 4.0.0 diff --git a/ruoyi-demo/pom.xml b/ruoyi-demo/pom.xml index ffe1f127e..9789455ec 100644 --- a/ruoyi-demo/pom.xml +++ b/ruoyi-demo/pom.xml @@ -3,9 +3,9 @@ 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"> - ruoyi + ruoyi-vue-plus com.ruoyi - 3.4.0 + ${ruoyi-vue-plus.version} 4.0.0 diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/FeignTestController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/FeignTestController.java index f4c5f4499..ec3e0d665 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/FeignTestController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/FeignTestController.java @@ -9,6 +9,11 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +/** + * feign测试controller + * + * @author Lion Li + */ @RequiredArgsConstructor(onConstructor_ = @Autowired) @RestController @RequestMapping("/feign/test") diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/FeignTestService.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/FeignTestService.java index 4945f5967..c20973a72 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/FeignTestService.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/FeignTestService.java @@ -5,6 +5,11 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; +/** + * feign测试service + * + * @author Lion Li + */ @FeignClient(name = "baidu",url = "http://www.baidu.com",fallback = FeignTestFallback.class) public interface FeignTestService { diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/fallback/FeignTestFallback.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/fallback/FeignTestFallback.java index 9e49701c0..3b4dfd0c4 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/fallback/FeignTestFallback.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/feign/fallback/FeignTestFallback.java @@ -5,6 +5,11 @@ import com.ruoyi.demo.feign.FeignTestService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +/** + * feign测试fallback + * + * @author Lion Li + */ @Slf4j @Component public class FeignTestFallback implements FeignTestService { diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml index d738880e9..a138044ac 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-framework/pom.xml @@ -3,9 +3,9 @@ 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"> - ruoyi + ruoyi-vue-plus com.ruoyi - 3.4.0 + ${ruoyi-vue-plus.version} 4.0.0 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AdminServerConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AdminServerConfig.java index 49b541104..5fa65c1e1 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AdminServerConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AdminServerConfig.java @@ -11,6 +11,11 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import java.util.concurrent.Executor; +/** + * springboot-admin server配置类 + * + * @author Lion Li + */ @Configuration @EnableAdminServer public class AdminServerConfig { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java index 426b084d2..df0951693 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java @@ -14,6 +14,11 @@ import org.springframework.context.annotation.Configuration; import java.util.concurrent.TimeUnit; +/** + * openfeign配置类 + * + * @author Lion Li + */ @EnableFeignClients("com.ruoyi.**.feign") @Configuration @ConditionalOnClass(Feign.class) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java index ea5e05b20..93a202caf 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java @@ -10,6 +10,11 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.transaction.annotation.EnableTransactionManagement; +/** + * mybatis-plus配置类 + * + * @author Lion Li + */ @EnableTransactionManagement(proxyTargetClass = true) @Configuration public class MybatisPlusConfig { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ValidatorConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ValidatorConfig.java index d9b0b3d99..258e855cd 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ValidatorConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ValidatorConfig.java @@ -8,6 +8,11 @@ import javax.validation.Validation; import javax.validation.Validator; import javax.validation.ValidatorFactory; +/** + * 校验框架配置类 + * + * @author Lion Li + */ @Configuration public class ValidatorConfig { diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml index 594d0b306..3d359605d 100644 --- a/ruoyi-generator/pom.xml +++ b/ruoyi-generator/pom.xml @@ -3,9 +3,9 @@ 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"> - ruoyi + ruoyi-vue-plus com.ruoyi - 3.4.0 + ${ruoyi-vue-plus.version} 4.0.0 diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml index cc2d760a3..f29cea7d4 100644 --- a/ruoyi-quartz/pom.xml +++ b/ruoyi-quartz/pom.xml @@ -3,9 +3,9 @@ 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"> - ruoyi + ruoyi-vue-plus com.ruoyi - 3.4.0 + ${ruoyi-vue-plus.version} 4.0.0 diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml index b36a70210..7563b1a04 100644 --- a/ruoyi-system/pom.xml +++ b/ruoyi-system/pom.xml @@ -3,9 +3,9 @@ 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"> - ruoyi + ruoyi-vue-plus com.ruoyi - 3.4.0 + ${ruoyi-vue-plus.version} 4.0.0 diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 57fa9dbb5..a3765b639 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -1,8 +1,8 @@ { - "name": "ruoyi", - "version": "3.4.0", - "description": "若依管理系统", - "author": "若依", + "name": "ruoyi-vue-plus", + "version": "1.0.0", + "description": "RuoYi-Vue-Plus后台管理系统", + "author": "LionLi", "license": "MIT", "scripts": { "dev": "vue-cli-service serve", diff --git a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue index 57dbd3a87..4c26fd304 100644 --- a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue +++ b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue @@ -35,7 +35,7 @@ export default { }, data() { return { - title: '若依管理系统', + title: 'RuoYi-Vue-Plus', logo: logoImg } } diff --git a/ruoyi-ui/src/settings.js b/ruoyi-ui/src/settings.js index ba5cbd03c..5d177b28c 100644 --- a/ruoyi-ui/src/settings.js +++ b/ruoyi-ui/src/settings.js @@ -1,5 +1,5 @@ module.exports = { - title: '若依管理系统', + title: 'RuoYi-Vue-Plus后台管理系统', /** * 侧边栏主题 深色主题theme-dark，浅色主题theme-light diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index dc189c7c5..520e06802 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -1,47 +1,10 @@ @@ -525,7 +96,7 @@ export default { data() { return { // 版本号 - version: "3.4.0", + version: "1.0.0", }; }, methods: { diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue index 0c381ac61..147117f99 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/ruoyi-ui/src/views/login.vue @@ -1,7 +1,7 @@