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

Merge branch 'master' into add-diffblue-tests-2

Browse Source
This commit is contained in:
Fury Zhu 2019-09-19 17:10:48 +08:00 committed by GitHub
commit 5bc80b948d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
126 changed files with 2685 additions and 1723 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -40,9 +40,9 @@ It is super easy to get started with your first project.
You can download the package from the [latest stable release](https://github.com/alibaba/nacos/releases).
Take release nacos-server-0.9.0.zip for example.
Take release nacos-server-1.0.0.zip for example.
```
unzip nacos-server-0.9.0.zip
unzip nacos-server-1.0.0.zip
cd nacos/bin
```

2
address/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>nacos-all</artifactId>
<groupId>com.alibaba.nacos</groupId>
<version>1.1.0</version>
<version>1.1.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
api/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>1.1.0</version>
<version>1.1.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
api/src/main/java/com/alibaba/nacos/api/annotation/NacosProperties.java
View File

@ -154,7 +154,7 @@ public @interface NacosProperties {
/**
* The placeholder of {@link NacosProperties#ENABLE_REMOTE_SYNC_CONFIG enableRemoteSyncConfig}, the value is <code>"${nacos.enableRemoteSyncConfig:}"</code>
*/
String ENABLE_REMOTE_SYNC_CONFIG_PLACEHOLDER = "${" + PREFIX + ENABLE_REMOTE_SYNC_CONFIG + "}";
String ENABLE_REMOTE_SYNC_CONFIG_PLACEHOLDER = "${" + PREFIX + ENABLE_REMOTE_SYNC_CONFIG + ":}";
/**
* The property of "endpoint"

2
client/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>1.1.0</version>
<version>1.1.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

8
client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
View File

@ -19,7 +19,6 @@ import com.alibaba.nacos.api.PropertyKeyConst;
import com.alibaba.nacos.api.common.Constants;
import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.PreservedMetadataKeys;
import com.alibaba.nacos.api.naming.listener.EventListener;
import com.alibaba.nacos.api.naming.pojo.Instance;
import com.alibaba.nacos.api.naming.pojo.ListView;
@ -35,11 +34,14 @@ import com.alibaba.nacos.client.naming.net.NamingProxy;
import com.alibaba.nacos.client.naming.utils.CollectionUtils;
import com.alibaba.nacos.client.naming.utils.InitUtils;
import com.alibaba.nacos.client.naming.utils.UtilAndComs;
import com.alibaba.nacos.client.utils.*;
import com.alibaba.nacos.client.utils.StringUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.math.NumberUtils;
import java.util.*;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
/**

2
client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatReactor.java
View File

@ -57,7 +57,7 @@ public class BeatReactor {
public void addBeatInfo(String serviceName, BeatInfo beatInfo) {
NAMING_LOGGER.info("[BEAT] adding beat: {} to beat map.", beatInfo);
dom2Beat.put(buildKey(serviceName, beatInfo.getIp(), beatInfo.getPort()), beatInfo);
executorService.schedule(new BeatTask(beatInfo), 0, TimeUnit.MILLISECONDS);
executorService.schedule(new BeatTask(beatInfo), beatInfo.getPeriod(), TimeUnit.MILLISECONDS);
MetricsMonitor.getDom2BeatSizeMonitor().set(dom2Beat.size());
}

22
client/src/main/java/com/alibaba/nacos/client/naming/core/HostReactor.java
View File

@ -105,7 +105,10 @@ public class HostReactor {
return oldService;
}
boolean changed = false;
if (oldService != null) {
if (oldService.getLastRefTime() > serviceInfo.getLastRefTime()) {
NAMING_LOGGER.warn("out of date data received, old-t: " + oldService.getLastRefTime()
+ ", new-t: " + serviceInfo.getLastRefTime());
@ -157,18 +160,21 @@ public class HostReactor {
}
if (newHosts.size() > 0) {
changed = true;
NAMING_LOGGER.info("new ips(" + newHosts.size() + ") service: "
+ serviceInfo.getName() + " -> " + JSON.toJSONString(newHosts));
+ serviceInfo.getKey() + " -> " + JSON.toJSONString(newHosts));
}
if (remvHosts.size() > 0) {
changed = true;
NAMING_LOGGER.info("removed ips(" + remvHosts.size() + ") service: "
+ serviceInfo.getName() + " -> " + JSON.toJSONString(remvHosts));
+ serviceInfo.getKey() + " -> " + JSON.toJSONString(remvHosts));
}
if (modHosts.size() > 0) {
changed = true;
NAMING_LOGGER.info("modified ips(" + modHosts.size() + ") service: "
+ serviceInfo.getName() + " -> " + JSON.toJSONString(modHosts));
+ serviceInfo.getKey() + " -> " + JSON.toJSONString(modHosts));
}
serviceInfo.setJsonFromServer(json);
@ -179,7 +185,8 @@ public class HostReactor {
}
} else {
NAMING_LOGGER.info("new ips(" + serviceInfo.ipCount() + ") service: " + serviceInfo.getName() + " -> " + JSON
changed = true;
NAMING_LOGGER.info("init new ips(" + serviceInfo.ipCount() + ") service: " + serviceInfo.getKey() + " -> " + JSON
.toJSONString(serviceInfo.getHosts()));
serviceInfoMap.put(serviceInfo.getKey(), serviceInfo);
eventDispatcher.serviceChanged(serviceInfo);
@ -189,8 +196,10 @@ public class HostReactor {
MetricsMonitor.getServiceInfoMapSizeMonitor().set(serviceInfoMap.size());
NAMING_LOGGER.info("current ips:(" + serviceInfo.ipCount() + ") service: " + serviceInfo.getName() +
" -> " + JSON.toJSONString(serviceInfo.getHosts()));
if (changed) {
NAMING_LOGGER.info("current ips:(" + serviceInfo.ipCount() + ") service: " + serviceInfo.getKey() +
" -> " + JSON.toJSONString(serviceInfo.getHosts()));
}
return serviceInfo;
}
@ -268,6 +277,7 @@ public class HostReactor {
try {
String result = serverProxy.queryList(serviceName, clusters, pushReceiver.getUDPPort(), false);
if (StringUtils.isNotEmpty(result)) {
processServiceJSON(result);
}

4
client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
View File

@ -32,6 +32,7 @@ import com.alibaba.nacos.client.config.impl.SpasAdapter;
import com.alibaba.nacos.client.monitor.MetricsMonitor;
import com.alibaba.nacos.client.naming.beat.BeatInfo;
import com.alibaba.nacos.client.naming.utils.*;
import com.alibaba.nacos.client.utils.AppNameUtils;
import com.alibaba.nacos.client.utils.StringUtils;
import com.alibaba.nacos.client.utils.TemplateUtils;
import com.alibaba.nacos.common.util.HttpMethod;
@ -481,18 +482,17 @@ public class NamingProxy {
private void checkSignature(Map<String, String> params) {
String ak = getAccessKey();
String sk = getSecretKey();
params.put("app", AppNameUtils.getAppName());
if (StringUtils.isEmpty(ak) && StringUtils.isEmpty(sk)) {
return;
}
try {
String app = System.getProperty("project.name");
String signData = getSignData(params.get("serviceName"));
String signature = SignUtil.sign(signData, sk);
params.put("signature", signature);
params.put("data", signData);
params.put("ak", ak);
params.put("app", app);
} catch (Exception e) {
e.printStackTrace();
}

4
client/src/main/java/com/alibaba/nacos/client/naming/utils/UtilAndComs.java
View File

@ -15,12 +15,14 @@
*/
package com.alibaba.nacos.client.naming.utils;
import com.alibaba.nacos.common.util.VersionUtils;
/**
* @author xuanyin.zy
*/
public class UtilAndComs {
public static final String VERSION = "Nacos-Java-Client:v1.1.1";
public static final String VERSION = "Nacos-Java-Client:v" + VersionUtils.VERSION;
public static String WEB_CONTEXT = "/nacos";

20
client/src/test/java/com/alibaba/nacos/client/AppTest.java
View File

@ -22,32 +22,28 @@ import junit.framework.TestSuite;
/**
* Unit test for simple App.
*/
public class AppTest
extends TestCase
{
public class AppTest
extends TestCase {
/**
* Create the test case
*
* @param testName name of the test case
*/
public AppTest( String testName )
{
super( testName );
public AppTest(String testName) {
super(testName);
}
/**
* @return the suite of tests being tested
*/
public static Test suite()
{
return new TestSuite( AppTest.class );
public static Test suite() {
return new TestSuite(AppTest.class);
}
/**
* Rigourous Test :-)
*/
public void testApp()
{
assertTrue( true );
public void testApp() {
assertTrue(true);
}
}

2
cmdb/pom.xml
View File

@ -18,7 +18,7 @@
<parent>
<artifactId>nacos-all</artifactId>
<groupId>com.alibaba.nacos</groupId>
<version>1.1.0</version>
<version>1.1.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

1
cmdb/src/main/java/com/alibaba/nacos/cmdb/controllers/OperationController.java
View File

@ -15,7 +15,6 @@
*/
package com.alibaba.nacos.cmdb.controllers;
import com.alibaba.nacos.cmdb.core.SwitchAndOptions;
import com.alibaba.nacos.cmdb.memory.CmdbProvider;
import com.alibaba.nacos.cmdb.utils.UtilsAndCommons;
import com.alibaba.nacos.core.utils.WebUtils;

11
common/pom.xml
View File

@ -18,7 +18,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>1.1.0</version>
<version>1.1.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -68,5 +68,14 @@
</configuration>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>nacos-version.txt</include>
</includes>
</resource>
</resources>
</build>
</project>

10
common/src/main/java/com/alibaba/nacos/common/util/VersionUtils.java
View File

@ -25,13 +25,15 @@ import java.util.Properties;
public class VersionUtils {
public static String VERSION;
/**获取当前version*/
/**
* 获取当前version
*/
public static final String VERSION_DEFAULT = "${project.version}";
static{
static {
InputStream in = null;
try{
try {
in = VersionUtils.class.getClassLoader()
.getResourceAsStream("nacos-version.txt");
Properties props = new Properties();
@ -40,7 +42,7 @@ public class VersionUtils {
if (val != null && !VERSION_DEFAULT.equals(val)) {
VERSION = val;
}
} catch(Exception e) {
} catch (Exception e) {
e.printStackTrace();
} finally {
try {

0
console/src/main/resources/nacos-version.txt → common/src/main/resources/nacos-version.txt
View File

20
common/src/test/java/com/alibaba/nacos/common/AppTest.java
View File

@ -22,32 +22,28 @@ import junit.framework.TestSuite;
/**
* Unit test for simple App.
*/
public class AppTest
extends TestCase
{
public class AppTest
extends TestCase {
/**
* Create the test case
*
* @param testName name of the test case
*/
public AppTest( String testName )
{
super( testName );
public AppTest(String testName) {
super(testName);
}
/**
* @return the suite of tests being tested
*/
public static Test suite()
{
return new TestSuite( AppTest.class );
public static Test suite() {
return new TestSuite(AppTest.class);
}
/**
* Rigourous Test :-)
*/
public void testApp()
{
assertTrue( true );
public void testApp() {
assertTrue(true);
}
}

2
config/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>1.1.0</version>
<version>1.1.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

6
config/src/main/java/com/alibaba/nacos/config/server/aspect/RequestLogAspect.java
View File

@ -15,8 +15,8 @@
*/
package com.alibaba.nacos.config.server.aspect;
import com.alibaba.nacos.config.server.service.ConfigService;
import com.alibaba.nacos.config.server.monitor.MetricsMonitor;
import com.alibaba.nacos.config.server.service.ConfigService;
import com.alibaba.nacos.config.server.utils.GroupKey2;
import com.alibaba.nacos.config.server.utils.LogUtil;
import com.alibaba.nacos.config.server.utils.MD5;
@ -61,7 +61,7 @@ public class RequestLogAspect {
/**
* publishSingle
* */
*/
@Around(CLIENT_INTERFACE_PUBLISH_SINGLE_CONFIG)
public Object interfacePublishSingle(ProceedingJoinPoint pjp, HttpServletRequest request,
HttpServletResponse response, String dataId, String group, String tenant,
@ -73,7 +73,7 @@ public class RequestLogAspect {
/**
* removeAll
* */
*/
@Around(CLIENT_INTERFACE_REMOVE_ALL_CONFIG)
public Object interfaceRemoveAll(ProceedingJoinPoint pjp, HttpServletRequest request, HttpServletResponse response,
String dataId, String group, String tenant) throws Throwable {

4
config/src/main/java/com/alibaba/nacos/config/server/controller/CapacityController.java
View File

@ -45,7 +45,9 @@ public class CapacityController {
private final CapacityService capacityService;
@Autowired
public CapacityController(CapacityService capacityService) {this.capacityService = capacityService;}
public CapacityController(CapacityService capacityService) {
this.capacityService = capacityService;
}
@ResponseBody
@RequestMapping(method = RequestMethod.GET)

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

@ -36,6 +36,7 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
@ -227,6 +228,32 @@ public class ConfigController {
return true;
}
/**
* @author klw
* @Description: delete configuration based on multiple config ids
* @Date 2019/7/5 10:26
* @Param [request, response, dataId, group, tenant, tag]
* @return java.lang.Boolean
*/
@RequestMapping(params = "delType=ids", method = RequestMethod.DELETE)
@ResponseBody
public RestResult<Boolean> deleteConfigs(HttpServletRequest request, HttpServletResponse response,
@RequestParam(value = "ids")List<Long> ids) {
String clientIp = RequestUtil.getRemoteIp(request);
final Timestamp time = TimeUtils.getCurrentTime();
List<ConfigInfo> configInfoList = persistService.removeConfigInfoByIds(ids, clientIp, null);
if(!CollectionUtils.isEmpty(configInfoList)){
for(ConfigInfo configInfo : configInfoList) {
ConfigTraceService.logPersistenceEvent(configInfo.getDataId(), configInfo.getGroup(),
configInfo.getTenant(), null, time.getTime(), clientIp,
ConfigTraceService.PERSISTENCE_EVENT_REMOVE, null);
EventDispatcher.fireEvent(new ConfigDataChangeEvent(false, configInfo.getDataId(),
configInfo.getGroup(), configInfo.getTenant(), time.getTime()));
}
}
return ResultBuilder.buildSuccessResult(true);
}
@RequestMapping(value = "/catalog", method = RequestMethod.GET)
@ResponseBody
public RestResult<ConfigAdvanceInfo> getConfigAdvanceInfo(HttpServletRequest request, HttpServletResponse response,

4
config/src/main/java/com/alibaba/nacos/config/server/controller/HealthController.java
View File

@ -45,7 +45,9 @@ public class HealthController {
private String heathWarnStr = "WARN";
@Autowired
public HealthController(DynamicDataSource dynamicDataSource) {this.dynamicDataSource = dynamicDataSource;}
public HealthController(DynamicDataSource dynamicDataSource) {
this.dynamicDataSource = dynamicDataSource;
}
@PostConstruct
public void init() {

4
config/src/main/java/com/alibaba/nacos/config/server/controller/ListenerController.java
View File

@ -46,7 +46,9 @@ public class ListenerController {
private final ConfigSubService configSubService;
@Autowired
public ListenerController(ConfigSubService configSubService) {this.configSubService = configSubService;}
public ListenerController(ConfigSubService configSubService) {
this.configSubService = configSubService;
}
/**
* 获取客户端订阅配置信息

11
config/src/main/java/com/alibaba/nacos/config/server/controller/OpsController.java
View File

@ -22,6 +22,8 @@ import com.alibaba.nacos.config.server.constant.Constants;
import com.alibaba.nacos.config.server.service.PersistService;
import com.alibaba.nacos.config.server.service.dump.DumpService;
import com.alibaba.nacos.config.server.utils.LogUtil;
import com.alibaba.nacos.core.utils.WebUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -63,4 +65,13 @@ public class OpsController {
return HttpServletResponse.SC_OK + "";
}
@RequestMapping(value = "/log", method = RequestMethod.PUT)
@ResponseBody
public String setLogLevel(HttpServletRequest request) {
String logName = WebUtils.required(request, "logName");
String logLevel = WebUtils.required(request, "logLevel");
LogUtil.setLogLevel(logName, logLevel);
return HttpServletResponse.SC_OK + "";
}
}

9
config/src/main/java/com/alibaba/nacos/config/server/enums/FileTypeEnum.java
View File

@ -75,9 +75,7 @@ public enum FileTypeEnum {
* @author klw
* @Description: properties file
*/
PROPERTIES("properties")
;
PROPERTIES("properties");
/**
* @author klw
@ -85,14 +83,13 @@ public enum FileTypeEnum {
*/
private String fileType;
FileTypeEnum(String fileType){
FileTypeEnum(String fileType) {
this.fileType = fileType;
}
public String getFileType(){
public String getFileType() {
return this.fileType;
}
}

3
config/src/main/java/com/alibaba/nacos/config/server/model/SubscriberStatus.java
View File

@ -27,7 +27,8 @@ public class SubscriberStatus {
Boolean status;
String serverIp;
public SubscriberStatus() {}
public SubscriberStatus() {
}
public SubscriberStatus(String groupKey, Boolean status, String md5, Long lastTime) {
this.groupKey = groupKey;

6
config/src/main/java/com/alibaba/nacos/config/server/monitor/MemoryMonitor.java
View File

@ -50,7 +50,7 @@ public class MemoryMonitor {
}
static final long DELAY_SECONDS = 10;
private static final long DELAY_SECONDS = 10;
@Scheduled(cron = "0 0 0 * * ?")
public void clear() {
@ -89,9 +89,7 @@ class NotifyTaskQueueMonitorTask implements Runnable {
@Override
public void run() {
int size = ((ScheduledThreadPoolExecutor)notifySingleService.getExecutor()).getQueue().size();
memoryLog.info("notifySingleServiceThreadPool-{}, toNotifyTaskSize={}",
new Object[] {((ScheduledThreadPoolExecutor)notifySingleService.getExecutor()).getClass().getName(),
size});
memoryLog.info("toNotifyTaskSize={}", size);
MetricsMonitor.getNotifyTaskMonitor().set(size);
}
}

11
config/src/main/java/com/alibaba/nacos/config/server/result/code/ResultCodeEnum.java
View File

@ -25,11 +25,15 @@ import com.alibaba.nacos.config.server.result.core.IResultCode;
*/
public enum ResultCodeEnum implements IResultCode {
/** common code **/
/**
* common code
**/
SUCCESS(200, "处理成功"),
ERROR(500, "服务器内部错误"),
/** config use 100001 ~ 100999 **/
/**
* config use 100001 ~ 100999
**/
NAMESPACE_NOT_EXIST(100001, "目标 namespace 不存在"),
METADATA_ILLEGAL(100002, "导入的元数据非法"),
@ -41,14 +45,13 @@ public enum ResultCodeEnum implements IResultCode {
DATA_EMPTY(100005, "导入的文件数据为空"),
;
private int code;
private String msg;
ResultCodeEnum(int code, String codeMsg){
ResultCodeEnum(int code, String codeMsg) {
this.code = code;
this.msg = codeMsg;
}

22
config/src/main/java/com/alibaba/nacos/config/server/service/BasicDataSourceServiceImpl.java
View File

@ -163,27 +163,27 @@ public class BasicDataSourceServiceImpl implements DataSourceService {
}
ds.setUrl(val.trim());
val = env.getProperty("db.user");
val = env.getProperty("db.user." + i, env.getProperty("db.user"));
if (null == val) {
fatalLog.error("db.user is null");
fatalLog.error("db.user." + i + " is null");
throw new IllegalArgumentException();
}
ds.setUsername(val.trim());
val = env.getProperty("db.password");
val = env.getProperty("db.password." + i, env.getProperty("db.password"));
if (null == val) {
fatalLog.error("db.password is null");
fatalLog.error("db.password." + i + " is null");
throw new IllegalArgumentException();
}
ds.setPassword(val.trim());
val = env.getProperty("db.initialSize");
val = env.getProperty("db.initialSize." + i, env.getProperty("db.initialSize"));
ds.setInitialSize(Integer.parseInt(defaultIfNull(val, "10")));
val = env.getProperty("db.maxActive");
val = env.getProperty("db.maxActive." + i, env.getProperty("db.maxActive"));
ds.setMaxActive(Integer.parseInt(defaultIfNull(val, "20")));
val = env.getProperty("db.maxIdle");
val = env.getProperty("db.maxIdle." + i, env.getProperty("db.maxIdle"));
ds.setMaxIdle(Integer.parseInt(defaultIfNull(val, "50")));
ds.setMaxWait(3000L);
@ -302,7 +302,9 @@ public class BasicDataSourceServiceImpl implements DataSourceService {
@Override
public void run() {
defaultLog.info("check master db.");
if (defaultLog.isDebugEnabled()) {
defaultLog.debug("check master db.");
}
boolean isFound = false;
int index = -1;
@ -339,7 +341,9 @@ public class BasicDataSourceServiceImpl implements DataSourceService {
@Override
public void run() {
defaultLog.info("check db health.");
if (defaultLog.isDebugEnabled()) {
defaultLog.debug("check db health.");
}
String sql = "SELECT * FROM config_info_beta WHERE id = 1";
for (int i = 0; i < testJTList.size(); i++) {

295
config/src/main/java/com/alibaba/nacos/config/server/service/PersistService.java
View File

@ -23,6 +23,7 @@ import com.alibaba.nacos.config.server.utils.MD5;
import com.alibaba.nacos.config.server.utils.PaginationHelper;
import com.alibaba.nacos.config.server.utils.ParamUtils;
import com.alibaba.nacos.config.server.utils.event.EventDispatcher;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -75,6 +76,10 @@ public class PersistService {
private static final String SQL_TENANT_INFO_COUNT_BY_TENANT_ID = "select count(1) from tenant_info where tenant_id = ?";
private static final String SQL_FIND_CONFIG_INFO_BY_IDS = "SELECT ID,data_id,group_id,tenant_id,app_name,content,md5 FROM config_info WHERE ";
private static final String SQL_DELETE_CONFIG_INFO_BY_IDS = "DELETE FROM config_info WHERE ";
/**
* @author klw
* @Description: constant variables
@ -500,7 +505,7 @@ public class PersistService {
public Boolean doInTransaction(TransactionStatus status) {
try {
long configId = addConfigInfoAtomic(srcIp, srcUser, configInfo, time, configAdvanceInfo);
String configTags = configAdvanceInfo == null ? null : (String)configAdvanceInfo.get("config_tags");
String configTags = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("config_tags");
addConfiTagsRelationAtomic(configId, configTags, configInfo.getDataId(), configInfo.getGroup(),
configInfo.getTenant());
insertConfigHistoryAtomic(0, configInfo, srcIp, srcUser, time, "I");
@ -587,7 +592,7 @@ public class PersistService {
configInfo.setAppName(appNameTmp);
}
updateConfigInfoAtomic(configInfo, srcIp, srcUser, time, configAdvanceInfo);
String configTags = configAdvanceInfo == null ? null : (String)configAdvanceInfo.get("config_tags");
String configTags = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("config_tags");
if (configTags != null) {
// 删除所有tag，然后再重新创建
removeTagByIdAtomic(oldConfigInfo.getId());
@ -746,6 +751,42 @@ public class PersistService {
});
}
/**
* @author klw
* @Description: delete config info by ids
* @Date 2019/7/5 16:45
* @Param [ids, srcIp, srcUser]
* @return List<ConfigInfo> deleted configInfos
*/
public List<ConfigInfo> removeConfigInfoByIds(final List<Long> ids, final String srcIp, final String srcUser) {
if(CollectionUtils.isEmpty(ids)){
return null;
}
ids.removeAll(Collections.singleton(null));
return tjt.execute(new TransactionCallback<List<ConfigInfo>>() {
final Timestamp time = new Timestamp(System.currentTimeMillis());
@Override
public List<ConfigInfo> doInTransaction(TransactionStatus status) {
try {
String idsStr = Joiner.on(",").join(ids);
List<ConfigInfo> configInfoList = findConfigInfosByIds(idsStr);
if (!CollectionUtils.isEmpty(configInfoList)) {
removeConfigInfoByIdsAtomic(idsStr);
for(ConfigInfo configInfo : configInfoList){
removeTagByIdAtomic(configInfo.getId());
insertConfigHistoryAtomic(configInfo.getId(), configInfo, srcIp, srcUser, time, "D");
}
}
return configInfoList;
} catch (CannotGetJdbcConnectionException e) {
fatalLog.error("[db-error] " + e.toString(), e);
throw e;
}
}
});
}
/**
* 删除beta配置信息, 物理删除
*/
@ -791,7 +832,7 @@ public class PersistService {
try {
try {
String dbContent = jt.queryForObject(select, new Object[] {dataId, group, tenantTmp, datumId},
String dbContent = jt.queryForObject(select, new Object[]{dataId, group, tenantTmp, datumId},
String.class);
if (dbContent != null && dbContent.equals(content)) {
@ -890,7 +931,7 @@ public class PersistService {
String sql = "delete from his_config_info where gmt_modified < ? limit ?";
PaginationHelper<ConfigInfo> helper = new PaginationHelper<ConfigInfo>();
try {
helper.updateLimit(jt, sql, new Object[] {startTime, limitSize});
helper.updateLimit(jt, sql, new Object[]{startTime, limitSize});
} catch (CannotGetJdbcConnectionException e) {
fatalLog.error("[db-error] " + e.toString(), e);
throw e;
@ -902,7 +943,7 @@ public class PersistService {
*/
public int findConfigHistoryCountByTime(final Timestamp startTime) {
String sql = "SELECT COUNT(*) FROM his_config_info WHERE gmt_modified < ?";
Integer result = jt.queryForObject(sql, Integer.class, new Object[] {startTime});
Integer result = jt.queryForObject(sql, Integer.class, new Object[]{startTime});
if (result == null) {
throw new IllegalArgumentException("configInfoBetaCount error");
}
@ -1010,7 +1051,7 @@ public class PersistService {
String sql = "SELECT DISTINCT data_id, group_id FROM config_info";
try {
return jt.query(sql, new Object[] {}, CONFIG_INFO_ROW_MAPPER);
return jt.query(sql, new Object[]{}, CONFIG_INFO_ROW_MAPPER);
} catch (EmptyResultDataAccessException e) {
return Collections.emptyList();
} catch (CannotGetJdbcConnectionException e) {
@ -1031,7 +1072,7 @@ public class PersistService {
return this.jt.queryForObject(
"SELECT ID,data_id,group_id,tenant_id,app_name,content,beta_ips FROM config_info_beta WHERE data_id=?"
+ " AND group_id=? AND tenant_id=?",
new Object[] {dataId, group, tenantTmp}, CONFIG_INFO4BETA_ROW_MAPPER);
new Object[]{dataId, group, tenantTmp}, CONFIG_INFO4BETA_ROW_MAPPER);
} catch (EmptyResultDataAccessException e) { // 表明数据不存在, 返回null
return null;
} catch (CannotGetJdbcConnectionException e) {
@ -1051,7 +1092,7 @@ public class PersistService {
return this.jt.queryForObject(
"SELECT ID,data_id,group_id,tenant_id,tag_id,app_name,content FROM config_info_tag WHERE data_id=? "
+ "AND group_id=? AND tenant_id=? AND tag_id=?",
new Object[] {dataId, group, tenantTmp, tagTmp}, CONFIG_INFO4TAG_ROW_MAPPER);
new Object[]{dataId, group, tenantTmp, tagTmp}, CONFIG_INFO4TAG_ROW_MAPPER);
} catch (EmptyResultDataAccessException e) { // 表明数据不存在, 返回null
return null;
} catch (CannotGetJdbcConnectionException e) {
@ -1070,7 +1111,7 @@ public class PersistService {
return this.jt.queryForObject(
"SELECT ID,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE data_id=? AND "
+ "group_id=? AND tenant_id=? AND app_name=?",
new Object[] {dataId, group, tenantTmp, appName}, CONFIG_INFO_ROW_MAPPER);
new Object[]{dataId, group, tenantTmp, appName}, CONFIG_INFO_ROW_MAPPER);
} catch (EmptyResultDataAccessException e) { // 表明数据不存在, 返回null
return null;
} catch (CannotGetJdbcConnectionException e) {
@ -1085,8 +1126,8 @@ public class PersistService {
public ConfigInfo findConfigInfoAdvanceInfo(final String dataId, final String group, final String tenant,
final Map<String, Object> configAdvanceInfo) {
String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant;
final String appName = configAdvanceInfo == null ? null : (String)configAdvanceInfo.get("appName");
final String configTags = configAdvanceInfo == null ? null : (String)configAdvanceInfo.get("config_tags");
final String appName = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("appName");
final String configTags = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("config_tags");
List<String> paramList = new ArrayList<String>();
paramList.add(dataId);
paramList.add(group);
@ -1141,7 +1182,7 @@ public class PersistService {
.queryForObject(
"SELECT ID,data_id,group_id,content FROM config_info WHERE data_id=? AND group_id=? AND "
+ "tenant_id=?",
new Object[] {dataId, group, StringUtils.EMPTY},
new Object[]{dataId, group, StringUtils.EMPTY},
CONFIG_INFO_BASE_ROW_MAPPER);
} catch (EmptyResultDataAccessException e) { // 表明数据不存在, 返回null
return null;
@ -1162,7 +1203,7 @@ public class PersistService {
return this.jt
.queryForObject(
"SELECT ID,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE ID=?",
new Object[] {id}, CONFIG_INFO_ROW_MAPPER);
new Object[]{id}, CONFIG_INFO_ROW_MAPPER);
} catch (EmptyResultDataAccessException e) { // 表明数据不存在
return null;
} catch (CannotGetJdbcConnectionException e) {
@ -1187,7 +1228,7 @@ public class PersistService {
return helper.fetchPage(this.jt, "select count(*) from config_info where data_id=? and tenant_id=?",
"select ID,data_id,group_id,tenant_id,app_name,content from config_info where data_id=? and "
+ "tenant_id=?",
new Object[] {dataId, tenantTmp}, pageNo, pageSize, CONFIG_INFO_ROW_MAPPER);
new Object[]{dataId, tenantTmp}, pageNo, pageSize, CONFIG_INFO_ROW_MAPPER);
} catch (CannotGetJdbcConnectionException e) {
fatalLog.error("[db-error] " + e.toString(), e);
throw e;
@ -1211,7 +1252,7 @@ public class PersistService {
"select count(*) from config_info where data_id=? and tenant_id=? and app_name=?",
"select ID,data_id,group_id,tenant_id,app_name,content from config_info where data_id=? and "
+ "tenant_id=? and app_name=?",
new Object[] {dataId, tenantTmp, appName}, pageNo, pageSize, CONFIG_INFO_ROW_MAPPER);
new Object[]{dataId, tenantTmp, appName}, pageNo, pageSize, CONFIG_INFO_ROW_MAPPER);
} catch (CannotGetJdbcConnectionException e) {
fatalLog.error("[db-error] " + e.toString(), e);
throw e;
@ -1223,8 +1264,8 @@ public class PersistService {
final Map<String, Object> configAdvanceInfo) {
String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant;
PaginationHelper<ConfigInfo> helper = new PaginationHelper<ConfigInfo>();
final String appName = configAdvanceInfo == null ? null : (String)configAdvanceInfo.get("appName");
final String configTags = configAdvanceInfo == null ? null : (String)configAdvanceInfo.get("config_tags");
final String appName = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("appName");
final String configTags = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("config_tags");
StringBuilder sqlCount = new StringBuilder("select count(*) from config_info where data_id=? and tenant_id=? ");
StringBuilder sql = new StringBuilder(
"select ID,data_id,group_id,tenant_id,app_name,content from config_info where data_id=? and tenant_id=? ");
@ -1281,8 +1322,8 @@ public class PersistService {
final String tenant, final Map<String, Object> configAdvanceInfo) {
String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant;
PaginationHelper<ConfigInfo> helper = new PaginationHelper<ConfigInfo>();
final String appName = configAdvanceInfo == null ? null : (String)configAdvanceInfo.get("appName");
final String configTags = configAdvanceInfo == null ? null : (String)configAdvanceInfo.get("config_tags");
final String appName = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("appName");
final String configTags = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("config_tags");
String sqlCount = "select count(*) from config_info";
String sql = "select ID,data_id,group_id,tenant_id,app_name,content from config_info";
StringBuilder where = new StringBuilder(" where ");
@ -1360,7 +1401,7 @@ public class PersistService {
this.jt,
"select count(*) from config_info where data_id=? and tenant_id=?",
"select ID,data_id,group_id,content from config_info where data_id=? and tenant_id=?",
new Object[] {dataId, StringUtils.EMPTY}, pageNo, pageSize,
new Object[]{dataId, StringUtils.EMPTY}, pageNo, pageSize,
CONFIG_INFO_BASE_ROW_MAPPER);
} catch (CannotGetJdbcConnectionException e) {
fatalLog.error("[db-error] " + e.toString(), e);
@ -1384,7 +1425,7 @@ public class PersistService {
return helper.fetchPage(this.jt, "select count(*) from config_info where group_id=? and tenant_id=?",
"select ID,data_id,group_id,tenant_id,app_name,content from config_info where group_id=? and "
+ "tenant_id=?",
new Object[] {group, tenantTmp}, pageNo, pageSize, CONFIG_INFO_ROW_MAPPER);
new Object[]{group, tenantTmp}, pageNo, pageSize, CONFIG_INFO_ROW_MAPPER);
} catch (CannotGetJdbcConnectionException e) {
fatalLog.error("[db-error] " + e.toString(), e);
throw e;
@ -1409,7 +1450,7 @@ public class PersistService {
"select count(*) from config_info where group_id=? and tenant_id=? and app_name =?",
"select ID,data_id,group_id,tenant_id,app_name,content from config_info where group_id=? and "
+ "tenant_id=? and app_name =?",
new Object[] {group, tenantTmp, appName}, pageNo, pageSize, CONFIG_INFO_ROW_MAPPER);
new Object[]{group, tenantTmp, appName}, pageNo, pageSize, CONFIG_INFO_ROW_MAPPER);
} catch (CannotGetJdbcConnectionException e) {
fatalLog.error("[db-error] " + e.toString(), e);
throw e;
@ -1422,8 +1463,8 @@ public class PersistService {
String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant;
PaginationHelper<ConfigInfo> helper = new PaginationHelper<ConfigInfo>();
final String appName = configAdvanceInfo == null ? null : (String)configAdvanceInfo.get("appName");
final String configTags = configAdvanceInfo == null ? null : (String)configAdvanceInfo.get("config_tags");
final String appName = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("appName");
final String configTags = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("config_tags");
StringBuilder sqlCount = new StringBuilder(
"select count(*) from config_info where group_id=? and tenant_id=? ");
StringBuilder sql = new StringBuilder(
@ -1491,7 +1532,7 @@ public class PersistService {
return helper.fetchPage(this.jt, "select count(*) from config_info where tenant_id like ? and app_name=?",
"select ID,data_id,group_id,tenant_id,app_name,content from config_info where tenant_id like ? and "
+ "app_name=?",
new Object[] {generateLikeArgument(tenantTmp), appName}, pageNo, pageSize,
new Object[]{generateLikeArgument(tenantTmp), appName}, pageNo, pageSize,
CONFIG_INFO_ROW_MAPPER);
} catch (CannotGetJdbcConnectionException e) {
fatalLog.error("[db-error] " + e.toString(), e);
@ -1504,8 +1545,8 @@ public class PersistService {
final Map<String, Object> configAdvanceInfo) {
String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant;
PaginationHelper<ConfigInfo> helper = new PaginationHelper<ConfigInfo>();
final String appName = configAdvanceInfo == null ? null : (String)configAdvanceInfo.get("appName");
final String configTags = configAdvanceInfo == null ? null : (String)configAdvanceInfo.get("config_tags");
final String appName = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("appName");
final String configTags = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("config_tags");
StringBuilder sqlCount = new StringBuilder("select count(*) from config_info where tenant_id like ? ");
StringBuilder sql = new StringBuilder(
"select ID,data_id,group_id,tenant_id,app_name,content from config_info where tenant_id like ? ");
@ -1574,7 +1615,7 @@ public class PersistService {
this.jt,
"select count(*) from config_info where group_id=? and tenant_id=?",
"select ID,data_id,group_id,content from config_info where group_id=? and tenant_id=?",
new Object[] {group, StringUtils.EMPTY}, pageNo, pageSize,
new Object[]{group, StringUtils.EMPTY}, pageNo, pageSize,
CONFIG_INFO_BASE_ROW_MAPPER);
} catch (CannotGetJdbcConnectionException e) {
fatalLog.error("[db-error] " + e.toString(), e);
@ -1645,7 +1686,7 @@ public class PersistService {
public int aggrConfigInfoCount(String dataId, String group, String tenant) {
String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant;
String sql = " SELECT COUNT(ID) FROM config_info_aggr WHERE data_id = ? AND group_id = ? AND tenant_id = ?";
Integer result = jt.queryForObject(sql, Integer.class, new Object[] {dataId, group, tenantTmp});
Integer result = jt.queryForObject(sql, Integer.class, new Object[]{dataId, group, tenantTmp});
if (result == null) {
throw new IllegalArgumentException("aggrConfigInfoCount error");
}
@ -1712,7 +1753,7 @@ public class PersistService {
PaginationHelper<ConfigInfo> helper = new PaginationHelper<ConfigInfo>();
try {
return helper.fetchPageLimit(jt, sqlCountRows, sqlFetchRows,
new Object[] {generateLikeArgument(tenantTmp), (pageNo - 1) * pageSize, pageSize},
new Object[]{generateLikeArgument(tenantTmp), (pageNo - 1) * pageSize, pageSize},
pageNo, pageSize, CONFIG_INFO_ROW_MAPPER);
} catch (CannotGetJdbcConnectionException e) {
fatalLog.error("[db-error] " + e.toString(), e);
@ -1754,7 +1795,7 @@ public class PersistService {
try {
List<ConfigKey> result = jt.query(select,
new Object[] {generateLikeArgument(tenantTmp), (pageNo - 1) * pageSize, pageSize},
new Object[]{generateLikeArgument(tenantTmp), (pageNo - 1) * pageSize, pageSize},
// new Object[0],
CONFIG_KEY_ROW_MAPPER);
@ -1790,7 +1831,7 @@ public class PersistService {
PaginationHelper<ConfigInfoBase> helper = new PaginationHelper<ConfigInfoBase>();
try {
return helper.fetchPageLimit(jt, sqlCountRows, sqlFetchRows, new Object[] {
return helper.fetchPageLimit(jt, sqlCountRows, sqlFetchRows, new Object[]{
(pageNo - 1) * pageSize, pageSize}, pageNo, pageSize, CONFIG_INFO_BASE_ROW_MAPPER);
} catch (CannotGetJdbcConnectionException e) {
fatalLog.error("[db-error] " + e.toString(), e);
@ -1907,7 +1948,7 @@ public class PersistService {
+ "order by id asc limit ?,?";
PaginationHelper<ConfigInfoWrapper> helper = new PaginationHelper<ConfigInfoWrapper>();
try {
return helper.fetchPageLimit(jt, select, new Object[] {lastMaxId, 0, pageSize}, 1, pageSize,
return helper.fetchPageLimit(jt, select, new Object[]{lastMaxId, 0, pageSize}, 1, pageSize,
CONFIG_INFO_WRAPPER_ROW_MAPPER);
} catch (CannotGetJdbcConnectionException e) {
fatalLog.error("[db-error] " + e.toString(), e);
@ -1926,7 +1967,7 @@ public class PersistService {
+ " WHERE g.id = t.id ";
PaginationHelper<ConfigInfoBetaWrapper> helper = new PaginationHelper<ConfigInfoBetaWrapper>();
try {
return helper.fetchPageLimit(jt, sqlCountRows, sqlFetchRows, new Object[] {
return helper.fetchPageLimit(jt, sqlCountRows, sqlFetchRows, new Object[]{
(pageNo - 1) * pageSize, pageSize}, pageNo, pageSize, CONFIG_INFO_BETA_WRAPPER_ROW_MAPPER);
} catch (CannotGetJdbcConnectionException e) {
@ -1946,7 +1987,7 @@ public class PersistService {
+ " WHERE g.id = t.id ";
PaginationHelper<ConfigInfoTagWrapper> helper = new PaginationHelper<ConfigInfoTagWrapper>();
try {
return helper.fetchPageLimit(jt, sqlCountRows, sqlFetchRows, new Object[] {
return helper.fetchPageLimit(jt, sqlCountRows, sqlFetchRows, new Object[]{
(pageNo - 1) * pageSize, pageSize}, pageNo, pageSize, CONFIG_INFO_TAG_WRAPPER_ROW_MAPPER);
} catch (CannotGetJdbcConnectionException e) {
@ -2073,9 +2114,9 @@ public class PersistService {
final String group, final String tenant,
final Map<String, Object> configAdvanceInfo) {
String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant;
final String appName = configAdvanceInfo == null ? null : (String)configAdvanceInfo.get("appName");
final String content = configAdvanceInfo == null ? null : (String)configAdvanceInfo.get("content");
final String configTags = configAdvanceInfo == null ? null : (String)configAdvanceInfo.get("config_tags");
final String appName = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("appName");
final String content = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("content");
final String configTags = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("config_tags");
PaginationHelper<ConfigInfo> helper = new PaginationHelper<ConfigInfo>();
String sqlCountRows = "select count(*) from config_info";
String sqlFetchRows = "select ID,data_id,group_id,tenant_id,app_name,content from config_info";
@ -2319,7 +2360,7 @@ public class PersistService {
+ "AND group_id=? AND tenant_id=? AND datum_id=?";
try {
return this.jt.queryForObject(sql, new Object[] {dataId, group, tenantTmp, datumId},
return this.jt.queryForObject(sql, new Object[]{dataId, group, tenantTmp, datumId},
CONFIG_INFO_AGGR_ROW_MAPPER);
} catch (EmptyResultDataAccessException e) {
// 是EmptyResultDataAccessException, 表明数据不存在, 返回null
@ -2343,7 +2384,7 @@ public class PersistService {
+ "group_id=? AND tenant_id=? ORDER BY datum_id";
try {
return this.jt.query(sql, new Object[] {dataId, group, tenantTmp},
return this.jt.query(sql, new Object[]{dataId, group, tenantTmp},
CONFIG_INFO_AGGR_ROW_MAPPER);
} catch (CannotGetJdbcConnectionException e) {
fatalLog.error("[db-error] " + e.toString(), e);
@ -2366,8 +2407,8 @@ public class PersistService {
+ "group_id=? and tenant_id=? order by datum_id limit ?,?";
PaginationHelper<ConfigInfoAggr> helper = new PaginationHelper<ConfigInfoAggr>();
try {
return helper.fetchPageLimit(jt, sqlCountRows, new Object[] {dataId, group, tenantTmp}, sqlFetchRows,
new Object[] {dataId, group, tenantTmp, (pageNo - 1) * pageSize, pageSize},
return helper.fetchPageLimit(jt, sqlCountRows, new Object[]{dataId, group, tenantTmp}, sqlFetchRows,
new Object[]{dataId, group, tenantTmp, (pageNo - 1) * pageSize, pageSize},
pageNo, pageSize, CONFIG_INFO_AGGR_ROW_MAPPER);
} catch (CannotGetJdbcConnectionException e) {
@ -2495,7 +2536,7 @@ public class PersistService {
String sql = "SELECT DISTINCT data_id, group_id, tenant_id FROM config_info_aggr";
try {
return this.jt.query(sql, new Object[] {},
return this.jt.query(sql, new Object[]{},
CONFIG_INFO_CHANGED_ROW_MAPPER);
} catch (CannotGetJdbcConnectionException e) {
fatalLog.error("[db-error] " + e.toString(), e);
@ -2521,7 +2562,7 @@ public class PersistService {
String sql = "SELECT datum_id FROM config_info_aggr WHERE data_id = ? AND group_id = ? AND content = ? ";
try {
return this.jt.queryForList(sql, new Object[] {dataId, groupId,
return this.jt.queryForList(sql, new Object[]{dataId, groupId,
content}, String.class);
} catch (EmptyResultDataAccessException e) {
return null;
@ -2540,7 +2581,7 @@ public class PersistService {
.queryForList(
"SELECT data_id, group_id, tenant_id, app_name, content, gmt_modified FROM config_info WHERE "
+ "gmt_modified >=? AND gmt_modified <= ?",
new Object[] {startTime, endTime});
new Object[]{startTime, endTime});
return convertChangeConfig(list);
} catch (DataAccessException e) {
fatalLog.error("[db-error] " + e.toString(), e);
@ -2615,7 +2656,7 @@ public class PersistService {
.queryForList(
"SELECT DISTINCT data_id, group_id, tenant_id FROM his_config_info WHERE op_type = 'D' AND "
+ "gmt_modified >=? AND gmt_modified <= ?",
new Object[] {startTime, endTime});
new Object[]{startTime, endTime});
return convertDeletedConfig(list);
} catch (DataAccessException e) {
fatalLog.error("[db-error] " + e.toString(), e);
@ -2641,11 +2682,11 @@ public class PersistService {
final String tenantTmp = StringUtils.isBlank(configInfo.getTenant()) ? StringUtils.EMPTY
: configInfo.getTenant();
final String desc = configAdvanceInfo == null ? null : (String)configAdvanceInfo.get("desc");
final String use = configAdvanceInfo == null ? null : (String)configAdvanceInfo.get("use");
final String effect = configAdvanceInfo == null ? null : (String)configAdvanceInfo.get("effect");
final String type = configAdvanceInfo == null ? null : (String)configAdvanceInfo.get("type");
final String schema = configAdvanceInfo == null ? null : (String)configAdvanceInfo.get("schema");
final String desc = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("desc");
final String use = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("use");
final String effect = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("effect");
final String type = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("type");
final String schema = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("schema");
final String md5Tmp = MD5.getInstance().getMD5String(configInfo.getContent());
@ -2740,7 +2781,7 @@ public class PersistService {
public List<String> getConfigTagsByTenant(String tenant) {
String sql = "SELECT tag_name FROM config_tags_relation WHERE tenant_id = ? ";
try {
return jt.queryForList(sql, new Object[] {tenant}, String.class);
return jt.queryForList(sql, new Object[]{tenant}, String.class);
} catch (EmptyResultDataAccessException e) {
return null;
} catch (IncorrectResultSizeDataAccessException e) {
@ -2754,7 +2795,7 @@ public class PersistService {
public List<String> selectTagByConfig(String dataId, String group, String tenant) {
String sql = "SELECT tag_name FROM config_tags_relation WHERE data_id=? AND group_id=? AND tenant_id = ? ";
try {
return jt.queryForList(sql, new Object[] {dataId, group, tenant}, String.class);
return jt.queryForList(sql, new Object[]{dataId, group, tenant}, String.class);
} catch (EmptyResultDataAccessException e) {
return null;
} catch (IncorrectResultSizeDataAccessException e) {
@ -2787,6 +2828,37 @@ public class PersistService {
}
}
/**
* @author klw
* @Description: Delete configuration; database atomic operation, minimum SQL action, no business encapsulation
* @Date 2019/7/5 16:39
* @Param [id]
* @return void
*/
private void removeConfigInfoByIdsAtomic(final String ids) {
if(StringUtils.isBlank(ids)){
return;
}
StringBuilder sql = new StringBuilder(SQL_DELETE_CONFIG_INFO_BY_IDS);
sql.append("id in (");
List<Long> paramList = new ArrayList<>();
String[] tagArr = ids.split(",");
for (int i = 0; i < tagArr.length; i++) {
if (i != 0) {
sql.append(", ");
}
sql.append("?");
paramList.add(Long.valueOf(tagArr[i]));
}
sql.append(") ");
try {
jt.update(sql.toString(), paramList.toArray());
} catch (CannotGetJdbcConnectionException e) {
fatalLog.error("[db-error] " + e.toString(), e);
throw e;
}
}
/**
* 删除配置；数据库原子操作，最小sql动作，无业务封装
*
@ -2826,11 +2898,11 @@ public class PersistService {
String appNameTmp = StringUtils.isBlank(configInfo.getAppName()) ? StringUtils.EMPTY : configInfo.getAppName();
String tenantTmp = StringUtils.isBlank(configInfo.getTenant()) ? StringUtils.EMPTY : configInfo.getTenant();
final String md5Tmp = MD5.getInstance().getMD5String(configInfo.getContent());
String desc = configAdvanceInfo == null ? null : (String)configAdvanceInfo.get("desc");
String use = configAdvanceInfo == null ? null : (String)configAdvanceInfo.get("use");
String effect = configAdvanceInfo == null ? null : (String)configAdvanceInfo.get("effect");
String type = configAdvanceInfo == null ? null : (String)configAdvanceInfo.get("type");
String schema = configAdvanceInfo == null ? null : (String)configAdvanceInfo.get("schema");
String desc = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("desc");
String use = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("use");
String effect = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("effect");
String type = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("type");
String schema = configAdvanceInfo == null ? null : (String) configAdvanceInfo.get("schema");
try {
jt.update(
@ -2856,7 +2928,40 @@ public class PersistService {
try {
return this.jt.queryForObject(
"SELECT ID,data_id,group_id,tenant_id,app_name,content,md5 FROM config_info WHERE data_id=? AND group_id=? AND tenant_id=?",
new Object[] {dataId, group, tenantTmp}, CONFIG_INFO_ROW_MAPPER);
new Object[]{dataId, group, tenantTmp}, CONFIG_INFO_ROW_MAPPER);
} catch (EmptyResultDataAccessException e) { // 表明数据不存在, 返回null
return null;
} catch (CannotGetJdbcConnectionException e) {
fatalLog.error("[db-error] " + e.toString(), e);
throw e;
}
}
/**
* @author klw
* @Description: find ConfigInfo by ids
* @Date 2019/7/5 16:37
* @Param [ids]
* @return java.util.List<com.alibaba.nacos.config.server.model.ConfigInfo>
*/
public List<ConfigInfo> findConfigInfosByIds(final String ids) {
if(StringUtils.isBlank(ids)){
return null;
}
StringBuilder sql = new StringBuilder(SQL_FIND_CONFIG_INFO_BY_IDS);
sql.append("id in (");
List<Long> paramList = new ArrayList<>();
String[] tagArr = ids.split(",");
for (int i = 0; i < tagArr.length; i++) {
if (i != 0) {
sql.append(", ");
}
sql.append("?");
paramList.add(Long.valueOf(tagArr[i]));
}
sql.append(") ");
try {
return this.jt.query(sql.toString(), paramList.toArray(), CONFIG_INFO_ROW_MAPPER);
} catch (EmptyResultDataAccessException e) { // 表明数据不存在, 返回null
return null;
} catch (CannotGetJdbcConnectionException e) {
@ -2879,7 +2984,7 @@ public class PersistService {
List<String> configTagList = this.selectTagByConfig(dataId, group, tenant);
ConfigAdvanceInfo configAdvance = this.jt.queryForObject(
"SELECT gmt_create,gmt_modified,src_user,src_ip,c_desc,c_use,effect,type,c_schema FROM config_info WHERE data_id=? AND group_id=? AND tenant_id=?",
new Object[] {dataId, group, tenantTmp}, CONFIG_ADVANCE_INFO_ROW_MAPPER);
new Object[]{dataId, group, tenantTmp}, CONFIG_ADVANCE_INFO_ROW_MAPPER);
if (configTagList != null && !configTagList.isEmpty()) {
StringBuilder configTagsTmp = new StringBuilder();
for (String configTag : configTagList) {
@ -2914,7 +3019,7 @@ public class PersistService {
List<String> configTagList = this.selectTagByConfig(dataId, group, tenant);
ConfigAllInfo configAdvance = this.jt.queryForObject(
"SELECT ID,data_id,group_id,tenant_id,app_name,content,md5,gmt_create,gmt_modified,src_user,src_ip,c_desc,c_use,effect,type,c_schema FROM config_info WHERE data_id=? AND group_id=? AND tenant_id=?",
new Object[] {dataId, group, tenantTmp}, CONFIG_ALL_INFO_ROW_MAPPER);
new Object[]{dataId, group, tenantTmp}, CONFIG_ALL_INFO_ROW_MAPPER);
if (configTagList != null && !configTagList.isEmpty()) {
StringBuilder configTagsTmp = new StringBuilder();
for (String configTag : configTagList) {
@ -2982,11 +3087,11 @@ public class PersistService {
Page<ConfigHistoryInfo> page = null;
try {
page = helper.fetchPage(this.jt, sqlCountRows, sqlFetchRows, new Object[] {dataId, group, tenantTmp},
page = helper.fetchPage(this.jt, sqlCountRows, sqlFetchRows, new Object[]{dataId, group, tenantTmp},
pageNo,
pageSize, HISTORY_LIST_ROW_MAPPER);
} catch (DataAccessException e) {
fatalLog.error("[list-config-history] error, dataId:{}, group:{}", new Object[] {dataId, group}, e);
fatalLog.error("[list-config-history] error, dataId:{}, group:{}", new Object[]{dataId, group}, e);
throw e;
}
return page;
@ -3038,11 +3143,11 @@ public class PersistService {
String sqlFetchRows
= "SELECT nid,data_id,group_id,tenant_id,app_name,content,md5,src_user,src_ip,op_type,gmt_create,gmt_modified FROM his_config_info WHERE nid = ?";
try {
ConfigHistoryInfo historyInfo = jt.queryForObject(sqlFetchRows, new Object[] {nid},
ConfigHistoryInfo historyInfo = jt.queryForObject(sqlFetchRows, new Object[]{nid},
HISTORY_DETAIL_ROW_MAPPER);
return historyInfo;
} catch (DataAccessException e) {
fatalLog.error("[list-config-history] error, nid:{}", new Object[] {nid}, e);
fatalLog.error("[list-config-history] error, nid:{}", new Object[]{nid}, e);
throw e;
}
}
@ -3090,7 +3195,7 @@ public class PersistService {
public List<TenantInfo> findTenantByKp(String kp) {
String sql = "SELECT tenant_id,tenant_name,tenant_desc FROM tenant_info WHERE kp=?";
try {
return this.jt.query(sql, new Object[] {kp}, TENANT_INFO_ROW_MAPPER);
return this.jt.query(sql, new Object[]{kp}, TENANT_INFO_ROW_MAPPER);
} catch (CannotGetJdbcConnectionException e) {
fatalLog.error("[db-error] " + e.toString(), e);
throw e;
@ -3105,7 +3210,7 @@ public class PersistService {
public TenantInfo findTenantByKp(String kp, String tenantId) {
String sql = "SELECT tenant_id,tenant_name,tenant_desc FROM tenant_info WHERE kp=? AND tenant_id=?";
try {
return this.jt.queryForObject(sql, new Object[] {kp, tenantId}, TENANT_INFO_ROW_MAPPER);
return this.jt.queryForObject(sql, new Object[]{kp, tenantId}, TENANT_INFO_ROW_MAPPER);
} catch (CannotGetJdbcConnectionException e) {
fatalLog.error("[db-error] " + e.toString(), e);
throw e;
@ -3129,7 +3234,7 @@ public class PersistService {
public User findUserByUsername(String username) {
String sql = "SELECT username,password FROM users WHERE username=? ";
try {
return this.jt.queryForObject(sql, new Object[] {username}, USER_ROW_MAPPER);
return this.jt.queryForObject(sql, new Object[]{username}, USER_ROW_MAPPER);
} catch (CannotGetJdbcConnectionException e) {
fatalLog.error("[db-error] " + e.toString(), e);
throw e;
@ -3141,13 +3246,27 @@ public class PersistService {
}
}
/**
* 更新用户密码
*/
public void updateUserPassword(String username, String password) {
try {
jt.update(
"UPDATE users SET password = ? WHERE username=?",
password, username);
} catch (CannotGetJdbcConnectionException e) {
fatalLog.error("[db-error] " + e.toString(), e);
throw e;
}
}
private List<ConfigInfo> convertDeletedConfig(List<Map<String, Object>> list) {
List<ConfigInfo> configs = new ArrayList<ConfigInfo>();
for (Map<String, Object> map : list) {
String dataId = (String)map.get("data_id");
String group = (String)map.get("group_id");
String tenant = (String)map.get("tenant_id");
String dataId = (String) map.get("data_id");
String group = (String) map.get("group_id");
String tenant = (String) map.get("tenant_id");
ConfigInfo config = new ConfigInfo();
config.setDataId(dataId);
config.setGroup(group);
@ -3161,11 +3280,11 @@ public class PersistService {
List<Map<String, Object>> list) {
List<ConfigInfoWrapper> configs = new ArrayList<ConfigInfoWrapper>();
for (Map<String, Object> map : list) {
String dataId = (String)map.get("data_id");
String group = (String)map.get("group_id");
String tenant = (String)map.get("tenant_id");
String content = (String)map.get("content");
long mTime = ((Timestamp)map.get("gmt_modified")).getTime();
String dataId = (String) map.get("data_id");
String group = (String) map.get("group_id");
String tenant = (String) map.get("tenant_id");
String content = (String) map.get("content");
long mTime = ((Timestamp) map.get("gmt_modified")).getTime();
ConfigInfoWrapper config = new ConfigInfoWrapper();
config.setDataId(dataId);
config.setGroup(group);
@ -3185,7 +3304,7 @@ public class PersistService {
public List<ConfigInfoWrapper> listAllGroupKeyMd5() {
final int pageSize = 10000;
int totalCount = configInfoCount();
int pageCount = (int)Math.ceil(totalCount * 1.0 / pageSize);
int pageCount = (int) Math.ceil(totalCount * 1.0 / pageSize);
List<ConfigInfoWrapper> allConfigInfo = new ArrayList<ConfigInfoWrapper>();
for (int pageNo = 1; pageNo <= pageCount; pageNo++) {
List<ConfigInfoWrapper> configInfoList = listGroupKeyMd5ByPage(pageNo, pageSize);
@ -3200,7 +3319,7 @@ public class PersistService {
= " SELECT t.id,data_id,group_id,tenant_id,app_name,md5,gmt_modified FROM ( SELECT id FROM config_info ORDER BY id LIMIT ?,? ) g, config_info t WHERE g.id = t.id";
PaginationHelper<ConfigInfoWrapper> helper = new PaginationHelper<ConfigInfoWrapper>();
try {
Page<ConfigInfoWrapper> page = helper.fetchPageLimit(jt, sqlCountRows, sqlFetchRows, new Object[] {
Page<ConfigInfoWrapper> page = helper.fetchPageLimit(jt, sqlCountRows, sqlFetchRows, new Object[]{
(pageNo - 1) * pageSize, pageSize}, pageNo, pageSize, CONFIG_INFO_WRAPPER_ROW_MAPPER);
return page.getPageItems();
@ -3213,7 +3332,9 @@ public class PersistService {
private String generateLikeArgument(String s) {
String fuzzySearchSign = "\\*";
String sqlLikePercentSign = "%";
if (s.contains(PATTERN_STR)) { return s.replaceAll(fuzzySearchSign, sqlLikePercentSign); } else {
if (s.contains(PATTERN_STR)) {
return s.replaceAll(fuzzySearchSign, sqlLikePercentSign);
} else {
return s;
}
}
@ -3224,7 +3345,7 @@ public class PersistService {
return this.jt
.queryForObject(
"SELECT ID,data_id,group_id,tenant_id,app_name,content,gmt_modified,md5 FROM config_info WHERE data_id=? AND group_id=? AND tenant_id=?",
new Object[] {dataId, group, tenantTmp}, CONFIG_INFO_WRAPPER_ROW_MAPPER);
new Object[]{dataId, group, tenantTmp}, CONFIG_INFO_WRAPPER_ROW_MAPPER);
} catch (EmptyResultDataAccessException e) {
return null;
} catch (CannotGetJdbcConnectionException e) {
@ -3247,7 +3368,7 @@ public class PersistService {
defaultLog.info("[start completeMd5]");
int perPageSize = 1000;
int rowCount = configInfoCount();
int pageCount = (int)Math.ceil(rowCount * 1.0 / perPageSize);
int pageCount = (int) Math.ceil(rowCount * 1.0 / perPageSize);
int actualRowCount = 0;
for (int pageNo = 1; pageNo <= pageCount; pageNo++) {
Page<PersistService.ConfigInfoWrapper> page = findAllConfigInfoForDumpAll(
@ -3265,7 +3386,7 @@ public class PersistService {
} catch (Exception e) {
LogUtil.defaultLog
.error("[completeMd5-error] datId:{} group:{} lastModified:{}",
new Object[] {
new Object[]{
cf.getDataId(),
cf.getGroup(),
new Timestamp(cf
@ -3278,7 +3399,7 @@ public class PersistService {
new Timestamp(cf.getLastModified()));
} catch (Exception e) {
LogUtil.defaultLog.error("[completeMd5-error] datId:{} group:{} lastModified:{}",
new Object[] {cf.getDataId(), cf.getGroup(),
new Object[]{cf.getDataId(), cf.getGroup(),
new Timestamp(cf.getLastModified())});
}
}
@ -3299,11 +3420,11 @@ public class PersistService {
* @return Collection of ConfigInfo objects
*/
public List<ConfigInfo> findAllConfigInfo4Export(final String dataId, final String group, final String tenant,
final String appName, final List<Long> ids) {
final String appName, final List<Long> ids) {
String tenantTmp = StringUtils.isBlank(tenant) ? StringUtils.EMPTY : tenant;
StringBuilder where = new StringBuilder(" where ");
List<Object> paramList = new ArrayList<>();
if(!CollectionUtils.isEmpty(ids)){
if (!CollectionUtils.isEmpty(ids)) {
where.append(" id in (");
for (int i = 0; i < ids.size(); i++) {
if (i != 0) {
@ -3367,9 +3488,9 @@ public class PersistService {
String type = null;
if (configInfo.getDataId().contains(SPOT)) {
String extName = configInfo.getDataId().substring(configInfo.getDataId().lastIndexOf(SPOT) + 1).toLowerCase();
try{
try {
type = FileTypeEnum.valueOf(extName).getFileType();
}catch (Exception ex){
} catch (Exception ex) {
type = FileTypeEnum.TEXT.getFileType();
}
}

31
config/src/main/java/com/alibaba/nacos/config/server/service/ServerListService.java
View File

@ -15,20 +15,6 @@
*/
package com.alibaba.nacos.config.server.service;
import java.io.IOException;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import javax.annotation.PostConstruct;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletResponse;
import com.alibaba.nacos.config.server.constant.Constants;
import com.alibaba.nacos.config.server.monitor.MetricsMonitor;
import com.alibaba.nacos.config.server.service.notify.NotifyService;
@ -37,7 +23,6 @@ import com.alibaba.nacos.config.server.utils.LogUtil;
import com.alibaba.nacos.config.server.utils.PropertyUtil;
import com.alibaba.nacos.config.server.utils.RunningConfigUtils;
import com.alibaba.nacos.config.server.utils.event.EventDispatcher;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpResponse;
@ -54,11 +39,18 @@ import org.springframework.core.env.Environment;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import javax.annotation.PostConstruct;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.StringReader;
import java.util.*;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import static com.alibaba.nacos.config.server.utils.LogUtil.defaultLog;
import static com.alibaba.nacos.config.server.utils.LogUtil.fatalLog;
import static com.alibaba.nacos.core.utils.SystemUtils.LOCAL_IP;
import static com.alibaba.nacos.core.utils.SystemUtils.STANDALONE_MODE;
import static com.alibaba.nacos.core.utils.SystemUtils.readClusterConf;
import static com.alibaba.nacos.core.utils.SystemUtils.*;
/**
* Serverlist service
@ -169,7 +161,8 @@ public class ServerListService implements ApplicationListener<WebServerInitializ
/**
* serverList has changed
*/
static public class ServerlistChangeEvent implements EventDispatcher.Event {}
static public class ServerlistChangeEvent implements EventDispatcher.Event {
}
private void updateIfChanged(List<String> newList) {
if (newList.isEmpty()) {

5
config/src/main/java/com/alibaba/nacos/config/server/utils/JSONUtils.java
View File

@ -16,15 +16,12 @@
package com.alibaba.nacos.config.server.utils;
import java.io.IOException;
import java.io.InputStream;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
import java.io.InputStream;
/**

63
config/src/main/java/com/alibaba/nacos/config/server/utils/LogUtil.java
View File

@ -15,6 +15,7 @@
*/
package com.alibaba.nacos.config.server.utils;
import ch.qos.logback.classic.Level;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -28,46 +29,74 @@ public class LogUtil {
/**
* 默认的日志
*/
static public final Logger defaultLog = LoggerFactory.getLogger("com.alibaba.nacos.config.startLog");
public static final Logger defaultLog = LoggerFactory.getLogger("com.alibaba.nacos.config.startLog");
/**
* 致命错误，需要告警
*/
static public final Logger fatalLog = LoggerFactory
public static final Logger fatalLog = LoggerFactory
.getLogger("com.alibaba.nacos.config.fatal");
/**
* 客户端GET方法获取数据的日志
*/
static public final Logger pullLog = LoggerFactory
public static final Logger pullLog = LoggerFactory
.getLogger("com.alibaba.nacos.config.pullLog");
static public final Logger pullCheckLog = LoggerFactory
public static final Logger pullCheckLog = LoggerFactory
.getLogger("com.alibaba.nacos.config.pullCheckLog");
/**
* 从DB dump数据的日志
*/
static public final Logger dumpLog = LoggerFactory
public static final Logger dumpLog = LoggerFactory
.getLogger("com.alibaba.nacos.config.dumpLog");
static public final Logger memoryLog = LoggerFactory
public static final Logger memoryLog = LoggerFactory
.getLogger("com.alibaba.nacos.config.monitorLog");
static public final Logger clientLog = LoggerFactory
public static final Logger clientLog = LoggerFactory
.getLogger("com.alibaba.nacos.config.clientLog");
static public final Logger sdkLog = LoggerFactory
.getLogger("com.alibaba.nacos.config.sdkLog");
static public final Logger traceLog = LoggerFactory
public static final Logger traceLog = LoggerFactory
.getLogger("com.alibaba.nacos.config.traceLog");
static public final Logger aclLog = LoggerFactory
.getLogger("com.alibaba.nacos.config.aclLog");
static public final Logger notifyLog = LoggerFactory
public static final Logger notifyLog = LoggerFactory
.getLogger("com.alibaba.nacos.config.notifyLog");
static public final Logger appCollectorLog = LoggerFactory
.getLogger("com.alibaba.nacos.config.appCollectorLog");
public static void setLogLevel(String logName, String level) {
switch (logName) {
case "config-server":
((ch.qos.logback.classic.Logger) defaultLog).setLevel(Level.valueOf(level));
break;
case "config-fatal":
((ch.qos.logback.classic.Logger) fatalLog).setLevel(Level.valueOf(level));
break;
case "config-pull":
((ch.qos.logback.classic.Logger) pullLog).setLevel(Level.valueOf(level));
break;
case "config-pull-check":
((ch.qos.logback.classic.Logger) pullCheckLog).setLevel(Level.valueOf(level));
break;
case "config-dump":
((ch.qos.logback.classic.Logger) dumpLog).setLevel(Level.valueOf(level));
break;
case "config-memory":
((ch.qos.logback.classic.Logger) memoryLog).setLevel(Level.valueOf(level));
break;
case "config-client-request":
((ch.qos.logback.classic.Logger) clientLog).setLevel(Level.valueOf(level));
break;
case "config-trace":
((ch.qos.logback.classic.Logger) traceLog).setLevel(Level.valueOf(level));
break;
case "config-notify":
((ch.qos.logback.classic.Logger) notifyLog).setLevel(Level.valueOf(level));
break;
default:
break;
}
}
}

1
config/src/test/java/com/alibaba/nacos/config/server/service/AggrWhitelistTest.java
View File

@ -24,7 +24,6 @@ import org.springframework.test.context.web.WebAppConfiguration;
import java.util.ArrayList;
import java.util.List;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

7
config/src/test/java/com/alibaba/nacos/config/server/utils/SimpleReadWriteLockTest.java
View File

@ -15,16 +15,13 @@
*/
package com.alibaba.nacos.config.server.utils;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration;
import com.alibaba.nacos.config.server.utils.SimpleReadWriteLock;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@RunWith(SpringJUnit4ClassRunner.class)
@WebAppConfiguration

6
config/src/test/java/com/alibaba/nacos/config/server/utils/event/EventDispatcherTest.java
View File

@ -15,6 +15,8 @@
*/
package com.alibaba.nacos.config.server.utils.event;
import com.alibaba.nacos.config.server.utils.event.EventDispatcher.AbstractEventListener;
import com.alibaba.nacos.config.server.utils.event.EventDispatcher.Event;
import org.junit.After;
import org.junit.Ignore;
import org.junit.Test;
@ -22,10 +24,6 @@ import org.junit.runner.RunWith;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration;
import com.alibaba.nacos.config.server.utils.event.EventDispatcher;
import com.alibaba.nacos.config.server.utils.event.EventDispatcher.Event;
import com.alibaba.nacos.config.server.utils.event.EventDispatcher.AbstractEventListener;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;

9
console/pom.xml
View File

@ -18,7 +18,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>1.1.0</version>
<version>1.1.3</version>
</parent>
<artifactId>nacos-console</artifactId>
<!--<packaging>war</packaging>-->
@ -93,13 +93,6 @@
<exclude>static/console-fe/.vscode/**</exclude>
</excludes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>nacos-version.txt</include>
</includes>
</resource>
</resources>
</build>

35
console/src/main/java/com/alibaba/nacos/console/controller/AuthController.java
View File

@ -17,15 +17,19 @@ package com.alibaba.nacos.console.controller;
import com.alibaba.nacos.console.config.WebSecurityConfig;
import com.alibaba.nacos.config.server.model.RestResult;
import com.alibaba.nacos.console.security.CustomUserDetailsServiceImpl;
import com.alibaba.nacos.console.utils.JwtTokenUtils;
import com.alibaba.nacos.console.utils.PasswordEncoderUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@ -42,6 +46,8 @@ public class AuthController {
private JwtTokenUtils jwtTokenUtils;
@Autowired
private AuthenticationManager authenticationManager;
@Autowired
private CustomUserDetailsServiceImpl userDetailsService;
/**
* Whether the Nacos is in broken states or not, and cannot recover except by being restarted
@ -78,4 +84,33 @@ public class AuthController {
return rr;
}
}
@ResponseBody
@RequestMapping(value = "password", method = RequestMethod.PUT)
public RestResult<String> updatePassword(HttpServletRequest request, HttpServletResponse response,
@RequestParam(value = "oldPassword", required = true) String oldPassword,
@RequestParam(value = "newPassword", required = true) String newPassword) throws Exception {
RestResult<String> rr = new RestResult<String>();
Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
String username = ((UserDetails) principal).getUsername();
UserDetails userDetails = userDetailsService.loadUserByUsername(username);
String password = userDetails.getPassword();
// TODO: throw out more fine grained exceptions
try {
if (PasswordEncoderUtil.matches(oldPassword, password)) {
userDetailsService.updateUserPassword(username, PasswordEncoderUtil.encode(newPassword));
rr.setCode(200);
rr.setMessage("Update password success");
} else {
rr.setCode(401);
rr.setMessage("Old password is invalid");
}
} catch (Exception e) {
rr.setCode(500);
rr.setMessage("Update userpassword failed");
}
return rr;
}
}

4
console/src/main/java/com/alibaba/nacos/console/security/CustomUserDetailsServiceImpl.java
View File

@ -43,4 +43,8 @@ public class CustomUserDetailsServiceImpl implements UserDetailsService {
}
return new CustomUserDetails(user);
}
public void updateUserPassword(String username, String password) throws Exception {
persistService.updateUserPassword(username, password);
}
}

8
console/src/main/java/com/alibaba/nacos/console/utils/PasswordEncoderUtil.java
View File

@ -27,4 +27,12 @@ public class PasswordEncoderUtil {
public static void main(String[] args) {
System.out.println(new BCryptPasswordEncoder().encode("nacos"));
}
public static Boolean matches(String raw, String encoded) {
return new BCryptPasswordEncoder().matches(raw, encoded);
}
public static String encode(String raw) {
return new BCryptPasswordEncoder().encode(raw);
}
}

10
console/src/main/resources/static/console-fe/build/webpack.prod.conf.js
View File

@ -18,6 +18,16 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
const CleanWebpackPlugin = require('clean-webpack-plugin');
const [cssLoader] = base.module.rules;
cssLoader.use.push({
loader: '@alifd/next-theme-loader',
options: {
modifyVars: {
'$icon-font-path':'"/nacos/console-fe/public/icons/icon-font"',
'$font-custom-path': '"/nacos/console-fe/public/fonts/"'
}
}
})
module.exports = Object.assign({}, base, {
optimization: {
minimizer: [

5
console/src/main/resources/static/console-fe/package.json
View File

@ -26,6 +26,7 @@
"url": "git+https://github.com/alibaba/nacos.git"
},
"devDependencies": {
"@alifd/next-theme-loader": "^1.3.1",
"@babel/cli": "^7.2.3",
"@babel/core": "^7.2.2",
"@babel/plugin-proposal-decorators": "^7.2.3",
@ -33,7 +34,7 @@
"@babel/runtime": "^7.2.0",
"babel-eslint": "^10.0.1",
"babel-loader": "^8.0.4",
"babel-plugin-import": "^1.11.0",
"babel-plugin-import": "^1.12.0",
"babel-preset-react-app": "^6.1.0",
"clean-webpack-plugin": "^0.1.19",
"copy-webpack-plugin": "^4.6.0",
@ -63,7 +64,7 @@
"webpack-dev-server": "^3.1.13"
},
"dependencies": {
"@alifd/next": "^1.11.10",
"@alifd/next": "^1.15.12",
"axios": "^0.18.0",
"jquery": "^3.3.1",
"moment": "^2.23.0",

BIN
console/src/main/resources/static/console-fe/public/fonts/roboto-bold.eot Normal file
View File

Binary file not shown.

BIN
console/src/main/resources/static/console-fe/public/fonts/roboto-bold.ttf Normal file
View File

Binary file not shown.

BIN
console/src/main/resources/static/console-fe/public/fonts/roboto-bold.woff Normal file
View File

Binary file not shown.

BIN
console/src/main/resources/static/console-fe/public/fonts/roboto-bold.woff2 Normal file
View File

Binary file not shown.

BIN
console/src/main/resources/static/console-fe/public/fonts/roboto-light.eot Normal file
View File

Binary file not shown.

BIN
console/src/main/resources/static/console-fe/public/fonts/roboto-light.ttf Normal file
View File

Binary file not shown.

BIN
console/src/main/resources/static/console-fe/public/fonts/roboto-light.woff Normal file
View File

Binary file not shown.

BIN
console/src/main/resources/static/console-fe/public/fonts/roboto-light.woff2 Normal file
View File

Binary file not shown.

BIN
console/src/main/resources/static/console-fe/public/fonts/roboto-medium.eot Normal file
View File

Binary file not shown.

BIN
console/src/main/resources/static/console-fe/public/fonts/roboto-medium.ttf Normal file
View File

Binary file not shown.

BIN
console/src/main/resources/static/console-fe/public/fonts/roboto-medium.woff Normal file
View File

Binary file not shown.

BIN
console/src/main/resources/static/console-fe/public/fonts/roboto-medium.woff2 Normal file
View File

Binary file not shown.

BIN
console/src/main/resources/static/console-fe/public/fonts/roboto-regular.eot Normal file
View File

Binary file not shown.

BIN
console/src/main/resources/static/console-fe/public/fonts/roboto-regular.ttf Normal file
View File

Binary file not shown.

BIN
console/src/main/resources/static/console-fe/public/fonts/roboto-regular.woff Normal file
View File

Binary file not shown.

BIN
console/src/main/resources/static/console-fe/public/fonts/roboto-regular.woff2 Normal file
View File

Binary file not shown.

BIN
console/src/main/resources/static/console-fe/public/fonts/roboto-thin.eot Normal file
View File

Binary file not shown.

BIN
console/src/main/resources/static/console-fe/public/fonts/roboto-thin.ttf Normal file
View File

Binary file not shown.

BIN
console/src/main/resources/static/console-fe/public/fonts/roboto-thin.woff Normal file
View File

Binary file not shown.

BIN
console/src/main/resources/static/console-fe/public/fonts/roboto-thin.woff2 Normal file
View File

Binary file not shown.

BIN
console/src/main/resources/static/console-fe/public/icons/icon-font.eot Normal file
View File

Binary file not shown.

159
console/src/main/resources/static/console-fe/public/icons/icon-font.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
console/src/main/resources/static/console-fe/public/icons/icon-font.ttf Normal file
View File

Binary file not shown.

BIN
console/src/main/resources/static/console-fe/public/icons/icon-font.woff Normal file
View File

Binary file not shown.

4
console/src/main/resources/static/console-fe/src/globalLib.js
View File

@ -619,6 +619,10 @@ const request = (function(_global) {
// 跳转至login页
// TODO: 用 react-router 重写，改造成本比较高，这里先hack
const url = window.location.href;
// TODO: 后端返回细致的错误码，如果原始密码不对 不应该直接跳到登陆页
if (url.includes('password')) {
return;
}
const base_url = url.split('#')[0];
window.location = `${base_url}#/login`;
}

2
console/src/main/resources/static/console-fe/src/index.js
View File

@ -30,6 +30,7 @@ import { LANGUAGE_KEY, REDUX_DEVTOOLS } from './constants';
import Login from './pages/Login';
import Namespace from './pages/NameSpace';
import Password from './pages/Password';
import Newconfig from './pages/ConfigurationManagement/NewConfig';
import Configsync from './pages/ConfigurationManagement/ConfigSync';
import Configdetail from './pages/ConfigurationManagement/ConfigDetail';
@ -74,6 +75,7 @@ const MENU = [
{ path: '/', exact: true, render: () => <Redirect to="/welcome" /> },
{ path: '/welcome', component: Welcome },
{ path: '/namespace', component: Namespace },
{ path: '/password', component: Password },
{ path: '/newconfig', component: Newconfig },
{ path: '/configsync', component: Configsync },
{ path: '/configdetail', component: Configdetail },

5
console/src/main/resources/static/console-fe/src/layouts/Header.js
View File

@ -49,6 +49,10 @@ class Header extends React.Component {
this.props.history.push('/login');
};
changePassword = () => {
this.props.history.push('/password');
};
getUsername = () => {
const token = window.localStorage.getItem('token');
if (token) {
@ -94,6 +98,7 @@ class Header extends React.Component {
<Dropdown trigger={<div className="logout">{this.getUsername()}</div>}>
<Menu>
<Menu.Item onClick={this.logout}>{locale.logout}</Menu.Item>
<Menu.Item onClick={this.changePassword}>{locale.changePassword}</Menu.Item>
</Menu>
</Dropdown>
)}

9
console/src/main/resources/static/console-fe/src/layouts/MainLayout.js
View File

@ -341,9 +341,6 @@ class MainLayout extends React.Component {
});
return;
}
this.setState({
noChild: !!nowNavObj.dontUseChild,
});
const { parentServiceName } = nowNavObj;
const parentNav = this.oneLevelNavArr[parentServiceName];
@ -391,7 +388,11 @@ class MainLayout extends React.Component {
refreshNav() {
const { navList } = this.state;
const { location, history, functionMode } = this.props;
const [configUrl, serviceUrl, clusterUrl] = ['/configurationManagement', '/serviceManagement', '/clusterManagement'];
const [configUrl, serviceUrl, clusterUrl] = [
'/configurationManagement',
'/serviceManagement',
'/clusterManagement',
];
this.setState(
{
navList: navList.map(item => {

22
console/src/main/resources/static/console-fe/src/locales/en-US.js
View File

@ -19,6 +19,7 @@ const I18N_CONF = {
community: 'COMMUNITY',
languageSwitchButton: '中',
logout: 'logout',
changePassword: 'modify password',
passwordRequired: 'password should not be empty',
usernameRequired: 'username should not be empty',
},
@ -50,6 +51,19 @@ const I18N_CONF = {
clusterManagementVirtual: 'ClusterManagement',
clusterManagement: 'Cluster Node List',
},
Password: {
passwordNotConsistent: 'The passwords are not consistent',
passwordRequired: 'password should not be empty',
pleaseInputOldPassword: 'Please input original password',
pleaseInputNewPassword: 'Please input new password',
pleaseInputNewPasswordAgain: 'Please input new password again',
oldPassword: 'Original password',
newPassword: 'New password',
checkPassword: 'Check password',
changePassword: 'modify password',
invalidPassword: 'Invalid original password',
modifyPasswordFailed: 'Modify password failed',
},
NameSpace: {
namespace: 'Namespaces',
prompt: 'Notice',
@ -78,6 +92,7 @@ const I18N_CONF = {
serviceList: 'Service List',
serviceName: 'Service Name',
serviceNamePlaceholder: 'Enter Service Name',
hiddenEmptyService: 'Hidden Empty Service',
query: 'Search',
pubNoData: 'No results found.',
columnServiceName: 'Service Name',
@ -291,12 +306,17 @@ const I18N_CONF = {
target: 'Target:',
selectNamespace: 'Select Namespace',
selectedEntry: '| Selected Entry',
cloneSelectedAlertTitle: 'Clone config',
cloneSelectedAlertContent: 'please select the configuration to clone',
delSelectedAlertTitle: 'Delete config',
delSelectedAlertContent: 'please select the configuration to delete',
delSuccessMsg: 'delete successful',
},
NewConfig: {
newListingMain: 'Create Configuration',
newListing: 'Create Configuration',
publishFailed: 'Publish failed. Make sure parameters are entered correctly.',
doNotEnte: 'Illegal characters not allowed',
doNotEnter: 'Illegal characters not allowed',
newConfig: 'Data ID cannot be empty.',
dataIdIsNotEmpty: 'Data ID cannot exceed 255 characters in length',
groupPlaceholder: 'Enter your group name',

22
console/src/main/resources/static/console-fe/src/locales/zh-CN.js
View File

@ -19,6 +19,7 @@ const I18N_CONF = {
community: '社区',
languageSwitchButton: 'En',
logout: '登出',
changePassword: '修改密码',
},
Login: {
login: '登录',
@ -50,6 +51,19 @@ const I18N_CONF = {
clusterManagementVirtual: '集群管理',
clusterManagement: '节点列表',
},
Password: {
passwordNotConsistent: '两次输入密码不一致',
passwordRequired: '密码不能为空',
pleaseInputOldPassword: '请输入原始密码',
pleaseInputNewPassword: '请输入新密码',
pleaseInputNewPasswordAgain: '请再次输入新密码',
oldPassword: '原始密码',
newPassword: '新密码',
checkPassword: '再次输入',
changePassword: '修改密码',
invalidPassword: '原始密码错误',
modifyPasswordFailed: '修改密码失败',
},
NameSpace: {
namespace: '命名空间',
prompt: '提示',
@ -78,6 +92,7 @@ const I18N_CONF = {
serviceList: '服务列表',
serviceName: '服务名称',
serviceNamePlaceholder: '请输入服务名称',
hiddenEmptyService: '隐藏空服务',
query: '查询',
pubNoData: '没有数据',
columnServiceName: '服务名',
@ -289,12 +304,17 @@ const I18N_CONF = {
target: '目标空间：',
selectNamespace: '请选择命名空间',
selectedEntry: '| 选中的条目',
cloneSelectedAlertTitle: '配置克隆',
cloneSelectedAlertContent: '请选择要克隆的配置',
delSelectedAlertTitle: '配置删除',
delSelectedAlertContent: '请选择要删除的配置',
delSuccessMsg: '删除成功',
},
NewConfig: {
newListingMain: '新建配置',
newListing: '新建配置',
publishFailed: '发布失败。请检查参数是否正确。',
doNotEnte: 'Illegal characters not allowed',
doNotEnter: '不允许非法字符',
newConfig: 'Data ID 不能为空',
dataIdIsNotEmpty: 'Data ID 长度不能超过255字符',
groupPlaceholder: '请输入Group名称',

16
console/src/main/resources/static/console-fe/src/menu.js
View File

@ -242,6 +242,22 @@ module.exports = {
useRouter: false,
id: 'namespace',
},
{
enable: true,
isExtend: false,
name: '修改密码',
title: '修改密码',
isVirtual: false,
projectName: 'nacos',
serviceName: 'password',
link: 'password',
hasFusion: true,
template: '',
dontUseChild: true,
registerName: 'com.alibaba.nacos.page.password',
useRouter: false,
id: 'password',
},
{
enable: false,
isExtend: true,

4
console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigEditor/NewConfigEditor.js
View File

@ -124,7 +124,7 @@ class ConfigEditor extends React.Component {
this.monacoEditor = null;
const options = {
value,
language: this.state.configType,
language,
codeLens: true,
selectOnLineNumbers: true,
roundedSelection: false,
@ -262,12 +262,14 @@ class ConfigEditor extends React.Component {
stopBeta() {
const { locale } = this.props;
const { dataId, group } = this.state.form;
const tenant = getParams('namespace');
return request
.delete('v1/cs/configs', {
params: {
beta: true,
dataId,
group,
tenant,
},
})
.then(res => {

61
console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js
View File

@ -697,6 +697,52 @@ class ConfigurationManagement extends React.Component {
}
}
multipleSelectionDeletion() {
const { locale = {} } = this.props;
const self = this;
if (configsTableSelected.size === 0) {
Dialog.alert({
title: locale.delSelectedAlertTitle,
content: locale.delSelectedAlertContent,
});
} else {
let toShowDatas = [];
configsTableSelected.forEach((value, key, map) => {
let item = {};
item.dataId = value.dataId;
item.group = value.group;
toShowDatas.push(item);
});
Dialog.confirm({
title: locale.removeConfiguration,
content: (
<div style={{ marginTop: '-20px' }}>
<h3>{locale.sureDelete}</h3>
<Table dataSource={toShowDatas}>
<Table.Column title="Data Id" dataIndex="dataId" />
<Table.Column title="Group" dataIndex="group" />
</Table>
</div>
),
onOk: () => {
let idsStr = '';
configsTableSelected.forEach((value, key, map) => {
idsStr = `${idsStr + key},`;
});
const url = `v1/cs/configs?delType=ids&ids=${idsStr}`;
request({
url,
type: 'delete',
success(res) {
Message.success(locale.delSuccessMsg);
self.getData();
},
});
},
});
}
}
cloneSelectedDataConfirm() {
const { locale = {} } = this.props;
const self = this;
@ -704,8 +750,8 @@ class ConfigurationManagement extends React.Component {
self.field.setValue('cloneTargetSpace', undefined);
if (configsTableSelected.size === 0) {
Dialog.alert({
title: locale.exportSelectedAlertTitle,
content: locale.exportSelectedAlertContent,
title: locale.cloneSelectedAlertTitle,
content: locale.cloneSelectedAlertContent,
});
return;
}
@ -1258,7 +1304,16 @@ class ConfigurationManagement extends React.Component {
<div style={{ float: 'left' }}>
<Button
type={'primary'}
style={{ marginLeft: 60, marginRight: 10 }}
warning
style={{ marginRight: 10 }}
onClick={this.multipleSelectionDeletion.bind(this)}
data-spm-click={'gostr=/aliyun;locaid=configsDelete'}
>
{locale.deleteAction}
</Button>
<Button
type={'primary'}
style={{ marginRight: 10 }}
onClick={this.exportSelectedData.bind(this)}
data-spm-click={'gostr=/aliyun;locaid=configsExport'}
>

4
console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/NewConfig/NewConfig.js
View File

@ -365,10 +365,10 @@ class NewConfig extends React.Component {
validateChart(rule, value, callback) {
const { locale = {} } = this.props;
const chartReg = /[@#\$%\^&\*]+/g;
const chartReg = /[@#\$%\^&\*\s]+/g;
if (chartReg.test(value)) {
callback(locale.doNotEnte);
callback(locale.doNotEnter);
} else {
callback();
}

178
console/src/main/resources/static/console-fe/src/pages/Password/Password.js Normal file
View File

@ -0,0 +1,178 @@
/*
* Copyright 1999-2018 Alibaba Group Holding Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import React from 'react';
import PropTypes from 'prop-types';
import RegionGroup from 'components/RegionGroup';
import { ConfigProvider, Input, Field, Form, Message } from '@alifd/next';
import { getParams, setParams, request } from '../../globalLib';
import './index.scss';
const FormItem = Form.Item;
@ConfigProvider.config
class Password extends React.Component {
static displayName = 'Password';
static propTypes = {
locale: PropTypes.object,
};
constructor(props) {
super(props);
this.field = new Field(this);
this.state = {};
}
componentDidMount() {}
validatePassword(rule, value, callback) {
const { locale = {} } = this.props;
if (this.field.getValue('newPassword') !== this.field.getValue('confirmNewPassword')) {
callback(locale.passwordNotConsistent);
} else {
callback();
}
}
handleSubmit = () => {
const { locale = {} } = this.props;
this.field.validate((errors, values) => {
if (errors) {
return;
}
request({
type: 'post',
url: 'v1/auth/login',
data: values,
success: ({ code, data }) => {
if (code === 200) {
// TODO: 封装一个方法存储、读取token
localStorage.setItem('token', data);
// TODO: 使用react router
this.props.history.push('/');
}
if (code === 401) {
Message.error({
content: locale.invalidUsernameOrPassword,
});
}
},
error: () => {
Message.error({
content: locale.invalidUsernameOrPassword,
});
},
});
});
};
changePassword() {
const { locale = {} } = this.props;
this.field.validate((errors, values) => {
if (errors) {
return;
}
request({
type: 'put',
url: 'v1/auth/password',
data: values,
success: ({ code, data }) => {
if (code === 200) {
window.localStorage.clear();
this.props.history.push('/login');
}
if (code === 401) {
Message.error({
content: locale.invalidPassword,
});
}
},
error: () => {
Message.error({
content: locale.invalidPassword,
});
},
});
});
}
render() {
const { locale = {} } = this.props;
const formItemLayout = {
labelCol: { fixedSpan: 6 },
wrapperCol: { span: 18 },
};
return (
<div style={{ padding: 10 }}>
<RegionGroup left={locale.changePassword} />
<Form style={{ width: '300px' }} field={this.field}>
<FormItem label={locale.oldPassword} required {...formItemLayout}>
<Input
htmlType="password"
placeholder={locale.pleaseInputOldPassword}
{...this.field.init('oldPassword', {
rules: [
{
required: true,
message: locale.passwordRequired,
},
],
})}
disabled={this.state.type === 0}
/>
</FormItem>
<FormItem label={locale.newPassword} required {...formItemLayout}>
<Input
htmlType="password"
placeholder={locale.pleaseInputNewPassword}
{...this.field.init('newPassword', {
rules: [
{
required: true,
message: locale.passwordRequired,
},
],
})}
disabled={this.state.type === 0}
/>
</FormItem>
<FormItem label={locale.checkPassword} required {...formItemLayout}>
<Input
htmlType="password"
placeholder={locale.pleaseInputNewPasswordAgain}
{...this.field.init('confirmNewPassword', {
rules: [
{
required: true,
message: locale.passwordRequired,
},
{ validator: this.validatePassword.bind(this) },
],
})}
disabled={this.state.type === 0}
/>
</FormItem>
<FormItem label=" " {...formItemLayout}>
<Form.Submit type="primary" onClick={this.changePassword.bind(this)}>
{locale.changePassword}
</Form.Submit>
</FormItem>
</Form>
</div>
);
}
}
export default Password;

16
console/src/main/resources/static/console-fe/src/pages/Password/index.js Normal file
View File

@ -0,0 +1,16 @@
/*
* Copyright 1999-2018 Alibaba Group Holding Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import Password from './Password';
export default Password;

12
console/src/main/resources/static/console-fe/src/pages/Password/index.scss Normal file
View File

@ -0,0 +1,12 @@
/*
* Copyright 1999-2018 Alibaba Group Holding Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

48
console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceList/ServiceList.js
View File

@ -25,6 +25,7 @@ import {
Dialog,
Message,
ConfigProvider,
Switch,
} from '@alifd/next';
import { request } from '../../../globalLib';
import RegionGroup from '../../../components/RegionGroup';
@ -57,6 +58,7 @@ class ServiceList extends React.Component {
currentPage: 1,
keyword: '',
dataSource: [],
hasIpCount: !(localStorage.getItem('hasIpCount') === 'false'),
};
this.field = new Field(this);
}
@ -71,15 +73,14 @@ class ServiceList extends React.Component {
openEditServiceDialog() {
try {
this.editServiceDialog.current.getInstance()
.show(this.state.service);
} catch (error) {
}
this.editServiceDialog.current.getInstance().show(this.state.service);
} catch (error) {}
}
queryServiceList() {
const { currentPage, pageSize, keyword, withInstances = false } = this.state;
const { currentPage, pageSize, keyword, withInstances = false, hasIpCount } = this.state;
const parameter = [
`hasIpCount=${hasIpCount}`,
`withInstances=${withInstances}`,
`pageNo=${currentPage}`,
`pageSize=${pageSize}`,
@ -119,8 +120,7 @@ class ServiceList extends React.Component {
*
*/
showSampleCode(record) {
this.showcode.current.getInstance()
.openDialog(record);
this.showcode.current.getInstance().openDialog(record);
}
deleteService(service) {
@ -157,7 +157,6 @@ class ServiceList extends React.Component {
rowColor = row => ({ className: !row.healthyInstanceCount ? 'row-bg-red' : '' });
render() {
const { locale = {} } = this.props;
const {
@ -165,6 +164,7 @@ class ServiceList extends React.Component {
serviceList,
serviceName,
serviceNamePlaceholder,
hiddenEmptyService,
query,
create,
operation,
@ -172,7 +172,7 @@ class ServiceList extends React.Component {
sampleCode,
deleteAction,
} = locale;
const { keyword, nowNamespaceName, nowNamespaceId } = this.state;
const { keyword, nowNamespaceName, nowNamespaceId, hasIpCount } = this.state;
const { init, getValue } = this.field;
this.init = init;
this.getValue = getValue;
@ -221,6 +221,17 @@ class ServiceList extends React.Component {
}
/>
</FormItem>
<Form.Item label={`${hiddenEmptyService}:`}>
<Switch
checked={hasIpCount}
onChange={hasIpCount =>
this.setState({ hasIpCount, currentPage: 1 }, () => {
localStorage.setItem('hasIpCount', hasIpCount);
this.queryServiceList();
})
}
/>
</Form.Item>
<FormItem label="">
<Button
type="primary"
@ -266,8 +277,9 @@ class ServiceList extends React.Component {
<a
onClick={() =>
this.props.history.push(
`/serviceDetail?name=${record.name}&groupName=${record.groupName}`,
)}
`/serviceDetail?name=${record.name}&groupName=${record.groupName}`
)
}
style={{ marginRight: 5 }}
>
{detail}
@ -277,10 +289,7 @@ class ServiceList extends React.Component {
{sampleCode}
</a>
<span style={{ marginRight: 5 }}>|</span>
<a
onClick={() => this.deleteService(record)}
style={{ marginRight: 5 }}
>
<a onClick={() => this.deleteService(record)} style={{ marginRight: 5 }}>
{deleteAction}
</a>
</div>
@ -290,10 +299,11 @@ class ServiceList extends React.Component {
</Col>
</Row>
{this.state.total > this.state.pageSize && (
<div style={{
marginTop: 10,
textAlign: 'right',
}}
<div
style={{
marginTop: 10,
textAlign: 'right',
}}
>
<Pagination
current={this.state.currentPage}

4
console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceList/ServiceList.scss
View File

@ -26,4 +26,8 @@
color: #000;
margin-right: 8px;
}
.next-switch-off {
background-color: #f2f3f7;
border-color: #c4c6cf;
}
}

1814
console/src/main/resources/static/console-fe/yarn.lock
View File

File diff suppressed because it is too large Load Diff

2
console/src/main/resources/static/css/main.css
View File

File diff suppressed because one or more lines are too long

18
console/src/main/resources/static/js/main.js
View File

File diff suppressed because one or more lines are too long

2
core/pom.xml
View File

@ -18,7 +18,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>1.1.0</version>
<version>1.1.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

16
core/src/main/java/com/alibaba/nacos/core/utils/InetUtils.java
View File

@ -16,6 +16,10 @@
package com.alibaba.nacos.core.utils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.net.Inet4Address;
import java.net.InetAddress;
@ -27,10 +31,6 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static com.alibaba.nacos.core.utils.Constants.*;
/**
@ -108,7 +108,7 @@ public class InetUtils {
try {
int lowest = Integer.MAX_VALUE;
for (Enumeration<NetworkInterface> nics = NetworkInterface
.getNetworkInterfaces(); nics.hasMoreElements();) {
.getNetworkInterfaces(); nics.hasMoreElements(); ) {
NetworkInterface ifc = nics.nextElement();
if (ifc.isUp()) {
log.info("Testing interface: " + ifc.getDisplayName());
@ -133,8 +133,7 @@ public class InetUtils {
}
}
}
}
catch (IOException ex) {
} catch (IOException ex) {
log.error("Cannot get first non-loopback address", ex);
}
@ -144,8 +143,7 @@ public class InetUtils {
try {
return InetAddress.getLocalHost();
}
catch (UnknownHostException e) {
} catch (UnknownHostException e) {
log.warn("Unable to retrieve localhost");
}

241
distribution/conf/nacos-logback.xml
View File

@ -11,7 +11,7 @@
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${nacos.home}/logs/cmdb-main.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>2GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<MaxHistory>7</MaxHistory>
<totalSizeCap>7GB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
@ -34,8 +34,8 @@
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/naming-server.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>2GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<maxFileSize>1GB</maxFileSize>
<MaxHistory>7</MaxHistory>
<totalSizeCap>7GB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
@ -59,7 +59,7 @@
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/naming-raft.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>1GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<MaxHistory>7</MaxHistory>
<totalSizeCap>3GB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
@ -77,14 +77,14 @@
</appender>
<appender name="naming-ephemeral"
<appender name="naming-distro"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_HOME}/naming-ephemeral.log</file>
<file>${LOG_HOME}/naming-distro.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/naming-ephemeral.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<fileNamePattern>${LOG_HOME}/naming-distro.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>1GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<MaxHistory>7</MaxHistory>
<totalSizeCap>3GB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
@ -94,11 +94,11 @@
</encoder>
</appender>
<appender name="async-naming-ephemeral" class="ch.qos.logback.classic.AsyncAppender">
<appender name="async-naming-distro" class="ch.qos.logback.classic.AsyncAppender">
<discardingThreshold>0</discardingThreshold>
<queueSize>1024</queueSize>
<neverBlock>true</neverBlock>
<appender-ref ref="naming-ephemeral"/>
<appender-ref ref="naming-distro"/>
</appender>
<appender name="naming-event"
@ -108,7 +108,7 @@
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/naming-event.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>1GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<MaxHistory>7</MaxHistory>
<totalSizeCap>3GB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
@ -132,7 +132,7 @@
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/naming-push.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>1GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<MaxHistory>7</MaxHistory>
<totalSizeCap>3GB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
@ -148,7 +148,7 @@
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/naming-rt.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>1GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<MaxHistory>7</MaxHistory>
<totalSizeCap>3GB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
@ -165,7 +165,7 @@
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/naming-performance.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>1GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<MaxHistory>7</MaxHistory>
<totalSizeCap>3GB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
@ -175,109 +175,6 @@
</encoder>
</appender>
<appender name="naming-router"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_HOME}/naming-router.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/naming-router.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>2GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>7GB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
<encoder>
<Pattern>%date|%msg%n</Pattern>
<charset>UTF-8</charset>
</encoder>
</appender>
<appender name="naming-cache"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_HOME}/naming-cache.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/naming-cache.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>1GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>3GB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
<encoder>
<Pattern>%date|%msg%n</Pattern>
<charset>UTF-8</charset>
</encoder>
</appender>
<appender name="naming-device"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_HOME}/naming-device.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/naming-device.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>2GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>7GB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
<encoder>
<Pattern>%date|%msg%n</Pattern>
<charset>UTF-8</charset>
</encoder>
</appender>
<appender name="naming-tag"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_HOME}/naming-tag.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/naming-tag.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>1GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>3GB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
<encoder>
<Pattern>%date %level %msg%n%n</Pattern>
<charset>UTF-8</charset>
</encoder>
</appender>
<appender name="naming-tenant"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_HOME}/naming-tenant.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/naming-tenant.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>1GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>3GB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
<encoder>
<Pattern>%date %level %msg%n%n</Pattern>
<charset>UTF-8</charset>
</encoder>
</appender>
<appender name="naming-debug"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_HOME}/naming-debug.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/naming-debug.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>1GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>3GB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
<encoder>
<Pattern>%date %level %msg%n%n</Pattern>
<charset>UTF-8</charset>
</encoder>
</appender>
<!--config module logback config-->
<appender name="dumpFile"
class="ch.qos.logback.core.rolling.RollingFileAppender">
@ -286,7 +183,7 @@
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/config-dump.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>2GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<MaxHistory>7</MaxHistory>
<totalSizeCap>7GB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
@ -302,7 +199,7 @@
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/config-pull.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>20MB</maxFileSize>
<MaxHistory>15</MaxHistory>
<MaxHistory>7</MaxHistory>
<totalSizeCap>128MB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
@ -318,7 +215,7 @@
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/config-fatal.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>20MB</maxFileSize>
<MaxHistory>15</MaxHistory>
<MaxHistory>7</MaxHistory>
<totalSizeCap>128MB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
@ -334,7 +231,7 @@
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/config-memory.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>20MB</maxFileSize>
<MaxHistory>15</MaxHistory>
<MaxHistory>7</MaxHistory>
<totalSizeCap>128MB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
@ -350,7 +247,7 @@
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/config-pull-check.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>1GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<MaxHistory>7</MaxHistory>
<totalSizeCap>3GB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
@ -360,23 +257,6 @@
</encoder>
</appender>
<appender name="aclLog"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_HOME}/config-acl.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/config-acl.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>512MB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
<encoder>
<Pattern>%date %level %msg%n%n</Pattern>
<charset>UTF-8</charset>
</encoder>
</appender>
<appender name="clientLog"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_HOME}/config-client-request.log</file>
@ -384,7 +264,7 @@
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/config-client-request.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>2GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<MaxHistory>7</MaxHistory>
<totalSizeCap>7GB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
@ -394,23 +274,6 @@
</encoder>
</appender>
<appender name="sdkLog"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_HOME}/config-sdk-request.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/config-sdk-request.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>1GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>3GB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
<encoder>
<Pattern>%date|%msg%n</Pattern>
<charset>UTF-8</charset>
</encoder>
</appender>
<appender name="traceLog"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_HOME}/config-trace.log</file>
@ -418,7 +281,7 @@
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/config-trace.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>2GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<MaxHistory>7</MaxHistory>
<totalSizeCap>7GB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
@ -435,7 +298,7 @@
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/config-notify.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>1GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<MaxHistory>7</MaxHistory>
<totalSizeCap>3GB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
@ -445,23 +308,6 @@
</encoder>
</appender>
<appender name="appCollectorLog"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_HOME}/config-app.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/config-app.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>20MB</maxFileSize>
<MaxHistory>15</MaxHistory>
<totalSizeCap>128MB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
<encoder>
<Pattern>%date %level %msg%n%n</Pattern>
<charset>UTF-8</charset>
</encoder>
</appender>
<appender name="startLog"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_HOME}/config-server.log</file>
@ -469,7 +315,7 @@
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/config-server.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<MaxHistory>15</MaxHistory>
<MaxHistory>7</MaxHistory>
<totalSizeCap>512MB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
@ -486,7 +332,7 @@
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/nacos.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<MaxHistory>15</MaxHistory>
<MaxHistory>7</MaxHistory>
<totalSizeCap>512MB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
@ -503,7 +349,7 @@
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${LOG_HOME}/nacos-address.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>2GB</maxFileSize>
<MaxHistory>15</MaxHistory>
<MaxHistory>7</MaxHistory>
<totalSizeCap>7GB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
@ -531,9 +377,9 @@
<level value="INFO"/>
<appender-ref ref="async-naming-raft"/>
</logger>
<logger name="com.alibaba.nacos.naming.ephemeral" additivity="false">
<level value="DEBUG"/>
<appender-ref ref="async-naming-ephemeral"/>
<logger name="com.alibaba.nacos.naming.distro" additivity="false">
<level value="INFO"/>
<appender-ref ref="async-naming-distro"/>
</logger>
<logger name="com.alibaba.nacos.naming.event" additivity="false">
<level value="INFO"/>
@ -551,22 +397,6 @@
<level value="INFO"/>
<appender-ref ref="naming-performance"/>
</logger>
<logger name="com.alibaba.nacos.naming.router" additivity="false">
<level value="INFO"/>
<appender-ref ref="naming-router"/>
</logger>
<logger name="com.alibaba.nacos.naming.cache" additivity="false">
<level value="INFO"/>
<appender-ref ref="naming-cache"/>
</logger>
<logger name="com.alibaba.nacos.naming.tenant" additivity="false">
<level value="INFO"/>
<appender-ref ref="naming-tenant"/>
</logger>
<logger name="com.alibaba.nacos.naming.debug" additivity="false">
<level value="INFO"/>
<appender-ref ref="naming-debug"/>
</logger>
<logger name="com.alibaba.nacos.config.dumpLog" additivity="false">
<level value="INFO"/>
@ -589,21 +419,11 @@
<appender-ref ref="memoryFile"/>
</logger>
<logger name="com.alibaba.nacos.config.aclLog" additivity="false">
<level value="INFO"/>
<appender-ref ref="aclLog"/>
</logger>
<logger name="com.alibaba.nacos.config.clientLog" additivity="false">
<level value="info"/>
<appender-ref ref="clientLog"/>
</logger>
<logger name="com.alibaba.nacos.config.sdkLog" additivity="false">
<level value="INFO"/>
<appender-ref ref="sdkLog"/>
</logger>
<logger name="com.alibaba.nacos.config.notifyLog" additivity="false">
<level value="INFO"/>
<appender-ref ref="notifyLog"/>
@ -614,11 +434,6 @@
<appender-ref ref="traceLog"/>
</logger>
<logger name="com.alibaba.nacos.config.appCollectorLog" additivity="false">
<level value="INFO"/>
<appender-ref ref="appCollectorLog"/>
</logger>
<logger name="com.alibaba.nacos.config.startLog" additivity="false">
<level value="INFO"/>
<appender-ref ref="startLog"/>

BIN
distribution/plugins/health/nacos-health-plugin-example-1.0.jar
View File

Binary file not shown.

2
distribution/pom.xml
View File

@ -18,7 +18,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>1.1.0</version>
<version>1.1.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
example/pom.xml
View File

@ -18,7 +18,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>1.1.0</version>
<version>1.1.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

20
example/src/test/java/com/alibaba/nacos/example/AppTest.java
View File

@ -22,32 +22,28 @@ import junit.framework.TestSuite;
/**
* Unit test for simple App.
*/
public class AppTest
extends TestCase
{
public class AppTest
extends TestCase {
/**
* Create the test case
*
* @param testName name of the test case
*/
public AppTest( String testName )
{
super( testName );
public AppTest(String testName) {
super(testName);
}
/**
* @return the suite of tests being tested
*/
public static Test suite()
{
return new TestSuite( AppTest.class );
public static Test suite() {
return new TestSuite(AppTest.class);
}
/**
* Rigourous Test :-)
*/
public void testApp()
{
assertTrue( true );
public void testApp() {
assertTrue(true);
}
}

2
naming/pom.xml
View File

@ -18,7 +18,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>1.1.0</version>
<version>1.1.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

7
naming/src/main/java/com/alibaba/nacos/naming/acl/AuthInfo.java
View File

@ -25,7 +25,8 @@ public class AuthInfo {
private String appKey;
public AuthInfo() {}
public AuthInfo() {
}
public AuthInfo(String operator, String appKey) {
this.operator = operator;
@ -36,8 +37,8 @@ public class AuthInfo {
try {
String[] byteStrs = auth.split(",");
byte[] bytes = new byte[byteStrs.length];
for(int i = 0; i < byteStrs.length; i++) {
bytes[i] = (byte)(~(Short.parseShort(byteStrs[i])));
for (int i = 0; i < byteStrs.length; i++) {
bytes[i] = (byte) (~(Short.parseShort(byteStrs[i])));
}
String contentStr = new String(bytes, encoding);

185
naming/src/main/java/com/alibaba/nacos/naming/cluster/ServerListManager.java
View File

@ -54,6 +54,8 @@ public class ServerListManager {
private Map<String, List<Server>> distroConfig = new ConcurrentHashMap<>();
private Map<String, Long> distroBeats = new ConcurrentHashMap<>(16);
private Set<String> liveSites = new HashSet<>();
private final static String LOCALHOST_SITE = UtilsAndCommons.UNKNOWN_SITE;
@ -93,15 +95,15 @@ public class ServerListManager {
Loggers.SRV_LOG.warn("failed to get config: " + CLUSTER_CONF_FILE_PATH, e);
}
if (Loggers.DEBUG_LOG.isDebugEnabled()) {
Loggers.DEBUG_LOG.debug("SERVER-LIST from cluster.conf: {}", result);
if (Loggers.SRV_LOG.isDebugEnabled()) {
Loggers.SRV_LOG.debug("SERVER-LIST from cluster.conf: {}", result);
}
//use system env
if (CollectionUtils.isEmpty(serverList)) {
serverList = SystemUtils.getIPsBySystemEnv(UtilsAndCommons.SELF_SERVICE_CLUSTER_ENV);
if (Loggers.DEBUG_LOG.isDebugEnabled()) {
Loggers.DEBUG_LOG.debug("SERVER-LIST from system variable: {}", result);
if (Loggers.SRV_LOG.isDebugEnabled()) {
Loggers.SRV_LOG.debug("SERVER-LIST from system variable: {}", result);
}
}
@ -196,11 +198,17 @@ public class ServerListManager {
throw new IllegalArgumentException("server: " + server.getKey() + " is not in serverlist");
}
Long lastBeat = distroBeats.get(server.getKey());
long now = System.currentTimeMillis();
if (null != lastBeat) {
server.setAlive(now - lastBeat < switchDomain.getDistroServerExpiredMillis());
}
distroBeats.put(server.getKey(), now);
Date date = new Date(Long.parseLong(params[2]));
server.setLastRefTimeStr(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date));
server.setWeight(params.length == 4 ? Integer.parseInt(params[3]) : 1);
server.setAlive(System.currentTimeMillis() - server.getLastRefTime() < switchDomain.getDistroServerExpiredMillis());
List<Server> list = distroConfig.get(server.getSite());
if (list == null || list.size() <= 0) {
list = new ArrayList<>();
@ -230,65 +238,6 @@ public class ServerListManager {
distroConfig.put(server.getSite(), tmpServerList);
}
liveSites.addAll(distroConfig.keySet());
List<Server> servers = distroConfig.get(LOCALHOST_SITE);
if (CollectionUtils.isEmpty(servers)) {
return;
}
//local site servers
List<String> allLocalSiteSrvs = new ArrayList<>();
for (Server server : servers) {
if (server.getKey().endsWith(":0")) {
continue;
}
server.setAdWeight(switchDomain.getAdWeight(server.getKey()) == null ? 0 : switchDomain.getAdWeight(server.getKey()));
for (int i = 0; i < server.getWeight() + server.getAdWeight(); i++) {
if (!allLocalSiteSrvs.contains(server.getKey())) {
allLocalSiteSrvs.add(server.getKey());
}
if (server.isAlive() && !newHealthyList.contains(server)) {
newHealthyList.add(server);
}
}
}
Collections.sort(newHealthyList);
float curRatio = (float) newHealthyList.size() / allLocalSiteSrvs.size();
if (autoDisabledHealthCheck
&& curRatio > switchDomain.getDistroThreshold()
&& System.currentTimeMillis() - lastHealthServerMillis > STABLE_PERIOD) {
Loggers.SRV_LOG.info("[NACOS-DISTRO] distro threshold restored and " +
"stable now, enable health check. current ratio: {}", curRatio);
switchDomain.setHealthCheckEnabled(true);
// we must set this variable, otherwise it will conflict with user's action
autoDisabledHealthCheck = false;
}
if (!CollectionUtils.isEqualCollection(healthyServers, newHealthyList)) {
// for every change disable healthy check for some while
if (switchDomain.isHealthCheckEnabled()) {
Loggers.SRV_LOG.info("[NACOS-DISTRO] healthy server list changed, " +
"disable health check for {} ms from now on, old: {}, new: {}", STABLE_PERIOD,
healthyServers, newHealthyList);
switchDomain.setHealthCheckEnabled(false);
autoDisabledHealthCheck = true;
lastHealthServerMillis = System.currentTimeMillis();
}
healthyServers = newHealthyList;
notifyListeners();
}
}
public void clean() {
@ -310,29 +259,14 @@ public class ServerListManager {
}
private void cleanInvalidServers() {
for (Map.Entry<String, List<Server>> entry : distroConfig.entrySet()) {
List<Server> tmpServers = null;
List<Server> currentServerList = entry.getValue();
for (Server server : entry.getValue()) {
if (!server.isAlive()) {
tmpServers = new ArrayList<>();
for (Server server1 : currentServerList) {
String serverKey1 = server1.getKey() + "_" + server1.getSite();
String serverKey = server.getKey() + "_" + server.getSite();
if (!serverKey.equals(serverKey1) && !tmpServers.contains(server1)) {
tmpServers.add(server1);
}
}
}
}
if (tmpServers != null) {
distroConfig.put(entry.getKey(), tmpServers);
List<Server> currentServers = entry.getValue();
if (null == currentServers) {
distroConfig.remove(entry.getKey());
continue;
}
currentServers.removeIf(server -> !server.isAlive());
}
}
@ -397,11 +331,7 @@ public class ServerListManager {
return;
}
for (String key : distroConfig.keySet()) {
for (Server server : distroConfig.get(key)) {
server.setAlive(System.currentTimeMillis() - server.getLastRefTime() < switchDomain.getDistroServerExpiredMillis());
}
}
checkDistroHeartbeat();
int weight = Runtime.getRuntime().availableProcessors() / 2;
if (weight <= 0) {
@ -442,4 +372,79 @@ public class ServerListManager {
}
}
private void checkDistroHeartbeat() {
Loggers.SRV_LOG.debug("check distro heartbeat.");
List<Server> servers = distroConfig.get(LOCALHOST_SITE);
if (CollectionUtils.isEmpty(servers)) {
return;
}
List<Server> newHealthyList = new ArrayList<>(servers.size());
long now = System.currentTimeMillis();
for (Server s: servers) {
Long lastBeat = distroBeats.get(s.getKey());
if (null == lastBeat) {
continue;
}
s.setAlive(now - lastBeat < switchDomain.getDistroServerExpiredMillis());
}
//local site servers
List<String> allLocalSiteSrvs = new ArrayList<>();
for (Server server : servers) {
if (server.getKey().endsWith(":0")) {
continue;
}
server.setAdWeight(switchDomain.getAdWeight(server.getKey()) == null ? 0 : switchDomain.getAdWeight(server.getKey()));
for (int i = 0; i < server.getWeight() + server.getAdWeight(); i++) {
if (!allLocalSiteSrvs.contains(server.getKey())) {
allLocalSiteSrvs.add(server.getKey());
}
if (server.isAlive() && !newHealthyList.contains(server)) {
newHealthyList.add(server);
}
}
}
Collections.sort(newHealthyList);
float curRatio = (float) newHealthyList.size() / allLocalSiteSrvs.size();
if (autoDisabledHealthCheck
&& curRatio > switchDomain.getDistroThreshold()
&& System.currentTimeMillis() - lastHealthServerMillis > STABLE_PERIOD) {
Loggers.SRV_LOG.info("[NACOS-DISTRO] distro threshold restored and " +
"stable now, enable health check. current ratio: {}", curRatio);
switchDomain.setHealthCheckEnabled(true);
// we must set this variable, otherwise it will conflict with user's action
autoDisabledHealthCheck = false;
}
if (!CollectionUtils.isEqualCollection(healthyServers, newHealthyList)) {
// for every change disable healthy check for some while
if (switchDomain.isHealthCheckEnabled()) {
Loggers.SRV_LOG.info("[NACOS-DISTRO] healthy server list changed, " +
"disable health check for {} ms from now on, old: {}, new: {}", STABLE_PERIOD,
healthyServers, newHealthyList);
switchDomain.setHealthCheckEnabled(false);
autoDisabledHealthCheck = true;
lastHealthServerMillis = System.currentTimeMillis();
}
healthyServers = newHealthyList;
notifyListeners();
}
}
}

3
naming/src/main/java/com/alibaba/nacos/naming/cluster/transport/FastJsonSerializer.java
View File

@ -23,13 +23,10 @@ import com.alibaba.nacos.naming.misc.Loggers;
import com.alibaba.nacos.naming.pojo.Record;
import org.springframework.stereotype.Component;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
import static org.apache.commons.lang3.CharEncoding.UTF_8;
/**
* Use FastJSON to serialize data
*

20
naming/src/main/java/com/alibaba/nacos/naming/consistency/ephemeral/distro/DataSyncer.java
View File

@ -75,8 +75,8 @@ public class DataSyncer {
String key = iterator.next();
if (StringUtils.isNotBlank(taskMap.putIfAbsent(buildKey(key, task.getTargetServer()), key))) {
// associated key already exist:
if (Loggers.EPHEMERAL.isDebugEnabled()) {
Loggers.EPHEMERAL.debug("sync already in process, key: {}", key);
if (Loggers.DISTRO.isDebugEnabled()) {
Loggers.DISTRO.debug("sync already in process, key: {}", key);
}
iterator.remove();
}
@ -100,8 +100,8 @@ public class DataSyncer {
List<String> keys = task.getKeys();
if (Loggers.EPHEMERAL.isDebugEnabled()) {
Loggers.EPHEMERAL.debug("sync keys: {}", keys);
if (Loggers.DISTRO.isDebugEnabled()) {
Loggers.DISTRO.debug("sync keys: {}", keys);
}
Map<String, Datum> datumMap = dataStore.batchGet(keys);
@ -133,7 +133,7 @@ public class DataSyncer {
}
} catch (Exception e) {
Loggers.EPHEMERAL.error("sync data failed.", e);
Loggers.DISTRO.error("sync data failed.", e);
}
}
}, delay);
@ -164,8 +164,8 @@ public class DataSyncer {
try {
if (Loggers.EPHEMERAL.isDebugEnabled()) {
Loggers.EPHEMERAL.debug("server list is: {}", getServers());
if (Loggers.DISTRO.isDebugEnabled()) {
Loggers.DISTRO.debug("server list is: {}", getServers());
}
// send local timestamps to other servers:
@ -182,8 +182,8 @@ public class DataSyncer {
return;
}
if (Loggers.EPHEMERAL.isDebugEnabled()) {
Loggers.EPHEMERAL.debug("sync checksums: {}", keyChecksums);
if (Loggers.DISTRO.isDebugEnabled()) {
Loggers.DISTRO.debug("sync checksums: {}", keyChecksums);
}
for (Server member : getServers()) {
@ -193,7 +193,7 @@ public class DataSyncer {
NamingProxy.syncCheckSums(keyChecksums, member.getKey());
}
} catch (Exception e) {
Loggers.EPHEMERAL.error("timed sync task failed.", e);
Loggers.DISTRO.error("timed sync task failed.", e);
}
}
}

46
naming/src/main/java/com/alibaba/nacos/naming/consistency/ephemeral/distro/DistroConsistencyServiceImpl.java
View File

@ -104,14 +104,14 @@ public class DistroConsistencyServiceImpl implements EphemeralConsistencyService
private Map<String, String> syncChecksumTasks = new ConcurrentHashMap<>(16);
@PostConstruct
public void init() throws Exception {
public void init() {
GlobalExecutor.submit(new Runnable() {
@Override
public void run() {
try {
load();
} catch (Exception e) {
Loggers.EPHEMERAL.error("load data failed.", e);
Loggers.DISTRO.error("load data failed.", e);
}
}
});
@ -127,15 +127,15 @@ public class DistroConsistencyServiceImpl implements EphemeralConsistencyService
// size = 1 means only myself in the list, we need at least one another server alive:
while (serverListManager.getHealthyServers().size() <= 1) {
Thread.sleep(1000L);
Loggers.EPHEMERAL.info("waiting server list init...");
Loggers.DISTRO.info("waiting server list init...");
}
for (Server server : serverListManager.getHealthyServers()) {
if (NetUtils.localServer().equals(server.getKey())) {
continue;
}
if (Loggers.EPHEMERAL.isDebugEnabled()) {
Loggers.EPHEMERAL.debug("sync from " + server);
if (Loggers.DISTRO.isDebugEnabled()) {
Loggers.DISTRO.debug("sync from " + server);
}
// try sync data from remote server:
if (syncAllDataFromRemote(server)) {
@ -154,6 +154,7 @@ public class DistroConsistencyServiceImpl implements EphemeralConsistencyService
@Override
public void remove(String key) throws NacosException {
onRemove(key);
listeners.remove(key);
}
@Override
@ -186,8 +187,6 @@ public class DistroConsistencyServiceImpl implements EphemeralConsistencyService
return;
}
listeners.remove(key);
notifier.addTask(key, ApplyAction.DELETE);
}
@ -195,7 +194,7 @@ public class DistroConsistencyServiceImpl implements EphemeralConsistencyService
if (syncChecksumTasks.containsKey(server)) {
// Already in process of this server:
Loggers.EPHEMERAL.warn("sync checksum task already in process with {}", server);
Loggers.DISTRO.warn("sync checksum task already in process with {}", server);
return;
}
@ -208,7 +207,7 @@ public class DistroConsistencyServiceImpl implements EphemeralConsistencyService
for (Map.Entry<String, String> entry : checksumMap.entrySet()) {
if (distroMapper.responsible(KeyBuilder.getServiceName(entry.getKey()))) {
// this key should not be sent from remote server:
Loggers.EPHEMERAL.error("receive responsible key timestamp of " + entry.getKey() + " from " + server);
Loggers.DISTRO.error("receive responsible key timestamp of " + entry.getKey() + " from " + server);
// abort the procedure:
return;
}
@ -230,7 +229,9 @@ public class DistroConsistencyServiceImpl implements EphemeralConsistencyService
}
}
Loggers.EPHEMERAL.info("to remove keys: {}, to update keys: {}, source: {}", toRemoveKeys, toUpdateKeys, server);
if (Loggers.DISTRO.isDebugEnabled()) {
Loggers.DISTRO.info("to remove keys: {}, to update keys: {}, source: {}", toRemoveKeys, toUpdateKeys, server);
}
for (String key : toRemoveKeys) {
onRemove(key);
@ -244,7 +245,7 @@ public class DistroConsistencyServiceImpl implements EphemeralConsistencyService
byte[] result = NamingProxy.getData(toUpdateKeys, server);
processData(result);
} catch (Exception e) {
Loggers.EPHEMERAL.error("get data from " + server + " failed!", e);
Loggers.DISTRO.error("get data from " + server + " failed!", e);
}
} finally {
// Remove this 'in process' flag:
@ -260,7 +261,7 @@ public class DistroConsistencyServiceImpl implements EphemeralConsistencyService
processData(data);
return true;
} catch (Exception e) {
Loggers.EPHEMERAL.error("sync full data from " + server + " failed!", e);
Loggers.DISTRO.error("sync full data from " + server + " failed!", e);
return false;
}
}
@ -278,7 +279,7 @@ public class DistroConsistencyServiceImpl implements EphemeralConsistencyService
// pretty sure the service not exist:
if (switchDomain.isDefaultInstanceEphemeral()) {
// create empty service
Loggers.EPHEMERAL.info("creating service {}", entry.getKey());
Loggers.DISTRO.info("creating service {}", entry.getKey());
Service service = new Service();
String serviceName = KeyBuilder.getServiceName(entry.getKey());
String namespaceId = KeyBuilder.getNamespace(entry.getKey());
@ -298,7 +299,7 @@ public class DistroConsistencyServiceImpl implements EphemeralConsistencyService
if (!listeners.containsKey(entry.getKey())) {
// Should not happen:
Loggers.EPHEMERAL.warn("listener of {} not found.", entry.getKey());
Loggers.DISTRO.warn("listener of {} not found.", entry.getKey());
continue;
}
@ -307,7 +308,7 @@ public class DistroConsistencyServiceImpl implements EphemeralConsistencyService
listener.onChange(entry.getKey(), entry.getValue().value);
}
} catch (Exception e) {
Loggers.EPHEMERAL.error("[NACOS-DISTRO] error while execute listener of key: {}", entry.getKey(), e);
Loggers.DISTRO.error("[NACOS-DISTRO] error while execute listener of key: {}", entry.getKey(), e);
continue;
}
@ -322,6 +323,11 @@ public class DistroConsistencyServiceImpl implements EphemeralConsistencyService
if (!listeners.containsKey(key)) {
listeners.put(key, new CopyOnWriteArrayList<>());
}
if (listeners.get(key).contains(listener)) {
return;
}
listeners.get(key).add(listener);
}
@ -370,7 +376,7 @@ public class DistroConsistencyServiceImpl implements EphemeralConsistencyService
@Override
public void run() {
Loggers.EPHEMERAL.info("distro notifier started");
Loggers.DISTRO.info("distro notifier started");
while (true) {
try {
@ -407,16 +413,16 @@ public class DistroConsistencyServiceImpl implements EphemeralConsistencyService
continue;
}
} catch (Throwable e) {
Loggers.EPHEMERAL.error("[NACOS-DISTRO] error while notifying listener of key: {}", datumKey, e);
Loggers.DISTRO.error("[NACOS-DISTRO] error while notifying listener of key: {}", datumKey, e);
}
}
if (Loggers.EPHEMERAL.isDebugEnabled()) {
Loggers.EPHEMERAL.debug("[NACOS-DISTRO] datum change notified, key: {}, listener count: {}, action: {}",
if (Loggers.DISTRO.isDebugEnabled()) {
Loggers.DISTRO.debug("[NACOS-DISTRO] datum change notified, key: {}, listener count: {}, action: {}",
datumKey, count, action.name());
}
} catch (Throwable e) {
Loggers.EPHEMERAL.error("[NACOS-DISTRO] Error while handling notifying task", e);
Loggers.DISTRO.error("[NACOS-DISTRO] Error while handling notifying task", e);
}
}
}

10
naming/src/main/java/com/alibaba/nacos/naming/consistency/ephemeral/distro/TaskDispatcher.java
View File

@ -94,8 +94,8 @@ public class TaskDispatcher {
String key = queue.poll(partitionConfig.getTaskDispatchPeriod(),
TimeUnit.MILLISECONDS);
if (Loggers.EPHEMERAL.isDebugEnabled() && StringUtils.isNotBlank(key)) {
Loggers.EPHEMERAL.debug("got key: {}", key);
if (Loggers.DISTRO.isDebugEnabled() && StringUtils.isNotBlank(key)) {
Loggers.DISTRO.debug("got key: {}", key);
}
if (dataSyncer.getServers() == null || dataSyncer.getServers().isEmpty()) {
@ -124,8 +124,8 @@ public class TaskDispatcher {
syncTask.setKeys(keys);
syncTask.setTargetServer(member.getKey());
if (Loggers.EPHEMERAL.isDebugEnabled() && StringUtils.isNotBlank(key)) {
Loggers.EPHEMERAL.debug("add sync task: {}", JSON.toJSONString(syncTask));
if (Loggers.DISTRO.isDebugEnabled() && StringUtils.isNotBlank(key)) {
Loggers.DISTRO.debug("add sync task: {}", JSON.toJSONString(syncTask));
}
dataSyncer.submit(syncTask, 0);
@ -135,7 +135,7 @@ public class TaskDispatcher {
}
} catch (Exception e) {
Loggers.EPHEMERAL.error("dispatch sync task failed.", e);
Loggers.DISTRO.error("dispatch sync task failed.", e);
}
}
}

27
naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftCore.java
View File

@ -485,7 +485,9 @@ public class RaftCore {
return;
}
Loggers.RAFT.info("[RAFT] send beat with {} keys.", datums.size());
if (Loggers.RAFT.isDebugEnabled()) {
Loggers.RAFT.debug("[RAFT] send beat with {} keys.", datums.size());
}
local.resetLeaderDue();
@ -513,8 +515,6 @@ public class RaftCore {
array.add(element);
}
} else {
Loggers.RAFT.info("[RAFT] send beat only.");
}
packet.put("datums", array);
@ -531,13 +531,18 @@ public class RaftCore {
byte[] compressedBytes = out.toByteArray();
String compressedContent = new String(compressedBytes, StandardCharsets.UTF_8);
Loggers.RAFT.info("raw beat data size: {}, size of compressed data: {}",
content.length(), compressedContent.length());
if (Loggers.RAFT.isDebugEnabled()) {
Loggers.RAFT.debug("raw beat data size: {}, size of compressed data: {}",
content.length(), compressedContent.length());
}
for (final String server : peers.allServersWithoutMySelf()) {
try {
final String url = buildURL(server, API_BEAT);
Loggers.RAFT.info("send beat to server " + server);
if (Loggers.RAFT.isDebugEnabled()) {
Loggers.RAFT.debug("send beat to server " + server);
}
HttpClient.asyncHttpPostLarge(url, null, compressedBytes, new AsyncCompletionHandler<Integer>() {
@Override
public Integer onCompleted(Response response) throws Exception {
@ -549,7 +554,9 @@ public class RaftCore {
}
peers.update(JSON.parseObject(response.getResponseBody(), RaftPeer.class));
Loggers.RAFT.info("receive beat response from: {}", url);
if (Loggers.RAFT.isDebugEnabled()) {
Loggers.RAFT.debug("receive beat response from: {}", url);
}
return 0;
}
@ -615,8 +622,10 @@ public class RaftCore {
List<String> batch = new ArrayList<>();
if (!switchDomain.isSendBeatOnly()) {
int processedCount = 0;
Loggers.RAFT.info("[RAFT] received beat with {} keys, RaftCore.datums' size is {}, remote server: {}, term: {}, local term: {}",
beatDatums.size(), datums.size(), remote.ip, remote.term, local.term);
if (Loggers.RAFT.isDebugEnabled()) {
Loggers.RAFT.debug("[RAFT] received beat with {} keys, RaftCore.datums' size is {}, remote server: {}, term: {}, local term: {}",
beatDatums.size(), datums.size(), remote.ip, remote.term, local.term);
}
for (Object object : beatDatums) {
processedCount = processedCount + 1;

3
naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftStore.java
View File

@ -177,7 +177,8 @@ public class RaftStore {
instancesDatum.key = key;
instancesDatum.value = new Instances();
instancesDatum.value.setInstanceList(JSON.parseObject(jsonObject.getString("value"),
new TypeReference<List<Instance>>(){}));
new TypeReference<List<Instance>>() {
}));
if (!instancesDatum.value.getInstanceList().isEmpty()) {
for (Instance instance : instancesDatum.value.getInstanceList()) {
instance.setEphemeral(false);

Some files were not shown because too many files have changed in this diff Show More