From e4fd56d89308b3e72247241fe8d82c77ec82555f Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Wed, 16 Dec 2020 09:07:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8F=AF=E4=BB=A5=E7=9B=B4?=
 =?UTF-8?q?=E4=BC=A0userId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ccmq/lowlevel/message/MessageHandler.java |  8 ++++--
 .../lowlevel/message/client/AuthMessage.java  |  1 +
 .../wiki/tall/ccmq/common/util/ImgUtil.java   | 26 +++++++++----------
 .../resources/application-prod.properties     |  2 +-
 .../src/main/resources/application.properties |  2 +-
 eureka/pom.xml                                |  6 -----
 6 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/ccmq/src/main/java/com/ccsens/ccmq/lowlevel/message/MessageHandler.java b/ccmq/src/main/java/com/ccsens/ccmq/lowlevel/message/MessageHandler.java
index 89899bd..113b4de 100644
--- a/ccmq/src/main/java/com/ccsens/ccmq/lowlevel/message/MessageHandler.java
+++ b/ccmq/src/main/java/com/ccsens/ccmq/lowlevel/message/MessageHandler.java
@@ -258,8 +258,12 @@ public class MessageHandler {
                 boolean authSuccess = false;
                 AuthMessage inSysData = JacksonUtil.jsonToBean(data, AuthMessage.class);
                 if(null != inSysData.getData()){
-                    if(StrUtil.isNotEmpty(inSysData.getData().getToken())) {
-                        String userId = getUserService().getUserIdByToken(inSysData.getData().getToken());
+                    if(StrUtil.isNotEmpty(inSysData.getData().getToken()) || StrUtil.isNotEmpty(inSysData.getData().getUserId())) {
+                        String userId = inSysData.getData().getUserId();
+                        System.out.println(userId);
+                        if(StrUtil.isEmpty(userId)){
+                            userId = getUserService().getUserIdByToken(inSysData.getData().getToken());
+                        }
                         if(StrUtil.isNotEmpty(userId)){
                             ChannelManager.authChannel(ChannelManager.getCurrentChannel(),userId,inSysData.getData().getMajor(),inSysData.getData().getMinor(), inSysData.getMessage());
                             onClientOnLine(MessageConstant.DomainType.User,userId);
diff --git a/ccmq/src/main/java/com/ccsens/ccmq/lowlevel/message/client/AuthMessage.java b/ccmq/src/main/java/com/ccsens/ccmq/lowlevel/message/client/AuthMessage.java
index 9a25cdc..0cd6663 100644
--- a/ccmq/src/main/java/com/ccsens/ccmq/lowlevel/message/client/AuthMessage.java
+++ b/ccmq/src/main/java/com/ccsens/ccmq/lowlevel/message/client/AuthMessage.java
@@ -16,6 +16,7 @@ public class AuthMessage extends ServerMessage {
     @Getter
     public static class Data{
         private String token;
+        private String userId;
         // 主版本号
         private int major;
         // 此版本号
diff --git a/ccmq/src/main/java/wiki/tall/ccmq/common/util/ImgUtil.java b/ccmq/src/main/java/wiki/tall/ccmq/common/util/ImgUtil.java
index d4f92c1..71553ff 100644
--- a/ccmq/src/main/java/wiki/tall/ccmq/common/util/ImgUtil.java
+++ b/ccmq/src/main/java/wiki/tall/ccmq/common/util/ImgUtil.java
@@ -1,13 +1,13 @@
-package wiki.tall.ccmq.common.util;
-
-import sun.font.FontDesignMetrics;
-
-import java.awt.*;
-
-public class ImgUtil {
-    public static int getStringWidth(String text,Font f){
-        FontMetrics fm = FontDesignMetrics.getMetrics(f);
-        int w = fm.stringWidth(text);
-        return w;
-    }
-}
+//package wiki.tall.ccmq.common.util;
+//
+//import sun.font.FontDesignMetrics;
+//
+//import java.awt.*;
+//
+//public class ImgUtil {
+//    public static int getStringWidth(String text,Font f){
+//        FontMetrics fm = FontDesignMetrics.getMetrics(f);
+//        int w = fm.stringWidth(text);
+//        return w;
+//    }
+//}
diff --git a/ccmq/src/main/resources/application-prod.properties b/ccmq/src/main/resources/application-prod.properties
index ec2926f..e343dbc 100644
--- a/ccmq/src/main/resources/application-prod.properties
+++ b/ccmq/src/main/resources/application-prod.properties
@@ -14,7 +14,7 @@ spring.servlet.multipart.max-request-size=100MB
 spring.redis.database=0
 spring.redis.host=127.0.0.1
 spring.redis.port=6379
-spring.redis.password=
+spring.redis.password=areowqr!@43ef
 spring.redis.timeout=1000ms
 spring.redis.jedis.pool.max-active=200
 spring.redis.jedis.pool.max-wait=-1ms
diff --git a/ccmq/src/main/resources/application.properties b/ccmq/src/main/resources/application.properties
index 97e42eb..dd8b329 100644
--- a/ccmq/src/main/resources/application.properties
+++ b/ccmq/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 # ѡ�񿪷�����{dev|test|prod}
-spring.profiles.active=prod
+spring.profiles.active=test
 
 # ����Ӧ����
 spring.application.name=tall-message
diff --git a/eureka/pom.xml b/eureka/pom.xml
index bdc359a..83152d0 100644
--- a/eureka/pom.xml
+++ b/eureka/pom.xml
@@ -28,12 +28,6 @@
             <version>2.1.6</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>de.codecentric</groupId>
-            <artifactId>spring-boot-admin-server</artifactId>
-            <version>2.1.6</version>
-            <scope>compile</scope>
-        </dependency>
 
     </dependencies>