huanghongfa
2020-12-21 aa873a484b525625444b73a93db103c8b07123c0
登录失败修改
1 文件已重命名
3个文件已修改
97 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml 81 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/application.yml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/eureka_server/pom.xml 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/eureka_server/src/main/resources/application.yml 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -23,24 +23,9 @@
  </component>
  <component name="ChangeListManager">
    <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" />
      <change beforePath="$PROJECT_DIR$/eureka_server/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/eureka_server/src/main/resources/application.yml" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -126,7 +111,7 @@
      </set>
    </option>
  </component>
  <component name="RunManager" selected="Application.CommonApi">
  <component name="RunManager" selected="Spring Boot.EurekaServerApplication">
    <configuration name="AES" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
      <option name="MAIN_CLASS_NAME" value="com.panzhihua.common.utlis.AES" />
      <module name="common" />
@@ -389,7 +374,7 @@
      <workItem from="1608371107059" duration="646000" />
      <workItem from="1608371917868" duration="79000" />
      <workItem from="1608379508016" duration="46000" />
      <workItem from="1608531425658" duration="1019000" />
      <workItem from="1608531425658" duration="3708000" />
    </task>
    <servers />
  </component>
@@ -433,58 +418,62 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="561" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1607675048319" />
    <state x="93" y="93" width="1350" height="638" key="DiffContextDialog" timestamp="1608535183408">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="93" y="93" width="1350" height="638" key="DiffContextDialog/0.0.1536.824@0.0.1536.824" timestamp="1608535183408" />
    <state x="549" y="167" key="FileChooserDialogImpl" timestamp="1606197830966">
      <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="1608531883739">
    <state width="1031" height="374" key="GridCell.Tab.0.bottom" timestamp="1608535846435">
      <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="1608531883739" />
    <state width="1031" height="424" key="GridCell.Tab.0.center" timestamp="1608531883739">
    <state width="1031" height="374" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608535846435" />
    <state width="1031" height="374" key="GridCell.Tab.0.center" timestamp="1608535846435">
      <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="1608531883739" />
    <state width="1031" height="424" key="GridCell.Tab.0.left" timestamp="1608531883739">
    <state width="1031" height="374" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1608535846435" />
    <state width="1031" height="374" key="GridCell.Tab.0.left" timestamp="1608535846435">
      <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="1608531883739" />
    <state width="1031" height="424" key="GridCell.Tab.0.right" timestamp="1608531883739">
    <state width="1031" height="374" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1608535846435" />
    <state width="1031" height="374" key="GridCell.Tab.0.right" timestamp="1608535846435">
      <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="1608531883739" />
    <state width="1031" height="424" key="GridCell.Tab.1.bottom" timestamp="1608531883739">
    <state width="1031" height="374" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1608535846435" />
    <state width="1031" height="374" key="GridCell.Tab.1.bottom" timestamp="1608535846436">
      <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="1608531883739" />
    <state width="1031" height="424" key="GridCell.Tab.1.center" timestamp="1608531883739">
    <state width="1031" height="374" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608535846436" />
    <state width="1031" height="374" key="GridCell.Tab.1.center" timestamp="1608535846435">
      <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="1608531883739" />
    <state width="1031" height="424" key="GridCell.Tab.1.left" timestamp="1608531883739">
    <state width="1031" height="374" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1608535846435" />
    <state width="1031" height="374" key="GridCell.Tab.1.left" timestamp="1608535846435">
      <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="1608531883739" />
    <state width="1031" height="424" key="GridCell.Tab.1.right" timestamp="1608531883739">
    <state width="1031" height="374" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1608535846435" />
    <state width="1031" height="374" key="GridCell.Tab.1.right" timestamp="1608535846435">
      <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="1608531883739" />
    <state width="1031" height="424" key="GridCell.Tab.2.bottom" timestamp="1608531883739">
    <state width="1031" height="374" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1608535846435" />
    <state width="1031" height="374" key="GridCell.Tab.2.bottom" timestamp="1608535846436">
      <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="1608531883739" />
    <state width="1031" height="424" key="GridCell.Tab.2.center" timestamp="1608531883739">
    <state width="1031" height="374" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608535846436" />
    <state width="1031" height="374" key="GridCell.Tab.2.center" timestamp="1608535846436">
      <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="1608531883739" />
    <state width="1031" height="424" key="GridCell.Tab.2.left" timestamp="1608531883739">
    <state width="1031" height="374" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1608535846436" />
    <state width="1031" height="374" key="GridCell.Tab.2.left" timestamp="1608535846436">
      <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="1608531883739" />
    <state width="1031" height="424" key="GridCell.Tab.2.right" timestamp="1608531883739">
    <state width="1031" height="374" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1608535846436" />
    <state width="1031" height="374" key="GridCell.Tab.2.right" timestamp="1608535846436">
      <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="1608531883739" />
    <state width="1031" height="374" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1608535846436" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1606714311663">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -497,14 +486,14 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="498" height="519" key="SwitcherDM/0.0.1536.824@0.0.1536.824" timestamp="1608278257976" />
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog" timestamp="1607655281449">
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog" timestamp="1608535536014">
      <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.DirectoryHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1607655281449" />
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1606974030135">
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1608535536014" />
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1608535536014">
      <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.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1606974030135" />
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1608535536014" />
    <state x="468" y="115" width="703" height="594" key="find.popup" timestamp="1608279950168">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/application.yml
@@ -13,3 +13,8 @@
    service-url:
      defaultZone: http://localhost:8192/eureka/
wx:
  miniapp:
    appid: wx0cef797390444b75
    secret: c7ea9aaa7e391a487e8a5b9ba61045d1
    msgDataFormat: JSON
springcloud_k8s_panzhihuazhihuishequ/eureka_server/pom.xml
@@ -25,12 +25,6 @@
            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-config-client</artifactId>
        </dependency>
    </dependencies>
@@ -50,6 +44,7 @@
                <version>1.2.0</version>
                <configuration>
                    <imageName>eureka-server:v1</imageName>
                    <serverId></serverId>
                    <baseImage>java</baseImage>
                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
                    <resources>
springcloud_k8s_panzhihuazhihuishequ/eureka_server/src/main/resources/application.yml
File was renamed from springcloud_k8s_panzhihuazhihuishequ/eureka_server/src/main/resources/bootstrap.yml
@@ -13,6 +13,4 @@
    server:
        enable-self-preservation: false  #是否开启自我保护模式
        eviction‐interval‐timer‐in‐ms: 10000 #服务注册表清理间隔(单位毫秒,默认是60*1000)
spring:
    application:
        name: eureka