From 8fe4e6dcc9dcfb8477ef7634925f4e5107b2693b Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Thu, 15 May 2025 14:54:55 +0800
Subject: [PATCH 1/3] clean code

---
 .../manage/service/serviceimpl/EdPrjServiceImpl.java      | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
index ceaba57..6f1310e 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
@@ -15,14 +15,12 @@ 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;
@@ -37,12 +35,6 @@ 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;
 

From 294a7e12f3f8d06ac70464dba183252aea68229f Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Thu, 15 May 2025 15:43:33 +0800
Subject: [PATCH 2/3] clean code

---
 .../manage/service/serviceimpl/EdFileInfoServiceImpl.java    | 2 +-
 .../industry/software/common/util/AESUtils.java              | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
index 74e50c8..007fcff 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
@@ -1564,7 +1564,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         }
     }
 
-    private void updateImportPrj2FileSystem(MultipartFile file, String prjId) throws IOException {
+    private void updateImportPrj2FileSystem(MultipartFile file, String prjId) {
         String tmpZipFile = null;
         String destDir = null;
         try {
diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/AESUtils.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/AESUtils.java
index 476ec90..2167ac2 100644
--- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/AESUtils.java
+++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/AESUtils.java
@@ -4,7 +4,10 @@ package com.electromagnetic.industry.software.common.util;
 import cn.hutool.core.codec.Base64;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
-import javax.crypto.*;
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
 import javax.crypto.spec.SecretKeySpec;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;

From 671c0882f43162511badfabed5f9e2c0eedf4f77 Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Mon, 26 May 2025 11:13:39 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E8=AE=BE=E7=BD=AE=E5=85=B6=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=B8=BAnormal?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../industry/software/manage/pojo/models/User.java              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/User.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/User.java
index 5943ed4..c0020ed 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/User.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/User.java
@@ -3,6 +3,7 @@ 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;
@@ -96,5 +97,6 @@ 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());
     }
 }