huanghongfa
2020-12-21 714997ea36224ee7bd36d413ae9922cd468d9c87
配置文件修改为configserver
1 文件已重命名
6个文件已修改
8个文件已删除
7个文件已添加
766 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/.idea/encodings.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/.idea/modules.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml 85 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/application.yml 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/application.yml 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/application.yml 136 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/application.yml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/config_server/pom.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/application.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/eureka_server/pom.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/eureka_server/src/main/resources/bootstrap.yml 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/application.yml 91 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/application.yml 90 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/application.yml 115 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/application.yml 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/bootstrap.yml 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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/application.yml" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/auth/src/main/resources/bootstrap.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" />
springcloud_k8s_panzhihuazhihuishequ/.idea/modules.xml
File was deleted
springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -22,7 +22,26 @@
    <select />
  </component>
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="" />
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <change afterPath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/eureka_server/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" />
      <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/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/resources/application.yml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/auth/src/main/resources/application.yml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/config_server/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/config_server/pom.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/config_server/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/config_server/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/eureka_server/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/eureka_server/pom.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/eureka_server/src/main/resources/application.yml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/zuul/src/main/resources/application.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" />
    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -40,7 +59,7 @@
    </option>
  </component>
  <component name="Git.Settings">
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
  </component>
  <component name="JRebelWorkspace">
    <option name="jrebelEnabledAutocompile" value="true" />
@@ -169,6 +188,19 @@
          <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>
@@ -357,6 +389,7 @@
      <workItem from="1608371107059" duration="646000" />
      <workItem from="1608371917868" duration="79000" />
      <workItem from="1608379508016" duration="46000" />
      <workItem from="1608531425658" duration="1019000" />
    </task>
    <servers />
  </component>
@@ -404,54 +437,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="1606197830966" />
    <state width="1031" height="424" key="GridCell.Tab.0.bottom" timestamp="1608524037990">
    <state width="1031" height="424" key="GridCell.Tab.0.bottom" timestamp="1608531883739">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="424" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608524037990" />
    <state width="1031" height="424" key="GridCell.Tab.0.center" timestamp="1608524037990">
    <state width="1031" height="424" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608531883739" />
    <state width="1031" height="424" key="GridCell.Tab.0.center" timestamp="1608531883739">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="424" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1608524037990" />
    <state width="1031" height="424" key="GridCell.Tab.0.left" timestamp="1608524037990">
    <state width="1031" height="424" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1608531883739" />
    <state width="1031" height="424" key="GridCell.Tab.0.left" timestamp="1608531883739">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="424" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1608524037990" />
    <state width="1031" height="424" key="GridCell.Tab.0.right" timestamp="1608524037990">
    <state width="1031" height="424" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1608531883739" />
    <state width="1031" height="424" key="GridCell.Tab.0.right" timestamp="1608531883739">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="424" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1608524037990" />
    <state width="1031" height="424" key="GridCell.Tab.1.bottom" timestamp="1608524037997">
    <state width="1031" height="424" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1608531883739" />
    <state width="1031" height="424" key="GridCell.Tab.1.bottom" timestamp="1608531883739">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="424" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608524037997" />
    <state width="1031" height="424" key="GridCell.Tab.1.center" timestamp="1608524037997">
    <state width="1031" height="424" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608531883739" />
    <state width="1031" height="424" key="GridCell.Tab.1.center" timestamp="1608531883739">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="424" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1608524037997" />
    <state width="1031" height="424" key="GridCell.Tab.1.left" timestamp="1608524037997">
    <state width="1031" height="424" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1608531883739" />
    <state width="1031" height="424" key="GridCell.Tab.1.left" timestamp="1608531883739">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="424" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1608524037997" />
    <state width="1031" height="424" key="GridCell.Tab.1.right" timestamp="1608524037997">
    <state width="1031" height="424" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1608531883739" />
    <state width="1031" height="424" key="GridCell.Tab.1.right" timestamp="1608531883739">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="424" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1608524037997" />
    <state width="1031" height="424" key="GridCell.Tab.2.bottom" timestamp="1608524037997">
    <state width="1031" height="424" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1608531883739" />
    <state width="1031" height="424" key="GridCell.Tab.2.bottom" timestamp="1608531883739">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="424" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608524037997" />
    <state width="1031" height="424" key="GridCell.Tab.2.center" timestamp="1608524037997">
    <state width="1031" height="424" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608531883739" />
    <state width="1031" height="424" key="GridCell.Tab.2.center" timestamp="1608531883739">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="424" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1608524037997" />
    <state width="1031" height="424" key="GridCell.Tab.2.left" timestamp="1608524037997">
    <state width="1031" height="424" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1608531883739" />
    <state width="1031" height="424" key="GridCell.Tab.2.left" timestamp="1608531883739">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="424" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1608524037997" />
    <state width="1031" height="424" key="GridCell.Tab.2.right" timestamp="1608524037997">
    <state width="1031" height="424" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1608531883739" />
    <state width="1031" height="424" key="GridCell.Tab.2.right" timestamp="1608531883739">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="424" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1608524037997" />
    <state width="1031" height="424" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1608531883739" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1606714311663">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/application.yml
@@ -1,23 +1,15 @@
server:
  port: 8195
  servlet:
    encoding:
      force-response: true #中文乱码
spring:
  application:
    name: applets
  cloud:
    config:
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: dev  # 指定配置文件的环境
eureka:
  client:
    service-url:
      defaultZone: http://localhost:8192/eureka/
feign:
  hystrix:
    enabled: true
wx:
  miniapp:
    appid: wx93b8361ed926f3fd
    secret: f346f32dab20729973451d2fd2a03d15
    msgDataFormat: JSON
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/application.yml
File was deleted
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml
New file
@@ -0,0 +1,17 @@
spring:
  application:
    name: appletsbackstage
  cloud:
    config:
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: dev  # 指定配置文件的环境
eureka:
  client:
    service-url:
      defaultZone: http://localhost:8192/eureka/
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/application.yml
File was deleted
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml
New file
@@ -0,0 +1,17 @@
spring:
  application:
    name: auth
  cloud:
    config:
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: dev  # 指定配置文件的环境
eureka:
  client:
    service-url:
      defaultZone: http://localhost:8192/eureka/
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/application.yml
File was deleted
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml
New file
@@ -0,0 +1,15 @@
spring:
  application:
    name: communitybackstage
  cloud:
    config:
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: dev  # 指定配置文件的环境
eureka:
  client:
    service-url:
      defaultZone: http://localhost:8192/eureka/
springcloud_k8s_panzhihuazhihuishequ/config_server/pom.xml
@@ -25,10 +25,10 @@
            <artifactId>spring-cloud-config-server</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-bus-amqp</artifactId>
        </dependency>
<!--        <dependency>-->
<!--            <groupId>org.springframework.cloud</groupId>-->
<!--            <artifactId>spring-cloud-starter-bus-amqp</artifactId>-->
<!--        </dependency>-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/application.yml
@@ -17,8 +17,8 @@
    config:
      server:
        git:
          uri: http://gitlab.nhys.cdnhxx.com/root/zhihuishequ.git
          uri: http://gitlab.nhys.cdnhxx.com/huanghongfa/config-repo.git
#          search-paths: adminConfig
          username: huanghongfa
          password: huanghongfa123456
          basedir: F:\nahan\panzhihua_zhihuishequ\zhihuishequ
          basedir: F:\nahan\config-repo\config-repo
springcloud_k8s_panzhihuazhihuishequ/eureka_server/pom.xml
@@ -25,6 +25,12 @@
            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-config-client</artifactId>
        </dependency>
    </dependencies>
springcloud_k8s_panzhihuazhihuishequ/eureka_server/src/main/resources/bootstrap.yml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/application.yml
File was deleted
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml
New file
@@ -0,0 +1,15 @@
spring:
  application:
    name: community
  cloud:
    config:
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: dev  # 指定配置文件的环境
eureka:
  client:
    service-url:
      defaultZone: http://localhost:8192/eureka/
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/application.yml
File was deleted
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml
New file
@@ -0,0 +1,15 @@
spring:
  application:
    name: partybuilding
  cloud:
    config:
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: dev  # 指定配置文件的环境
eureka:
  client:
    service-url:
      defaultZone: http://localhost:8192/eureka/
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/application.yml
File was deleted
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml
New file
@@ -0,0 +1,15 @@
spring:
  application:
    name: user
  cloud:
    config:
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: dev  # 指定配置文件的环境
eureka:
  client:
    service-url:
      defaultZone: http://localhost:8192/eureka/
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/application.yml
File was deleted
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/bootstrap.yml
New file
@@ -0,0 +1,15 @@
spring:
  application:
    name: zuul
  cloud:
    config:
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: dev  # 指定配置文件的环境
eureka:
  client:
    service-url:
      defaultZone: http://localhost:8192/eureka/