DESKTOP-71BH0QO\L、ming
2021-03-24 38159f3451439fa20db76288e884fe34d2ec5cba
fix:支持视频上传
2个文件已修改
75 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml 61 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -23,49 +23,8 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <change afterPath="$PROJECT_DIR$/../.gitignore" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/applets.log.2021-02-05.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/applets.log.2021-02-05.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/applets.log.2021-02-18.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/applets.log.2021-02-18.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/applets.log.2021-02-19.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/applets.log.2021-02-19.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/applets.log.2021-02-20.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/applets.log.2021-02-20.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/applets_backstage.log.2021-02-05.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/applets_backstage.log.2021-02-05.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/applets_backstage.log.2021-02-18.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/applets_backstage.log.2021-02-18.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/applets_backstage.log.2021-02-19.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/applets_backstage.log.2021-02-19.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/applets_backstage.log.2021-02-20.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/applets_backstage.log.2021-02-20.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/auth.log.2021-02-05.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/auth.log.2021-02-05.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/auth.log.2021-02-18.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/auth.log.2021-02-18.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/auth.log.2021-02-19.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/auth.log.2021-02-19.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/auth.log.2021-02-20.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/auth.log.2021-02-20.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/community_backstage.log.2021-02-05.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/community_backstage.log.2021-02-05.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/community_backstage.log.2021-02-18.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/community_backstage.log.2021-02-18.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/community_backstage.log.2021-02-19.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/community_backstage.log.2021-02-19.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/community_backstage.log.2021-02-20.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/community_backstage.log.2021-02-20.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/config_server.log.2020-12-28.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/config_server.log.2020-12-28.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/config_server.log.2020-12-29.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/config_server.log.2020-12-29.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/eureka_server.log.2020-12-28.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/eureka_server.log.2020-12-28.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/eureka_server.log.2020-12-29.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/eureka_server.log.2020-12-29.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/service_community.log.2021-02-05.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/service_community.log.2021-02-05.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/service_community.log.2021-02-18.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/service_community.log.2021-02-18.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/service_community.log.2021-02-19.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/service_community.log.2021-02-19.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/service_community.log.2021-02-20.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/service_community.log.2021-02-20.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/service_partybuilding.log.2021-02-05.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/service_partybuilding.log.2021-02-05.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/service_partybuilding.log.2021-02-18.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/service_partybuilding.log.2021-02-18.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/service_partybuilding.log.2021-02-19.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/service_partybuilding.log.2021-02-19.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/service_partybuilding.log.2021-02-20.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/service_partybuilding.log.2021-02-20.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/service_user.log.2021-02-05.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/service_user.log.2021-02-05.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/service_user.log.2021-02-18.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/service_user.log.2021-02-18.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/service_user.log.2021-02-19.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/service_user.log.2021-02-19.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/service_user.log.2021-02-20.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/service_user.log.2021-02-20.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/zuul.log.2021-02-01.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/zuul.log.2021-02-01.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/zuul.log.2021-02-05.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/zuul.log.2021-02-05.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/zuul.log.2021-02-18.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/zuul.log.2021-02-18.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/zuul.log.2021-02-19.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/zuul.log.2021-02-19.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/zuul.log.2021-02-20.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/zuul.log.2021-02-20.log" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/ComCvtCategoryDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/ComCvtCategoryDTO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -324,15 +283,15 @@
    </configuration>
    <list>
      <item itemvalue="Spring Boot.ServiceUserApplication" />
      <item itemvalue="Spring Boot.ZuulApplication" />
      <item itemvalue="Spring Boot.AppletsApplication" />
      <item itemvalue="Spring Boot.CommunityBackstageApplication" />
      <item itemvalue="Spring Boot.AppletsBackstageApplication" />
      <item itemvalue="Spring Boot.AuthApplication" />
      <item itemvalue="Spring Boot.ConfigServerApplication" />
      <item itemvalue="Spring Boot.EurekaServerApplication" />
      <item itemvalue="Spring Boot.ServiceDangjianApplication" />
      <item itemvalue="Spring Boot.ZuulApplication" />
      <item itemvalue="Spring Boot.EurekaServerApplication" />
      <item itemvalue="Spring Boot.ServiceCommunityApplication" />
      <item itemvalue="Spring Boot.CommunityBackstageApplication" />
      <item itemvalue="Spring Boot.TimejobApplication" />
      <item itemvalue="应用程序.ComActActivityServiceImpl" />
      <item itemvalue="应用程序.IdCard" />
@@ -486,7 +445,7 @@
      <workItem from="1616487257652" duration="6990000" />
      <workItem from="1616501287620" duration="598000" />
      <workItem from="1616547019982" duration="10669000" />
      <workItem from="1616566015680" duration="5438000" />
      <workItem from="1616566015680" duration="7999000" />
    </task>
    <servers />
  </component>
@@ -523,6 +482,16 @@
          <line>52</line>
          <option name="timeStamp" value="7" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java</url>
          <line>175</line>
          <option name="timeStamp" value="8" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java</url>
          <line>180</line>
          <option name="timeStamp" value="9" />
        </line-breakpoint>
      </breakpoints>
    </breakpoint-manager>
    <pin-to-top-manager>
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java
@@ -23,6 +23,7 @@
import com.panzhihua.community_backstage.listen.PartyBuildingMemberExcelListen;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javassist.expr.NewArray;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.ObjectUtils;
@@ -35,6 +36,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.UUID;
@@ -81,6 +83,7 @@
        log.info("社区所有党组织社区id【{}】", communityId);
        return partyBuildingService.listPartyOrganization(communityId);
    }
    @ApiOperation(value = "社区所有党组织列表", response = PartyOrganizationVO.class)
    @GetMapping("listpartyorganizationAll")
    public R listPartyOrganizationAll() {
@@ -170,8 +173,16 @@
    @ApiOperation(value = "上传照片")
    @PostMapping(value = "uploadimage", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R uploadImage(@RequestParam MultipartFile file, HttpServletRequest request) {
        String name = file.getOriginalFilename();
        String name = file.getOriginalFilename().toLowerCase();;
        List<String> formateList = Arrays.asList(
                "avi", "flv", "mpg", "mpeg", "mpe", "m1v", "m2v", "mpv2", "mp2v", "dat", "ts", "tp", "tpr", "pva", "pss", "mp4", "m4v",
                "m4p", "m4b", "3gp", "3gpp", "3g2", "3gp2", "ogg", "mov", "qt", "amr", "rm", "ram", "rmvb", "rpm");
        String nameStr = name.split("\\.")[1];
        if (formateList.contains(nameStr)) {
            name = UUID.randomUUID().toString().replaceAll("-", "") + ".mp4";
        } else {
        name= UUID.randomUUID().toString().replaceAll("-","")+".jpg";
        }
        try {
            SFTPUtil sftp = new SFTPUtil(userName,password,host,port);
            sftp.login();
@@ -487,6 +498,7 @@
    public R deleteMessage(@RequestBody ComActMessageVO comActMessageVO) {
        return communityService.deleteMessage(comActMessageVO);
    }
    @ApiOperation(value = "批量设置留言(公开1,保密2)")
    @DeleteMapping("resetmessagepublic")
    public R resetMessagePublic(@RequestBody ResetComActMessageVO resetComActMessageVO) {