yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改消息公共接口，增加日志

Browse Source
This commit is contained in:
yuyang 2021-09-10 15:58:02 +08:00
parent feccc684b5
commit ba5cf8d462
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/WebSocketFallbackFactory.java
View File

@ -5,12 +5,14 @@ import com.xhpc.common.core.domain.R;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
/** /**
* @author yuyang * @author yuyang
* @date 2021/9/10 15:14 * @date 2021/9/10 15:14
* @Version 1.0 * @Version 1.0
*/ */
@Component
public class WebSocketFallbackFactory implements FallbackFactory<WebSocketService> { public class WebSocketFallbackFactory implements FallbackFactory<WebSocketService> {
private static final Logger logger = LoggerFactory.getLogger(WebSocketFallbackFactory.class); private static final Logger logger = LoggerFactory.getLogger(WebSocketFallbackFactory.class);

12
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java
View File

@ -5,7 +5,6 @@ import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.rabbitmq.client.Channel; import com.rabbitmq.client.Channel;
import com.rabbitmq.client.Connection; import com.rabbitmq.client.Connection;
import com.xhpc.common.api.SmsService;
import com.xhpc.common.core.domain.R; import com.xhpc.common.core.domain.R;
import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.controller.BaseController;
import com.xhpc.common.data.redis.CacheOrderData; import com.xhpc.common.data.redis.CacheOrderData;
@ -13,9 +12,9 @@ import com.xhpc.common.data.redis.CacheRealtimeData;
import com.xhpc.common.domain.XhpcRate; import com.xhpc.common.domain.XhpcRate;
import com.xhpc.common.redis.service.RedisService; import com.xhpc.common.redis.service.RedisService;
import com.xhpc.common.util.ConnectionRabbitMQUtil; import com.xhpc.common.util.ConnectionRabbitMQUtil;
import com.xhpc.order.domain.*; import com.xhpc.order.domain.XhpcChargeOrder;
import com.xhpc.order.domain.XhpcHistoryOrder;
import com.xhpc.order.service.IXhpcChargeOrderService; import com.xhpc.order.service.IXhpcChargeOrderService;
import com.xhpc.order.service.IXhpcHistoryOrderService;
import com.xhpc.order.service.IXhpcRealTimeOrderService; import com.xhpc.order.service.IXhpcRealTimeOrderService;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -41,16 +40,9 @@ public class XhpcPileOrderController extends BaseController {
@Autowired @Autowired
private IXhpcChargeOrderService xhpcChargeOrderService; private IXhpcChargeOrderService xhpcChargeOrderService;
@Autowired
private IXhpcHistoryOrderService xhpcHistoryOrderService;
@Autowired @Autowired
private IXhpcRealTimeOrderService xhpcRealTimeOrderService; private IXhpcRealTimeOrderService xhpcRealTimeOrderService;
@Autowired
private SmsService smsService;
private static final Logger logger = LoggerFactory.getLogger(XhpcPileOrderController.class); private static final Logger logger = LoggerFactory.getLogger(XhpcPileOrderController.class);
/** /**
* 测试 * 测试

18
xhpc-modules/xhpc-wxma/src/main/java/com/xhpc/wxma/controller/OrderNotificationWebSocketController.java
View File

@ -1,27 +1,37 @@
package com.xhpc.wxma.controller; package com.xhpc.wxma.controller;
import cn.hutool.core.date.DateUtil;
import com.xhpc.common.core.domain.R;
import com.xhpc.common.core.web.controller.BaseController;
import com.xhpc.wxma.socket.OrderNotificationWebSocket; import com.xhpc.wxma.socket.OrderNotificationWebSocket;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.Calendar;
/** /**
* @author yuyang * @author yuyang
* @date 2021/8/11 17:47 * @date 2021/8/11 17:47
*/ */
@RestController @RestController
@RequestMapping("/orderWebSocket") public class OrderNotificationWebSocketController extends BaseController {
public class OrderNotificationWebSocketController {
private static final Logger logger = LoggerFactory.getLogger(OrderNotificationWebSocketController.class);
@GetMapping("/test") @GetMapping("/test")
public void test(@RequestParam String userId){ public void test(@RequestParam String userId){
OrderNotificationWebSocket.sendMessage(userId,"有新订单啦"); OrderNotificationWebSocket.sendMessage(userId,"有新订单啦");
} }
@GetMapping("/getMessage") @GetMapping("/orderWebSocket/getMessage")
public void getMessage(@RequestParam String userId,@RequestParam String message){ public R getMessage(@RequestParam String userId, @RequestParam String message){
logger.info("<<<<1111<<<<<<接收时间<<<<<<<<<<<<<<"+ DateUtil.format(Calendar.getInstance().getTime(), "yyyy-MM-dd HH:mm:ss")+">>>>>>>>>>>>>>>>>");
OrderNotificationWebSocket.sendMessage(userId,message); OrderNotificationWebSocket.sendMessage(userId,message);
logger.info("<<<<1111<<<<发送时间<<<<<<<<<<<<<<"+ DateUtil.format(Calendar.getInstance().getTime(), "yyyy-MM-dd HH:mm:ss")+">>>>>>>>>>>>>>>>>");
return R.ok();
} }