huanghongfa
2021-01-18 a678b6d79e52c4e1b99905aa9145474d8498e2de
小区查询
17个文件已修改
276 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml 75 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDTO.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActVO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/dtos/community/PageComActDTO.class 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActVO.class 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java 128 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructAreaDAO.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/bootstrap.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -24,7 +24,18 @@
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDTO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActVO.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" />
      <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/dao/ComActDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.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/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/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" />
@@ -270,6 +281,7 @@
      <item itemvalue="Application.UserServiceImpl" />
      <item itemvalue="Application.CommonApi" />
      <item itemvalue="Application.RealNameUtil" />
      <item itemvalue="Application.ComBpActivityServiceImpl" />
      <item itemvalue="Spring Boot.CommunityBackstageApplication" />
      <item itemvalue="Spring Boot.AppletsApplication" />
      <item itemvalue="Spring Boot.AppletsBackstageApplication" />
@@ -280,7 +292,6 @@
      <item itemvalue="Spring Boot.ServiceUserApplication" />
      <item itemvalue="Spring Boot.ZuulApplication" />
      <item itemvalue="Spring Boot.ServiceCommunityApplication" />
      <item itemvalue="Application.ComBpActivityServiceImpl" />
      <item itemvalue="Spring Boot.TimejobApplication" />
    </list>
    <recent_temporary>
@@ -398,7 +409,11 @@
      <workItem from="1610326930387" duration="5497000" />
      <workItem from="1610368400707" duration="771000" />
      <workItem from="1610415637750" duration="6485000" />
      <workItem from="1610499071420" duration="66775000" />
      <workItem from="1610499071420" duration="67665000" />
      <workItem from="1610859280054" duration="1991000" />
      <workItem from="1610930834137" duration="517000" />
      <workItem from="1610934956567" duration="1325000" />
      <workItem from="1610939265133" duration="5619000" />
    </task>
    <servers />
  </component>
@@ -450,54 +465,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="1610606590056" />
    <state width="1031" height="252" key="GridCell.Tab.0.bottom" timestamp="1610703591477">
    <state width="1031" height="439" key="GridCell.Tab.0.bottom" timestamp="1610953681270">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="252" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610703591477" />
    <state width="1031" height="252" key="GridCell.Tab.0.center" timestamp="1610703591477">
    <state width="1031" height="439" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610953681270" />
    <state width="1031" height="439" key="GridCell.Tab.0.center" timestamp="1610953681270">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="252" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1610703591477" />
    <state width="1031" height="252" key="GridCell.Tab.0.left" timestamp="1610703591477">
    <state width="1031" height="439" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1610953681270" />
    <state width="1031" height="439" key="GridCell.Tab.0.left" timestamp="1610953681270">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="252" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1610703591477" />
    <state width="1031" height="252" key="GridCell.Tab.0.right" timestamp="1610703591477">
    <state width="1031" height="439" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1610953681270" />
    <state width="1031" height="439" key="GridCell.Tab.0.right" timestamp="1610953681270">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="252" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1610703591477" />
    <state width="1031" height="252" key="GridCell.Tab.1.bottom" timestamp="1610703591477">
    <state width="1031" height="439" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1610953681270" />
    <state width="1031" height="439" key="GridCell.Tab.1.bottom" timestamp="1610953681270">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="252" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610703591477" />
    <state width="1031" height="252" key="GridCell.Tab.1.center" timestamp="1610703591477">
    <state width="1031" height="439" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610953681270" />
    <state width="1031" height="439" key="GridCell.Tab.1.center" timestamp="1610953681270">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="252" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1610703591477" />
    <state width="1031" height="252" key="GridCell.Tab.1.left" timestamp="1610703591477">
    <state width="1031" height="439" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1610953681270" />
    <state width="1031" height="439" key="GridCell.Tab.1.left" timestamp="1610953681270">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="252" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1610703591477" />
    <state width="1031" height="252" key="GridCell.Tab.1.right" timestamp="1610703591477">
    <state width="1031" height="439" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1610953681270" />
    <state width="1031" height="439" key="GridCell.Tab.1.right" timestamp="1610953681270">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="252" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1610703591477" />
    <state width="1031" height="252" key="GridCell.Tab.2.bottom" timestamp="1610703591478">
    <state width="1031" height="439" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1610953681270" />
    <state width="1031" height="439" key="GridCell.Tab.2.bottom" timestamp="1610953681270">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="252" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610703591478" />
    <state width="1031" height="252" key="GridCell.Tab.2.center" timestamp="1610703591477">
    <state width="1031" height="439" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610953681270" />
    <state width="1031" height="439" key="GridCell.Tab.2.center" timestamp="1610953681270">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="252" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1610703591477" />
    <state width="1031" height="252" key="GridCell.Tab.2.left" timestamp="1610703591477">
    <state width="1031" height="439" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1610953681270" />
    <state width="1031" height="439" key="GridCell.Tab.2.left" timestamp="1610953681270">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="252" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1610703591477" />
    <state width="1031" height="252" key="GridCell.Tab.2.right" timestamp="1610703591477">
    <state width="1031" height="439" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1610953681270" />
    <state width="1031" height="439" key="GridCell.Tab.2.right" timestamp="1610953681270">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="252" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1610703591477" />
    <state width="1031" height="439" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1610953681270" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -514,14 +529,14 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1609398421992" />
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1610685985967">
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1610939578806">
      <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="1610685985967" />
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610701670550">
    <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="1610939578806" />
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610949611764">
      <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="1610701670550" />
    <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610949611764" />
    <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev
eureka:
  client:
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev
eureka:
  client:
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev
eureka:
  client:
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDTO.java
@@ -1,5 +1,6 @@
package com.panzhihua.common.model.dtos.community;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,7 +14,7 @@
 * @create: 2020-12-15 10:06
 **/
@Data
@ApiModel("社区表")
@ApiModel("社区表请求参数")
public class PageComActDTO {
    @ApiModelProperty("社区名字")
@@ -23,9 +24,11 @@
    private String areaCode;
    @ApiModelProperty(value = "创建查询开始时间",example = "2020-01-02 00:00:00")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAtBegin;
    @ApiModelProperty(value = "创建查询结束时间",example = "2020-12-02 00:00:00")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAtEnd;
    @ApiModelProperty(value = "分页-当前页数",example = "1")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActVO.java
@@ -19,7 +19,7 @@
@ApiModel("社区表")
public class ComActVO {
    @ApiModelProperty("community_id")
    @ApiModelProperty("社区id")
    private Long communityId;
    @ApiModelProperty("社区名字")
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/dtos/community/PageComActDTO.class
Binary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActVO.class
Binary files differ
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java
@@ -95,50 +95,44 @@
    }
    @ApiOperation(value = "下载模板-导入党员")
    @GetMapping(value = "downloadtemplate")
    public R downloadTemplate() throws IOException, SftpException {
    @GetMapping(value = "downloadtemplate", headers = "Accept=application/octet-stream")
    public void downloadTemplate(HttpServletResponse response) throws IOException, SftpException {
        SFTPUtil sftp = new SFTPUtil();
        sftp.login();
        InputStream inputStream = sftp.downloadInputStream(FtpConstants.FTPFILEPATH_MUBAN, UPLOAD_EXCEL);
        // 配置文件下载
        response.setHeader("content-type", "application/octet-stream");
        response.setContentType("application/octet-stream");
        // 下载文件能正常显示中文
        response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(UPLOAD_EXCEL, "UTF-8"));
        response.setCharacterEncoding("UTF-8");
        byte[] fileData = IOUtils.toByteArray(inputStream);
        String filePath="C:\\";
        FileOutputStream fileOut = null;
        //创建不同的文件夹目录
        File file=new File(filePath);
        String fileName = filePath + UPLOAD_EXCEL;
        //判断文件夹是否存在
        if (!file.exists())
        {
            //如果文件夹不存在,则创建新的的文件夹
            file.mkdirs();
        }
        try
        {
            BufferedInputStream bis = new BufferedInputStream(inputStream);
            //判断文件的保存路径后面是否以/结尾
            if (!filePath.endsWith("/")) {
                filePath += "/";
            }
            //写入到文件(注意文件保存路径的后面一定要加上文件的名称)
            fileOut = new FileOutputStream(fileName);
            BufferedOutputStream bos = new BufferedOutputStream(fileOut);
            byte[] buf = new byte[4096];
            int length = bis.read(buf);
            //保存文件
            while(length != -1)
            {
                bos.write(buf, 0, length);
                length = bis.read(buf);
            }
            bos.close();
            bis.close();
        } catch (Exception e)
        {
            e.printStackTrace();
            log.error(e.getMessage());
        String result ="";
        for(byte b:fileData ){
            result += getBinaryStrFromByte(b);
        }
        return R.ok(fileName);
        System.out.println(result);
        // 实现文件下载
        byte[] buffer = new byte[1024];
        BufferedInputStream bis = null;
        try {
            bis = new BufferedInputStream(inputStream);
            OutputStream os = response.getOutputStream();
            int i = bis.read(buffer);
            while (i != -1) {
                os.write(buffer, 0, i);
                i = bis.read(buffer);
            }
        } catch (Exception exception) {
            log.error("下载出错");
        } finally {
            if (null != bis) {
                bis.close();
            }
        }
    }
    @ApiOperation(value = "上传照片")
@@ -389,53 +383,21 @@
        }
        return partyBuildingService.deleteDynUser(id);
    }
    /**
     * @功能 下载材料接口
     * @return
     */
    @GetMapping("saveurlas")
    public  void saveUrlAs() throws IOException, SftpException {
        SFTPUtil sftp = new SFTPUtil();
        sftp.login();
        InputStream inputStream = sftp.downloadInputStream(FtpConstants.FTPFILEPATH_MUBAN, UPLOAD_EXCEL);
        String filePath="C:\\";
        FileOutputStream fileOut = null;
        //创建不同的文件夹目录
        File file=new File(filePath);
        //判断文件夹是否存在
        if (!file.exists())
        {
            //如果文件夹不存在,则创建新的的文件夹
            file.mkdirs();
        }
        try
        {
            BufferedInputStream bis = new BufferedInputStream(inputStream);
            //判断文件的保存路径后面是否以/结尾
            if (!filePath.endsWith("/")) {
                filePath += "/";
    public String getBinaryStrFromByte(byte b){
        String result ="";
        byte a = b; ;
        for (int i = 0; i < 8; i++){
            byte c=a;
            a=(byte)(a>>1);//每移一位如同将10进制数除以2并去掉余数。
            a=(byte)(a<<1);
            if(a==c){
                result="0"+result;
            }else{
                result="1"+result;
            }
            //写入到文件(注意文件保存路径的后面一定要加上文件的名称)
            fileOut = new FileOutputStream(filePath+UPLOAD_EXCEL);
            BufferedOutputStream bos = new BufferedOutputStream(fileOut);
            byte[] buf = new byte[4096];
            int length = bis.read(buf);
            //保存文件
            while(length != -1)
            {
                bos.write(buf, 0, length);
                length = bis.read(buf);
            }
            bos.close();
            bis.close();
        } catch (Exception e)
        {
            e.printStackTrace();
            System.out.println("抛出异常!!");
            a=(byte)(a>>1);
        }
        return result;
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev
eureka:
  client:
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java
@@ -50,19 +50,28 @@
            " </if> " +
            "</script>")
    List<ComActVO> listCommunity(ComActVO comActVO);
    @Select("select district_name from com_mng_struct_area_district where district_adcode=#{areaCode}")
    String selectAreaName(String areaCode);
    @Select("<script> " +
            "select id,"+
        " <where>" +
        "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
        " </if> " +
        "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
        " </if> " +
        "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
        " </if> " +
        " </where>" +
        "</script>")
            "SELECT\n" +
            "a.* \n" +
            "FROM\n" +
            "com_act a \n" +
            " <where>" +
            "<if test='pageComActDTO.name != null and pageComActDTO.name.trim() != &quot;&quot;'>" +
            "and a.name LIKE concat( #{pageComActDTO.name}, '%' ) \n" +
            " </if> " +
            "<if test='pageComActDTO.areaCode != null and pageComActDTO.areaCode.trim() != &quot;&quot;'>" +
            "AND a.area_code = #{pageComActDTO.areaCode} \n" +
            " </if> " +
            "<if test='pageComActDTO.createAtBegin != null '>" +
            "AND a.create_at BETWEEN " +
            "#{pageComActDTO.createAtBegin} \n" +
            "AND #{pageComActDTO.createAtEnd}" +
            " </if> " +
            " </where>" +
            "</script>")
    IPage<ComActVO> pageCommunity(Page page, @Param("pageComActDTO") PageComActDTO pageComActDTO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructAreaDAO.java
@@ -32,6 +32,7 @@
            "SELECT\n" +
            "id,\n" +
            "area_name,\n" +
            "area_code,\n" +
            "address_detail,\n" +
            "create_at \n" +
            "FROM\n" +
@@ -42,5 +43,5 @@
            "AND area_name = #{comMngStructAreaVO.areaName}" +
            " </if> " +
            "</script>")
    IPage<ComActDynVO> pageArea(Page page, @Param("comMngStructAreaVO") ComMngStructAreaVO comMngStructAreaVO);
    IPage<ComMngStructAreaVO> pageArea(Page page, @Param("comMngStructAreaVO") ComMngStructAreaVO comMngStructAreaVO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaServiceImpl.java
@@ -78,7 +78,7 @@
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComActDynVO> iPage = comMngStructAreaDAO.pageArea(page, comMngStructAreaVO);
        IPage<ComMngStructAreaVO> iPage = comMngStructAreaDAO.pageArea(page, comMngStructAreaVO);
        return R.ok(iPage);
    }
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev
eureka:
  client:
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev
eureka:
  client:
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev
eureka:
  client:
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev
eureka: