github/arthas
4
0
Fork 0
mirror of https://github.com/alibaba/arthas.git synced 2024-04-21 10:21:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

jad command better support unicode. #1169

Browse Source
This commit is contained in:
hengyunabc
2020-05-13 23:19:32 +08:00
parent 3204c0ad36
commit 4a950140dc
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/taobao/arthas/core/command/klass100/JadCommand.java
+8 -1
View File
@@ -56,6 +56,7 @@ public class JadCommand extends AnnotatedCommand {
private String methodName;
private String code = null;
private boolean isRegEx = false;
private boolean hideUnicode = false;
/**
* jad output source code only
@@ -87,6 +88,12 @@ public class JadCommand extends AnnotatedCommand {
isRegEx = regEx;
}
@Option(longName = "hideUnicode", flag = true)
@Description("hide unicode, default value false")
public void setHideUnicode(boolean hideUnicode) {
this.hideUnicode = hideUnicode;
}
@Option(longName = "source-only", flag = true)
@Description("Output source code only")
public void setSourceOnly(boolean sourceOnly) {
@@ -153,7 +160,7 @@ public class JadCommand extends AnnotatedCommand {
Map<Class<?>, File> classFiles = transformer.getDumpResult();
File classFile = classFiles.get(c);
String source = Decompiler.decompile(classFile.getAbsolutePath(), methodName);
String source = Decompiler.decompile(classFile.getAbsolutePath(), methodName, hideUnicode);
if (source != null) {
source = pattern.matcher(source).replaceAll("");
} else {
core/src/main/java/com/taobao/arthas/core/util/Decompiler.java
+7 -1
View File
@@ -16,12 +16,17 @@ import org.benf.cfr.reader.api.OutputSinkFactory;
*/
public class Decompiler {
public static String decompile(String classFilePath, String methodName) {
return decompile(classFilePath, methodName, false);
}
/**
* @param classFilePath
* @param methodName
* @param hideUnicode
* @return
*/
public static String decompile(String classFilePath, String methodName) {
public static String decompile(String classFilePath, String methodName, boolean hideUnicode) {
final StringBuilder result = new StringBuilder(8192);
OutputSinkFactory mySink = new OutputSinkFactory() {
@@ -52,6 +57,7 @@ public class Decompiler {
* the cfr version is wrong. so disable show cfr version.
*/
options.put("showversion", "false");
options.put("hideutf", String.valueOf(hideUnicode));
if (!StringUtils.isBlank(methodName)) {
options.put("methodname", methodName);
}