Merge branch 'dev-encryption-20190904' into 'release'

feign



See merge request !2

server/pom.xml

@@ -128,6 +128,10 @@
                     <groupId>com.pica.cloud.foundation</groupId>
                     <artifactId>pica-cloud-entity</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.pica.cloud.foundation</groupId>
+                    <artifactId>pica-cloud-utils</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
     </dependencies>
@@ -149,6 +153,8 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+
+
         </dependencies>
     </dependencyManagement>
 

server/src/main/java/com/pica/cloud/account/account/server/App.java

@@ -12,7 +12,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @SpringBootApplication(scanBasePackages = "com.pica.cloud", exclude = {XxlJobConfiguration.class})
 @EnableDiscoveryClient
 @EnableSwagger2
-@EnableFeignClients
+@EnableFeignClients(basePackages = "com.pica.cloud")
 @MapperScan("com.pica.cloud.account.account.server.mapper")
 @EnableTransactionManagement
 public class App {

server/src/main/resources/bootstrap-dev.properties

@@ -26,7 +26,7 @@ logging.path=c:/tomcat-log/${spring.application.name}
 #xxl.job.executor.appname=pica-cloud-${server.port}-account-job
 
 #feign settings
-feign.hystrix.enabled=false
+#feign.hystrix.enabled=false
 ribbon.ReadTimeout=120000
 ribbon.ConnectTimeout=60000
 #------------ Please don't change above configurations ------------

server/src/main/resources/bootstrap-prod.properties

@@ -26,7 +26,7 @@ logging.path=/opt/tomcat-log/${spring.application.name}
 #xxl.job.executor.appname=pica-cloud-${server.port}-account-job
 
 #feign settings
-feign.hystrix.enabled=false
+#feign.hystrix.enabled=false
 ribbon.ReadTimeout=120000
 ribbon.ConnectTimeout=60000
 #------------ Please don't change above configurations ------------

server/src/main/resources/bootstrap-test1.properties

@@ -26,7 +26,7 @@ logging.path=/opt/tomcat-log/${spring.application.name}
 #xxl.job.executor.appname=pica-cloud-${server.port}-account-job
 
 #feign settings
-feign.hystrix.enabled=false
+#feign.hystrix.enabled=false
 ribbon.ReadTimeout=120000
 ribbon.ConnectTimeout=60000
 #------------ Please don't change above configurations ------------

server/src/main/resources/bootstrap-test2.properties

@@ -26,7 +26,7 @@ logging.path=/opt/tomcat-log/${spring.application.name}
 #xxl.job.executor.appname=pica-cloud-${server.port}-account-job
 
 #feign settings
-feign.hystrix.enabled=false
+#feign.hystrix.enabled=false
 ribbon.ReadTimeout=120000
 ribbon.ConnectTimeout=60000
 #------------ Please don't change above configurations ------------

server/src/main/resources/bootstrap-uat.properties

@@ -26,7 +26,7 @@ logging.path=/opt/tomcat-log/${spring.application.name}
 #xxl.job.executor.appname=pica-cloud-${server.port}-account-job
 
 #feign settings
-feign.hystrix.enabled=false
+#feign.hystrix.enabled=false
 ribbon.ReadTimeout=120000
 ribbon.ConnectTimeout=60000
 #------------ Please don't change above configurations ------------