From c6d457b82666dc5bac722ac648d237bb6b2ad22b Mon Sep 17 00:00:00 2001
From: xumiao <1365304440@qq.com>
Date: Thu, 23 Feb 2023 17:28:21 +0800
Subject: [PATCH] DataOutputStream改为OutputStreamWriter
---
src/main/java/com/huaheng/api/mes/domain/LoginMES.java | 2 +-
src/main/java/com/huaheng/api/mes/service/MESHelper.java | 25 +++++++++++++++++++------
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java | 5 +++--
3 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/huaheng/api/mes/domain/LoginMES.java b/src/main/java/com/huaheng/api/mes/domain/LoginMES.java
index 00c9d0d..4c34318 100644
--- a/src/main/java/com/huaheng/api/mes/domain/LoginMES.java
+++ b/src/main/java/com/huaheng/api/mes/domain/LoginMES.java
@@ -11,6 +11,6 @@ import org.springframework.stereotype.Component;
@Component
//登录参数
public class LoginMES {
- private String appkey;
+ private String appKey;
private String appSecret;
}
diff --git a/src/main/java/com/huaheng/api/mes/service/MESHelper.java b/src/main/java/com/huaheng/api/mes/service/MESHelper.java
index cfca9db..64ed9cd 100644
--- a/src/main/java/com/huaheng/api/mes/service/MESHelper.java
+++ b/src/main/java/com/huaheng/api/mes/service/MESHelper.java
@@ -2,15 +2,15 @@ package com.huaheng.api.mes.service;
import com.alibaba.fastjson.JSONObject;
import com.huaheng.api.mes.domain.MESUri;
+import com.huaheng.common.utils.http.HttpUtils;
import com.huaheng.framework.aspectj.ApiLogAspect;
+import com.huaheng.framework.web.domain.AjaxResult;
import com.huaheng.pc.monitor.apilog.domain.ApiLog;
import com.huaheng.pc.system.config.service.IConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.InputStreamReader;
+import java.io.*;
import java.net.HttpURLConnection;
import java.net.URL;
@@ -27,7 +27,6 @@ public class MESHelper {
HttpURLConnection connection = (HttpURLConnection) postUrl
.openConnection();
String MESCookie = configService.selectConfigByKey("MESCookie");
- connection.setRequestProperty("Authorization", MESCookie);
connection.setDoOutput(true);
connection.setDoInput(true);
connection.setUseCaches(false);
@@ -35,9 +34,13 @@ public class MESHelper {
connection.setRequestMethod("POST");// 设置请求方式
connection.setRequestProperty("Accept","application/json");// 设置接收数据的格式
connection.setRequestProperty("Content-Type","application/json");// 设置发送数据的格式
+ connection.setRequestProperty("Authorization", MESCookie);
apiLog = ApiLogAspect.initApiLog(connection, paras, "MES");
- DataOutputStream out = new DataOutputStream(connection.getOutputStream());
- out.writeBytes(paras);
+// DataOutputStream out = new DataOutputStream(connection.getOutputStream());
+ // out.writeBytes(paras);
+ OutputStreamWriter out = null;
+ out = new OutputStreamWriter(connection.getOutputStream(),"UTF-8");// utf-8编码
+ out.append(paras);
out.flush();
out.close();
return connection;
@@ -45,7 +48,17 @@ public class MESHelper {
public void insertAgvPort(String param) throws Exception {
HttpURLConnection connection = initUrlConn(MESUri.INSERT_AGV_PORT.getApiUri(), param);
+ BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+ String line;
+ String sResult=null;
+ while ((line = reader.readLine()) != null) {
+ sResult = new String(line.getBytes(), "UTF-8");
+ System.out.println(sResult);
+ }
+ reader.close();
connection.disconnect();
+ ApiLogAspect.finishApiLog(apiLog,connection, AjaxResult.success(sResult).toString());
+// HttpUtils.bodypost(MESUri.INSERT_AGV_PORT.getApiUri(),param,"CS0001");
}
public JSONObject returnOrderCode(String param) throws Exception {
diff --git a/src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java b/src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
index 8cd88c5..5dd2bb2 100644
--- a/src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
+++ b/src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
@@ -405,11 +405,12 @@ public class RyTask extends BaseController {
public void loginMES(String params)
throws Exception {
- System.out.println("params:" + params);
LoginMES loginMES = JSON.parseObject(params, LoginMES.class);
+ HashMap map=new HashMap();
+ map.put("body",loginMES);
String sUrl = MESUri.LOGIN.getApiUri();
Gson gson = new Gson();
- String s = gson.toJson(loginMES);
+ String s = gson.toJson(map);
HttpURLConnection connection = mesHelper.initUrlConn(sUrl, s);
// 获取Cookie
BufferedReader reader = new BufferedReader(new InputStreamReader(
--
libgit2 0.22.2