From c30b0597c3ea882dca80df67bae9e30b21b35158 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期一, 01 二月 2021 10:34:01 +0800
Subject: [PATCH] bug
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml | 2
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml | 2
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/bootstrap.yml | 2
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/resources/bootstrap.yml | 2
springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml | 80 +++++++++++++++++++---------------------
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml | 2
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml | 2
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml | 2
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml | 2
10 files changed, 47 insertions(+), 51 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml b/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
index a89f4b0..8ec0d96 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -24,8 +24,15 @@
<component name="ChangeListManager">
<list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/deploy-file/config-server.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/deploy-file/config-server.yaml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/deploy-file/eurekaserver.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/deploy-file/eurekaserver.yaml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/applets/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/resources/bootstrap.yml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/timejob/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/timejob/src/main/resources/bootstrap.yml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/zuul/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/zuul/src/main/resources/bootstrap.yml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -174,19 +181,6 @@
<option name="ENABLED" value="true" />
</pattern>
</extension>
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true">
- <option name="arquillianRunConfiguration">
- <value>
- <option name="containerStateName" value="" />
- </value>
- </option>
- <option name="TEST_OBJECT" value="CLASS" />
- <properties />
- <listeners />
<method v="2">
<option name="Make" enabled="true" />
</method>
@@ -412,7 +406,9 @@
<workItem from="1611536010905" duration="21843000" />
<workItem from="1611622682269" duration="58745000" />
<workItem from="1611834131869" duration="1431000" />
- <workItem from="1611883117467" duration="9949000" />
+ <workItem from="1611883117467" duration="13328000" />
+ <workItem from="1611913457874" duration="966000" />
+ <workItem from="1612141547518" duration="1241000" />
</task>
<servers />
</component>
@@ -472,54 +468,54 @@
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1610606590056" />
- <state width="1031" height="366" key="GridCell.Tab.0.bottom" timestamp="1611900737975">
+ <state width="1031" height="366" key="GridCell.Tab.0.bottom" timestamp="1611914445243">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="366" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611900737975" />
- <state width="1031" height="366" key="GridCell.Tab.0.center" timestamp="1611900737975">
+ <state width="1031" height="366" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611914445243" />
+ <state width="1031" height="366" key="GridCell.Tab.0.center" timestamp="1611914445243">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="366" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611900737975" />
- <state width="1031" height="366" key="GridCell.Tab.0.left" timestamp="1611900737975">
+ <state width="1031" height="366" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611914445243" />
+ <state width="1031" height="366" key="GridCell.Tab.0.left" timestamp="1611914445243">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="366" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611900737975" />
- <state width="1031" height="366" key="GridCell.Tab.0.right" timestamp="1611900737975">
+ <state width="1031" height="366" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611914445243" />
+ <state width="1031" height="366" key="GridCell.Tab.0.right" timestamp="1611914445243">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="366" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611900737975" />
- <state width="1031" height="366" key="GridCell.Tab.1.bottom" timestamp="1611900737976">
+ <state width="1031" height="366" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611914445243" />
+ <state width="1031" height="366" key="GridCell.Tab.1.bottom" timestamp="1611914445244">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="366" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611900737976" />
- <state width="1031" height="366" key="GridCell.Tab.1.center" timestamp="1611900737976">
+ <state width="1031" height="366" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611914445244" />
+ <state width="1031" height="366" key="GridCell.Tab.1.center" timestamp="1611914445244">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="366" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611900737976" />
- <state width="1031" height="366" key="GridCell.Tab.1.left" timestamp="1611900737975">
+ <state width="1031" height="366" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611914445244" />
+ <state width="1031" height="366" key="GridCell.Tab.1.left" timestamp="1611914445243">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="366" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611900737975" />
- <state width="1031" height="366" key="GridCell.Tab.1.right" timestamp="1611900737976">
+ <state width="1031" height="366" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611914445243" />
+ <state width="1031" height="366" key="GridCell.Tab.1.right" timestamp="1611914445244">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="366" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611900737976" />
- <state width="1031" height="366" key="GridCell.Tab.2.bottom" timestamp="1611900737976">
+ <state width="1031" height="366" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611914445244" />
+ <state width="1031" height="366" key="GridCell.Tab.2.bottom" timestamp="1611914445244">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="366" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611900737976" />
- <state width="1031" height="366" key="GridCell.Tab.2.center" timestamp="1611900737976">
+ <state width="1031" height="366" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611914445244" />
+ <state width="1031" height="366" key="GridCell.Tab.2.center" timestamp="1611914445244">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="366" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611900737976" />
- <state width="1031" height="366" key="GridCell.Tab.2.left" timestamp="1611900737976">
+ <state width="1031" height="366" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611914445244" />
+ <state width="1031" height="366" key="GridCell.Tab.2.left" timestamp="1611914445244">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="366" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611900737976" />
- <state width="1031" height="366" key="GridCell.Tab.2.right" timestamp="1611900737976">
+ <state width="1031" height="366" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611914445244" />
+ <state width="1031" height="366" key="GridCell.Tab.2.right" timestamp="1611914445244">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state width="1031" height="366" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611900737976" />
+ <state width="1031" height="366" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611914445244" />
<state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
<screen x="0" y="0" width="1536" height="824" />
</state>
@@ -548,10 +544,10 @@
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.SelectionHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1611623127978" />
- <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611888603087">
+ <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611914043130">
<screen x="0" y="0" width="1536" height="824" />
</state>
- <state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611888603087" />
+ <state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611914043130" />
<state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
<screen x="0" y="0" width="1536" height="824" />
</state>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml
index 17c8290..4705443 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml
@@ -17,7 +17,7 @@
eureka:
client:
service-url:
- defaultZone: http://localhost:8192/eureka/
+ defaultZone: http://${EUREKA_URL:localhost}:8192/eureka
wx:
miniapp:
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml
index 6767936..a14d0bb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml
@@ -17,7 +17,7 @@
eureka:
client:
service-url:
- defaultZone: http://localhost:8192/eureka/
+ defaultZone: http://${EUREKA_URL:localhost}:8192/eureka
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml
index b4c2418..ce004a0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml
@@ -13,6 +13,6 @@
eureka:
client:
service-url:
- defaultZone: http://localhost:8192/eureka/
+ defaultZone: http://${EUREKA_URL:localhost}:8192/eureka
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml
index 6a94efc..f157906 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml
@@ -17,5 +17,5 @@
eureka:
client:
service-url:
- defaultZone: http://localhost:8192/eureka/
+ defaultZone: http://${EUREKA_URL:localhost}:8192/eureka
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml
index 6a4080e..2b74a79 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml
@@ -18,7 +18,7 @@
eureka:
client:
service-url:
- defaultZone: http://localhost:8192/eureka/
+ defaultZone: http://${EUREKA_URL:localhost}:8192/eureka
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml
index cca90b7..56a3d3b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml
@@ -13,5 +13,5 @@
eureka:
client:
service-url:
- defaultZone: http://localhost:8192/eureka/
+ defaultZone: http://${EUREKA_URL:localhost}:8192/eureka
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml
index 194cd85..6b25c33 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml
@@ -13,5 +13,5 @@
eureka:
client:
service-url:
- defaultZone: http://localhost:8192/eureka/
+ defaultZone: http://${EUREKA_URL:localhost}:8192/eureka
diff --git a/springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/resources/bootstrap.yml
index 8f5d085..46a0f90 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/resources/bootstrap.yml
@@ -13,7 +13,7 @@
eureka:
client:
service-url:
- defaultZone: http://localhost:8192/eureka/
+ defaultZone: http://${EUREKA_URL:localhost}:8192/eureka
diff --git a/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/bootstrap.yml
index 6f37050..a757ee4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/bootstrap.yml
@@ -18,5 +18,5 @@
eureka:
client:
service-url:
- defaultZone: http://localhost:8192/eureka/
+ defaultZone: http://${EUREKA_URL:localhost}:8192/eureka
--
Gitblit v1.7.1