From 5a170fcd36c264e2275cbbe3039a3486eb4859ba Mon Sep 17 00:00:00 2001 From: xjs <1294405880@qq.com> Date: Thu, 16 Jun 2022 15:59:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E4=BF=AE=E5=A4=8D=E4=B8=8D?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=AC=AC=E4=B8=89=E6=96=B9=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/index.vue | 25 +++++- xjs-business/pom.xml | 1 - xjs-business/xjs-business-blog/pom.xml | 27 ------- .../src/main/java/com/xjs/XjsBlogApp.java | 22 ------ .../src/main/resources/banner.txt | 8 -- .../src/main/resources/bootstrap.yml | 31 -------- .../src/main/resources/logback.xml | 76 ------------------- .../src/main/resources/rebel.xml | 16 ---- xjs-business/xjs-business-english/pom.xml | 19 ++++- xjs-business/xjs-business-log/pom.xml | 19 ++++- xjs-business/xjs-business-monitor/pom.xml | 17 +++++ xjs-business/xjs-business-openapi/pom.xml | 18 ++++- .../service/impl/TopSearchServiceImpl.java | 8 +- xjs-business/xjs-business-statistics/pom.xml | 19 ++++- xjs-business/xjs-business-warning/pom.xml | 13 ++++ xjs-business/xjs-business-webmagic/pom.xml | 19 ++++- .../service/impl/SinaNewsServiceImpl.java | 8 ++ xjs-business/xjs-business-workflow/pom.xml | 17 +++++ xjs-business/xjs-project-blog/pom.xml | 17 +++++ xjs-business/xjs-project-exam/pom.xml | 17 +++++ .../xjs-project-mall/mall-coupon/pom.xml | 18 ++++- .../xjs-project-mall/mall-member/pom.xml | 18 ++++- .../xjs-project-mall/mall-order/pom.xml | 18 ++++- .../xjs-project-mall/mall-product/pom.xml | 17 +++++ .../xjs-project-mall/mall-search/pom.xml | 17 +++++ .../xjs-project-mall/mall-ware/pom.xml | 19 ++++- .../xjs-project-srb/srb-service-core/pom.xml | 19 ++++- 27 files changed, 325 insertions(+), 198 deletions(-) delete mode 100644 xjs-business/xjs-business-blog/pom.xml delete mode 100644 xjs-business/xjs-business-blog/src/main/java/com/xjs/XjsBlogApp.java delete mode 100644 xjs-business/xjs-business-blog/src/main/resources/banner.txt delete mode 100644 xjs-business/xjs-business-blog/src/main/resources/bootstrap.yml delete mode 100644 xjs-business/xjs-business-blog/src/main/resources/logback.xml delete mode 100644 xjs-business/xjs-business-blog/src/main/resources/rebel.xml diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 881360c5..08083281 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -103,7 +103,7 @@ 文案
+ style="color: #f8ac59;"> {{ copyWriting.content }} ——— {{ copyWriting.type }} @@ -182,7 +182,7 @@ - +
@@ -195,7 +195,7 @@
- +
@@ -210,6 +210,21 @@
+ +
+ +
+ 最新军事新闻 +
+
+ {{ + militaryNews.title + }} +
+ +
+ @@ -310,6 +325,9 @@ export default { internalNewsList: [], internationalNewsList: [], + militaryNewsList: [], + + beautyPictureList1: [], beautyPictureList2: [], beautyPictureList3: [], @@ -346,6 +364,7 @@ export default { this.englishWordTableData = res.data.englishWord this.internalNewsList = res.data.news.internal this.internationalNewsList = res.data.news.international + this.militaryNewsList = res.data.news.military this.beautyPictureList1 = res.data.beautyPicture.one this.beautyPictureList2 = res.data.beautyPicture.two this.beautyPictureList3 = res.data.beautyPicture.three diff --git a/xjs-business/pom.xml b/xjs-business/pom.xml index c8108e44..f5985dd5 100644 --- a/xjs-business/pom.xml +++ b/xjs-business/pom.xml @@ -23,7 +23,6 @@ xjs-business-log xjs-business-statistics xjs-business-webmagic - xjs-business-blog xjs-project-srb xjs-project-mall xjs-business-workflow diff --git a/xjs-business/xjs-business-blog/pom.xml b/xjs-business/xjs-business-blog/pom.xml deleted file mode 100644 index 95233d41..00000000 --- a/xjs-business/xjs-business-blog/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - xjs-business - com.xjs - 3.3.0 - - 4.0.0 - 业务模块-博客模块 - - xjs-business-blog - - - 11 - 11 - - - - - com.xjs - xjs-business-common - - - - \ No newline at end of file diff --git a/xjs-business/xjs-business-blog/src/main/java/com/xjs/XjsBlogApp.java b/xjs-business/xjs-business-blog/src/main/java/com/xjs/XjsBlogApp.java deleted file mode 100644 index 64408265..00000000 --- a/xjs-business/xjs-business-blog/src/main/java/com/xjs/XjsBlogApp.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.xjs; - -import com.ruoyi.common.security.annotation.EnableCustomConfig; -import com.ruoyi.common.security.annotation.EnableRyFeignClients; -import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * 博客服务启动器 - * @author xiejs - * @since 2022-01-27 - */ -@SpringBootApplication -@EnableCustomConfig -@EnableCustomSwagger2 -@EnableRyFeignClients -public class XjsBlogApp { - public static void main(String[] args) { - SpringApplication.run(XjsBlogApp.class, args); - } -} diff --git a/xjs-business/xjs-business-blog/src/main/resources/banner.txt b/xjs-business/xjs-business-blog/src/main/resources/banner.txt deleted file mode 100644 index 6f3fceaa..00000000 --- a/xjs-business/xjs-business-blog/src/main/resources/banner.txt +++ /dev/null @@ -1,8 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} -____ ___ ____. _________ _____.___._____.___.________ _________ -\ \/ / | |/ _____/ \__ | |\__ | |\______ \ / _____/ - \ / | |\_____ \ ______ / | | / | | | | \ \_____ \ - / \/\__| |/ \ /_____/ \____ | \____ | | ` \/ \ -/___/\ \________/_______ / / ______| / ______|/_______ /_______ / - \_/ \/ \/ \/ \/ \/ diff --git a/xjs-business/xjs-business-blog/src/main/resources/bootstrap.yml b/xjs-business/xjs-business-blog/src/main/resources/bootstrap.yml deleted file mode 100644 index 5965096d..00000000 --- a/xjs-business/xjs-business-blog/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,31 +0,0 @@ -# Tomcat -server: - port: 9907 - -# Spring -spring: - application: - # 应用名称 - name: xjs-blog - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: 127.0.0.1:8848 - config: - # 配置中心地址 - server-addr: 127.0.0.1:8848 - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - #配置组 - group: xjs - #命名空间 - namespace: xjs-666 - - diff --git a/xjs-business/xjs-business-blog/src/main/resources/logback.xml b/xjs-business/xjs-business-blog/src/main/resources/logback.xml deleted file mode 100644 index e86018e1..00000000 --- a/xjs-business/xjs-business-blog/src/main/resources/logback.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/xjs-business/xjs-business-blog/src/main/resources/rebel.xml b/xjs-business/xjs-business-blog/src/main/resources/rebel.xml deleted file mode 100644 index 7ae15862..00000000 --- a/xjs-business/xjs-business-blog/src/main/resources/rebel.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - xjs-business-blog - - - - - - - diff --git a/xjs-business/xjs-business-english/pom.xml b/xjs-business/xjs-business-english/pom.xml index 186c3496..ce785563 100644 --- a/xjs-business/xjs-business-english/pom.xml +++ b/xjs-business/xjs-business-english/pom.xml @@ -19,5 +19,22 @@ + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + - \ No newline at end of file + + diff --git a/xjs-business/xjs-business-log/pom.xml b/xjs-business/xjs-business-log/pom.xml index 68b3cebb..06583b00 100644 --- a/xjs-business/xjs-business-log/pom.xml +++ b/xjs-business/xjs-business-log/pom.xml @@ -25,4 +25,21 @@ - \ No newline at end of file + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + diff --git a/xjs-business/xjs-business-monitor/pom.xml b/xjs-business/xjs-business-monitor/pom.xml index 31e8de64..76756ed8 100644 --- a/xjs-business/xjs-business-monitor/pom.xml +++ b/xjs-business/xjs-business-monitor/pom.xml @@ -41,5 +41,22 @@ + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + diff --git a/xjs-business/xjs-business-openapi/pom.xml b/xjs-business/xjs-business-openapi/pom.xml index 4fc0a29d..ddad6727 100644 --- a/xjs-business/xjs-business-openapi/pom.xml +++ b/xjs-business/xjs-business-openapi/pom.xml @@ -25,4 +25,20 @@ - \ No newline at end of file + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/service/impl/TopSearchServiceImpl.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/service/impl/TopSearchServiceImpl.java index 235abad0..674127e1 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/service/impl/TopSearchServiceImpl.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/service/impl/TopSearchServiceImpl.java @@ -92,10 +92,10 @@ public class TopSearchServiceImpl implements TopSearchService { Map listHashMap = new HashMap<>(); listHashMap.put("allnetworkList", future1.get()); - listHashMap.put("wechatList", future2.get()); - listHashMap.put("baiduList", future3.get()); - listHashMap.put("weiboList", future4.get()); - listHashMap.put("douyinList", future5.get()); + listHashMap.put("weiboList", future2.get()); + listHashMap.put("douyinList", future3.get()); + listHashMap.put("wechatList", future4.get()); + listHashMap.put("baiduList", future5.get()); return listHashMap; } diff --git a/xjs-business/xjs-business-statistics/pom.xml b/xjs-business/xjs-business-statistics/pom.xml index 836da6e1..49ba9e34 100644 --- a/xjs-business/xjs-business-statistics/pom.xml +++ b/xjs-business/xjs-business-statistics/pom.xml @@ -24,4 +24,21 @@ - \ No newline at end of file + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + diff --git a/xjs-business/xjs-business-warning/pom.xml b/xjs-business/xjs-business-warning/pom.xml index ef9b6596..947272d3 100644 --- a/xjs-business/xjs-business-warning/pom.xml +++ b/xjs-business/xjs-business-warning/pom.xml @@ -10,7 +10,19 @@ 4.0.0 业务模块-预警模块 + ${project.artifactId} + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + org.apache.maven.plugins maven-compiler-plugin @@ -22,6 +34,7 @@ + xjs-business-warning diff --git a/xjs-business/xjs-business-webmagic/pom.xml b/xjs-business/xjs-business-webmagic/pom.xml index 21e2f215..a61c7570 100644 --- a/xjs-business/xjs-business-webmagic/pom.xml +++ b/xjs-business/xjs-business-webmagic/pom.xml @@ -40,4 +40,21 @@ - \ No newline at end of file + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/service/impl/SinaNewsServiceImpl.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/service/impl/SinaNewsServiceImpl.java index 7bf24eef..e8bf8b36 100644 --- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/service/impl/SinaNewsServiceImpl.java +++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/sina/service/impl/SinaNewsServiceImpl.java @@ -89,9 +89,17 @@ public class SinaNewsServiceImpl extends ServiceImpl i internationalWrapper.last("limit 5"); List internationalList = super.list(internationalWrapper); + LambdaQueryWrapper militaryWrapper = new LambdaQueryWrapper<>(); + militaryWrapper.select(SinaNews::getTitle, SinaNews::getUrl); + militaryWrapper.eq(SinaNews::getCategory, "军事"); + militaryWrapper.orderByDesc(SinaNews::getCreateTime); + militaryWrapper.last("limit 5"); + List militaryList = super.list(militaryWrapper); + return MapUtil.builder() .put("internal", internalList) .put("international", internationalList) + .put("military", militaryList) .build(); } diff --git a/xjs-business/xjs-business-workflow/pom.xml b/xjs-business/xjs-business-workflow/pom.xml index b9e8c0ed..b7e00e7d 100644 --- a/xjs-business/xjs-business-workflow/pom.xml +++ b/xjs-business/xjs-business-workflow/pom.xml @@ -44,4 +44,21 @@ + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + diff --git a/xjs-business/xjs-project-blog/pom.xml b/xjs-business/xjs-project-blog/pom.xml index 033b5d29..8b1122ef 100644 --- a/xjs-business/xjs-project-blog/pom.xml +++ b/xjs-business/xjs-project-blog/pom.xml @@ -17,4 +17,21 @@ 11 + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + diff --git a/xjs-business/xjs-project-exam/pom.xml b/xjs-business/xjs-project-exam/pom.xml index 595b2ffd..a300acf4 100644 --- a/xjs-business/xjs-project-exam/pom.xml +++ b/xjs-business/xjs-project-exam/pom.xml @@ -17,4 +17,21 @@ 11 + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + diff --git a/xjs-business/xjs-project-mall/mall-coupon/pom.xml b/xjs-business/xjs-project-mall/mall-coupon/pom.xml index eb9ad7b7..21b40c96 100644 --- a/xjs-business/xjs-project-mall/mall-coupon/pom.xml +++ b/xjs-business/xjs-project-mall/mall-coupon/pom.xml @@ -18,4 +18,20 @@ 11 - \ No newline at end of file + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + diff --git a/xjs-business/xjs-project-mall/mall-member/pom.xml b/xjs-business/xjs-project-mall/mall-member/pom.xml index 50856740..a6691692 100644 --- a/xjs-business/xjs-project-mall/mall-member/pom.xml +++ b/xjs-business/xjs-project-mall/mall-member/pom.xml @@ -18,4 +18,20 @@ 11 - \ No newline at end of file + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + diff --git a/xjs-business/xjs-project-mall/mall-order/pom.xml b/xjs-business/xjs-project-mall/mall-order/pom.xml index fafe21d6..5b4c0e3f 100644 --- a/xjs-business/xjs-project-mall/mall-order/pom.xml +++ b/xjs-business/xjs-project-mall/mall-order/pom.xml @@ -18,4 +18,20 @@ 11 - \ No newline at end of file + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + diff --git a/xjs-business/xjs-project-mall/mall-product/pom.xml b/xjs-business/xjs-project-mall/mall-product/pom.xml index 657dc05c..abaa3002 100644 --- a/xjs-business/xjs-project-mall/mall-product/pom.xml +++ b/xjs-business/xjs-project-mall/mall-product/pom.xml @@ -30,4 +30,21 @@ + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + diff --git a/xjs-business/xjs-project-mall/mall-search/pom.xml b/xjs-business/xjs-project-mall/mall-search/pom.xml index 0f4f70b5..e1b8ab9d 100644 --- a/xjs-business/xjs-project-mall/mall-search/pom.xml +++ b/xjs-business/xjs-project-mall/mall-search/pom.xml @@ -35,4 +35,21 @@ + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + diff --git a/xjs-business/xjs-project-mall/mall-ware/pom.xml b/xjs-business/xjs-project-mall/mall-ware/pom.xml index 28b9b08b..edeeb93d 100644 --- a/xjs-business/xjs-project-mall/mall-ware/pom.xml +++ b/xjs-business/xjs-project-mall/mall-ware/pom.xml @@ -18,4 +18,21 @@ 11 - \ No newline at end of file + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + diff --git a/xjs-business/xjs-project-srb/srb-service-core/pom.xml b/xjs-business/xjs-project-srb/srb-service-core/pom.xml index 436af111..2cc5af69 100644 --- a/xjs-business/xjs-project-srb/srb-service-core/pom.xml +++ b/xjs-business/xjs-project-srb/srb-service-core/pom.xml @@ -31,4 +31,21 @@ - \ No newline at end of file + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + +