Merge remote-tracking branch 'origin/master'

huanghongfa

2021-03-25 c135b191b96892744d6ac39f3230b9298735af84

Merge remote-tracking branch 'origin/master'

 .gitignore

New file
@@ -0,0 +1 @@
/springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/

 .idea/workspace.xml

@@ -22,9 +22,7 @@
    <select />
  </component>
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <change beforePath="$PROJECT_DIR$/springcloud_k8s_panzhihuazhihuishequ/.idea/springcloud_k8s_panzhihuazhihuishequ.iml" beforeDir="false" afterPath="$PROJECT_DIR$/springcloud_k8s_panzhihuazhihuishequ/.idea/springcloud_k8s_panzhihuazhihuishequ.iml" afterDir="false" />
    </list>
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="" />
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -72,10 +70,11 @@
    <property name="RequestMappingsPanelWidth0" value="75" />
    <property name="RequestMappingsPanelWidth1" value="75" />
    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
    <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$/pom.xml" />
    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
    <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" />
@@ -109,7 +108,7 @@
      </set>
    </option>
  </component>
  <component name="RunManager" selected="Application.CommonApi">
  <component name="RunManager" selected="Spring Boot.AppletsApplication">
    <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" />
@@ -246,11 +245,6 @@
      </method>
    </configuration>
    <list>
      <item itemvalue="Application.UserServiceImpl" />
      <item itemvalue="Application.SFTPUtil" />
      <item itemvalue="Application.AESUtils" />
      <item itemvalue="Application.AES" />
      <item itemvalue="Application.CommonApi" />
      <item itemvalue="Spring Boot.AppletsApplication" />
      <item itemvalue="Spring Boot.AppletsBackstageApplication" />
      <item itemvalue="Spring Boot.AuthApplication" />
@@ -261,16 +255,12 @@
      <item itemvalue="Spring Boot.ServiceUserApplication" />
      <item itemvalue="Spring Boot.ZuulApplication" />
      <item itemvalue="Spring Boot.ServiceCommunityApplication" />
      <item itemvalue="应用程序.AES" />
      <item itemvalue="应用程序.AESUtils" />
      <item itemvalue="应用程序.CommonApi" />
      <item itemvalue="应用程序.SFTPUtil" />
      <item itemvalue="应用程序.UserServiceImpl" />
    </list>
    <recent_temporary>
      <list>
        <item itemvalue="Application.CommonApi" />
        <item itemvalue="Application.AES" />
        <item itemvalue="Application.AESUtils" />
        <item itemvalue="Application.SFTPUtil" />
        <item itemvalue="Application.UserServiceImpl" />
      </list>
    </recent_temporary>
  </component>
  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
  <component name="TaskManager">
@@ -359,6 +349,7 @@
      <workItem from="1608371107059" duration="646000" />
      <workItem from="1608371917868" duration="79000" />
      <workItem from="1608379508016" duration="46000" />
      <workItem from="1616487193167" duration="62000" />
    </task>
    <servers />
  </component>
@@ -376,124 +367,6 @@
      </map>
    </option>
    <option name="oldMeFiltersMigrated" value="true" />
  </component>
  <component name="WindowStateProjectService">
    <state x="249" y="0" key="#Project_Structure" timestamp="1606984030035">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="249" y="0" key="#Project_Structure/0.0.1536.824@0.0.1536.824" timestamp="1606984030035" />
    <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1608270254259">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1608270254259" />
    <state x="405" y="335" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1606099594079">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="405" y="335" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog/0.0.1536.824@0.0.1536.824" timestamp="1606099594079" />
    <state x="0" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog" timestamp="1606969359946">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="0" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog/0.0.1536.824@0.0.1536.824" timestamp="1606969359946" />
    <state x="499" y="159" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1608103012443">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="499" y="159" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1536.824@0.0.1536.824" timestamp="1608103012443" />
    <state width="561" height="466" key="DebuggerActiveHint" timestamp="1607675048319">
      <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="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="504" key="GridCell.Tab.0.bottom" timestamp="1608371099523">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="504" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608371099523" />
    <state width="1031" height="504" key="GridCell.Tab.0.center" timestamp="1608371099523">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="504" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1608371099523" />
    <state width="1031" height="504" key="GridCell.Tab.0.left" timestamp="1608371099523">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="504" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1608371099523" />
    <state width="1031" height="504" key="GridCell.Tab.0.right" timestamp="1608371099523">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="504" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1608371099523" />
    <state width="1031" height="504" key="GridCell.Tab.1.bottom" timestamp="1608371099523">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="504" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608371099523" />
    <state width="1031" height="504" key="GridCell.Tab.1.center" timestamp="1608371099523">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="504" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1608371099523" />
    <state width="1031" height="504" key="GridCell.Tab.1.left" timestamp="1608371099523">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="504" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1608371099523" />
    <state width="1031" height="504" key="GridCell.Tab.1.right" timestamp="1608371099523">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="504" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1608371099523" />
    <state width="1031" height="504" key="GridCell.Tab.2.bottom" timestamp="1608371099523">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="504" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608371099523" />
    <state width="1031" height="504" key="GridCell.Tab.2.center" timestamp="1608371099523">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="504" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1608371099523" />
    <state width="1031" height="504" key="GridCell.Tab.2.left" timestamp="1608371099523">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="504" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1608371099523" />
    <state width="1031" height="504" key="GridCell.Tab.2.right" timestamp="1608371099523">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="504" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1608371099523" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1606714311663">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="299" y="67" key="Maven.ArtifactSearchDialog/0.0.1536.824@0.0.1536.824" timestamp="1606714311663" />
    <state x="270" y="57" key="SettingsEditor" timestamp="1606120706449">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="270" y="57" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1606120706449" />
    <state width="498" height="519" key="SwitcherDM" timestamp="1608278257976">
      <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">
      <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">
      <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="468" y="115" width="703" height="594" key="find.popup" timestamp="1608279950168">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="468" y="115" width="703" height="594" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1608279950168" />
    <state x="301" y="126" key="new project wizard" timestamp="1607319774085">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="301" y="126" key="new project wizard/0.0.1536.824@0.0.1536.824" timestamp="1607319774085" />
    <state x="545" y="169" key="refactoring.ChangeSignatureDialog" timestamp="1608170338181">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="545" y="169" key="refactoring.ChangeSignatureDialog/0.0.1536.824@0.0.1536.824" timestamp="1608170338181" />
    <state x="425" y="187" key="run.anything.popup" timestamp="1608280452280">
      <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="1608283772327">
      <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="1608283772327" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>

 springcloud_k8s_panzhihuazhihuishequ/.idea/compiler.xml

@@ -23,7 +23,6 @@
    </annotationProcessing>
    <bytecodeTargetLevel>
      <module name="service_dangjian" target="1.8" />
      <module name="zhihuishequ" target="1.8" />
    </bytecodeTargetLevel>
  </component>
  <component name="JavacSettings">
@@ -37,7 +36,7 @@
      <module name="service_dangjian" options="" />
      <module name="service_user" options="" />
      <module name="timejob" options="" />
      <module name="zhihuishequ" options="-parameters" />
      <module name="zhihuishequ" options="" />
      <module name="zuul" options="" />
    </option>
  </component>

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -23,19 +23,8 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <change afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/weixin/CheckService.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/java/com/panzhihua/applets/api/DiscussApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/UserApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/UserApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvJumpDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvJumpDTO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvJumpVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvJumpVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvJumpDTO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvJumpDTO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/advertisement/ComOpsAdvJumpVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/advertisement/ComOpsAdvJumpVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAdvJumpDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAdvJumpDO.java" 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$/common/src/main/java/com/panzhihua/common/model/vos/community/ComOpsHouseVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComOpsHouseVO.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -57,14 +46,22 @@
  <component name="Git.Settings">
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
  </component>
  <component name="GitSEFilterConfiguration">
    <file-type-list>
      <filtered-out-file-type name="LOCAL_BRANCH" />
      <filtered-out-file-type name="REMOTE_BRANCH" />
      <filtered-out-file-type name="TAG" />
      <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
    </file-type-list>
  </component>
  <component name="JRebelWorkspace">
    <option name="jrebelEnabledAutocompile" value="true" />
  </component>
  <component name="MavenImportPreferences">
    <option name="generalSettings">
      <MavenGeneralSettings>
        <option name="mavenHome" value="F:\apache-maven-3.6.3" />
        <option name="userSettingsFile" value="F:\settings.xml" />
        <option name="localRepository" value="D:\repository" />
        <option name="userSettingsFile" value="C:\Users\L、ming\.m2\settings.xml" />
      </MavenGeneralSettings>
    </option>
  </component>
@@ -85,14 +82,16 @@
    <property name="RequestMappingsPanelWidth0" value="75" />
    <property name="RequestMappingsPanelWidth1" value="75" />
    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
    <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$/../../../../easyexcel-master/easyexcel-master/pom.xml" />
    <property name="nodejs_package_manager_path" value="npm" />
    <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" />
    <property name="settings.editor.selected.configurable" value="spring.boot" />
    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
  </component>
  <component name="ReactorSettings">
    <option name="notificationShown" value="true" />
@@ -101,19 +100,22 @@
    <selection>jr</selection>
  </component>
  <component name="RecentsManager">
    <key name="CopyClassDialog.RECENTS_KEY">
      <recent name="com.panzhihua.community_backstage.excel" />
      <recent name="com.panzhihua.common.utlis" />
      <recent name="com.panzhihua.applets.api" />
      <recent name="com.panzhihua.timejob.config" />
      <recent name="com.panzhihua.common.model.dtos.community" />
    </key>
    <key name="CopyFile.RECENT_KEYS">
      <recent name="F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\deploy-file" />
      <recent name="F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\timejob\src\main\resources" />
      <recent name="F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common" />
      <recent name="F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\service_user\src\main\java\com\panzhihua\service_user" />
      <recent name="F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\zuul\src\main\resources" />
    </key>
    <key name="MoveFile.RECENT_KEYS">
      <recent name="D:\idea_space\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common" />
    </key>
    <key name="CopyClassDialog.RECENTS_KEY">
      <recent name="com.panzhihua.community_backstage.excel" />
      <recent name="com.panzhihua.common.utlis" />
      <recent name="com.panzhihua.applets.api" />
      <recent name="com.panzhihua.timejob.config" />
      <recent name="com.panzhihua.common.model.dtos.community" />
    </key>
  </component>
  <component name="RunDashboard">
@@ -123,7 +125,7 @@
      </set>
    </option>
  </component>
  <component name="RunManager" selected="Application.IdCard">
  <component name="RunManager" selected="Spring Boot.ServiceUserApplication">
    <configuration name="ComActActivityServiceImpl" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
      <option name="MAIN_CLASS_NAME" value="com.panzhihua.service_community.service.impl.ComActActivityServiceImpl" />
      <module name="service_community" />
@@ -189,13 +191,15 @@
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
    <configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true">
      <option name="arquillianRunConfiguration">
        <value>
          <option name="containerStateName" value="" />
        </value>
      </option>
      <option name="TEST_OBJECT" value="class" />
      <option name="TEST_OBJECT" value="CLASS" />
      <properties />
      <listeners />
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
@@ -278,32 +282,23 @@
      </method>
    </configuration>
    <list>
      <item itemvalue="Application.UserServiceImpl" />
      <item itemvalue="Application.RichTextUtil" />
      <item itemvalue="Application.PartyBuildingApi" />
      <item itemvalue="Application.ComActActivityServiceImpl" />
      <item itemvalue="Application.IdCard" />
      <item itemvalue="Spring Boot.ServiceUserApplication" />
      <item itemvalue="Spring Boot.AppletsApplication" />
      <item itemvalue="Spring Boot.CommunityBackstageApplication" />
      <item itemvalue="Spring Boot.AppletsBackstageApplication" />
      <item itemvalue="Spring Boot.AuthApplication" />
      <item itemvalue="Spring Boot.ConfigServerApplication" />
      <item itemvalue="Spring Boot.EurekaServerApplication" />
      <item itemvalue="Spring Boot.ServiceDangjianApplication" />
      <item itemvalue="Spring Boot.ZuulApplication" />
      <item itemvalue="Spring Boot.AppletsApplication" />
      <item itemvalue="Spring Boot.AppletsBackstageApplication" />
      <item itemvalue="Spring Boot.ConfigServerApplication" />
      <item itemvalue="Spring Boot.ServiceDangjianApplication" />
      <item itemvalue="Spring Boot.EurekaServerApplication" />
      <item itemvalue="Spring Boot.ServiceCommunityApplication" />
      <item itemvalue="Spring Boot.CommunityBackstageApplication" />
      <item itemvalue="Spring Boot.TimejobApplication" />
      <item itemvalue="应用程序.ComActActivityServiceImpl" />
      <item itemvalue="应用程序.IdCard" />
      <item itemvalue="应用程序.PartyBuildingApi" />
      <item itemvalue="应用程序.RichTextUtil" />
      <item itemvalue="应用程序.UserServiceImpl" />
    </list>
    <recent_temporary>
      <list>
        <item itemvalue="Application.IdCard" />
        <item itemvalue="Application.UserServiceImpl" />
        <item itemvalue="Application.ComActActivityServiceImpl" />
        <item itemvalue="Application.PartyBuildingApi" />
        <item itemvalue="Application.RichTextUtil" />
      </list>
    </recent_temporary>
  </component>
  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
  <component name="TaskManager">
@@ -447,6 +442,10 @@
      <workItem from="1614146399536" duration="4002000" />
      <workItem from="1614213754832" duration="85000" />
      <workItem from="1614219125851" duration="3423000" />
      <workItem from="1616487257652" duration="6990000" />
      <workItem from="1616501287620" duration="598000" />
      <workItem from="1616547019982" duration="10669000" />
      <workItem from="1616566015680" duration="16654000" />
    </task>
    <servers />
  </component>
@@ -465,153 +464,34 @@
    </option>
    <option name="oldMeFiltersMigrated" value="true" />
  </component>
  <component name="WindowStateProjectService">
    <state x="249" y="0" key="#Project_Structure" timestamp="1613697422556">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="249" y="0" key="#Project_Structure/0.0.1536.824@0.0.1536.824" timestamp="1613697422556" />
    <state x="464" y="213" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1612177264050">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="464" y="213" key="#com.intellij.fileTypes.FileTypeChooser/0.0.1536.824@0.0.1536.824" timestamp="1612177264050" />
    <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1613788451041">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1613788451041" />
    <state x="405" y="335" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1606099594079">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="405" y="335" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog/0.0.1536.824@0.0.1536.824" timestamp="1606099594079" />
    <state x="510" y="279" width="515" height="272" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes" timestamp="1611213242838">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="510" y="279" width="515" height="272" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes/0.0.1536.824@0.0.1536.824" timestamp="1611213242838" />
    <state x="0" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog" timestamp="1611214700095">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="0" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog/0.0.1536.824@0.0.1536.824" timestamp="1611214700095" />
    <state x="499" y="159" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1613713199165">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="499" y="159" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1536.824@0.0.1536.824" timestamp="1613713199165" />
    <state width="562" height="466" key="DebuggerActiveHint" timestamp="1614222823789">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="562" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1614222823789" />
    <state x="93" y="93" width="1350" height="638" key="DiffContextDialog" timestamp="1612321934878">
      <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="1612321934878" />
    <state x="549" y="167" key="FileChooserDialogImpl" timestamp="1612426172959">
      <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="1612426172959" />
    <state width="1031" height="265" key="GridCell.Tab.0.bottom" timestamp="1614223349915">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="265" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1614223349915" />
    <state width="1031" height="265" key="GridCell.Tab.0.center" timestamp="1614223349914">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="265" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1614223349914" />
    <state width="1031" height="265" key="GridCell.Tab.0.left" timestamp="1614223349914">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="265" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1614223349914" />
    <state width="1031" height="265" key="GridCell.Tab.0.right" timestamp="1614223349914">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="265" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1614223349914" />
    <state width="1031" height="265" key="GridCell.Tab.1.bottom" timestamp="1614223349915">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="265" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1614223349915" />
    <state width="1031" height="265" key="GridCell.Tab.1.center" timestamp="1614223349915">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="265" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1614223349915" />
    <state width="1031" height="265" key="GridCell.Tab.1.left" timestamp="1614223349915">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="265" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1614223349915" />
    <state width="1031" height="265" key="GridCell.Tab.1.right" timestamp="1614223349915">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="265" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1614223349915" />
    <state width="1031" height="265" key="GridCell.Tab.2.bottom" timestamp="1614223349915">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="265" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1614223349915" />
    <state width="1031" height="265" key="GridCell.Tab.2.center" timestamp="1614223349915">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="265" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1614223349915" />
    <state width="1031" height="265" key="GridCell.Tab.2.left" timestamp="1614223349915">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="265" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1614223349915" />
    <state width="1031" height="265" key="GridCell.Tab.2.right" timestamp="1614223349915">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="265" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1614223349915" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1612603382513">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="299" y="67" key="Maven.ArtifactSearchDialog/0.0.1536.824@0.0.1536.824" timestamp="1612603382513" />
    <state x="349" y="252" key="MavenRunHelper.GoalEditor" timestamp="1611284568987">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="349" y="252" key="MavenRunHelper.GoalEditor/0.0.1536.824@0.0.1536.824" timestamp="1611284568987" />
    <state x="270" y="57" key="SettingsEditor" timestamp="1606120706449">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="270" y="57" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1606120706449" />
    <state width="498" height="540" key="SwitcherDM" timestamp="1612596268481">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="498" height="540" key="SwitcherDM/0.0.1536.824@0.0.1536.824" timestamp="1612596268481" />
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog" timestamp="1612321934878">
      <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="1612321934878" />
    <state x="93" y="93" width="1350" height="639" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1611623127978">
      <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="1611623127978" />
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.SelectionHistoryDialog" timestamp="1611623127978">
      <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.SelectionHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1611623127978" />
    <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1614219881345">
      <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="1614219881345" />
    <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="600" height="428" key="javadoc.popup/0.0.1536.824@0.0.1536.824" timestamp="1610005781617" />
    <state x="131" y="82" key="new project wizard" timestamp="1610606891357">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="131" y="82" key="new project wizard/0.0.1536.824@0.0.1536.824" timestamp="1610606891357" />
    <state x="545" y="169" key="refactoring.ChangeSignatureDialog" timestamp="1613788208222">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="545" y="169" key="refactoring.ChangeSignatureDialog/0.0.1536.824@0.0.1536.824" timestamp="1613788208222" />
    <state x="425" y="187" key="run.anything.popup" timestamp="1611565231827">
      <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="1611565231827" />
    <state x="431" y="145" width="672" height="678" key="search.everywhere.popup" timestamp="1613787820637">
      <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="1613787820637" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
      <breakpoints>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java</url>
          <line>68</line>
          <option name="timeStamp" value="4" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java</url>
          <line>71</line>
          <option name="timeStamp" value="5" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtCategoryServiceImpl.java</url>
          <line>52</line>
          <option name="timeStamp" value="7" />
        </line-breakpoint>
      </breakpoints>
    </breakpoint-manager>
    <pin-to-top-manager>
      <pinned-members>
        <PinnedItemInfo parentTag="com.panzhihua.common.model.vos.R" memberName="data" />
      </pinned-members>
    </pin-to-top-manager>
  </component>
  <component name="XSLT-Support.FileAssociations.UIState">
    <expand />
    <select />
  </component>
</project>

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/applets.log.2021-02-05.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/applets.log.2021-02-18.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/applets.log.2021-02-19.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/applets.log.2021-02-20.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/applets_backstage.log.2021-02-05.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/applets_backstage.log.2021-02-18.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/applets_backstage.log.2021-02-19.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/applets_backstage.log.2021-02-20.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/auth.log.2021-02-05.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/auth.log.2021-02-18.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/auth.log.2021-02-19.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/auth.log.2021-02-20.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/community_backstage.log.2021-02-05.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/community_backstage.log.2021-02-18.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/community_backstage.log.2021-02-19.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/community_backstage.log.2021-02-20.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/config_server.log.2020-12-28.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/config_server.log.2020-12-29.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/eureka_server.log.2020-12-28.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/eureka_server.log.2020-12-29.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/service_community.log.2021-02-05.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/service_community.log.2021-02-18.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/service_community.log.2021-02-19.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/service_community.log.2021-02-20.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/service_partybuilding.log.2021-02-05.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/service_partybuilding.log.2021-02-18.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/service_partybuilding.log.2021-02-19.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/service_partybuilding.log.2021-02-20.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/service_user.log.2021-02-05.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/service_user.log.2021-02-18.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/service_user.log.2021-02-19.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/service_user.log.2021-02-20.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/zuul.log.2021-02-01.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/zuul.log.2021-02-05.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/zuul.log.2021-02-18.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/zuul.log.2021-02-19.log

 springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/zuul.log.2021-02-20.log

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComCvtCategoryDTO.java

@@ -5,9 +5,11 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;

/**
 * @description: 便民服务 分类信息
@@ -29,7 +31,7 @@
    private String remark;

    @ApiModelProperty("权重")
    @NotBlank(groups = {AddGroup.class},message = "权重不能为空")
    @NotNull(message = "权重不能为空")
    private Integer weight;

    @ApiModelProperty(value = "创建人",hidden = true)

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComOpsHouseVO.java

@@ -1,7 +1,9 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.time.LocalDateTime;
@@ -143,11 +145,13 @@
    @ApiModelProperty(value="审核人id")
    private Long approveBy;


    /**
     * create_at
     */
    @DateTimeFormat(pattern = "yyyy/MM/dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy/MM/dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty("发布人名字")
    private String userName;


 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java

@@ -23,6 +23,7 @@
import com.panzhihua.community_backstage.listen.PartyBuildingMemberExcelListen;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javassist.expr.NewArray;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.ObjectUtils;
@@ -35,6 +36,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.UUID;
@@ -81,6 +83,7 @@
        log.info("社区所有党组织社区id【{}】", communityId);
        return partyBuildingService.listPartyOrganization(communityId);
    }

    @ApiOperation(value = "社区所有党组织列表", response = PartyOrganizationVO.class)
    @GetMapping("listpartyorganizationAll")
    public R listPartyOrganizationAll() {
@@ -170,8 +173,16 @@
    @ApiOperation(value = "上传照片")
    @PostMapping(value = "uploadimage", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R uploadImage(@RequestParam MultipartFile file, HttpServletRequest request) {
        String name = file.getOriginalFilename();
        String name = file.getOriginalFilename().toLowerCase();;
        List<String> formateList = Arrays.asList(
                "avi", "flv", "mpg", "mpeg", "mpe", "m1v", "m2v", "mpv2", "mp2v", "dat", "ts", "tp", "tpr", "pva", "pss", "mp4", "m4v",
                "m4p", "m4b", "3gp", "3gpp", "3g2", "3gp2", "ogg", "mov", "qt", "amr", "rm", "ram", "rmvb", "rpm");
        String nameStr = name.split("\\.")[1];
        if (formateList.contains(nameStr)) {
            name = UUID.randomUUID().toString().replaceAll("-", "") + ".mp4";
        } else {
        name= UUID.randomUUID().toString().replaceAll("-","")+".jpg";
        }
        try {
            SFTPUtil sftp = new SFTPUtil(userName,password,host,port);
            sftp.login();
@@ -487,6 +498,7 @@
    public R deleteMessage(@RequestBody ComActMessageVO comActMessageVO) {
        return communityService.deleteMessage(comActMessageVO);
    }

    @ApiOperation(value = "批量设置留言（公开1，保密2）")
    @DeleteMapping("resetmessagepublic")
    public R resetMessagePublic(@RequestBody ResetComActMessageVO resetComActMessageVO) {

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java

@@ -10,9 +10,11 @@
import com.panzhihua.service_community.service.ComCvtServeService;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.List;

/**
@@ -128,7 +130,7 @@
     * @return 返回结果
     */
    @PostMapping("/category/add")
    public R addComCvtCategory(@RequestBody ComCvtCategoryDTO comCvtCategoryDTO) {
    public R addComCvtCategory(@Valid @RequestBody ComCvtCategoryDTO comCvtCategoryDTO) {
        return comCvtCategoryService.addComCvtCategory(comCvtCategoryDTO);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java

@@ -58,7 +58,6 @@
            " </if> " +



            "<if test='pageComOpsHouseDTO.houseCommunityId != null '>" +
            "AND d.house_community_id=#{pageComOpsHouseDTO.houseCommunityId} \n" +
            " </if> " +