From 828e81038310f5bb63eff32b601eef287de79590 Mon Sep 17 00:00:00 2001 From: wangqing <408564126@qq.com> Date: Sat, 26 Oct 2024 11:59:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=B8=93?= =?UTF-8?q?=E6=A0=8Fbug=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- luoo_user/src/main/java/com/luoo/user/config/EnvConfig.java | 2 +- .../src/main/java/com/luoo/user/controller/LoginController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/luoo_user/src/main/java/com/luoo/user/config/EnvConfig.java b/luoo_user/src/main/java/com/luoo/user/config/EnvConfig.java index 2db562c..11ed2aa 100644 --- a/luoo_user/src/main/java/com/luoo/user/config/EnvConfig.java +++ b/luoo_user/src/main/java/com/luoo/user/config/EnvConfig.java @@ -27,6 +27,6 @@ public class EnvConfig { private Float permanentMemberDiscount; @ApiModelProperty(value = "不显示专栏的版本号") - private Integer showColumnVersion; + private String showColumnVersion; } diff --git a/luoo_user/src/main/java/com/luoo/user/controller/LoginController.java b/luoo_user/src/main/java/com/luoo/user/controller/LoginController.java index 9554a30..2fa8899 100644 --- a/luoo_user/src/main/java/com/luoo/user/controller/LoginController.java +++ b/luoo_user/src/main/java/com/luoo/user/controller/LoginController.java @@ -471,7 +471,7 @@ public class LoginController extends BaseController { @ApiOperation(value = "获取不显示专栏的版本号", notes = "获取不显示专栏的版本号") @GetMapping("/showColumnVersion") - public Result showColumnFlag() { + public Result showColumnFlag() { return Result.success(envConfig.getShowColumnVersion()); } From b03232e56752012a8625996ae5b68e5d7fede5b6 Mon Sep 17 00:00:00 2001 From: wangqing <408564126@qq.com> Date: Wed, 30 Oct 2024 16:47:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?release--=E5=8E=BB=E9=99=A4=E6=9C=9F?= =?UTF-8?q?=E5=88=8A=E5=88=97=E8=A1=A8=E5=8C=BF=E5=90=8D=E6=B5=8F=E8=A7=88?= =?UTF-8?q?=E9=99=90=E5=88=B6=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../music/controller/JournalController.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/luoo_music/src/main/java/com/luoo/music/controller/JournalController.java b/luoo_music/src/main/java/com/luoo/music/controller/JournalController.java index 99d800a..d1dc833 100644 --- a/luoo_music/src/main/java/com/luoo/music/controller/JournalController.java +++ b/luoo_music/src/main/java/com/luoo/music/controller/JournalController.java @@ -70,7 +70,7 @@ public class JournalController { @RequestHeader(value = "device_type", required = false) String deviceType, @VerifyParam JournalQueryReq queryReq) { UserLoginDto user = jwtUtil.getUserLoginDto(authorization); - updateQuery(deviceType,user,queryReq); +// updateQuery(deviceType,user,queryReq); Long count = journalService.countJournal(queryReq); if(0==count) { return Result.success(new PageResult(count, Collections.emptyList())); @@ -90,16 +90,16 @@ public class JournalController { private Set getJournalCollectSet(UserLoginDto user) { return null == user ? Collections.emptySet():getJournalCollectSet(user.getUserId()); } - private void updateQuery(String deviceType, UserLoginDto user, JournalQueryReq queryReq) { - if(DeviceTypeUtil.isWeb(deviceType)) { - return; - } - if (StringTools.isEmpty(queryReq.getCategoryId()) && null == user) { - queryReq.setCategoryId(null); - queryReq.setPageNum(1); - queryReq.setPageSize(10); - } - } +// private void updateQuery(String deviceType, UserLoginDto user, JournalQueryReq queryReq) { +// if(DeviceTypeUtil.isWeb(deviceType)) { +// return; +// } +// if (StringTools.isEmpty(queryReq.getCategoryId()) && null == user) { +// queryReq.setCategoryId(null); +// queryReq.setPageNum(1); +// queryReq.setPageSize(10); +// } +// } private Set getJournalCollectSet(String userId) { Set set=(Set) redisTemplate.opsForValue().get(Constants.REDIS_KEY_USER_COLLECT_JOURNAL+userId); if(null==set) {