升级druid到最新版本v1.1.23

RuoYi

2020-09-04 abef552b59ee6f0390437301776c2758576d11e8

升级druid到最新版本v1.1.23

 pom.xml

@@ -26,7 +26,7 @@
        <mybatis.spring.boot.starter.version>1.3.2</mybatis.spring.boot.starter.version>

        <pagehelper.spring.boot.starter.version>1.2.5</pagehelper.spring.boot.starter.version>

        <fastjson.version>1.2.73</fastjson.version>

        <druid.version>1.1.14</druid.version>

        <druid.version>1.1.23</druid.version>

        <commons.io.version>2.5</commons.io.version>

        <commons.fileupload.version>1.3.3</commons.fileupload.version>

        <bitwalker.version>1.19</bitwalker.version>


 src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java

@@ -79,11 +79,11 @@
        }

        // 获取当前的用户

        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());

        SysUser currentUser = loginUser.getUser();

        if (currentUser != null)

        if (StringUtils.isNotNull(loginUser))

        {

            SysUser currentUser = loginUser.getUser();

            // 如果是超级管理员，则不过滤数据

            if (!currentUser.isAdmin())

            if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())

            {

                dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),

                        controllerDataScope.userAlias());


 src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java

@@ -76,12 +76,12 @@
    public List<SysDictData> selectDictDataByType(String dictType)

    {

        List<SysDictData> dictDatas = DictUtils.getDictCache(dictType);

        if (StringUtils.isNotNull(dictDatas))

        if (StringUtils.isNotEmpty(dictDatas))

        {

            return dictDatas;

        }

        dictDatas = dictDataMapper.selectDictDataByType(dictType);

        if (StringUtils.isNotNull(dictDatas))

        if (StringUtils.isNotEmpty(dictDatas))

        {

            DictUtils.setDictCache(dictType, dictDatas);

            return dictDatas;