Skip to content

A
amos-boot-biz
Commit 92c27d8d authored by 高建强's avatar 高建强
Browse files
Options

item：取消设备文件前缀地址，fileserver_domain

parent 1ce21c8e
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 96 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/CarController.java
View file @ 92c27d8d
......@@ -180,8 +180,6 @@ public class CarController extends AbstractBaseController {
private String appKeyApp;
@Value("${iot.vehicle.track}")
private String iotServerName;
@Value("${fileserver_domain}")
private String fileServer;
@Value("${systemctl.sync.switch}")
private Boolean syncSwitch;
......@@ -572,7 +570,7 @@ public class CarController extends AbstractBaseController {
for (Map<String, Object> map : list) {
String img = (String) map.get("img");
if (img != null && !"".equals(img)) {
map.put("img", fileServer + img);
map.put("img", img);
}
}
}
......@@ -828,7 +826,7 @@ public class CarController extends AbstractBaseController {
mape.put("brand", brand);
listdate = equipmentCategoryMapper.getEquipmentCount(mape);
for (Map<String, Object> map : listdate) {
map.put("img", fileServer + map.get("img"));
map.put("img", map.get("img"));
Object amount = map.get("amount");
String unit = map.get("unit").toString();
if (ercode.substring(0, 1).equals("4")) {
......@@ -872,7 +870,7 @@ public class CarController extends AbstractBaseController {
amount = amount + utname;
}
map.put("amount", amount);
map.put("img", fileServer + map.get("img"));
map.put("img", map.get("img"));
}
return listdate;
} catch (Exception e) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/ManufacturerInfoController.java
View file @ 92c27d8d
......@@ -53,9 +53,6 @@ public class ManufacturerInfoController {
@Autowired
ISystemDicService iSystemDicService;
@Value("${fileserver_domain}")
private String fileServer;
/**
* 新增
*
......@@ -66,9 +63,6 @@ public class ManufacturerInfoController {
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ManufacturerInfo saveManufacturerInfo(HttpServletRequest request,
@RequestBody ManufacturerInfo manufacturerInfo) {
if (!ObjectUtils.isEmpty(manufacturerInfo.getImg()) && manufacturerInfo.getImg().contains(fileServer)) {
manufacturerInfo.setImg(manufacturerInfo.getImg().replace(fileServer, ""));
}
if (!ObjectUtils.isEmpty(manufacturerInfo.getCountryId())) {
SystemDic byId = iSystemDicService.getByIdforAll(manufacturerInfo.getCountryId());
manufacturerInfo.setCountry(byId.getName());
......@@ -113,9 +107,6 @@ public class ManufacturerInfoController {
@ApiOperation(httpMethod = "PUT", value = "修改", notes = "修改")
public boolean updateByIdManufacturerInfo(HttpServletRequest request,
@RequestBody ManufacturerInfo manufacturerInfo) {
if (!ObjectUtils.isEmpty(manufacturerInfo.getImg()) && manufacturerInfo.getImg().contains(fileServer)) {
manufacturerInfo.setImg(manufacturerInfo.getImg().replace(fileServer, ""));
}
if (!ObjectUtils.isEmpty(manufacturerInfo.getCountryId())) {
SystemDic byId = iSystemDicService.getByIdforAll(manufacturerInfo.getCountryId());
manufacturerInfo.setCountryId(manufacturerInfo.getCountryId());
......@@ -150,9 +141,6 @@ public class ManufacturerInfoController {
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public ManufacturerInfo selectById(HttpServletRequest request, @PathVariable Long id) {
ManufacturerInfo manufacturerInfo = iManufacturerInfoService.getById(id);
if (!ObjectUtils.isEmpty(manufacturerInfo.getImg())) {
manufacturerInfo.setImg(fileServer + manufacturerInfo.getImg());
}
return manufacturerInfo;
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/CarServiceImpl.java
View file @ 92c27d8d
......@@ -188,8 +188,6 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
@Autowired
@Lazy
private IEquipmentIndexService equipmentIndexService;
@Value("${fileserver_domain}")
private String fileServer;
@Autowired
private IManufacturerInfoService iManufacturerInfoService;
@Autowired
......@@ -1147,7 +1145,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
Equipment equipment = iEquipmentService.getById(carOne.getEquipmentId());
String utilName = carMapper.getUtilName(equipment.getUnitId());
carOne.setUnitName(utilName);
equipment.setImg(fileServer + equipment.getImg());
equipment.setImg(equipment.getImg());
carOne.setEquipment(equipment);
carOne.setCarState(CarStatusEnum.getEnum(carOne.getCarState().toString()).getName());
}
......@@ -1285,9 +1283,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
return new ArrayList<UploadFile>();
}
list.forEach(item -> {
if (item.getUrl().contains(fileServer)) {
item.setUrl(item.getUrl().replace(fileServer, ""));
}
item.setUrl(item.getUrl());
item.setFileType(type);
item.setObjectType(BillContentEnum.CL.getKey());
item.setObjectId(id);
......@@ -1388,7 +1384,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
car.setCarPropertyList(carPropertyList);
ManufacturerInfo manufacturerInfo = iManufacturerInfoService.getById(car.getManufacturerId());
manufacturerInfo.setImg(fileServer + manufacturerInfo.getImg());
manufacturerInfo.setImg(manufacturerInfo.getImg());
car.setManufacturerInfo(manufacturerInfo);
car.setImg(getCarFileList(id, FileTypeEnum.image.toString()));
car.setVideo(getCarFileList(id, FileTypeEnum.video.toString()));
......@@ -1417,7 +1413,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
Map<String, List<CarIndexVo>> map = carVoList.stream().collect(Collectors.groupingBy(vo -> vo.getName()));
car.setExt(JSONObject.toJSONString(map));
ManufacturerInfo manufacturerInfo = iManufacturerInfoService.getById(car.getManufacturerId());
manufacturerInfo.setImg(fileServer + manufacturerInfo.getImg());
manufacturerInfo.setImg(manufacturerInfo.getImg());
car.setManufacturerInfo(manufacturerInfo);
car.setImg(getCarFileList(id, FileTypeEnum.image.toString()));
Equipment equipment = iEquipmentService.getById(car.getEquipmentId());
......@@ -1444,7 +1440,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
Map<String, List<CarIndexVo>> map = carVoList.stream().collect(Collectors.groupingBy(vo -> vo.getName()));
car.setExt(JSONObject.toJSONString(map));
ManufacturerInfo manufacturerInfo = iManufacturerInfoService.getById(car.getManufacturerId());
manufacturerInfo.setImg(fileServer + manufacturerInfo.getImg());
manufacturerInfo.setImg(manufacturerInfo.getImg());
car.setManufacturerInfo(manufacturerInfo);
car.setImg(getCarFileList(car.getId(), FileTypeEnum.image.toString()));
Equipment equipment = iEquipmentService.getById(car.getEquipmentId());
......@@ -1463,7 +1459,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
List<UploadFile> list = iUploadFileService.list(new QueryWrapper<UploadFile>().eq("object_id", id)
.eq("object_type", BillContentEnum.CL.getKey()).eq("file_type", type));
list.forEach(item -> {
item.setUrl(fileServer + item.getUrl());
item.setUrl(item.getUrl());
});
return list;
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentDetailServiceImpl.java
View file @ 92c27d8d
......@@ -64,9 +64,6 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
@Autowired
private IEquipmentSpecificIndexSerivce equipmentSpecificIndexSerivce;
@Value("${fileserver_domain}")
private String fileServer;
@Autowired
private ISystemDicService iSystemDicService;
......@@ -84,9 +81,7 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
return new ArrayList<UploadFile>();
}
list.forEach(item -> {
if (item.getUrl().contains(fileServer)) {
item.setUrl(item.getUrl().replace(fileServer, ""));
}
item.setUrl(item.getUrl());
item.setFileType(type);
item.setObjectType(BillContentEnum.ZB.getKey());
item.setObjectId(id);
......@@ -137,7 +132,7 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
List<UploadFile> list = iUploadFileService.list(new QueryWrapper<UploadFile>().eq("object_id", id)
.eq("object_type", BillContentEnum.ZB.getKey()).eq("file_type", type));
list.forEach(item -> {
item.setUrl(fileServer + item.getUrl());
item.setUrl(item.getUrl());
});
return list;
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentManageServiceImpl.java
View file @ 92c27d8d
......@@ -46,13 +46,6 @@ import java.util.zip.ZipOutputStream;
@Service
public class EquipmentManageServiceImpl extends ServiceImpl<EquipmentManageMapper, EquipmentManageEntity> implements EquipmentManageService {
/**
* 文件服务器地址
*/
@Value("${fileserver_domain}")
private String ipUrl;
@Autowired
EquipmentManageMapper equipmentManageMapper;
......@@ -281,7 +274,7 @@ public class EquipmentManageServiceImpl extends ServiceImpl<EquipmentManageMappe
response.setHeader("Access-Control-Allow-Origin", "*");
response.setContentType("multipart/form-data");
try {
InputStream inputStream = getInputStreamFromURL(ipUrl + vo.getUrl());
InputStream inputStream = getInputStreamFromURL(vo.getUrl());
//3.通过response获取ServletOutputStream对象(out)
out = response.getOutputStream();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentServiceImpl.java
View file @ 92c27d8d
......@@ -57,13 +57,9 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
private PatrolFeign patrolFeign;
@Autowired
private RemoteSecurityService remoteSecurityService;
@Value("${fileserver_domain}")
private String fileServer;
@Autowired
private IEquipmentDetailService iEquipmentDetailService;
@Value("${fileserver_domain}")
private String fileUrl;
// 装备分类code长度
private static final int CATECODELEN = 8;
private String proviceCode = "44";
......@@ -339,7 +335,7 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
imgQueryWrapper.eq("file_type", "image");
List<UploadFile> uploadFiles = uploadFileMapper.selectList(imgQueryWrapper);
for (UploadFile s : uploadFiles) {
s.setUrl(fileServer + s.getUrl());
s.setUrl(s.getUrl());
}
equipmentBaseApp.setImg(uploadFiles);
equipmentApp.setEquipmentBase(equipmentBaseApp);
......@@ -349,7 +345,7 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
excelQueryWrapper.eq("file_type", "instruction");
List<UploadFile> uploadFiles1 = uploadFileMapper.selectList(excelQueryWrapper);
for (UploadFile s : uploadFiles1) {
s.setUrl(fileServer + s.getUrl());
s.setUrl(s.getUrl());
}
equipmentApp.setExcel(uploadFiles1);
//性能指标,带指标值
......@@ -424,7 +420,7 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
images.forEach(a -> {
String picture = a.getPicture();
if (StringUtils.isNotEmpty(picture)) {
a.setPicture(fileUrl + picture);
a.setPicture(picture);
}
});
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmServiceImpl.java
View file @ 92c27d8d
......@@ -89,9 +89,6 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
@Autowired
private IVideoService videoService;
@Value("${fileserver_domain}")
private String fileServer;
@Override
public void handleExport(HttpServletResponse response, List<Long> ids, String alarmType) {
CommonPageInfoParam param = new CommonPageInfoParam();
......@@ -469,7 +466,7 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
alarmDataVO5.setKey(EquipmentDataEnum.XT.getName());
alarmDataVO5.setValue(StringUtil.isNotEmpty(sourceData.get("systemName")) ? sourceData.get("systemName").toString() : null);
lists.add(alarmDataVO5);
alarmEquipMockDataVO.setPic(StringUtil.isNotEmpty(sourceData.get("imgUrl")) ? fileServer + sourceData.get("imgUrl") : null);
alarmEquipMockDataVO.setPic(StringUtil.isNotEmpty(sourceData.get("imgUrl")) ? sourceData.get("imgUrl").toString() : null);
alarmEquipMockDataVO.setAlarmCount(count);
alarmEquipMockDataVO.setQrcode(StringUtil.isNotEmpty(sourceData.get("qrCode")) ? sourceData.get("qrCode").toString() : null);
alarmEquipMockDataVO.setDetailUrl(null);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java
View file @ 92c27d8d
......@@ -117,9 +117,6 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
@Value("${systemctl.dict.iot-core-param}")
private String iotCoreParam;
@Value("${fileserver_domain}")
private String fileServer;
@Value("${equipment.filter.code}")
private String codes;
......@@ -380,9 +377,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
return new ArrayList<UploadFile>();
}
list.forEach(item -> {
if (item.getUrl().contains(fileServer)) {
item.setUrl(item.getUrl().replace(fileServer, ""));
}
item.setUrl(item.getUrl());
item.setId(sequence.nextId());
item.setFileType(type);
item.setObjectType(BillContentEnum.ZB.getKey());
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/QREquipmentDefServiceImpl.java
View file @ 92c27d8d
......@@ -94,8 +94,6 @@ public class QREquipmentDefServiceImpl implements IQRCodeService<ScanResult<QREq
private IStockDetailService stockDetailService;
@Autowired
private UploadFileMapper uploadFileMapper;
@Value("${fileserver_domain}")
private String fileUrl;
@Autowired
IEquipmentService iEquipmentService;
......@@ -269,7 +267,7 @@ public class QREquipmentDefServiceImpl implements IQRCodeService<ScanResult<QREq
ParsePropertyUtil.setting(info::setCarNum, car::getCarNum);
ParsePropertyUtil.setting(info::setEquipmentId, car::getEquipmentId);
ParsePropertyUtil.setting(info::setEquipName, equipment::getName);
info.setImg(fileUrl+img);
info.setImg(img);
// ParsePropertyUtil.setting(info::setImg, () -> {
// if(car.getImg().size()>0){
// if (StringUtil.isNotEmpty(car.getImg().get(0).getUrl())) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/QREquipmentKnowledgeServiceImpl.java
View file @ 92c27d8d
......@@ -127,9 +127,6 @@ public class QREquipmentKnowledgeServiceImpl implements IQRCodeService<ScanResul
@Autowired
private IStockDetailService iStockDetailService;
@Value("${fileserver_domain}")
private String fileUrl;
public ScanResult<QREquipResponse> scan(QRCodeRequest request) throws RuntimeException {
try {
String qrCode = StringUtil.splitQRCode(request)[1];
......@@ -377,7 +374,7 @@ public class QREquipmentKnowledgeServiceImpl implements IQRCodeService<ScanResul
}
});
String img = iEquipmentService.getById(equipmentDetail.getEquipmentId()).getImg();
info.setImg(fileUrl+img);
info.setImg(img);
// ParsePropertyUtil.setting(info::setImg, () -> {
// if(equipmentDetail.getVideo()!=null && equipmentDetail.getVideo().size() != 0){
// if (null != equipmentDetail.getImg().get(0).getUrl()) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ScrapDetailServiceImpl.java
View file @ 92c27d8d
......@@ -43,9 +43,6 @@ public class ScrapDetailServiceImpl extends ServiceImpl<ScrapDetailMapper, Scrap
@Autowired
private ScrapMapper scrapMapper;
@Value("${fileserver_domain}")
private String fileServer;
@Override
public ScrapDetail getOneById(Long id) {
ScrapDetail scrapDetail = getById(id);
......@@ -68,14 +65,14 @@ public class ScrapDetailServiceImpl extends ServiceImpl<ScrapDetailMapper, Scrap
scrapDetail.setStockDetail(stockDetail);
String img = equipmentDetail.getEquipment().getImg();
if (img !=null && !"".equals(img)){
scrapDetail.setImg(fileServer+img);
scrapDetail.setImg(img);
}
} else if (scrapDetail.getCarId() != null) {
Car car = iCarService.getById(scrapDetail.getCarId());
scrapDetail.setCar(car);
String img = scrapMapper.getImgById(scrapDetail.getScrapId(), "2");
if (img != null && !"".equals(img)) {
scrapDetail.setImg(fileServer+img);
scrapDetail.setImg(img);
}
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ScrapServiceImpl.java
View file @ 92c27d8d
......@@ -61,9 +61,6 @@ public class ScrapServiceImpl extends ServiceImpl<ScrapMapper, Scrap> implements
@Autowired
private EquipmentOnCarMapper equipmentOnCarMapper;
@Value("${fileserver_domain}")
private String fileServer;
@Override
public Scrap create(List<ScrapDetail> list, String type, AgencyUserModel agencyUserModel) {
this.scrapCheck(type, list);
......@@ -267,7 +264,7 @@ public class ScrapServiceImpl extends ServiceImpl<ScrapMapper, Scrap> implements
String type = scrap.getBillType();
String img = scrapMapper.getImgById(scrap.getId(), type);
if (img != null && !"".equals(img)) {
scrap.setImg(fileServer + img);
scrap.setImg(img);
}
List<Map<String, Object>> list = scrapDetailService.geteqTypeAndAmount(scrap.getId());
if (0 < list().size()) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/StockDetailServiceImpl.java
View file @ 92c27d8d
......@@ -51,9 +51,6 @@ public class StockDetailServiceImpl extends ServiceImpl<StockDetailMapper, Stock
@Autowired
private StockDetailMapper stockDetailMapper;
@Value("${fileserver_domain}")
private String fileServer;
@Override
public Page<StockDetail> pageCategoryStock(Page<EquipmentDetail> pageBean, String category,
Long warehouseStructureId) {
......@@ -73,7 +70,7 @@ public class StockDetailServiceImpl extends ServiceImpl<StockDetailMapper, Stock
stockDetail.setEquipmentDetail(equipmentDetail);
String img = equipmentDetail.getEquipment().getImg();
if (img != null && !"".equals(img)) {
stockDetail.setImg(fileServer + img);
stockDetail.setImg(img);
}
stockDetailList.add(stockDetail);
}
......@@ -122,7 +119,7 @@ public class StockDetailServiceImpl extends ServiceImpl<StockDetailMapper, Stock
stockDetail.setEquipmentDetail(equipmentDetail);
String img = equipmentDetail.getEquipment().getImg();
if (img != null && !"".equals(img)) {
stockDetail.setImg(fileServer + img);
stockDetail.setImg(img);
}
}
return page;
......
amos-boot-system-equip/src/main/resources/application-dev.properties
View file @ 92c27d8d
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://172.16.10.85:3306/autosys_business_v3.0.0.2?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.url = jdbc:mysql://172.16.3.20:3307/autosys_business_v3.0.1.3?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username=root
spring.datasource.password=Amos2019Mysql8
spring.datasource.password=123456
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.pool-name=DatebookHikariCP
spring.datasource.hikari.minimum-idle= 3
......@@ -12,9 +12,6 @@ spring.datasource.hikari.max-lifetime= 1800000
spring.datasource.hikari.connection-timeout= 60000
spring.datasource.hikari.connection-test-query= SELECT 1
# \u6587\u4EF6\u670D\u52A1\u5668\u5730\u5740
fileserver_domain=http://39.98.246.31:8888/
eureka.instance.hostname= 172.16.11.20
eureka.instance.prefer-ip-address = true
eureka.client.serviceUrl.defaultZone: http://${eureka.instance.hostname}:10001/eureka/
......
amos-boot-system-equip/src/main/resources/application-docker.properties
View file @ 92c27d8d
......@@ -12,9 +12,6 @@ spring.datasource.hikari.max-lifetime= 1800000
spring.datasource.hikari.connection-timeout= 30000
spring.datasource.hikari.connection-test-query= SELECT 1
# 文件服务器地址
fileserver_domain=http://39.98.246.31:8888/
eureka.instance.hostname= 172.16.11.20
eureka.instance.prefer-ip-address = true
eureka.client.serviceUrl.defaultZone: http://${eureka.instance.hostname}:10001/eureka/
......
amos-boot-system-equip/src/main/resources/application-jcs.properties
View file @ 92c27d8d
......@@ -17,8 +17,6 @@ fdfs.connect-timeout=601
fdfs.thumb-image.height=200
fdfs.thumb-image.width=200
fdfs.tracker-list[0]=39.98.246.31:22122
# 文件服务器地址
fileserver_domain=http://39.98.246.31:8888/
eureka.instance.hostname= 172.16.10.72
eureka.instance.prefer-ip-address = true
......
amos-boot-system-equip/src/main/resources/application-qa.properties
View file @ 92c27d8d
......@@ -12,9 +12,6 @@ spring.datasource.hikari.max-lifetime= 1800000
spring.datasource.hikari.connection-timeout= 30000
spring.datasource.hikari.connection-test-query= SELECT 1
# 文件服务器地址
fileserver_domain=http://39.98.246.31:8888/
eureka.instance.hostname= 172.16.11.20
eureka.instance.prefer-ip-address = true
eureka.client.serviceUrl.defaultZone: http://${eureka.instance.hostname}:10001/eureka/
......
amos-boot-system-equip/src/main/resources/application-test.properties
View file @ 92c27d8d
......@@ -12,9 +12,6 @@ spring.datasource.hikari.max-lifetime= 1800000
spring.datasource.hikari.connection-timeout= 30000
spring.datasource.hikari.connection-test-query= SELECT 1
# 文件服务器地址
fileserver_domain=http://39.98.246.31:8888/
eureka.instance.hostname= 172.16.11.20
eureka.instance.prefer-ip-address = true
eureka.client.serviceUrl.defaultZone: http://${eureka.instance.hostname}:10001/eureka/
......
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