Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/views/monitor/log/localLog.vue

@@ -25,7 +25,7 @@
                  type="text"
                  :loading="downloadLoading"
                  @click="downLoadLogFile(scope.row)"
                  v-if="permissionList.downLoadBtn"
                  v-if="permissionList.downLoadBtn && scope.row.hasChildren!=1"
              >下载
              </el-button>
          </template>

 Source/UBCS-WEB/src/views/system/userinfo.vue

@@ -29,13 +29,32 @@
    },
    methods: {
      handleSubmit(form, done) {
        if (this.index === 0) {
          updateInfo(form).then(res => {
            if (res.data.success) {
              this.$message({
                type: "success",
                message: "修改信息成功!"
              });
              if( form.oldPassword != undefined || form.newPassword1 != undefined || form.newPassword != undefined){
                updatePassword(form.oldPassword, form.newPassword, form.newPassword1).then(res => {
                  if (res.data.success) {
                    this.$message({
                      type: "success",
                      message: "修改成功!"
                    });
                  } else {
                    this.$message({
                      type: "error",
                      message: res.data.msg
                    });
                  }
                  done();
                }, error => {
                  window.console.log(error);
                  done();
                })
              }else{
                this.$message({
                  type: "success",
                  message: "修改信息成功!"
                });
              };
            } else {
              this.$message({
                type: "error",
@@ -47,25 +66,6 @@
            window.console.log(error);
            done();
          })
        } else {
          updatePassword(md5(form.oldPassword), md5(form.newPassword), md5(form.newPassword1)).then(res => {
            if (res.data.success) {
              this.$message({
                type: "success",
                message: "修改密码成功!"
              });
            } else {
              this.$message({
                type: "error",
                message: res.data.msg
              });
            }
            done();
          }, error => {
            window.console.log(error);
            done();
          })
        }
      },
      handleWitch() {
        if (this.index === 0) {

 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java

@@ -4,6 +4,7 @@
import com.vci.ubcs.log.vo.LocalLogVO;
import com.vci.ubcs.log.service.ILogLocalService;
import com.vci.ubcs.log.entity.LocalLog;
import com.vci.ubcs.resource.bo.FileObjectBO;
import com.vci.ubcs.resource.utils.FileDownloadUtil;
import com.vci.ubcs.starter.web.util.ControllerUtil;
import com.vci.ubcs.starter.web.util.LangBaseUtil;
@@ -61,7 +62,9 @@
            if(StringUtils.isBlank(msg)){
                msg = "未知错误";
            }
            ControllerUtil.writeDataToResponse(response,msg.getBytes(StandardCharsets.UTF_8),null);
            FileObjectBO fileObjectBO = new FileObjectBO();
            fileObjectBO.setName(msg.getBytes(StandardCharsets.UTF_8).toString());
            FileDownloadUtil.downloadFileLocal(response, fileObjectBO,true);
        }
    }


 Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java

@@ -265,7 +265,6 @@
                    if(!logFile.exists() || !logFile.isFile()){
                        throw new VciBaseException("本地日志文件路径"+item.getPath()+"中未找到日志");
                    }

                    try(OutputStream os = new FileOutputStream(file);
                        InputStream ins = new FileInputStream(logFile);
                    ){
@@ -277,10 +276,13 @@
                String zipName = new File(tempFolder).getPath() + File.separator + getLogFileName(logFullPaths) + "等"+file1.length + "个文件.zip";
                zipUtil.folderToZipFile(tempFolder,zipName);
                fileObjectBO.setFileLocalPath(zipName);
                fileObjectBO.setName(zipName);
                fileObjectBO.setFileExtension(".log");
                if(log.isDebugEnabled()){
                    log.debug("下载文件的信息,",zipName);
                }
            }else{
                throw new ServerException("该目录下不存在日志文件！");
            }
        }
        return fileObjectBO;

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java

@@ -4988,7 +4988,7 @@

        ExecGroupCodePortDataDTO execGroupCodePortDataDTO=new ExecGroupCodePortDataDTO();
        createExportGroupCodeMapConfig(templateVO,execGroupCodePortDataDTO);//组织数据
        if(!CollectionUtils.isEmpty(execGroupCodePortDataDTO.getCodeAttrMapGroupAttrDTOS())){
        if(CollectionUtils.isEmpty(execGroupCodePortDataDTO.getCodeAttrMapGroupAttrDTOS())){
            throw new VciBaseException("集团属性映射未配置");
        }
        fieldList=execGroupCodePortDataDTO.getFieldList();

 Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java

@@ -378,9 +378,6 @@
        if (!newPassword.equals(newPassword1)) {
            throw new ServiceException("请输入正确的确认密码!");
        }
        if (!user.getPassword().equals(DigestUtil.hex(oldPassword))) {
            throw new ServiceException("原密码不正确!");
        }
        //获取用户采用的密码策略
        Strategy strategy = sysClient.getByUserId(userId).getData();
        // 几乎不会出现这种情况
@@ -391,6 +388,11 @@
        if(newPassword1.length() < strategy.getMinPwdLen() || newPassword1.length() > strategy.getMaxPwdLen()){
            throw new ServiceException("密码中必须含有【"+strategy.getCombinationNames()+"】中的【"+strategy.getRequiredType()+"】种密码组合方式，且密码长度必须在【"+strategy.getMinPwdLen()+"-"+strategy.getMaxPwdLen()+"】范围内");
        }

        oldPassword = DigestUtil.hex(DigestUtils.md5DigestAsHex((oldPassword).getBytes()));
        if (!user.getPassword().equals(oldPassword)) {
            throw new ServiceException("原密码不正确!");
        }
        List<String> regexs = sysClient.getRegexByList(Arrays.asList(strategy.getCombinationIds().split(","))).getData();
        //判断是否满足组合方式中的必填种类数
        int reqType = 0;