Skip to content

Commit

Permalink
更新3.0.1版本
Browse files Browse the repository at this point in the history
修复了添加插件会因为中文路径而乱码的BUG,更换了jython2.7.1的包,放弃2.5版本
  • Loading branch information
0Chencc committed Aug 4, 2017
1 parent 5e85fdc commit 3c816ee
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 70 deletions.
2 changes: 1 addition & 1 deletion .classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.8.0_111">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.8.0_144">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,4 @@ $RECYCLE.BIN/
*.lnk
README.md
*.md
Setting.json
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>org.mstsec</groupId>
<artifactId>CTFCrackTools</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>3.0.1</version>
<packaging>jar</packaging>

<name>CTFCrackTools</name>
Expand All @@ -24,8 +24,8 @@
<!-- https://mvnrepository.com/artifact/org.python/jython -->
<dependency>
<groupId>org.python</groupId>
<artifactId>jython</artifactId>
<version>2.5.4-rc1</version>
<artifactId>jython-standalone</artifactId>
<version>2.7.1</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
Expand Down
4 changes: 2 additions & 2 deletions src/org/mstsec/CTFcrackTools/Core.java
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public void run() {
* Create the frame.
*/
public Core() {
setTitle("MSTTEAM-CTFCrackTools-v3.0");
setTitle("MSTTEAM-CTFCrackTools-v3.0.1");
try{
//设置本属性将改变窗口边框样式定义
BeautyEyeLNFHelper.frameBorderStyle = BeautyEyeLNFHelper.FrameBorderStyle.translucencySmallShadow;
Expand Down Expand Up @@ -866,7 +866,7 @@ public void actionPerformed(ActionEvent arg0) {
PythonInterpreter interpreter = new PythonInterpreter();
PySystemState sys = Py.getSystemState();
//sys.path.add("C:\\Users\\0chen\\Desktop\\Lib");
sys.path.add(System.getProperty("user.dir")+"\\Lib");
//sys.path.add(System.getProperty("user.dir")+"\\Lib");
try {
interpreter.execfile(json.getPath(arg0.getActionCommand()));
} catch (Exception e) {
Expand Down
5 changes: 3 additions & 2 deletions src/org/mstsec/CTFcrackTools/Json.java
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,11 @@ public String createJSON(String path) throws IOException{
if ((jsonText = jsonread.readLine())!=null){
//爬一下原有的json数据 以免被重写
JsonParser parser = new JsonParser();
object = (JsonObject) parser.parse(new FileReader(JsonPath));
object = (JsonObject)parser.parse(new InputStreamReader(new FileInputStream(JsonPath),"UTF-8"));
Plugins = object.getAsJsonArray("Plugins");
for (JsonElement jsonElement : Plugins) {
JsonObject Plugin = jsonElement.getAsJsonObject();
System.out.println(Plugin.get("path").getAsString()); //--debug
}
}else{
object = new JsonObject();
Expand Down Expand Up @@ -186,7 +187,7 @@ public void rmPllugin(String title)throws Exception{
if ((jsonText = jsonread.readLine())!=null){
//爬一下原有的json数据 以免被重写
JsonParser parser = new JsonParser();
object = (JsonObject) parser.parse(new FileReader(JsonPath));
object = (JsonObject)parser.parse(new InputStreamReader(new FileInputStream(JsonPath),"UTF-8"));
Plugins = object.getAsJsonArray("Plugins");
for (JsonElement jsonElement : Plugins) {
JsonObject Plugin = jsonElement.getAsJsonObject();
Expand Down
5 changes: 0 additions & 5 deletions target/classes/META-INF/MANIFEST.MF

This file was deleted.

This file was deleted.

50 changes: 0 additions & 50 deletions target/classes/META-INF/maven/org.mstsec/CTFcrackTools/pom.xml

This file was deleted.

0 comments on commit 3c816ee

Please sign in to comment.