Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁

jenkins

10 天以前 37e8d3271fdc473ab9f756a3445f595d3babeab7

 src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java

@@ -38,7 +38,7 @@
            final Object... args)

    {

        final UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent"));

        final String ip = IpUtils.getIpAddr(ServletUtils.getRequest());

        final String ip = IpUtils.getIpAddr();

        return new TimerTask()

        {

            @Override