diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java index a01b8c93..d0423205 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java @@ -1416,11 +1416,11 @@ public class AppSystemController extends BaseController { userPublishWorkSourceListDto.setSource(userPublishWorkSourceListDto.getCity()+userPublishWorkSourceListDto.getScenic()+userPublishWorkSourceListDto.getPart()+userPublishWorkSourceListDto.getCoordinate()); //--------------------------------------测试时直接注释掉------------------------------------------------- -// LocalDate now = LocalDate.now(); -// long daysBetween = ChronoUnit.DAYS.between(now, userPublishWorkSourceListDto.getEndTime()); -// userPublishWorkSourceListDto.setrDays(daysBetween); + LocalDate now = LocalDate.now(); + long daysBetween = ChronoUnit.DAYS.between(now, userPublishWorkSourceListDto.getEndTime()); + userPublishWorkSourceListDto.setrDays(daysBetween); //--------------------------------------测试时直接注释掉end----------------------------------------------- - userPublishWorkSourceListDto.setrDays(0L); +// userPublishWorkSourceListDto.setrDays(0L); } //-----------------------------------查看该作品所属资源位end--------------------------------------------- @@ -2071,12 +2071,12 @@ public class AppSystemController extends BaseController { for(UserPublishWorkSourceListDto userPublishWorkSourceListDto: sourceList){ userPublishWorkSourceListDto.setSource(userPublishWorkSourceListDto.getCity()+userPublishWorkSourceListDto.getScenic()+userPublishWorkSourceListDto.getPart()+userPublishWorkSourceListDto.getCoordinate()); - //------------------------- 测试版本先注释掉-------------------------------------- -// LocalDate now = LocalDate.now(); -// long daysBetween = ChronoUnit.DAYS.between(now, userPublishWorkSourceListDto.getEndTime()); -// userPublishWorkSourceListDto.setrDays(daysBetween); - //---------------------------测试版本先注释掉end---------------------------------- - userPublishWorkSourceListDto.setrDays(0L); +// ------------------------- 测试版本先注释掉-------------------------------------- + LocalDate now = LocalDate.now(); + long daysBetween = ChronoUnit.DAYS.between(now, userPublishWorkSourceListDto.getEndTime()); + userPublishWorkSourceListDto.setrDays(daysBetween); +// ---------------------------测试版本先注释掉end---------------------------------- +// userPublishWorkSourceListDto.setrDays(0L); } //-----------------------------------查看该作品所属资源位end--------------------------------------------- @@ -2088,6 +2088,8 @@ public class AppSystemController extends BaseController { userFollow.setFollowedUserId(userPublishWorkDetail.getUserId()); userFollow.setStatus("0"); List userFollowList = userFollowService.selectSysUserFollowList(userFollow); + + if(userFollowList.size() > 0){ // 以关注 userPublishWorkDetail.setIsFollow("1"); @@ -2143,7 +2145,7 @@ public class AppSystemController extends BaseController { userFollow.setStatus("0"); List userFollowList = userFollowService.selectSysUserFollowList(userFollow); if(userFollowList.size() > 0){ - // 以关注 + // 已关注 moreUserDetailDto.setIsFollow("1"); }else{ moreUserDetailDto.setIsFollow("0"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/daily/dailySysServer.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/daily/dailySysServer.java index 363d5c58..c1d9fb80 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/daily/dailySysServer.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/daily/dailySysServer.java @@ -215,7 +215,7 @@ public class dailySysServer { // 这里应该每天12点后更新一次, @Scheduled(cron = "0 5 12 * * ?") @Transactional - @GetMapping("/dailySource") +// @GetMapping("/dailySource") public void updateDailySource(){ LocalDate now = LocalDate.now(); diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index f980e2f8..9271e46a 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -9,7 +9,8 @@ spring: master: url: jdbc:mysql://localhost:3306/wenlvapp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# url: jdbc:mysql://172.17.0.7:3306/wenlvapp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# url: jdbc:mysql://172.17.0.7:3306/wenlvapp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # 腾讯云 +# url: jdbc:mysql://172.17.0.3:3306/wenlvapp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # 火山云 # url: jdbc:mysql://localhost:3306/xingming?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # url: jdbc:mysql://172.17.0.7:3306/wenlvapp?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false username: root diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 409e63be..93bcc44f 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -16,6 +16,7 @@ ruoyi: domain: http://10.0.0.17:8081 # domain: http://82.156.153.112:8081 +# domain: http://14.103.162.172:8081 # # idCardPath: /home/IdCard # profile: /home/uploadPath @@ -83,7 +84,9 @@ spring: redis: # 地址 host: localhost -# host: 172.17.0.3 +# host: 172.17.0.3 # 腾讯云 +# host: 172.17.0.2 #火山云 + # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MoreUserDetailDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MoreUserDetailDto.java index f3dd70ee..46b7b425 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MoreUserDetailDto.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MoreUserDetailDto.java @@ -11,6 +11,8 @@ public class MoreUserDetailDto { private String avatar; private String remark; private String isFollow; + private String signature; + private String backGround; // private List userWorkList; public Long getUserId() { @@ -53,6 +55,22 @@ public class MoreUserDetailDto { this.isFollow = isFollow; } + public String getSignature() { + return signature; + } + + public void setSignature(String signature) { + this.signature = signature; + } + + public String getBackGround() { + return backGround; + } + + public void setBackGround(String back_ground) { + this.backGround = back_ground; + } + // public List getUserWorkList() { // return userWorkList; // } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserPublishWorkDetailDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserPublishWorkDetailDto.java index 5e98708f..2fbfce5f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserPublishWorkDetailDto.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserPublishWorkDetailDto.java @@ -27,6 +27,8 @@ public class UserPublishWorkDetailDto { private String isFollow; private String isAddLike; + private String isMine = "0"; + private List sourceList; // private List userWorkList; @@ -140,6 +142,14 @@ public class UserPublishWorkDetailDto { this.isAddLike = isAddLike; } + public String getIsMine() { + return isMine; + } + + public void setIsMine(String isMine) { + this.isMine = isMine; + } + // public List getUserWorkList() { // return userWorkList; // } diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 46e2b811..3b0c5be1 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -79,6 +79,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -222,9 +225,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"