bug

huanghongfa

2021-01-19 6ab0c03da9baccf22bbb62293284b942452d8696

bug

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -24,9 +24,20 @@
  <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/exceptions/GlobalExceptionCapture.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/exceptions/GlobalExceptionCapture.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/exceptions/GlobalExceptionCapture.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/exceptions/GlobalExceptionCapture.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/listen/PartyBuildingMemberExcelListen.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/listen/PartyBuildingMemberExcelListen.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/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/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/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/timejob/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/timejob/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" />
@@ -273,8 +284,8 @@
      <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.CommunityBackstageApplication" />
      <item itemvalue="Spring Boot.AppletsBackstageApplication" />
      <item itemvalue="Spring Boot.AuthApplication" />
      <item itemvalue="Spring Boot.ConfigServerApplication" />
@@ -406,7 +417,7 @@
      <workItem from="1610934956567" duration="1325000" />
      <workItem from="1610939265133" duration="8588000" />
      <workItem from="1610956684718" duration="7037000" />
      <workItem from="1611019208339" duration="20664000" />
      <workItem from="1611019208339" duration="22502000" />
    </task>
    <servers />
  </component>
@@ -446,10 +457,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="499" y="159" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1536.824@0.0.1536.824" timestamp="1608878808962" />
    <state width="561" height="466" key="DebuggerActiveHint" timestamp="1611045182355">
    <state width="561" height="466" key="DebuggerActiveHint" timestamp="1611047155934">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="561" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1611045182355" />
    <state width="561" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1611047155934" />
    <state x="93" y="93" width="1350" height="638" key="DiffContextDialog" timestamp="1609316182000">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -458,54 +469,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="483" key="GridCell.Tab.0.bottom" timestamp="1611046293936">
    <state width="1031" height="289" key="GridCell.Tab.0.bottom" timestamp="1611048119151">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="483" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611046293936" />
    <state width="1031" height="483" key="GridCell.Tab.0.center" timestamp="1611046293936">
    <state width="1031" height="289" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611048119151" />
    <state width="1031" height="289" key="GridCell.Tab.0.center" timestamp="1611048119151">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="483" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611046293936" />
    <state width="1031" height="483" key="GridCell.Tab.0.left" timestamp="1611046293936">
    <state width="1031" height="289" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611048119151" />
    <state width="1031" height="289" key="GridCell.Tab.0.left" timestamp="1611048119151">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="483" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611046293936" />
    <state width="1031" height="483" key="GridCell.Tab.0.right" timestamp="1611046293936">
    <state width="1031" height="289" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611048119151" />
    <state width="1031" height="289" key="GridCell.Tab.0.right" timestamp="1611048119151">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="483" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611046293936" />
    <state width="1031" height="483" key="GridCell.Tab.1.bottom" timestamp="1611046293937">
    <state width="1031" height="289" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611048119151" />
    <state width="1031" height="289" key="GridCell.Tab.1.bottom" timestamp="1611048119152">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="483" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611046293937" />
    <state width="1031" height="483" key="GridCell.Tab.1.center" timestamp="1611046293936">
    <state width="1031" height="289" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611048119152" />
    <state width="1031" height="289" key="GridCell.Tab.1.center" timestamp="1611048119152">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="483" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611046293936" />
    <state width="1031" height="483" key="GridCell.Tab.1.left" timestamp="1611046293936">
    <state width="1031" height="289" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611048119152" />
    <state width="1031" height="289" key="GridCell.Tab.1.left" timestamp="1611048119152">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="483" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611046293936" />
    <state width="1031" height="483" key="GridCell.Tab.1.right" timestamp="1611046293937">
    <state width="1031" height="289" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611048119152" />
    <state width="1031" height="289" key="GridCell.Tab.1.right" timestamp="1611048119152">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="483" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611046293937" />
    <state width="1031" height="483" key="GridCell.Tab.2.bottom" timestamp="1611046293937">
    <state width="1031" height="289" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611048119152" />
    <state width="1031" height="289" key="GridCell.Tab.2.bottom" timestamp="1611048119152">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="483" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611046293937" />
    <state width="1031" height="483" key="GridCell.Tab.2.center" timestamp="1611046293937">
    <state width="1031" height="289" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611048119152" />
    <state width="1031" height="289" key="GridCell.Tab.2.center" timestamp="1611048119152">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="483" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611046293937" />
    <state width="1031" height="483" key="GridCell.Tab.2.left" timestamp="1611046293937">
    <state width="1031" height="289" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611048119152" />
    <state width="1031" height="289" key="GridCell.Tab.2.left" timestamp="1611048119152">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="483" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611046293937" />
    <state width="1031" height="483" key="GridCell.Tab.2.right" timestamp="1611046293937">
    <state width="1031" height="289" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611048119152" />
    <state width="1031" height="289" key="GridCell.Tab.2.right" timestamp="1611048119152">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="483" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611046293937" />
    <state width="1031" height="289" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611048119152" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -526,10 +537,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="93" y="93" width="1350" height="639" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1611044794794" />
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1611045692188">
    <state x="233" y="42" width="766" height="782" key="find.popup" timestamp="1611047744843">
      <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="1611045692188" />
    <state x="233" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611047744843" />
    <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/exceptions/GlobalExceptionCapture.java

@@ -41,7 +41,7 @@
     */
    @ExceptionHandler(value = PartyBuildingMemberException.class)
    public R PartyBuildingMemberException(PartyBuildingMemberException ex) {
        return R.fail(ex.getCode(),ex.getMsg());
        return R.fail(ex.getMsg());
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/exceptions/GlobalExceptionCapture.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/listen/PartyBuildingMemberExcelListen.java

@@ -4,6 +4,7 @@
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.constants.HttpStatus;
import com.panzhihua.common.exceptions.PartyBuildingMemberException;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberExcelVO;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
@@ -38,8 +39,8 @@
        if(list.size() >= BATCH_COUNT){
            log.info("excel导入数据【{}】", JSONObject.toJSONString(list));
            R r = this.partyBuildingService.listSavePartyBuildingMemberExcelVO(list);
            if (r.getCode()!= HttpStatus.SUCCESS) {
                log.error("excel导入数据失败【{}】",r.getMsg());
            if (!R.isOk(r)) {
                throw new PartyBuildingMemberException(r.getMsg());
            }
            list.clear();           //清空list
        }
@@ -49,6 +50,9 @@
    @Override
    public void doAfterAllAnalysed(AnalysisContext analysisContext) {
        log.info("excel导入数据【{}】", JSONObject.toJSONString(list));
        this.partyBuildingService.listSavePartyBuildingMemberExcelVO(list); //确保最后遗留的数据保存在数据库中
        R r = this.partyBuildingService.listSavePartyBuildingMemberExcelVO(list);//确保最后遗留的数据保存在数据库中
        if (!R.isOk(r)) {
            throw new PartyBuildingMemberException(r.getMsg());
        }
    }
}

 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/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/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java

@@ -1,5 +1,6 @@
package com.panzhihua.service_dangjian.api;

import com.panzhihua.common.exceptions.PartyBuildingMemberException;
import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.*;
@@ -54,7 +55,17 @@
     */
    @PostMapping("listsavepartybuildingmemberexcelvo")
    public R listSavePartyBuildingMemberExcelVO(@RequestBody List<PartyBuildingMemberExcelVO> list){
        return  comPbMemberService.listSavePartyBuildingMemberExcelVO(list);
        R r = null;
        try {
            r = comPbMemberService.listSavePartyBuildingMemberExcelVO(list);
        } catch (Exception e) {
            if (e.getMessage().contains("unique_id_card_community_id")) {
              return R.fail("身份证重复");
            }else {
                return R.fail("导入失败");
            }
        }
        return r;
        
    }


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

@@ -132,15 +132,7 @@
                comPbMemberDOS.add(comPbMemberDO);
            });
        }
        try {
            this.saveBatch(comPbMemberDOS);
        } catch (Exception e) {
            e.printStackTrace();
            if (e.getMessage().contains("unique_id_card_community_id")) {
                return R.fail("导入失败，身份证已经存在");
            }
           return R.ok("导入失败");
        }
        this.saveBatch(comPbMemberDOS);
        return R.ok();
    }


 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/timejob/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: