From 79d97c39f1d118824f91467feb9f4a55717fd0c0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 26 七月 2024 14:03:41 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ZuulIGOTravel/src/main/java/com/sinata/zuul/util/echo/NettyServerController.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/ZuulIGOTravel/src/main/java/com/sinata/zuul/util/echo/NettyServerController.java b/ZuulIGOTravel/src/main/java/com/sinata/zuul/util/echo/NettyServerController.java
index 0ddae06..6119873 100644
--- a/ZuulIGOTravel/src/main/java/com/sinata/zuul/util/echo/NettyServerController.java
+++ b/ZuulIGOTravel/src/main/java/com/sinata/zuul/util/echo/NettyServerController.java
@@ -90,10 +90,10 @@
Integer type = jsonCon.getInteger("type");
String token = jsonCon.getString("token");
String userId1 = jsonCon.getString("userId");
+ Integer language = jsonCon.getInteger("language");
String device = jsonCon.getString("device");
String version = jsonCon.getString("version");
if(StringUtil.isNotEmpty(userId1)){
-
//判断用户或者司机长连接
if(type==1){
//确保账号在单个设备上登录
@@ -105,7 +105,7 @@
msg_.put("msg", "SUCCESS");
msg_.put("method", "OFFLINE");
msg_.put("data", new Object());
- this.sendMsgToClient(ctx, msg_.toJSONString());//给当前通道发送消息
+ sendMsgToClient(ctx, msg_.toJSONString());//给当前通道发送消息
TimerTask timerTask = new TimerTask() {
@Override
public void run() {
@@ -125,8 +125,17 @@
if(StringUtil.isEmpty(token_)){//确保登录的时候存储token失败的情况
redisUtil.setStrValue("USER_" + userId1, token);
}
+
+ //设置语言环境
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+ headers.set("Authorization", "Bearer " + token);
+ MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
+ params.add("language", language);
+ HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
+ String w = internalRestTemplate.postForObject("http://user-server/api/user/editLanguage",requestEntity , String.class);
}
-
+
}else{
//添加司机在线
HttpHeaders headers = new HttpHeaders();
@@ -154,7 +163,7 @@
msg_.put("msg", "SUCCESS");
msg_.put("method", "OFFLINE");
msg_.put("data", new Object());
- this.sendMsgToClient(ctx, msg_.toJSONString());//给当前通道发送消息
+ sendMsgToClient(ctx, msg_.toJSONString());//给当前通道发送消息
TimerTask timerTask = new TimerTask() {
@Override
public void run() {
@@ -175,6 +184,15 @@
if(StringUtil.isEmpty(token_)){//确保登录的时候存储token失败的情况
redisUtil.setStrValue("DRIVER_" + userId1, token);
}
+
+ //设置语言环境
+ headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+ headers.set("Authorization", "Bearer " + token);
+ params = new LinkedMultiValueMap<>();
+ params.add("language", language);
+ requestEntity = new HttpEntity<>(params, headers);
+ w = internalRestTemplate.postForObject("http://driver-server/api/driver/editLanguage",requestEntity , String.class);
}
--
Gitblit v1.7.1