bug

huanghongfa

2021-01-20 fb4f898f9dbb2b5743a061912c310985d42197f4

bug

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -23,15 +23,7 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <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$/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" />
      <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$/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -411,7 +403,7 @@
      <workItem from="1610934956567" duration="1325000" />
      <workItem from="1610939265133" duration="8588000" />
      <workItem from="1610956684718" duration="7037000" />
      <workItem from="1611019208339" duration="38287000" />
      <workItem from="1611019208339" duration="38905000" />
    </task>
    <servers />
  </component>
@@ -463,54 +455,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="1610606590056" />
    <state width="1031" height="448" key="GridCell.Tab.0.bottom" timestamp="1611126391754">
    <state width="1031" height="448" key="GridCell.Tab.0.bottom" timestamp="1611126654129">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="448" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611126391754" />
    <state width="1031" height="448" key="GridCell.Tab.0.center" timestamp="1611126391754">
    <state width="1031" height="448" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611126654129" />
    <state width="1031" height="448" key="GridCell.Tab.0.center" timestamp="1611126654128">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="448" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611126391754" />
    <state width="1031" height="448" key="GridCell.Tab.0.left" timestamp="1611126391754">
    <state width="1031" height="448" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611126654128" />
    <state width="1031" height="448" key="GridCell.Tab.0.left" timestamp="1611126654128">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="448" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611126391754" />
    <state width="1031" height="448" key="GridCell.Tab.0.right" timestamp="1611126391754">
    <state width="1031" height="448" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611126654128" />
    <state width="1031" height="448" key="GridCell.Tab.0.right" timestamp="1611126654129">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="448" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611126391754" />
    <state width="1031" height="448" key="GridCell.Tab.1.bottom" timestamp="1611126391754">
    <state width="1031" height="448" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611126654129" />
    <state width="1031" height="448" key="GridCell.Tab.1.bottom" timestamp="1611126654129">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="448" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611126391754" />
    <state width="1031" height="448" key="GridCell.Tab.1.center" timestamp="1611126391754">
    <state width="1031" height="448" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611126654129" />
    <state width="1031" height="448" key="GridCell.Tab.1.center" timestamp="1611126654129">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="448" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611126391754" />
    <state width="1031" height="448" key="GridCell.Tab.1.left" timestamp="1611126391754">
    <state width="1031" height="448" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611126654129" />
    <state width="1031" height="448" key="GridCell.Tab.1.left" timestamp="1611126654129">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="448" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611126391754" />
    <state width="1031" height="448" key="GridCell.Tab.1.right" timestamp="1611126391754">
    <state width="1031" height="448" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611126654129" />
    <state width="1031" height="448" key="GridCell.Tab.1.right" timestamp="1611126654129">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="448" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611126391754" />
    <state width="1031" height="448" key="GridCell.Tab.2.bottom" timestamp="1611126391755">
    <state width="1031" height="448" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611126654129" />
    <state width="1031" height="448" key="GridCell.Tab.2.bottom" timestamp="1611126654129">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="448" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611126391755" />
    <state width="1031" height="448" key="GridCell.Tab.2.center" timestamp="1611126391755">
    <state width="1031" height="448" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611126654129" />
    <state width="1031" height="448" key="GridCell.Tab.2.center" timestamp="1611126654129">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="448" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611126391755" />
    <state width="1031" height="448" key="GridCell.Tab.2.left" timestamp="1611126391754">
    <state width="1031" height="448" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611126654129" />
    <state width="1031" height="448" key="GridCell.Tab.2.left" timestamp="1611126654129">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="448" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611126391754" />
    <state width="1031" height="448" key="GridCell.Tab.2.right" timestamp="1611126391755">
    <state width="1031" height="448" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611126654129" />
    <state width="1031" height="448" key="GridCell.Tab.2.right" timestamp="1611126654129">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="448" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611126391755" />
    <state width="1031" height="448" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611126654129" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -531,10 +523,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="93" y="93" width="1350" height="639" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1611044794794" />
    <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611126383412">
    <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611126674458">
      <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="1611126383412" />
    <state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611126674458" />
    <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -551,10 +543,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="425" y="187" key="run.anything.popup/0.0.1536.824@0.0.1536.824" timestamp="1608280452280" />
    <state x="431" y="145" width="672" height="678" key="search.everywhere.popup" timestamp="1610961524558">
    <state x="431" y="145" width="672" height="678" key="search.everywhere.popup" timestamp="1611126449254">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1610961524558" />
    <state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1611126449254" />
  </component>
  <component name="XDebuggerManager">
    <pin-to-top-manager>

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java

@@ -66,7 +66,7 @@
        comActActivityVO.setCommunityId(communityId);
        comActActivityVO.setIsApplets(1);
        Integer status = comActActivityVO.getStatus();
        if (status.intValue()==4) {
        if (null!=status&&status.intValue()==4) {
            comActActivityVO.setIsIng(1);
        }
        return communityService.pageActivity(comActActivityVO);