Compare commits

..

No commits in common. "9b775e071f0b5adee79c291bd480f9673440813a" and "7efa94871b0931d1da0b16f9565eb79ce5fb81fc" have entirely different histories.

3 changed files with 9 additions and 3 deletions

View File

@ -3,7 +3,6 @@ package com.electromagnetic.industry.software.manage.pojo.models;
import cn.hutool.core.util.RandomUtil;
import com.baomidou.mybatisplus.annotation.TableName;
import com.electromagnetic.industry.software.common.cons.UserConstants;
import com.electromagnetic.industry.software.common.enums.AdminTypeEnum;
import com.electromagnetic.industry.software.common.util.IdWorker;
import com.electromagnetic.industry.software.common.util.SignUtils;
import lombok.Data;
@ -97,6 +96,5 @@ public class User extends BaseModel {
this.setUserPwd(SignUtils.MD5(UserConstants.DEFAULT_PASSWORD + this.getSalt()));
this.setIsPublished(UserConstants.DEFAULT_PUBLISH_STATUS);
this.setIsActivated(UserConstants.DEFAULT_ACTIVE_STATUS);
this.setAdminType(AdminTypeEnum.NORMAL.getValue());
}
}

View File

@ -1564,7 +1564,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
}
}
private void updateImportPrj2FileSystem(MultipartFile file, String prjId) {
private void updateImportPrj2FileSystem(MultipartFile file, String prjId) throws IOException {
String tmpZipFile = null;
String destDir = null;
try {

View File

@ -15,12 +15,14 @@ import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
import com.electromagnetic.industry.software.common.util.EleCommonUtil;
import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil;
import com.electromagnetic.industry.software.common.util.UserThreadLocal;
import com.electromagnetic.industry.software.manage.config.ElePropertyConfig;
import com.electromagnetic.industry.software.manage.mapper.EdFileInfoMapper;
import com.electromagnetic.industry.software.manage.pojo.models.EdFileInfo;
import com.electromagnetic.industry.software.manage.pojo.req.FolderResortDTO;
import com.electromagnetic.industry.software.manage.pojo.req.QueryPublishStatus;
import com.electromagnetic.industry.software.manage.pojo.resp.ProjectVO;
import com.electromagnetic.industry.software.manage.service.EdPrjService;
import com.electromagnetic.industry.software.manage.service.FileSystemService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@ -35,6 +37,12 @@ import static com.electromagnetic.industry.software.common.cons.ElectromagneticC
@Service
public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo> implements EdPrjService {
@Resource
private FileSystemService fileSystemService;
@Resource
private ElePropertyConfig elePropertyConfig;
@Resource
private CommonService commonService;