RuoYi
2020-06-04 5c51cbc07ce3a7462bf247d86a05c0f65adb8ede
格式化代码
1 files deleted
3 files modified
199 ■■■■■ changed files
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/web/WebUtils.java 184 ●●●●● patch | view | raw | blame | history
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java 1 ●●●● patch | view | raw | blame | history
ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java 12 ●●●●● patch | view | raw | blame | history
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml 2 ●●● patch | view | raw | blame | history
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/web/WebUtils.java
File was deleted
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java
@@ -70,6 +70,7 @@
        TableDataInfo rspData = new TableDataInfo();
        rspData.setCode(HttpStatus.SUCCESS);
        rspData.setRows(list);
        rspData.setMsg("查询成功");
        rspData.setTotal(new PageInfo(list).getTotal());
        return rspData;
    }
ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java
@@ -1,7 +1,5 @@
package com.ruoyi.gateway.filter;
import com.ruoyi.common.core.utils.web.WebUtils;
import com.ruoyi.gateway.config.properties.IgnoreClientProperties;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.gateway.filter.GatewayFilter;
import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory;
@@ -27,9 +25,6 @@
    @Autowired
    private ValidateCodeService validateCodeService;
    @Autowired
    private IgnoreClientProperties ignoreClient;
    @Override
    public GatewayFilter apply(Object config)
    {
@@ -43,13 +38,6 @@
            }
            try
            {
                // swagger的oauth2.0验证码放行操作
                String[] clientInfos = WebUtils.getClientId(request);
                if (ignoreClient.getClients().contains(clientInfos[0]))
                {
                    return chain.filter(exchange);
                }
                validateCodeService.checkCapcha(request.getQueryParams().getFirst("code"),
                        request.getQueryParams().getFirst("uuid"));
            }
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
@@ -107,7 +107,7 @@
             <if test="createBy != null and createBy != ''">create_by,</if>
             create_time
         )values(
             <if test="dictSort != null and dictSort != ''">#{dictSort},</if>
             <if test="dictSort != null">#{dictSort},</if>
             <if test="dictLabel != null and dictLabel != ''">#{dictLabel},</if>
             <if test="dictValue != null and dictValue != ''">#{dictValue},</if>
             <if test="dictType != null and dictType != ''">#{dictType},</if>