Merge remote-tracking branch 'origin/master'

k94314517

2024-07-11 a52f8c508d08014d1a153cfc02e12b5fc185a3a4

 server/admin/src/main/java/com/doumee/api/business/PushController.java

@@ -43,6 +43,7 @@
            success = Constants.ONE;
            r = ApiResponse.failed(StringUtils.defaultString(e.getMessage(),"操作失败"));
        }catch (Exception e){
            e.printStackTrace();
            success = Constants.ONE;
            r = ApiResponse.failed("操作失败");
        }finally {
@@ -67,6 +68,7 @@
            r = ApiResponse.failed(StringUtils.defaultString(e.getMessage(),"操作失败"));
        }catch (Exception e){
            success = Constants.ONE;
            e.getMessage();
            r = ApiResponse.failed("操作失败");
        }finally {
            zbomIAMService.saveInterfaceLog("/push/iam/updateUserInfo","IAM推送人员账号信息", token, uuid, timestamp, upateUserModel,success, JSONObject.toJSONString(r));