liyanqi
2022-09-13 42c81d1538e3c08c84a789ffafd9a7deafa1ff24
fix bug
4个文件已修改
40 ■■■■■ 已修改文件
ycl-common/src/main/java/com/ycl/config/MetaObjectConfig.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-common/src/main/java/com/ycl/service/store/impl/UmsStoreInfoServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-common/src/main/java/com/ycl/utils/JwtTokenUtil.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/controller/depart/DepartController.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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 {
    /**
     * 自动插入数据
     *
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);
ycl-common/src/main/java/com/ycl/utils/JwtTokenUtil.java
@@ -174,6 +174,26 @@
        return false;
    }
    /**
     * 根据用户id,用户名生成token
     */
    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解析出AuthInfo
     * @param token
     * @return
     */
    public AuthInfo parseToken(String token) {
        AuthInfo authInfo = null;
        try {
@@ -187,18 +207,5 @@
            throw new ApiException(e.getMessage());
        }
        return authInfo;
    }
    /**
     * 根据用户id,用户名生成token
     */
    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);
    }
}
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")