!25 Live轻量级PR Merge pull request !25 from Live/live

若依

2020-06-10 c3b5cb20d847f24cd7c2545c65ab01c88767aaf3

!25 Live轻量级PR
Merge pull request !25 from Live/live

 ruoyi-ui/public/robots.txt

对比新文件
@@ -0,0 +1,2 @@
User-agent: *

Disallow: /

 ruoyi-ui/vue.config.js

@@ -117,7 +117,11 @@
                }

              }

            })

          config.optimization.runtimeChunk('single')

          config.optimization.runtimeChunk('single'),

          {

             from: path.resolve(__dirname, './public/robots.txt'),//防爬虫文件

             to:'./',//到根目录下

          }

        }

      )

  }


 ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java

@@ -118,7 +118,7 @@
        StringBuilder result = new StringBuilder();

        try

        {

            String urlNameString = url + "?" + param;

            String urlNameString = url;

            log.info("sendPost - {}", urlNameString);

            URL realUrl = new URL(urlNameString);

            URLConnection conn = realUrl.openConnection();


 ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java

@@ -40,7 +40,7 @@
        {

            ip = request.getRemoteAddr();

        }



        ip = EscapeUtil.clean(ip);//清除Xss特殊字符

        return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : ip;

    }




 ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java

@@ -58,11 +58,11 @@
        {

            column.setHtmlType(GenConstants.HTML_INPUT);



            // 如果是浮点型

            // 如果是浮点型 统一用BigDecimal

            String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), ",");

            if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0)

            {

                column.setJavaType(GenConstants.TYPE_DOUBLE);

                column.setJavaType(GenConstants.TYPE_BIGDECIMAL);

            }

            // 如果是整形

            else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10)