Merge branch 'develop' of http://10.0.6.99/common/maat_service.git into develop

This commit is contained in:
zhangdongxu
2018-02-28 10:15:49 +08:00
180 changed files with 44 additions and 23038 deletions

View File

@@ -1815,7 +1815,9 @@ public class ConfigSourcesService extends BaseService {
if (null != compileList && compileList.size() > 0) {
for (ConfigCompile config : compileList) {
String msg = checkCompileOptForUpdate(config);
if (config.getOpTime()==null) {
config.setOpTime(opTime);
}
if (!msg.equals("ok")) {
thread.setExceptionInfo(msg + sb.toString());
throw new RestServiceException(thread, System.currentTimeMillis() - start, msg + sb.toString(),