From 42c81d1538e3c08c84a789ffafd9a7deafa1ff24 Mon Sep 17 00:00:00 2001
From: liyanqi <15181887205@163.com>
Date: 星期二, 13 九月 2022 16:52:12 +0800
Subject: [PATCH] fix bug

---
 ycl-common/src/main/java/com/ycl/service/store/impl/UmsStoreInfoServiceImpl.java |    2 ++
 ycl-platform/src/main/java/com/ycl/controller/depart/DepartController.java       |    3 +++
 ycl-common/src/main/java/com/ycl/config/MetaObjectConfig.java                    |    2 +-
 ycl-common/src/main/java/com/ycl/utils/JwtTokenUtil.java                         |   33 ++++++++++++++++++++-------------
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/ycl-common/src/main/java/com/ycl/config/MetaObjectConfig.java b/ycl-common/src/main/java/com/ycl/config/MetaObjectConfig.java
index 89f544d..bbeba6d 100644
--- a/ycl-common/src/main/java/com/ycl/config/MetaObjectConfig.java
+++ b/ycl-common/src/main/java/com/ycl/config/MetaObjectConfig.java
@@ -2,7 +2,6 @@
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.ycl.enums.common.DelType;
-import com.ycl.utils.common.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.reflection.MetaObject;
 import org.springframework.context.annotation.Configuration;
@@ -18,6 +17,7 @@
 @Slf4j
 @Configuration
 public class MetaObjectConfig implements MetaObjectHandler {
+
     /**
      * 鑷姩鎻掑叆鏁版嵁
      *
diff --git a/ycl-common/src/main/java/com/ycl/service/store/impl/UmsStoreInfoServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/store/impl/UmsStoreInfoServiceImpl.java
index b1e0e3d..070b337 100644
--- a/ycl-common/src/main/java/com/ycl/service/store/impl/UmsStoreInfoServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/store/impl/UmsStoreInfoServiceImpl.java
@@ -15,6 +15,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
@@ -43,6 +44,7 @@
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean addByExcel(MultipartFile file) {
         if (file == null) {
             throw new ApiException(ResultCode.FILE_NOT_FOUND);
diff --git a/ycl-common/src/main/java/com/ycl/utils/JwtTokenUtil.java b/ycl-common/src/main/java/com/ycl/utils/JwtTokenUtil.java
index d64c7df..594ac79 100644
--- a/ycl-common/src/main/java/com/ycl/utils/JwtTokenUtil.java
+++ b/ycl-common/src/main/java/com/ycl/utils/JwtTokenUtil.java
@@ -174,6 +174,26 @@
         return false;
     }
 
+
+
+    /**
+     * 鏍规嵁鐢ㄦ埛id,鐢ㄦ埛鍚嶇敓鎴恡oken
+     */
+    public String generateToken(long userId, String username) {
+        Map<String, Object> claims = new HashMap<>();
+        AuthInfo authInfo = new AuthInfo();
+        authInfo.setUserId(userId);
+        authInfo.setUsername(username);
+        claims.put(CLAIM_KEY_INFO, JSONObject.toJSONString(authInfo));
+        claims.put(CLAIM_KEY_CREATED, new Date());
+        return generateToken(claims);
+    }
+
+    /**
+     * 鏍规嵁token瑙f瀽鍑篈uthInfo
+     * @param token
+     * @return
+     */
     public AuthInfo parseToken(String token) {
         AuthInfo authInfo = null;
         try {
@@ -187,18 +207,5 @@
             throw new ApiException(e.getMessage());
         }
         return authInfo;
-    }
-
-    /**
-     * 鏍规嵁鐢ㄦ埛id,鐢ㄦ埛鍚嶇敓鎴恡oken
-     */
-    public String generateToken(long userId, String username) {
-        Map<String, Object> claims = new HashMap<>();
-        AuthInfo authInfo = new AuthInfo();
-        authInfo.setUserId(userId);
-        authInfo.setUsername(username);
-        claims.put(CLAIM_KEY_INFO, JSONObject.toJSONString(authInfo));
-        claims.put(CLAIM_KEY_CREATED, new Date());
-        return generateToken(claims);
     }
 }
diff --git a/ycl-platform/src/main/java/com/ycl/controller/depart/DepartController.java b/ycl-platform/src/main/java/com/ycl/controller/depart/DepartController.java
index 178c4e3..7cb83da 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/depart/DepartController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/depart/DepartController.java
@@ -9,6 +9,7 @@
 import com.ycl.entity.depart.SccgDepart;
 import com.ycl.service.depart.SccgDepartService;
 import com.ycl.service.user.UmsDepartManageService;
+import com.ycl.utils.auth.UserAuthUtil;
 import com.ycl.vo.depart.DepartVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -36,6 +37,8 @@
     private SccgDepartService departService;
     @Resource
     private UmsDepartManageService umsAdminDepartService;
+    @Resource
+    private UserAuthUtil userAuthUtil;
 
     @ApiOperation("娣诲姞閮ㄩ棬")
     @PostMapping(value = "/create")

--
Gitblit v1.8.0