springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -23,7 +23,58 @@ </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/constants/HttpConstant.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/utlis/HttpClientFactory.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/utlis/HttpClientUtil.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/utlis/RealNameUtil.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/applets/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/pom.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.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/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/utlis/HttpUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/utlis/HttpUtils.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ActivitySignVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ActivitySignVO.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActDynVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActDynVO.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.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/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/utlis/HttpUtils$TrustAnyHostnameVerifier.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/utlis/HttpUtils$TrustAnyHostnameVerifier.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/utlis/HttpUtils$TrustAnyTrustManager.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/utlis/HttpUtils$TrustAnyTrustManager.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/utlis/HttpUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/utlis/HttpUtils.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/TestApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/TestApi.java" 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/ComActActivityDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynUserDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynUserDAO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDynDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDynDO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActDynService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActDynService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.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/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/ComPbActivityMemberDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbActivityMemberDAO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.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/service/ComPbMemberService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.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/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.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/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" /> @@ -110,13 +161,13 @@ </set> </option> </component> <component name="RunManager" selected="Application.UserServiceImpl"> <configuration name="BaseController" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <option name="MAIN_CLASS_NAME" value="com.panzhihua.common.controller.BaseController" /> <module name="common" /> <component name="RunManager" selected="Application.RealNameUtil"> <configuration name="CommonApi" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <option name="MAIN_CLASS_NAME" value="com.panzhihua.applets.api.CommonApi" /> <module name="applets" /> <extension name="coverage"> <pattern> <option name="PATTERN" value="com.panzhihua.common.controller.*" /> <option name="PATTERN" value="com.panzhihua.applets.api.*" /> <option name="ENABLED" value="true" /> </pattern> </extension> @@ -150,12 +201,12 @@ <option name="Make" enabled="true" /> </method> </configuration> <configuration name="UserApi" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <option name="MAIN_CLASS_NAME" value="com.panzhihua.applets.api.UserApi" /> <module name="applets" /> <configuration name="RealNameUtil" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <option name="MAIN_CLASS_NAME" value="com.panzhihua.common.utlis.RealNameUtil" /> <module name="common" /> <extension name="coverage"> <pattern> <option name="PATTERN" value="com.panzhihua.applets_backstage.api.*" /> <option name="PATTERN" value="com.panzhihua.common.utlis.*" /> <option name="ENABLED" value="true" /> </pattern> </extension> @@ -176,13 +227,15 @@ <option name="Make" enabled="true" /> </method> </configuration> <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true"> <configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true"> <option name="arquillianRunConfiguration"> <value> <option name="containerStateName" value="" /> </value> </option> <option name="TEST_OBJECT" value="class" /> <option name="TEST_OBJECT" value="CLASS" /> <properties /> <listeners /> <method v="2"> <option name="Make" enabled="true" /> </method> @@ -258,11 +311,11 @@ </method> </configuration> <list> <item itemvalue="Application.BaseController" /> <item itemvalue="Application.UserApi" /> <item itemvalue="Application.HanyuPinyinHelper" /> <item itemvalue="Application.IPUtil" /> <item itemvalue="Application.UserServiceImpl" /> <item itemvalue="Application.CommonApi" /> <item itemvalue="Application.RealNameUtil" /> <item itemvalue="Spring Boot.CommunityBackstageApplication" /> <item itemvalue="Spring Boot.AppletsApplication" /> <item itemvalue="Spring Boot.AppletsBackstageApplication" /> @@ -276,11 +329,11 @@ </list> <recent_temporary> <list> <item itemvalue="Application.RealNameUtil" /> <item itemvalue="Application.CommonApi" /> <item itemvalue="Application.UserServiceImpl" /> <item itemvalue="Application.IPUtil" /> <item itemvalue="Application.HanyuPinyinHelper" /> <item itemvalue="Application.UserApi" /> <item itemvalue="Application.BaseController" /> </list> </recent_temporary> </component> @@ -379,7 +432,14 @@ <workItem from="1609219740946" duration="61933000" /> <workItem from="1609722105304" duration="63644000" /> <workItem from="1609921318056" duration="16792000" /> <workItem from="1609992667471" duration="12506000" /> <workItem from="1609992667471" duration="24624000" /> <workItem from="1610082606721" duration="36000" /> <workItem from="1610082728195" duration="20000" /> <workItem from="1610082769063" duration="89000" /> <workItem from="1610082881298" duration="30000" /> <workItem from="1610083716561" duration="4831000" /> <workItem from="1610088905473" duration="10469000" /> <workItem from="1610326930387" duration="968000" /> </task> <servers /> </component> @@ -403,10 +463,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="1610005965673"> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1610093667474"> <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="1610005965673" /> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1610093667474" /> <state x="405" y="335" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1606099594079"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -431,66 +491,66 @@ <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="1609823156997" /> <state width="1031" height="375" key="GridCell.Tab.0.bottom" timestamp="1610007835800"> <state width="1031" height="528" key="GridCell.Tab.0.bottom" timestamp="1610347022957"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="375" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610007835800" /> <state width="1031" height="375" key="GridCell.Tab.0.center" timestamp="1610007835799"> <state width="1031" height="528" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610347022957" /> <state width="1031" height="528" key="GridCell.Tab.0.center" timestamp="1610347022956"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="375" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1610007835799" /> <state width="1031" height="375" key="GridCell.Tab.0.left" timestamp="1610007835799"> <state width="1031" height="528" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1610347022956" /> <state width="1031" height="528" key="GridCell.Tab.0.left" timestamp="1610347022956"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="375" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1610007835799" /> <state width="1031" height="375" key="GridCell.Tab.0.right" timestamp="1610007835800"> <state width="1031" height="528" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1610347022956" /> <state width="1031" height="528" key="GridCell.Tab.0.right" timestamp="1610347022956"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="375" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1610007835800" /> <state width="1031" height="375" key="GridCell.Tab.1.bottom" timestamp="1610007835800"> <state width="1031" height="528" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1610347022956" /> <state width="1031" height="528" key="GridCell.Tab.1.bottom" timestamp="1610347022957"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="375" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610007835800" /> <state width="1031" height="375" key="GridCell.Tab.1.center" timestamp="1610007835800"> <state width="1031" height="528" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610347022957" /> <state width="1031" height="528" key="GridCell.Tab.1.center" timestamp="1610347022957"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="375" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1610007835800" /> <state width="1031" height="375" key="GridCell.Tab.1.left" timestamp="1610007835800"> <state width="1031" height="528" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1610347022957" /> <state width="1031" height="528" key="GridCell.Tab.1.left" timestamp="1610347022957"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="375" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1610007835800" /> <state width="1031" height="375" key="GridCell.Tab.1.right" timestamp="1610007835800"> <state width="1031" height="528" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1610347022957" /> <state width="1031" height="528" key="GridCell.Tab.1.right" timestamp="1610347022957"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="375" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1610007835800" /> <state width="1031" height="375" key="GridCell.Tab.2.bottom" timestamp="1610007835800"> <state width="1031" height="528" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1610347022957" /> <state width="1031" height="528" key="GridCell.Tab.2.bottom" timestamp="1610347022957"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="375" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610007835800" /> <state width="1031" height="375" key="GridCell.Tab.2.center" timestamp="1610007835800"> <state width="1031" height="528" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610347022957" /> <state width="1031" height="528" key="GridCell.Tab.2.center" timestamp="1610347022957"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="375" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1610007835800" /> <state width="1031" height="375" key="GridCell.Tab.2.left" timestamp="1610007835800"> <state width="1031" height="528" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1610347022957" /> <state width="1031" height="528" key="GridCell.Tab.2.left" timestamp="1610347022957"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="375" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1610007835800" /> <state width="1031" height="375" key="GridCell.Tab.2.right" timestamp="1610007835800"> <state width="1031" height="528" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1610347022957" /> <state width="1031" height="528" key="GridCell.Tab.2.right" timestamp="1610347022957"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="375" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1610007835800" /> <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1606714311663"> <state width="1031" height="528" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1610347022957" /> <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610072873414"> <screen x="0" y="0" width="1536" height="824" /> </state> <state x="299" y="67" key="Maven.ArtifactSearchDialog/0.0.1536.824@0.0.1536.824" timestamp="1606714311663" /> <state x="299" y="67" key="Maven.ArtifactSearchDialog/0.0.1536.824@0.0.1536.824" timestamp="1610072873414" /> <state x="270" y="57" key="SettingsEditor" timestamp="1606120706449"> <screen x="0" y="0" width="1536" height="824" /> </state> <state x="270" y="57" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1606120706449" /> <state width="498" height="540" key="SwitcherDM" timestamp="1609989508012"> <state width="498" height="540" key="SwitcherDM" timestamp="1610091343622"> <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="1609989508012" /> <state width="498" height="540" key="SwitcherDM/0.0.1536.824@0.0.1536.824" timestamp="1610091343622" /> <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog" timestamp="1609398421992"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -499,18 +559,18 @@ <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="1610007910206"> <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610099376511"> <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="1610007910206" /> <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610099376511" /> <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="600" height="428" key="javadoc.popup/0.0.1536.824@0.0.1536.824" timestamp="1610005781617" /> <state x="301" y="45" key="new project wizard" timestamp="1609120520884"> <state x="301" y="45" key="new project wizard" timestamp="1610082902691"> <screen x="0" y="0" width="1536" height="824" /> </state> <state x="301" y="45" key="new project wizard/0.0.1536.824@0.0.1536.824" timestamp="1609120520884" /> <state x="301" y="45" key="new project wizard/0.0.1536.824@0.0.1536.824" timestamp="1610082902691" /> <state x="545" y="169" key="refactoring.ChangeSignatureDialog" timestamp="1609148997036"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -519,10 +579,10 @@ <screen x="0" y="0" width="1536" height="824" /> </state> <state x="425" y="187" key="run.anything.popup/0.0.1536.824@0.0.1536.824" timestamp="1608280452280" /> <state x="431" y="145" width="672" height="678" key="search.everywhere.popup" timestamp="1609997764808"> <state x="431" y="145" width="672" height="678" key="search.everywhere.popup" timestamp="1610075113322"> <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="1609997764808" /> <state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1610075113322" /> </component> <component name="XDebuggerManager"> <pin-to-top-manager> springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
@@ -18,6 +18,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.io.InputStream; import java.util.Base64; import java.util.concurrent.TimeUnit; /** @@ -67,7 +68,11 @@ } public static void main(String[] args) { int nextInt = RandomUtils.nextInt(99999, 1000000); System.out.println(nextInt); // int nextInt = RandomUtils.nextInt(99999, 1000000); // System.out.println(nextInt); String basicStr = "2092261934651932672" + ":" + "de1c0dbb-9197-4724-9cc2-aa94e30a072f" + ":" + System.currentTimeMillis(); String s = Base64.getEncoder().encodeToString(basicStr.getBytes()); System.out.println(s); } } springcloud_k8s_panzhihuazhihuishequ/common/pom.xml
@@ -110,6 +110,10 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-aop</artifactId> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> </dependency> </dependencies>
New file @@ -0,0 +1,37 @@ package com.panzhihua.common.constants; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-08 10:40 **/ public class HttpConstant { /**httpClient连接超时时间,单位毫秒 */ public static final int CONNECT_TIMEOUT = 3*1000; /**httpClient请求获取数据的超时时间(即响应时间) 单位毫秒*/ public static final int SOCKET_TIMEOUT = 10*1000; /**http连接池大小*/ public static final int MAX_TOTAL = 10; /**分配给同一个route(路由)最大的并发连接数*/ public static final int MAX_CONN_PER_ROUTE = 2; /**http连接是否是长连接*/ public static final boolean IS_KEEP_ALIVE = true; /**调用接口失败默认重新调用次数*/ public static final int REQ_TIMES = 3; /**utf-8编码*/ public static final String UTF8_ENCODE = "UTF-8"; /** application/json */ public static final String APPLICATION_JSON = "application/json"; /** text/xml */ public static final String TEXT_XML = "text/xml"; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
@@ -68,7 +68,7 @@ private Integer sex; @ApiModelProperty("生日") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date birthday; @ApiModelProperty("头像") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java
@@ -16,7 +16,7 @@ @ApiModelProperty("活动主键") private Long activityId; @ApiModelProperty("人员主键") @ApiModelProperty("表主键") private Long id; @ApiModelProperty("名字") private String name; @@ -30,4 +30,6 @@ private String imageUrl; @ApiModelProperty(value = "人员头像",hidden = true) private Integer isVolunteer; @ApiModelProperty("人员主键") private Long userId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
@@ -123,4 +123,5 @@ private Integer type; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java
@@ -67,4 +67,7 @@ @ApiModelProperty(value = "社区名字") private String communityName; @ApiModelProperty(value = "封面") private String cover; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java
@@ -87,6 +87,9 @@ @ApiModelProperty("是否已经报名") private Integer isSign; @ApiModelProperty(value = "活动报名人员id集合",hidden = true) private List<Long> userIds;
@@ -603,4 +603,26 @@ */ @PostMapping("timedtaskdynistopping") R timedTaskDynIstopping(); /** * 定时任务刷新社区动态发布状态 * @return */ @PostMapping("timedtaskdynstatus") R timedTaskDynStatus(); /** * 定时任务查询所有要取消的社区活动 * @return 社区活动集合 */ @PostMapping("timedtaskactactivity") R timedTaskActActivity(); /** * 定时任务刷新社区活动的各个状态 除取消外 * @return */ @PostMapping("timedtaskactactivityall") R timedTaskActActivityAll(); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
@@ -260,4 +260,25 @@ */ @PostMapping("/partybuildIng/selectallpartybuildingactivitymembers") R selectAllPartyBuildingActivityMembers(@RequestParam("id")Long id); /** * 定时任务刷新党建动态发布状态 * @return 刷新数据数量 */ @PostMapping("/partybuildIng/timedtaskpartybuildingstatus") R timedTaskPartyBuildingStatus(); /** * 定时任务取消党建活动 * @return 需要取消的所有党建活动 */ @PostMapping("/partybuildIng/timedtaskpartybuildingactivity") R timedTaskPartyBuildingActivity(); /** * 定时任务刷新党建活动的各个状态 除取消外 * @return 修改结果 */ @PostMapping("/partybuildIng/timedtaskpartybuildingactivityall") R timedTaskPartyBuildingActivityAll(); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HttpClientFactory.java
New file @@ -0,0 +1,128 @@ package com.panzhihua.common.utlis; import com.panzhihua.common.constants.HttpConstant; import org.apache.http.client.HttpClient; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.HttpPost; import org.apache.http.config.Registry; import org.apache.http.config.RegistryBuilder; import org.apache.http.conn.socket.ConnectionSocketFactory; import org.apache.http.conn.socket.LayeredConnectionSocketFactory; import org.apache.http.conn.socket.PlainConnectionSocketFactory; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; import org.apache.http.impl.client.HttpClients; import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import javax.net.ssl.SSLContext; import java.security.NoSuchAlgorithmException; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-08 10:26 **/ public class HttpClientFactory { private static HttpClientFactory instance = null; private HttpClientFactory() { } public synchronized static HttpClientFactory getInstance() { if (instance == null) { instance = new HttpClientFactory(); } return instance; } public synchronized HttpClient getHttpClient() { HttpClient httpClient = null; if (HttpConstant.IS_KEEP_ALIVE) { //获取长连接 httpClient = new KeepAliveHttpClientBuilder().getKeepAliveHttpClient(); } else { // 获取短连接 httpClient = new HttpClientBuilder().getHttpClient(); } return httpClient; } public HttpPost httpPost(String httpUrl) { HttpPost httpPost = null; httpPost = new HttpPost(httpUrl); if (HttpConstant.IS_KEEP_ALIVE) { // 设置为长连接，服务端判断有此参数就不关闭连接。 httpPost.setHeader("Connection", "Keep-Alive"); } return httpPost; } private static class KeepAliveHttpClientBuilder{ private static HttpClient httpClient; /** * 获取http长连接 */ private synchronized HttpClient getKeepAliveHttpClient() { if (httpClient == null) { LayeredConnectionSocketFactory sslsf = null; try { sslsf = new SSLConnectionSocketFactory(SSLContext.getDefault()); } catch (NoSuchAlgorithmException e) { e.printStackTrace(); } Registry<ConnectionSocketFactory> socketFactoryRegistry = RegistryBuilder .<ConnectionSocketFactory> create().register("https", sslsf) .register("http", new PlainConnectionSocketFactory()).build(); PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager(socketFactoryRegistry); cm.setMaxTotal(HttpConstant.MAX_TOTAL); cm.setDefaultMaxPerRoute(HttpConstant.MAX_CONN_PER_ROUTE); RequestConfig requestConfig = RequestConfig.custom() .setConnectTimeout(HttpConstant.CONNECT_TIMEOUT) .setSocketTimeout(HttpConstant.SOCKET_TIMEOUT).build(); // 创建连接 httpClient = HttpClients.custom().setDefaultRequestConfig(requestConfig).setConnectionManager(cm).build(); } return httpClient; } } private static class HttpClientBuilder{ private HttpClient httpClient; /** * 获取http短连接 */ private synchronized HttpClient getHttpClient() { if(httpClient == null){ RequestConfig requestConfig = RequestConfig.custom() // 设置请求超时时间 .setConnectTimeout(HttpConstant.CONNECT_TIMEOUT) // 设置响应超时时间 .setSocketTimeout(HttpConstant.SOCKET_TIMEOUT).build(); // 创建连接 httpClient = HttpClients.custom().setDefaultRequestConfig(requestConfig).build(); } return httpClient; } } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HttpClientUtil.java
New file @@ -0,0 +1,90 @@ package com.panzhihua.common.utlis; import com.panzhihua.common.constants.HttpConstant; import lombok.extern.slf4j.Slf4j; import org.apache.http.Header; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.StringEntity; import org.apache.http.message.BasicHeader; import org.apache.http.util.EntityUtils; import org.springframework.util.ObjectUtils; import java.io.IOException; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-08 10:23 **/ @Slf4j public class HttpClientUtil { /** * 通过post方式调用http接口 * @param url url路径 * @param jsonParam json格式的参数 * @param reSend 重发次数 * @param headerKey header键值 * @param headerValue headervalue * @return * @throws Exception */ public static String sendPostByJson(String url, String jsonParam,int reSend,String headerKey,String headerValue) { //声明返回结果 String result = ""; //开始请求API接口时间 long startTime=System.currentTimeMillis(); //请求API接口的响应时间 long endTime= 0L; HttpEntity httpEntity = null; HttpResponse httpResponse = null; HttpClient httpClient = null; try { // 创建连接 httpClient = HttpClientFactory.getInstance().getHttpClient(); // 设置请求头和报文 HttpPost httpPost = HttpClientFactory.getInstance().httpPost(url); Header header=new BasicHeader("Accept-Encoding",null); httpPost.setHeader(header); if (!ObjectUtils.isEmpty(headerKey)) { httpPost.setHeader(headerKey,headerValue); } // 设置报文和通讯格式 StringEntity stringEntity = new StringEntity(jsonParam, HttpConstant.UTF8_ENCODE); stringEntity.setContentEncoding(HttpConstant.UTF8_ENCODE); stringEntity.setContentType(HttpConstant.APPLICATION_JSON); httpPost.setEntity(stringEntity); log.info("请求{}接口的参数为{}",url,jsonParam); //执行发送，获取相应结果 httpResponse = httpClient.execute(httpPost); httpEntity= httpResponse.getEntity(); result = EntityUtils.toString(httpEntity); } catch (Exception e) { log.error("请求{}接口出现异常",url,e); if (reSend > 0) { log.info("请求{}出现异常:{}，进行重发。进行第{}次重发",url,e.getMessage(),(HttpConstant.REQ_TIMES-reSend +1)); result = sendPostByJson(url, jsonParam, reSend - 1,headerKey,headerValue); if (result != null && !"".equals(result)) { return result; } } }finally { try { EntityUtils.consume(httpEntity); } catch (IOException e) { log.error("http请求释放资源异常",e); } } //请求接口的响应时间 endTime=System.currentTimeMillis(); log.info("请求{}接口的响应报文内容为{},本次请求API接口的响应时间为:{}毫秒",url,result,(endTime-startTime)); return result; } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HttpUtils.java
@@ -3,6 +3,7 @@ import com.panzhihua.common.constants.Constants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.util.ObjectUtils; import javax.net.ssl.*; import java.io.*; @@ -96,78 +97,7 @@ return result.toString(); } /** * 向指定 URL 发送POST方法的请求 * * @param url 发送请求的 URL * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 * @return 所代表远程资源的响应结果 */ public static String sendPost(String url, String param) { PrintWriter out = null; BufferedReader in = null; StringBuilder result = new StringBuilder(); try { String urlNameString = url; log.info("sendPost - {}", urlNameString); URL realUrl = new URL(urlNameString); URLConnection conn = realUrl.openConnection(); conn.setRequestProperty("accept", "*/*"); conn.setRequestProperty("connection", "Keep-Alive"); conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); conn.setRequestProperty("Accept-Charset", "utf-8"); conn.setRequestProperty("contentType", "utf-8"); conn.setDoOutput(true); conn.setDoInput(true); out = new PrintWriter(conn.getOutputStream()); out.print(param); out.flush(); in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "utf-8")); String line; while ((line = in.readLine()) != null) { result.append(line); } log.info("recv - {}", result); } catch (ConnectException e) { log.error("调用HttpUtils.sendPost ConnectException, url=" + url + ",param=" + param, e); } catch (SocketTimeoutException e) { log.error("调用HttpUtils.sendPost SocketTimeoutException, url=" + url + ",param=" + param, e); } catch (IOException e) { log.error("调用HttpUtils.sendPost IOException, url=" + url + ",param=" + param, e); } catch (Exception e) { log.error("调用HttpsUtil.sendPost Exception, url=" + url + ",param=" + param, e); } finally { try { if (out != null) { out.close(); } if (in != null) { in.close(); } } catch (IOException ex) { log.error("调用in.close Exception, url=" + url + ",param=" + param, ex); } } return result.toString(); } public static String sendSSLPost(String url, String param) { springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/RealNameUtil.java
New file @@ -0,0 +1,48 @@ package com.panzhihua.common.utlis; import com.alibaba.fastjson.JSONObject; import java.util.Base64; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 实名认证工具 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-08 09:45 **/ public class RealNameUtil { private static final String CLIENT_ID="2092261934651932672"; private static final String SECRET="de1c0dbb-9197-4724-9cc2-aa94e30a072f"; private static final String URL="http://118.121.56.56:18080/users/auth/policeMatch"; /** * 实名认证 * @param idcard 身份证 * @param name 名字 * @return 认证结果 true false */ public static boolean authentication(String idcard,String name){ boolean result=false; String headerkey="Authorization"; String headervalue="Basic "; String basicStr = CLIENT_ID + ":" + SECRET + ":" + System.currentTimeMillis(); String encodeToString = Base64.getEncoder().encodeToString(basicStr.getBytes()); JSONObject jsonObject=new JSONObject(); jsonObject.put("idNumber",idcard); jsonObject.put("realName",name); String param=jsonObject.toJSONString(); String postByJson = HttpClientUtil.sendPostByJson(URL, param, 0, headerkey, headervalue + encodeToString); int code = JSONObject.parseObject(postByJson).getIntValue("code"); if (0==code) { result =true; } return result; } public static void main(String[] args) { boolean b = RealNameUtil.authentication("340823199112282557", "黄宏发f"); System.out.println(b); } } springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/constants/HttpConstant.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/LoginUserInfoVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ActivitySignVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActDynVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/community/CommunityService.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/partybuilding/PartyBuildingService.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/utlis/HttpClientFactory$1.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/utlis/HttpClientFactory$HttpClientBuilder.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/utlis/HttpClientFactory$KeepAliveHttpClientBuilder.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/utlis/HttpClientFactory.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/utlis/HttpClientUtil.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/utlis/HttpUtils$TrustAnyHostnameVerifier.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/utlis/HttpUtils$TrustAnyTrustManager.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/utlis/HttpUtils.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/utlis/RealNameUtil.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
@@ -175,8 +175,6 @@ comActDynVO.setStatus(1); } return communityService.addDynamic(comActDynVO); //todo 五天自动取消置顶状态 //todo 发布时间到了直接修改状态为已发布 } @ApiOperation(value = "编辑社区动态、取消置顶、设置置顶") @@ -197,7 +195,6 @@ } comActDynVO.setCommunityId(communityId); return communityService.putDynamic(comActDynVO); //todo 五天自动取消置顶状态 } @ApiOperation(value = "删除社区动态") @@ -208,7 +205,6 @@ return R.fail("动态主键不能为空"); } return communityService.deleteDynamic(comActDynVO); //todo 五天自动取消置顶状态 } @ApiOperation(value = "分页查询社区动态") springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/TestApi.java
@@ -1,14 +1,26 @@ package com.panzhihua.community_backstage.api; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ActivitySignVO; import com.panzhihua.common.model.vos.community.ComActActivityVO; import com.panzhihua.common.model.vos.partybuilding.PartyBuildingActivityVO; import com.panzhihua.common.model.vos.user.SysUserNoticeVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.partybuilding.PartyBuildingService; import com.panzhihua.common.service.user.UserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.Date; import java.util.List; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -16,6 +28,7 @@ * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-07 15:47 **/ @Slf4j @RestController @Api(tags = {"调试接口"}) @RequestMapping("/test/") @@ -23,6 +36,10 @@ @Resource private CommunityService communityService; @Resource private PartyBuildingService partyBuildingService; @Resource private UserService userService; @ApiOperation(value = "定时任务刷新社区动态置顶状态") @GetMapping("timedtaskdynistopping") @@ -30,4 +47,104 @@ R r=communityService.timedTaskDynIstopping(); return r; } @ApiOperation(value = "定时任务刷新社区动态发布状态") @GetMapping("timedtaskdynstatus") public R timedTaskDynStatus() { R r=communityService.timedTaskDynStatus(); return r; } @ApiOperation(value = "定时任务刷新党建动态发布状态") @GetMapping("timedtaskpartybuildingstatus") public R timedTaskPartyBuildingStatus() { R r=partyBuildingService.timedTaskPartyBuildingStatus(); return r; } @ApiOperation(value = "定时任务取消党建活动") @GetMapping("timedtaskpartybuildingactivity") public R timedTaskPartyBuildingActivity() { R r=partyBuildingService.timedTaskPartyBuildingActivity(); if (R.isOk(r)) { Object data = r.getData(); List<PartyBuildingActivityVO> partyBuildingActivityVOS= JSONArray.parseArray(JSONArray.toJSONString(data),PartyBuildingActivityVO.class); if (!ObjectUtils.isEmpty(partyBuildingActivityVOS)) { partyBuildingActivityVOS.forEach(partyBuildingActivityVO -> { List<Long> userIds = partyBuildingActivityVO.getUserIds(); if (!ObjectUtils.isEmpty(userIds)) { userIds.forEach(aLong -> { SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO(); sysUserNoticeVO.setUserId(aLong); sysUserNoticeVO.setType(1); sysUserNoticeVO.setBusinessType(2); sysUserNoticeVO.setBusinessTitle(partyBuildingActivityVO.getName()); sysUserNoticeVO.setBusinessTime(new Date()); sysUserNoticeVO.setBusinessId(partyBuildingActivityVO.getId()); sysUserNoticeVO.setStatus(0); sysUserNoticeVO.setTitle("活动因故取消"); sysUserNoticeVO.setBusinessContent("报名人数不足活动自动取消"); sysUserNoticeVO.setBusinessStatus(1); R r2 = userService.addNotice(sysUserNoticeVO); if (R.isOk(r2)) { log.info("新增党建活动取消通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO)); } }); } }); } } return r; } @ApiOperation(value = "定时任务取消社区活动") @GetMapping("timedtaskactactivity") public R timedTaskActActivity() { R r=communityService.timedTaskActActivity(); if (R.isOk(r)) { Object data = r.getData(); List<ComActActivityVO> comActActivityVOS= JSONArray.parseArray(JSONArray.toJSONString(data),ComActActivityVO.class); if (!ObjectUtils.isEmpty(comActActivityVOS)) { comActActivityVOS.forEach(comActActivityVO -> { List<ActivitySignVO> activitySignVOList = comActActivityVO.getActivitySignVOList(); if (!ObjectUtils.isEmpty(activitySignVOList)) { activitySignVOList.forEach(activitySignVO -> { SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO(); sysUserNoticeVO.setUserId(activitySignVO.getUserId()); sysUserNoticeVO.setType(1); sysUserNoticeVO.setBusinessType(2); sysUserNoticeVO.setBusinessTitle(comActActivityVO.getActivityName()); sysUserNoticeVO.setBusinessTime(new Date()); sysUserNoticeVO.setBusinessId(comActActivityVO.getId()); sysUserNoticeVO.setStatus(0); sysUserNoticeVO.setTitle("活动因故取消"); sysUserNoticeVO.setBusinessContent("报名人数不足活动自动取消"); sysUserNoticeVO.setBusinessStatus(1); sysUserNoticeVO.setActivityType(activitySignVO.getIsVolunteer().intValue()==1?1:2); R r2 = userService.addNotice(sysUserNoticeVO); if (R.isOk(r2)) { log.info("新增社区活动取消通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO)); } }); } }); } } return r; } @ApiOperation(value = "定时任务刷新社区活动的各个状态 除取消外") @GetMapping("timedtaskactactivityall") public R timedTaskActActivityAll() { R r=communityService.timedTaskActActivityAll(); return r; } @ApiOperation(value = "定时任务刷新党建活动的各个状态 除取消外") @GetMapping("timedtaskpartybuildingactivityall") public R timedTaskPartyBuildingActivityAll() { R r=partyBuildingService.timedTaskPartyBuildingActivityAll(); return r; } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -982,8 +982,32 @@ public R timedTaskDynIstopping(){ return comActDynService.timedTaskDynIstopping(); } /** * 定时任务刷新社区动态发布状态 * @return */ @PostMapping("timedtaskdynstatus") public R timedTaskDynStatus(){ return comActDynService.timedTaskDynStatus(); } /** * 定时任务查询所有要取消的社区活动 * @return 社区活动集合 */ @PostMapping("timedtaskactactivity") public R timedTaskActActivity(){ return comActActivityService.timedTaskActActivity(); } /** * 定时任务刷新社区活动的各个状态 除取消外 * @return 更新结果 */ @PostMapping("timedtaskactactivityall") R timedTaskActActivityAll(){ return comActActivityService.timedTaskActActivityAll(); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
@@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; import java.util.List; @@ -92,4 +93,36 @@ @Select("select t.activity_name,t.id,t.end_at,t.cover,t.status from com_act_act_sign s join sys_user u on s.user_id=u.user_id and u.phone=#{phone} and s.is_volunteer=1 " + "join com_act_activity t on s.activity_id=t.id and t.status=5") List<ComActActivityVO> listActivityByPhone(String phone); @Select("select t.id from (\n" + "SELECT \n" + "a.id,\n" + "a.activity_name,\n" + "COUNT(case when s.is_volunteer=1 then s.id else null end )volunteernum,\n" + "COUNT(case when s.is_volunteer=0 then s.id else null end)usernum,\n" + "a.participant_min,\n" + "a.volunteer_min\n" + "FROM\n" + "com_act_activity a \n" + "LEFT JOIN com_act_act_sign s on a.id=s.activity_id \n" + "WHERE\n" + "a.`status` in(3,4) and DATEDIFF(SYSDATE(),a.sign_up_end)>=0\n" + "GROUP BY a.id)t WHERE t.usernum<participant_min or t.volunteernum<volunteer_min") List<Long> selectTimedTaskActActivity(); @Update("<script> " + "update com_act_activity set `status`=6 where id in\n" + "<foreach item=\"item\" collection=\"longs\" separator=\",\" open=\"(\" close=\")\" index=\"\">\n"+ "#{item}\n"+ "</foreach>\n"+ "</script>") int updateIdBatch(@Param("longs") List<Long> longs); @Update("update com_act_activity set `status`=2 where `status`=1 and DATEDIFF(SYSDATE(),publish_at)>=0") int updateStatusToNotBegin(); @Update("update com_act_activity set `status`=3 where `status`=2 and DATEDIFF(SYSDATE(),sign_up_begin)>=0") int updateStatusToBeginSign(); @Update("update com_act_activity set `status`=(if(DATEDIFF(SYSDATE(),end_at)>=0,5,4)) where `status`=3 and DATEDIFF(SYSDATE(),begin_at)>=0") int updateStatusToBeginActiveOrEnd(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java
@@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -50,4 +51,6 @@ " order by d.is_topping desc, d.create_at desc "+ "</script>") IPage<ComActDynVO> pageDynamic(Page page, @Param("comActDynVO") ComActDynVO comActDynVO); @Update("update com_act_dyn set `status`=1 WHERE `status`=0 and DATEDIFF(SYSDATE(),publish_at)>=0") int timedTaskDynStatus(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynUserDAO.java
@@ -13,6 +13,6 @@ **/ @Mapper public interface ComActDynUserDAO extends BaseMapper<ComActDynUserDO> { @Update("update com_act_dyn set is_topping=(if(DATEDIFF(SYSDATE(),publish_at)>5,0,1)) WHERE is_topping=1") @Update("update com_act_dyn set is_topping=0 WHERE is_topping=1 and DATEDIFF(SYSDATE(),publish_at)>5 ") int timedTaskDynIstopping(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDynDO.java
@@ -61,4 +61,8 @@ * 动态内容富文本 */ private String content; /** * 封面图 */ private String cover; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java
@@ -86,4 +86,14 @@ * @return 所有活动集合 */ List<ComActActivityVO> listActivityByPhone(String phone); /** * 定时任务查询所有要取消的社区活动 * @return 社区活动集合 */ R timedTaskActActivity(); /** * 定时任务刷新社区活动的各个状态 除取消外 * @return 更新结果 */ R timedTaskActActivityAll(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDynService.java
@@ -37,4 +37,10 @@ * @return 刷新结果 */ R timedTaskDynIstopping(); /** * 定时任务刷新社区动态发布状态 * @return 刷新结果 */ R timedTaskDynStatus(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -14,6 +14,7 @@ import com.panzhihua.service_community.model.dos.ComActActSignDO; import com.panzhihua.service_community.model.dos.ComActActivityDO; import com.panzhihua.service_community.service.ComActActivityService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -31,6 +32,7 @@ * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2020-12-07 14:35 **/ @Slf4j @Service public class ComActActivityServiceImpl extends ServiceImpl<ComActActivityDAO, ComActActivityDO> implements ComActActivityService { @Resource @@ -265,5 +267,59 @@ return comActActivityVOS; } /** * 定时任务查询所有要取消的社区活动 * * @return 社区活动集合 */ @Override public R timedTaskActActivity() { List<Long>longs=comActActivityDAO.selectTimedTaskActActivity(); if (ObjectUtils.isEmpty(longs)) { return R.fail("没有需要取消的社区活动"); } List<ComActActivityDO> comActActivityDOS = comActActivityDAO.selectBatchIds(longs); List<ComActActivityVO>comActActivityVOS=new ArrayList<>(); if (!ObjectUtils.isEmpty(comActActivityDOS)) { comActActivityDOS.forEach(comActActivityDO -> { ComActActivityVO comActActivityVO=new ComActActivityVO(); BeanUtils.copyProperties(comActActivityDO,comActActivityVO); List<ComActActSignDO> comActActSignDOS = comActActSignDAO.selectList(new QueryWrapper<ComActActSignDO>().lambda().eq(ComActActSignDO::getActivityId, comActActivityDO.getId())); if (!ObjectUtils.isEmpty(comActActSignDOS)) { List<ActivitySignVO> activitySignVOList=new ArrayList<>(); comActActSignDOS.forEach(comActActSignDO -> { ActivitySignVO activitySignVO=new ActivitySignVO(); BeanUtils.copyProperties(comActActSignDO,activitySignVO); activitySignVOList.add(activitySignVO); comActActivityVO.setActivitySignVOList(activitySignVOList); }); } comActActivityVOS.add(comActActivityVO); }); int num=comActActivityDAO.updateIdBatch(longs); log.info("定时任务--一共取消社区活动数量【{}】",num); } return R.ok(comActActivityVOS); } /** * 定时任务刷新社区活动的各个状态 除取消外 * * @return 更新结果 */ @Override public R timedTaskActActivityAll() { // 修改发布状态 变为未开始 int num=comActActivityDAO.updateStatusToNotBegin(); log.info("定时任务--修改社区活动发布状态活动数量【{}】",num); // 修改报名状态 变为报名中 int num1=comActActivityDAO.updateStatusToBeginSign(); log.info("定时任务--修改社区活动报名状态活动数量【{}】",num1); // 修改进行状态 变为进行中或者已结束 int num2=comActActivityDAO.updateStatusToBeginActiveOrEnd(); log.info("定时任务--修改社区活动进行状态活动数量【{}】",num2); return R.ok(); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java
@@ -117,9 +117,21 @@ @Override public R timedTaskDynIstopping() { int num=comActDynUserDAO.timedTaskDynIstopping(); if (num>0) { log.info("一共维护社区动态数量【{}】",num); } return R.ok(); log.info("定时任务--一共维护社区动态数量【{}】",num); return R.ok(num); } /** * 定时任务刷新社区动态发布状态 * * @return 刷新结果 */ @Override public R timedTaskDynStatus() { int num=comActDynDAO.timedTaskDynStatus(); log.info("定时任务--一共刷新社区动态发布状态数量【{}】",num); return R.ok(num); } } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java
@@ -351,9 +351,36 @@ * @param id 党建活动id * @return 人员id集合 */ @PostMapping("/partybuildIng/selectallpartybuildingactivitymembers") @PostMapping("selectallpartybuildingactivitymembers") public R selectAllPartyBuildingActivityMembers(@RequestParam("id")Long id){ return comBpActivityService.selectAllPartyBuildingActivityMembers(id); } /** * 定时任务刷新党建动态发布状态 * @return 刷新数据数量 */ @PostMapping("timedtaskpartybuildingstatus") R timedTaskPartyBuildingStatus(){ return comPbMemberService.timedTaskPartyBuildingStatus(); } /** * 定时任务取消党建活动 * @return 党建活动集合 */ @PostMapping("timedtaskpartybuildingactivity") public R timedTaskPartyBuildingActivity(){ return comBpActivityService.timedTaskPartyBuildingActivity(); } /** * 定时任务刷新党建活动的各个状态 除取消外 * @return 修改结果 */ @PostMapping("timedtaskpartybuildingactivityall") public R timedTaskPartyBuildingActivityAll(){ return comBpActivityService.timedTaskPartyBuildingActivityAll(); } } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java
@@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; import java.util.List; @@ -20,7 +21,16 @@ **/ @Mapper public interface ComBpActivityDAO extends BaseMapper<ComPbActivityDO> { // @Select("<script> " + // " <where>" + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // " </where>" + // "</script>") @Select("<script> " + "SELECT\n" + "a.id,\n" + @@ -67,7 +77,7 @@ "enroll_time_end \n" + "FROM\n" + "com_pb_activity \n" + "where community_id=#{partyBuildingActivityVO.communityId}\n"+ "where community_id=#{partyBuildingActivityVO.communityId}\n" + "<if test='partyBuildingActivityVO.name != null and partyBuildingActivityVO.name.trim() != ""'>" + "and name = #{partyBuildingActivityVO.name} \n" + " </if> " + @@ -82,7 +92,46 @@ "AND activity_time_begin BETWEEN #{partyBuildingActivityVO.activityTimeBegin} \n" + "AND #{partyBuildingActivityVO.activityTimeEnd}" + " </if> " + "order by create_at desc "+ "order by create_at desc " + "</script>") IPage<PartyBuildingActivityVO> pageActivity(Page page, @Param("partyBuildingActivityVO") PartyBuildingActivityVO partyBuildingActivityVO); @Select("select t.id from (\n" + "SELECT \n" + "a.participation_lowest_num,\n" + "a.name,\n" + "a.id,\n" + "COUNT(m.id)num\n" + "FROM\n" + "com_pb_activity a\n" + "LEFT JOIN com_pb_activity_member m ON a.id = m.activity_id\n" + "WHERE a.`status` in (3,4) and DATEDIFF(SYSDATE(),a.enroll_time_end)>=0\n" + "GROUP BY a.id)t where t.num<t.participation_lowest_num") List<Long> selectTimedTaskPartyBuildingActivity(); @Select("SELECT \n" + "u.user_id\n" + "FROM\n" + "com_pb_activity_member m\n" + "JOIN com_pb_member r on m.member_id=r.id\n" + "join sys_user u on r.id_card=u.id_card and u.type=1 \n" + "where m.activity_id=#{activityId}") List<Long> selectTimedTaskPartyBuildingActivityUserids(Long activityId); @Update("<script> " + "update com_pb_activity set `status`=6 WHERE id in \n" + "<foreach item=\"item\" collection=\"ids\" separator=\",\" open=\"(\" close=\")\" index=\"\"> \n" + "#{item}\n" + "</foreach>\n" + "</script>") int updateBatchIds(@Param("ids") List<Long> ids); @Update("update com_pb_activity set status=2 where `status`=1 and DATEDIFF(SYSDATE(),release_time)>=0") int updateStatusToNotBegin(); @Update("update com_pb_activity set status=3 where `status`=2 and DATEDIFF(SYSDATE(),enroll_time_begin)>=0") int updateStatusToSign(); @Update("update com_pb_activity set status=(if(DATEDIFF(SYSDATE(),activity_time_end)>=0,5,4)) where `status`=3 and DATEDIFF(SYSDATE(),activity_time_begin)>=0") int updateStatusToActiveOrEnd(); } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbActivityMemberDAO.java
@@ -20,7 +20,16 @@ **/ @Mapper public interface ComPbActivityMemberDAO extends BaseMapper<ComPbActivityMemberDO> { // @Select("<script> " + // " <where>" + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // " </where>" + // "</script>") @Select("<script> " + "SELECT\n" + springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java
@@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -18,7 +19,16 @@ **/ @Mapper public interface ComPbDynDAO extends BaseMapper<ComPbDynDO> { // @Select("<script> " + // " <where>" + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // " </where>" + // "</script>") @Select("<script> " + "SELECT\n" + @@ -51,4 +61,6 @@ "ORDER BY d.create_at desc"+ "</script>") IPage<PartyBuildingComPbDynVO> pageYnamic(Page page, @Param("partyBuildingComPbDynVO") PartyBuildingComPbDynVO partyBuildingComPbDynVO); @Update("update com_pb_dyn set `status`=(if(DATEDIFF(SYSDATE(),publish_at)>0,2,1)) WHERE `status`=1") int timedTaskPartyBuildingStatus(); } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java
@@ -18,6 +18,16 @@ **/ @Mapper public interface ComPbMemberRoleDAO extends BaseMapper<ComPbMemberRoleDO> { // @Select("<script> " + // " <where>" + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // " </where>" + // "</script>") @Select("<script> " + "SELECT\n" + "mr.id,\n" + springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComBpActivityService.java
@@ -92,4 +92,14 @@ * @return 人员id集合 */ R selectAllPartyBuildingActivityMembers(Long id); /** * 定时任务取消党建活动 * @return 党建活动集合 */ R timedTaskPartyBuildingActivity(); /** * 定时任务刷新党建活动的各个状态 除取消外 * @return 修改结果 */ R timedTaskPartyBuildingActivityAll(); } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java
@@ -114,5 +114,9 @@ */ R deleteDynUser(Integer id); /** * 定时任务刷新党建动态发布状态 * @return 刷新数据数量 */ R timedTaskPartyBuildingStatus(); } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
@@ -16,6 +16,7 @@ import com.panzhihua.service_dangjian.model.dos.ComPbActivityMemberDO; import com.panzhihua.service_dangjian.model.dos.ComPbMemberDO; import com.panzhihua.service_dangjian.service.ComBpActivityService; import lombok.extern.slf4j.Slf4j; import org.apache.http.client.utils.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -31,6 +32,7 @@ * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2020-12-01 09:16 **/ @Slf4j @Service public class ComBpActivityServiceImpl implements ComBpActivityService { @Resource @@ -340,4 +342,49 @@ List<Long> longs=comPbActivityMemberDAO.selectAllPartyBuildingActivityMembers(id); return R.ok(longs); } /** * 定时任务取消党建活动 * * @return 取消党建活动数量 */ @Override public R timedTaskPartyBuildingActivity() { List<Long> ids=comBpActivityDAO.selectTimedTaskPartyBuildingActivity(); List<PartyBuildingActivityVO> partyBuildingActivityVOS = new ArrayList<>(); if (!ObjectUtils.isEmpty(ids)) { List<ComPbActivityDO> comPbActivityDOS = comBpActivityDAO.selectBatchIds(ids); comPbActivityDOS.forEach(comPbActivityDO -> { PartyBuildingActivityVO partyBuildingActivityVO = new PartyBuildingActivityVO(); BeanUtils.copyProperties(comPbActivityDO,partyBuildingActivityVO); List<Long> userIdS=comBpActivityDAO.selectTimedTaskPartyBuildingActivityUserids(comPbActivityDO.getId()); partyBuildingActivityVO.setUserIds(userIdS); partyBuildingActivityVOS.add(partyBuildingActivityVO); }); int i = comBpActivityDAO.updateBatchIds(ids); log.info("定时任务取消党建活动数量【{}】",i); } return R.ok(partyBuildingActivityVOS); } /** * 定时任务刷新党建活动的各个状态 除取消外 * * @return 修改结果 */ @Override public R timedTaskPartyBuildingActivityAll() { // 修改发布状态为未开始 int num=comBpActivityDAO.updateStatusToNotBegin(); log.info("定时任务修改党建活动--修改发布状态为未开始数量【{}】",num); // 修改报名状态为报名中 int num1=comBpActivityDAO.updateStatusToSign(); log.info("定时任务修改党建活动--修改报名状态为报名中始数量【{}】",num1); // 修改进行状态为进行中 或者已结束 int num2=comBpActivityDAO.updateStatusToActiveOrEnd(); log.info("定时任务修改党建活动--修改进行状态为进行中 或者已结束数量【{}】",num2); return R.ok(); } } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -11,6 +11,7 @@ import com.panzhihua.service_dangjian.dao.*; import com.panzhihua.service_dangjian.model.dos.*; import com.panzhihua.service_dangjian.service.ComPbMemberService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.ValueOperations; @@ -31,6 +32,7 @@ * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2020-11-30 10:53 **/ @Slf4j @Service public class ComPbMemberServiceImpl extends ServiceImpl<ComPbMemberDAO,ComPbMemberDO> implements ComPbMemberService { @Resource @@ -415,7 +417,17 @@ return R.fail(); } /** * 定时任务刷新党建动态发布状态 * * @return 刷新数据数量 */ @Override public R timedTaskPartyBuildingStatus() { int num=comPbDynDAO.timedTaskPartyBuildingStatus(); log.info("定时任务更新党建动态发布状态数量【{}】",num); return R.ok(num); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -15,6 +15,7 @@ import com.panzhihua.common.model.vos.*; import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO; import com.panzhihua.common.model.vos.user.*; import com.panzhihua.common.utlis.RealNameUtil; import com.panzhihua.service_user.dao.*; import com.panzhihua.service_user.model.dos.*; import com.panzhihua.service_user.model.dtos.DataKanbanDTO; @@ -465,16 +466,23 @@ */ @Override public R putUserAuthentication(LoginUserInfoVO loginUserInfoVO) { //接入第三方实名认证 String idCard = loginUserInfoVO.getIdCard(); String name = loginUserInfoVO.getName(); boolean b = RealNameUtil.authentication(idCard, name); if (!b) { return R.fail("身份认证失败：公安系统认证错误"); } SysUserDO sysUserDO=new SysUserDO(); sysUserDO.setName(loginUserInfoVO.getName()); sysUserDO.setIdCard(loginUserInfoVO.getIdCard()); sysUserDO.setName(name); sysUserDO.setIdCard(idCard); sysUserDO.setSex(loginUserInfoVO.getSex()); sysUserDO.setBirthday(loginUserInfoVO.getBirthday()); sysUserDO.setJob(loginUserInfoVO.getJob()); sysUserDO.setUserId(loginUserInfoVO.getUserId()); sysUserDO.setFaceUrl(loginUserInfoVO.getFaceUrl()); sysUserDO.setFaceState(0); SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard, loginUserInfoVO.getIdCard())); SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard, idCard)); if (!ObjectUtils.isEmpty(sysUserDO1)) { return R.fail("身份证已经存在"); }
