From d4329ca7ab174e25a2a5366f9869d2b9b45f2c27 Mon Sep 17 00:00:00 2001 From: 77 <77@77.com> Date: Mon, 1 Jul 2024 11:06:34 +0800 Subject: [PATCH] 1231123 --- .../main/java/com/ruoyi/job/EveryDaysJob.java | 2 +- .../java/com/ruoyi/{ => job}/op/BusOp.java | 2 +- .../main/java/com/ruoyi/{ => job}/op/ImOp.java | 2 +- .../cai/admin/op/BusOpController.java | 2 +- .../cai/admin/op/ImOpController.java | 2 +- .../cai/app/UserDynamicAppController.java | 10 ++++++++++ .../src/main/resources/application-dev.yml | 6 +++--- .../src/main/resources/application-prod.yml | 4 ++-- .../java/com/ruoyi/test/business/BusTest.java | 2 +- .../java/com/ruoyi/test/business/YxTest.java | 18 +++--------------- .../src/main/resources/application-prod.yml | 6 +++--- 11 files changed, 27 insertions(+), 29 deletions(-) rename ruoyi-admin/src/main/java/com/ruoyi/{ => job}/op/BusOp.java (99%) rename ruoyi-admin/src/main/java/com/ruoyi/{ => job}/op/ImOp.java (99%) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/EveryDaysJob.java b/ruoyi-admin/src/main/java/com/ruoyi/job/EveryDaysJob.java index a2367742..8669cc3d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/EveryDaysJob.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/EveryDaysJob.java @@ -1,6 +1,6 @@ package com.ruoyi.job; -import com.ruoyi.op.BusOp; +import com.ruoyi.job.op.BusOp; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/op/BusOp.java b/ruoyi-admin/src/main/java/com/ruoyi/job/op/BusOp.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/op/BusOp.java rename to ruoyi-admin/src/main/java/com/ruoyi/job/op/BusOp.java index e0aaf2ae..9860c8f0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/op/BusOp.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/op/BusOp.java @@ -1,4 +1,4 @@ -package com.ruoyi.op; +package com.ruoyi.job.op; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/op/ImOp.java b/ruoyi-admin/src/main/java/com/ruoyi/job/op/ImOp.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/op/ImOp.java rename to ruoyi-admin/src/main/java/com/ruoyi/job/op/ImOp.java index bb842372..10eba672 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/op/ImOp.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/op/ImOp.java @@ -1,4 +1,4 @@ -package com.ruoyi.op; +package com.ruoyi.job.op; import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson2.JSON; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/op/BusOpController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/op/BusOpController.java index b33ed192..c87bd73c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/op/BusOpController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/op/BusOpController.java @@ -3,7 +3,7 @@ package com.ruoyi.web.controller.cai.admin.op; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.op.BusOp; +import com.ruoyi.job.op.BusOp; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/op/ImOpController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/op/ImOpController.java index 70b25174..f4dfcecd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/op/ImOpController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/op/ImOpController.java @@ -1,7 +1,7 @@ package com.ruoyi.web.controller.cai.admin.op; import com.ruoyi.common.core.domain.R; -import com.ruoyi.op.ImOp; +import com.ruoyi.job.op.ImOp; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserDynamicAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserDynamicAppController.java index a6c5a78c..9798d78a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserDynamicAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserDynamicAppController.java @@ -1,11 +1,13 @@ package com.ruoyi.web.controller.cai.app; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.cai.domain.User; import com.ruoyi.cai.dto.app.query.DynamicAddReq; import com.ruoyi.cai.dto.app.query.DynamicQuery; import com.ruoyi.cai.dto.app.query.IdReq; import com.ruoyi.cai.dto.app.vo.DynamicListVo; import com.ruoyi.cai.service.DynamicService; +import com.ruoyi.cai.service.UserService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; @@ -27,12 +29,20 @@ public class UserDynamicAppController { @Autowired private DynamicService dynamicService; + @Autowired + private UserService userService; @GetMapping("/page") @Operation(summary = "动态查询动态") @Log(title = "动态查询动态", businessType = BusinessType.OTHER, isPrintResponseData = false, isSaveDb = false) public R> page(PageQuery pageQuery, DynamicQuery query){ query.setCurrentUserId(LoginHelper.getUserId()); + /*if(query.getType() != null && query.getType() == 3){ // 同城 + User user = userService.getById(LoginHelper.getUserId()); + if(user != null && user.getCityId() != null){ + query.setCityId(user.getCityId()); + } + }*/ Page resp = dynamicService.pageApp(pageQuery,query); resp.getRecords().forEach(i -> { i.setTimeDiffText(diffTime(i.getCreateTime())); diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 8780ea55..4b53ceae 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -20,7 +20,7 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://124.220.152.123:5306/cai-v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true + url: jdbc:mysql://124.222.254.188:5306/cai-v3?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true username: root password: 383200134 # 从库数据源 @@ -99,8 +99,8 @@ agora: key: 0cca1a53262c4c74b0a8c653a9b7540e secret: 4a4f734285f34aea86cef63b2a186f27 yunxin: - app-key: 0aaefeb8a80a9889987c5346244b58e2 - app-secret: 470345ca2832 + app-key: f81cdf7dd5a1cd76ddb7bf1513bd0380 + app-secret: cb17e285f56b knife4j: enable: false insight: diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index 7a3c4661..d480e3d3 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -97,8 +97,8 @@ agora: key: 0cca1a53262c4c74b0a8c653a9b7540e secret: 4a4f734285f34aea86cef63b2a186f27 yunxin: - app-key: 0aaefeb8a80a9889987c5346244b58e2 - app-secret: 470345ca2832 + app-key: 0aaefeb8a80a9889987c5346244b58e21234 + app-secret: 470345ca28321234 cai: enable-api-encryption: true open-pay-proxy: false diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/business/BusTest.java b/ruoyi-admin/src/test/java/com/ruoyi/test/business/BusTest.java index 9134eaf9..11d55ff3 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/test/business/BusTest.java +++ b/ruoyi-admin/src/test/java/com/ruoyi/test/business/BusTest.java @@ -1,6 +1,6 @@ package com.ruoyi.test.business; -import com.ruoyi.op.BusOp; +import com.ruoyi.job.op.BusOp; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/business/YxTest.java b/ruoyi-admin/src/test/java/com/ruoyi/test/business/YxTest.java index 5a927459..46b063db 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/test/business/YxTest.java +++ b/ruoyi-admin/src/test/java/com/ruoyi/test/business/YxTest.java @@ -1,21 +1,13 @@ package com.ruoyi.test.business; -import com.alibaba.fastjson.JSON; import com.ruoyi.cai.im.ImManager; -import com.ruoyi.op.ImOp; -import com.ruoyi.yunxin.client.ImUserClient; +import com.ruoyi.job.op.ImOp; import com.ruoyi.yunxin.client.ImUserRefClient; -import com.ruoyi.yunxin.req.GetUnifoReq; -import com.ruoyi.yunxin.req.UnblockReq; -import com.ruoyi.yunxin.resp.YxUpdateUinfoR; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import java.util.ArrayList; -import java.util.List; - @SpringBootTest @Slf4j public class YxTest { @@ -27,12 +19,8 @@ public class YxTest { @Test public void test(){ - GetUnifoReq getUnifoReq = new GetUnifoReq(); - List accids = new ArrayList<>(); - accids.add("1088"); - getUnifoReq.setAccids(JSON.toJSONString(accids)); - YxUpdateUinfoR uinfos = imUserRefClient.getUinfos(getUnifoReq); - log.info(JSON.toJSONString(uinfos)); + imOp.refreshImNoSaveToken(); + imOp.refreshImUserInfo(); } @Autowired diff --git a/ruoyi-websocket-boot/src/main/resources/application-prod.yml b/ruoyi-websocket-boot/src/main/resources/application-prod.yml index b9b38b6f..b3e992b6 100644 --- a/ruoyi-websocket-boot/src/main/resources/application-prod.yml +++ b/ruoyi-websocket-boot/src/main/resources/application-prod.yml @@ -25,7 +25,7 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://localhost:4306/cai-new?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true + url: jdbc:mysql://localhost:5306/cai-new?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true username: root password: 383200134 # 从库数据源 @@ -105,8 +105,8 @@ agora: key: 0cca1a53262c4c74b0a8c653a9b7540e secret: 4a4f734285f34aea86cef63b2a186f27 yunxin: - app-key: 0aaefeb8a80a9889987c5346244b58e2 - app-secret: 470345ca2832 + app-key: 0aaefeb8a80a9889987c5346244b58e21234 + app-secret: 470345ca28321234 springdoc: api-docs: enabled: false