From 0a8ef890592a9c0389c42daeebb9a3f0974c37e6 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 08 十一月 2023 14:59:41 +0800
Subject: [PATCH] 调整MQTT配置

---
 src/main/java/com/fzzy/gateway/hx2023/controller/GatewayController.java |   42 ++++++++++++++++++++++++++++++++----------
 1 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/fzzy/gateway/hx2023/controller/GatewayController.java b/src/main/java/com/fzzy/gateway/hx2023/controller/GatewayController.java
index 8ad1617..20cdbc2 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/controller/GatewayController.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/controller/GatewayController.java
@@ -4,12 +4,15 @@
 import com.fzzy.api.utils.ContextUtil;
 import com.fzzy.api.utils.RedisConst;
 import com.fzzy.api.utils.RedisUtil;
+import com.fzzy.gateway.entity.GatewayConf;
 import com.fzzy.gateway.hx2023.data.GatewayAuthData;
+import com.fzzy.gateway.service.GatewayConfService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  *
@@ -21,6 +24,9 @@
 
     @Resource
     private RedisUtil redisUtil;
+    @Resource
+    private GatewayConfService confService;
+
 
     /**
      * 閴存潈鎺ュ彛
@@ -39,28 +45,44 @@
     public @ResponseBody
     JSONObject authorize(@RequestBody GatewayAuthData data) {
 
-        log.debug("============閴存潈==========={}--{}", data.getUsername(), data.getPassword());
+
+        List<GatewayConf> list = confService.getCacheConfList();
+
+        JSONObject json = new JSONObject();
+        json.put("timestamp", System.currentTimeMillis());
+        if (null == list || list.isEmpty()) {
+            json.put("code", 500);
+            json.put("message", "鏈幏鍙栫綉鍏充俊鎭�");
+            return json;
+        }
+
+        String gatewayId = null;
+        for (GatewayConf conf : list) {
+            if (data.getUsername().equals(conf.getGatewayUsername()) && data.getPassword().equals(conf.getGatewayPassword())) {
+                gatewayId = conf.getGatewayId();
+                break;
+            }
+        }
+
+        if (null == gatewayId) {
+            json.put("code", 500);
+            json.put("message", "鏈尮閰嶅埌鐢ㄦ埛鍚嶅拰瀵嗙爜");
+            return json;
+        }
 
 
-        //TODO 楠岃瘉鐢ㄦ埛鍚嶅拰瀵嗙爜
+        String token = "fzzy-" + gatewayId;
 
-
-        String token = ContextUtil.getUUID();
+        log.debug("============閴存潈==========={}--{}--{}", data.getUsername(), data.getPassword(), token);
 
         this.updateGatewayToken(token, data.getUsername());
 
-        JSONObject json = new JSONObject();
-
         JSONObject result = new JSONObject();
-
         result.put("token", token);
-
         json.put("result", result);
         json.put("message", "鎴愬姛");
         json.put("status", 0);
         json.put("code", 200);
-        json.put("timestamp", System.currentTimeMillis());
-
         return json;
     }
 

--
Gitblit v1.9.3