Compare commits
No commits in common. "b1aa7bef5d698c62ede21a78f43c345c5e88722e" and "7e5b48872f15eae594f43eddb2f7da25479af5a8" have entirely different histories.
b1aa7bef5d
...
7e5b48872f
|
|
@ -1,7 +1,6 @@
|
||||||
package com.bonus.sgzb.base.api.domain;
|
package com.bonus.sgzb.base.api.domain;
|
||||||
|
|
||||||
import com.bonus.sgzb.common.core.web.domain.BaseEntity;
|
import com.bonus.sgzb.common.core.web.domain.BaseEntity;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
@ -62,11 +61,6 @@ public class MaType extends BaseEntity {
|
||||||
@ApiModelProperty(value = "租赁单价")
|
@ApiModelProperty(value = "租赁单价")
|
||||||
private String leasePrice;
|
private String leasePrice;
|
||||||
|
|
||||||
/** 租赁单价 */
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
||||||
@ApiModelProperty(value = "租赁单价")
|
|
||||||
private Date effTime;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "外部价格")
|
@ApiModelProperty(value = "外部价格")
|
||||||
private String rentPrice;
|
private String rentPrice;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,51 +0,0 @@
|
||||||
package com.bonus.sgzb.system.config;
|
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.web.servlet.config.annotation.CorsRegistry;
|
|
||||||
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
|
|
||||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 通用映射配置
|
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*/
|
|
||||||
@Configuration
|
|
||||||
public class ResourcesConfig implements WebMvcConfigurer
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* 上传文件存储在本地的根路径
|
|
||||||
*/
|
|
||||||
@Value("${file.path}")
|
|
||||||
private String localFilePath;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 资源映射路径 前缀
|
|
||||||
*/
|
|
||||||
@Value("${file.prefix}")
|
|
||||||
public String localFilePrefix;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void addResourceHandlers(ResourceHandlerRegistry registry)
|
|
||||||
{
|
|
||||||
/** 本地文件上传路径 */
|
|
||||||
registry.addResourceHandler("/**")
|
|
||||||
.addResourceLocations("file:" + localFilePath + File.separator);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 开启跨域
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public void addCorsMappings(CorsRegistry registry) {
|
|
||||||
// 设置允许跨域的路由
|
|
||||||
registry.addMapping( "/**")
|
|
||||||
// 设置允许跨域请求的域名
|
|
||||||
.allowedOrigins("*")
|
|
||||||
// 设置允许的方法
|
|
||||||
.allowedMethods("GET");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue