Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

zss

6 天以前 222685a758d615ef69d8dafd5bcf0c270d6d0fb2

 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