springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -23,22 +23,34 @@ </component> <component name="ChangeListManager"> <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment=""> <change afterPath="$PROJECT_DIR$/applets/src/main/resources/logback-spring.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/applets_backstage/src/main/resources/logback-spring.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/auth/src/main/resources/logback-spring.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/community_backstage/src/main/resources/logback-spring.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/config_server/src/main/resources/logback-spring.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/eureka_server/src/main/resources/logback-spring.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/resources/logback-spring.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_partybuilding/src/main/resources/logback-spring.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_user/src/main/resources/logback-spring.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/zuul/src/main/resources/logback-spring.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/config/MyMetaObjectHandler.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/config/MyMetaObjectHandler.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/config/MybatisPlusConfig.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_backstage/src/main/java/com/panzhihua/applets_backstage/api/LoginApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/LoginApi.java" 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/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/java/com/panzhihua/applets/exception/GlobalExceptionCapture.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/exception/GlobalExceptionCapture.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$/common/target/common-1.0-SNAPSHOT.jar" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/common-1.0-SNAPSHOT.jar" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/maven-archiver/pom.properties" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" 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/model/vos/community/ComActMicroWishVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructHouseVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructHouseVO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.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/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/model/vos/community/ComActMicroWishVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActMicroWishVO.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComMngStructHouseVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComMngStructHouseVO.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.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$/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/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/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/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" /> </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> @@ -90,7 +102,7 @@ <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> <property name="WebServerToolWindowFactoryState" value="false" /> <property name="aspect.path.notification.shown" value="true" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/zuul/src/main/resources" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user" /> <property name="project.structure.last.edited" value="Modules" /> <property name="project.structure.proportion" value="0.15" /> <property name="project.structure.side.proportion" value="0.2850575" /> @@ -104,18 +116,18 @@ </component> <component name="RecentsManager"> <key name="CopyClassDialog.RECENTS_KEY"> <recent name="com.panzhihua.service_dangjian.config" /> <recent name="com.panzhihua.service_community.config" /> <recent name="com.panzhihua.applets.api" /> <recent name="com.panzhihua.applets.config" /> <recent name="com.panzhihua.zuul.config" /> <recent name="com.panzhihua.zuul.exceptions" /> </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" /> <recent name="F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\zuul\src\main\resources" /> <recent name="F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\service_user\src\main\resources" /> <recent name="F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\service_partybuilding\src\main\resources" /> <recent name="F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\service_community\src\main\resources" /> <recent name="F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\eureka_server\src\main\resources" /> </key> </component> <component name="RunDashboard"> @@ -388,7 +400,7 @@ <workItem from="1608371107059" duration="646000" /> <workItem from="1608371917868" duration="79000" /> <workItem from="1608379508016" duration="46000" /> <workItem from="1608531425658" duration="27403000" /> <workItem from="1608531425658" duration="38249000" /> </task> <servers /> </component> @@ -420,18 +432,18 @@ <screen x="0" y="0" width="1536" height="824" /> </state> <state x="405" y="335" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog/0.0.1536.824@0.0.1536.824" timestamp="1606099594079" /> <state x="0" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog" timestamp="1606969359946"> <state x="0" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog" timestamp="1608617413896"> <screen x="0" y="0" width="1536" height="824" /> </state> <state x="0" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog/0.0.1536.824@0.0.1536.824" timestamp="1606969359946" /> <state x="0" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog/0.0.1536.824@0.0.1536.824" timestamp="1608617413896" /> <state x="499" y="159" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1608103012443"> <screen x="0" y="0" width="1536" height="824" /> </state> <state x="499" y="159" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1536.824@0.0.1536.824" timestamp="1608103012443" /> <state width="561" height="466" key="DebuggerActiveHint" timestamp="1608537541370"> <state width="561" height="466" key="DebuggerActiveHint" timestamp="1608624568355"> <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="1608537541370" /> <state width="561" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1608624568355" /> <state x="93" y="93" width="1350" height="638" key="DiffContextDialog" timestamp="1608535183408"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -440,54 +452,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="339" key="GridCell.Tab.0.bottom" timestamp="1608616977097"> <state width="1031" height="342" key="GridCell.Tab.0.bottom" timestamp="1608628027944"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="339" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608616977097" /> <state width="1031" height="339" key="GridCell.Tab.0.center" timestamp="1608616977097"> <state width="1031" height="342" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608628027944" /> <state width="1031" height="342" key="GridCell.Tab.0.center" timestamp="1608628027944"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="339" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1608616977097" /> <state width="1031" height="339" key="GridCell.Tab.0.left" timestamp="1608616977097"> <state width="1031" height="342" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1608628027944" /> <state width="1031" height="342" key="GridCell.Tab.0.left" timestamp="1608628027944"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="339" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1608616977097" /> <state width="1031" height="339" key="GridCell.Tab.0.right" timestamp="1608616977097"> <state width="1031" height="342" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1608628027944" /> <state width="1031" height="342" key="GridCell.Tab.0.right" timestamp="1608628027944"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="339" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1608616977097" /> <state width="1031" height="339" key="GridCell.Tab.1.bottom" timestamp="1608616977097"> <state width="1031" height="342" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1608628027944" /> <state width="1031" height="342" key="GridCell.Tab.1.bottom" timestamp="1608628027944"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="339" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608616977097" /> <state width="1031" height="339" key="GridCell.Tab.1.center" timestamp="1608616977097"> <state width="1031" height="342" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608628027944" /> <state width="1031" height="342" key="GridCell.Tab.1.center" timestamp="1608628027944"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="339" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1608616977097" /> <state width="1031" height="339" key="GridCell.Tab.1.left" timestamp="1608616977097"> <state width="1031" height="342" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1608628027944" /> <state width="1031" height="342" key="GridCell.Tab.1.left" timestamp="1608628027944"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="339" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1608616977097" /> <state width="1031" height="339" key="GridCell.Tab.1.right" timestamp="1608616977097"> <state width="1031" height="342" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1608628027944" /> <state width="1031" height="342" key="GridCell.Tab.1.right" timestamp="1608628027944"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="339" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1608616977097" /> <state width="1031" height="339" key="GridCell.Tab.2.bottom" timestamp="1608616977097"> <state width="1031" height="342" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1608628027944" /> <state width="1031" height="342" key="GridCell.Tab.2.bottom" timestamp="1608628027944"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="339" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608616977097" /> <state width="1031" height="339" key="GridCell.Tab.2.center" timestamp="1608616977097"> <state width="1031" height="342" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608628027944" /> <state width="1031" height="342" key="GridCell.Tab.2.center" timestamp="1608628027944"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="339" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1608616977097" /> <state width="1031" height="339" key="GridCell.Tab.2.left" timestamp="1608616977097"> <state width="1031" height="342" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1608628027944" /> <state width="1031" height="342" key="GridCell.Tab.2.left" timestamp="1608628027944"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="339" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1608616977097" /> <state width="1031" height="339" key="GridCell.Tab.2.right" timestamp="1608616977097"> <state width="1031" height="342" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1608628027944" /> <state width="1031" height="342" key="GridCell.Tab.2.right" timestamp="1608628027944"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="339" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1608616977097" /> <state width="1031" height="342" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1608628027944" /> <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1606714311663"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -496,10 +508,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="519" key="SwitcherDM" timestamp="1608278257976"> <state width="498" height="540" key="SwitcherDM" timestamp="1608624418629"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="498" height="519" key="SwitcherDM/0.0.1536.824@0.0.1536.824" timestamp="1608278257976" /> <state width="498" height="540" key="SwitcherDM/0.0.1536.824@0.0.1536.824" timestamp="1608624418629" /> <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> springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -5,10 +5,12 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -80,7 +82,7 @@ @PostMapping("dynamicuser") public R addDynamicUser(@RequestBody ComActDynVO comActDynVO){ Long id = comActDynVO.getId(); if (ObjectUtils.isEmpty(id)||id==0) { if (null==id||id==0) { return R.fail("社区动态不存在"); } Long userId = this.getUserId(); @@ -89,7 +91,7 @@ @ApiOperation(value = "志愿者申请") @PostMapping("volunteer") public R addVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){ public R addVolunteer(@RequestBody @Validated(AddGroup.class) ComMngVolunteerMngVO comMngVolunteerMngVO){ comMngVolunteerMngVO.setState(1); return communityService.addVolunteer(comMngVolunteerMngVO); } springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
@@ -6,10 +6,12 @@ import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO; import com.panzhihua.common.model.vos.community.ComActMicroWishVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -42,7 +44,7 @@ @ApiOperation("上传随手拍") @PostMapping("easyphoto") public R addEasyPhoto (@RequestBody ComActEasyPhotoVO comActEasyPhotoVO){ public R addEasyPhoto (@RequestBody @Validated(AddGroup.class) ComActEasyPhotoVO comActEasyPhotoVO){ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); Long communityId = loginUserInfo.getCommunityId(); Long userId = loginUserInfo.getUserId(); @@ -67,6 +69,10 @@ if (null==id||id==0) { return R.fail("随手拍主键不能为空"); } Integer haveGiveThumbsUp = comActEasyPhotoVO.getHaveGiveThumbsUp(); if (null==haveGiveThumbsUp) { return R.fail("操作类型不能为空"); } Long userId = this.getUserId(); comActEasyPhotoVO.setSponsorId(userId); return communityService.putEasyPhoto(comActEasyPhotoVO); @@ -88,7 +94,7 @@ @ApiOperation("发布微心愿") @PostMapping("microwish") public R addMicroWish (@RequestBody ComActMicroWishVO comActMicroWishVO){ public R addMicroWish (@RequestBody @Validated(AddGroup.class) ComActMicroWishVO comActMicroWishVO){ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); Long communityId = loginUserInfo.getCommunityId(); Long userId = loginUserInfo.getUserId(); springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java
@@ -112,16 +112,12 @@ } WxMaService maService = wxMaConfiguration.getMaService(); Long userId = this.getUserId(); boolean empty2 = ObjectUtils.isEmpty(userId); if (empty2) { throw new UnAuthenticationException(); } R<LoginUserInfoVO> r = userService.getUserInfoByUserId(userId + ""); LoginUserInfoVO loginUserInfoVO = r.getData(); WxMaPhoneNumberInfo wxMaPhoneNumberInfo = maService.getUserService().getPhoneNoInfo(loginUserInfoVO.getSessionKey(), encryptedData, iv); if (ObjectUtils.isEmpty(wxMaPhoneNumberInfo) || ObjectUtils.isEmpty(wxMaPhoneNumberInfo.getPhoneNumber())) { throw new WeiXinException("微信解析手机号失败"); return R.fail("微信解析手机号失败"); } String purePhoneNumber = wxMaPhoneNumberInfo.getPurePhoneNumber(); return userService.updateUserWeiXinPhone(userId,purePhoneNumber); springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -10,10 +10,12 @@ import com.panzhihua.common.exceptions.UnAuthenticationException; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -38,10 +40,6 @@ @GetMapping("info") public R getUserInfo() { Long userId = this.getUserId(); boolean empty = ObjectUtils.isEmpty(userId); if (empty) { throw new UnAuthenticationException(); } R<LoginUserInfoVO> r = userService.getUserInfoByUserId(userId + ""); if (R.isOk(r)) { Object data = r.getData(); @@ -80,7 +78,7 @@ return r; } @ApiOperation(value = "修改用户手机号") @ApiOperation(value = "修改用户信息") @PutMapping("user") public R putUser(@RequestBody LoginUserInfoVO loginUserInfoVO) { Long userId = this.getUserId(); @@ -101,7 +99,7 @@ @ApiOperation(value = "新增房屋") @PostMapping("houses") public R addHouses(@RequestBody ComMngStructHouseVO comMngStructHouseVO) { public R addHouses(@RequestBody @Validated(AddGroup.class) ComMngStructHouseVO comMngStructHouseVO) { String houseCode = comMngStructHouseVO.getHouseCode(); if (ObjectUtils.isEmpty(houseCode)) { return R.fail("房屋地址编码不能为空"); @@ -120,8 +118,8 @@ } @ApiOperation(value = "新增家庭成员") @GetMapping("addfamily") public R addFamily(@RequestBody ComMngFamilyInfoVO comMngFamilyInfoVO) { @PostMapping("addfamily") public R addFamily(@RequestBody @Validated(AddGroup.class) ComMngFamilyInfoVO comMngFamilyInfoVO) { Long userId = this.getUserId(); comMngFamilyInfoVO.setUserId(userId); return userService.addFamily(comMngFamilyInfoVO); springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/exception/GlobalExceptionCapture.java
@@ -1,11 +1,19 @@ package com.panzhihua.applets.exception; import com.panzhihua.common.constants.HttpStatus; import com.panzhihua.common.exceptions.TokenException; import com.panzhihua.common.exceptions.UnAuthenticationException; import com.panzhihua.common.exceptions.UnAuthorizationException; import com.panzhihua.common.model.vos.R; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.BindingResult; import org.springframework.validation.FieldError; import org.springframework.validation.ObjectError; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; import java.util.List; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -13,6 +21,7 @@ * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2020-11-25 14:36 **/ @Slf4j @RestControllerAdvice public class GlobalExceptionCapture { /** @@ -52,6 +61,27 @@ */ @ExceptionHandler(value = Exception.class) public R errorHandler(Exception ex) { log.error("捕捉到全局异常【{}】",ex.getMessage()); return R.fail(); } /** * 校验异常 * @param ex valid * @return 返回json */ @ExceptionHandler(value = MethodArgumentNotValidException.class) public R methodArgumentNotValidException(MethodArgumentNotValidException ex) { BindingResult result = ex.getBindingResult(); StringBuilder errorMessage = new StringBuilder(); if (result.hasErrors()) { List<ObjectError> errors = result.getAllErrors(); errors.forEach(p ->{ FieldError fieldError = (FieldError) p; errorMessage.append(fieldError.getDefaultMessage()); errorMessage.append(" "); }); } return R.fail(HttpStatus.BAD_REQUEST,errorMessage.toString()); } } springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@ discovery: enabled: true service-id: config # 注册中心的服务名 profile: dev # 指定配置文件的环境 profile: test # 指定配置文件的环境 profiles: active: dev active: test eureka: client: springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java
@@ -1,11 +1,14 @@ package com.panzhihua.common.model.vos.community; import com.fasterxml.jackson.annotation.JsonFormat; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import io.swagger.models.auth.In; import lombok.Data; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import java.util.Date; /** @@ -28,6 +31,7 @@ private String sponsorName; @ApiModelProperty("发生地址") @NotBlank(groups = {AddGroup.class},message = "发生地址不能为空") private String happenAddr; @ApiModelProperty("发起人头像") @@ -51,9 +55,11 @@ private Date createEnd; @ApiModelProperty("详情") @NotBlank(groups = {AddGroup.class},message = "详情不能为空") private String detail; @ApiModelProperty("图片路径列表，逗号分隔") @NotBlank(groups = {AddGroup.class},message = "图片路径列表不能为空") private String photoPathList; @ApiModelProperty("处理结果") @@ -82,7 +88,8 @@ @ApiModelProperty("点赞数量") private Integer giveThumbsUpNum; @ApiModelProperty("是否匿名发布") @ApiModelProperty("是否匿名发布 0 否 1 是") @Min(value = 0,groups = {AddGroup.class},message = "是否匿名发布不能为空") private Integer isHide; @ApiModelProperty("是否点赞 0 否 1 是") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java
@@ -1,11 +1,13 @@ package com.panzhihua.common.model.vos.community; import com.fasterxml.jackson.annotation.JsonFormat; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import io.swagger.models.auth.In; import lombok.Data; import javax.validation.constraints.NotBlank; import java.util.Date; /** @@ -34,6 +36,7 @@ private String imageUrl; @ApiModelProperty("微心愿名称") @NotBlank(groups = {AddGroup.class},message = "微心愿名称不能为空") private String wishName; @ApiModelProperty("状态 1待审核 2待分配 3进行中 4已驳回 5待确认6 已完成") @@ -75,9 +78,11 @@ private Integer score; @ApiModelProperty("详情") @NotBlank(groups = {AddGroup.class},message = "详情不能为空") private String detail; @ApiModelProperty("图片路径列表，逗号分隔") @NotBlank(groups = {AddGroup.class},message = "图片路径列表不能为空") private String photoPathList; @ApiModelProperty("当前页数") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructHouseVO.java
@@ -1,9 +1,12 @@ package com.panzhihua.common.model.vos.community; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import java.util.Date; /** @@ -20,6 +23,7 @@ private Long id; @ApiModelProperty("房屋地址编号") @NotBlank(groups = {AddGroup.class},message = "房屋地址编号不能为空") private String houseCode; @ApiModelProperty("房屋地址") @@ -38,6 +42,7 @@ private Date updateAt; @ApiModelProperty("房屋面积") @Min(value = 1,groups = {AddGroup.class},message = "房屋面积不能为空") private Double square; @ApiModelProperty("居住用户名字-多个用，隔开") @@ -47,9 +52,11 @@ private String phones; @ApiModelProperty("房屋状态 1 自主 2 租住 3 商用") @Min(value = 1,groups = {AddGroup.class},message = "房屋状态不能为空") private Integer states; @ApiModelProperty("身份 1租户 2房主") @Min(value = 1,groups = {AddGroup.class},message = "身份不能为空") private Integer identity; @ApiModelProperty(value = "登录用户id",hidden = true) springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java
@@ -1,9 +1,12 @@ package com.panzhihua.common.model.vos.community; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import java.util.Date; /** @@ -26,24 +29,29 @@ private Integer state; @ApiModelProperty("姓名") @NotBlank(groups = {AddGroup.class},message = "姓名不能为空") private String name; @ApiModelProperty("电话号码") private String phone; @ApiModelProperty("照片路径") @NotBlank(groups = {AddGroup.class},message = "照片不能为空") private String photoPath; @ApiModelProperty("政治面貌：1 - 党员；2- 团员；3 - 群众") @Min(value = 1,groups = {AddGroup.class},message = "政治面貌不能为空") private Integer politicalFace; @ApiModelProperty("拒绝原因") private String rejectReson; @ApiModelProperty("申请原因") @NotBlank(groups = {AddGroup.class},message = "申请原因不能为空") private String applyReson; @ApiModelProperty("居住地址") @NotBlank(groups = {AddGroup.class},message = "居住地址不能为空") private String address; @ApiModelProperty("当前页数") @@ -53,8 +61,10 @@ private Long pageSize; @ApiModelProperty(value = "年龄",example = "15") @Min(value = 1,groups = {AddGroup.class},message = "年龄不能为空") private Integer age; @ApiModelProperty(value = "职业",example = "家庭主妇") @NotBlank(groups = {AddGroup.class},message = "职业不能为空") private String job; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.java
@@ -1,10 +1,13 @@ package com.panzhihua.common.model.vos.user; import com.fasterxml.jackson.annotation.JsonFormat; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import java.util.Date; /** @@ -24,31 +27,38 @@ private Long userId; @ApiModelProperty("与本人关系") @NotBlank(groups = {AddGroup.class},message ="与本人关系不能为空" ) private String relationship; @ApiModelProperty("名字") @NotBlank(groups = {AddGroup.class},message ="名字不能为空" ) private String name; @ApiModelProperty("身份证号") @NotBlank(groups = {AddGroup.class},message ="身份证号不能为空" ) private String idCard; @ApiModelProperty("手机号") @NotBlank(groups = {AddGroup.class},message ="手机号不能为空" ) private String phone; @ApiModelProperty("年龄") @Min(value = 1,groups = {AddGroup.class},message ="年龄不能为空" ) private Integer age; @ApiModelProperty("健康状况") @NotBlank(groups = {AddGroup.class},message ="健康状况不能为空" ) private String health; @ApiModelProperty("工作") @NotBlank(groups = {AddGroup.class},message ="工作不能为空" ) private String job; @ApiModelProperty("create_at") @ApiModelProperty(value = "create_at",hidden = true) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; @ApiModelProperty("update_at") @ApiModelProperty(value = "update_at",hidden = true) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateAt;
@@ -425,7 +425,7 @@ * @return 修改结果 */ @PostMapping("putvolunteerphone") R putVolunteerPhone(UserPhoneVO userPhoneVO); R putVolunteerPhone(@RequestBody UserPhoneVO userPhoneVO); /** * 房屋地址下拉列表 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActMicroWishVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComMngStructHouseVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/community/CommunityService.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -782,7 +782,7 @@ * @return 修改结果 */ @PostMapping("putvolunteerphone") public R putVolunteerPhone(UserPhoneVO userPhoneVO){ public R putVolunteerPhone(@RequestBody UserPhoneVO userPhoneVO){ return comMngVolunteerMngService.putVolunteerPhone(userPhoneVO); }
New file @@ -0,0 +1,39 @@ package com.panzhihua.service_dangjian.config; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; import org.springframework.stereotype.Component; import java.util.Date; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 自动填充 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2020-12-11 14:23 **/ @Slf4j @Component public class MyMetaObjectHandler implements MetaObjectHandler { @Override public void insertFill(MetaObject metaObject) { log.info("start insert fill ...."); // this.strictInsertFill(metaObject, "createTime", Date.class, new Date()); // 起始版本 3.3.0(推荐使用) // 或者 this.strictInsertFill(metaObject, "createAt", () -> new Date(), Date.class); // 起始版本 3.3.3(推荐) this.strictInsertFill(metaObject, "updateAt", () -> new Date(), Date.class); // 起始版本 3.3.3(推荐) // 或者 // this.fillStrategy(metaObject, "createTime", LocalDateTime.now()); // 也可以使用(3.3.0 该方法有bug) } @Override public void updateFill(MetaObject metaObject) { log.info("start update fill ...."); // this.strictUpdateFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now()); // 起始版本 3.3.0(推荐) // 或者 this.strictUpdateFill(metaObject, "updateAt", () -> new Date(), Date.class); // 起始版本 3.3.3(推荐) // 或者 // this.fillStrategy(metaObject, "updateTime", LocalDateTime.now()); // 也可以使用(3.3.0 该方法有bug) } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -229,7 +229,7 @@ * @return 增加结果 */ @PostMapping("addFamily") public R addFamily(ComMngFamilyInfoVO comMngFamilyInfoVO){ public R addFamily(@RequestBody ComMngFamilyInfoVO comMngFamilyInfoVO){ return userService.addFamily(comMngFamilyInfoVO); }
New file @@ -0,0 +1,39 @@ package com.panzhihua.service_user.config; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; import org.springframework.stereotype.Component; import java.util.Date; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 自动填充 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2020-12-11 14:23 **/ @Slf4j @Component public class MyMetaObjectHandler implements MetaObjectHandler { @Override public void insertFill(MetaObject metaObject) { log.info("start insert fill ...."); // this.strictInsertFill(metaObject, "createTime", Date.class, new Date()); // 起始版本 3.3.0(推荐使用) // 或者 this.strictInsertFill(metaObject, "createAt", () -> new Date(), Date.class); // 起始版本 3.3.3(推荐) this.strictInsertFill(metaObject, "updateAt", () -> new Date(), Date.class); // 起始版本 3.3.3(推荐) // 或者 // this.fillStrategy(metaObject, "createTime", LocalDateTime.now()); // 也可以使用(3.3.0 该方法有bug) } @Override public void updateFill(MetaObject metaObject) { log.info("start update fill ...."); // this.strictUpdateFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now()); // 起始版本 3.3.0(推荐) // 或者 this.strictUpdateFill(metaObject, "updateAt", () -> new Date(), Date.class); // 起始版本 3.3.3(推荐) // 或者 // this.fillStrategy(metaObject, "updateTime", LocalDateTime.now()); // 也可以使用(3.3.0 该方法有bug) } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/config/MybatisPlusConfig.java
New file @@ -0,0 +1,35 @@ package com.panzhihua.service_user.config; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 分页 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2020-11-30 16:26 **/ @Configuration public class MybatisPlusConfig { /** * 新的分页插件,一缓和二缓遵循mybatis的规则,需要设置 MybatisConfiguration#useDeprecatedExecutor = false 避免缓存出现问题(该属性会在旧插件移除后一同移除) */ @Bean public MybatisPlusInterceptor mybatisPlusInterceptor() { MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.H2)); return interceptor; } @Bean public ConfigurationCustomizer configurationCustomizer() { return configuration -> configuration.setUseDeprecatedExecutor(false); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -27,6 +27,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.util.*; @@ -471,7 +472,7 @@ } SysUserDO sysUserDO1 = userDao.selectById(userPhoneVO.getUserId()); String phone = sysUserDO1.getPhone(); if (!phone.equals(oldPhone)) { if (!StringUtils.isEmpty(phone)&& !phone.equals(oldPhone)) { return R.fail("旧手机号错误"); } ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue(); @@ -536,6 +537,10 @@ public R addFamily(ComMngFamilyInfoVO comMngFamilyInfoVO) { ComMngFamilyInfoDO comMngFamilyInfoDO=new ComMngFamilyInfoDO(); BeanUtils.copyProperties(comMngFamilyInfoVO,comMngFamilyInfoDO); ComMngFamilyInfoDO comMngFamilyInfoDO1 = comMngFamilyInfoDAO.selectOne(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getIdCard, comMngFamilyInfoVO.getIdCard()).eq(ComMngFamilyInfoDO::getUserId, comMngFamilyInfoVO.getUserId())); if (!ObjectUtils.isEmpty(comMngFamilyInfoDO1)) { return R.fail("家庭成员已经存在"); } int insert = comMngFamilyInfoDAO.insert(comMngFamilyInfoDO); if (insert>0) { return R.ok(); @@ -552,7 +557,7 @@ @Override public R putFamily(ComMngFamilyInfoVO comMngFamilyInfoVO) { ComMngFamilyInfoDO comMngFamilyInfoDO=new ComMngFamilyInfoDO(); BeanUtils.copyProperties(comMngFamilyInfoDO,comMngFamilyInfoVO); BeanUtils.copyProperties(comMngFamilyInfoVO,comMngFamilyInfoDO); int update = comMngFamilyInfoDAO.updateById(comMngFamilyInfoDO); if (update>0) { return R.ok();
