运营后台用户管理

huanghongfa

2020-12-30 b1da1a1fd20d2392e0b686ba1ea72cd9eba7e723

运营后台用户管理

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -23,39 +23,28 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <change afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserManagementApi.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ActivitySignUpDTO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/user/PageUserAppletsBackstageDTO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserVO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/validated/PageGroup.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/UserApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/UserApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/auth/src/main/java/com/panzhihua/auth/config/SecurityConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/auth/src/main/java/com/panzhihua/auth/config/SecurityConfig.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java" beforeDir="false" afterPath="$PROJECT_DIR$/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/auth/src/main/java/com/panzhihua/auth/handel/UserLoginFailureHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/auth/src/main/java/com/panzhihua/auth/handel/UserLoginFailureHandler.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/auth/src/main/java/com/panzhihua/auth/handel/UserLoginSuccessHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/auth/src/main/java/com/panzhihua/auth/handel/UserLoginSuccessHandler.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/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/ComActEasyPhotoVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/partybuilding/PartyBuildingService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/partybuilding/PartyBuildingService.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/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$/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/SysUserVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/SysUserVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/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/java/com/panzhihua/service_dangjian/service/ComBpActivityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComBpActivityService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/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/model/dos/ComPbActivityDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbActivityDO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/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/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/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/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>
@@ -412,7 +401,7 @@
      <workItem from="1609120633455" duration="2000" />
      <workItem from="1609120765557" duration="31000" />
      <workItem from="1609121031103" duration="30812000" />
      <workItem from="1609219740946" duration="29821000" />
      <workItem from="1609219740946" duration="42713000" />
    </task>
    <servers />
  </component>
@@ -456,62 +445,62 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="561" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1609309867208" />
    <state x="93" y="93" width="1350" height="638" key="DiffContextDialog" timestamp="1608535183408">
    <state x="93" y="93" width="1350" height="638" key="DiffContextDialog" timestamp="1609316182000">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="93" y="93" width="1350" height="638" key="DiffContextDialog/0.0.1536.824@0.0.1536.824" timestamp="1608535183408" />
    <state x="93" y="93" width="1350" height="638" key="DiffContextDialog/0.0.1536.824@0.0.1536.824" timestamp="1609316182000" />
    <state x="549" y="167" key="FileChooserDialogImpl" timestamp="1606197830966">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1606197830966" />
    <state width="1031" height="303" key="GridCell.Tab.0.bottom" timestamp="1609309985296">
    <state width="1031" height="589" key="GridCell.Tab.0.bottom" timestamp="1609323188498">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="303" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609309985296" />
    <state width="1031" height="303" key="GridCell.Tab.0.center" timestamp="1609309985296">
    <state width="1031" height="589" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609323188498" />
    <state width="1031" height="589" key="GridCell.Tab.0.center" timestamp="1609323188498">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="303" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1609309985296" />
    <state width="1031" height="303" key="GridCell.Tab.0.left" timestamp="1609309985296">
    <state width="1031" height="589" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1609323188498" />
    <state width="1031" height="589" key="GridCell.Tab.0.left" timestamp="1609323188498">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="303" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1609309985296" />
    <state width="1031" height="303" key="GridCell.Tab.0.right" timestamp="1609309985296">
    <state width="1031" height="589" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1609323188498" />
    <state width="1031" height="589" key="GridCell.Tab.0.right" timestamp="1609323188498">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="303" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1609309985296" />
    <state width="1031" height="303" key="GridCell.Tab.1.bottom" timestamp="1609309985296">
    <state width="1031" height="589" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1609323188498" />
    <state width="1031" height="589" key="GridCell.Tab.1.bottom" timestamp="1609323188499">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="303" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609309985296" />
    <state width="1031" height="303" key="GridCell.Tab.1.center" timestamp="1609309985296">
    <state width="1031" height="589" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609323188499" />
    <state width="1031" height="589" key="GridCell.Tab.1.center" timestamp="1609323188499">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="303" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1609309985296" />
    <state width="1031" height="303" key="GridCell.Tab.1.left" timestamp="1609309985296">
    <state width="1031" height="589" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1609323188499" />
    <state width="1031" height="589" key="GridCell.Tab.1.left" timestamp="1609323188499">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="303" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1609309985296" />
    <state width="1031" height="303" key="GridCell.Tab.1.right" timestamp="1609309985296">
    <state width="1031" height="589" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1609323188499" />
    <state width="1031" height="589" key="GridCell.Tab.1.right" timestamp="1609323188499">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="303" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1609309985296" />
    <state width="1031" height="303" key="GridCell.Tab.2.bottom" timestamp="1609309985296">
    <state width="1031" height="589" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1609323188499" />
    <state width="1031" height="589" key="GridCell.Tab.2.bottom" timestamp="1609323188499">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="303" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609309985296" />
    <state width="1031" height="303" key="GridCell.Tab.2.center" timestamp="1609309985296">
    <state width="1031" height="589" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609323188499" />
    <state width="1031" height="589" key="GridCell.Tab.2.center" timestamp="1609323188499">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="303" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1609309985296" />
    <state width="1031" height="303" key="GridCell.Tab.2.left" timestamp="1609309985296">
    <state width="1031" height="589" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1609323188499" />
    <state width="1031" height="589" key="GridCell.Tab.2.left" timestamp="1609323188499">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="303" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1609309985296" />
    <state width="1031" height="303" key="GridCell.Tab.2.right" timestamp="1609309985296">
    <state width="1031" height="589" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1609323188499" />
    <state width="1031" height="589" key="GridCell.Tab.2.right" timestamp="1609323188499">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="303" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1609309985296" />
    <state width="1031" height="589" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1609323188499" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1606714311663">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -520,22 +509,22 @@
      <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="1609294498031">
    <state width="498" height="540" key="SwitcherDM" timestamp="1609312215199">
      <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="1609294498031" />
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog" timestamp="1608535536014">
    <state width="498" height="540" key="SwitcherDM/0.0.1536.824@0.0.1536.824" timestamp="1609312215199" />
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog" timestamp="1609316182000">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1608535536014" />
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1609316182000" />
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1609226181026">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1609226181026" />
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1609292338459">
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1609312579188">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1609292338459" />
    <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1609312579188" />
    <state x="301" y="45" key="new project wizard" timestamp="1609120520884">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -554,15 +543,6 @@
    <state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1609223814946" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
      <breakpoints>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/auth/src/main/java/com/panzhihua/auth/handel/UserLoginSuccessHandler.java</url>
          <line>31</line>
          <option name="timeStamp" value="95" />
        </line-breakpoint>
      </breakpoints>
    </breakpoint-manager>
    <pin-to-top-manager>
      <pinned-members>
        <PinnedItemInfo parentTag="com.panzhihua.common.model.vos.R" memberName="data" />

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

@@ -53,7 +53,7 @@
        return communityService.addEasyPhoto(comActEasyPhotoVO);
    }

    @ApiOperation("随手拍详情")
    @ApiOperation(value = "随手拍详情",response =ComActEasyPhotoVO.class )
    @GetMapping("detaileasyphoto")
    @ApiImplicitParam(name = "id",value = "随手拍主键")
    public R detailEasyPhoto (@RequestParam("id") Long id){

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

@@ -60,9 +60,13 @@
             sessionInfo = maService.getUserService().getSessionInfo(code);
        } catch (Exception e) {
            log.error("微信登录失败【{}】", e.getMessage());
            sessionInfo=new WxMaJscode2SessionResult();
            sessionInfo.setOpenid("88888888");
            sessionInfo.setSessionKey("9999999");
            if (code.equals("22")) {
                sessionInfo=new WxMaJscode2SessionResult();
                sessionInfo.setOpenid("88888888");
                sessionInfo.setSessionKey("9999999");
            }else{
                return R.fail("微信登录失败");
            }
        }
        log.info("微信登录成功【{}】", JSONObject.toJSONString(sessionInfo));
        String openid = sessionInfo.getOpenid();

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

@@ -196,6 +196,7 @@
    public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        Long userId = this.getUserId();
        comActEasyPhotoVO.setUserId(userId);
        comActEasyPhotoVO.setLogInUserId(userId);
        comActEasyPhotoVO.setCommunityId(null);
        return communityService.pageEasyPhoto(comActEasyPhotoVO);
    }

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/config/SecurityConfig.java

@@ -6,6 +6,7 @@
import com.panzhihua.auth.handel.UserLoginSuccessHandler;
import com.panzhihua.auth.handel.UserLogoutSuccessHandler;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -20,6 +21,7 @@
 * SpringSecurity配置类
 * @Author youcong
 */
@Configuration
@EnableWebSecurity
public class SecurityConfig extends WebSecurityConfigurerAdapter {
    /**
@@ -28,6 +30,8 @@
    @Resource
    private UserAuthenticationProvider userAuthenticationProvider;



    /**
     * 加密方式
     * @Author youcong

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java

@@ -55,6 +55,7 @@
        }
        // 我们还要判断密码是否正确，这里我们的密码使用BCryptPasswordEncoder进行加密的
        if (!new BCryptPasswordEncoder().matches(password, loginUserInfoVO.getPassword())) {
//            throw new RuntimeException("顶顶顶顶");
            throw new BadCredentialsException("密码不正确");
        }
        // 还可以加一些其他信息的判断，比如用户账号已停用等判断

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserLoginFailureHandler.java

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

import com.panzhihua.common.utlis.ResultUtil;
import com.panzhihua.common.model.vos.R;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.LockedException;
import org.springframework.security.core.AuthenticationException;
@@ -18,6 +19,8 @@
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-24 16:02
 **/
@Slf4j
@Component
public class UserLoginFailureHandler implements AuthenticationFailureHandler {
    /**
     * 登录失败返回结果
@@ -25,6 +28,7 @@
     */
    @Override
    public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception){
        log.info("登录失败");
        // 这些对于操作的处理类可以根据不同异常进行不同处理
        if (exception instanceof UsernameNotFoundException){
            ResultUtil.responseJson(response, R.fail("用户名不存在"));

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserLoginSuccessHandler.java

@@ -5,6 +5,7 @@
import com.panzhihua.common.utlis.ResultUtil;
import com.panzhihua.common.constants.TokenConstant;
import com.panzhihua.common.model.vos.R;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.core.Authentication;
import org.springframework.security.web.authentication.AuthenticationSuccessHandler;

@@ -20,14 +21,16 @@
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-24 15:23
 **/
@Slf4j
public class UserLoginSuccessHandler implements AuthenticationSuccessHandler {
    @Override
    public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, FilterChain chain, Authentication authentication) throws IOException, ServletException {

        log.info("登录成功");
    }

    @Override
    public void onAuthenticationSuccess(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Authentication authentication) throws IOException, ServletException {
        log.info("登录成功");
        // 组装JWT
        LoginUserInfoVO loginUserInfoVO =  (LoginUserInfoVO) authentication.getPrincipal();
        String token = JWTTokenUtil.generateToken(loginUserInfoVO);

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

@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.user;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -35,9 +36,11 @@
    private Integer status;

    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty("最后登录时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date lastLoginTime;



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

Binary files differ

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

@@ -28,6 +28,7 @@
            "su.`name` handler_name,\n" +
            "p.`status`,\n" +
            "p.`detail`,\n" +
            "p.`photo_path_list`,\n" +
            "p.create_at,\n" +
            "p.examine_at \n" +
            "FROM\n" +
@@ -68,7 +69,7 @@
    @Select("SELECT \n" +
            "p.id,\n" +
            "p.create_at,\n" +
            "u.`name`,\n" +
            "u.`name` sponsorName,\n" +
            "u.`image_url`,\n" +
            "u.phone,\n" +
            "p.detail,\n" +
@@ -78,11 +79,13 @@
            "su.`name`,\n" +
            "p.handle_result,\n" +
            "p.photo_path_list,\n" +
            "count(pu.id)giveThumbsUpNum,\n" +
            "p.handle_photo_list\n" +
            "FROM\n" +
            "com_act_easy_photo p\n" +
            "JOIN sys_user u on p.sponsor_id=u.user_id\n" +
            "LEFT JOIN sys_user su on p.handler_id=su.user_id\n" +
            "LEFT JOIN com_act_easy_photo_user pu on p.id=pu.easy_photo_id\n" +
            "WHERE p.id=#{id}")
    ComActEasyPhotoVO detailEasyPhoto(Long id);
}

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

@@ -78,7 +78,7 @@
    @Override
    public R detailEasyPhoto(Long id, Long userId) {
        ComActEasyPhotoVO comActEasyPhotoVO=comActEasyPhotoDAO.detailEasyPhoto(id);
        if (ObjectUtils.isEmpty(comActEasyPhotoVO)) {
        if (ObjectUtils.isEmpty(comActEasyPhotoVO)||null==comActEasyPhotoVO.getStatus()) {
            return R.fail("随手拍不存在");
        }
        ComActEasyPhotoUserDO comActEasyPhotoUserDO = comActEasyPhotoUserDAO.selectOne(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, userId));

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

@@ -23,20 +23,21 @@

    @Select("<script> " +
            "SELECT\n" +
            "a.id activityId,\n" +
            "a.NAME,\n" +
            "a.id,\n" +
            "a.name,\n" +
            "a.address,\n" +
            "a.status,\n" +
            "a.create_at releaseTimeBegin,\n" +
            "a.activity_time_begin,\n" +
            "a.activity_time_end,\n" +
            "a.enroll_time_begin,\n" +
            "a.release_time,\n" +
            "a.enroll_time_end \n" +
            "FROM\n" +
            "com_pb_activity_member m\n" +
            "JOIN com_pb_activity a ON m.activity_id = a.id \n" +
            "WHERE\n" +
            "m.member_id = 1 \n" +
            "m.member_id = #{id} \n" +
            "<if test='name != null and name.trim() != &quot;&quot;'>" +
            "AND a.`name` = #{name} \n" +
            " </if> " +

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbActivityDO.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

import java.io.Serializable;

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java

@@ -16,14 +16,13 @@
import com.panzhihua.service_dangjian.model.dos.ComPbActivityMemberDO;
import com.panzhihua.service_dangjian.model.dos.ComPbMemberDO;
import com.panzhihua.service_dangjian.service.ComBpActivityService;
import org.apache.http.client.utils.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

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

/**
@@ -64,6 +63,7 @@
        Page page = new Page<>();
        Long pageNum = pageActivityMembersVO.getPageNum();
        Long pageSize = pageActivityMembersVO.getPageSize();
        Long activityId = pageActivityMembersVO.getActivityId();
        if (null == pageNum) {
            pageNum = 1l;
        }
@@ -73,7 +73,12 @@
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<PageActivityMembersVO> iPage = comPbActivityMemberDAO.pageActivityMembers(page, pageActivityMembersVO);
        return R.ok(iPage);
        Map<String,Object> map=new HashMap<>(3);
        ComPbActivityDO comPbActivityDO = comBpActivityDAO.selectById(activityId);
        map.put("page",iPage);
        map.put("name",comPbActivityDO.getName());
        map.put("createAt",DateUtils.formatDate(comPbActivityDO.getCreateAt(),"yyyy-MM-dd HH:mm:ss"));
        return R.ok(map);
    }

    /**
@@ -215,7 +220,7 @@
        ComPbActivityDO comPbActivityDO = new ComPbActivityDO();
        comPbActivityDO.setId(partyBuildingActivityVO.getId());
        comPbActivityDO.setCancelReason(partyBuildingActivityVO.getCancelReason());
        comPbActivityDO.setCreateBy(partyBuildingActivityVO.getCreateBy());
        comPbActivityDO.setStatus(6);
        int update = comBpActivityDAO.updateById(comPbActivityDO);
        if (update > 0) {
            return R.ok();

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -127,14 +127,14 @@

    @Select("<script> " +
            "select \n" +
            "u.userId,\n" +
            "u.user_id,\n" +
            "u.phone,\n" +
            "u.nick_name,\n" +
            "u.name,\n" +
            "a.name communityName,\n" +
            "a.status,\n" +
            "a.create_at,\n" +
            "a.last_login_time\n" +
            "u.status,\n" +
            "u.create_at,\n" +
            "u.last_login_time\n" +
            "from sys_user u\n" +
            "left join com_act a on u.community_id=a.community_id\n" +
            " <where>" +