Skip to content

legobackend / lego-manage

Go to a project
Toggle navigation
Toggle navigation pinning
64833a39 by chentao
Options

no message

1 parent 8f4ba851
Inline Side-by-side
Showing 4 changed files with 21 additions and 27 deletions
lego-admin/src/main/java/com/lego/web/controller/core/CourseController.java
......@@ -151,7 +151,7 @@ public class CourseController extends BaseController {
fileBytes = byteArrayOutputStream.toByteArray();
log.info("======fileBytes.length===="+fileBytes.length);
byte[] encryptBytes = EncryptUtils.encryptByAes(fileBytes);
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "text/plain");
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "application/json");
} catch (Exception e) {
log.info(e.getMessage());
}
......@@ -168,7 +168,7 @@ public class CourseController extends BaseController {
byteArrayOutputStream.flush();
fileBytes = byteArrayOutputStream.toByteArray();
byte[] encryptBytes = EncryptUtils.encryptByAes(fileBytes);
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "text/plain");
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "application/octet-stream");
} catch (Exception e) {
log.info(e.getMessage());
}
......@@ -253,7 +253,7 @@ public class CourseController extends BaseController {
byteArrayOutputStream.flush();
fileBytes = byteArrayOutputStream.toByteArray();
byte[] encryptBytes = EncryptUtils.encryptByAes(fileBytes);
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "text/plain");
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "application/json");
} catch (Exception e) {
log.info(e.getMessage());
}
......@@ -270,7 +270,7 @@ public class CourseController extends BaseController {
byteArrayOutputStream.flush();
fileBytes = byteArrayOutputStream.toByteArray();
byte[] encryptBytes = EncryptUtils.encryptByAes(fileBytes);
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "text/plain");
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "application/octet-stream");
} catch (Exception e) {
log.info(e.getMessage());
}
......@@ -359,7 +359,7 @@ public class CourseController extends BaseController {
fileBytes = byteArrayOutputStream.toByteArray();
byte[] encryptBytes = EncryptUtils.encryptByAes(fileBytes);
log.info("======fileBytes.length===="+fileBytes.length);
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "text/plain");
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "application/json");
log.info("json==============="+uploadResult.getUrl());
} catch (Exception e) {
log.error(e.getMessage());
......@@ -377,7 +377,7 @@ public class CourseController extends BaseController {
byteArrayOutputStream.flush();
fileBytes = byteArrayOutputStream.toByteArray();
byte[] encryptBytes = EncryptUtils.encryptByAes(fileBytes);
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "text/plain");
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "application/octet-stream");
} catch (Exception e) {
log.info(e.getMessage());
}
......@@ -462,7 +462,7 @@ public class CourseController extends BaseController {
byteArrayOutputStream.flush();
fileBytes = byteArrayOutputStream.toByteArray();
byte[] encryptBytes = EncryptUtils.encryptByAes(fileBytes);
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "text/plain");
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "application/json");
} catch (Exception e) {
log.info(e.getMessage());
}
......@@ -479,7 +479,7 @@ public class CourseController extends BaseController {
byteArrayOutputStream.flush();
fileBytes = byteArrayOutputStream.toByteArray();
byte[] encryptBytes = EncryptUtils.encryptByAes(fileBytes);
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "text/plain");
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "application/octet-stream");
} catch (Exception e) {
log.info(e.getMessage());
}
......@@ -564,7 +564,7 @@ public class CourseController extends BaseController {
byteArrayOutputStream.flush();
fileBytes = byteArrayOutputStream.toByteArray();
byte[] encryptBytes = EncryptUtils.encryptByAes(fileBytes);
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "text/plain");
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "application/json");
} catch (Exception e) {
log.info(e.getMessage());
}
......@@ -581,7 +581,7 @@ public class CourseController extends BaseController {
byteArrayOutputStream.flush();
fileBytes = byteArrayOutputStream.toByteArray();
byte[] encryptBytes = EncryptUtils.encryptByAes(fileBytes);
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "text/plain");
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "application/octet-stream");
} catch (Exception e) {
log.info(e.getMessage());
}
......@@ -666,7 +666,7 @@ public class CourseController extends BaseController {
byteArrayOutputStream.flush();
fileBytes = byteArrayOutputStream.toByteArray();
byte[] encryptBytes = EncryptUtils.encryptByAes(fileBytes);
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "text/plain");
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "application/json");
} catch (Exception e) {
log.info(e.getMessage());
}
......@@ -683,7 +683,7 @@ public class CourseController extends BaseController {
byteArrayOutputStream.flush();
fileBytes = byteArrayOutputStream.toByteArray();
byte[] encryptBytes = EncryptUtils.encryptByAes(fileBytes);
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "text/plain");
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "application/octet-stream");
} catch (Exception e) {
log.info(e.getMessage());
}
......@@ -770,7 +770,7 @@ public class CourseController extends BaseController {
byteArrayOutputStream.flush();
fileBytes = byteArrayOutputStream.toByteArray();
byte[] encryptBytes = EncryptUtils.encryptByAes(fileBytes);
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "text/plain");
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "application/json");
} catch (Exception e) {
log.info(e.getMessage());
}
......@@ -788,7 +788,7 @@ public class CourseController extends BaseController {
byteArrayOutputStream.flush();
fileBytes = byteArrayOutputStream.toByteArray();
byte[] encryptBytes = EncryptUtils.encryptByAes(fileBytes);
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "text/plain");
uploadResult = storage.uploadSuffix(encryptBytes, suffix, "application/octet-stream");
} catch (Exception e) {
log.info(e.getMessage());
}
......
lego-admin/src/main/resources/application.yml
......@@ -136,7 +136,6 @@ security:
# actuator 监控配置
- /actuator
- /actuator/**
- /core/course/encrypt
# MyBatisPlus配置
# https://baomidou.com/config/
......
lego-oss/src/main/java/com/lego/oss/core/OssClient.java
......@@ -163,9 +163,7 @@ public class OssClient {
}
public InputStream getObjectContent(String path) {
path = path.replace("http://bp.douyaedu.com/legao/", "");
log.info("============path==========="+path);
log.info("============properties.getBucketName()==========="+properties.getBucketName());
path = path.replace(getUrl() + "/", "");
S3Object object = client.getObject(properties.getBucketName(), path);
return object.getObjectContent();
}
......
lego-system/src/main/java/com/lego/system/service/impl/SysOssServiceImpl.java
......@@ -210,16 +210,13 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
OssClient storage = OssFactory.instance();
UploadResult uploadResult;
try {
// if(".pdf".equals(suffix) || ".mp4".equals(suffix) || ".json".equals(suffix) || ".ldr".equals(suffix)) {
// byte[] encryptBytes = EncryptUtils.encryptByAes(file.getBytes());
// uploadResult = storage.uploadSuffix(encryptBytes, suffix, file.getContentType());
// }
// else{
// uploadResult = storage.upload(file.getBytes(), originalfileName, file.getContentType());
// }
log.info("==========originalfileName========="+originalfileName);
log.info("==========getContentType========="+file.getContentType());
if(".pdf".equals(suffix) || ".mp4".equals(suffix) || ".json".equals(suffix) || ".ldr".equals(suffix)) {
byte[] encryptBytes = EncryptUtils.encryptByAes(file.getBytes());
uploadResult = storage.uploadSuffix(encryptBytes, suffix, file.getContentType());
}
else{
uploadResult = storage.upload(file.getBytes(), originalfileName, file.getContentType());
}
} catch (IOException e) {
throw new ServiceException(e.getMessage());
}
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!