java110
2020-06-23 d3fc62508b192db4dc0f6f1250329124418e5068
统一外部分装tempalte
16个文件已修改
91 ■■■■■ 已修改文件
java110-generator/src/main/java/com/java110/code/GeneratorServiceApplicationStart.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-service/src/main/java/com/java110/service/context/DataQuery.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-api/src/main/java/com/java110/api/ApiApplicationStart.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-api/src/main/java/com/java110/api/bmo/ApiBaseBMO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-api/src/main/java/com/java110/api/listener/AbstractServiceApiDataFlowListener.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-api/src/main/java/com/java110/api/listener/machineTranslate/MachineQueryUserInfoListener.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-api/src/main/java/com/java110/api/listener/smallWeChat/PublishWechatMenuListener.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-api/src/main/java/com/java110/api/smo/impl/ApiServiceSMOImpl.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-common/src/main/java/com/java110/common/CommonServiceApplicationStart.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-community/src/main/java/com/java110/community/CommunityServiceApplicationStart.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-order/src/main/java/com/java110/order/OrderServiceApplicationStart.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-order/src/main/java/com/java110/order/smo/impl/AbstractOrderServiceSMOImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-order/src/main/java/com/java110/order/smo/impl/CenterServiceSMOImpl.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-order/src/main/java/com/java110/order/smo/impl/OrderProcessServiceSMOImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-order/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-report/src/main/java/com/java110/report/ReportServiceApplicationStart.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-generator/src/main/java/com/java110/code/GeneratorServiceApplicationStart.java
@@ -68,7 +68,7 @@
     * @return restTemplate
     */
    @Bean
    public com.java110.core.client.RestTemplate restTemplateNoLoadBalanced() {
    public com.java110.core.client.RestTemplate outRestTemplate() {
        StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
        com.java110.core.client.RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(com.java110.core.client.RestTemplate.class);
        return restTemplate;
java110-service/src/main/java/com/java110/service/context/DataQuery.java
@@ -159,7 +159,7 @@
        if(innerService){
            restTemplate = ApplicationContextFactory.getBean("restTemplate",RestTemplate.class);
        }else{
            restTemplate = ApplicationContextFactory.getBean("restTemplateNoLoadBalanced",RestTemplate.class);
            restTemplate = ApplicationContextFactory.getBean("outRestTemplate",RestTemplate.class);
        }
        return restTemplate.exchange(requestEntity,String.class);
    }
service-api/src/main/java/com/java110/api/ApiApplicationStart.java
@@ -77,7 +77,7 @@
     * @return restTemplate
     */
    @Bean
    public RestTemplate restTemplateNoLoadBalanced() {
    public RestTemplate outRestTemplate() {
        StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
        RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(RestTemplate.class);
        return restTemplate;
service-api/src/main/java/com/java110/api/bmo/ApiBaseBMO.java
@@ -27,7 +27,7 @@
    private RestTemplate restTemplate;
    @Autowired
    private RestTemplate restTemplateNoLoadBalanced;
    private RestTemplate outRestTemplate;
    /**
     * 调用下游服务
@@ -97,7 +97,7 @@
        }
        RestTemplate tmpRestTemplate = appService.getServiceCode().startsWith("out.") ? restTemplateNoLoadBalanced : restTemplate;
        RestTemplate tmpRestTemplate = appService.getServiceCode().startsWith("out.") ? outRestTemplate : restTemplate;
        String serviceUrl = appService.getUrl();
        HttpEntity<String> httpEntity = null;
service-api/src/main/java/com/java110/api/listener/AbstractServiceApiDataFlowListener.java
@@ -1,15 +1,18 @@
package com.java110.api.listener;
import com.alibaba.fastjson.JSONObject;
import com.java110.utils.constant.*;
import com.java110.utils.exception.ListenerExecuteException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.StringUtil;
import com.java110.core.context.DataFlowContext;
import com.java110.core.event.service.api.ServiceDataFlowListener;
import com.java110.core.smo.community.ICommunityInnerServiceSMO;
import com.java110.dto.CommunityMemberDto;
import com.java110.entity.center.AppService;
import com.java110.core.event.service.api.ServiceDataFlowListener;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.constant.CommunityMemberTypeConstant;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.constant.StatusConstant;
import com.java110.utils.exception.ListenerExecuteException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,8 +43,7 @@
    private RestTemplate restTemplate;
    @Autowired
    private RestTemplate restTemplateNoLoadBalanced;
    private RestTemplate outRestTemplate;
    /**
@@ -55,7 +57,7 @@
        ResponseEntity responseEntity = null;
        //配置c_service 时请注意 如果是以out 开头的调用外部的地址
        RestTemplate tmpRestTemplate = service.getServiceCode().startsWith("out.") ? restTemplateNoLoadBalanced : restTemplate;
        RestTemplate tmpRestTemplate = service.getServiceCode().startsWith("out.") ? outRestTemplate : restTemplate;
        try {
            if (CommonConstant.HTTP_METHOD_GET.equals(service.getMethod())) {
@@ -86,7 +88,7 @@
                responseEntity = tmpRestTemplate.exchange(service.getUrl(), HttpMethod.POST, httpEntity, String.class);
            }
        } catch (HttpStatusCodeException e) { //这里spring 框架 在4XX 或 5XX 时抛出 HttpServerErrorException 异常,需要重新封装一下
            responseEntity = new ResponseEntity<String>( e.getResponseBodyAsString(), e.getStatusCode());
            responseEntity = new ResponseEntity<String>(e.getResponseBodyAsString(), e.getStatusCode());
        }
        logger.debug("API 服务调用下游服务请求:{},返回为:{}", httpEntity, responseEntity);
@@ -208,11 +210,4 @@
        this.restTemplate = restTemplate;
    }
    public RestTemplate getRestTemplateNoLoadBalanced() {
        return restTemplateNoLoadBalanced;
    }
    public void setRestTemplateNoLoadBalanced(RestTemplate restTemplateNoLoadBalanced) {
        this.restTemplateNoLoadBalanced = restTemplateNoLoadBalanced;
    }
}
service-api/src/main/java/com/java110/api/listener/machineTranslate/MachineQueryUserInfoListener.java
@@ -68,7 +68,7 @@
    private IFileInnerServiceSMO fileInnerServiceSMOImpl;
    @Autowired
    private RestTemplate restTemplateNoLoadBalanced;
    private RestTemplate outRestTemplate;
    @Autowired
    private IApplicationKeyInnerServiceSMO applicationKeyInnerServiceSMOImpl;
service-api/src/main/java/com/java110/api/listener/smallWeChat/PublishWechatMenuListener.java
@@ -35,7 +35,7 @@
    private IWechatMenuBMO wechatMenuBMOImpl;
    @Autowired
    private RestTemplate restTemplateNoLoadBalanced;
    private RestTemplate outRestTemplate;
    @Autowired
    private IWechatMenuInnerServiceSMO wechatMenuInnerServiceSMOImpl;
@@ -132,7 +132,7 @@
        }
        String token = WechatFactory.getAccessToken(smallWeChatDtos.get(0).getAppId(), smallWeChatDtos.get(0).getAppSecret());
        String url = WechatConstant.CREATE_MENU.replace("ACCESS_TOKEN", token);
        ResponseEntity<String> responseEntity = restTemplateNoLoadBalanced.postForEntity(url, wechatMenuObj.toJSONString(), String.class);
        ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, wechatMenuObj.toJSONString(), String.class);
        JSONObject wechatOutObj = JSONObject.parseObject(responseEntity.getBody());
        context.setResponseEntity(ResultVo.createResponseEntity(wechatOutObj.getInteger("errcode"), wechatOutObj.getString("errmsg")));
service-api/src/main/java/com/java110/api/smo/impl/ApiServiceSMOImpl.java
@@ -57,7 +57,7 @@
    private RestTemplate restTemplate;
    @Autowired
    private RestTemplate restTemplateNoLoadBalanced;
    private RestTemplate outRestTemplate;
    /**
@@ -372,12 +372,4 @@
        this.restTemplate = restTemplate;
    }
    public RestTemplate getRestTemplateNoLoadBalanced() {
        return restTemplateNoLoadBalanced;
    }
    public void setRestTemplateNoLoadBalanced(RestTemplate restTemplateNoLoadBalanced) {
        this.restTemplateNoLoadBalanced = restTemplateNoLoadBalanced;
    }
}
service-common/src/main/java/com/java110/common/CommonServiceApplicationStart.java
@@ -70,7 +70,7 @@
     * @return restTemplate
     */
    @Bean
    public com.java110.core.client.RestTemplate restTemplateNoLoadBalanced() {
    public com.java110.core.client.RestTemplate outRestTemplate() {
        StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
        com.java110.core.client.RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(com.java110.core.client.RestTemplate.class);
        return restTemplate;
service-community/src/main/java/com/java110/community/CommunityServiceApplicationStart.java
@@ -58,7 +58,7 @@
     * @return restTemplate
     */
    @Bean
    public com.java110.core.client.RestTemplate restTemplateNoLoadBalanced() {
    public com.java110.core.client.RestTemplate outRestTemplate() {
        StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
        com.java110.core.client.RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(com.java110.core.client.RestTemplate.class);
        return restTemplate;
service-order/src/main/java/com/java110/order/OrderServiceApplicationStart.java
@@ -68,7 +68,7 @@
     * @return restTemplate
     */
    @Bean
    public RestTemplate restTemplateNoLoadBalanced() {
    public RestTemplate outRestTemplate() {
        StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
        RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(RestTemplate.class);
        return restTemplate;
service-order/src/main/java/com/java110/order/smo/impl/AbstractOrderServiceSMOImpl.java
@@ -38,7 +38,7 @@
    protected RestTemplate restTemplate;
    @Autowired
    protected RestTemplate restTemplateNoLoadBalanced;
    protected RestTemplate outRestTemplate;
    /**
     * 4.0规则校验
@@ -323,7 +323,7 @@
            responseMessage = restTemplate.postForObject(httpUrl, requestBusinessJson.toJSONString(), String.class);
        } else if (ServiceBusinessConstant.INVOKE_TYPE_OUT_HTTP_POST.equals(serviceBusiness.getInvokeType())) {
            httpUrl = MappingCache.getValue(serviceBusiness.getUrl());
            responseMessage = restTemplateNoLoadBalanced.postForObject(httpUrl, requestBusinessJson.toJSONString(), String.class);
            responseMessage = outRestTemplate.postForObject(httpUrl, requestBusinessJson.toJSONString(), String.class);
        } else {//post方式
            throw new ConfigDataException(ResponseConstant.RESULT_CODE_CONFIG_ERROR, "配置错误:c_service_business配置url字段错误,当前无法识别" + serviceBusiness.getBusinessTypeCd());
        }
service-order/src/main/java/com/java110/order/smo/impl/CenterServiceSMOImpl.java
@@ -51,7 +51,7 @@
    private RestTemplate restTemplate;
    @Autowired
    private RestTemplate restTemplateNoLoadBalanced;
    private RestTemplate outRestTemplate;
    @Autowired
    private IQueryServiceSMO queryServiceSMOImpl;
@@ -1206,7 +1206,7 @@
                header.add(key,dataFlow.getRequestCurrentHeaders().get(key));
            }
            HttpEntity<String> httpEntity = new HttpEntity<String>(reqData, header);
            responseMessage = restTemplateNoLoadBalanced.postForObject(service.getUrl(),httpEntity,String.class);
            responseMessage = outRestTemplate.postForObject(service.getUrl(),httpEntity,String.class);
        }else{//webservice方式
            responseMessage = (String) WebServiceAxisClient.callWebService(service.getUrl(),service.getMethod(),
                    new Object[]{dataFlow.getRequestBusinessJson().toJSONString()},
@@ -1383,11 +1383,4 @@
        this.queryServiceSMOImpl = queryServiceSMOImpl;
    }
    public RestTemplate getRestTemplateNoLoadBalanced() {
        return restTemplateNoLoadBalanced;
    }
    public void setRestTemplateNoLoadBalanced(RestTemplate restTemplateNoLoadBalanced) {
        this.restTemplateNoLoadBalanced = restTemplateNoLoadBalanced;
    }
}
service-order/src/main/java/com/java110/order/smo/impl/OrderProcessServiceSMOImpl.java
@@ -395,11 +395,5 @@
        this.queryServiceSMOImpl = queryServiceSMOImpl;
    }
    public RestTemplate getRestTemplateNoLoadBalanced() {
        return restTemplateNoLoadBalanced;
    }
    public void setRestTemplateNoLoadBalanced(RestTemplate restTemplateNoLoadBalanced) {
        this.restTemplateNoLoadBalanced = restTemplateNoLoadBalanced;
    }
}
service-order/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java
@@ -637,7 +637,7 @@
                header.add(key, dataFlow.getRequestCurrentHeaders().get(key));
            }
            HttpEntity<String> httpEntity = new HttpEntity<String>(reqData, header);
            responseMessage = restTemplateNoLoadBalanced.postForObject(service.getUrl(), httpEntity, String.class);
            responseMessage = outRestTemplate.postForObject(service.getUrl(), httpEntity, String.class);
        } else {//webservice方式
            responseMessage = (String) WebServiceAxisClient.callWebService(service.getUrl(), service.getMethod(),
                    new Object[]{dataFlow.getRequestBusinessJson().toJSONString()},
@@ -769,11 +769,4 @@
        this.queryServiceSMOImpl = queryServiceSMOImpl;
    }
    public RestTemplate getRestTemplateNoLoadBalanced() {
        return restTemplateNoLoadBalanced;
    }
    public void setRestTemplateNoLoadBalanced(RestTemplate restTemplateNoLoadBalanced) {
        this.restTemplateNoLoadBalanced = restTemplateNoLoadBalanced;
    }
}
service-report/src/main/java/com/java110/report/ReportServiceApplicationStart.java
@@ -61,7 +61,7 @@
     * @return restTemplate
     */
    @Bean
    public com.java110.core.client.RestTemplate restTemplateNoLoadBalanced() {
    public com.java110.core.client.RestTemplate outRestTemplate() {
        StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
        com.java110.core.client.RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(com.java110.core.client.RestTemplate.class);
        return restTemplate;