diff --git a/mallinkAdmin/src/main/java/com/iformall/config/Swagger2Config.java b/mallinkAdmin/src/main/java/com/iformall/config/Swagger2Config.java new file mode 100644 index 000000000..335b86b7b --- /dev/null +++ b/mallinkAdmin/src/main/java/com/iformall/config/Swagger2Config.java @@ -0,0 +1,61 @@ +package com.iformall.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.ParameterBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.schema.ModelRef; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.service.Parameter; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.paths.RelativePathProvider; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +import javax.servlet.ServletContext; +import java.util.ArrayList; +import java.util.List; + +//参考:http://blog.csdn.net/catoop/article/details/50668896 +@Configuration +@EnableSwagger2 +public class Swagger2Config { + + @Autowired + private ServletContext servletContext; + + @Bean + public Docket createRestApi() { + ParameterBuilder tokenPar = new ParameterBuilder(); + List pars = new ArrayList(); + //增加一个request的header参数 + tokenPar.name("token").description("令牌").modelRef(new ModelRef("string")).parameterType("header").required(false).build(); + pars.add(tokenPar.build()); + return new Docket(DocumentationType.SWAGGER_2) + .apiInfo(apiInfo()) + .select() + .apis(RequestHandlerSelectors.basePackage("com.iformall.controller")) + .paths(PathSelectors.any()) + .build() + .globalOperationParameters(pars) + .pathProvider(new RelativePathProvider(servletContext) { + @Override + public String getApplicationBasePath() { + return "/api"; + } + }); + } + + private ApiInfo apiInfo() { + return new ApiInfoBuilder() + .title("a端 api") + .description("a api") + .termsOfServiceUrl("http://localhost:7000") + .version("2.0") + .build(); + } + +} \ No newline at end of file diff --git a/mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java index 043f85175..d4e06206b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/WebConfig.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.iformall.file.aliyun.AliyunOSS; import com.iformall.interceptor.CurrentTenantInterceptor; import com.iformall.interceptor.HttpServletRequestWrapperFilter; import com.iformall.interceptor.RequestInterceptor; @@ -52,10 +53,13 @@ public class WebConfig implements WebMvcConfigurer { @Autowired private MallResourceService mallResourceService; + @Autowired + private AliyunOSS aliyunOSS; + @Bean @ConditionalOnMissingBean(ActionEnter.class) public ActionEnter actionEnter() { - ActionEnter actionEnter = new ActionEnter(ConfigManager.getInstance(uEditorConfig, awsProperty, mallResourceService)); + ActionEnter actionEnter = new ActionEnter(ConfigManager.getInstance(uEditorConfig, awsProperty, mallResourceService, aliyunOSS)); return actionEnter; } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java index 51d4ae920..4030ffe15 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java @@ -41,7 +41,7 @@ public class WxMallController extends BaseController { @SystemControllerLog(description = "商城-当前查询") public ResultData mallinfo() { logger.debug("[" + getIpAddr() + "] WxMallController::mallinfo"); - return new ResultData(wxMallService.getByTenantInfo(getTenantInfo())); + return new ResultData(wxMallService.getByTenantInfo(ifParentUpdateTenantInfo())); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java index d1b878324..786a9fabe 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java @@ -168,6 +168,7 @@ public class HomeController extends BaseController { // 集团用户获取子商场 List mallList = mallService.getSubByParentTenantId(info.getTenantId()); + map.put("mall", JSON.toJSONString(mall)); map.put("subMalls", JSON.toJSONString(mallList)); map.put("group", EnumGroupSupport.SUPPORT.getCode()); } diff --git a/mallinkAdmin/src/main/java/com/iformall/ueditor/ActionEnter.java b/mallinkAdmin/src/main/java/com/iformall/ueditor/ActionEnter.java index a8ece41d2..a8998d59e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/ueditor/ActionEnter.java +++ b/mallinkAdmin/src/main/java/com/iformall/ueditor/ActionEnter.java @@ -69,7 +69,7 @@ public class ActionEnter { case ActionMap.UPLOAD_VIDEO: case ActionMap.UPLOAD_FILE: conf = this.configManager.getConfig(actionCode); - state = new Uploader(request, conf, configManager.getMallResourceService()).doExec(); + state = new Uploader(request, conf, configManager.getMallResourceService(),configManager.getAliyunOSS()).doExec(); break; case ActionMap.CATCH_IMAGE: diff --git a/mallinkAdmin/src/main/java/com/iformall/ueditor/ConfigManager.java b/mallinkAdmin/src/main/java/com/iformall/ueditor/ConfigManager.java index 4b0246ea3..c71e46298 100644 --- a/mallinkAdmin/src/main/java/com/iformall/ueditor/ConfigManager.java +++ b/mallinkAdmin/src/main/java/com/iformall/ueditor/ConfigManager.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONException; import com.alibaba.fastjson.JSONObject; import com.iformall.config.AwsProperty; +import com.iformall.file.aliyun.AliyunOSS; import com.iformall.service.MallResourceService; import com.iformall.ueditor.define.ActionMap; @@ -30,14 +31,16 @@ public final class ConfigManager { private UEditorConfig uEditorConfig; private AwsProperty awsProperty; private MallResourceService mallResourceService; + private AliyunOSS aliyunOSS; /* * 通过一个给定的路径构建一个配置管理器, 该管理器要求地址路径所在目录下必须存在config.properties文件 */ - private ConfigManager(UEditorConfig uEditorConfig, AwsProperty awsProperty, MallResourceService mallResourceService) throws IOException { + private ConfigManager(UEditorConfig uEditorConfig, AwsProperty awsProperty, MallResourceService mallResourceService, AliyunOSS aliyunOSS) throws IOException { this.uEditorConfig = uEditorConfig; this.awsProperty = awsProperty; this.mallResourceService = mallResourceService; + this.aliyunOSS = aliyunOSS; String configPath = uEditorConfig.getConfig(); configPath = configPath == null || configPath.isEmpty() ? configFileName : configPath; this.initEnv(configPath); @@ -49,10 +52,10 @@ public final class ConfigManager { * @param uEditorConfig 配置文件 * @return 配置管理器实例或者null */ - public static ConfigManager getInstance(UEditorConfig uEditorConfig, AwsProperty awsProperty, MallResourceService mallResourceService) { + public static ConfigManager getInstance(UEditorConfig uEditorConfig, AwsProperty awsProperty, MallResourceService mallResourceService, AliyunOSS aliyunOSS) { try { - return new ConfigManager(uEditorConfig, awsProperty, mallResourceService); + return new ConfigManager(uEditorConfig, awsProperty, mallResourceService, aliyunOSS); } catch (Exception e) { System.err.println("UEditor ConfigManager load error~"); return null; @@ -60,6 +63,14 @@ public final class ConfigManager { } + public AliyunOSS getAliyunOSS() { + return aliyunOSS; + } + + public void setAliyunOSS(AliyunOSS aliyunOSS) { + this.aliyunOSS = aliyunOSS; + } + public MallResourceService getMallResourceService() { return mallResourceService; } diff --git a/mallinkAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java b/mallinkAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java index 62d1e3137..4e7f3ee3d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java +++ b/mallinkAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java @@ -12,8 +12,10 @@ import com.amazonaws.services.s3.AmazonS3ClientBuilder; import com.amazonaws.services.s3.model.CannedAccessControlList; import com.amazonaws.services.s3.model.ObjectMetadata; import com.amazonaws.services.s3.model.PutObjectRequest; +import com.iformall.common.ResultData; import com.iformall.domain.po.MallResource; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.file.aliyun.AliyunOSS; import com.iformall.service.MallResourceService; import com.iformall.shiro.UserSession; import com.iformall.ueditor.define.BaseState; @@ -23,6 +25,7 @@ import org.apache.shiro.SecurityUtils; import org.apache.shiro.session.Session; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; @@ -41,6 +44,8 @@ public class Uploader { private MallResourceService mallResourceService = null; private AmazonS3 s3 = null; + private AliyunOSS aliyunOSS; + private String getFileName(TenantEntity tenantEntity, String fileName) { if (StringUtils.isBlank(tenantEntity.getParentTenantId())) { fileName = tenantEntity.getTenantId() + "/" + fileName; @@ -50,24 +55,25 @@ public class Uploader { return fileName; } - public Uploader(HttpServletRequest request, Map conf, MallResourceService mallResourceService) { + public Uploader(HttpServletRequest request, Map conf, MallResourceService mallResourceService, AliyunOSS aliyunOSS) { this.request = request; this.conf = conf; this.mallResourceService = mallResourceService; - this.s3 = AmazonS3ClientBuilder.standard() - .withRegion(conf.get("clientRegion").toString()) - .withCredentials(new AWSCredentialsProvider() { - @Override - public AWSCredentials getCredentials() { - return new BasicAWSCredentials(conf.get("access").toString(), conf.get("secret").toString()); - } - - @Override - public void refresh() { - - } - }) - .build(); + this.aliyunOSS = aliyunOSS; +// this.s3 = AmazonS3ClientBuilder.standard() +// .withRegion(conf.get("clientRegion").toString()) +// .withCredentials(new AWSCredentialsProvider() { +// @Override +// public AWSCredentials getCredentials() { +// return new BasicAWSCredentials(conf.get("access").toString(), conf.get("secret").toString()); +// } +// +// @Override +// public void refresh() { +// +// } +// }) +// .build(); } public final State doExec() { @@ -82,18 +88,22 @@ public class Uploader { Session session = SecurityUtils.getSubject().getSession(); String tenantId = (String)session.getAttribute(UserSession.tenantId); String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); - TenantEntity tenantEntity = new TenantEntity(){{ - setTenantId(tenantId); - setParentTenantId(parentTenantId); - }}; + if(StringUtils.isBlank(tenantId)){ + tenantId = parentTenantId; + parentTenantId = ""; + } + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(tenantId); + tenantEntity.setParentTenantId(parentTenantId); if (StringUtils.isBlank(tenantId)) { logger.error("TENANT is null"); } String fileName = UUID.randomUUID().toString(); int dot = multiReq.getOriginalFilename().lastIndexOf('.'); + String fileFormat = ""; if (dot >= 0) { - String fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); + fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); fileName = getFileName(tenantEntity, fileName + fileFormat); } else { fileName = getFileName(tenantEntity, fileName); @@ -110,19 +120,29 @@ public class Uploader { metadata.setContentLength(multiReq.getSize()); try { - s3.putObject( - new PutObjectRequest(conf.get("bucketName").toString(), fileName, multiReq.getInputStream(), metadata) - .withCannedAcl(CannedAccessControlList.PublicRead)); - URL url = s3.getUrl(conf.get("bucketName").toString(), fileName); +// s3.putObject( +// new PutObjectRequest(conf.get("bucketName").toString(), fileName, multiReq.getInputStream(), metadata) +// .withCannedAcl(CannedAccessControlList.PublicRead)); +// URL url = s3.getUrl(conf.get("bucketName").toString(), fileName); //logger.info(url.toString()); - state.putInfo("url", url.toString()); + ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, multiReq.getInputStream()); + Map map = (Map) data.data; + state.putInfo("url",map.get("url")); MallResource mr = new MallResource(); mr.updateTenantInfo(tenantEntity); - mr.setBucket(conf.get("bucketName").toString()); - mr.setS3Key(fileName); - mr.setUrl(url.toString()); + mr.setBucket(map.get("bucketName")); + //mr.setS3Key(fileName); + mr.setUrl(map.get("url")); + +// state.putInfo("url", url.toString()); +// +// MallResource mr = new MallResource(); +// mr.updateTenantInfo(tenantEntity); +// mr.setBucket(conf.get("bucketName").toString()); +// mr.setS3Key(fileName); +// mr.setUrl(url.toString()); mallResourceService.saveOrUpdate(mr); } catch (AmazonServiceException ase) { /* diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 5b02ef220..943a99b0f 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -58,7 +58,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkadmin - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index 69ae8b3c2..26c10ca4f 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -54,7 +54,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkadmin - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com diff --git a/mallinkBApi/src/main/resources/application-dev.yml b/mallinkBApi/src/main/resources/application-dev.yml index 53589c006..ed00eba69 100644 --- a/mallinkBApi/src/main/resources/application-dev.yml +++ b/mallinkBApi/src/main/resources/application-dev.yml @@ -57,7 +57,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkbapi - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/mallinkBApi/src/main/resources/application-prod.yml b/mallinkBApi/src/main/resources/application-prod.yml index 673236766..b06feacc4 100644 --- a/mallinkBApi/src/main/resources/application-prod.yml +++ b/mallinkBApi/src/main/resources/application-prod.yml @@ -53,7 +53,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkadmin - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com diff --git a/mallinkCApi/src/main/java/com/iformall/config/Swagger2Config.java b/mallinkCApi/src/main/java/com/iformall/config/Swagger2Config.java index 9e6318868..2118b9dbd 100644 --- a/mallinkCApi/src/main/java/com/iformall/config/Swagger2Config.java +++ b/mallinkCApi/src/main/java/com/iformall/config/Swagger2Config.java @@ -1,5 +1,6 @@ package com.iformall.config; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import springfox.documentation.builders.ApiInfoBuilder; @@ -10,9 +11,11 @@ import springfox.documentation.schema.ModelRef; import springfox.documentation.service.ApiInfo; import springfox.documentation.service.Parameter; import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.paths.RelativePathProvider; import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.swagger2.annotations.EnableSwagger2; +import javax.servlet.ServletContext; import java.util.ArrayList; import java.util.List; @@ -21,6 +24,9 @@ import java.util.List; @EnableSwagger2 public class Swagger2Config { + @Autowired + private ServletContext servletContext; + @Bean public Docket createRestApi() { ParameterBuilder tokenPar = new ParameterBuilder(); @@ -34,7 +40,13 @@ public class Swagger2Config { .apis(RequestHandlerSelectors.basePackage("com.iformall.controller")) .paths(PathSelectors.any()) .build() - .globalOperationParameters(pars); + .globalOperationParameters(pars) + .pathProvider(new RelativePathProvider(servletContext) { + @Override + public String getApplicationBasePath() { + return "/api"; + } + }); } private ApiInfo apiInfo() { diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index 9ec032bba..6c2ae5c08 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -57,7 +57,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkcapi - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/mallinkCApi/src/main/resources/application-prod.yml b/mallinkCApi/src/main/resources/application-prod.yml index 93fe8adab..5efbe5257 100644 --- a/mallinkCApi/src/main/resources/application-prod.yml +++ b/mallinkCApi/src/main/resources/application-prod.yml @@ -52,7 +52,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkadmin - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/mallinkCallback/src/main/resources/application-dev.yml b/mallinkCallback/src/main/resources/application-dev.yml index c2de357bd..1fff919cd 100644 --- a/mallinkCallback/src/main/resources/application-dev.yml +++ b/mallinkCallback/src/main/resources/application-dev.yml @@ -58,7 +58,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkcallback - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/mallinkCallback/src/main/resources/application-prod.yml b/mallinkCallback/src/main/resources/application-prod.yml index 9ebbf91b7..1c425ee19 100644 --- a/mallinkCallback/src/main/resources/application-prod.yml +++ b/mallinkCallback/src/main/resources/application-prod.yml @@ -53,7 +53,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkadmin - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/mallinkMQConsumer/src/main/resources/application-dev.yml b/mallinkMQConsumer/src/main/resources/application-dev.yml index 96f2a28b6..f5fc79d65 100644 --- a/mallinkMQConsumer/src/main/resources/application-dev.yml +++ b/mallinkMQConsumer/src/main/resources/application-dev.yml @@ -59,7 +59,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkmqconsumer - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/mallinkMQConsumer/src/main/resources/application-prod.yml b/mallinkMQConsumer/src/main/resources/application-prod.yml index b6787707f..0c0d51aed 100644 --- a/mallinkMQConsumer/src/main/resources/application-prod.yml +++ b/mallinkMQConsumer/src/main/resources/application-prod.yml @@ -53,7 +53,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkadmin - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com diff --git a/mallinkPosApi/src/main/resources/application-dev.yml b/mallinkPosApi/src/main/resources/application-dev.yml index cb1c954bf..a03439cb0 100644 --- a/mallinkPosApi/src/main/resources/application-dev.yml +++ b/mallinkPosApi/src/main/resources/application-dev.yml @@ -57,7 +57,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkposapi - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/mallinkPosApi/src/main/resources/application-prod.yml b/mallinkPosApi/src/main/resources/application-prod.yml index 6f9d27193..d51c351a4 100644 --- a/mallinkPosApi/src/main/resources/application-prod.yml +++ b/mallinkPosApi/src/main/resources/application-prod.yml @@ -52,7 +52,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkadmin - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com diff --git a/mallinkSchedule/src/main/resources/application-dev.yml b/mallinkSchedule/src/main/resources/application-dev.yml index 298c01a4c..862a11d64 100644 --- a/mallinkSchedule/src/main/resources/application-dev.yml +++ b/mallinkSchedule/src/main/resources/application-dev.yml @@ -59,7 +59,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkschedule - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/mallinkSchedule/src/main/resources/application-prod.yml b/mallinkSchedule/src/main/resources/application-prod.yml index c1ab1613c..c21611e26 100644 --- a/mallinkSchedule/src/main/resources/application-prod.yml +++ b/mallinkSchedule/src/main/resources/application-prod.yml @@ -53,7 +53,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkadmin - filedomain: http://formall.oss-accelerate.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com diff --git a/mallinkService/src/main/java/com/iformall/file/aliyun/AliyunOSS.java b/mallinkService/src/main/java/com/iformall/file/aliyun/AliyunOSS.java index 29317ca75..905f531b6 100644 --- a/mallinkService/src/main/java/com/iformall/file/aliyun/AliyunOSS.java +++ b/mallinkService/src/main/java/com/iformall/file/aliyun/AliyunOSS.java @@ -35,6 +35,7 @@ public class AliyunOSS { data = new ResultData(); Map map = new HashMap<>(); map.put("url", upload); + map.put("bucketName", aliyunOSSConfig.getBucketname()); data.data = map; }else{ data = new ResultData(ResultData.ERROR,"上传失败"); @@ -42,6 +43,7 @@ public class AliyunOSS { return data; } + /** * 上传 * @param inputStream @@ -49,11 +51,11 @@ public class AliyunOSS { */ public String upload(String folder, String suffix,InputStream inputStream){ log.info("=========>OSS文件上传开始:"); - String endpoint= aliyunOSSConfig.getEndpoint(); - String accessKeyId= aliyunOSSConfig.getKeyid(); - String accessKeySecret=aliyunOSSConfig.getKeysecret(); - String bucketName=aliyunOSSConfig.getBucketname(); - String fileHost=aliyunOSSConfig.getFilehost(); + String endpoint = aliyunOSSConfig.getEndpoint(); + String accessKeyId = aliyunOSSConfig.getKeyid(); + String accessKeySecret = aliyunOSSConfig.getKeysecret(); + String bucketName = aliyunOSSConfig.getBucketname(); + String fileHost = aliyunOSSConfig.getFilehost(); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); String dateStr = format.format(new Date()); diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index ba9b30755..2d6db382d 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -760,7 +760,7 @@