|
@@ -1,13 +1,10 @@
|
|
|
package com.uas.erp.schedular.finance.mq;
|
|
package com.uas.erp.schedular.finance.mq;
|
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSON;
|
|
|
-import com.alibaba.fastjson.JSONObject;
|
|
|
|
|
import com.alibaba.fastjson.TypeReference;
|
|
import com.alibaba.fastjson.TypeReference;
|
|
|
import com.uas.erp.schedular.database.RestJdbcTemplate;
|
|
import com.uas.erp.schedular.database.RestJdbcTemplate;
|
|
|
import com.uas.erp.schedular.entity.Master;
|
|
import com.uas.erp.schedular.entity.Master;
|
|
|
import com.uas.erp.schedular.entity.MqConfig;
|
|
import com.uas.erp.schedular.entity.MqConfig;
|
|
|
-import com.uas.erp.schedular.service.MasterService;
|
|
|
|
|
-import com.uas.erp.schedular.service.SettingService;
|
|
|
|
|
import com.uas.erp.schedular.util.ContextHolder;
|
|
import com.uas.erp.schedular.util.ContextHolder;
|
|
|
import com.uas.erp.schedular.util.HmacUtils;
|
|
import com.uas.erp.schedular.util.HmacUtils;
|
|
|
import com.uas.erp.schedular.web.ResultWrap;
|
|
import com.uas.erp.schedular.web.ResultWrap;
|
|
@@ -15,41 +12,34 @@ import com.usoft.mq.utils.BaseRabbitReceiveService;
|
|
|
import com.usoft.mq.utils.MessageInfo;
|
|
import com.usoft.mq.utils.MessageInfo;
|
|
|
import com.usoft.security.utils.OpenApiSignUtil;
|
|
import com.usoft.security.utils.OpenApiSignUtil;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.core.annotation.Order;
|
|
|
|
|
import org.springframework.http.HttpEntity;
|
|
import org.springframework.http.HttpEntity;
|
|
|
import org.springframework.http.HttpHeaders;
|
|
import org.springframework.http.HttpHeaders;
|
|
|
import org.springframework.http.MediaType;
|
|
import org.springframework.http.MediaType;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
-import org.springframework.util.Assert;
|
|
|
|
|
import org.springframework.util.LinkedMultiValueMap;
|
|
import org.springframework.util.LinkedMultiValueMap;
|
|
|
import org.springframework.util.MultiValueMap;
|
|
import org.springframework.util.MultiValueMap;
|
|
|
import org.springframework.web.client.RestTemplate;
|
|
import org.springframework.web.client.RestTemplate;
|
|
|
import org.springframework.web.util.DefaultUriTemplateHandler;
|
|
import org.springframework.web.util.DefaultUriTemplateHandler;
|
|
|
|
|
|
|
|
import javax.annotation.PostConstruct;
|
|
import javax.annotation.PostConstruct;
|
|
|
-import java.io.UnsupportedEncodingException;
|
|
|
|
|
import java.net.URLEncoder;
|
|
import java.net.URLEncoder;
|
|
|
-import java.security.InvalidKeyException;
|
|
|
|
|
-import java.security.NoSuchAlgorithmException;
|
|
|
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
|
|
|
|
@Service
|
|
@Service
|
|
|
public class RabbitReceiveServiceImpl extends BaseRabbitReceiveService {
|
|
public class RabbitReceiveServiceImpl extends BaseRabbitReceiveService {
|
|
|
|
|
|
|
|
-
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private RestTemplate restTemplate;
|
|
private RestTemplate restTemplate;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private RestJdbcTemplate jdbcTemplate;
|
|
private RestJdbcTemplate jdbcTemplate;
|
|
|
- @Autowired
|
|
|
|
|
- private SettingService settingService;
|
|
|
|
|
|
|
|
|
|
private final static String SECRETKEY = "600d3f07955ba67fe050007f01002db2";
|
|
private final static String SECRETKEY = "600d3f07955ba67fe050007f01002db2";
|
|
|
- private final static String BASEPATH = "http://192.168.253.3:26600";
|
|
|
|
|
|
|
+ private final static String BASEPATH = "https://finrest.usofchina.com";
|
|
|
private final static String UASURL = "http://218.18.115.198:8888/ERP";
|
|
private final static String UASURL = "http://218.18.115.198:8888/ERP";
|
|
|
|
|
+// private final static String UASURL = "http://192.168.253.41:8080/ERP";
|
|
|
private final static String MASTERNAME = "YITOA_BL";
|
|
private final static String MASTERNAME = "YITOA_BL";
|
|
|
|
|
+// private final static String MASTERNAME = "YITOA_BL_BAKCUP";
|
|
|
|
|
|
|
|
@PostConstruct
|
|
@PostConstruct
|
|
|
public void init() throws InterruptedException {
|
|
public void init() throws InterruptedException {
|
|
@@ -127,8 +117,11 @@ public class RabbitReceiveServiceImpl extends BaseRabbitReceiveService {
|
|
|
|
|
|
|
|
DefaultUriTemplateHandler uriTemplateHandler = new DefaultUriTemplateHandler();
|
|
DefaultUriTemplateHandler uriTemplateHandler = new DefaultUriTemplateHandler();
|
|
|
uriTemplateHandler.setStrictEncoding(true);
|
|
uriTemplateHandler.setStrictEncoding(true);
|
|
|
- restTemplate.setUriTemplateHandler(uriTemplateHandler);
|
|
|
|
|
- String result = restTemplate.getForObject(requestURL, String.class);
|
|
|
|
|
|
|
+
|
|
|
|
|
+ RestTemplate restTemp = new RestTemplate(new HttpsClientRequestFactory());
|
|
|
|
|
+ restTemp.setUriTemplateHandler(uriTemplateHandler);
|
|
|
|
|
+ String result = restTemp.getForObject(requestURL, String.class);
|
|
|
|
|
+
|
|
|
String UASurl = UASURL + uasURL;
|
|
String UASurl = UASURL + uasURL;
|
|
|
Map<String, Object> map = new HashMap<String, Object>();
|
|
Map<String, Object> map = new HashMap<String, Object>();
|
|
|
map.put("data", result);
|
|
map.put("data", result);
|