diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java new file mode 100644 index 0000000..d934621 --- /dev/null +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java @@ -0,0 +1,45 @@ +package com.kening.vordm.vo; + +import com.kening.vordm.entity.DisasterInfo; +import lombok.Getter; +import lombok.Setter; + +import java.util.Date; + +@Getter +@Setter +public class CallForHelpVo extends DisasterInfo { + + /** + * 灾害id + */ + private Long disasterId; + /** + * 账户id + */ + private Long accountId; + /** + * 用户名称 + */ + private String username; + + /** + * 用户邮件 + */ + private String email; + + /** + * 用户组织机构 + */ + private String organization; + + /** + * 研究范围 + */ + private String researchField; + + /** + * 创建时间 + */ + private Date createTime; +} diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterMangerInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterMangerInfo.java index 584aaa7..d9f5d92 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterMangerInfo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterMangerInfo.java @@ -1,7 +1,9 @@ package com.kening.vordm.vo; import com.kening.vordm.entity.DisasterInfo; +import lombok.Data; +@Data public class DisasterMangerInfo extends DisasterInfo { /** * 用户名 diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java index 9828532..f7de346 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java @@ -1,8 +1,10 @@ package com.kening.vordm.vo; import lombok.Data; +import org.springframework.web.multipart.MultipartFile; import java.util.Date; +import java.util.List; @Data public class EntityDataUserVo { @@ -131,4 +133,14 @@ public class EntityDataUserVo { * 职称 */ private String professionalTitle; + + /** + * 职称 + */ + private String key; + + /** + * 文件信息 + */ + private List filesArray; } diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/FileVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/FileVo.java new file mode 100644 index 0000000..4aaeeda --- /dev/null +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/FileVo.java @@ -0,0 +1,20 @@ +package com.kening.vordm.vo; + +import lombok.Data; + +@Data +public class FileVo { + + //文件大小 + private Long fileSize; + + //获取文件类型 + private String fileType; + + //文件后缀 + private String fileSuffix; + + //文件存储路径 + private String link; + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java index cd32db5..6979a41 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java @@ -12,5 +12,6 @@ import org.springframework.cloud.client.SpringCloudApplication; public class VoRdmApplication { public static void main(String[] args) { BladeApplication.run(CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args); +// BladeApplication.run("zqq-" + CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args); } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CaptchaController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CaptchaController.java new file mode 100644 index 0000000..8f63236 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CaptchaController.java @@ -0,0 +1,41 @@ +package com.kening.vordm.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springblade.common.cache.CacheNames; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.redis.cache.BladeRedis; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.StringUtil; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author wanghongqing + * @date 2023/3/31 11:10 + **/ +@RestController +@RequestMapping("/captcha") +@RequiredArgsConstructor +@Api(value = "验证码校验接口", tags = "验证码校验") +public class CaptchaController extends BladeController { + + private final BladeRedis bladeRedis; + + + @PostMapping("/validate") + @ApiOperation(value = "验证码校验", notes = "传入需要校验的验证码以及缓存Key") + public R validDefaultTime(@RequestParam String code, @RequestParam String key) { + // 获取验证码 + String redisCode = bladeRedis.get(CacheNames.CAPTCHA_KEY + key); + // 判断验证码 + if (code == null || !StringUtil.equalsIgnoreCase(redisCode, code)) { + return R.fail(1404, "Verification code error"); + } + return R.success("OK"); + } + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ContactController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ContactController.java index a10caaa..e27548a 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ContactController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ContactController.java @@ -21,7 +21,7 @@ import java.util.Arrays; @RestController @AllArgsConstructor -@RequestMapping("/contact") +@RequestMapping("/ui/contact") public class ContactController{ private ContactService contactService; @ApiOperationSupport(order = 1) diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java index d70bf32..1024577 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java @@ -1,11 +1,14 @@ package com.kening.vordm.controller; +import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.kening.vordm.entity.*; import com.kening.vordm.service.*; +import com.kening.vordm.vo.CallForHelpVo; import com.kening.vordm.vo.DisasterInfoVo; import com.kening.vordm.vo.GroupByUse; import com.kening.vordm.vo.UserTenantVo; @@ -13,6 +16,7 @@ import lombok.RequiredArgsConstructor; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; import org.springframework.web.bind.annotation.*; import java.time.LocalDate; @@ -30,7 +34,16 @@ public class DisasterInfoController { private final WebsitesService websitesService; private final NewsService newsService; + private final PictureInfoService pictureInfoService; + + private final GuestInfoService guestInfoService; + + private final GuestManageDisasterRefService guestManageDisasterRefService; + + //下载次数记录 + private final DownloadRecordService downloadRecordService; + private final DisasterInfoVoService disasterInfoVoService; /** @@ -46,8 +59,22 @@ public class DisasterInfoController { @GetMapping("/getPicInfoByDisasterId") public R> getPicInfoByDisasterInfoId(Long disasterId){ return R.data(pictureInfoService.list(Wrappers.lambdaQuery() - .eq(PictureInfo::getDisasterId,disasterId) - .eq(PictureInfo::getIsMain, 1))); + .eq(PictureInfo::getDisasterId,disasterId))); + } + + /** + * 灾害查询条件，时间，类型，灾害联动 + * @param disasterInfo + * @return + */ + @GetMapping("/selectCondition") + public R> getSelectCondition1(DisasterInfo disasterInfo){ + String disaster_time = null; + if (disasterInfo.getDisasterTime() != null) { + disaster_time = disasterInfo.getDisasterTime().toString(); + } + return R.data(disasterInfoService.getConditionData(disasterInfo.getDisasterType(), disasterInfo.getDisasterCountry(), disaster_time, disasterInfo.getName() + )); } /** @@ -80,7 +107,7 @@ public class DisasterInfoController { // } String disaster_time = null; if (disasterInfo.getDisasterTime() != null) { - disaster_time = disasterInfo.getDisasterTime().toString(); + disaster_time = DateUtil.format(disasterInfo.getDisasterTime(),"yyyy-MM-dd"); } return R.data(disasterInfoService.getConditionData(disasterInfo.getDisasterType(), disasterInfo.getDisasterCountry(), disaster_time, disasterInfo.getName() )); @@ -178,4 +205,30 @@ public class DisasterInfoController { public R> getUserTenant() { return R.data(disasterInfoService.getAllUser()); } + + /** + * call for help + * + */ + @PostMapping("Call-for-help") + public R insertRespondInfo(@RequestBody CallForHelpVo callForHelpVo){ + GuestInfo guestInfo = new GuestInfo(); + BeanUtil.copyProperties(callForHelpVo, guestInfo); + guestInfo.setId(IdWorker.getId()); + DisasterInfo disasterInfo = new DisasterInfo(); + BeanUtil.copyProperties(callForHelpVo, disasterInfo); + disasterInfo.setId(IdWorker.getId()); + GuestManageDisasterRef GuestManageDisasterRef = new GuestManageDisasterRef(); + GuestManageDisasterRef.setId(IdWorker.getId()); + GuestManageDisasterRef.setSponsorId(guestInfo.getId()); + String vordm_id="test"; + GuestManageDisasterRef.setDisasterId(disasterInfo.getId()); + Boolean flag1=guestInfoService.save(guestInfo); + Boolean flag2= guestManageDisasterRefService.save(GuestManageDisasterRef); + Boolean flag3=disasterInfoService.save(disasterInfo); + Boolean callForHelp= flag1&flag2&flag3; +// callForHelpVo.setId(IdWorker.getId()); +// Boolean insertFlag=accountInfoService.save(accountInfo); + return R.data(callForHelp); + } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java index 3fea077..172628f 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java @@ -33,7 +33,7 @@ public class EntityDataController { } /** - * 获取所以不可可视化下机构信息 + * 获取所有实体信息下机构信息 * @return */ @GetMapping("/getEntityDataSourceOrganization") @@ -47,7 +47,7 @@ public class EntityDataController { * @return */ @PostMapping("/saveEntityData") - public R saveEntityData(@RequestBody EntityDataUserVo entityDataUserVo) { + public R saveEntityData(EntityDataUserVo entityDataUserVo) { return R.data(entityDataService.saveEntityData(entityDataUserVo)); } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/FileController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/FileController.java new file mode 100644 index 0000000..f91b254 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/FileController.java @@ -0,0 +1,50 @@ +package com.kening.vordm.controller; + +import cn.hutool.core.date.DateUtil; +import com.kening.vordm.vo.FileVo; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.oss.MinioTemplate; +import org.springblade.core.oss.model.BladeFile; +import org.springblade.core.tool.api.R; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +@RequestMapping("/ui/upload") +@RestController +@Slf4j +public class FileController { + + + /** + * 对象存储模块 + */ + @Autowired + private MinioTemplate minioTemplate; + + /** + * 上传文件 + * @param file + * @return + */ + @PostMapping("/uploadFile") + public R upload(MultipartFile file){ + BladeFile bladeFile = minioTemplate.putFile(file); + //获取文件大小 + Long fileSize = file.getSize(); + //获取文件类型 + String fileType = file.getContentType(); + //文件后缀 + String fileSuffix = file.getOriginalFilename(); + //文件存储路径 + String link = bladeFile.getLink(); + FileVo fileVo = new FileVo(); + fileVo.setFileSize(fileSize); + fileVo.setFileType(fileType); + fileVo.setFileSuffix(fileSuffix); + fileVo.setLink(link); + return R.data(bladeFile); + } +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java index fcd7ef3..bd69049 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java @@ -3,13 +3,16 @@ package com.kening.vordm.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kening.vordm.entity.DisasterInfo; +import com.kening.vordm.entity.EntityData; import com.kening.vordm.entity.RemoteSensingSourceData; import com.kening.vordm.service.DisasterInfoService; import com.kening.vordm.service.RemoteSensingSourceDataService; +import com.kening.vordm.vo.GroupByUse; import lombok.AllArgsConstructor; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -33,8 +36,32 @@ public class RemoteSensingSourceDataController { */ @GetMapping("/SourceData") public R> getRemoteSensingSourceData(DisasterInfo disasterInfo, Query query){ - List disasterIds=disasterInfoService.getDisasterId(disasterInfo); + List disasterIds = disasterInfoService.getDisasterId(disasterInfo); + if (disasterIds.isEmpty()){ + return R.data(null); + } return R.data(remoteSensingSourceDataService.page(Condition.getPage(query),new QueryWrapper().in("disaster_id",disasterIds))); } + /** + * 实体数据列表信息 + * @param remoteSensingSourceData 实体数据条件信息 + * @param query current当前页 size 每页数据量 + * @return + */ + @GetMapping("/Condition") + public R> getRemoteSensingSourceDataByCondition(RemoteSensingSourceData remoteSensingSourceData, Query query) { + return R.data(remoteSensingSourceDataService.getRemoteSensingSourceDataByCondition(Condition.getPage(query), remoteSensingSourceData)); + } + +// /** +// * 根据页码和灾害信息查出遥感影像源数据，可多个灾害 +// * @param remoteSensingSourceData +// * @param query +// * @return +// */ +// @GetMapping("/Condition1") +// public R> getRemoteSensingSourceDataByCondition(RemoteSensingSourceData remoteSensingSourceData, Query query){ +// return R.data(remoteSensingSourceDataService.page(Condition.getPage(query),Condition.getQueryWrapper(remoteSensingSourceData))); +// } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java index 826ec4f..c76bd67 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java @@ -21,7 +21,7 @@ import java.util.Arrays; @RestController @AllArgsConstructor -@RequestMapping("/tool") +@RequestMapping("/ui/tool") public class ToolController{ private ToolService toolService; @ApiOperationSupport(order = 1) @@ -60,6 +60,7 @@ public class ToolController{ Tool detail = toolService.getById(id); return R.data(detail); } + @ApiOperationSupport(order = 6) @ApiOperation(value = "提交", notes = "传入Tool") @PostMapping("/submit") diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml index 5b887ea..d382336 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml @@ -62,7 +62,7 @@ from disaster_info where - disaster_type=#{disaster_type} + disaster_type like concat('%',#{disaster_type},'%') and disaster_country like concat('%',#{disaster_country},'%') and @@ -84,6 +84,7 @@ where d.respond_status=#{respondStatus} order by d.disaster_time desc + + + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/RemoteSensingSourceDataService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/RemoteSensingSourceDataService.java index bf7c2bc..04385ca 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/RemoteSensingSourceDataService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/RemoteSensingSourceDataService.java @@ -1,8 +1,11 @@ package com.kening.vordm.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.kening.vordm.entity.EntityData; import com.kening.vordm.entity.RemoteSensingSourceData; +import com.kening.vordm.vo.GroupByUse; import org.springframework.stereotype.Service; import java.util.List; @@ -15,4 +18,6 @@ import java.util.List; public interface RemoteSensingSourceDataService extends IService { List getRemoteSensingSourceData(String disasterType,String disasterCountry, String disasterTime); + IPage getRemoteSensingSourceDataByCondition(IPage page, RemoteSensingSourceData remoteSensingSourceData); + } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java index 0037b1e..5b2bfd3 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java @@ -46,23 +46,23 @@ implements DisasterInfoService { public List getDisasterId(DisasterInfo disasterInfo){ QueryWrapper qw = new QueryWrapper<>(); if (disasterInfo.getDisasterType()!=null){ - qw.like("disaster_type",disasterInfo.getDisasterType()); + qw.eq("disaster_type",disasterInfo.getDisasterType()); } if (disasterInfo.getDisasterCountry()!=null){ - qw.like("disaster_country",disasterInfo.getDisasterCountry()); + qw.eq("disaster_country",disasterInfo.getDisasterCountry()); } if (disasterInfo.getDisasterTime()!=null){ - qw.like("disaster_time",disasterInfo.getDisasterTime()); + qw.eq("disaster_time",disasterInfo.getDisasterTime()); } List disasterInfos = this.baseMapper.selectList(qw); + List ids = new ArrayList<>(); if (!disasterInfos.isEmpty()){ - List ids = new ArrayList<>(); disasterInfos.stream().forEach(disasterInfo1 -> { - ids.add(disasterInfo1.getId()); + ids .add(disasterInfo1.getId()); }); return ids; } - return null; + return ids; } /** diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java index c998f37..35669ff 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java @@ -1,5 +1,6 @@ package com.kening.vordm.service.impl; +import com.alibaba.nacos.common.utils.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -12,8 +13,13 @@ import com.kening.vordm.vo.EntityDataUserVo; import com.kening.vordm.vo.UserTenantVo; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springblade.core.oss.MinioTemplate; +import org.springblade.core.oss.model.BladeFile; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -30,6 +36,11 @@ public class EntityDataServiceImpl extends ServiceImpl getEntityDataList(IPage page, EntityData entityData) { return this.baseMapper.getEntityDataList(entityData, page); @@ -46,10 +57,20 @@ public class EntityDataServiceImpl extends ServiceImpl link = new ArrayList<>(); + //文件数据 + List filesArray = entityDataUserVo.getFilesArray(); + filesArray.stream().forEach(files->{ + BladeFile bladeFile = minioTemplate.putFile(files); + link.add(bladeFile.getLink()); + }); + //判断上传用户是否存在 LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); qw.eq(GuestInfo::getEmail, entityDataUserVo.getEmail()); @@ -73,7 +94,7 @@ public class EntityDataServiceImpl extends ServiceImpl getRemoteSensingSourceDataByCondition(IPage page, RemoteSensingSourceData remoteSensingSourceData) { + return this.baseMapper.getRemoteSensingSourceDataByCondition(remoteSensingSourceData, page); + } } diff --git a/kn-service/biz-vordm/src/main/java/mapper/ContactMapper.xml b/kn-service/biz-vordm/src/main/java/mapper/ContactMapper.xml deleted file mode 100644 index 3f3c255..0000000 --- a/kn-service/biz-vordm/src/main/java/mapper/ContactMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - user_name,email,organization, - message,id - - diff --git a/kn-service/biz-vordm/src/main/resources/application-dev.yml b/kn-service/biz-vordm/src/main/resources/application-dev.yml index 3aef9ec..c447108 100644 --- a/kn-service/biz-vordm/src/main/resources/application-dev.yml +++ b/kn-service/biz-vordm/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ spring: datasource: - url: ${kn.datasource.vordm.url} - username: ${kn.datasource.vordm.username} - password: ${kn.datasource.vordm.password} + url: ${blade.datasource.dev.url} + username: ${blade.datasource.dev.username} + password: ${blade.datasource.dev.password} diff --git a/kn-service/kn-setting/pom.xml b/kn-service/kn-setting/pom.xml index b01b199..c4112c2 100644 --- a/kn-service/kn-setting/pom.xml +++ b/kn-service/kn-setting/pom.xml @@ -19,3 +19,4 @@ + diff --git a/kn-service/pom.xml b/kn-service/pom.xml index b1d3bac..e7461aa 100644 --- a/kn-service/pom.xml +++ b/kn-service/pom.xml @@ -5,7 +5,7 @@ 4.0.0 biz-vordm - kn-setting + @@ -65,6 +65,25 @@ + + org.springblade + blade-starter-oss + + + esdk-obs-java + com.huaweicloud + + + + + io.minio + minio + + + org.springframework + spring-mock + 2.0.8 + com.alibaba fastjson