广告模块积分模块数据模型建立完成

huanghongfa

2020-12-28 c68e631c3ef3c105b82bbc9e40118c3301ea9237

广告模块积分模块数据模型建立完成

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -23,31 +23,64 @@
  </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/model/vos/SystemmanagementConfigVO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/aop/OperLogAspect.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/SystemManagementApi.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/exception/ServiceException.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/AppletesBackstageConfigDTO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvJumpDTO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/AppletesBackstageConfigVO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvJumpVO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvPosVO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvVO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/integral/ComOpsAccRuleFuncVO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/integral/ComOpsAccRuleVO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/integral/ComOpsAccUserVO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/AdvertisementApi.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsAccRuleDAO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsAccRuleFuncDAO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsAccUserDAO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsAdvDAO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsAdvJumpDAO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsAdvPosDAO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAccRuleDO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAccRuleFuncDO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAccUserDO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAdvDO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAdvJumpDO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAdvPosDO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComOpsAccRuleService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComOpsAdvService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsAccRuleServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsAdvServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructBuildTypeVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructBuildTypeVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngUserTagVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngUserTagVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/SystemManagementApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/SystemManagementApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/SystemmanagementConfigVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/SystemmanagementConfigVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.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/user/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/user/UserService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComMngStructBuildTypeVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComMngStructBuildTypeVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/ComMngUserTagVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/ComMngUserTagVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/SystemmanagementConfigVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/SystemmanagementConfigVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/AdministratorsUserVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/AdministratorsUserVO.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/user/UserService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/user/UserService.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/SystemManagementApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/SystemManagementApi.java" 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/model/dos/ComMngStructBuildTypeDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructBuildTypeDO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActMicroWishService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActMicroWishService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructOtherBuildDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructOtherBuildDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructOtherBuildDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructOtherBuildDO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVolunteerMngDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVolunteerMngDO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComMngStructOtherBuildService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComMngStructOtherBuildService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.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/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/ComPbMemberDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.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/api/RoleApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java" 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" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComMngUserTagDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComMngUserTagDO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysMenuDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysMenuDO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/RoleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/RoleService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.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$/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" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -90,6 +123,7 @@
    <option name="showVisibilityIcons" value="true" />
  </component>
  <component name="PropertiesComponent">
    <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
    <property name="RequestMappingsPanelOrder0" value="0" />
    <property name="RequestMappingsPanelOrder1" value="1" />
    <property name="RequestMappingsPanelWidth0" value="75" />
@@ -112,11 +146,11 @@
  </component>
  <component name="RecentsManager">
    <key name="CopyClassDialog.RECENTS_KEY">
      <recent name="com.panzhihua.common.model.vos" />
      <recent name="com.panzhihua.common.model.dtos" />
      <recent name="com.panzhihua.common.exception" />
      <recent name="com.panzhihua.community_backstage.aop" />
      <recent name="com.panzhihua.community_backstage.api" />
      <recent name="com.panzhihua.applets_backstage.aop" />
      <recent name="com.panzhihua.community_backstage.exception" />
      <recent name="com.panzhihua.service_dangjian.config" />
    </key>
    <key name="CopyFile.RECENT_KEYS">
      <recent name="F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\service_user\src\main\java\com\panzhihua\service_user" />
@@ -199,15 +233,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>
@@ -287,6 +319,7 @@
      <item itemvalue="Application.BaseController" />
      <item itemvalue="Application.UserApi" />
      <item itemvalue="Application.HanyuPinyinHelper" />
      <item itemvalue="Application.IPUtil" />
      <item itemvalue="Spring Boot.CommunityBackstageApplication" />
      <item itemvalue="Spring Boot.AppletsApplication" />
      <item itemvalue="Spring Boot.AppletsBackstageApplication" />
@@ -297,7 +330,6 @@
      <item itemvalue="Spring Boot.ServiceUserApplication" />
      <item itemvalue="Spring Boot.ZuulApplication" />
      <item itemvalue="Spring Boot.ServiceCommunityApplication" />
      <item itemvalue="Application.IPUtil" />
    </list>
    <recent_temporary>
      <list>
@@ -396,7 +428,11 @@
      <workItem from="1608371107059" duration="646000" />
      <workItem from="1608371917868" duration="79000" />
      <workItem from="1608379508016" duration="46000" />
      <workItem from="1608531425658" duration="126772000" />
      <workItem from="1608531425658" duration="130322000" />
      <workItem from="1609120146771" duration="384000" />
      <workItem from="1609120633455" duration="2000" />
      <workItem from="1609120765557" duration="31000" />
      <workItem from="1609121031103" duration="19431000" />
    </task>
    <servers />
  </component>
@@ -420,10 +456,10 @@
      <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="1608546608273" />
    <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1608887711448">
    <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1609148115607">
      <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="1608887711448" />
    <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1609148115607" />
    <state x="405" y="335" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1606099594079">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -436,10 +472,10 @@
      <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="1608878808962" />
    <state width="561" height="466" key="DebuggerActiveHint" timestamp="1608807098863">
    <state width="561" height="466" key="DebuggerActiveHint" timestamp="1609135897135">
      <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="1608807098863" />
    <state width="561" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1609135897135" />
    <state x="93" y="93" width="1350" height="638" key="DiffContextDialog" timestamp="1608535183408">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -448,54 +484,54 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1606197830966" />
    <state width="1031" height="490" key="GridCell.Tab.0.bottom" timestamp="1608884849373">
    <state width="1031" height="565" key="GridCell.Tab.0.bottom" timestamp="1609147334212">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="490" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608884849373" />
    <state width="1031" height="490" key="GridCell.Tab.0.center" timestamp="1608884849373">
    <state width="1031" height="565" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609147334212" />
    <state width="1031" height="565" key="GridCell.Tab.0.center" timestamp="1609147334212">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="490" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1608884849373" />
    <state width="1031" height="490" key="GridCell.Tab.0.left" timestamp="1608884849373">
    <state width="1031" height="565" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1609147334212" />
    <state width="1031" height="565" key="GridCell.Tab.0.left" timestamp="1609147334211">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="490" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1608884849373" />
    <state width="1031" height="490" key="GridCell.Tab.0.right" timestamp="1608884849373">
    <state width="1031" height="565" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1609147334211" />
    <state width="1031" height="565" key="GridCell.Tab.0.right" timestamp="1609147334212">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="490" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1608884849373" />
    <state width="1031" height="490" key="GridCell.Tab.1.bottom" timestamp="1608884849373">
    <state width="1031" height="565" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1609147334212" />
    <state width="1031" height="565" key="GridCell.Tab.1.bottom" timestamp="1609147334212">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="490" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608884849373" />
    <state width="1031" height="490" key="GridCell.Tab.1.center" timestamp="1608884849373">
    <state width="1031" height="565" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609147334212" />
    <state width="1031" height="565" key="GridCell.Tab.1.center" timestamp="1609147334212">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="490" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1608884849373" />
    <state width="1031" height="490" key="GridCell.Tab.1.left" timestamp="1608884849373">
    <state width="1031" height="565" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1609147334212" />
    <state width="1031" height="565" key="GridCell.Tab.1.left" timestamp="1609147334212">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="490" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1608884849373" />
    <state width="1031" height="490" key="GridCell.Tab.1.right" timestamp="1608884849373">
    <state width="1031" height="565" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1609147334212" />
    <state width="1031" height="565" key="GridCell.Tab.1.right" timestamp="1609147334212">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="490" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1608884849373" />
    <state width="1031" height="490" key="GridCell.Tab.2.bottom" timestamp="1608884849373">
    <state width="1031" height="565" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1609147334212" />
    <state width="1031" height="565" key="GridCell.Tab.2.bottom" timestamp="1609147334212">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="490" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608884849373" />
    <state width="1031" height="490" key="GridCell.Tab.2.center" timestamp="1608884849373">
    <state width="1031" height="565" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609147334212" />
    <state width="1031" height="565" key="GridCell.Tab.2.center" timestamp="1609147334212">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="490" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1608884849373" />
    <state width="1031" height="490" key="GridCell.Tab.2.left" timestamp="1608884849373">
    <state width="1031" height="565" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1609147334212" />
    <state width="1031" height="565" key="GridCell.Tab.2.left" timestamp="1609147334212">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="490" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1608884849373" />
    <state width="1031" height="490" key="GridCell.Tab.2.right" timestamp="1608884849373">
    <state width="1031" height="565" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1609147334212" />
    <state width="1031" height="565" key="GridCell.Tab.2.right" timestamp="1609147334212">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="490" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1608884849373" />
    <state width="1031" height="565" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1609147334212" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1606714311663">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -504,10 +540,10 @@
      <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="1608861433704">
    <state width="498" height="540" key="SwitcherDM" timestamp="1609141463075">
      <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="1608861433704" />
    <state width="498" height="540" key="SwitcherDM/0.0.1536.824@0.0.1536.824" timestamp="1609141463075" />
    <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>
@@ -520,22 +556,22 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="468" y="115" width="766" height="594" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1608858479111" />
    <state x="301" y="126" key="new project wizard" timestamp="1607319774085">
    <state x="301" y="45" key="new project wizard" timestamp="1609120520884">
      <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">
    <state x="301" y="45" key="new project wizard/0.0.1536.824@0.0.1536.824" timestamp="1609120520884" />
    <state x="545" y="169" key="refactoring.ChangeSignatureDialog" timestamp="1609148997036">
      <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="545" y="169" key="refactoring.ChangeSignatureDialog/0.0.1536.824@0.0.1536.824" timestamp="1609148997036" />
    <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="1608858461752">
    <state x="431" y="145" width="672" height="678" key="search.everywhere.popup" timestamp="1609147467741">
      <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="1608858461752" />
    <state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1609147467741" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>

 springcloud_k8s_panzhihuazhihuishequ/LOG_HOME_IS_UNDEFINED/config_server.log.2020-12-22.log

File was deleted

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

New file
@@ -0,0 +1,215 @@
2020-12-28 10:05:48.624 [background-preinit] INFO  org.hibernate.validator.internal.util.Version - HV000001: Hibernate Validator 6.1.5.Final
2020-12-28 10:05:52.822 [main] INFO  c.panzhihua.config_server.ConfigServerApplication - No active profile set, falling back to default profiles: default
2020-12-28 10:05:57.110 [main] WARN  o.springframework.boot.actuate.endpoint.EndpointId - Endpoint ID 'service-registry' contains invalid characters, please migrate to a valid format.
2020-12-28 10:05:57.423 [main] WARN  o.springframework.boot.actuate.endpoint.EndpointId - Endpoint ID 'hystrix.stream' contains invalid characters, please migrate to a valid format.
2020-12-28 10:05:58.681 [main] INFO  o.springframework.cloud.context.scope.GenericScope - BeanFactory id=609b2626-9897-309a-a0c7-bd0a31781dea
2020-12-28 10:06:02.494 [main] INFO  o.s.boot.web.embedded.tomcat.TomcatWebServer - Tomcat initialized with port(s): 8193 (http)
2020-12-28 10:06:02.601 [main] INFO  org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8193"]
2020-12-28 10:06:02.603 [main] INFO  org.apache.catalina.core.StandardService - Starting service [Tomcat]
2020-12-28 10:06:02.603 [main] INFO  org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.38]
2020-12-28 10:06:03.050 [main] INFO  o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext
2020-12-28 10:06:03.050 [main] INFO  o.s.b.w.s.c.ServletWebServerApplicationContext - Root WebApplicationContext: initialization completed in 10120 ms
2020-12-28 10:06:03.621 [main] WARN  com.netflix.config.sources.URLConfigurationSource - No URLs will be polled as dynamic configuration sources.
2020-12-28 10:06:03.622 [main] INFO  com.netflix.config.sources.URLConfigurationSource - To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
2020-12-28 10:06:03.668 [main] INFO  com.netflix.config.DynamicPropertyFactory - DynamicPropertyFactory is initialized with configuration sources: com.netflix.config.ConcurrentCompositeConfiguration@549cdc73
2020-12-28 10:06:04.850 [main] WARN  com.netflix.config.sources.URLConfigurationSource - No URLs will be polled as dynamic configuration sources.
2020-12-28 10:06:04.850 [main] INFO  com.netflix.config.sources.URLConfigurationSource - To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
2020-12-28 10:06:06.371 [main] INFO  o.s.scheduling.concurrent.ThreadPoolTaskExecutor - Initializing ExecutorService 'applicationTaskExecutor'
2020-12-28 10:06:13.207 [main] INFO  o.s.c.n.e.c.DiscoveryClientOptionalArgsConfiguration - Eureka HTTP Client uses Jersey
2020-12-28 10:06:13.308 [main] WARN  o.s.c.l.c.BlockingLoadBalancerClientAutoConfiguration$BlockingLoadBalancerClientRibbonWarnLogger - You already have RibbonLoadBalancerClient on your classpath. It will be used by default. As Spring Cloud Ribbon is in maintenance mode. We recommend switching to BlockingLoadBalancerClient instead. In order to use it, set the value of `spring.cloud.loadbalancer.ribbon.enabled` to `false` or remove spring-cloud-starter-netflix-ribbon from your project.
2020-12-28 10:06:13.711 [main] INFO  o.s.b.actuate.endpoint.web.EndpointLinksResolver - Exposing 2 endpoint(s) beneath base path '/actuator'
2020-12-28 10:06:13.989 [main] INFO  o.s.cloud.netflix.eureka.InstanceInfoFactory - Setting initial instance status as: STARTING
2020-12-28 10:06:14.121 [main] INFO  com.netflix.discovery.DiscoveryClient - Initializing Eureka in region us-east-1
2020-12-28 10:06:14.465 [main] INFO  c.n.discovery.provider.DiscoveryJerseyProvider - Using JSON encoding codec LegacyJacksonJson
2020-12-28 10:06:14.465 [main] INFO  c.n.discovery.provider.DiscoveryJerseyProvider - Using JSON decoding codec LegacyJacksonJson
2020-12-28 10:06:15.105 [main] INFO  c.n.discovery.provider.DiscoveryJerseyProvider - Using XML encoding codec XStreamXml
2020-12-28 10:06:15.105 [main] INFO  c.n.discovery.provider.DiscoveryJerseyProvider - Using XML decoding codec XStreamXml
2020-12-28 10:06:15.792 [main] INFO  c.n.d.shared.resolver.aws.ConfigClusterResolver - Resolving eureka endpoints via configuration
2020-12-28 10:06:16.273 [main] INFO  com.netflix.discovery.DiscoveryClient - Disable delta property : false
2020-12-28 10:06:16.274 [main] INFO  com.netflix.discovery.DiscoveryClient - Single vip registry refresh property : null
2020-12-28 10:06:16.274 [main] INFO  com.netflix.discovery.DiscoveryClient - Force full registry fetch : false
2020-12-28 10:06:16.274 [main] INFO  com.netflix.discovery.DiscoveryClient - Application is null : false
2020-12-28 10:06:16.274 [main] INFO  com.netflix.discovery.DiscoveryClient - Registered Applications size is zero : true
2020-12-28 10:06:16.274 [main] INFO  com.netflix.discovery.DiscoveryClient - Application version is -1: true
2020-12-28 10:06:16.274 [main] INFO  com.netflix.discovery.DiscoveryClient - Getting all instance registry info from the eureka server
2020-12-28 10:06:21.327 [main] INFO  c.n.d.s.t.decorator.RedirectingEurekaHttpClient - Request execution error. endpoint=DefaultEndpoint{ serviceUrl='http://localhost:8192/eureka/}, exception=java.net.ConnectException: Connection refused: connect stacktrace=com.sun.jersey.api.client.ClientHandlerException: java.net.ConnectException: Connection refused: connect
    at com.sun.jersey.client.apache4.ApacheHttpClient4Handler.handle(ApacheHttpClient4Handler.java:187)
    at com.sun.jersey.api.client.filter.GZIPContentEncodingFilter.handle(GZIPContentEncodingFilter.java:123)
    at com.netflix.discovery.EurekaIdentityHeaderFilter.handle(EurekaIdentityHeaderFilter.java:27)
    at com.sun.jersey.api.client.Client.handle(Client.java:652)
    at com.sun.jersey.api.client.WebResource.handle(WebResource.java:682)
    at com.sun.jersey.api.client.WebResource.access$200(WebResource.java:74)
    at com.sun.jersey.api.client.WebResource$Builder.get(WebResource.java:509)
    at com.netflix.discovery.shared.transport.jersey.AbstractJerseyEurekaHttpClient.getApplicationsInternal(AbstractJerseyEurekaHttpClient.java:196)
    at com.netflix.discovery.shared.transport.jersey.AbstractJerseyEurekaHttpClient.getApplications(AbstractJerseyEurekaHttpClient.java:167)
    at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator$6.execute(EurekaHttpClientDecorator.java:137)
    at com.netflix.discovery.shared.transport.decorator.MetricsCollectingEurekaHttpClient.execute(MetricsCollectingEurekaHttpClient.java:73)
    at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator.getApplications(EurekaHttpClientDecorator.java:134)
    at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator$6.execute(EurekaHttpClientDecorator.java:137)
    at com.netflix.discovery.shared.transport.decorator.RedirectingEurekaHttpClient.executeOnNewServer(RedirectingEurekaHttpClient.java:121)
    at com.netflix.discovery.shared.transport.decorator.RedirectingEurekaHttpClient.execute(RedirectingEurekaHttpClient.java:80)
    at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator.getApplications(EurekaHttpClientDecorator.java:134)
    at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator$6.execute(EurekaHttpClientDecorator.java:137)
    at com.netflix.discovery.shared.transport.decorator.RetryableEurekaHttpClient.execute(RetryableEurekaHttpClient.java:120)
    at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator.getApplications(EurekaHttpClientDecorator.java:134)
    at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator$6.execute(EurekaHttpClientDecorator.java:137)
    at com.netflix.discovery.shared.transport.decorator.SessionedEurekaHttpClient.execute(SessionedEurekaHttpClient.java:77)
    at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator.getApplications(EurekaHttpClientDecorator.java:134)
    at com.netflix.discovery.DiscoveryClient.getAndStoreFullRegistry(DiscoveryClient.java:1101)
    at com.netflix.discovery.DiscoveryClient.fetchRegistry(DiscoveryClient.java:1014)
    at com.netflix.discovery.DiscoveryClient.<init>(DiscoveryClient.java:441)
    at com.netflix.discovery.DiscoveryClient.<init>(DiscoveryClient.java:283)
    at com.netflix.discovery.DiscoveryClient.<init>(DiscoveryClient.java:279)
    at org.springframework.cloud.netflix.eureka.CloudEurekaClient.<init>(CloudEurekaClient.java:67)
    at org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration$RefreshableEurekaClientConfiguration.eurekaClient(EurekaClientAutoConfiguration.java:316)
    at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
    at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
    at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
    at java.lang.reflect.Method.invoke(Method.java:498)
    at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:154)
    at org.springframework.beans.factory.support.ConstructorResolver.instantiate(ConstructorResolver.java:650)
    at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:635)
    at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1336)
    at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1176)
    at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:556)
    at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:516)
    at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$1(AbstractBeanFactory.java:363)
    at org.springframework.cloud.context.scope.GenericScope$BeanLifecycleWrapper.getBean(GenericScope.java:389)
    at org.springframework.cloud.context.scope.GenericScope.get(GenericScope.java:186)
    at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:360)
    at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
    at org.springframework.aop.target.SimpleBeanTargetSource.getTarget(SimpleBeanTargetSource.java:35)
    at org.springframework.cloud.netflix.eureka.serviceregistry.EurekaRegistration.getTargetObject(EurekaRegistration.java:129)
    at org.springframework.cloud.netflix.eureka.serviceregistry.EurekaRegistration.getEurekaClient(EurekaRegistration.java:117)
    at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
    at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
    at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
    at java.lang.reflect.Method.invoke(Method.java:498)
    at org.springframework.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:282)
    at org.springframework.cloud.context.scope.GenericScope$LockedScopedProxyFactoryBean.invoke(GenericScope.java:499)
    at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)
    at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:749)
    at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:691)
    at org.springframework.cloud.netflix.eureka.serviceregistry.EurekaRegistration$$EnhancerBySpringCGLIB$$1.getEurekaClient(<generated>)
    at org.springframework.cloud.netflix.eureka.serviceregistry.EurekaServiceRegistry.maybeInitializeClient(EurekaServiceRegistry.java:57)
    at org.springframework.cloud.netflix.eureka.serviceregistry.EurekaServiceRegistry.register(EurekaServiceRegistry.java:38)
    at org.springframework.cloud.netflix.eureka.serviceregistry.EurekaAutoServiceRegistration.start(EurekaAutoServiceRegistration.java:83)
    at org.springframework.context.support.DefaultLifecycleProcessor.doStart(DefaultLifecycleProcessor.java:182)
    at org.springframework.context.support.DefaultLifecycleProcessor.access$200(DefaultLifecycleProcessor.java:53)
    at org.springframework.context.support.DefaultLifecycleProcessor$LifecycleGroup.start(DefaultLifecycleProcessor.java:360)
    at org.springframework.context.support.DefaultLifecycleProcessor.startBeans(DefaultLifecycleProcessor.java:158)
    at org.springframework.context.support.DefaultLifecycleProcessor.onRefresh(DefaultLifecycleProcessor.java:122)
    at org.springframework.context.support.AbstractApplicationContext.finishRefresh(AbstractApplicationContext.java:895)
    at org.springframework.context.support.AbstractApplicationContext.__refresh(AbstractApplicationContext.java:554)
    at org.springframework.context.support.AbstractApplicationContext.jrLockAndRefresh(AbstractApplicationContext.java:40002)
    at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:41008)
    at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:143)
    at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:758)
    at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:750)
    at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:397)
    at org.springframework.boot.SpringApplication.run(SpringApplication.java:315)
    at org.springframework.boot.SpringApplication.run(SpringApplication.java:1237)
    at org.springframework.boot.SpringApplication.run(SpringApplication.java:1226)
    at com.panzhihua.config_server.ConfigServerApplication.main(ConfigServerApplication.java:16)
Caused by: java.net.ConnectException: Connection refused: connect
    at java.net.DualStackPlainSocketImpl.waitForConnect(Native Method)
    at java.net.DualStackPlainSocketImpl.socketConnect(DualStackPlainSocketImpl.java:81)
    at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:476)
    at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:218)
    at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:200)
    at java.net.PlainSocketImpl.connect(PlainSocketImpl.java:162)
    at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:394)
    at java.net.Socket.connect(Socket.java:606)
    at org.apache.http.conn.scheme.PlainSocketFactory.connectSocket(PlainSocketFactory.java:121)
    at org.apache.http.impl.conn.DefaultClientConnectionOperator.openConnection(DefaultClientConnectionOperator.java:180)
    at org.apache.http.impl.conn.AbstractPoolEntry.open(AbstractPoolEntry.java:144)
    at org.apache.http.impl.conn.AbstractPooledConnAdapter.open(AbstractPooledConnAdapter.java:134)
    at org.apache.http.impl.client.DefaultRequestDirector.tryConnect(DefaultRequestDirector.java:605)
    at org.apache.http.impl.client.DefaultRequestDirector.execute(DefaultRequestDirector.java:440)
    at org.apache.http.impl.client.AbstractHttpClient.doExecute(AbstractHttpClient.java:835)
    at org.apache.http.impl.client.CloseableHttpClient.execute(CloseableHttpClient.java:118)
    at org.apache.http.impl.client.CloseableHttpClient.execute(CloseableHttpClient.java:56)
    at com.sun.jersey.client.apache4.ApacheHttpClient4Handler.handle(ApacheHttpClient4Handler.java:173)
    ... 77 more

2020-12-28 10:06:21.328 [main] WARN  c.n.d.s.t.decorator.RetryableEurekaHttpClient - Request execution failed with message: java.net.ConnectException: Connection refused: connect
2020-12-28 10:06:21.329 [main] INFO  com.netflix.discovery.DiscoveryClient - DiscoveryClient_CONFIG/SC-202008122205:config:8193 - was unable to refresh its cache! This periodic background refresh will be retried in 30 seconds. status = Cannot execute request on any known server stacktrace = com.netflix.discovery.shared.transport.TransportException: Cannot execute request on any known server
    at com.netflix.discovery.shared.transport.decorator.RetryableEurekaHttpClient.execute(RetryableEurekaHttpClient.java:112)
    at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator.getApplications(EurekaHttpClientDecorator.java:134)
    at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator$6.execute(EurekaHttpClientDecorator.java:137)
    at com.netflix.discovery.shared.transport.decorator.SessionedEurekaHttpClient.execute(SessionedEurekaHttpClient.java:77)
    at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator.getApplications(EurekaHttpClientDecorator.java:134)
    at com.netflix.discovery.DiscoveryClient.getAndStoreFullRegistry(DiscoveryClient.java:1101)
    at com.netflix.discovery.DiscoveryClient.fetchRegistry(DiscoveryClient.java:1014)
    at com.netflix.discovery.DiscoveryClient.<init>(DiscoveryClient.java:441)
    at com.netflix.discovery.DiscoveryClient.<init>(DiscoveryClient.java:283)
    at com.netflix.discovery.DiscoveryClient.<init>(DiscoveryClient.java:279)
    at org.springframework.cloud.netflix.eureka.CloudEurekaClient.<init>(CloudEurekaClient.java:67)
    at org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration$RefreshableEurekaClientConfiguration.eurekaClient(EurekaClientAutoConfiguration.java:316)
    at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
    at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
    at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
    at java.lang.reflect.Method.invoke(Method.java:498)
    at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:154)
    at org.springframework.beans.factory.support.ConstructorResolver.instantiate(ConstructorResolver.java:650)
    at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:635)
    at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1336)
    at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1176)
    at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:556)
    at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:516)
    at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$1(AbstractBeanFactory.java:363)
    at org.springframework.cloud.context.scope.GenericScope$BeanLifecycleWrapper.getBean(GenericScope.java:389)
    at org.springframework.cloud.context.scope.GenericScope.get(GenericScope.java:186)
    at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:360)
    at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
    at org.springframework.aop.target.SimpleBeanTargetSource.getTarget(SimpleBeanTargetSource.java:35)
    at org.springframework.cloud.netflix.eureka.serviceregistry.EurekaRegistration.getTargetObject(EurekaRegistration.java:129)
    at org.springframework.cloud.netflix.eureka.serviceregistry.EurekaRegistration.getEurekaClient(EurekaRegistration.java:117)
    at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
    at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
    at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
    at java.lang.reflect.Method.invoke(Method.java:498)
    at org.springframework.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:282)
    at org.springframework.cloud.context.scope.GenericScope$LockedScopedProxyFactoryBean.invoke(GenericScope.java:499)
    at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)
    at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:749)
    at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:691)
    at org.springframework.cloud.netflix.eureka.serviceregistry.EurekaRegistration$$EnhancerBySpringCGLIB$$1.getEurekaClient(<generated>)
    at org.springframework.cloud.netflix.eureka.serviceregistry.EurekaServiceRegistry.maybeInitializeClient(EurekaServiceRegistry.java:57)
    at org.springframework.cloud.netflix.eureka.serviceregistry.EurekaServiceRegistry.register(EurekaServiceRegistry.java:38)
    at org.springframework.cloud.netflix.eureka.serviceregistry.EurekaAutoServiceRegistration.start(EurekaAutoServiceRegistration.java:83)
    at org.springframework.context.support.DefaultLifecycleProcessor.doStart(DefaultLifecycleProcessor.java:182)
    at org.springframework.context.support.DefaultLifecycleProcessor.access$200(DefaultLifecycleProcessor.java:53)
    at org.springframework.context.support.DefaultLifecycleProcessor$LifecycleGroup.start(DefaultLifecycleProcessor.java:360)
    at org.springframework.context.support.DefaultLifecycleProcessor.startBeans(DefaultLifecycleProcessor.java:158)
    at org.springframework.context.support.DefaultLifecycleProcessor.onRefresh(DefaultLifecycleProcessor.java:122)
    at org.springframework.context.support.AbstractApplicationContext.finishRefresh(AbstractApplicationContext.java:895)
    at org.springframework.context.support.AbstractApplicationContext.__refresh(AbstractApplicationContext.java:554)
    at org.springframework.context.support.AbstractApplicationContext.jrLockAndRefresh(AbstractApplicationContext.java:40002)
    at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:41008)
    at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:143)
    at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:758)
    at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:750)
    at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:397)
    at org.springframework.boot.SpringApplication.run(SpringApplication.java:315)
    at org.springframework.boot.SpringApplication.run(SpringApplication.java:1237)
    at org.springframework.boot.SpringApplication.run(SpringApplication.java:1226)
    at com.panzhihua.config_server.ConfigServerApplication.main(ConfigServerApplication.java:16)

2020-12-28 10:06:21.329 [main] INFO  com.netflix.discovery.DiscoveryClient - Initial registry fetch from primary servers failed
2020-12-28 10:06:21.330 [main] WARN  com.netflix.discovery.DiscoveryClient - Using default backup registry implementation which does not do anything.
2020-12-28 10:06:21.331 [main] INFO  com.netflix.discovery.DiscoveryClient - Initial registry fetch from backup servers failed
2020-12-28 10:06:21.333 [main] INFO  com.netflix.discovery.DiscoveryClient - Starting heartbeat executor: renew interval is: 30
2020-12-28 10:06:21.340 [main] INFO  com.netflix.discovery.InstanceInfoReplicator - InstanceInfoReplicator onDemand update allowed rate per min is 4
2020-12-28 10:06:21.352 [main] INFO  com.netflix.discovery.DiscoveryClient - Discovery Client initialized at timestamp 1609121181348 with initial instances count: 0
2020-12-28 10:06:21.355 [main] INFO  o.s.c.n.e.serviceregistry.EurekaServiceRegistry - Registering application CONFIG with eureka with status UP
2020-12-28 10:06:21.356 [main] INFO  com.netflix.discovery.DiscoveryClient - Saw local status change event StatusChangeEvent [timestamp=1609121181356, current=UP, previous=STARTING]
2020-12-28 10:06:21.360 [main] INFO  org.apache.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-8193"]
2020-12-28 10:06:21.360 [DiscoveryClient-InstanceInfoReplicator-0] INFO  com.netflix.discovery.DiscoveryClient - DiscoveryClient_CONFIG/SC-202008122205:config:8193: registering service...
2020-12-28 10:06:21.419 [main] INFO  o.s.boot.web.embedded.tomcat.TomcatWebServer - Tomcat started on port(s): 8193 (http) with context path ''
2020-12-28 10:06:21.425 [main] INFO  o.s.c.n.e.s.EurekaAutoServiceRegistration - Updating port to 8193
2020-12-28 10:06:22.246 [main] INFO  c.panzhihua.config_server.ConfigServerApplication - Started ConfigServerApplication in 37.074 seconds (JVM running for 50.441)
2020-12-28 10:06:23.835 [RMI TCP Connection(3)-192.168.2.24] INFO  o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring DispatcherServlet 'dispatcherServlet'
2020-12-28 10:06:23.836 [RMI TCP Connection(3)-192.168.2.24] INFO  org.springframework.web.servlet.DispatcherServlet - Initializing Servlet 'dispatcherServlet'
2020-12-28 10:06:23.869 [RMI TCP Connection(3)-192.168.2.24] INFO  org.springframework.web.servlet.DispatcherServlet - Completed initialization in 33 ms
2020-12-28 10:06:24.941 [DiscoveryClient-InstanceInfoReplicator-0] INFO  com.netflix.discovery.DiscoveryClient - DiscoveryClient_CONFIG/SC-202008122205:config:8193 - registration status: 204

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

New file
@@ -0,0 +1,64 @@
2020-12-28 10:05:54.725 [background-preinit] INFO  org.hibernate.validator.internal.util.Version - HV000001: Hibernate Validator 6.1.5.Final
2020-12-28 10:05:59.411 [main] INFO  c.panzhihua.eureka_server.EurekaServerApplication - No active profile set, falling back to default profiles: default
2020-12-28 10:06:04.204 [main] WARN  o.springframework.boot.actuate.endpoint.EndpointId - Endpoint ID 'service-registry' contains invalid characters, please migrate to a valid format.
2020-12-28 10:06:04.374 [main] WARN  o.springframework.boot.actuate.endpoint.EndpointId - Endpoint ID 'hystrix.stream' contains invalid characters, please migrate to a valid format.
2020-12-28 10:06:05.456 [main] INFO  o.springframework.cloud.context.scope.GenericScope - BeanFactory id=d99200ee-b961-327f-b422-34be3421b25e
2020-12-28 10:06:08.823 [main] INFO  o.s.boot.web.embedded.tomcat.TomcatWebServer - Tomcat initialized with port(s): 8192 (http)
2020-12-28 10:06:08.936 [main] INFO  org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8192"]
2020-12-28 10:06:08.938 [main] INFO  org.apache.catalina.core.StandardService - Starting service [Tomcat]
2020-12-28 10:06:08.940 [main] INFO  org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.38]
2020-12-28 10:06:09.989 [main] INFO  o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext
2020-12-28 10:06:09.989 [main] INFO  o.s.b.w.s.c.ServletWebServerApplicationContext - Root WebApplicationContext: initialization completed in 10494 ms
2020-12-28 10:06:10.319 [main] WARN  com.netflix.config.sources.URLConfigurationSource - No URLs will be polled as dynamic configuration sources.
2020-12-28 10:06:10.319 [main] INFO  com.netflix.config.sources.URLConfigurationSource - To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
2020-12-28 10:06:10.599 [main] INFO  com.netflix.config.DynamicPropertyFactory - DynamicPropertyFactory is initialized with configuration sources: com.netflix.config.ConcurrentCompositeConfiguration@639a5e7e
2020-12-28 10:06:12.871 [main] INFO  c.s.j.server.impl.application.WebApplicationImpl - Initiating Jersey application, version 'Jersey: 1.19.4 05/24/2017 03:20 PM'
2020-12-28 10:06:13.444 [main] INFO  c.n.discovery.provider.DiscoveryJerseyProvider - Using JSON encoding codec LegacyJacksonJson
2020-12-28 10:06:13.445 [main] INFO  c.n.discovery.provider.DiscoveryJerseyProvider - Using JSON decoding codec LegacyJacksonJson
2020-12-28 10:06:14.068 [main] INFO  c.n.discovery.provider.DiscoveryJerseyProvider - Using XML encoding codec XStreamXml
2020-12-28 10:06:14.068 [main] INFO  c.n.discovery.provider.DiscoveryJerseyProvider - Using XML decoding codec XStreamXml
2020-12-28 10:06:17.075 [main] WARN  o.s.c.netflix.archaius.ArchaiusAutoConfiguration - No spring.application.name found, defaulting to 'application'
2020-12-28 10:06:17.077 [main] WARN  com.netflix.config.sources.URLConfigurationSource - No URLs will be polled as dynamic configuration sources.
2020-12-28 10:06:17.077 [main] INFO  com.netflix.config.sources.URLConfigurationSource - To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
2020-12-28 10:06:17.723 [main] INFO  o.s.scheduling.concurrent.ThreadPoolTaskExecutor - Initializing ExecutorService 'applicationTaskExecutor'
2020-12-28 10:06:21.486 [main] INFO  o.s.c.n.e.c.DiscoveryClientOptionalArgsConfiguration - Eureka HTTP Client uses Jersey
2020-12-28 10:06:21.601 [main] WARN  o.s.c.l.c.BlockingLoadBalancerClientAutoConfiguration$BlockingLoadBalancerClientRibbonWarnLogger - You already have RibbonLoadBalancerClient on your classpath. It will be used by default. As Spring Cloud Ribbon is in maintenance mode. We recommend switching to BlockingLoadBalancerClient instead. In order to use it, set the value of `spring.cloud.loadbalancer.ribbon.enabled` to `false` or remove spring-cloud-starter-netflix-ribbon from your project.
2020-12-28 10:06:21.816 [main] INFO  o.s.cloud.netflix.eureka.InstanceInfoFactory - Setting initial instance status as: STARTING
2020-12-28 10:06:21.910 [main] INFO  com.netflix.discovery.DiscoveryClient - Initializing Eureka in region us-east-1
2020-12-28 10:06:21.910 [main] INFO  com.netflix.discovery.DiscoveryClient - Client configured to neither register nor query for data.
2020-12-28 10:06:21.936 [main] INFO  com.netflix.discovery.DiscoveryClient - Discovery Client initialized at timestamp 1609121181933 with initial instances count: 0
2020-12-28 10:06:22.191 [main] INFO  com.netflix.eureka.DefaultEurekaServerContext - Initializing ...
2020-12-28 10:06:22.201 [main] INFO  com.netflix.eureka.cluster.PeerEurekaNodes - Adding new peer nodes [http://localhost:8192/eureka/]
2020-12-28 10:06:22.401 [main] INFO  c.n.discovery.provider.DiscoveryJerseyProvider - Using JSON encoding codec LegacyJacksonJson
2020-12-28 10:06:22.401 [main] INFO  c.n.discovery.provider.DiscoveryJerseyProvider - Using JSON decoding codec LegacyJacksonJson
2020-12-28 10:06:22.401 [main] INFO  c.n.discovery.provider.DiscoveryJerseyProvider - Using XML encoding codec XStreamXml
2020-12-28 10:06:22.401 [main] INFO  c.n.discovery.provider.DiscoveryJerseyProvider - Using XML decoding codec XStreamXml
2020-12-28 10:06:22.944 [main] INFO  com.netflix.eureka.cluster.PeerEurekaNodes - Replica node URL:  http://localhost:8192/eureka/
2020-12-28 10:06:22.985 [main] INFO  c.netflix.eureka.registry.AbstractInstanceRegistry - Finished initializing remote region registries. All known remote regions: []
2020-12-28 10:06:22.988 [main] INFO  com.netflix.eureka.DefaultEurekaServerContext - Initialized
2020-12-28 10:06:23.047 [main] INFO  o.s.b.actuate.endpoint.web.EndpointLinksResolver - Exposing 2 endpoint(s) beneath base path '/actuator'
2020-12-28 10:06:23.431 [main] INFO  o.s.c.n.e.serviceregistry.EurekaServiceRegistry - Registering application UNKNOWN with eureka with status UP
2020-12-28 10:06:23.435 [main] INFO  org.apache.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-8192"]
2020-12-28 10:06:23.438 [Thread-65] INFO  o.s.c.netflix.eureka.server.EurekaServerBootstrap - Setting the eureka configuration..
2020-12-28 10:06:23.446 [Thread-65] INFO  o.s.c.netflix.eureka.server.EurekaServerBootstrap - Eureka data center value eureka.datacenter is not set, defaulting to default
2020-12-28 10:06:23.449 [Thread-65] INFO  o.s.c.netflix.eureka.server.EurekaServerBootstrap - Eureka environment value eureka.environment is not set, defaulting to test
2020-12-28 10:06:23.678 [main] INFO  o.s.boot.web.embedded.tomcat.TomcatWebServer - Tomcat started on port(s): 8192 (http) with context path ''
2020-12-28 10:06:23.682 [main] INFO  o.s.c.n.e.s.EurekaAutoServiceRegistration - Updating port to 8192
2020-12-28 10:06:23.736 [Thread-65] INFO  o.s.c.netflix.eureka.server.EurekaServerBootstrap - isAws returned false
2020-12-28 10:06:23.738 [Thread-65] INFO  o.s.c.netflix.eureka.server.EurekaServerBootstrap - Initialized server context
2020-12-28 10:06:23.738 [Thread-65] INFO  c.n.eureka.registry.PeerAwareInstanceRegistryImpl - Got 1 instances from neighboring DS node
2020-12-28 10:06:23.738 [Thread-65] INFO  c.n.eureka.registry.PeerAwareInstanceRegistryImpl - Renew threshold is: 1
2020-12-28 10:06:23.739 [Thread-65] INFO  c.n.eureka.registry.PeerAwareInstanceRegistryImpl - Changing status to UP
2020-12-28 10:06:23.764 [Thread-65] INFO  o.s.c.n.e.s.EurekaServerInitializerConfiguration - Started Eureka Server
2020-12-28 10:06:24.227 [http-nio-8192-exec-10] INFO  o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring DispatcherServlet 'dispatcherServlet'
2020-12-28 10:06:24.227 [http-nio-8192-exec-10] INFO  org.springframework.web.servlet.DispatcherServlet - Initializing Servlet 'dispatcherServlet'
2020-12-28 10:06:24.249 [http-nio-8192-exec-10] INFO  org.springframework.web.servlet.DispatcherServlet - Completed initialization in 21 ms
2020-12-28 10:06:24.406 [http-nio-8192-exec-10] WARN  c.netflix.eureka.registry.AbstractInstanceRegistry - DS: Registry: cancel failed because Lease is not registered for: APPLETS/SC-202008122205:applets
2020-12-28 10:06:24.406 [http-nio-8192-exec-10] INFO  com.netflix.eureka.resources.InstanceResource - Not Found (Cancel): APPLETS - SC-202008122205:applets
2020-12-28 10:06:24.873 [main] INFO  c.panzhihua.eureka_server.EurekaServerApplication - Started EurekaServerApplication in 33.406 seconds (JVM running for 47.657)
2020-12-28 10:06:24.889 [http-nio-8192-exec-9] INFO  c.netflix.eureka.registry.AbstractInstanceRegistry - Registered instance APPLETS/SC-202008122205:applets with status DOWN (replication=false)
2020-12-28 10:06:24.889 [http-nio-8192-exec-6] INFO  c.netflix.eureka.registry.AbstractInstanceRegistry - Registered instance CONFIG/SC-202008122205:config:8193 with status UP (replication=false)
2020-12-28 10:06:25.110 [http-nio-8192-exec-8] INFO  c.netflix.eureka.registry.AbstractInstanceRegistry - Registered instance APPLETSBACKSTAGE/SC-202008122205:appletsbackstage with status UP (replication=false)
2020-12-28 10:06:25.906 [http-nio-8192-exec-7] INFO  c.netflix.eureka.registry.AbstractInstanceRegistry - Registered instance APPLETS/SC-202008122205:applets with status DOWN (replication=true)
2020-12-28 10:06:25.907 [http-nio-8192-exec-7] INFO  c.netflix.eureka.registry.AbstractInstanceRegistry - Registered instance CONFIG/SC-202008122205:config:8193 with status UP (replication=true)
2020-12-28 10:06:25.908 [http-nio-8192-exec-7] INFO  c.netflix.eureka.registry.AbstractInstanceRegistry - Registered instance APPLETSBACKSTAGE/SC-202008122205:appletsbackstage with status UP (replication=true)

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/SystemManagementApi.java

@@ -2,9 +2,14 @@

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO;
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvJumpDTO;
import com.panzhihua.common.model.vos.AppletesBackstageConfigVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.advertisement.ComOpsAdvJumpVO;
import com.panzhihua.common.model.vos.user.*;
import com.panzhihua.common.service.HanyuPinyinHelper;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.Api;
@@ -14,6 +19,7 @@
import org.springframework.web.bind.annotation.*;

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

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -27,6 +33,8 @@
public class SystemManagementApi extends BaseController {
    @Resource
    private UserService userService;
    @Resource
    private CommunityService communityService;

    @ApiOperation(value = "新增运营后台账户")
    @PostMapping("user")
@@ -64,6 +72,7 @@
        if (null==userId||0==userId) {
            return R.fail("用户主键不能为空");
        }
        administratorsUserVO.setCommunityId(0l);
        return userService.deleteUserBackstage(administratorsUserVO);
    }

@@ -112,8 +121,8 @@
    @ApiOperation(value = "运营平台权限配置列表",response = SysMenuVO.class)
    @GetMapping("listmenu")
    public R listMenuBackstage(){
        int type=1;
        return userService.listMenuBackstage(type);
       Long communityId=0l;
        return userService.listMenuBackstage(communityId);
    }

    @ApiOperation(value = "设置角色的权限")
@@ -146,4 +155,20 @@
        }
        return userService.putAgreement(sysUserAgreementVO);
    }

    @ApiOperation(value = "获取系统配置",response = AppletesBackstageConfigVO.class)
    @GetMapping("config")
    public R getConfig(){
        return communityService.getJumpContent();
    }

    @ApiOperation(value = "编辑系统配置")
    @PutMapping("config")
    public R putConfig(@RequestBody AppletesBackstageConfigDTO appletesBackstageConfigDTO){
        List<ComOpsAdvJumpDTO> comOpsAdvJumpDTOS = appletesBackstageConfigDTO.getComOpsAdvJumpDTOS();
        if (ObjectUtils.isEmpty(comOpsAdvJumpDTOS)) {
            return R.fail("广告跳转内容不能为空");
        }
        return communityService.putConfig(appletesBackstageConfigDTO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exception/ServiceException.java

New file
@@ -0,0 +1,61 @@
package com.panzhihua.common.exception;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 服务层业务异常
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-28 14:13
 **/
public class ServiceException extends RuntimeException{

    private String code;
    private String msg;
    public ServiceException() {
        super();
    }



    public ServiceException(String errorMsg) {
        super(errorMsg);
        this.msg = errorMsg;
    }

    public ServiceException(String errorCode, String errorMsg) {
        super(errorCode);
        this.code = errorCode;
        this.msg = errorMsg;
    }

    public ServiceException(String errorCode, String errorMsg, Throwable cause) {
        super(errorCode, cause);
        this.code = errorCode;
        this.msg = errorMsg;
    }


    public String getErrorCode() {
        return code;
    }

    public void setErrorCode(String errorCode) {
        this.code = errorCode;
    }

    public String getErrorMsg() {
        return msg;
    }

    public void setErrorMsg(String errorMsg) {
        this.msg = errorMsg;
    }

    public String getMessage() {
        return msg;
    }

    @Override
    public Throwable fillInStackTrace() {
        return this;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/AppletesBackstageConfigDTO.java

New file
@@ -0,0 +1,22 @@
package com.panzhihua.common.model.dtos;

import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvJumpDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 运营后台编辑配置
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-28 17:45
 **/
@Data
@ApiModel(value = "运营后台编辑配置")
public class AppletesBackstageConfigDTO {

    @ApiModelProperty("广告配置参数集合")
    private List<ComOpsAdvJumpDTO> comOpsAdvJumpDTOS;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvJumpDTO.java

New file
@@ -0,0 +1,24 @@
package com.panzhihua.common.model.dtos.advertisement;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 跳转内容
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-28 15:49
 **/
@Data
@ApiModel(value = "跳转内容")
public class ComOpsAdvJumpDTO {

    @ApiModelProperty("id")
    private Long id;

    @ApiModelProperty("跳转内容")
    private String jumpContent;


}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/AppletesBackstageConfigVO.java

New file
@@ -0,0 +1,23 @@
package com.panzhihua.common.model.vos;

import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvJumpDTO;
import com.panzhihua.common.model.vos.advertisement.ComOpsAdvJumpVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 运营后台编辑配置
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-28 17:45
 **/
@Data
@ApiModel(value = "运营后台编辑配置")
public class AppletesBackstageConfigVO {

    @ApiModelProperty("广告配置参数集合")
    private List<ComOpsAdvJumpVO> comOpsAdvJumpDTOS;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/SystemmanagementConfigVO.java

@@ -2,10 +2,12 @@

import com.panzhihua.common.model.vos.community.ComMngStructBuildTypeVO;
import com.panzhihua.common.model.vos.user.ComMngUserTagVO;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotEmpty;
import java.util.List;

/**
@@ -18,10 +20,12 @@
@ApiModel(value = "系统配置")
public class SystemmanagementConfigVO {
    @ApiModelProperty("建筑类型")
    @NotEmpty(groups = {AddGroup.class},message ="建筑类型不能为空")
    List<ComMngStructBuildTypeVO> comMngStructBuildTypeVOList;
    @ApiModelProperty("用户标签")
    @NotEmpty(groups = {AddGroup.class},message ="用户标签不能为空")
    List<ComMngUserTagVO> comMngUserTagVOList;
    @ApiModelProperty("社区id")
    @ApiModelProperty(value = "社区id",hidden = true)
    private Long communityId;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvJumpVO.java

New file
@@ -0,0 +1,24 @@
package com.panzhihua.common.model.vos.advertisement;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 跳转内容
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-28 15:49
 **/
@Data
@ApiModel(value = "跳转内容")
public class ComOpsAdvJumpVO {

    @ApiModelProperty("id")
    private Long id;

    @ApiModelProperty("跳转内容")
    private String jumpContent;


}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvPosVO.java

New file
@@ -0,0 +1,23 @@
package com.panzhihua.common.model.vos.advertisement;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 广告位置
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-28 15:52
 **/
@Data
@ApiModel(value = "广告位置")
public class ComOpsAdvPosVO {


    @ApiModelProperty("自增id")
    private Long id;

    @ApiModelProperty("广告位置中文描述")
    private String desc;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvVO.java

New file
@@ -0,0 +1,50 @@
package com.panzhihua.common.model.vos.advertisement;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 广告
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-28 15:42
 **/
@Data
@ApiModel(value = "广告")
public class ComOpsAdvVO {

    @ApiModelProperty("自增id")
    private Long id;

    @ApiModelProperty("广告位置id")
    private Integer posId;

    @ApiModelProperty("图片路径")
    private String photoPath;

    @ApiModelProperty("链接类型：0~ 外部链接；1 ~ 内部链接")
    private Integer linkType;

    @ApiModelProperty("上架时间")
    private Date onAt;

    @ApiModelProperty("下架时间")
    private Date offAt;

    @ApiModelProperty("跳转内容id")
    private Long jumpId;

    @ApiModelProperty("跳转url地址")
    private String jumpUrl;

    @ApiModelProperty("新增时间")
    private Date createAt;

    @ApiModelProperty("编辑时间")
    private Date updateAt;


}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/integral/ComOpsAccRuleFuncVO.java

New file
@@ -0,0 +1,23 @@
package com.panzhihua.common.model.vos.integral;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 积分功能
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-28 16:08
 **/
@Data
@ApiModel("》运营 》积分 》积分功能")
public class ComOpsAccRuleFuncVO {

    @ApiModelProperty("自增id")
    private Long id;

    @ApiModelProperty("积分功能描述")
    private String desc;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/integral/ComOpsAccRuleVO.java

New file
@@ -0,0 +1,35 @@
package com.panzhihua.common.model.vos.integral;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 积分规则
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-28 16:00
 **/
@Data
@ApiModel("》运营 》积分 》规则")
public class ComOpsAccRuleVO {

    @ApiModelProperty("自增id")
    private Long id;

    @ApiModelProperty("积分功能id")
    private Integer funcId;

    @ApiModelProperty("积分项目")
    private String accItem;

    @ApiModelProperty("获得积分")
    private Integer score;

    @ApiModelProperty("每日上限")
    private Integer max;

    @ApiModelProperty("备注")
    private String appendix;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/integral/ComOpsAccUserVO.java

New file
@@ -0,0 +1,35 @@
package com.panzhihua.common.model.vos.integral;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 积分用户关系
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-28 16:14
 **/
@Data
@ApiModel("》运营 》积分 》用户关系")
public class ComOpsAccUserVO {

    @ApiModelProperty("自增id")
    private Long id;

    @ApiModelProperty("用户id，可以关联出名称、手机、社区等信息")
    private Integer userId;

    @ApiModelProperty("积分规则id，可以关联积分功能，积分项目")
    private Integer ruleId;

    @ApiModelProperty("积分变化，可正可负")
    private Integer scoreChange;

    @ApiModelProperty("积分变化时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date changeAt;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java

@@ -21,15 +21,15 @@
public class AdministratorsUserVO {

    @ApiModelProperty("账户")
    @Pattern(groups = {AddGroup.class},message="账户2-20个字符，英文，数字",regexp="^[0-9A-Za-z]{2,20}$")
    @Pattern(groups = {AddGroup.class},message="【账户】2-20个字符，英文，数字",regexp="^[0-9A-Za-z]{2,20}$")
    private String account;

    @ApiModelProperty("密码")
    @Pattern(groups = {AddGroup.class},message="密码格式为6-16个字符，英文，数字，且必须包含英文和数字",regexp="^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$")
    @Pattern(groups = {AddGroup.class},message="【密码】格式为6-16个字符，英文，数字，且必须包含英文和数字",regexp="^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$")
    private String password;

    @ApiModelProperty("用户名称")
    @Pattern(groups = {AddGroup.class},message="用户名称2-16个字符，英文，中文，数字",regexp="^[0-9A-Za-z\u4e00-\u9fa5]{2,16}$")
    @Pattern(groups = {AddGroup.class},message="【用户名称】2-16个字符，英文，中文，数字",regexp="^[0-9A-Za-z\u4e00-\u9fa5]{2,16}$")
    private String name;

    @ApiModelProperty("角色")
@@ -37,7 +37,7 @@
    private Long roleId;

    @ApiModelProperty("手机号")
    @Pattern(groups = {AddGroup.class},message="2-16个字符，英文，中文，数字",regexp = "1[3|4|5|7|8][0-9]\\d{8}")
    @Pattern(groups = {AddGroup.class},message="【手机号】格式错误",regexp = "1[3|4|5|7|8][0-9]\\d{8}")
    private String phone;

    @ApiModelProperty("状态")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -1,5 +1,6 @@
package com.panzhihua.common.service.community;

import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.community.*;
@@ -486,4 +487,19 @@
     */
    @PostMapping("putcommngstructbuildtype")
    R putComMngStructBuildType(@RequestBody SystemmanagementConfigVO systemmanagementConfigVO);

    /**
     * 获取广告跳转内容配置
     * @return 跳转内容集合
     */
    @PostMapping("getjumpcontent")
    R getJumpContent();

    /**
     * 编辑运营后台系统配置
     * @param appletesBackstageConfigDTO 编辑内容
     * @return 编辑结果
     */
    @PostMapping("putconfig")
    R putConfig(@RequestBody AppletesBackstageConfigDTO appletesBackstageConfigDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -277,11 +277,11 @@

    /**
     * 平台菜单列表
     * @param type 1 运营平台 2 社区平台
     * @param communityId 社区id 0 运营平台
     * @return 菜单集合
     */
    @PostMapping("/role/listmenubackstage")
    R listMenuBackstage(@RequestParam("type")int type);
    R listMenuBackstage(@RequestParam("communityId")Long communityId);

    /**
     * 设置角色的权限

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/exception/ServiceException.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/dtos/AppletesBackstageConfigDTO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvJumpDTO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/AppletesBackstageConfigVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/SystemmanagementConfigVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/advertisement/ComOpsAdvJumpVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/advertisement/ComOpsAdvPosVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/advertisement/ComOpsAdvVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/integral/ComOpsAccRuleFuncVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/integral/ComOpsAccRuleVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/integral/ComOpsAccUserVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/user/AdministratorsUserVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/community/CommunityService.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/user/UserService.class

Binary files differ

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

@@ -44,7 +44,7 @@
        return userService.addUserBackstage(administratorsUserVO);
    }

    @ApiOperation(value = "编辑运营后台账户")
    @ApiOperation(value = "编辑社区后台账户")
    @PutMapping("user")
    @OperLog(operModul = "用户管理",operType = 2)
    public R putUserBackstage(@RequestBody  AdministratorsUserVO administratorsUserVO){
@@ -70,6 +70,7 @@
        if (null==userId||0==userId) {
            return R.fail("用户主键不能为空");
        }
        administratorsUserVO.setCommunityId(this.getCommunityId());
        return userService.deleteUserBackstage(administratorsUserVO);
    }

@@ -118,8 +119,8 @@
    @ApiOperation(value = "运营平台权限配置列表",response = SysMenuVO.class)
    @GetMapping("listmenu")
    public R listMenuBackstage(){
        int type=1;
        return userService.listMenuBackstage(type);
        Long communityId = this.getCommunityId();
        return userService.listMenuBackstage(communityId);
    }

    @ApiOperation(value = "设置角色的权限")
@@ -137,8 +138,8 @@
        return userService.pageOperLog(sysOperLogVO);
    }

    @ApiOperation(value = "系统配置",response = SystemmanagementConfigVO.class)
    @PostMapping("config")
    @ApiOperation(value = "获取系统配置",response = SystemmanagementConfigVO.class)
    @GetMapping("config")
    public R config(){
        Long communityId = this.getCommunityId();
        R r=userService.listComMngUserTag(communityId);
@@ -155,12 +156,15 @@

    @ApiOperation(value = "新增、删除系统配置")
    @PutMapping("config")
    public R putconfig(@RequestBody SystemmanagementConfigVO systemmanagementConfigVO){
    public R putconfig(@RequestBody @Validated(AddGroup.class) SystemmanagementConfigVO systemmanagementConfigVO){
        Long communityId = this.getCommunityId();
        systemmanagementConfigVO.setCommunityId(communityId);
        R r=userService.putComMngUserTag(systemmanagementConfigVO);
        if (!R.isOk(r)) {
            return r;
        }
        R r1=communityService.putComMngStructBuildType(systemmanagementConfigVO);
        return R.ok();
        return r1;
    }



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

New file
@@ -0,0 +1,33 @@
package com.panzhihua.service_community.api;

import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComOpsAdvService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 广告
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-28 17:32
 **/
@Slf4j
@RestController
@RequestMapping("/")
public class AdvertisementApi {
    @Resource
    private ComOpsAdvService comOpsAdvService;

    /**
     * 获取广告跳转内容配置
     * @return 跳转内容集合
     */
    @PostMapping("getjumpcontent")
    public R getJumpContent(){
        return comOpsAdvService.getJumpContent();
    }
}

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

@@ -2,7 +2,9 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.exception.ServiceException;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import com.panzhihua.service_community.model.dos.ComActActPrizeDO;
@@ -223,7 +225,12 @@
        R r = comActActivityService.listActivitySign(activitySignVO);
        if (R.isOk(r)) {
            List<ActivitySignVO> activitySignVOS = (List<ActivitySignVO>) r.getData();
            comActActivityVO.setActivitySignVOList(activitySignVOS);
            int size = activitySignVOS.size();
            if (size>=6) {
                comActActivityVO.setActivitySignVOList(activitySignVOS.subList(0,6));
            } else {
                comActActivityVO.setActivitySignVOList(activitySignVOS);
            }
        }
        return R.ok(comActActivityVO);
    }
@@ -858,4 +865,19 @@
        return comMngStructOtherBuildService.listComMngStructBuildType(communityId);
    }

    /**
     * 增加删除建筑类型
     * @param systemmanagementConfigVO 操作内容
     * @return  操作结果
     */
    @PostMapping("putcommngstructbuildtype")
    public R putComMngStructBuildType(@RequestBody SystemmanagementConfigVO systemmanagementConfigVO){
        try {
            R r=comMngStructOtherBuildService.putComMngStructBuildType(systemmanagementConfigVO);
        } catch (ServiceException e) {
            return R.fail(e.getMessage());
        }
        return R.ok();
    }

}

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

@@ -9,6 +9,8 @@
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 其他建筑
@@ -48,4 +50,14 @@
            " </where>" +
            "</script>")
    IPage<ComMngStructOtherBuildVO> pageOtherBuild(Page page, @Param("comMngStructOtherBuildVO") ComMngStructOtherBuildVO comMngStructOtherBuildVO);

    @Select("SELECT\n" +
            "b.type_id \n" +
            "FROM\n" +
            "com_mng_struct_other_build b\n" +
            "WHERE\n" +
            "b.community_id = #{communityId}\n" +
            "GROUP BY\n" +
            "b.type_id")
    List<Long> selectAllBuildTypeIds(Long communityId);
}

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

New file
@@ -0,0 +1,26 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComOpsAccRuleDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 积分规则
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-28 15:58
 **/
@Mapper
public interface ComOpsAccRuleDAO extends BaseMapper<ComOpsAccRuleDO> {
    //    @Select("<script> " +
//            " <where>" +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            " </where>" +
//            "</script>")

}

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

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComOpsAccRuleFuncDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 积分功能
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-28 16:07
 **/
@Mapper
public interface ComOpsAccRuleFuncDAO extends BaseMapper<ComOpsAccRuleFuncDO> {
}

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

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComOpsAccUserDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 积分规则用户关系
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-28 16:13
 **/
@Mapper
public interface ComOpsAccUserDAO extends BaseMapper<ComOpsAccUserDO> {
}

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

New file
@@ -0,0 +1,25 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComOpsAdvDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 广告
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-28 15:40
 **/
@Mapper
public interface ComOpsAdvDAO extends BaseMapper<ComOpsAdvDO> {
    //    @Select("<script> " +
//            " <where>" +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            " </where>" +
//            "</script>")
}

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

New file
@@ -0,0 +1,26 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComOpsAdvDO;
import com.panzhihua.service_community.model.dos.ComOpsAdvJumpDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 跳转内容
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-28 15:46
 **/
@Mapper
public interface ComOpsAdvJumpDAO extends BaseMapper<ComOpsAdvJumpDO> {
    //    @Select("<script> " +
//            " <where>" +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            " </where>" +
//            "</script>")
}

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

New file
@@ -0,0 +1,25 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComOpsAdvPosDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 广告位置
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-28 15:51
 **/
@Mapper
public interface ComOpsAdvPosDAO extends BaseMapper<ComOpsAdvPosDO> {
    //    @Select("<script> " +
//            " <where>" +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            " </where>" +
//            "</script>")
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructOtherBuildDO.java

@@ -60,4 +60,8 @@
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    /**
     * 社区id
     */
    private Long communityId;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVolunteerMngDO.java

@@ -1,8 +1,6 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
@@ -28,6 +26,7 @@
    /**
     * 创建时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAccRuleDO.java

New file
@@ -0,0 +1,49 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 积分规则
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-28 15:56
 **/
@Data
@TableName(value = "com_ops_acc_rule")
public class ComOpsAccRuleDO implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * 自增id
     */
    private Long id;

    /**
     * 积分功能id
     */
    private Integer funcId;

    /**
     * 积分项目
     */
    private String accItem;

    /**
     * 获得积分
     */
    private Integer score;

    /**
     * 每日上限
     */
    private Integer max;

    /**
     * 备注
     */
    private String appendix;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAccRuleFuncDO.java

New file
@@ -0,0 +1,29 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: J积分功能
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-28 16:06
 **/
@Data
@TableName(value = "com_ops_acc_rule_func")
public class ComOpsAccRuleFuncDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 自增id
     */
    private Long id;

    /**
     * 积分功能描述
     */
    private String desc;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAccUserDO.java

New file
@@ -0,0 +1,46 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 积分规则用户关系
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-28 16:10
 **/
@Data
@TableName(value = "com_ops_acc_user")
public class ComOpsAccUserDO implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * 自增id
     */
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 用户id，可以关联出名称、手机、社区等信息
     */
    private Integer userId;

    /**
     * 积分规则id，可以关联积分功能，积分项目
     */
    private Integer ruleId;

    /**
     * 积分变化，可正可负
     */
    private Integer scoreChange;

    /**
     * 积分变化时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date changeAt;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAdvDO.java

New file
@@ -0,0 +1,71 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 广告
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-28 15:37
 **/
@Data
@TableName(value = "com_ops_adv")
public class ComOpsAdvDO implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * 自增id
     */
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 广告位置id
     */
    private Integer posId;

    /**
     * 图片路径
     */
    private String photoPath;

    /**
     * 链接类型：0~ 外部链接；1 ~ 内部链接
     */
    private Integer linkType;

    /**
     * 上架时间
     */
    private Date onAt;

    /**
     * 下架时间
     */
    private Date offAt;

    /**
     * 跳转内容id
     */
    private Long jumpId;

    /**
     * 跳转url地址
     */
    private String jumpUrl;
    /**
     * 创建时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createDt;
    /**
     * 修改时间
     */
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Date updateAt;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAdvJumpDO.java

New file
@@ -0,0 +1,29 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 广告跳转内容
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-28 15:45
 **/
@Data
@TableName(value = "com_ops_adv_jump")
public class ComOpsAdvJumpDO implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * id
     */
    private Long id;

    /**
     * 跳转内容
     */
    private String jumpContent;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAdvPosDO.java

New file
@@ -0,0 +1,26 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 广告位置
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-28 15:50
 **/
@Data
@TableName(value = "com_ops_adv_pos")
public class ComOpsAdvPosDO implements Serializable {
    /**
     * 自增id
     */
    private Long id;

    /**
     * 广告位置中文描述
     */
    private String desc;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngStructOtherBuildService.java

@@ -1,6 +1,7 @@
package com.panzhihua.service_community.service;

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.community.ComMngStructOtherBuildVO;

/**
@@ -34,4 +35,10 @@
     * @return 建筑集合
     */
    R listComMngStructBuildType(Long communityId);
    /**
     * 增加删除建筑类型
     * @param systemmanagementConfigVO 操作内容
     * @return  操作结果
     */
    R putComMngStructBuildType(SystemmanagementConfigVO systemmanagementConfigVO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComOpsAccRuleService.java

New file
@@ -0,0 +1,10 @@
package com.panzhihua.service_community.service;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 积分
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-28 16:03
 **/
public interface ComOpsAccRuleService {
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComOpsAdvService.java

New file
@@ -0,0 +1,17 @@
package com.panzhihua.service_community.service;

import com.panzhihua.common.model.vos.R;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 广告
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-28 15:41
 **/
public interface ComOpsAdvService {
    /**
     * 获取广告跳转内容配置
     * @return 跳转内容集合
     */
    R getJumpContent();
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java

@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.exception.ServiceException;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.community.ComMngStructBuildTypeVO;
import com.panzhihua.common.model.vos.community.ComMngStructOtherBuildVO;
import com.panzhihua.service_community.dao.ComMngStructBuildTypeDAO;
@@ -13,11 +15,13 @@
import com.panzhihua.service_community.service.ComMngStructOtherBuildService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -111,4 +115,40 @@
        });
        return R.ok(comMngStructBuildTypeVOList);
    }

    /**
     * 增加删除建筑类型
     *
     * @param systemmanagementConfigVO 操作内容
     * @return 操作结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R putComMngStructBuildType(SystemmanagementConfigVO systemmanagementConfigVO) {
        Long communityId = systemmanagementConfigVO.getCommunityId();
        List<ComMngStructBuildTypeVO> comMngStructBuildTypeVOList = systemmanagementConfigVO.getComMngStructBuildTypeVOList();
        if (ObjectUtils.isEmpty(comMngStructBuildTypeVOList)) {
            return R.fail("建筑类型不能为空");
        }
        List<Long> collect = comMngStructBuildTypeVOList.stream().map(comMngStructBuildTypeVO -> comMngStructBuildTypeVO.getId()).collect(Collectors.toList());
        List<Long> buildTypdIds= comMngStructOtherBuildDAO.selectAllBuildTypeIds(communityId);
        buildTypdIds.forEach(aLong -> {
            if (!collect.contains(aLong)) {
                ComMngStructBuildTypeDO comMngStructBuildTypeDO = comMngStructBuildTypeDAO.selectById(aLong);
                throw new ServiceException(comMngStructBuildTypeDO.getName()+"已经在使用无法删除");
            }
        });
         comMngStructBuildTypeDAO.delete(new QueryWrapper<ComMngStructBuildTypeDO>().lambda().eq(ComMngStructBuildTypeDO::getCommunityId, communityId));
        comMngStructBuildTypeVOList.forEach(comMngStructBuildTypeVO -> {
            String name = comMngStructBuildTypeVO.getName();
            if (ObjectUtils.isEmpty(name)) {
                throw new RuntimeException("建筑类型名称不能为空");
            }
            ComMngStructBuildTypeDO comMngStructBuildTypeDO=new ComMngStructBuildTypeDO();
            comMngStructBuildTypeDO.setCommunityId(communityId);
            comMngStructBuildTypeDO.setName(name);
            comMngStructBuildTypeDAO.insert(comMngStructBuildTypeDO);
        });
        return R.ok();
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java

@@ -41,6 +41,7 @@
            return R.fail("手机号已经存在");
        }
        ComMngVolunteerMngDO comMngVolunteerMngDO=new ComMngVolunteerMngDO();
        BeanUtils.copyProperties(comMngVolunteerMngVO,comMngVolunteerMngDO);
        int insert = comMngVolunteerMngDAO.insert(comMngVolunteerMngDO);
        if (insert>0) {
            return R.ok();

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsAccRuleServiceImpl.java

New file
@@ -0,0 +1,14 @@
package com.panzhihua.service_community.service.impl;

import com.panzhihua.service_community.service.ComOpsAccRuleService;
import org.springframework.stereotype.Service;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 积分
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-28 16:03
 **/
@Service
public class ComOpsAccRuleServiceImpl implements ComOpsAccRuleService {
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsAdvServiceImpl.java

New file
@@ -0,0 +1,44 @@
package com.panzhihua.service_community.service.impl;

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.advertisement.ComOpsAdvJumpVO;
import com.panzhihua.service_community.dao.ComOpsAdvJumpDAO;
import com.panzhihua.service_community.model.dos.ComOpsAdvJumpDO;
import com.panzhihua.service_community.service.ComOpsAdvService;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 广告
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-28 15:41
 **/
@Service
public class ComOpsAdvServiceImpl implements ComOpsAdvService {
    @Resource
    private ComOpsAdvJumpDAO comOpsAdvJumpDAO;
    /**
     * 获取广告跳转内容配置
     *
     * @return 跳转内容集合
     */
    @Override
    public R getJumpContent() {
        List<ComOpsAdvJumpVO> comOpsAdvJumpVOS=new ArrayList<>();
        List<ComOpsAdvJumpDO> comOpsAdvJumpDOS = comOpsAdvJumpDAO.selectList(null);
        if (!ObjectUtils.isEmpty(comOpsAdvJumpDOS)) {
            comOpsAdvJumpDOS.forEach(comOpsAdvJumpDO -> {
                ComOpsAdvJumpVO comOpsAdvJumpVO=new ComOpsAdvJumpVO();
                comOpsAdvJumpVO.setId(comOpsAdvJumpDO.getId());
                comOpsAdvJumpVO.setJumpContent(comOpsAdvJumpDO.getJumpContent());
                comOpsAdvJumpVOS.add(comOpsAdvJumpVO);
            });
        }
        return R.ok(comOpsAdvJumpVOS);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java

@@ -34,7 +34,7 @@
            "a.enroll_time_end \n" +
            "FROM\n" +
            "com_pb_activity_member m\n" +
            "JOIN com_bp_activity a ON m.activity_id = a.id \n" +
            "JOIN com_pb_activity a ON m.activity_id = a.id \n" +
            "WHERE\n" +
            "m.member_id = 1 \n" +
            "<if test='name != null and name.trim() != &quot;&quot;'>" +
@@ -64,7 +64,7 @@
            "enroll_time_begin,\n" +
            "enroll_time_end \n" +
            "FROM\n" +
            "com_bp_activity \n" +
            "com_pb_activity \n" +
            "where community_id=#{partyBuildingActivityVO.communityId}\n"+
            "<if test='partyBuildingActivityVO.name != null and partyBuildingActivityVO.name.trim() != &quot;&quot;'>" +
            "and name = #{partyBuildingActivityVO.name} \n" +

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java

@@ -33,6 +33,7 @@
    @Select("<script> " +
            "SELECT\n" +
            "o.`name` orgName,\n" +
            "m.org_id,\n"+
            "m.id_card,\n"+
            "m.`id`,\n" +
            "u.phone,\n" +
@@ -63,6 +64,7 @@
            "and m.name=#{pagePartyOrganizationVO.name}"+
            " </if> " +
            " </where>" +
            "order by m.join_time desc "+
            "</script>")
    IPage<PartyBuildingMemberVO> pagePartyOrganization(Page page, @Param("pagePartyOrganizationVO") PagePartyOrganizationVO pagePartyOrganizationVO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java

@@ -83,12 +83,12 @@

    /**
     * 平台菜单列表
     * @param type 1 运营平台 2 社区平台
     * @param communityId 社区id 0 运营平台
     * @return 菜单集合
     */
    @PostMapping("listmenubackstage")
    public R listMenuBackstage(@RequestParam("type")int type){
        return roleService.listMenuBackstage(type);
    public R listMenuBackstage(@RequestParam("communityId")Long communityId){
        return roleService.listMenuBackstage(communityId);
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -2,6 +2,7 @@

import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.user.*;
import com.panzhihua.service_user.service.UserService;
import org.springframework.web.bind.annotation.PostMapping;
@@ -329,4 +330,14 @@
    public R listComMngUserTag(@RequestParam("communityId")Long communityId){
        return userService.listComMngUserTag(communityId);
    }

    /**
     * 新增删除用户标签
     * @param systemmanagementConfigVO 操作内容
     * @return 操作结果
     */
    @PostMapping("putcommngusertag")
    public R putComMngUserTag(@RequestBody SystemmanagementConfigVO systemmanagementConfigVO){
        return userService.putComMngUserTag(systemmanagementConfigVO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysMenuDO.java

@@ -108,7 +108,7 @@
     */
    private String remark;
    /**
     * 平台 1 运营后台 2 社区平台
     * 社区id
     */
    private Integer type;
    private Long communityId;
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/RoleService.java

@@ -53,10 +53,10 @@
    R deleteRoleBackstage(RoleVO roleVO);
    /**
     * 平台菜单列表
     * @param type 1 运营平台 2 社区平台
     * @param communityId 社区id 0 运营平台
     * @return 菜单集合
     */
    R listMenuBackstage(int type);
    R listMenuBackstage(Long communityId);
    /**
     * 设置角色的权限
     * @param menuRoleVO 用户设置的权限id

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -2,6 +2,7 @@

import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.user.*;

/**
@@ -203,4 +204,10 @@
     * @return 标签集合
     */
    R listComMngUserTag(Long communityId);
    /**
     * 新增删除用户标签
     * @param systemmanagementConfigVO 操作内容
     * @return 操作结果
     */
    R putComMngUserTag(SystemmanagementConfigVO systemmanagementConfigVO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java

@@ -158,14 +158,13 @@

    /**
     * 平台菜单列表
     *
     * @param type 1 运营平台 2 社区平台
     * @param communityId 社区id 0 运营平台
     * @return 菜单集合
     */
    @Override
    public R listMenuBackstage(int type) {
    public R listMenuBackstage(Long communityId) {
        List<SysMenuVO> sysMenuVOS=new ArrayList<>();
        List<SysMenuDO> sysMenuDOS = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getParentId, 0).eq(SysMenuDO::getType,type).orderByAsc(SysMenuDO::getOrderNum));
        List<SysMenuDO> sysMenuDOS = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getParentId, 0).eq(SysMenuDO::getCommunityId,communityId).orderByAsc(SysMenuDO::getOrderNum));
        if (!ObjectUtils.isEmpty(sysMenuDOS)) {
            sysMenuDOS.forEach(sysMenuDO -> {
                SysMenuVO sysMenuVO=new SysMenuVO();

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -9,6 +9,7 @@
import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO;
import com.panzhihua.common.model.vos.partybuilding.PageActivityMembersVO;
import com.panzhihua.common.model.vos.user.*;
@@ -213,7 +214,18 @@
    @Override
    public R changePassword(ChangePasswordVO changePasswordVO) {
        Long userId = changePasswordVO.getUserId();
        SysUserDO sysUserDO1 = userDao.selectById(userId);
        String oldPassoword = sysUserDO1.getPassword();
        String newPassword = changePasswordVO.getNewPassword();
        if (oldPassoword.equals(newPassword)) {
            return R.fail("新老密码不能相同");
        }
         oldPassoword = new BCryptPasswordEncoder().encode(oldPassoword);
        BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
        if( !encoder.matches(oldPassoword,newPassword)){
            return R.fail("老密码错误");

        }
        SysUserDO sysUserDO=new SysUserDO();
        sysUserDO.setUserId(userId);
        String encode = new BCryptPasswordEncoder().encode(newPassword);
@@ -706,9 +718,10 @@
        if (ObjectUtils.isEmpty(sysUserDO)) {
            return R.fail("用户不存在");
        }
        Integer type = sysUserDO.getType();
        if (type.intValue()!=2) {
            return R.fail("用户废运营平台用户");
        Long communityId = sysUserDO.getCommunityId();
        Long communityId1 = administratorsUserVO.getCommunityId();
        if (communityId1.intValue()!=communityId.intValue()) {
            return R.fail("用户不属于当前平台");
        }
        //删除用户
        int delete = userDao.deleteById(userId);
@@ -843,6 +856,32 @@
        return R.ok(comMngUserTagVOList);
    }

    /**
     * 新增删除用户标签
     *
     * @param systemmanagementConfigVO 操作内容
     * @return 操作结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R putComMngUserTag(SystemmanagementConfigVO systemmanagementConfigVO) {
        Long communityId = systemmanagementConfigVO.getCommunityId();
        List<ComMngUserTagVO> comMngUserTagVOList = systemmanagementConfigVO.getComMngUserTagVOList();
        if (!ObjectUtils.isEmpty(comMngUserTagVOList)) {
            comMngUserTagDAO.delete(null);
            comMngUserTagVOList.forEach(comMngUserTagVO -> {
                ComMngUserTagDO comMngUserTagDO=new ComMngUserTagDO();
                comMngUserTagDO.setCommunityId(communityId);
                comMngUserTagDO.setTagName(comMngUserTagVO.getTagName());
                comMngUserTagDAO.insert(comMngUserTagDO);
            });
            return R.ok();
        }else {
            return R.fail("用户标签不能为空");
        }

    }

    public static void main(String[] args) {
        String encode = new BCryptPasswordEncoder().encode("123456");
        System.out.println(encode);