Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai int...

puzhibing

2024-03-08 1d3134d07c0351bdcc35e58a585c6d6e78571a94

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UediterController.java

@@ -105,8 +105,7 @@
            try {
               //文件上传，具体根据实际替换
                //File upload, replace according to actual situation
                pictureName = OBSUploadUtil.inputStreamUpload(picture);
 
                pictureName = OssUploadUtil.ossUpload("img/", picture);
                String result = "{'original': '" + picture.getOriginalFilename() + "', 'state': 'SUCCESS', 'url': '" + pictureName + "'}";
                if (callback == null) {
                    return JSON.parseObject(result);