Merge branch 'Jw' into 'master'

1:完善TEST环境配置

See merge request hewei/Jumeirah!71

config/src/main/resources/config/application-test.yml

@@ -26,6 +26,13 @@ spring:
     password: LSlX0JKkD34U3oY3hwI5
     port: 6379
 
+  rabbitmq:
+    host: 127.0.0.1
+    port: 5672
+    username: root
+    password: TYWu154pBpvr
+    order-queue-name: push.order
+
 # 打印SQL语句和结果集，本地开发环境可开启，线上注释掉
 mybatis-plus:
   configuration:

customer-service/src/main/java/com/ym/im/service/impl/StaffSingleChatServiceImpl.java

@@ -16,7 +16,6 @@ import com.ym.im.util.JsonUtils;
 import com.ym.im.validation.group.*;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.socket.nio.NioSocketChannel;
-import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -179,11 +178,9 @@ public class StaffSingleChatServiceImpl implements ChatService {
      *
      * @param userId
      */
-    @SneakyThrows
     private void pushNotifications(Long userId) {
         final DeviceTokenParam deviceTokenParam = channelGroup.USER_DEVICE_PUSH_TOKEN.get(userId);
         pushFactory.getService(deviceTokenParam.getDeviceType()).unicast(deviceTokenParam.getDeviceToken());
-
     }
 
 

customer-service/src/main/resources/application-test.yml

@@ -16,21 +16,22 @@ spring:
       max-wait: 60000
       # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位毫秒
       time-between-eviction-runs-millis: 60000
-      url: jdbc:mysql://47.99.47.225/customer_service?useUnicode=true&useSSL=false&serverTimezone=Asia/Shanghai&characterEncoding=utf8
-      username: root
-      password: temple123456
+      url: jdbc:mysql://127.0.0.1/customer_service?useUnicode=true&useSSL=false&serverTimezone=Asia/Shanghai&characterEncoding=utf8
+      username: web
+      password: wBT7bC9BeUkE
       driver-class-name: com.mysql.cj.jdbc.Driver
       connectionInitSqls: set names utf8mb4
 
   jackson:
     default-property-inclusion: non_null
   rabbitmq:
-    host: 47.99.47.225
+    host: 127.0.0.1
     port: 5672
     username: root
-    password: root
-    staff-offline-Queue-Name: staff.offline.dev
-    exchange-name: delay.exchange.dev
+    password: TYWu154pBpvr
+    staff-offline-Queue-Name: staff.offline
+    order-queue-name: push.order
+    exchange-name: delay.exchange
     listener:
       simple:
         default-requeue-rejected: false
@@ -38,7 +39,7 @@ spring:
     database: 0
     host: 127.0.0.1
     port: 6379
-    password: temple123456
+    password: LSlX0JKkD34U3oY3hwI5
   # （重要！）设置mvc默认语言为zh_CN，默认语言必须为static.i18n目录下有的语言配置文件，否则跟随服务器语言
   mvc:
     locale: zh_CN
@@ -47,4 +48,4 @@ spring:
       log-condition-evaluation-delta: false
 
 serviceUrl:
-  user-info-url: http://47.99.47.225:8889/api/app/user/userInfo
\ No newline at end of file
+  user-info-url: http:/127.0.0.1:8889/api/app/user/userInfo
\ No newline at end of file