huanghongfa
2021-01-12 6ec2f685a9f0eb58e846058afe1e60ee8dbd2cc6
登录bug修复
2个文件已修改
124 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml 120 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -23,58 +23,8 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/constants/HttpConstant.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/utlis/HttpClientFactory.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/utlis/HttpClientUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/utlis/RealNameUtil.java" afterDir="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/java/com/panzhihua/applets/api/CommonApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java" 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$/common/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/pom.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/utlis/HttpUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/utlis/HttpUtils.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ActivitySignVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ActivitySignVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActDynVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActDynVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/community/CommunityService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/community/CommunityService.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/partybuilding/PartyBuildingService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/partybuilding/PartyBuildingService.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/utlis/HttpUtils$TrustAnyHostnameVerifier.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/utlis/HttpUtils$TrustAnyHostnameVerifier.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/utlis/HttpUtils$TrustAnyTrustManager.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/utlis/HttpUtils$TrustAnyTrustManager.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/utlis/HttpUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/utlis/HttpUtils.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/TestApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/TestApi.java" 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/java/com/panzhihua/service_community/api/CommunityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynUserDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynUserDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDynDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDynDO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActDynService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActDynService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java" 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/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbActivityMemberDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbActivityMemberDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComBpActivityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComBpActivityService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java" 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/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" 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$/zuul/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/zuul/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -126,7 +76,7 @@
    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
    <property name="WebServerToolWindowFactoryState" value="false" />
    <property name="aspect.path.notification.shown" value="true" />
    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../pinganxiaoqu/project_branch" />
    <property name="last_opened_file_path" value="$PROJECT_DIR$/../xxl-job-admin/pom.xml" />
    <property name="project.structure.last.edited" value="Modules" />
    <property name="project.structure.proportion" value="0.15" />
    <property name="project.structure.side.proportion" value="0.2850575" />
@@ -227,15 +177,13 @@
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true">
    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
      <option name="arquillianRunConfiguration">
        <value>
          <option name="containerStateName" value="" />
        </value>
      </option>
      <option name="TEST_OBJECT" value="CLASS" />
      <properties />
      <listeners />
      <option name="TEST_OBJECT" value="class" />
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
@@ -439,7 +387,9 @@
      <workItem from="1610082881298" duration="30000" />
      <workItem from="1610083716561" duration="4831000" />
      <workItem from="1610088905473" duration="10469000" />
      <workItem from="1610326930387" duration="968000" />
      <workItem from="1610326930387" duration="5497000" />
      <workItem from="1610368400707" duration="771000" />
      <workItem from="1610415637750" duration="447000" />
    </task>
    <servers />
  </component>
@@ -487,58 +437,58 @@
      <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="1609316182000" />
    <state x="549" y="167" key="FileChooserDialogImpl" timestamp="1609823156997">
    <state x="549" y="167" key="FileChooserDialogImpl" timestamp="1610368574903">
      <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="1609823156997" />
    <state width="1031" height="528" key="GridCell.Tab.0.bottom" timestamp="1610347022957">
    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1610368574903" />
    <state width="1031" height="528" key="GridCell.Tab.0.bottom" timestamp="1610351113864">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="528" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610347022957" />
    <state width="1031" height="528" key="GridCell.Tab.0.center" timestamp="1610347022956">
    <state width="1031" height="528" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610351113864" />
    <state width="1031" height="528" key="GridCell.Tab.0.center" timestamp="1610351113864">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="528" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1610347022956" />
    <state width="1031" height="528" key="GridCell.Tab.0.left" timestamp="1610347022956">
    <state width="1031" height="528" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1610351113864" />
    <state width="1031" height="528" key="GridCell.Tab.0.left" timestamp="1610351113864">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="528" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1610347022956" />
    <state width="1031" height="528" key="GridCell.Tab.0.right" timestamp="1610347022956">
    <state width="1031" height="528" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1610351113864" />
    <state width="1031" height="528" key="GridCell.Tab.0.right" timestamp="1610351113864">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="528" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1610347022956" />
    <state width="1031" height="528" key="GridCell.Tab.1.bottom" timestamp="1610347022957">
    <state width="1031" height="528" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1610351113864" />
    <state width="1031" height="528" key="GridCell.Tab.1.bottom" timestamp="1610351113865">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="528" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610347022957" />
    <state width="1031" height="528" key="GridCell.Tab.1.center" timestamp="1610347022957">
    <state width="1031" height="528" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610351113865" />
    <state width="1031" height="528" key="GridCell.Tab.1.center" timestamp="1610351113865">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="528" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1610347022957" />
    <state width="1031" height="528" key="GridCell.Tab.1.left" timestamp="1610347022957">
    <state width="1031" height="528" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1610351113865" />
    <state width="1031" height="528" key="GridCell.Tab.1.left" timestamp="1610351113865">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="528" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1610347022957" />
    <state width="1031" height="528" key="GridCell.Tab.1.right" timestamp="1610347022957">
    <state width="1031" height="528" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1610351113865" />
    <state width="1031" height="528" key="GridCell.Tab.1.right" timestamp="1610351113865">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="528" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1610347022957" />
    <state width="1031" height="528" key="GridCell.Tab.2.bottom" timestamp="1610347022957">
    <state width="1031" height="528" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1610351113865" />
    <state width="1031" height="528" key="GridCell.Tab.2.bottom" timestamp="1610351113865">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="528" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610347022957" />
    <state width="1031" height="528" key="GridCell.Tab.2.center" timestamp="1610347022957">
    <state width="1031" height="528" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610351113865" />
    <state width="1031" height="528" key="GridCell.Tab.2.center" timestamp="1610351113865">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="528" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1610347022957" />
    <state width="1031" height="528" key="GridCell.Tab.2.left" timestamp="1610347022957">
    <state width="1031" height="528" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1610351113865" />
    <state width="1031" height="528" key="GridCell.Tab.2.left" timestamp="1610351113865">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="528" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1610347022957" />
    <state width="1031" height="528" key="GridCell.Tab.2.right" timestamp="1610347022957">
    <state width="1031" height="528" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1610351113865" />
    <state width="1031" height="528" key="GridCell.Tab.2.right" timestamp="1610351113865">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="528" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1610347022957" />
    <state width="1031" height="528" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1610351113865" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610072873414">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -559,10 +509,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.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1609226181026" />
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610099376511">
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610415696026">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610099376511" />
    <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610415696026" />
    <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -71,9 +71,9 @@
     */
    @PostMapping("/getUserInfo")
    public R<LoginUserInfoVO> getUserInfo(@RequestParam("userName") String userName){
        int index = userName.indexOf("_");
        int index = userName.lastIndexOf("_");
        String type = userName.substring(index+1, userName.length());
        String name = userName.substring(0, userName.indexOf("_"));
        String name = userName.substring(0, index);
        return userService.getUserInfo(name,Integer.parseInt(type));
    }