Merge branch 'master' of http://119.28.51.83/hewei/Jumeirah into dev/lanpingxiong

customer-service/pom.xml

@@ -130,19 +130,23 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
+                <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                    <encoding>${project.build.sourceEncoding}</encoding>
+                    <skipTests>true</skipTests>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file

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

@@ -19,6 +19,7 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.socket.nio.NioSocketChannel;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -58,7 +59,8 @@ public class UserSingleChatServiceImpl implements ChatService {
     @Autowired
     private SessionListService sessiontListService;
 
-    private static final String USER_INFO_URL = "http://192.168.1.237:8889/api/app/user/userInfo";
+    @Value("${serviceUrl.user-info-url}")
+    private String USER_INFO_URL;
 
     @Override
     public void init(ChannelHandlerContext ctx) throws IOException {

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

@@ -45,3 +45,6 @@ spring:
   devtools:
     restart:
       log-condition-evaluation-delta: false
+
+serviceUrl:
+  user-info-url: http://127.0.0.1:8889/api/app/user/userInfo
\ No newline at end of file

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

@@ -36,7 +36,7 @@ spring:
       simple:
         default-requeue-rejected: false
   redis:
-    database: 5
+    database: 0
     host: 172.31.33.14
     password: Yum123456
     port: 6379
@@ -51,9 +51,5 @@ logging:
   file: logs/${spring.application.name}.log
 
 
-eureka:
-  client:
-    service-url:
-      defaultZone: http://172.31.41.108:20000/eureka/
-  instance:
-    prefer-ip-address: true
\ No newline at end of file
+serviceUrl:
+  user-info-url: http://192.168.1.237:8889/api/app/user/userInfo

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

@@ -16,33 +16,36 @@ spring:
       max-wait: 60000
       # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位毫秒
       time-between-eviction-runs-millis: 60000
-      url: jdbc:mysql://192.168.1.237:3306/pathfinder_im?useUnicode=true&useSSL=false&serverTimezone=Asia/Shanghai&characterEncoding=utf8
+      url: jdbc:mysql://47.99.47.225/customer_service?useUnicode=true&useSSL=false&serverTimezone=Asia/Shanghai&characterEncoding=utf8
       username: root
-      password: 123456
+      password: temple123456
       driver-class-name: com.mysql.cj.jdbc.Driver
       connectionInitSqls: set names utf8mb4
 
   jackson:
     default-property-inclusion: non_null
   rabbitmq:
-    host: 127.0.0.1
+    host: 47.99.47.225
     port: 5672
-    username: admin
-    password: admin
-    delay-queue-name: delay.ack.dev
-    staff-offline-Queue-Name: staff.offline.dev
-    exchange-name: delay.exchange.dev
+    username: root
+    password: root
+    delay-queue-name: delay.ack-Jw
+    staff-offline-Queue-Name: staff.offline-Jw
+    exchange-name: delay.exchange
     listener:
       simple:
         default-requeue-rejected: false
   redis:
     database: 5
     host: 127.0.0.1
-    password:
     port: 6379
+    password: temple123456
   # （重要！）设置mvc默认语言为zh_CN，默认语言必须为static.i18n目录下有的语言配置文件，否则跟随服务器语言
   mvc:
     locale: zh_CN
   devtools:
     restart:
       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