记得上下班打卡 | git大法好,push需谨慎

Commit 0c34f69a authored by anjiabin's avatar anjiabin

社交增加喜欢和不喜欢计数

parent b945b7bd
...@@ -77,7 +77,8 @@ liquidnet: ...@@ -77,7 +77,8 @@ liquidnet:
pay: http://devdragon.zhengzai.tv/dragon/pay/dragonPay pay: http://devdragon.zhengzai.tv/dragon/pay/dragonPay
check: http://devdragon.zhengzai.tv/dragon/pay/checkOrder check: http://devdragon.zhengzai.tv/dragon/pay/checkOrder
callback: http://devadam.zhengzai.tv/adam/member/order/callback callback: http://devadam.zhengzai.tv/adam/member/order/callback
url: http://devadam.zhengzai.tv # url: http://devadam.zhengzai.tv
url: http://127.0.0.1:9001
kylin: kylin:
url-pay: url-pay:
pay: http://devdragon.zhengzai.tv/dragon/pay/dragonPay pay: http://devdragon.zhengzai.tv/dragon/pay/dragonPay
......
...@@ -73,17 +73,6 @@ spring: ...@@ -73,17 +73,6 @@ spring:
exclude: exclude:
- org.springframework.cloud.bus.BusAutoConfiguration - org.springframework.cloud.bus.BusAutoConfiguration
- org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
redis:
database: ${liquidnet.redis.adam.database}
port: ${liquidnet.redis.adam.port}
host: ${liquidnet.redis.adam.host}
password: ${liquidnet.redis.adam.password}
lettuce:
pool:
max-active: 5
max-wait: -1
max-idle: 8
min-idle: 0
data: data:
mongodb: mongodb:
uri: mongodb://${liquidnet.mongodb.chime.user}:${liquidnet.mongodb.chime.pwd}@${liquidnet.mongodb.chime.host}/?authSource=admin&maxPoolSize=2000&waitQueueMultiple=100 uri: mongodb://${liquidnet.mongodb.chime.user}:${liquidnet.mongodb.chime.pwd}@${liquidnet.mongodb.chime.host}/?authSource=admin&maxPoolSize=2000&waitQueueMultiple=100
......
package com.liquidnet.service.feign.adam.api; package com.liquidnet.service.feign.adam.api;
import com.liquidnet.service.adam.dto.rsc.AdamChimeUinfoReq;
import com.liquidnet.service.adam.dto.rsc.AdamChimeUinfoDto; import com.liquidnet.service.adam.dto.rsc.AdamChimeUinfoDto;
import com.liquidnet.service.adam.dto.rsc.AdamChimeUinfoReq;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import feign.hystrix.FallbackFactory; import feign.hystrix.FallbackFactory;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List; import java.util.List;
...@@ -37,4 +38,7 @@ public interface FeignAdamBaseClient { ...@@ -37,4 +38,7 @@ public interface FeignAdamBaseClient {
@PostMapping("rsc/inquire/cuinfo") @PostMapping("rsc/inquire/cuinfo")
ResponseDto<List<AdamChimeUinfoDto>> queryForChimeUserInfo(@RequestBody AdamChimeUinfoReq req); ResponseDto<List<AdamChimeUinfoDto>> queryForChimeUserInfo(@RequestBody AdamChimeUinfoReq req);
@PostMapping("rsc/inquire/sendMsgToRedis")
ResponseDto<Boolean> sendMsgToRedis(@RequestParam("redisKey") String redisKey,@RequestParam("jsonParamStr") String jsonParamStr);
} }
...@@ -8,6 +8,7 @@ import com.liquidnet.service.adam.dto.vo.*; ...@@ -8,6 +8,7 @@ import com.liquidnet.service.adam.dto.vo.*;
import com.liquidnet.service.adam.service.AdamRdmService; import com.liquidnet.service.adam.service.AdamRdmService;
import com.liquidnet.service.adam.service.IAdamUserService; import com.liquidnet.service.adam.service.IAdamUserService;
import com.liquidnet.service.adam.util.ObjectUtil; import com.liquidnet.service.adam.util.ObjectUtil;
import com.liquidnet.service.adam.util.QueueUtils;
import com.liquidnet.service.base.ErrorMapping; import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.base.UserPathDto; import com.liquidnet.service.base.UserPathDto;
...@@ -39,6 +40,9 @@ public class AdamRscController { ...@@ -39,6 +40,9 @@ public class AdamRscController {
@Autowired @Autowired
IAdamUserService adamUserService; IAdamUserService adamUserService;
@Autowired
private QueueUtils queueUtils;
@ApiOperationSupport(order = 10) @ApiOperationSupport(order = 10)
@ApiOperation(value = "@API:手机号注册", notes = "用于小程序活动用户注册,不登录") @ApiOperation(value = "@API:手机号注册", notes = "用于小程序活动用户注册,不登录")
...@@ -114,4 +118,19 @@ public class AdamRscController { ...@@ -114,4 +118,19 @@ public class AdamRscController {
} }
return ResponseDto.success(list); return ResponseDto.success(list);
} }
@ApiOperationSupport(order = 40)
@ApiOperation(value = "@API:社交用户点击喜欢或不喜欢", notes = "发送点击事件计数")
@PostMapping("inquire/sendMsgToRedis")
public ResponseDto<Boolean> sendMsgToRedis(@RequestParam(required = true) String redisKey,@RequestParam(required = true) String jsonParamStr) {
if (null == redisKey || null == jsonParamStr || redisKey.isEmpty() || jsonParamStr.isEmpty()) {
return ResponseDto.failure();
}
try {
queueUtils.sendMsgByRedis(redisKey,jsonParamStr);
} catch (Exception e) {
log.error("@API:社交用户点击喜欢或不喜欢计数入队", e);
}
return ResponseDto.success(true);
}
} }
package com.liquidnet.service.chime.utils; package com.liquidnet.service.chime.utils;
import com.liquidnet.commons.lang.util.CollectionUtil; import com.liquidnet.service.feign.adam.api.FeignAdamBaseClient;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.connection.stream.StreamRecords;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.HashMap; @Slf4j
@Component @Component
public class QueueUtils { public class QueueUtils {
// @Autowired // @Autowired
// private RabbitTemplate rabbitTemplate; // private RabbitTemplate rabbitTemplate;
// @Autowired
// StringRedisTemplate stringRedisTemplate;
@Autowired @Autowired
StringRedisTemplate stringRedisTemplate; private FeignAdamBaseClient feignAdamBaseClient;
/** /**
* 发送消息 - RABBIT * 发送消息 - RABBIT
...@@ -34,8 +35,23 @@ public class QueueUtils { ...@@ -34,8 +35,23 @@ public class QueueUtils {
* @param jsonMsg Json字符串 * @param jsonMsg Json字符串
*/ */
public void sendMsgByRedis(String streamKey, String jsonMsg) { public void sendMsgByRedis(String streamKey, String jsonMsg) {
HashMap<String, String> map = CollectionUtil.mapStringString(); try {
map.put("message", jsonMsg); feignAdamBaseClient.sendMsgToRedis(streamKey,jsonMsg);
stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey)); } catch (Exception e) {
log.error("userOperation sendMsgByRedis error:{}",e);
log.error("userOperation sendMsgByRedis error msg",e.getMessage());
e.printStackTrace();
}
} }
// public void sendMsgByRedis(String streamKey, String jsonMsg) {
// HashMap<String, String> map = CollectionUtil.mapStringString();
// map.put("message", jsonMsg);
// try {
// stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
// } catch (Exception e) {
// log.error("userLikeOperation error:{}",e);
// log.error("userLikeOperation error msg",e.getMessage());
// e.printStackTrace();
// }
// }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment