huanghongfa
2021-02-02 4a1f1fbf853790e0e9201d05dd1894234252acb4
Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ
10个文件已修改
32 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/deploy-file/applets-backstage.yaml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/deploy-file/applets.yaml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/deploy-file/community-backstage.yaml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-auth.yaml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-community.yaml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-partybuilding.yaml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-user.yaml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-zuul.yaml 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/bootstrap.yml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -24,6 +24,14 @@
  <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/applets-backstage.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/deploy-file/applets-backstage.yaml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/deploy-file/applets.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/deploy-file/applets.yaml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/deploy-file/community-backstage.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/deploy-file/community-backstage.yaml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/deploy-file/service-auth.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/deploy-file/service-auth.yaml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/deploy-file/service-community.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/deploy-file/service-community.yaml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/deploy-file/service-partybuilding.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/deploy-file/service-partybuilding.yaml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/deploy-file/service-user.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/deploy-file/service-user.yaml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/deploy-file/service-zuul.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/deploy-file/service-zuul.yaml" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -411,7 +419,7 @@
      <workItem from="1611834131869" duration="1431000" />
      <workItem from="1611883117467" duration="13328000" />
      <workItem from="1611913457874" duration="966000" />
      <workItem from="1612141547518" duration="28004000" />
      <workItem from="1612141547518" duration="29400000" />
    </task>
    <servers />
  </component>
springcloud_k8s_panzhihuazhihuishequ/deploy-file/applets-backstage.yaml
@@ -8,7 +8,7 @@
    matchLabels:
      app: springcloud-applets-backstage
  replicas: 3
  replicas: 2
  template:
    metadata:
springcloud_k8s_panzhihuazhihuishequ/deploy-file/applets.yaml
@@ -8,7 +8,7 @@
    matchLabels:
      app: springcloud-applets
  replicas: 3
  replicas: 2
  template:
    metadata:
springcloud_k8s_panzhihuazhihuishequ/deploy-file/community-backstage.yaml
@@ -8,7 +8,7 @@
    matchLabels:
      app: springcloud-community-backstage
  replicas: 3
  replicas: 2
  template:
    metadata:
springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-auth.yaml
@@ -8,7 +8,7 @@
    matchLabels:
      app: springcloud-service-auth
  replicas: 3
  replicas: 2
  template:
    metadata:
springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-community.yaml
@@ -8,7 +8,7 @@
    matchLabels:
      app: springcloud-service-community
  replicas: 3
  replicas: 2
  template:
    metadata:
springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-partybuilding.yaml
@@ -8,7 +8,7 @@
    matchLabels:
      app: springcloud-service-partybuilding
  replicas: 3
  replicas: 2
  template:
    metadata:
springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-user.yaml
@@ -8,7 +8,7 @@
    matchLabels:
      app: springcloud-service-user
  replicas: 3
  replicas: 2
  template:
    metadata:
springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-zuul.yaml
@@ -8,7 +8,7 @@
    matchLabels:
      app: springcloud-service-zuul
  replicas: 3
  replicas: 2
  template:
    metadata:
@@ -19,6 +19,11 @@
       - name: service-zuul-instance
         image: registry.cn-chengdu.aliyuncs.com/panzhihua/service-zuul:v1
         imagePullPolicy: Always
         env:
           - name: EUREKA_URL
             value: eureka-server
           - name: CONFIG_URL
             value: config-server
         ports:
         - containerPort: 8194
      imagePullSecrets:
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/bootstrap.yml
@@ -15,6 +15,7 @@
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: prod  # 指定配置文件的环境
      uri: http://${CONFIG_URL:localhost}:8193/
  profiles:
    active: prod
  servlet: