ibizdev提交

config.xml

@@ -37,6 +37,11 @@
 	  git clone -b master $para2 ibzuaa/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzuaa/
+      mvn clean package -Papi
+      cd ibzuaa-provider/ibzuaa-provider-api
+      mvn -Papi docker:build
+      mvn -Papi docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-provider-api.yaml ibzlab-rt --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzuaa-boot/src/main/resources/application-dev.yml

 server:
-  port: 8080
+  port: 40002
 

ibzuaa-provider/ibzuaa-provider-api/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-provider-api.jar
 
-EXPOSE 8081
+EXPOSE 40002
 
 ADD ibzuaa-provider-api.jar /ibzuaa-provider-api.jar

ibzuaa-provider/ibzuaa-provider-api/src/main/docker/ibzuaa-provider-api.yaml

@@ -3,9 +3,11 @@ services:
   ibzuaa-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest
     ports:
-      - "8081:8081"
+      - "40002:40002"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
     deploy:
       mode: replicated
       replicas: 1

ibzuaa-provider/ibzuaa-provider-api/src/main/resources/application-api-dev.yml

 server:
-  port: 8081
\ No newline at end of file
+  port: 40002
\ No newline at end of file

ibzuaa-provider/ibzuaa-provider-api/src/main/resources/application-api-prod.yml

 server:
-  port: 8081
+  port: 40002

ibzuaa-util/src/main/java/cn/ibizlab/util/service/RemoteService.java

 package cn.ibizlab.util.service;
 
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.alibaba.fastjson.support.config.FastJsonConfig;
-import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
-import com.alibaba.fastjson.support.springfox.SwaggerJsonSerializer;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import feign.*;
 import feign.codec.Decoder;
+import feign.codec.Encoder;
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.cloud.openfeign.FeignContext;
 import org.springframework.cloud.openfeign.support.SpringDecoder;
+import org.springframework.cloud.openfeign.support.SpringEncoder;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
@@ -94,9 +91,10 @@ public class RemoteService {
             object = Feign.builder()
                     //decoder指定对象解码方式
                     .decoder(this.feignDecoder())
+                    .encoder(this.feignEncoder())
                     .client(feignClient)
                     //options方法指定连接超时时长及响应超时时长
-                    .options(new Request.Options(5000, 5000))
+                    .options(new Request.Options(5000, 50000))
                     //retryer方法指定重试策略
                     //.retryer(new Retryer.Default(5000, 5000, 3))
                     .contract(feignContext.getInstance(serviceId, Contract.class))
@@ -112,31 +110,18 @@ public class RemoteService {
         return new SpringDecoder(feignHttpMessageConverter());
     }
 
-    /**
-     * 设置解码器为fastjson
-     *
-     * @return
-     */
-    private ObjectFactory<HttpMessageConverters> feignHttpMessageConverter() {
-        final HttpMessageConverters httpMessageConverters = new HttpMessageConverters(this.getFastJsonConverter());
-        return () -> httpMessageConverters;
+    private Encoder feignEncoder() {
+        return new SpringEncoder(feignHttpMessageConverter());
     }
 
-    private FastJsonHttpMessageConverter getFastJsonConverter() {
-        FastJsonHttpMessageConverter converter = new FastJsonHttpMessageConverter();
-
-        List<MediaType> supportedMediaTypes = new ArrayList<>();
-        MediaType mediaTypeJson = MediaType.valueOf(MediaType.APPLICATION_JSON_UTF8_VALUE);
-        supportedMediaTypes.add(mediaTypeJson);
-        converter.setSupportedMediaTypes(supportedMediaTypes);
-        FastJsonConfig config = new FastJsonConfig();
-        config.getSerializeConfig().put(JSON.class, new SwaggerJsonSerializer());
-        config.setSerializerFeatures(SerializerFeature.DisableCircularReferenceDetect);
-        converter.setFastJsonConfig(config);
 
-        return converter;
+    private ObjectFactory<HttpMessageConverters> feignHttpMessageConverter() {
+        HttpMessageConverter jsonConverter = new MappingJackson2HttpMessageConverter(new ObjectMapper());
+        final HttpMessageConverters httpMessageConverters = new HttpMessageConverters(jsonConverter);
+        return () -> httpMessageConverters;
     }
 
+
     @Configuration
     public class FeignTokenInterceptor implements RequestInterceptor {