--no commit message

com.zrqx.third/src/main/resources/application.yml

-security:
-  sessions: always   #always设置保存用户状态(内存可能会被占满)  stateless设置不保存用户状态  
-  basic:
-    enabled: false #开启认证
-  user:
-    name: user
-    password: 123456
 feign: 
   hystrix: 
     enabled: true 
 ribbon:
-  ConnectTimeout: 60000
-  ReadTimeout: 60000
+  ConnectTimeout: 360000
+  ReadTimeout: 360000
 hystrix:
   command: 
     default: 
@@ -18,7 +11,9 @@ hystrix:
         isolation:
           strategy: SEMAPHORE
           thread: 
-            timeoutInMilliseconds: 120000
+            timeoutInMilliseconds: 1440000
+          semaphore:
+            maxConcurrentRequests: 200
 mybatis:
     type-aliases-package: com.zrqx.core.model
 mapper:

com.zrqx.third/src/main/resources/assembly.xml

+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+	<id>package</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<fileSets>
+		<fileSet>
+			<directory>${basedir}/src/main/resources</directory>
+			<includes>
+				<include>*.yml</include>
+				<include>*.xml</include>
+				<include>static/**</include>
+				<include>templates/**</include>
+				<include>*.properties</include>
+				<include>*.txt</include>
+			</includes>
+			<filtered>true</filtered>
+			<outputDirectory>${file.separator}${project.artifactId}</outputDirectory>
+		</fileSet>
+
+		<fileSet>
+			<directory>src/main/resources/runScript</directory>
+			<outputDirectory>${file.separator}bin</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>${project.build.directory}/lib</directory>
+			<outputDirectory>${file.separator}${project.artifactId}/lib</outputDirectory>
+			<includes>
+				<include>*.jar</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>${project.build.directory}/</directory>
+			<outputDirectory>${file.separator}${project.artifactId}</outputDirectory>
+			<includes>
+				<include>*.jar</include>
+			</includes>
+		</fileSet>
+	</fileSets>
+</assembly>
\ No newline at end of file

com.zrqx.third/src/main/resources/bootstrap.yml

----
+server:
+  port: 8096
 spring:
   cloud:
     config:

com.zrqx.third/src/main/resources/logback.xml

@@ -5,7 +5,7 @@
     debug="false" scan="true" scanPeriod="30 second">
 	<!--读取配置中心的属性-->
     <springProperty scope="context" name="name" source="spring.application.name"/>
-    <property name="ROOT" value="/opt/logs/third/" />
+    <property name="ROOT" value="/opt/logs/master/third/" />
     <property name="FILESIZE" value="50MB" />
     <property name="MAXHISTORY" value="100" />
     <property name="DATETIME" value="yyyy-MM-dd HH:mm:ss" />