zcy
/
iot-iita-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:修改ws的参数格式

master
tangfudong 2024-03-06 11:04:19 +08:00
parent f631bbfd8a
commit 0b4daf2e96
4 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
websocket-plugin/src/main/java/cc/iotkit/plugins/websocket/conf/WebsocketConfig.java
View File

@ -13,8 +13,6 @@ import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List;
@Data @Data
@Component @Component
@ConfigurationProperties(prefix = "websocket") @ConfigurationProperties(prefix = "websocket")
@ -28,12 +26,8 @@ public class WebsocketConfig {
private boolean ssl; private boolean ssl;
private List<AccessToken> accessTokens; private String tokenKey;
@Data private String accessToken;
public static class AccessToken{
private String tokenName;
private String tokenStr;
}
} }

12
websocket-plugin/src/main/java/cc/iotkit/plugins/websocket/service/WebsocketVerticle.java
View File

@ -31,7 +31,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
@ -66,10 +65,10 @@ public class WebsocketVerticle extends AbstractVerticle {
@Override @Override
public void start() { public void start() {
Executors.newSingleThreadScheduledExecutor().schedule(this::initMqttServer, 3, TimeUnit.SECONDS); Executors.newSingleThreadScheduledExecutor().schedule(this::initWsServer, 3, TimeUnit.SECONDS);
} }
private void initMqttServer() { private void initWsServer() {
HttpServerOptions options = new HttpServerOptions() HttpServerOptions options = new HttpServerOptions()
.setPort(config.getPort()); .setPort(config.getPort());
if (config.isSsl()) { if (config.isSsl()) {
@ -186,11 +185,8 @@ public class WebsocketVerticle extends AbstractVerticle {
}).listen(config.getPort(), server -> { }).listen(config.getPort(), server -> {
if (server.succeeded()) { if (server.succeeded()) {
log.info("webSocket server is listening on port " + config.getPort()); log.info("webSocket server is listening on port " + config.getPort());
if(config.getAccessTokens()!=null){ if(config.getTokenKey()!=null&&config.getAccessToken()!=null){
List<WebsocketConfig.AccessToken> tokenConfig= config.getAccessTokens(); tokens.put(config.getTokenKey(),config.getAccessToken());
for (WebsocketConfig.AccessToken obj:tokenConfig) {
tokens.put(obj.getTokenName(),obj.getTokenStr());
}
} }
} else { } else {
log.error("webSocket server on starting the server", server.cause()); log.error("webSocket server on starting the server", server.cause());

3
websocket-plugin/src/main/resources/application.yml
View File

@ -4,4 +4,5 @@ plugin:
websocket: websocket:
port: 1662 port: 1662
accessTokens: [{"tokenName":"test_token","tokenStr":"123456789"}] tokenKey: "test_token"
accessToken: "123456789"

17
websocket-plugin/src/main/resources/config.json
View File

@ -7,10 +7,17 @@
"desc": "websocket端口，默认为1662" "desc": "websocket端口，默认为1662"
}, },
{ {
"id": "accessTokens", "id": "tokenKey",
"name": "token表", "name": "令牌key",
"type": "json", "type": "text",
"value": "[{'tokenName':'test_token','tokenStr':'123456789'}]", "value": "test_token",
"desc": "token表，可多个" "desc": "令牌key"
},
{
"id": "accessToken",
"name": "令牌",
"type": "text",
"value": "123456789",
"desc": "令牌"
} }
] ]