diff --git a/jcommon/docean/src/main/java/com/xiaomi/youpin/docean/Mvc.java b/jcommon/docean/src/main/java/com/xiaomi/youpin/docean/Mvc.java index 244c0bbc0..d6cd74510 100644 --- a/jcommon/docean/src/main/java/com/xiaomi/youpin/docean/Mvc.java +++ b/jcommon/docean/src/main/java/com/xiaomi/youpin/docean/Mvc.java @@ -174,7 +174,12 @@ public void callMethod(MvcContext context, MvcRequest request, MvcResponse respo if (method.getMethod().getParameterTypes().length == 1 && method.getMethod().getParameterTypes()[0].equals(MvcContext.class)) { params[0] = context; } else { - params = methodInvoker.getMethodParams(method.getMethod(), args); + try { + params = methodInvoker.getMethodParams(method.getMethod(), args); + } catch (Exception e) { + log.error("getMethodParams error,path:{},params:{},method:{}", context.getPath(), + new Gson().toJson(context.getParams()), request.getMethod().toLowerCase(Locale.ROOT), e); + } } Object data = this.mvcConfig.isUseCglib() ? methodInvoker.invokeFastMethod(method.getObj(), method.getMethod(), params) : methodInvoker.invokeMethod(method.getObj(), method.getMethod(), params); diff --git a/jcommon/es/src/test/java/com/xiaomi/mone/es/test/EsClientTest.java b/jcommon/es/src/test/java/com/xiaomi/mone/es/test/EsClientTest.java index 80b6ff659..97ef93055 100644 --- a/jcommon/es/src/test/java/com/xiaomi/mone/es/test/EsClientTest.java +++ b/jcommon/es/src/test/java/com/xiaomi/mone/es/test/EsClientTest.java @@ -13,6 +13,7 @@ import org.elasticsearch.action.update.UpdateRequest; import org.elasticsearch.action.update.UpdateResponse; import org.elasticsearch.client.indices.GetMappingsResponse; +import org.elasticsearch.client.indices.IndexTemplatesExistRequest; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHit; @@ -228,4 +229,12 @@ public void queryIndexMetadataTest() throws IOException { GetMappingsResponse metadata = client.queryIndexMapping("zgq_common_milog_staging_app_private_1"); System.out.println(String.format("result:%s", gson.toJson(metadata))); } + + @Test + public void existsTemplateTest() throws IOException { + String templateName = "zgq_common_milog_app_private_1 "; + IndexTemplatesExistRequest request = new IndexTemplatesExistRequest(templateName); + boolean res = client.existsTemplate(request); + System.out.println("result:" + res); + } } diff --git a/jcommon/excel/pom.xml b/jcommon/excel/pom.xml index f48fdec10..891e02058 100644 --- a/jcommon/excel/pom.xml +++ b/jcommon/excel/pom.xml @@ -8,9 +8,10 @@ 1.4-jdk20-SNAPSHOT excel + ${submodule-release.version} - 8 - 8 + 21 + 21 diff --git a/jcommon/feishu/pom.xml b/jcommon/feishu/pom.xml index 8f72e4ea7..4623d8cec 100644 --- a/jcommon/feishu/pom.xml +++ b/jcommon/feishu/pom.xml @@ -8,11 +8,12 @@ 1.4-jdk20-SNAPSHOT feishu + ${submodule-release.version} run.mone http - 1.4-jdk20-SNAPSHOT + ${submodule-release.version} compile diff --git a/jcommon/file/src/main/java/com/xiaomi/mone/file/MLog.java b/jcommon/file/src/main/java/com/xiaomi/mone/file/MLog.java index 2f83fca3c..0f96fa63d 100644 --- a/jcommon/file/src/main/java/com/xiaomi/mone/file/MLog.java +++ b/jcommon/file/src/main/java/com/xiaomi/mone/file/MLog.java @@ -38,7 +38,7 @@ public class MLog { @Getter private Queue msgQueue = new LinkedList<>(); @Getter - private Long appendTime; + private volatile Long appendTime; /** * 用户自定义的行首正则 */