From cc683b79217853ea34b479661f927077d47f7766 Mon Sep 17 00:00:00 2001 From: hello-hao <923453645@qq.com> Date: Mon, 9 May 2022 16:46:40 +0800 Subject: [PATCH] =?UTF-8?q?:art:=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hellohao/controller/AdminController.java | 4 - .../controller/AdminRootController.java | 8 +- .../java/cn/hellohao/service/CodeService.java | 3 - .../cn/hellohao/service/ImgTempService.java | 2 + .../java/cn/hellohao/service/KeysService.java | 6 +- .../cn/hellohao/service/SysConfigService.java | 1 + .../hellohao/service/UploadConfigService.java | 2 + .../cn/hellohao/service/UserGroupService.java | 7 + .../java/cn/hellohao/service/UserService.java | 12 +- .../service/impl/AlbumServiceImpl.java | 1 - .../hellohao/service/impl/COSImageupload.java | 9 -- .../hellohao/service/impl/ClientService.java | 35 +---- .../service/impl/CodeServiceImpl.java | 1 - .../service/impl/ConfigServiceImpl.java | 1 + .../service/impl/EmailServiceImpl.java | 1 + .../hellohao/service/impl/FTPImageupload.java | 26 ++-- .../hellohao/service/impl/ImgServiceImpl.java | 145 +----------------- .../service/impl/KeysServiceImpl.java | 3 +- .../hellohao/service/impl/NOSImageupload.java | 28 +--- .../hellohao/service/impl/OSSImageupload.java | 9 +- .../service/impl/UFileImageupload.java | 16 +- .../hellohao/service/impl/USSImageupload.java | 17 +- .../hellohao/service/impl/UploadServicel.java | 33 +--- .../cn/hellohao/service/impl/deleImages.java | 1 - 24 files changed, 69 insertions(+), 302 deletions(-) diff --git a/src/main/java/cn/hellohao/controller/AdminController.java b/src/main/java/cn/hellohao/controller/AdminController.java index d5cc132..3e72095 100644 --- a/src/main/java/cn/hellohao/controller/AdminController.java +++ b/src/main/java/cn/hellohao/controller/AdminController.java @@ -40,14 +40,10 @@ public class AdminController { @Autowired private ImgreviewService imgreviewService; @Autowired - private ImgTempService imgTempService; - @Autowired private UploadConfigService uploadConfigService; @Autowired private CodeService codeService; @Autowired - private ImgAndAlbumService imgAndAlbumService; - @Autowired private AlbumService albumService; @Autowired AlbumServiceImpl albumServiceI; diff --git a/src/main/java/cn/hellohao/controller/AdminRootController.java b/src/main/java/cn/hellohao/controller/AdminRootController.java index 3ed9b72..db440cd 100644 --- a/src/main/java/cn/hellohao/controller/AdminRootController.java +++ b/src/main/java/cn/hellohao/controller/AdminRootController.java @@ -3,8 +3,8 @@ package cn.hellohao.controller; import cn.hellohao.pojo.*; import cn.hellohao.service.*; import cn.hellohao.service.impl.*; -import cn.hellohao.utils.*; -import cn.hutool.http.HttpUtil; +import cn.hellohao.utils.NewSendEmail; +import cn.hellohao.utils.SetFiles; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -13,16 +13,12 @@ import com.github.pagehelper.PageInfo; import org.apache.shiro.SecurityUtils; import org.apache.shiro.subject.Subject; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/cn/hellohao/service/CodeService.java b/src/main/java/cn/hellohao/service/CodeService.java index 8bdb83a..03fd063 100644 --- a/src/main/java/cn/hellohao/service/CodeService.java +++ b/src/main/java/cn/hellohao/service/CodeService.java @@ -13,12 +13,9 @@ import java.util.List; */ @Service public interface CodeService { - //查询扩容码 List selectCode(String value); Code selectCodekey(String code); - //添加 Integer addCode(Code code); - //删除扩容码 Integer deleteCode(String code); } diff --git a/src/main/java/cn/hellohao/service/ImgTempService.java b/src/main/java/cn/hellohao/service/ImgTempService.java index 71ea7d1..5f2f925 100644 --- a/src/main/java/cn/hellohao/service/ImgTempService.java +++ b/src/main/java/cn/hellohao/service/ImgTempService.java @@ -12,6 +12,8 @@ import java.util.List; @Service public interface ImgTempService { List selectDelImgUidList(String datatime); + Integer delImgAndExp(String imguid); + Integer insertImgExp(ImgTemp imgDataExp); } diff --git a/src/main/java/cn/hellohao/service/KeysService.java b/src/main/java/cn/hellohao/service/KeysService.java index 1896d4e..b2e877f 100644 --- a/src/main/java/cn/hellohao/service/KeysService.java +++ b/src/main/java/cn/hellohao/service/KeysService.java @@ -9,11 +9,13 @@ import java.util.List; @Service public interface KeysService { - //查询密钥 Keys selectKeys(Integer id); + List getStorageName(); + List getStorage(); - //修改key + Msg updateKey(Keys key); + List getKeys(); } diff --git a/src/main/java/cn/hellohao/service/SysConfigService.java b/src/main/java/cn/hellohao/service/SysConfigService.java index 6966b0e..9aa9ba3 100644 --- a/src/main/java/cn/hellohao/service/SysConfigService.java +++ b/src/main/java/cn/hellohao/service/SysConfigService.java @@ -11,5 +11,6 @@ import org.springframework.stereotype.Service; @Service public interface SysConfigService { SysConfig getstate(); + Integer setstate(SysConfig sysConfig); } diff --git a/src/main/java/cn/hellohao/service/UploadConfigService.java b/src/main/java/cn/hellohao/service/UploadConfigService.java index c727e26..395972c 100644 --- a/src/main/java/cn/hellohao/service/UploadConfigService.java +++ b/src/main/java/cn/hellohao/service/UploadConfigService.java @@ -5,6 +5,8 @@ import org.springframework.stereotype.Service; @Service public interface UploadConfigService { + UploadConfig getUpdateConfig(); + Integer setUpdateConfig(UploadConfig updateConfig); } diff --git a/src/main/java/cn/hellohao/service/UserGroupService.java b/src/main/java/cn/hellohao/service/UserGroupService.java index 7b47962..3560ad5 100644 --- a/src/main/java/cn/hellohao/service/UserGroupService.java +++ b/src/main/java/cn/hellohao/service/UserGroupService.java @@ -10,10 +10,17 @@ import org.springframework.stereotype.Service; */ @Service public interface UserGroupService { + UserGroup useridgetusergroup(Integer userid); + UserGroup idgetusergroup(Integer id); + Integer addusergroup(UserGroup userGroup); + Integer updateusergroup(UserGroup userGroup); + Integer updateusergroupdefault(Integer groupid); + Integer deleusergroup(Integer userid); + } diff --git a/src/main/java/cn/hellohao/service/UserService.java b/src/main/java/cn/hellohao/service/UserService.java index 91989e9..8ba9308 100644 --- a/src/main/java/cn/hellohao/service/UserService.java +++ b/src/main/java/cn/hellohao/service/UserService.java @@ -2,31 +2,24 @@ package cn.hellohao.service; import cn.hellohao.pojo.Images; import cn.hellohao.pojo.User; -import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; import java.util.List; @Service public interface UserService { - //注册 Integer register(User user); - //登录 Integer login(String email, String password,String uid); - //获取用户信息 User getUsers(User user); - //插入图片 Integer insertimg(Images img); - //修改资料 Integer change(User user); Integer changeUser(User user); - //检查用户名是否重复 Integer checkUsername(String username); Integer getUserTotal(); @@ -35,7 +28,6 @@ public interface UserService { Integer deleuser(Integer id); - //查询用户名或者邮箱是否存在 Integer countusername(String username); Integer countmail(String email); @@ -43,8 +35,12 @@ public interface UserService { Integer uiduser(String uid); User getUsersMail(String uid); + Integer setisok (User user); + Integer setmemory(User user); + User getUsersid(Integer id); + List getuserlistforgroupid(Integer groupid); } diff --git a/src/main/java/cn/hellohao/service/impl/AlbumServiceImpl.java b/src/main/java/cn/hellohao/service/impl/AlbumServiceImpl.java index aa68de6..8b09e16 100644 --- a/src/main/java/cn/hellohao/service/impl/AlbumServiceImpl.java +++ b/src/main/java/cn/hellohao/service/impl/AlbumServiceImpl.java @@ -35,7 +35,6 @@ public class AlbumServiceImpl implements AlbumService { @Autowired ImgMapper imgMapper; - @Override public JSONArray getAlbumList(JSONArray array) { JSONArray jsonArray = new JSONArray(); diff --git a/src/main/java/cn/hellohao/service/impl/COSImageupload.java b/src/main/java/cn/hellohao/service/impl/COSImageupload.java index 7b59ee6..38bd37c 100644 --- a/src/main/java/cn/hellohao/service/impl/COSImageupload.java +++ b/src/main/java/cn/hellohao/service/impl/COSImageupload.java @@ -1,16 +1,9 @@ package cn.hellohao.service.impl; -import cn.hellohao.config.GlobalConstant; import cn.hellohao.pojo.Images; import cn.hellohao.pojo.Keys; import cn.hellohao.pojo.ReturnImage; -import cn.hellohao.pojo.UploadConfig; import cn.hellohao.utils.*; -import com.netease.cloud.auth.BasicCredentials; -import com.netease.cloud.auth.Credentials; -import com.netease.cloud.services.nos.NosClient; -import com.netease.cloud.services.nos.model.ObjectMetadata; -import com.netease.cloud.services.nos.transfer.TransferManager; import com.qcloud.cos.COSClient; import com.qcloud.cos.ClientConfig; import com.qcloud.cos.auth.BasicCOSCredentials; @@ -20,10 +13,8 @@ import com.qcloud.cos.exception.CosServiceException; import com.qcloud.cos.model.*; import com.qcloud.cos.region.Region; import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; import java.io.File; -import java.io.FileInputStream; import java.util.*; @Service diff --git a/src/main/java/cn/hellohao/service/impl/ClientService.java b/src/main/java/cn/hellohao/service/impl/ClientService.java index 0932aca..ac75b31 100644 --- a/src/main/java/cn/hellohao/service/impl/ClientService.java +++ b/src/main/java/cn/hellohao/service/impl/ClientService.java @@ -2,24 +2,16 @@ package cn.hellohao.service.impl; import cn.hellohao.dao.*; import cn.hellohao.pojo.*; -import cn.hellohao.pojo.vo.PageResultBean; -import cn.hellohao.service.ImgAndAlbumService; import cn.hellohao.service.SysConfigService; import cn.hellohao.utils.*; -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baidu.aip.contentcensor.AipContentCensor; import com.baidu.aip.contentcensor.EImgType; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import net.coobird.thumbnailator.filters.Watermark; import org.apache.commons.codec.digest.DigestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; - import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.FileInputStream; @@ -34,25 +26,9 @@ import java.util.*; @Service public class ClientService { - @Autowired - private ImgAndAlbumService imgAndAlbumService; - @Autowired - private NOSImageupload nOSImageupload; - @Autowired - private OSSImageupload ossImageupload; - @Autowired - private USSImageupload ussImageupload; - @Autowired - private KODOImageupload kodoImageupload; - @Autowired - private COSImageupload cosImageupload; @Autowired private SysConfigService sysConfigService; @Autowired - private FTPImageupload ftpImageupload; - @Autowired - private UFileImageupload uFileImageupload; - @Autowired private UserMapper userMapper; @Autowired private KeysMapper keysMapper; @@ -74,7 +50,6 @@ public class ClientService { String md5key = null; Integer setday = 0; JSONObject jsonObject = new JSONObject(); - Config config = configMapper.getSourceype(); String userip = GetIPS.getIpAddr(request); UploadConfig uploadConfig = uploadConfigMapper.getUpdateConfig(); if (uploadConfig.getApi() != 1) { @@ -92,14 +67,12 @@ public class ClientService { u2.setEmail(email); u2.setPassword(Base64Encryption.encryptBASE64(pass.getBytes())); User u = userMapper.getUsers(u2); - //判断用户的账号密码是否存在（正确） if (null == u || u.getIsok() != 1) { msg.setCode("4006"); msg.setInfo("用户信息不正确,账号异常"); return msg; } String imguid = UUID.randomUUID().toString().replace("-", ""); - //判断上传前的一些用户限制信息 Msg msg1 = updateImgCheck(u, uploadConfig); if (!msg1.getCode().equals("300")) { return msg1; @@ -128,7 +101,6 @@ public class ClientService { } Msg fileMiME = TypeDict.FileMiME(file); if (!fileMiME.getCode().equals("200")) { - //非图像文本 msg.setCode("4009"); msg.setInfo(fileMiME.getInfo()); return msg; @@ -147,7 +119,6 @@ public class ClientService { } } } - //判断图片是否存在 if(Integer.valueOf(sysConfigService.getstate().getCheckduplicate())==1) { Images imaOBJ = new Images(); imaOBJ.setMd5key(md5key); @@ -162,7 +133,6 @@ public class ClientService { } } Map map = new HashMap<>(); - String fileName = file.getName(); if (file.exists()) { map.put(prefix, file); } @@ -196,7 +166,6 @@ public class ClientService { jsonObject.put("url", img.getImgurl()); jsonObject.put("name", imgname); jsonObject.put("size", img.getSizes()); - //启动鉴黄线程 new Thread(() -> { LegalImageCheck(img); }).start(); @@ -207,7 +176,6 @@ public class ClientService { } file.delete(); msg.setData(jsonObject); -// 新代码结束========= return msg; }catch (Exception e){ e.printStackTrace(); @@ -268,7 +236,6 @@ public class ClientService { } //图片鉴黄 - private synchronized void LegalImageCheck(Images images){ System.out.println("非法图像鉴别进程启动"); Imgreview imgreview = null; @@ -301,7 +268,7 @@ public class ClientService { if (imgdata.getInteger("type") == 1) { Images img = new Images(); img.setImgname(images.getImgname()); - img.setViolation("1[1]");//数字是鉴别平台的主键ID，括号是非法的类型，参考上面的注释 + img.setViolation("1[1]"); imgMapper.setImg(img); Imgreview imgv = new Imgreview(); imgv.setId(1); diff --git a/src/main/java/cn/hellohao/service/impl/CodeServiceImpl.java b/src/main/java/cn/hellohao/service/impl/CodeServiceImpl.java index 10c455e..d4767ae 100644 --- a/src/main/java/cn/hellohao/service/impl/CodeServiceImpl.java +++ b/src/main/java/cn/hellohao/service/impl/CodeServiceImpl.java @@ -19,7 +19,6 @@ public class CodeServiceImpl implements CodeService { @Autowired private CodeMapper codeMapper; - @Override public List selectCode(String value) { return codeMapper.selectCode(value); diff --git a/src/main/java/cn/hellohao/service/impl/ConfigServiceImpl.java b/src/main/java/cn/hellohao/service/impl/ConfigServiceImpl.java index 94d99f1..915b4b0 100644 --- a/src/main/java/cn/hellohao/service/impl/ConfigServiceImpl.java +++ b/src/main/java/cn/hellohao/service/impl/ConfigServiceImpl.java @@ -11,6 +11,7 @@ import org.springframework.stereotype.Service; public class ConfigServiceImpl implements ConfigService { @Autowired private ConfigMapper configMapper; + @Override public Config getSourceype() { return configMapper.getSourceype(); diff --git a/src/main/java/cn/hellohao/service/impl/EmailServiceImpl.java b/src/main/java/cn/hellohao/service/impl/EmailServiceImpl.java index d1c4d52..e82b19f 100644 --- a/src/main/java/cn/hellohao/service/impl/EmailServiceImpl.java +++ b/src/main/java/cn/hellohao/service/impl/EmailServiceImpl.java @@ -10,6 +10,7 @@ import org.springframework.stereotype.Service; public class EmailServiceImpl implements EmailConfigService { @Autowired EmailConfigMapper emailConfigMapper; + @Override public EmailConfig getemail() { return emailConfigMapper.getemail(); diff --git a/src/main/java/cn/hellohao/service/impl/FTPImageupload.java b/src/main/java/cn/hellohao/service/impl/FTPImageupload.java index de9682e..c254781 100644 --- a/src/main/java/cn/hellohao/service/impl/FTPImageupload.java +++ b/src/main/java/cn/hellohao/service/impl/FTPImageupload.java @@ -1,25 +1,23 @@ package cn.hellohao.service.impl; -import cn.hellohao.config.GlobalConstant; import cn.hellohao.pojo.Images; import cn.hellohao.pojo.Keys; import cn.hellohao.pojo.ReturnImage; -import cn.hellohao.pojo.UploadConfig; -import cn.hellohao.utils.*; +import cn.hellohao.utils.FTPUtils; +import cn.hellohao.utils.Print; +import cn.hellohao.utils.SetText; import org.apache.commons.net.ftp.FTPClient; import org.apache.commons.net.ftp.FTPReply; import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import java.util.*; +import java.util.HashMap; +import java.util.Map; @Service public class FTPImageupload { - static FTPClient ftpClient1 ; static Keys key; public ReturnImage ImageuploadFTP(Map fileMap, String username,Integer keyID) { @@ -53,13 +51,10 @@ public class FTPImageupload { }catch (Exception e){ e.printStackTrace(); returnImage.setCode("500"); -// ImgUrl.put(null, 500); } return returnImage; - } - //初始化FTP对象存储 public static Integer Initialize(Keys k) { int ret = -1; if(k.getEndpoint()!=null && k.getAccessSecret()!=null && k.getEndpoint()!=null && k.getRequestAddress()!=null ) { @@ -84,7 +79,6 @@ public class FTPImageupload { } ret = 1; key = k; -// KeyObjectMap objectMap = new KeyObjectMap(ftp,k); } catch (IOException e) { System.out.println("FTP Object Is null"); return -1; @@ -100,12 +94,12 @@ public class FTPImageupload { try{ File afile=new File(a); File bfile=new File(p2);//定义一个复制后的文件路径 - bfile.createNewFile();//新建文件 - FileInputStream c=new FileInputStream(afile);//定义FileInputStream对象 - FileOutputStream d=new FileOutputStream(bfile);//定义FileOutputStream对象 - byte[] date=new byte[512];//定义一个byte数组 + bfile.createNewFile(); + FileInputStream c=new FileInputStream(afile); + FileOutputStream d=new FileOutputStream(bfile); + byte[] date=new byte[512]; int i=0; - while((i=c.read(date))>0){//判断有没有读取到文件末尾 + while((i=c.read(date))>0){ d.write(date); } c.close(); diff --git a/src/main/java/cn/hellohao/service/impl/ImgServiceImpl.java b/src/main/java/cn/hellohao/service/impl/ImgServiceImpl.java index f6a8374..5091239 100644 --- a/src/main/java/cn/hellohao/service/impl/ImgServiceImpl.java +++ b/src/main/java/cn/hellohao/service/impl/ImgServiceImpl.java @@ -1,48 +1,17 @@ package cn.hellohao.service.impl; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import cn.hellohao.pojo.User; -import cn.hellohao.utils.Print; -import com.UpYun; -import com.aliyun.oss.OSSClient; -import com.qcloud.cos.COSClient; -import com.qcloud.cos.ClientConfig; -import com.qcloud.cos.auth.BasicCOSCredentials; -import com.qcloud.cos.auth.COSCredentials; -import com.qcloud.cos.exception.CosClientException; -import com.qcloud.cos.exception.CosServiceException; -import com.qcloud.cos.region.Region; -import com.qiniu.common.QiniuException; -import com.qiniu.common.Zone; -import com.qiniu.storage.BucketManager; -import com.qiniu.storage.Configuration; -import com.qiniu.util.Auth; -import com.upyun.UpException; -import org.apache.commons.net.ftp.FTPClient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.netease.cloud.auth.BasicCredentials; -import com.netease.cloud.auth.Credentials; -import com.netease.cloud.services.nos.NosClient; -import com.netease.cloud.services.nos.model.Bucket; -import com.netease.cloud.services.nos.model.CannedAccessControlList; -import com.netease.cloud.services.nos.transfer.TransferManager; - import cn.hellohao.dao.ImgMapper; import cn.hellohao.pojo.Images; -import cn.hellohao.pojo.Keys; +import cn.hellohao.pojo.User; import cn.hellohao.service.ImgService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import java.util.List; @Service public class ImgServiceImpl implements ImgService { @Autowired - //@Resource private ImgMapper imgMapper; @Override @@ -65,113 +34,7 @@ public class ImgServiceImpl implements ImgService { public Images selectByPrimaryKey(Integer id) { return imgMapper.selectByPrimaryKey(id); } - //删除对象存储的图片文件 - public void delect(Keys key, String fileName) { - // 初始化 - Credentials credentials = new BasicCredentials(key.getAccessKey(), key.getAccessSecret()); - NosClient nosClient = new NosClient(credentials); - nosClient.setEndpoint(key.getEndpoint()); - // 初始化TransferManager - TransferManager transferManager = new TransferManager(nosClient); - //列举桶 - ArrayList bucketList = new ArrayList(); - String tname = ""; - for (Bucket bucket : nosClient.listBuckets()) { - bucketList.add(bucket.getName()); - } - for (Object object : bucketList) { - tname = object.toString(); - //查看桶的ACL - CannedAccessControlList acl = nosClient.getBucketAcl(object.toString()); - } - //这种方法不能删除指定文件夹下的文件 - boolean isExist = nosClient.doesObjectExist(tname, fileName, null); - System.out.println("文件是否存在：" + isExist); - if (isExist) { - nosClient.deleteObject(tname, fileName); - } - } - public void delectOSS(Keys key, String fileName) { - String endpoint = key.getEndpoint(); - String accessKeyId = key.getAccessKey(); - String accessKeySecret = key.getAccessSecret(); - String bucketName = key.getBucketname(); - String objectName = fileName; - OSSClient ossClient = new OSSClient(endpoint, accessKeyId, accessKeySecret); - ossClient.deleteObject(bucketName, objectName); - ossClient.shutdown(); - } - //删除USS对象存储的图片文件 - public void delectUSS(Keys key, String fileName) { - UpYun upyun = new UpYun(key.getBucketname(), key.getAccessKey(), key.getAccessSecret()); - try { - boolean result = upyun.deleteFile(fileName, null); - } catch (IOException e) { - e.printStackTrace(); - } catch (UpException e) { - e.printStackTrace(); - } - } - public void delectUFile(Keys key, String fileName) { - UpYun upyun = new UpYun(key.getBucketname(), key.getAccessKey(), key.getAccessSecret()); - try { - boolean result = upyun.deleteFile(fileName, null); - } catch (IOException e) { - e.printStackTrace(); - } catch (UpException e) { - e.printStackTrace(); - } - } - public void delectKODO(Keys key, String fileName) { - Configuration cfg; - if(key.getEndpoint().equals("1")){cfg = new Configuration(Zone.zone0());} - else if(key.getEndpoint().equals("2")){cfg = new Configuration(Zone.zone1());} - else if(key.getEndpoint().equals("3")){cfg = new Configuration(Zone.zone2());} - else if(key.getEndpoint().equals("4")){cfg = new Configuration(Zone.zoneNa0());} - else{cfg = new Configuration(Zone.zoneAs0());} - Auth auth = Auth.create(key.getAccessKey(), key.getAccessSecret()); - BucketManager bucketManager = new BucketManager(auth, cfg); - try { - bucketManager.delete(key.getBucketname(), fileName); - } catch (QiniuException ex) { - //如果遇到异常，说明删除失败 - System.err.println(ex.code()); - System.err.println(ex.response.toString()); - } - } - //删除COS对象存储的图片文件 - public void delectCOS(Keys key, String fileName) { - COSCredentials cred = new BasicCOSCredentials(key.getAccessKey(), key.getAccessSecret()); - Region region = new Region(key.getEndpoint()); - ClientConfig clientConfig = new ClientConfig(region); - COSClient cosClient= new COSClient(cred, clientConfig); - try { - String bucketName = key.getBucketname(); - String userkey = fileName; - cosClient.deleteObject(key.getBucketname(), userkey); - } catch (CosServiceException serverException) { - serverException.printStackTrace(); - } catch (CosClientException clientException) { - clientException.printStackTrace(); - } - } - public void delectFTP(Keys key, String fileName) { - FTPClient ftp = new FTPClient(); - String[] host = key.getEndpoint().split("\\:"); - String h = host[0]; - Integer p = Integer.parseInt(host[1]); - try { - if(!ftp.isConnected()){ - ftp.connect(h,p); - } - ftp.login(key.getAccessKey(), key.getAccessSecret()); - ftp.deleteFile(fileName); - } catch (IOException e) { - e.printStackTrace(); - Print.warning("删除FTP存储的图片失败"); - } - } @Override public Integer counts(Integer userid) { // TODO Auto-generated method stub diff --git a/src/main/java/cn/hellohao/service/impl/KeysServiceImpl.java b/src/main/java/cn/hellohao/service/impl/KeysServiceImpl.java index c5faac3..c01cd9b 100644 --- a/src/main/java/cn/hellohao/service/impl/KeysServiceImpl.java +++ b/src/main/java/cn/hellohao/service/impl/KeysServiceImpl.java @@ -52,9 +52,8 @@ public class KeysServiceImpl implements KeysService { public Msg updateKey(Keys key) { Msg msg = new Msg(); Integer ret = -2; - //修改完初始化 if(key.getStorageType()==1){ - ret =nOSImageupload.Initialize(key);//实例化网易 + ret =nOSImageupload.Initialize(key); }else if (key.getStorageType()==2){ ret = ossImageupload.Initialize(key); }else if(key.getStorageType()==3 ){ diff --git a/src/main/java/cn/hellohao/service/impl/NOSImageupload.java b/src/main/java/cn/hellohao/service/impl/NOSImageupload.java index 8651df2..e4ccb85 100644 --- a/src/main/java/cn/hellohao/service/impl/NOSImageupload.java +++ b/src/main/java/cn/hellohao/service/impl/NOSImageupload.java @@ -1,28 +1,17 @@ package cn.hellohao.service.impl; -import java.io.File; -import java.io.FileInputStream; -import java.util.*; - -import cn.hellohao.config.GlobalConstant; -import cn.hellohao.exception.StorageSourceInitException; import cn.hellohao.pojo.Images; +import cn.hellohao.pojo.Keys; import cn.hellohao.pojo.ReturnImage; -import cn.hellohao.pojo.UploadConfig; -import cn.hellohao.utils.*; -import com.netease.cloud.services.nos.model.NOSObjectSummary; -import com.netease.cloud.services.nos.model.ObjectListing; -import com.netease.cloud.services.nos.model.ObjectMetadata; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - +import cn.hellohao.utils.SetText; import com.netease.cloud.auth.BasicCredentials; import com.netease.cloud.auth.Credentials; import com.netease.cloud.services.nos.NosClient; -import com.netease.cloud.services.nos.model.Bucket; -import com.netease.cloud.services.nos.transfer.TransferManager; +import com.netease.cloud.services.nos.model.ObjectListing; +import org.springframework.stereotype.Service; -import cn.hellohao.pojo.Keys; +import java.io.File; +import java.util.Map; @Service public class NOSImageupload { @@ -51,7 +40,6 @@ public class NOSImageupload { } - //初始化网易NOS对象存储 public static Integer Initialize(Keys k) { int ret = -1; if(k.getEndpoint()!=null && k.getAccessSecret()!=null && k.getEndpoint()!=null @@ -74,16 +62,12 @@ public class NOSImageupload { } } } - //throw new StorageSourceInitException("当前数据源配置不完整，请管理员前往后台配置。"); return ret; } public Boolean delNOS(Integer keyID, Images images) { boolean b =true; try { - //这种方法不能删除指定文件夹下的文件 -// boolean isExist = nosClient.doesObjectExist(key.getBucketname(), fileName, null); -// if (isExist) { } nosClient.deleteObject(key.getBucketname(), images.getImgname()); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/cn/hellohao/service/impl/OSSImageupload.java b/src/main/java/cn/hellohao/service/impl/OSSImageupload.java index a4154eb..590e0d2 100644 --- a/src/main/java/cn/hellohao/service/impl/OSSImageupload.java +++ b/src/main/java/cn/hellohao/service/impl/OSSImageupload.java @@ -1,19 +1,19 @@ package cn.hellohao.service.impl; -import cn.hellohao.config.GlobalConstant; import cn.hellohao.pojo.Images; import cn.hellohao.pojo.Keys; import cn.hellohao.pojo.Msg; import cn.hellohao.pojo.ReturnImage; -import cn.hellohao.utils.*; +import cn.hellohao.utils.SetText; +import cn.hellohao.utils.TypeDict; import com.aliyun.oss.OSS; -import com.aliyun.oss.OSSClient; import com.aliyun.oss.OSSClientBuilder; import com.aliyun.oss.model.ObjectListing; import com.aliyun.oss.model.ObjectMetadata; import org.springframework.stereotype.Service; + import java.io.File; -import java.util.*; +import java.util.Map; @Service public class OSSImageupload { @@ -72,7 +72,6 @@ public class OSSImageupload { public boolean delOSS(Integer keyID, Images images){ boolean b =true; try { -// OSSClient ossClient = new OSSClient(key.getEndpoint(), key.getAccessKey(), key.getAccessSecret()); ossClient.deleteObject(key.getBucketname(), images.getImgname()); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/cn/hellohao/service/impl/UFileImageupload.java b/src/main/java/cn/hellohao/service/impl/UFileImageupload.java index a4be075..7934afa 100644 --- a/src/main/java/cn/hellohao/service/impl/UFileImageupload.java +++ b/src/main/java/cn/hellohao/service/impl/UFileImageupload.java @@ -1,15 +1,17 @@ package cn.hellohao.service.impl; -import cn.hellohao.config.GlobalConstant; -import cn.hellohao.pojo.*; -import cn.hellohao.utils.*; +import cn.hellohao.pojo.Images; +import cn.hellohao.pojo.Keys; +import cn.hellohao.pojo.Msg; +import cn.hellohao.pojo.ReturnImage; +import cn.hellohao.utils.SetText; +import cn.hellohao.utils.TypeDict; import com.UpYun; import com.aliyun.oss.model.ObjectMetadata; import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - import java.io.File; -import java.util.*; +import java.util.List; +import java.util.Map; @Service public class UFileImageupload { @@ -47,14 +49,12 @@ public class UFileImageupload { } - //ufile初始化 public static Integer Initialize(Keys k) { int ret = -1; if(k.getAccessSecret()!=null && k.getAccessKey()!=null && k.getBucketname()!=null && k.getRequestAddress()!=null ) { if(!k.getAccessSecret().equals("") && !k.getAccessKey().equals("") && !k.getBucketname().equals("") && !k.getRequestAddress().equals("") ) { - // 创建UpYun实例。 UpYun ufObj = new UpYun(k.getBucketname(), k.getAccessKey(), k.getAccessSecret()); List items = null; try { diff --git a/src/main/java/cn/hellohao/service/impl/USSImageupload.java b/src/main/java/cn/hellohao/service/impl/USSImageupload.java index b8ddebd..2536aaa 100644 --- a/src/main/java/cn/hellohao/service/impl/USSImageupload.java +++ b/src/main/java/cn/hellohao/service/impl/USSImageupload.java @@ -1,18 +1,17 @@ package cn.hellohao.service.impl; -import cn.hellohao.config.GlobalConstant; -import cn.hellohao.pojo.*; -import cn.hellohao.utils.*; +import cn.hellohao.pojo.Images; +import cn.hellohao.pojo.Keys; +import cn.hellohao.pojo.Msg; +import cn.hellohao.pojo.ReturnImage; +import cn.hellohao.utils.SetText; +import cn.hellohao.utils.TypeDict; import com.UpYun; -import com.aliyun.oss.OSSClient; import com.aliyun.oss.model.ObjectMetadata; -import com.upyun.UpException; import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - import java.io.File; -import java.io.IOException; -import java.util.*; +import java.util.List; +import java.util.Map; @Service public class USSImageupload { diff --git a/src/main/java/cn/hellohao/service/impl/UploadServicel.java b/src/main/java/cn/hellohao/service/impl/UploadServicel.java index c10fdbc..595944b 100644 --- a/src/main/java/cn/hellohao/service/impl/UploadServicel.java +++ b/src/main/java/cn/hellohao/service/impl/UploadServicel.java @@ -5,10 +5,7 @@ import cn.hellohao.pojo.*; import cn.hellohao.service.ImgTempService; import cn.hellohao.service.SysConfigService; import cn.hellohao.utils.*; -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baidu.aip.contentcensor.AipContentCensor; import com.baidu.aip.contentcensor.EImgType; @@ -20,7 +17,8 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; import java.text.SimpleDateFormat; import java.util.*; @@ -50,7 +48,6 @@ public class UploadServicel { ImgTempService imgTempService; - public Msg uploadForLoc(HttpServletRequest request, MultipartFile multipartFile, Integer setday, String imgUrl) { Msg msg = new Msg(); @@ -70,7 +67,6 @@ public class UploadServicel { if(imgUrl==null){ file = SetFiles.changeFile_new(multipartFile); }else{ - //说明是URL上传 Msg imgData = uploadForURL(request, imgUrl); if(imgData.getCode().equals("200")){ file = new File((String) imgData.getData()); @@ -79,13 +75,10 @@ public class UploadServicel { } } String imguid = UUID.randomUUID().toString().replace("-", ""); - //判断上传前的一些用户限制信息 Msg msg1 = updateImgCheck(u,uploadConfig); if(!msg1.getCode().equals("300")){ return msg1; } - - //判断可用容量 sourceKeyId = group.getKeyid(); Keys key = keysMapper.selectKeys(sourceKeyId); Long tmp = (memory == -1 ? -2 : UsedTotleMemory); @@ -94,8 +87,6 @@ public class UploadServicel { msg.setInfo(u==null?"游客空间已用尽":"您的可用空间不足"); return msg; } - - //判断图片有没有超出设定大小 if (file.length() > TotleMemory) { System.err.println("文件大小："+file.length()); System.err.println("最大限制："+TotleMemory); @@ -112,7 +103,6 @@ public class UploadServicel { } Msg fileMiME = TypeDict.FileMiME(file); if(!fileMiME.getCode().equals("200")) { - //非图像文本 msg.setCode("4000"); msg.setInfo(fileMiME.getInfo()); return msg; @@ -120,8 +110,6 @@ public class UploadServicel { if(md5key==null || md5key.equals("")){ md5key = UUID.randomUUID().toString().replace("-", ""); } - - //判断图片是否存在 if(Integer.valueOf(sysConfigService.getstate().getCheckduplicate())==1){ Images imaOBJ = new Images(); imaOBJ.setMd5key(md5key); @@ -131,13 +119,10 @@ public class UploadServicel { jsonObject.put("url", images.get(0).getImgurl()); jsonObject.put("name",file.getName()); jsonObject.put("imguid",images.get(0).getImguid()); -// jsonObject.put("shortLink",images.getShortlink()); msg.setData(jsonObject); return msg; } } - - String prefix = file.getName().substring(file.getName().lastIndexOf(".")+1); //判断黑名单 if (uploadConfig.getBlacklist() != null) { @@ -151,7 +136,6 @@ public class UploadServicel { } } } - Map map = new HashMap<>(); if (file.exists()) { map.put(prefix, file);//prefix @@ -194,7 +178,6 @@ public class UploadServicel { jsonObject.put("url", img.getImgurl()); jsonObject.put("name", imgname); jsonObject.put("imguid",img.getImguid()); -// jsonObject.put("shortLink", img.getShortlink()); new Thread(()->{LegalImageCheck(img);}).start(); }else{ msg.setCode("5001"); @@ -213,25 +196,18 @@ public class UploadServicel { } - - //通过图片Url上传图片 public static Msg uploadForURL(HttpServletRequest request, String imgurl){ final Msg msg = new Msg(); - //先判断是不是有效链接 -// final boolean valid = ImgUrlUtil.isValid(imgurl); if(true){ Long imgsize = 0L; try { -// imgsize = ImgUrlUtil.getFileLength(imgurl); if(imgsize==0){ -// String uuid= UUID.randomUUID().toString().replace("-", ""); String ShortUID = SetText.getShortUuid(); String savePath = request.getSession().getServletContext().getRealPath("/")+File.separator+"hellohaotmp"+File.separator; Map bl =ImgUrlUtil.downLoadFromUrl (imgurl, ShortUID, savePath); if((Boolean) bl.get("res")==true){ -// File file = new File(); msg.setCode("200"); - msg.setData(bl.get("imgPath"));//savePath + File.separator + ShortUID + msg.setData(bl.get("imgPath")); return msg; }else{ if(bl.get("StatusCode").equals("110403")){ @@ -270,7 +246,6 @@ public class UploadServicel { try { dateFormat = new SimpleDateFormat("yyyy/MM/dd"); if (user == null) { - //用户没有登陆，值判断游客能不能上传即可 if(uploadConfig.getIsupdate()!=1){ msg.setCode("1000"); msg.setInfo("系统已禁用游客上传"); @@ -282,7 +257,6 @@ public class UploadServicel { TotleMemory = Long.valueOf(uploadConfig.getFilesizetourists());//单位 B 游客单文件大小 UsedTotleMemory = imgMapper.getusermemory(0)==null?0L : imgMapper.getusermemory(0);//单位 B } else { - //判断用户能不能上传 if(uploadConfig.getUserclose()!=1){ msg.setCode("1001"); msg.setInfo("系统已禁用上传功能"); @@ -366,7 +340,6 @@ public class UploadServicel { } } - //计算时间 public static String plusDay(int setday){ Date d = new Date(); diff --git a/src/main/java/cn/hellohao/service/impl/deleImages.java b/src/main/java/cn/hellohao/service/impl/deleImages.java index 9d923f1..c395c48 100644 --- a/src/main/java/cn/hellohao/service/impl/deleImages.java +++ b/src/main/java/cn/hellohao/service/impl/deleImages.java @@ -74,7 +74,6 @@ public class deleImages { } else { System.err.println("未获取到对象存储参数，删除失败。"); } -// Integer delret = imgMapper.deleimg(images.getId()); if(isDele){ try { imgAndAlbumService.deleteImgAndAlbum(image.getImgurl());