Commit ba7dde14 by zhongzhimiao

init

parent e8d46c45
...@@ -2,6 +2,30 @@ ...@@ -2,6 +2,30 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="0dcfcd34-9a3d-4ad3-809a-8b9c19032e2b" name="Default" comment=""> <list default="true" id="0dcfcd34-9a3d-4ad3-809a-8b9c19032e2b" name="Default" comment="">
<change type="DELETED" beforePath="$PROJECT_DIR$/config-client/target/classes/bootstrap.properties" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/config-client/target/classes/com/study/app/ConfigClientApplication.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/config-server/target/classes/application.properties" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/config-server/target/classes/com/study/app/ConfigServerApplication.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/eureka-server/target/classes/application.yml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/eureka-server/target/classes/com/study/app/EurekaServerApp.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/sercice-order/target/classes/application.yml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/sercice-order/target/classes/com/study/AppOrder.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/sercice-order/target/classes/com/study/controller/OrderController.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/sercice-order/target/classes/com/study/service/MemberService.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/service-member/target/classes/application.yml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/service-member/target/classes/com/study/AppMember.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/service-member/target/classes/com/study/controller/MemberController.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/service-member2/target/classes/application.yml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/service-member2/target/classes/study/AppMember.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/service-member2/target/classes/study/controller/MemberController.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/service-order-feign/target/classes/application.yml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/service-order-feign/target/classes/com/study/OrderFeignApp.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/service-order-feign/target/classes/com/study/controller/MemberFeginController.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/service-order-feign/target/classes/com/study/service/MemberFeign.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/service-order-feign/target/classes/com/study/service/MemberFeignService.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/service-zuul/target/classes/application.yml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/service-zuul/target/classes/com/study/AppZuul.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/service-zuul/target/classes/com/study/MyFilter.class" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list> </list>
<ignored path="$PROJECT_DIR$/config-client/target/" /> <ignored path="$PROJECT_DIR$/config-client/target/" />
...@@ -185,11 +209,43 @@ ...@@ -185,11 +209,43 @@
<expand> <expand>
<path> <path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" /> <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="config-client" type="9519ce18:MavenProjectsStructure$ProjectNode" />
</path>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="config-client" type="9519ce18:MavenProjectsStructure$ProjectNode" />
<item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
</path>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="config-server" type="9519ce18:MavenProjectsStructure$ProjectNode" />
</path>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="config-server" type="9519ce18:MavenProjectsStructure$ProjectNode" />
<item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
</path>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="eureka-server" type="9519ce18:MavenProjectsStructure$ProjectNode" />
</path>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="eureka-server" type="9519ce18:MavenProjectsStructure$ProjectNode" />
<item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
</path>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="sercice-order" type="9519ce18:MavenProjectsStructure$ProjectNode" /> <item name="sercice-order" type="9519ce18:MavenProjectsStructure$ProjectNode" />
</path> </path>
<path> <path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" /> <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="sercice-order" type="9519ce18:MavenProjectsStructure$ProjectNode" /> <item name="sercice-order" type="9519ce18:MavenProjectsStructure$ProjectNode" />
<item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
</path>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="sercice-order" type="9519ce18:MavenProjectsStructure$ProjectNode" />
<item name="Dependencies" type="f4be9f2a:MavenProjectsStructure$DependenciesNode" /> <item name="Dependencies" type="f4be9f2a:MavenProjectsStructure$DependenciesNode" />
</path> </path>
<path> <path>
...@@ -210,6 +266,42 @@ ...@@ -210,6 +266,42 @@
<item name="Dependencies" type="f4be9f2a:MavenProjectsStructure$DependenciesNode" /> <item name="Dependencies" type="f4be9f2a:MavenProjectsStructure$DependenciesNode" />
<item name="org.springframework.boot:spring-boot-starter-web:1.5.2.RELEASE" type="c0821a7e:MavenProjectsStructure$DependencyNode" /> <item name="org.springframework.boot:spring-boot-starter-web:1.5.2.RELEASE" type="c0821a7e:MavenProjectsStructure$DependencyNode" />
</path> </path>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="service-member" type="9519ce18:MavenProjectsStructure$ProjectNode" />
</path>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="service-member" type="9519ce18:MavenProjectsStructure$ProjectNode" />
<item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
</path>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="service-member2" type="9519ce18:MavenProjectsStructure$ProjectNode" />
</path>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="service-member2" type="9519ce18:MavenProjectsStructure$ProjectNode" />
<item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
</path>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="service-order-feign" type="9519ce18:MavenProjectsStructure$ProjectNode" />
</path>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="service-order-feign" type="9519ce18:MavenProjectsStructure$ProjectNode" />
<item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
</path>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="service-zuul" type="9519ce18:MavenProjectsStructure$ProjectNode" />
</path>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="service-zuul" type="9519ce18:MavenProjectsStructure$ProjectNode" />
<item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
</path>
</expand> </expand>
<select /> <select />
</treeState> </treeState>
...@@ -525,8 +617,16 @@ ...@@ -525,8 +617,16 @@
<workItem from="1565337584225" duration="5000" /> <workItem from="1565337584225" duration="5000" />
<workItem from="1566175733036" duration="704000" /> <workItem from="1566175733036" duration="704000" />
<workItem from="1566197434181" duration="836000" /> <workItem from="1566197434181" duration="836000" />
<workItem from="1566198382633" duration="288000" /> <workItem from="1566198382633" duration="417000" />
</task>
<task id="LOCAL-00001" summary="init">
<created>1566198714166</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1566198714166</updated>
</task> </task>
<option name="localTasksCounter" value="2" />
<servers /> <servers />
</component> </component>
<component name="TestHistory"> <component name="TestHistory">
...@@ -541,10 +641,11 @@ ...@@ -541,10 +641,11 @@
</history-entry> </history-entry>
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="38117000" /> <option name="totallyTimeSpent" value="38246000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout> <layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="RestServices" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="RestServices" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
...@@ -564,11 +665,11 @@ ...@@ -564,11 +665,11 @@
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.65290177" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.40268457" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32997763" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32997763" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="MyBatis Sql Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="MyBatis Sql Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29669157" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29669157" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
...@@ -587,6 +688,10 @@ ...@@ -587,6 +688,10 @@
<component name="VcsContentAnnotationSettings"> <component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="VcsManagerConfiguration">
<MESSAGE value="init" />
<option name="LAST_COMMIT_MESSAGE" value="init" />
</component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
<option name="time" value="8" /> <option name="time" value="8" />
......
spring.application.name=config-client
spring.cloud.config.label=master
spring.cloud.config.profile=dev
spring.cloud.config.uri= http://localhost:8889/
server.port=8881
\ No newline at end of file
spring.application.name=config-server
server.port=8889
spring.cloud.config.server.git.uri=https://github.com/18868944669/config-study.git
spring.cloud.config.server.git.searchPaths=respo
spring.cloud.config.label=master
spring.cloud.config.server.git.username=
spring.cloud.config.server.git.password=
\ No newline at end of file
server:
port: 8888
eureka:
instance:
hostname: localhost
client:
registerWithEureka: false #服务注册开关
fetchRegistry: false #服务发现开关
serviceUrl: #Eureka客户端与Eureka服务端进行交互的地址,多个中间用逗号分隔
defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/
\ No newline at end of file
eureka:
client:
serviceUrl:
defaultZone: http://localhost:8888/eureka/
server:
port: 8764
spring:
application:
name: service-order
\ No newline at end of file
eureka:
client:
serviceUrl:
defaultZone: http://localhost:8888/eureka/
server:
port: 8762
spring:
application:
name: service-member
\ No newline at end of file
eureka:
client:
serviceUrl:
defaultZone: http://localhost:8888/eureka/
server:
port: 8763
spring:
application:
name: service-member
\ No newline at end of file
feign:
hystrix:
enabled: true
###超时时间
hystrix:
command:
default:
execution:
isolation:
thread:
timeoutInMilliseconds: 4000
eureka:
client:
serviceUrl:
defaultZone: http://localhost:8888/eureka/
server:
port: 8765
tomcat:
max-threads: 50
spring:
application:
name: service-order-feign
eureka:
client:
serviceUrl:
defaultZone: http://localhost:8888/eureka/
server:
port: 8769
spring:
application:
name: service-zuul
zuul:
routes:
api-member: #路由名称,名称任意,保持所有路由名称唯一
path: /api-member/**
service-id: service-member #微服务名称,网关会从eureka中获取该服务名称下的服务实例的地址
#url: http://www.baidu.com #也可指定url,此url也可以是外网地址\
strip-prefix: true #true:代理转发时去掉前缀,false:代理转发时不去掉前缀
sensitiveHeaders: #默认zuul会屏蔽cookie,cookie不会传到下游服务,这里设置为空则取消默认的黑名单,如果设置了具体的头信息则不会传到下游服务
# ignoredHeaders: 默认为空表示不过虑任何头
api-order:
path: /api-order/**
service-id: service-order
strip-prefix: false #true:代理转发时去掉前缀,false:代理转发时不去掉前缀
sensitiveHeaders:
ribbon:
MaxAutoRetries: 2 #最大重试次数,当Eureka中可以找到服务,但是服务连不上时将会重试,如果eureka中找不到服务则直接走断路器
MaxAutoRetriesNextServer: 3 #切换实例的重试次数
OkToRetryOnAllOperations: false #对所有操作请求都进行重试,如果是get则可以,如果是post,put等操作没有实现幂等的情况下是很危险的,所以设置为false
ConnectTimeout: 5000 #请求连接的超时时间
ReadTimeout: 6000 #请求处理的超时时间
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment