From 22899fc5104718c293058b95fff24c5038edf5a7 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Mon, 24 Jul 2023 13:41:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BA=AB=E4=BB=BD=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../depository_manage/config/WebMvcConfig.java | 2 +- .../controller/QyWxOperationController.java | 7 ++++++- .../hrNew_mapper/UserMapper.java | 2 +- .../service/impl/ExcelServiceImpl.java | 16 ++++++++-------- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/config/WebMvcConfig.java b/src/main/java/com/dreamchaser/depository_manage/config/WebMvcConfig.java index 6c4513d1..0471b9c6 100644 --- a/src/main/java/com/dreamchaser/depository_manage/config/WebMvcConfig.java +++ b/src/main/java/com/dreamchaser/depository_manage/config/WebMvcConfig.java @@ -15,7 +15,7 @@ public class WebMvcConfig implements WebMvcConfigurer { public void addInterceptors(InterceptorRegistry registry) { registry.addInterceptor(new UserInterceptor()) .addPathPatterns("/**") - .excludePathPatterns("/webSocket/{number}","/login", "/register", "/sendCode", "/error","/callback","/QyWxLogin","/getMaterialAll","/approvalcallback","/identity/**") + .excludePathPatterns("/webSocket/{number}","/login", "/register", "/sendCode", "/error","/callback","/QyWxLogin","/getMaterialAll","/approvalcallback","/identityVerify") .excludePathPatterns("classpath:/static/**") .excludePathPatterns("/static/**"); } diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java b/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java index 530de07e..72082da6 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java @@ -21,11 +21,13 @@ import com.dreamchaser.depository_manage.utils.Md5; import com.dreamchaser.depository_manage.utils.ObjectFormatUtil; import com.dreamchaser.depository_manage.utils.QyWxXMLUtils; import org.apache.commons.codec.digest.DigestUtils; +import org.apache.xmlbeans.impl.store.Public2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; @@ -39,7 +41,6 @@ import java.util.concurrent.TimeUnit; /** * 用于企业微信相关操作的控制器 */ -@RestController @Controller public class QyWxOperationController { @@ -262,6 +263,7 @@ public class QyWxOperationController { String header = request.getHeader("user-agent"); String crypt = Md5.crypt(header); JSONObject jsonObject = QyWxConfig.GetQYWXUserId(crypt); + Integer errCode = jsonObject.getInteger("errcode"); String userId = jsonObject.getString("userid"); if (errCode == 0) { @@ -274,6 +276,9 @@ public class QyWxOperationController { String key = userKeyAndUserToken.get("key"); String token = userKeyAndUserToken.get("token"); if (userByPort != null) { + + PublicConfig.findUserByQyWxUserId(userId); + // 如果数据库中存在该用户 // 设置放入时间 userByPort.setInstant(Instant.now()); diff --git a/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/UserMapper.java b/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/UserMapper.java index fe28b408..c06f6400 100644 --- a/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/UserMapper.java +++ b/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/UserMapper.java @@ -14,9 +14,9 @@ import java.util.Map; * * @author Dreamchaser */ -@Repository @Mapper @DS("hr_new") +@Repository public interface UserMapper { /** * 通过id获取用户信息 diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java index 3e554d4d..f2d3f483 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java @@ -43,29 +43,29 @@ public class ExcelServiceImpl implements ExcelService { // excel导入工具类 @Autowired - excelUtil excelutil; + private excelUtil excelutil; @Autowired - MaterialService materialService; + private MaterialService materialService; @Autowired - MaterialTypeService materialTypeService; + private MaterialTypeService materialTypeService; @Autowired - PlaceService placeService; + private PlaceService placeService; @Autowired - MaterialMapper materialMapper; + private MaterialMapper materialMapper; @Autowired - SplitUnitService splitUnitService; + private SplitUnitService splitUnitService; @Autowired - DepositoryRecordMapper depositoryRecordMapper; + private DepositoryRecordMapper depositoryRecordMapper; @Autowired - ConstructionUnitMapper constructionUnitMapper; + private ConstructionUnitMapper constructionUnitMapper; /**