Skip to content

P
poc-api
Commit b207b047 authored by alex yao's avatar alex yao
Browse files
Options

优化镜像大小

parent 16f347f2
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 301 deletions
pom.xml
View file @ b207b047
...@@ -23,56 +23,44 @@ ...@@ -23,56 +23,44 @@
</dependencyManagement> </dependencyManagement>
<dependencies> <dependencies>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.9</version>
</dependency>
<dependency> <dependency>
<groupId>cn.com.yict.framemax</groupId> <groupId>cn.com.yict.framemax</groupId>
<artifactId>framemax-core</artifactId> <artifactId>framemax-core</artifactId>
<version>4.0.2</version> <version>4.0.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.com.yict.framemax</groupId> <groupId>cn.com.yict.framemax</groupId>
<artifactId>framemax-data-hibernate</artifactId> <artifactId>framemax-data-hibernate</artifactId>
<version>4.0.2</version> <version>4.0.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.com.yict.framemax</groupId> <groupId>cn.com.yict.framemax</groupId>
<artifactId>framemax-common</artifactId> <artifactId>framemax-common</artifactId>
<version>4.0.2</version> <version>4.0.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.com.yict.framemax</groupId> <groupId>cn.com.yict.framemax</groupId>
<artifactId>framemax-security</artifactId> <artifactId>framemax-security</artifactId>
<version>4.0.2</version> <version>4.0.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.com.yict.framemax</groupId> <groupId>cn.com.yict.framemax</groupId>
<artifactId>framemax-frame</artifactId> <artifactId>framemax-frame</artifactId>
<version>4.0.2</version> <version>4.0.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.com.yict.framemax</groupId> <groupId>cn.com.yict.framemax</groupId>
<artifactId>framemax-codetool</artifactId> <artifactId>framemax-codetool</artifactId>
<version>4.0.3</version> <version>4.0.3</version>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>cn.com.yict.framemax</groupId>-->
<!-- <artifactId>framemax-easyui</artifactId>-->
<!-- <version>4.0.2</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>cn.com.yict.framemax</groupId>-->
<!-- <artifactId>framemax-ldap</artifactId>-->
<!-- <version>4.0.1</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>cn.com.yict.framemax</groupId>-->
<!-- <artifactId>framemax-organization</artifactId>-->
<!-- <version>4.0.2</version>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>cn.com.yict.framemax</groupId> <groupId>cn.com.yict.framemax</groupId>
<artifactId>framemax-webservice</artifactId> <artifactId>framemax-webservice</artifactId>
...@@ -107,19 +95,6 @@ ...@@ -107,19 +95,6 @@
<version>8.0.28</version> <version>8.0.28</version>
</dependency> </dependency>
<!-- ES -->
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>transport</artifactId>
<version>6.7.2</version>
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId> <artifactId>httpmime</artifactId>
...@@ -183,24 +158,6 @@ ...@@ -183,24 +158,6 @@
<version>4.5</version> <version>4.5</version>
</dependency> </dependency>
<!--阿里云对象储存-->
<dependency>
<groupId>com.aliyun.oss</groupId>
<artifactId>aliyun-sdk-oss</artifactId>
<version>2.2.3</version>
</dependency>
<!--阿里云短信服务-->
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-core</artifactId>
<version>4.5.16</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>dysmsapi20170525</artifactId>
<version>2.0.23</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.json/json --> <!-- https://mvnrepository.com/artifact/org.json/json -->
<dependency> <dependency>
...@@ -285,13 +242,6 @@ ...@@ -285,13 +242,6 @@
<artifactId>log4j-api</artifactId> <artifactId>log4j-api</artifactId>
<version>2.17.0</version> <version>2.17.0</version>
</dependency> </dependency>
<!--极光推送-->
<dependency>
<groupId>cn.jpush.api</groupId>
<artifactId>jpush-client</artifactId>
<version>3.6.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/cn.hutool/hutool-http --> <!-- https://mvnrepository.com/artifact/cn.hutool/hutool-http -->
<dependency> <dependency>
...@@ -306,12 +256,6 @@ ...@@ -306,12 +256,6 @@
<version>5.7.3</version> <version>5.7.3</version>
</dependency> </dependency>
<dependency>
<groupId>com.github.wechatpay-apiv3</groupId>
<artifactId>wechatpay-apache-httpclient</artifactId>
<version>0.4.7</version>
</dependency>
<dependency> <dependency>
<groupId>com.thoughtworks.xstream</groupId> <groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId> <artifactId>xstream</artifactId>
...@@ -338,12 +282,6 @@ ...@@ -338,12 +282,6 @@
<version>1.9</version> <version>1.9</version>
</dependency> </dependency>
<!--xfyun-->
<dependency>
<groupId>cn.xfyun</groupId>
<artifactId>websdk-java-speech</artifactId>
<version>2.0.1</version>
</dependency>
<!--腾讯--> <!--腾讯-->
<dependency> <dependency>
......
src/main/docker/Dockerfile
View file @ b207b047
FROM tomcat:9-jdk8-openjdk FROM tomcat:9-jre8-openjdk-slim
RUN echo "Asia/Shanghai" > /etc/timezone RUN echo "Asia/Shanghai" > /etc/timezone
......
src/main/java/cn/com/poc/common/utils/OssUtils.java deleted 100644 → 0
View file @ 16f347f2
package cn.com.poc.common.utils;
import cn.com.poc.common.entity.oss.ImageUrl;
import cn.com.yict.framemax.core.config.Config;
import cn.com.yict.framemax.core.i18n.I18nMessageException;
import cn.com.yict.framemax.frame.service.FmxParamConfigService;
import com.aliyun.oss.ClientException;
import com.aliyun.oss.OSSClient;
import com.aliyun.oss.OSSException;
import com.aliyun.oss.model.PutObjectRequest;
import org.apache.http.client.utils.DateUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Optional;
/**
* oss工具类
*/
public class OssUtils {
Logger logger = LoggerFactory.getLogger(this.getClass());
final static String RCS_UPLOAD_PATH = Config.get("uploadPath");
@Autowired
private FmxParamConfigService paramConfigService;
/**
* 执行下载和上传得到目标系统的url
*
* @param downloadUrl
* @return
*/
private String executeDownloadAndUploadAliyun(String downloadUrl) throws IOException {
StringBuffer url = new StringBuffer();
String uploadFolder = "mini-program-url/";
byte[] content = getBytesFromUrl(downloadUrl);
ImageUrl imageUrl = null;
String fileType = "jpeg";
//将文件上传到OSS
//若catalog为其他则表示为普通图片上传
imageUrl = uploadFileToOss(content, uploadFolder, fileType);
if (imageUrl.getImageUrls().size() == 0) {
throw new I18nMessageException("exception/upload.exception.please.check.the.file.before.uploading.again");
}
Optional.ofNullable(imageUrl).map(ImageUrl::getImageUrls).ifPresent(urls -> {
url.append(urls.get(0));
logger.info("小程序图片地址{}", urls.get(0));
});
// if (MessageStatus.SUCCESS.equals(result.getStatus())) {
// ImageUrl imageUrl = JsonUtils.deSerialize(JsonUtils.serialize(result.getData()), ImageUrl.class);
//
//
// } else {
// throw new I18nMessageException("调用上传阿里云图片异常！");
// }
return url.toString();
}
/**
* @param decodedByte
* @param uploadFolder
* @return oss的url
* @throws IOException
*/
public ImageUrl uploadFileToOss(byte[] decodedByte, String uploadFolder, String fileType) throws IOException {
String appDir = "app/appId/";
String rootPath = RCS_UPLOAD_PATH + "blo" + appDir;
String endpoint = paramConfigService.getParam("oss.endPoint");
String accessKeyId = paramConfigService.getParam("oss.accessKeyId");
String accessKeySecret = paramConfigService.getParam("oss.accessKeySecret");
String sourceBucketName = paramConfigService.getParam("oss.sourceBucketName");
String isStoreInLocal = paramConfigService.getParam("oss.isStoreInLocal");
String date = DateUtils.formatDate(new Date(), "yyyyMMdd");
// 如果上传目录不以【/】结尾，加上
if (uploadFolder.endsWith("/")) {
uploadFolder = uploadFolder + date + "/";
} else {
uploadFolder = uploadFolder + "/" + date + "/";
}
String sourceKey = appDir + uploadFolder; //sourceKey=oss.sourceKey + currentDate
String filePath = rootPath + uploadFolder;
String fileName = createFileName(fileType);
ImageUrl imageUrl = null;
List<String> list = new ArrayList<String>();
// 处理数据
for (int i = 0; i < decodedByte.length; ++i) {
if (decodedByte[i] < 0) {
decodedByte[i] += 256;
}
}
try (InputStream inputStream = new ByteArrayInputStream(decodedByte, 0, decodedByte.length)) {
/*
* Constructs a client instance with your account for accessing OSS
*/
OSSClient client = new OSSClient(endpoint, accessKeyId, accessKeySecret);
/*
* Upload an object to your source bucket
* 将本地文件上传至oss
*/
client.putObject(new PutObjectRequest(sourceBucketName, sourceKey + fileName, inputStream));
} catch (OSSException oe) {
logger.info("Caught an OSSException, which means your request made it to OSS, "
+ "but was rejected with an error response for some reason.");
logger.info("Error Message: " + oe.getErrorCode());
logger.info("Error Code: " + oe.getErrorCode());
logger.info("Request ID: " + oe.getRequestId());
logger.info("Host ID: " + oe.getHostId());
} catch (ClientException ce) {
logger.info("Caught an ClientException, which means the client encountered "
+ "a serious internal problem while trying to communicate with OSS, "
+ "such as not being able to access the network.");
logger.info("Error Message: " + ce.getMessage());
}
// //若应用oss配置了在本地留存则保存
// if ("true".equals(isStoreInLocal)) {
// createPath(filePath);
//
// storeFileToLocal(decodedByte, filePath + fileName);//rootpath + catalog + fileName
//
// logger.info("文件保存到本地！");
// }
//返回文件的oss地址
StringBuilder osspath = new StringBuilder();
osspath.append("https://").
append(sourceBucketName).
append(".").
append(endpoint.replaceAll("http://", "")).
append("/").
append(sourceKey).append(fileName);
list.add(osspath.toString());
imageUrl = new ImageUrl();
imageUrl.setImageUrls(list);
return imageUrl;
}
//返回即将创建的文件名
private String createFileName(String fileType) {
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append(System.currentTimeMillis()).
append(".").
append(fileType);
return stringBuilder.toString();
}
//处理文件的byte数据
public byte[] getBytesFromUrl(String url1) {
logger.info("url is :" + url1);
byte[] content = null;
try {
URL url = new URL(url1);
logger.info("url protocal:" + url.getProtocol());
HttpURLConnection httpUrl = (HttpURLConnection) url.openConnection();
httpUrl.setRequestMethod("GET");
httpUrl.usingProxy();
httpUrl.connect();
try (BufferedInputStream inputStream = new BufferedInputStream(httpUrl.getInputStream())) {
byte[] bytes = new byte[1024];
int len = 0;
int index = 0;
byte[] ob = null;
byte[] nb = null;
while ((len = inputStream.read(bytes)) > 0) {
if (nb == null) {
nb = new byte[len];
for (int addition = 0; addition < len; addition++) {
nb[addition] = bytes[addition];
}
} else {
nb = new byte[ob.length + len];
for (index = 0; index < ob.length; index++) {
nb[index] = ob[index];
}
for (int addition = 0; addition < len; addition++) {
nb[addition + index] = bytes[addition];
}
}
logger.info("readed length :" + len);
logger.info("curTotal length :" + nb.length);
ob = nb;
}
content = nb;
} finally {
httpUrl.disconnect();
}
} catch (MalformedURLException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
if (content == null) {
throw new I18nMessageException("exception/cannot.read.data.from.this.url");
}
logger.info("size:" + content.length);
return content;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment