Merge remote-tracking branch 'origin/master'

Administrator

2022-05-18 644ed3e30bbee9a417dfbe649f2a72df25a7efb1

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/org/springblade/modules/FTP/Monitor.java

 src/main/java/org/springblade/modules/FTP/DataHanlder.java

@@ -214,6 +214,8 @@
            Map map = JSON.parseObject(s, Map.class);
            Object user = map.get("user");
            User user1 = JSON.parseObject(user.toString(), User.class);
            System.out.println("user1 = " + user1);

            //获取 uuid
            String uuid = user1.getReasonForLeav();
            //用户数据校验

 src/main/java/org/springblade/modules/FTP/MyAsyncService.java

@@ -87,6 +87,7 @@
            user.setId(user0.getId());
            //远程调用接口
            String body = InvestigateUtil.httpGetOne(user0.getCardid());
            System.out.println("user0 = " + user0.getCardid());
            JSONObject jsonObject = new JSONObject(body);
            Object data = jsonObject.get("data");
            JSONObject jsonData = new JSONObject(data.toString());