Merge remote-tracking branch 'origin/master'

艾金辉

2023-07-24 651186d7fce51274500b66d7ed8a53bedc6a1339

 ard-work/src/main/java/com/ruoyi/client/ARDCarGPSLogInClient.java

@@ -6,13 +6,14 @@
import okhttp3.Response;
import okhttp3.ResponseBody;
import org.apache.commons.codec.digest.DigestUtils;

import java.io.IOException;
import java.util.HashMap;
import java.util.Map;

public class ARDCarGPSLogInClient {

    public static Map<String,Object> loginIn(String syURL,String userId,String password){
    public static Map<String, Object> loginIn(String syURL, String userId, String password) {
        OkHttpClient okHttpClient = new OkHttpClient();

        String passwordMd5 = DigestUtils.md5Hex(password);
@@ -21,7 +22,7 @@
              .url("http://116.182.15.14:9999/gps-web/api/login.jsp?"+"password="+passwordMd5+"&userId="+userId+"&loginType=user&loginWay=interface&loginLang=zh_CN")
              .build();*/
        Request request = new Request.Builder()
                .url(syURL + "/gps-web/api/login.jsp?"+"password="+passwordMd5+"&userId="+userId+"&loginType=user&loginWay=interface&loginLang=zh_CN")
                .url(syURL + "/gps-web/api/login.jsp?" + "password=" + passwordMd5 + "&userId=" + userId + "&loginType=user&loginWay=interface&loginLang=zh_CN")
                .build();
        Response response = null;
        try {
@@ -37,7 +38,7 @@

        try {
            String message = responseBody.string();// 响应体
            Map<String,Object> map = (Map<String, Object>) JSON.parse(message);
            Map<String, Object> map = (Map<String, Object>) JSON.parse(message);
            map.put("passwordMd5", passwordMd5);
            //System.out.println(message);
            return map;