Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update dependency version and fix log bug #783

Merged
merged 1 commit into from
Jan 19, 2024
Merged

feat: update dependency version and fix log bug #783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion jcommon/docean/src/main/java/com/xiaomi/youpin/docean/Mvc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
9 changes: 9 additions & 0 deletions jcommon/es/src/test/java/com/xiaomi/mone/es/test/EsClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
}
5 changes: 3 additions & 2 deletions jcommon/excel/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
<version>1.4-jdk20-SNAPSHOT</version>
</parent>
<artifactId>excel</artifactId>
<version>${submodule-release.version}</version>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
</properties>
<dependencies>
<dependency>
Expand Down
3 changes: 2 additions & 1 deletion jcommon/feishu/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@
<version>1.4-jdk20-SNAPSHOT</version>
</parent>
<artifactId>feishu</artifactId>
<version>${submodule-release.version}</version>
<dependencies>
<dependency>
<groupId>run.mone</groupId>
<artifactId>http</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>${submodule-release.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion jcommon/file/src/main/java/com/xiaomi/mone/file/MLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public class MLog {
@Getter
private Queue<String> msgQueue = new LinkedList<>();
@Getter
private Long appendTime;
private volatile Long appendTime;
/**
* 用户自定义的行首正则
*/
Expand Down