zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增克隆相关功能接口

Browse Source
This commit is contained in:
keran 2019-05-27 22:32:19 +08:00
parent 6bd8aebd21
commit 8e92e5a907
2 changed files with 114 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java
View File

@ -25,7 +25,6 @@ import com.alibaba.nacos.config.server.service.PersistService;
import com.alibaba.nacos.config.server.service.trace.ConfigTraceService;
import com.alibaba.nacos.config.server.utils.*;
import com.alibaba.nacos.config.server.utils.event.EventDispatcher;
import com.fasterxml.jackson.core.type.TypeReference;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.slf4j.Logger;
@ -397,19 +396,8 @@ public class ConfigController {
@RequestParam(value = "tenant", required = false,
defaultValue = StringUtils.EMPTY) String tenant,
@RequestParam(value = "ids", required = false)List<Long> ids) {
try {
StringBuilder idsSb = new StringBuilder();
if(ids != null && !ids.isEmpty()){
for(int i = 0; i < ids.size(); i++){
Long id = ids.get(i);
idsSb.append(id);
if((i + 1) < ids.size()){
idsSb.append(",");
}
}
}
List<ConfigInfo> dataList = persistService.findAllConfigInfo4eExport(group, tenant, appName, idsSb.toString());
String idsStr = idList2String(ids);
List<ConfigInfo> dataList = persistService.findAllConfigInfo4eExport(group, tenant, appName, idsStr);
List<ZipUtils.ZipItem> zipItemList = new ArrayList<>();
StringBuilder metaData = null;
for(ConfigInfo ci : dataList){
@ -438,11 +426,6 @@ public class ConfigController {
String fileName="nacos_config_export_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss") + ".zip";
headers.add("Content-Disposition", "attachment;filename="+fileName);
return new ResponseEntity<byte[]>(ZipUtils.zip(zipItemList), headers, HttpStatus.OK);
} catch (Exception e) {
String errorMsg = "serialize configInfo data error, group=" + group;
log.error(errorMsg, e);
throw new RuntimeException(errorMsg, e);
}
}
@RequestMapping(params = "import=true", method = RequestMethod.POST)
@ -544,4 +527,86 @@ public class ConfigController {
rr.setMessage("import ok");
return rr;
}
@RequestMapping(params = "clone=true", method = RequestMethod.GET)
@ResponseBody
public RestResult<Map<String, Object>> cloneConfig(HttpServletRequest request,
HttpServletResponse response,
@RequestParam(value = "src_user", required = false) String srcUser,
@RequestParam(value = "tenant", required = true) String namespace,
@RequestParam(value = "ids", required = true) List<Long> ids,
@RequestParam(value = "policy", defaultValue = "ABORT")
SameConfigPolicy policy) throws NacosException {
RestResult<Map<String, Object>> rr = new RestResult<>();
Map<String, Object> failedData = new HashMap<>(4);
rr.setData(failedData);
if(persistService.tenantInfoCountByTenantId(namespace) <= 0){
rr.setCode(5001);
failedData.put("succCount", 0);
rr.setMessage("namespace does not exist");
return rr;
}
String idsStr = idList2String(ids);
List<ConfigInfo> queryedDataList = persistService.findAllConfigInfo4eExport(null, null, null, idsStr);
if(queryedDataList == null || queryedDataList.isEmpty()){
rr.setCode(5005);
failedData.put("succCount", 0);
rr.setMessage("data is empty");
return rr;
}
List<ConfigInfo> configInfoList4Clone = new ArrayList<>(queryedDataList.size());
for(ConfigInfo ci : queryedDataList){
ConfigInfo ci4save = new ConfigInfo();
ci4save.setTenant(namespace);
ci4save.setGroup(ci.getGroup());
ci4save.setDataId(ci.getDataId());
ci4save.setContent(ci.getContent());
if(StringUtils.isNotBlank(ci.getAppName())){
ci4save.setAppName(ci.getAppName());
}
configInfoList4Clone.add(ci4save);
}
if (configInfoList4Clone.isEmpty()) {
rr.setCode(5005);
failedData.put("succCount", 0);
rr.setMessage("data is empty");
return rr;
}
final String srcIp = RequestUtil.getRemoteIp(request);
String requestIpApp = RequestUtil.getAppName(request);
final Timestamp time = TimeUtils.getCurrentTime();
Map<String, Object> saveResult = persistService.batchInsertOrUpdate(configInfoList4Clone, srcUser, srcIp,
null, time, false, policy);
for (ConfigInfo configInfo : configInfoList4Clone) {
EventDispatcher.fireEvent(new ConfigDataChangeEvent(false, configInfo.getDataId(), configInfo.getGroup(),
configInfo.getTenant(), time.getTime()));
ConfigTraceService.logPersistenceEvent(configInfo.getDataId(), configInfo.getGroup(),
configInfo.getTenant(), requestIpApp, time.getTime(),
LOCAL_IP, ConfigTraceService.PERSISTENCE_EVENT_PUB, configInfo.getContent());
}
rr.setCode(200);
rr.setData(saveResult);
rr.setMessage("import ok");
return rr;
}
private String idList2String(List<Long> ids){
StringBuilder idsSb = new StringBuilder();
if(ids != null && !ids.isEmpty()){
for(int i = 0; i < ids.size(); i++){
Long id = ids.get(i);
idsSb.append(id);
if((i + 1) < ids.size()){
idsSb.append(",");
}
}
}
return idsSb.toString();
}
}

6
console/src/main/resources/application.properties
View File

@ -1,3 +1,9 @@
# mysql
spring.datasource.platform=mysql
db.num=1
db.url.0=jdbc:mysql://127.0.0.1:3306/nacos_config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true
db.user=root
db.password=123456
# spring
server.contextPath=/nacos