From b3c6911c1e78563dc04998dd7bfb510130a9fcec Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期一, 01 二月 2021 16:37:52 +0800
Subject: [PATCH] auth
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml | 4 +-
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml | 4 +-
/dev/null | 43 ---------------------
springcloud_k8s_panzhihuazhihuishequ/.idea/encodings.xml | 2
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/resources/bootstrap.yml | 4 +-
springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml | 16 ++++++-
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml | 4 +-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml | 4 +-
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml | 4 +-
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml | 4 +-
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/application.yml | 4 +-
11 files changed, 30 insertions(+), 63 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/.idea/encodings.xml b/springcloud_k8s_panzhihuazhihuishequ/.idea/encodings.xml
index 499c58b..505ac2a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/.idea/encodings.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/.idea/encodings.xml
@@ -7,7 +7,7 @@
<file url="file://$PROJECT_DIR$/applets_backstage/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/auth/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/auth/src/main/resources" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/auth/src/main/resources/application.yml" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/common/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/community_backstage/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/community_backstage/src/main/resources" charset="UTF-8" />
diff --git a/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml b/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
index bc5b7b3..270c2ac 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -24,6 +24,16 @@
<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$/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$/deploy-file/config-server.yaml.back" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/deploy-file/service-zuul.yaml.back" beforeDir="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" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -411,7 +421,7 @@
<workItem from="1611834131869" duration="1431000" />
<workItem from="1611883117467" duration="13328000" />
<workItem from="1611913457874" duration="966000" />
- <workItem from="1612141547518" duration="11275000" />
+ <workItem from="1612141547518" duration="14939000" />
</task>
<servers />
</component>
@@ -547,10 +557,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="1612146786653">
+ <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1612167765428">
<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="1612146786653" />
+ <state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1612167765428" />
<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 4705443..a3fa8de 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@
discovery:
enabled: true
service-id: config # 注册中心的服务名
- profile: test # 指定配置文件的环境
+ profile: prod # 指定配置文件的环境
profiles:
- active: test
+ active: prod
servlet:
multipart:
max-file-size: 10MB
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 a14d0bb..b9331a6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@
discovery:
enabled: true
service-id: config # 注册中心的服务名
- profile: test # 指定配置文件的环境
+ profile: prod # 指定配置文件的环境
profiles:
- active: test
+ active: prod
servlet:
multipart:
max-file-size: 10MB
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/application.yml
similarity index 79%
rename from springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml
rename to springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/application.yml
index ce004a0..0b5de9d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/application.yml
@@ -6,9 +6,9 @@
discovery:
enabled: true
service-id: config # 注册中心的服务名
- profile: test # 指定配置文件的环境
+ profile: prod # 指定配置文件的环境
profiles:
- active: test
+ active: prod
eureka:
client:
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 f157906..bd61953 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@
discovery:
enabled: true
service-id: config # 注册中心的服务名
- profile: test # 指定配置文件的环境
+ profile: prod # 指定配置文件的环境
profiles:
- active: test
+ active: prod
servlet:
multipart:
max-file-size: 10MB
diff --git a/springcloud_k8s_panzhihuazhihuishequ/deploy-file/config-server.yaml.back b/springcloud_k8s_panzhihuazhihuishequ/deploy-file/config-server.yaml.back
deleted file mode 100644
index 567408a..0000000
--- a/springcloud_k8s_panzhihuazhihuishequ/deploy-file/config-server.yaml.back
+++ /dev/null
@@ -1,40 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: config-server
-spec:
- selector:
- matchLabels:
- app: springcloud-config-server
-
- replicas: 1
-
- template:
- metadata:
- labels:
- app: springcloud-config-server
- spec:
- containers:
- - name: config-server-instance
- image: registry.cn-hangzhou.aliyuncs.com/wooddeep/config-server:v0.3
- env:
- - name: EUREKA_URL
- value: eureka-server
- ports:
- - containerPort: 8765
-
-
----
-kind: Service
-apiVersion: v1
-metadata:
- name: config-server
-spec:
- selector:
- app: springcloud-config-server
- ports:
- - protocol: TCP
- port: 8765
- targetPort: 8765
- #type: NodePort
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-zuul.yaml.back b/springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-zuul.yaml.back
deleted file mode 100644
index b27f78c..0000000
--- a/springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-zuul.yaml.back
+++ /dev/null
@@ -1,43 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: service-zuul
-spec:
- selector:
- matchLabels:
- app: springcloud-service-zuul
-
- replicas: 1
-
- template:
- metadata:
- labels:
- app: springcloud-service-zuul
- spec:
- containers:
- - name: service-zuul-instance
- image: registry.cn-hangzhou.aliyuncs.com/magiclian/service-zuul:v3
- env:
- - name: EUREKA_URL
- value: eureka-server
- ports:
- - containerPort: 8762
-
-
----
-kind: Service
-apiVersion: v1
-metadata:
- name: service-zuul
-spec:
- selector:
- app: springcloud-service-zuul
- ports:
- - protocol: TCP
- port: 8762
- targetPort: 8762
- type: NodePort
-
-
-
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 2b74a79..edee079 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@
discovery:
enabled: true
service-id: config # 注册中心的服务名
- profile: test # 指定配置文件的环境
+ profile: prod # 指定配置文件的环境
profiles:
- active: test
+ active: prod
servlet:
multipart:
max-file-size: 10MB
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 56a3d3b..1d3a478 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@
discovery:
enabled: true
service-id: config # 注册中心的服务名
- profile: test # 指定配置文件的环境
+ profile: prod # 指定配置文件的环境
profiles:
- active: test
+ active: prod
eureka:
client:
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 6b25c33..9bef8a7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@
discovery:
enabled: true
service-id: config # 注册中心的服务名
- profile: test # 指定配置文件的环境
+ profile: prod # 指定配置文件的环境
profiles:
- active: test
+ active: prod
eureka:
client:
diff --git a/springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/resources/bootstrap.yml
index 46a0f90..c351323 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@
discovery:
enabled: true
service-id: config # 注册中心的服务名
- profile: test # 指定配置文件的环境
+ profile: prod # 指定配置文件的环境
profiles:
- active: test
+ active: prod
eureka:
client:
--
Gitblit v1.7.1