Merge branch 'dev_New_pro' into dev_pro_山西_晋和园

gongchunyi

2026-06-02 a8b712bc5b0af9ee6da25e1518729b78aa778fed

 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