m

youxiw2000
1 parent 93c6f0d8
Showing 4 changed files with 70 additions and 36 deletions
trash-admin/src/main/resources/application-dev.yml
trash-common/src/main/java/com/trash/common/utils/RemoteServerUtils.java
trash-ui/vue.config.js
trash-workFlow/src/main/java/com/trash/business/service/impl/CompanyCreditServiceImpl.java
@@ -17,11 +17,11 @@ trash:
     # 验证码类型 math 数组计算 char 字符验证
     captchaType: math
     # 远程服务器地址
-    #remotePath: http://175.6.47.84:8008
-    #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
+    remotePath: http://175.6.47.84:8008
+    token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
     #remotePath: http://cszhatu.natapp1.cc
-    remotePath: http://175.178.228.30:8008
-    token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
+    # remotePath: http://175.178.228.30:8008
+    # token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
 # 数据源配置
@@ -666,7 +666,7 @@ public class RemoteServerUtils {
 		if (token.contains("durable:")) {
 			token = "Bearer " + token;
 		} else {
-			token = "Bearer auth:token:" + token;
+			token = "Bearer auth:token:" + token.replace("auth:token:", "");
 		}
 		String param = JSON.toJSON(obj).toString();
@@ -708,7 +708,7 @@ public class RemoteServerUtils {
 		if (token.contains("durable:")) {
 			token = "Bearer " + token;
 		} else {
-			token = "Bearer auth:token:" + token;
+			token = "Bearer auth:token:" + token.replace("auth:token:", "");
 		}
 		String params = "";
@@ -755,7 +755,11 @@ public class RemoteServerUtils {
 			okHttpClient = getOkClient();
 		}
-		token = "Bearer " + token;
+		if (token.contains("durable:")) {
+			token = "Bearer " + token;
+		} else {
+			token = "Bearer auth:token:" + token.replace("auth:token:", "");
+		}
 		String param = JSON.toJSON(obj).toString();
@@ -812,8 +816,11 @@ public class RemoteServerUtils {
 		if (okHttpClient == null) {
 			okHttpClient = getOkClient();
 		}
-
-		token = "Bearer " + token;
+		if (token.contains("durable:")) {
+			token = "Bearer " + token;
+		} else {
+			token = "Bearer auth:token:" + token.replace("auth:token:", "");
+		}
 		String params = "";
@@ -883,7 +890,7 @@ public class RemoteServerUtils {
 		if (token.contains("durable:")) {
 			token = "Bearer " + token;
 		} else {
-			token = "Bearer auth:token:" + token;
+			token = "Bearer auth:token:" + token.replace("auth:token:", "");
 		}
 		String param = JSON.toJSON(map).toString();
@@ -1316,7 +1323,7 @@ public class RemoteServerUtils {
 		if (token.contains("durable:")) {
 			token = "Bearer " + token;
 		} else {
-			token = "Bearer auth:token:" + token;
+			token = "Bearer auth:token:" + token.replace("auth:token:", "");
 		}
 		Request request = new Request.Builder().url(remote + AREAS).addHeader("Authorization", token).get().build();
 		try {
@@ -41,13 +41,13 @@ module.exports = {
         }
       },
         ['/voice']: {
-          target: `http://127.0.0.1:15001/`,
-          // target: `http://175.6.47.84:8008`,
+          // target: `http://127.0.0.1:15001/`,
+          target: `http://175.6.47.84:8008`,
           changeOrigin: true,
         },
         ['/api']: {
-          target: `http://175.178.228.30:8008`,
-          // target: `http://175.6.47.84:8008`,
+          // target: `http://175.178.228.30:8008`,
+          target: `http://175.6.47.84:8008`,
           changeOrigin: true,
         }
@@ -115,8 +115,8 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
 			i = companyCreditMapper.insertCompanyCredit(companyCredit);
 			SendSms(companyCredit);
 		}
-
-		updateRemoteCompanyAndTruck(companyCredit, null);
+		String token = SecurityUtils.getLoginUser().getToken();
+		updateRemoteCompanyAndTruck(companyCredit, token);
 		return i;
 	}
@@ -208,18 +208,36 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
 		map.put("valid", 0);
 		map.put("size", 99999);
 		JSONArray turckList = null;
-		if (token == null) {
-			RemoteServerUtils.updateCompanyList(cpcList);
-			turckList = RemoteServerUtils.getTruckList(map);
-		} else {
-			RemoteServerUtils.updateCompanyList(cpcList, token);
-			turckList = RemoteServerUtils.getTruckList(map, token);
-		}
+		new Thread(new Runnable() {
+			
+			@Override
+			public void run() {
+				while(true){
+					Object object = RemoteServerUtils.updateCompanyList(cpcList, token);
+					if(object != null && ((boolean)object) == true){
+						break;
+					}
+					
+					try {
+						Thread.sleep(5000);
+					} catch (InterruptedException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+			}
+		}).start();
+		
+		
+		turckList = RemoteServerUtils.getTruckList(map, token);
+		
 		if (turckList != null) {
+			
+				List<Map> updateList = new ArrayList();
+				
 			for (Object objec : turckList) {
-				List<Map> updateList = new ArrayList();
 				JSONObject truck = (JSONObject) objec;
 				String truckId = truck.getString("id");
@@ -242,13 +260,6 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
 							upParam.put("creditStatus", credit);
 							upParam.put("id", truckId);
 							updateList.add(upParam);
-
-							if (token != null)
-								RemoteServerUtils.updateTruckList(updateList, token);
-							else
-								RemoteServerUtils.updateTruckList(updateList);
-
-							continue;
 						}
 					}
 				} else {
@@ -280,13 +291,29 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
 					upParam.put("creditStatus", credit);
 					upParam.put("id", truckId);
 					updateList.add(upParam);
-					if (token != null)
-						RemoteServerUtils.updateTruckList(updateList, token);
-					else
-						RemoteServerUtils.updateTruckList(updateList);
 				}
 			}
+			
+			new Thread(new Runnable() {
+				
+				@Override
+				public void run() {
+					while(true){
+						Object object = RemoteServerUtils.updateTruckList(updateList, token);
+						if(object != null && ((boolean)object) == true){
+							break;
+						}
+						
+						try {
+							Thread.sleep(5000);
+						} catch (InterruptedException e) {
+							// TODO Auto-generated catch block
+							e.printStackTrace();
+						}
+					}
+				}
+			}).start();
 		}
 	}