|
@@ -48,9 +48,6 @@ public class AuthProductServiceImpl implements AuthProductService {
|
|
@Resource
|
|
@Resource
|
|
private AuthProductMapper authProductMapper;
|
|
private AuthProductMapper authProductMapper;
|
|
|
|
|
|
- @Autowired
|
|
|
|
- private FastDfsClient client;
|
|
|
|
-
|
|
|
|
@Value("${caimei.imageDomain}")
|
|
@Value("${caimei.imageDomain}")
|
|
private String imageDomain;
|
|
private String imageDomain;
|
|
|
|
|
|
@@ -305,10 +302,10 @@ public class AuthProductServiceImpl implements AuthProductService {
|
|
|
|
|
|
private String addWaterMark(String image,Integer type) throws IOException {
|
|
private String addWaterMark(String image,Integer type) throws IOException {
|
|
//type:1pc,2applets
|
|
//type:1pc,2applets
|
|
- ClassPathResource classPathResource = new ClassPathResource("/images/pcWaterMark.png");
|
|
|
|
|
|
+ ClassPathResource classPathResource = new ClassPathResource("/images/newPcWaterMark.png");
|
|
InputStream inputStreamImg = classPathResource.getInputStream();
|
|
InputStream inputStreamImg = classPathResource.getInputStream();
|
|
Image pcWaterMarkImg = ImageIO.read(inputStreamImg);
|
|
Image pcWaterMarkImg = ImageIO.read(inputStreamImg);
|
|
- classPathResource = new ClassPathResource("/images/appletsWaterMark.png");
|
|
|
|
|
|
+ classPathResource = new ClassPathResource("/images/newAppletsWaterMark.png");
|
|
inputStreamImg = classPathResource.getInputStream();
|
|
inputStreamImg = classPathResource.getInputStream();
|
|
Image appletsWaterMarkImg = ImageIO.read(inputStreamImg);
|
|
Image appletsWaterMarkImg = ImageIO.read(inputStreamImg);
|
|
String img = ImageUtils.markImageByIcon(type == 1 ? pcWaterMarkImg : appletsWaterMarkImg, image, null);
|
|
String img = ImageUtils.markImageByIcon(type == 1 ? pcWaterMarkImg : appletsWaterMarkImg, image, null);
|