Skip to content

Commit

Permalink
1. 对 UI 进行大调整
Browse files Browse the repository at this point in the history
2. 修改为标签式的使用方式
3. 移除 mybatis jump 功能
  • Loading branch information
liuzhihang committed Apr 17, 2021
1 parent ca0e766 commit 07e9f28
Show file tree
Hide file tree
Showing 49 changed files with 1,434 additions and 2,419 deletions.
11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ Toolkit

特征
----
- Mybatis
- 通过侧栏箭头在 MyBatis XML文件和 Mapper文件之间相互跳转
- mapper文件id简单检查
- Json
- JavaBean复制为Json字符串
- Json字符串格式化
Expand All @@ -39,16 +36,18 @@ Toolkit

更新
----
## [v1.0.9](https://github.com/liuzhihang/toolkit/releases/tag/v1.0.9) (2020-07-31)
## [v1.1.1](https://github.com/liuzhihang/toolkit/releases/tag/v1.1.1) (2021-04-18)

- 修复 Mapper 为空 不能跳转 Xml 的问题
- 对 UI 进行大改版
- 标签化管理, 更美观, 通用
- 移除 mybatis jump 功能, 可以单独使用 mybatis jump 插件, 或使用其他 mybatis 插件.

[查看更多历史更新记录](./doc/ChangeNotes.md)

关于我
----

欢迎关注公众号:liuzhihangs
欢迎关注公众号:『 程序员小航 』

<img src="https://liuzhihang.com/oss/pic/wechat.jpg" width="20%" height="20%" />

Expand Down
14 changes: 8 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
plugins {
id 'java'
id 'org.jetbrains.intellij' version '0.4.8'
id 'org.jetbrains.intellij' version '0.7.2'
}

group 'com.liuzhihang.toolkit'
version '1.1.0'
version '1.1.1'

sourceCompatibility = 1.8
JavaVersion.VERSION_11

repositories {
mavenLocal()
Expand All @@ -17,14 +17,12 @@ repositories {

dependencies {
testCompile group: 'junit', name: 'junit', version: '4.12'
compile group: 'org.dom4j', name: 'dom4j', version: '2.1.1'
// compile group: 'com.alibaba', name: 'fastjson', version: '1.2.58'

}

// See https://github.com/JetBrains/gradle-intellij-plugin/
intellij {
version '2020.2'
version '2021.1'
plugins = ['java']
pluginName 'Toolkit'
updateSinceUntilBuild false
Expand All @@ -34,4 +32,8 @@ patchPluginXml {

pluginDescription(file(descriptionFile).text)
changeNotes(file(changesFile).text)
}

tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
}
12 changes: 8 additions & 4 deletions parts/changeNotes.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,22 @@

<h4>English introduction</h4>
<ul>
<li>1.1.0
<li>1.1.1
<ol>
<li>Fix conflicts with other plugins</li>
<li>Make a major revision to the UI</li>
<li>Labeled management, more beautiful and universal</li>
<li>To remove the mybatis jump function, you can use the mybatis jump plug-in alone, or use other mybatis plug-ins.</li>
</ol>
</li>
<li><a href="https://github.com/liuzhihangs/toolkit/blob/master/doc/ChangeNotes.md">More records</a></li>
</ul>
<h4>中文介绍</h4>
<ul>
<li>1.1.0
<li>1.1.1
<ol>
<li>修复和其他插件冲突的问题</li>
<li>对 UI 进行大改版</li>
<li>标签化管理, 更美观, 通用</li>
<li>移除 mybatis jump 功能, 可以单独使用 mybatis jump 插件, 或使用其他 mybatis 插件.</li>
</ol>
</li>
<li><a href="https://github.com/liuzhihangs/toolkit/blob/master/doc/ChangeNotes.md">更多记录</a></li>
Expand Down
14 changes: 1 addition & 13 deletions parts/pluginDescription.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@ <h1>A toolkit that can support MyBatis, Json, Xml, Base64 and other operations.<
<h4>English introduction</h4>
<br/>
<ul>
<li>MyBatis
<ul>
<li>Jump between Mapper and Xml files through the icon in the sidebar</li>
<li>mapper file id simple check</li>
</ul>
</li>
<li>JSON
<ul>
<li>Copy JavaBean as Json string</li>
Expand Down Expand Up @@ -49,12 +43,6 @@ <h4>English introduction</h4>
<h4>中文介绍</h4>
<br/>
<ul>
<li>MyBatis
<ul>
<li>通过侧栏的icon实现 Mapper 和 Xml 文件之间跳转</li>
<li>mapper文件id简单检查</li>
</ul>
</li>
<li>JSON
<ul>
<li>将JavaBean复制为Json字符串</li>
Expand Down Expand Up @@ -83,7 +71,7 @@ <h4>中文介绍</h4>
<h4>Other</h4>
<br/>
<ul>
<li>个人公众号: 『 刘志航</li>
<li>个人公众号: 『 程序员小航</li>
<br/>
<li>小伙伴们如果有遇到问题或者有使用建议,可以关注公众号并留言。</li>
</ul>
Expand Down
29 changes: 29 additions & 0 deletions src/main/java/com/liuzhihang/toolkit/ToolkitBundle.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.liuzhihang.toolkit;

import com.intellij.DynamicBundle;
import org.jetbrains.annotations.*;

import java.util.function.Supplier;

public final class ToolkitBundle extends DynamicBundle {

@NonNls
private static final String BUNDLE = "messages.ToolkitBundle";
private static final ToolkitBundle INSTANCE = new ToolkitBundle();

private ToolkitBundle() {
super(BUNDLE);
}

@NotNull
public static @Nls
String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object... params) {
return INSTANCE.getMessage(key, params);
}

@NotNull
public static Supplier<String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object... params) {
return INSTANCE.getLazyMessage(key, params);
}
}

This file was deleted.

Loading

0 comments on commit 07e9f28

Please sign in to comment.