Commit cbb548ff authored by 王琮's avatar 王琮

修改配置文件

parent 51d8bd6a
...@@ -9,7 +9,7 @@ import org.rcisoft.core.model.CyPersistModel; ...@@ -9,7 +9,7 @@ import org.rcisoft.core.model.CyPersistModel;
import org.rcisoft.sys.ossinfo.dao.OssInfoRepository; import org.rcisoft.sys.ossinfo.dao.OssInfoRepository;
import org.rcisoft.sys.ossinfo.entity.OssInfo; import org.rcisoft.sys.ossinfo.entity.OssInfo;
import org.rcisoft.sys.ossinfo.service.OssInfoService; import org.rcisoft.sys.ossinfo.service.OssInfoService;
import org.rcisoft.sys.ossinfo.util.CyCommonUtil; import org.rcisoft.sys.ossinfo.util.OssINfoUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -31,7 +31,7 @@ import org.springframework.web.multipart.MultipartFile; ...@@ -31,7 +31,7 @@ import org.springframework.web.multipart.MultipartFile;
@Slf4j @Slf4j
public class OssInfoServiceImpl extends ServiceImpl<OssInfoRepository, OssInfo> implements OssInfoService { public class OssInfoServiceImpl extends ServiceImpl<OssInfoRepository, OssInfo> implements OssInfoService {
@Autowired @Autowired
CyCommonUtil cyCommonUtil; OssINfoUtil ossINfoUtil;
@Value("${global.path.base_discovery}") @Value("${global.path.base_discovery}")
private String baseDiscovery; private String baseDiscovery;
...@@ -129,7 +129,7 @@ public class OssInfoServiceImpl extends ServiceImpl<OssInfoRepository, OssInfo> ...@@ -129,7 +129,7 @@ public class OssInfoServiceImpl extends ServiceImpl<OssInfoRepository, OssInfo>
@Override @Override
public OssInfo filePath(MultipartFile file, String temp) { public OssInfo filePath(MultipartFile file, String temp) {
OssInfo cyFileEntity = cyCommonUtil.filePath(file, temp); OssInfo cyFileEntity = ossINfoUtil.filePath(file, temp);
baseMapper.insert(cyFileEntity); baseMapper.insert(cyFileEntity);
cyFileEntity.setUrl(baseDiscovery + cyFileEntity.getUrl()); cyFileEntity.setUrl(baseDiscovery + cyFileEntity.getUrl());
return cyFileEntity; return cyFileEntity;
......
...@@ -15,7 +15,7 @@ import java.util.UUID; ...@@ -15,7 +15,7 @@ import java.util.UUID;
@Slf4j @Slf4j
@Component @Component
public class CyCommonUtil { public class OssINfoUtil {
protected static final String SEPARATOR; protected static final String SEPARATOR;
/*date 格式*/ /*date 格式*/
......
package org.rcisoft.sys.visit.service.impl; package org.rcisoft.sys.visit.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
...@@ -390,7 +391,7 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos ...@@ -390,7 +391,7 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
if (addINfoList.size() > 0) { if (addINfoList.size() > 0) {
for (ExportVisitInfoDto visitInfoDto : addINfoList) { for (ExportVisitInfoDto visitInfoDto : addINfoList) {
VisitInfoMation visitInfoMation = new VisitInfoMation(); VisitInfoMation visitInfoMation = new VisitInfoMation();
BeanUtil.copyProperties(visitInfoDto,visitInfoMation);
} }
} }
if (null != maps && maps.size() > 0) { if (null != maps && maps.size() > 0) {
......
...@@ -355,13 +355,13 @@ cy: ...@@ -355,13 +355,13 @@ cy:
config: /working/resource/acp.properties config: /working/resource/acp.properties
global: global:
path: path:
base_upload_location: ${global.path.base_upload_location} base_upload_location: ${global.base_upload_location}
base_discovery: ${global.path.base_discovery} base_discovery: ${global.base_discovery}
code_generate_location: ${global.path.code_generate_location} code_generate_location: ${global.code_generate_location}
video_location: ${global.path.video_location} video_location: ${global.video_location}
temp_location: ${global.path.temp_location} temp_location: ${global.temp_location}
file_location: ${global.path.file_location} file_location: ${global.file_location}
images_location: ${global.path.images_location} images_location: ${global.images_location}
code: code:
admin: ROLE_1001 admin: ROLE_1001
decryptKey: cyKey decryptKey: cyKey
......
...@@ -78,11 +78,10 @@ logging: ...@@ -78,11 +78,10 @@ logging:
# com.alibaba.nacos: debug # com.alibaba.nacos: debug
global: global:
path: base_upload_location: /working/file/
base_upload_location: /working/file/ base_discovery: 'http://124.71.16.228:18088/file/'
base_discovery: 'http://124.71.16.228:18088/file/' code_generate_location: /code
code_generate_location: /code video_location: /video
video_location: /video temp_location: /temp
temp_location: /temp file_location: /file
file_location: /file images_location: /images
images_location: /images
...@@ -77,11 +77,10 @@ logging: ...@@ -77,11 +77,10 @@ logging:
# com.alibaba.nacos: debug # com.alibaba.nacos: debug
global: global:
path: base_upload_location: /working/file/
base_upload_location: /working/file/ base_discovery: 'http://192.168.18.190/:8089/file/'
base_discovery: 'http://192.168.18.190/:8089/file/' code_generate_location: /code
code_generate_location: /code video_location: /video
video_location: /video temp_location: /temp
temp_location: /temp file_location: /file
file_location: /file images_location: /images
images_location: /images
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