记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 9d7db6d2 authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

banner 上传换成 platform的

parent db1716d7
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 90 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/ZhengzaiAppVersionsParam.java
View file @ 9d7db6d2
......@@ -15,7 +15,7 @@ import java.util.List;
@Data
public class ZhengzaiAppVersionsParam implements Serializable {
// @ApiModelProperty(value = "Banner主键ID", example = "9822346783245")
// @ApiModelProperty(value = "zhengzaiAppVersionsId", example = "9822346783245")
private String zhengzaiAppVersionsId;
private String name;
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinBannersAdminController.java
View file @ 9d7db6d2
package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
import com.aliyun.oss.OSS;
import com.aliyun.oss.OSSClientBuilder;
import com.aliyun.oss.model.PutObjectRequest;
import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.common.config.RuoYiConfig;
import com.liquidnet.client.admin.common.core.controller.BaseController;
import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.client.admin.common.enums.BannersDisplayLocation;
import com.liquidnet.client.admin.common.enums.BannersTargetType;
import com.liquidnet.client.admin.common.utils.file.FileUploadUtils;
import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinBannersServiceImpl;
import com.liquidnet.commons.lang.util.FilesUtils;
import com.liquidnet.service.kylin.dao.BannerDetailsListDao;
import com.liquidnet.service.kylin.dto.param.BannersParam;
import com.liquidnet.service.kylin.dto.param.BannersSearchParam;
......@@ -23,13 +17,8 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.UUID;
/**
* <p>
......@@ -77,12 +66,8 @@ public class KylinBannersAdminController extends BaseController {
@Value("${liquidnet.url-banner.url26}")
private String url26;
@Value("${liquidnet.al-oss.endpoint}")
private String endpoint;
@Value("${liquidnet.al-oss.accessKeyId}")
private String accessKeyId;
@Value("${liquidnet.al-oss.accessKeySecret}")
private String accessKeySecret;
@Value("${liquidnet.client.admin.platformUrl}")
private String platformUrl;
@Autowired
private KylinBannersServiceImpl kylinBannersServiceImpl;
......@@ -94,6 +79,8 @@ public class KylinBannersAdminController extends BaseController {
mmap.put("BannersTargetType", bannersTargetType);
mmap.put("BannersDisplayLocation", bannersDisplayLocation);
mmap.put("platformUrl", platformUrl);
mmap.put("provinces", provinces);
mmap.put("url1", url1);
mmap.put("url2", url2);
......@@ -138,6 +125,8 @@ public class KylinBannersAdminController extends BaseController {
mmap.put("BannersTargetType", bannersTargetType);
mmap.put("BannersDisplayLocation", bannersDisplayLocation);
mmap.put("platformUrl", platformUrl);
mmap.put("provinces", provinces);
mmap.put("url1", url1);
mmap.put("url2", url2);
......@@ -205,67 +194,4 @@ public class KylinBannersAdminController extends BaseController {
}
}
/**
* 文件上传
*/
@PostMapping("/upload1")
@ResponseBody
public String upload1(@RequestParam MultipartFile coverImg) {
try {
if (!coverImg.isEmpty()) {
String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), coverImg);
return avatar;
}
return "error";
} catch (Exception e) {
return "success";
}
}
@PostMapping("/upload2")
@ResponseBody
public String upload2(@RequestParam MultipartFile coverImg) {
if (coverImg.isEmpty()) {
return "上传失败，请选择文件";
}
String fileName = coverImg.getOriginalFilename();
String filePath = RuoYiConfig.getAvatarPath();
File dest = new File(filePath + fileName);
try {
coverImg.transferTo(dest);
return dest.getName();
} catch (IOException e) {
return "上传失败！";
}
}
@PostMapping("/upload3")
@ResponseBody
public HashMap upload3(@RequestParam MultipartFile coverImgFile) {
OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
File file = null;
try {
file = FilesUtils.multipartFileToFile(coverImgFile);
} catch (Exception e) {
return new HashMap<>();
}
String filename = coverImgFile.getResource().getFilename();// time.jpeg
//这里文件名用了uuid 防止重复，可以根据自己的需要来写
String uploadName = UUID.randomUUID() + filename.substring(filename.lastIndexOf("."));// 078a77e0-cf80-481b-824c-5935247cff15.jpeg
uploadName = uploadName.replace("-", "");// 078a77e0cf80481b824c5935247cff15.jpeg
String uploadpath = "banner/" + uploadName;
PutObjectRequest putObjectRequest = new PutObjectRequest("img-zhengzai-tv", uploadpath, file);
ossClient.putObject(putObjectRequest);
ossClient.shutdown();
file.delete();
HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
objectObjectHashMap.put("uploadpath", uploadpath);
return objectObjectHashMap;
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/create.html
View file @ 9d7db6d2
......@@ -118,7 +118,7 @@
<div class="form-group">
<label class="font-noraml">请上传封面图</label>
<div class="file-loading">
<input id="fileinput-demo-1" type="file" name="coverImgFile" data-browse-on-zone-click="true"
<input id="fileinput-demo-1" type="file" name="files" data-browse-on-zone-click="true"
data-msg-placeholder="Select {files} for upload...">
</div>
</div>
......@@ -132,6 +132,7 @@
<th:block th:include="include :: bootstrap-suggest-js"/>
<script type="text/javascript">
var prefix = ctx + "kylin/banners";
var platformUrl = "[[${platformUrl}]]";
var provinces = "[[${provinces}]]";
var url1 = "[[${url1}]]";
var url2 = "[[${url2}]]";
......@@ -469,7 +470,13 @@
});
$("#fileinput-demo-1").fileinput({
'theme': 'explorer-fas',
'uploadUrl': "/kylin/banners/upload3",
// 'uploadUrl': "/kylin/banners/upload3",
// 'uploadUrl': "http://127.0.0.1:9003" + "/platform/basicServices/alOss/upload",
'uploadUrl': platformUrl + "/platform/basicServices/alOss/upload",
"uploadExtraData": {
"pathName" : "banner",
"buckType" : 1
},
// overwriteInitial: false,
// initialPreviewAsData: true,
autoReplace: true,
......@@ -477,7 +484,7 @@
maxFileCount: 1
});
$("#fileinput-demo-1").on("fileuploaded", function (event, data, previewId, index) {
$("#coverImg").val(data.response.uploadpath)
$("#coverImg").val(data.response.ossPath)
});
})
</script>
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/update.html
View file @ 9d7db6d2
......@@ -142,7 +142,7 @@
<div class="form-group">
<label class="font-noraml">请上传封面图</label>
<div class="file-loading">
<input id="fileinput-demo-1" type="file" name="coverImgFile" th:value="${KylinBannersVo.coverImg}" data-browse-on-zone-click="true"
<input id="fileinput-demo-1" type="file" name="files" th:value="${KylinBannersVo.coverImg}" data-browse-on-zone-click="true"
data-msg-placeholder="Select {files} for upload...">
</div>
</div>
......@@ -156,6 +156,7 @@
<th:block th:include="include :: bootstrap-suggest-js"/>
<script type="text/javascript">
var prefix = ctx + "kylin/banners";
var platformUrl = "[[${platformUrl}]]";
var provinces = "[[${provinces}]]";
var url1 = "[[${url1}]]";
var url2 = "[[${url2}]]";
......@@ -519,8 +520,14 @@
$("#fileinput-demo-1").fileinput({
'theme': 'explorer-fas',
'uploadUrl': "/kylin/banners/upload3",
// 'uploadUrl': "/kylin/banners/upload3",
// 'uploadUrl': ctx + "system/user/profile/updateAvatar",
// 'uploadUrl': "http://127.0.0.1:9003" + "/platform/basicServices/alOss/upload",
'uploadUrl': platformUrl + "/platform/basicServices/alOss/upload",
"uploadExtraData": {
"pathName" : "banner",
"buckType" : 1
},
overwriteInitial: false,
initialPreviewAsData: true,
dropZoneTitle: "请上传文件",
......@@ -532,7 +539,7 @@
});
$("#fileinput-demo-1").on("fileuploaded", function (event, data, previewId, index) {
$("#coverImg").val(data.response.uploadpath)
$("#coverImg").val(data.response.ossPath)
});
})
</script>
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/zhengzaiAppVersion/update.html
View file @ 9d7db6d2
......@@ -132,7 +132,6 @@
initialPreviewConfig:[{"caption":filePath,"downloadUrl":"https://app.zhengzai.tv/" + filePath,"size":"","key":0}]
});
$("#fileinput-demo-1").on("fileuploaded", function (event, data, previewId, index) {
console.log(data)
$("#filePath").val(data.response.ossPath)
});
})
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/basicServices/AlOssController.java
View file @ 9d7db6d2
......@@ -16,12 +16,10 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.Resource;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.sql.Wrapper;
import java.time.LocalDateTime;
import java.util.UUID;
......@@ -111,4 +109,5 @@ public class AlOssController {
uploadVo.setContentType(platformOssFilesDate.getContentType());
return uploadVo;
}
}
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