From f7c5ae349507f01053643cbf01fbdbdd9e7283a6 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 18 六月 2024 14:44:52 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TGoodsController.java | 4 ++--
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 22 ++++++++++++++++++----
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java | 4 ++--
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/utils/PayMoneyUtil.java | 4 ++--
ruoyi-service/ruoyi-management/pom.xml | 6 +-----
5 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java
index 2592c62..1258c10 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java
@@ -7,9 +7,9 @@
*/
public class CacheConstants {
/**
- * 缓存有效期，默认720（分钟）
+ * 缓存有效期，默认720（分钟）一周
*/
- public final static long EXPIRATION = 720;
+ public final static long EXPIRATION = 10080;
/**
* 缓存刷新时间，默认120（分钟）
diff --git a/ruoyi-service/ruoyi-management/pom.xml b/ruoyi-service/ruoyi-management/pom.xml
index f91d8be..cb56bc2 100644
--- a/ruoyi-service/ruoyi-management/pom.xml
+++ b/ruoyi-service/ruoyi-management/pom.xml
@@ -22,11 +22,7 @@
<scope>system</scope>
<systemPath>${project.basedir}/lib/java-sdk-core-3.2.5.jar</systemPath>
</dependency>
- <dependency>
- <groupId>com.huaweicloud.sdk</groupId>
- <artifactId>huaweicloud-sdk-bundle</artifactId>
- <version>3.1.87</version>
- </dependency>
+
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-api-study</artifactId>
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TGoodsController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TGoodsController.java
index 386a78f..d5b76ef 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TGoodsController.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TGoodsController.java
@@ -101,7 +101,7 @@
@ResponseBody
@PostMapping("/addGoods")
@ApiOperation(value = "添加", tags = {"后台-商品管理"})
- public AjaxResult<TGoods> addGoods(@RequestBody TGoods dto) {
+ public AjaxResult<TGoods> addGoods(TGoods dto) {
goodsClient.addGoods(dto);
return AjaxResult.success("添加成功");
}
@@ -117,7 +117,7 @@
@ResponseBody
@PostMapping("/updateGoods")
@ApiOperation(value = "修改", tags = {"后台-商品管理"})
- public AjaxResult<TGoods> updateGoods(@RequestBody TGoods dto) {
+ public AjaxResult<TGoods> updateGoods( TGoods dto) {
goodsClient.updateGoods(dto);
return AjaxResult.success("修改成功");
}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
index f24d629..72e1e11 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
@@ -99,8 +99,14 @@
switch (query.getStoryType()) {
case 2:
List<TStory> list = storyService.list(wrapper);
- res.setRecords(list);
- res.setTotal(list.size());
+ List<TStory> tSubjects = new ArrayList<>();
+ for (TStory tSubject : list) {
+ if (!tSubject.getError().isEmpty()) {
+ tSubjects.add(tSubject);
+ }
+ }
+ res.setRecords(tSubjects);
+ res.setTotal(tSubjects.size());
return R.ok(res);
case 1:
// 查询出error字段不为空的数据
@@ -157,9 +163,17 @@
res.setTotal(list2.size());
return R.ok(res);
case 4:
+ // 查询出error字段不为空的数据
+ wrapper.isNotNull("error");
List<TSubject> list3 = subjectService.list(wrapper);
- res.setRecords(list3);
- res.setTotal(list3.size());
+ List<TSubject> tSubjects3 = new ArrayList<>();
+ for (TSubject tSubject : list3) {
+ if (!tSubject.getError().isEmpty()) {
+ tSubjects3.add(tSubject);
+ }
+ }
+ res.setRecords(tSubjects3);
+ res.setTotal(tSubjects3.size());
return R.ok(res);
case 5:
List<TSubject> list4 = subjectService.list(wrapper);
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/utils/PayMoneyUtil.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/utils/PayMoneyUtil.java
index 27d106b..809a726 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/utils/PayMoneyUtil.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/utils/PayMoneyUtil.java
@@ -65,8 +65,8 @@
private String key = "6f5e0c2dcabfa9c27b5da5836a362fef";//微信商户号
- private String callbackPath = "https://v7ro848ar5jx.ngrok.xiaomiqiu123.top/study";//支付回调网关地址
-// private String callbackPath = "https://jkcyl.cn/app";//支付回调网关地址
+// private String callbackPath = "https://v7ro848ar5jx.ngrok.xiaomiqiu123.top/study";//支付回调网关地址
+ private String callbackPath = "https://dollearn.com/api/study";//支付回调网关地址
private String app_cert_path = "C:/cert/alipay/user/app_cert_path.crt";//应用公钥证书路径
--
Gitblit v1.7.1