Skip to content

Commit eb3a4af

Browse files
longforuslongforus
committed
修改bug 添加打包清单
1 parent 79e0e8f commit eb3a4af

File tree

7 files changed

+56
-37
lines changed

7 files changed

+56
-37
lines changed

‎META-INF/MANIFEST.MF‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Manifest-Version: 1.0
2+
Main-Class: com.longforus.apidebugger.MainKt
3+

‎src/main/java/com/longforus/apidebugger/ui/MainPanel.form‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<properties/>
7373
<border type="none" title="Request Parameter"/>
7474
<children>
75-
<component id="f744b" class="javax.swing.JTable" binding="mTbParame">
75+
<component id="f744b" class="javax.swing.JTable" binding="mTbParams">
7676
<constraints/>
7777
<properties>
7878
<rowHeight value="25"/>

‎src/main/java/com/longforus/apidebugger/ui/MainPanel.java‎

Lines changed: 38 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@
4242
*/
4343

4444
public class MainPanel extends JFrame {
45-
private final MyTableModel mMyTableModel;
45+
private MyTableModel mMyTableModel;
4646
private JComboBox mCbBaseUrl;
4747
private JButton mBtnSaveBaseUrl;
4848
private JComboBox mCbApiUrl;
4949
private JButton mBtnSend;
5050
private JComboBox mCbEncrypt;
5151
private JTextPane mTpResponse;
52-
private JTable mTbParame;
52+
private JTable mTbParams;
5353
private JTextPane mTpInfo;
5454
private JsonEditPanel mJep;
5555
private JButton mBtnSaveApi;
@@ -66,8 +66,8 @@ public JComboBox getCbMethod() {
6666
return mCbMethod;
6767
}
6868

69-
public JTable getTbParame() {
70-
return mTbParame;
69+
public JTable getTbParams() {
70+
return mTbParams;
7171
}
7272

7373
public MyTableModel getMyTableModel() {
@@ -117,8 +117,19 @@ public MainPanel(String title) throws HeadlessException {
117117
mCbMethod.setModel(new DefaultComboBoxModel(new String[] { "POST", "GET" }));
118118
setContentPane(baseP);
119119
setJMenuBar(UILifecycleHandler.INSTANCE.getMenuBar());
120-
mMyTableModel = new MyTableModel();
121-
mTbParame.setModel(mMyTableModel);
120+
initEvent();
121+
initTextPanel();
122+
mJep.jTree.setCellRenderer(new JsonTreeCellRenderer());
123+
initTable();
124+
pack();
125+
Dimension screensize = Toolkit.getDefaultToolkit().getScreenSize();
126+
int x = (int) screensize.getWidth() / 2 - baseP.getPreferredSize().width / 2;
127+
int y = (int) screensize.getHeight() / 2 - baseP.getPreferredSize().height / 2 - 40;
128+
setLocation(x, y);
129+
setVisible(true);
130+
}
131+
132+
private void initEvent() {
122133
mBtnSaveBaseUrl.addActionListener(e -> UIActionHandler.INSTANCE.onSaveBaseUrl(mCbBaseUrl.getModel().getSelectedItem()));
123134
btnDelUrl.addActionListener(e -> UIActionHandler.INSTANCE.onDelBaseUrl(mCbBaseUrl.getModel().getSelectedItem()));
124135
btnDelApi.addActionListener(e -> UIActionHandler.INSTANCE.onDelApiUrl((ApiBean) mCbApiUrl.getModel().getSelectedItem()));
@@ -128,6 +139,9 @@ public MainPanel(String title) throws HeadlessException {
128139
mBtnSend.addActionListener(e -> UIActionHandler.INSTANCE.onSend());
129140
mCbMethod.addItemListener(e -> UIActionHandler.INSTANCE.onMethodChanged(mCbMethod.getSelectedIndex()));
130141
mCbEncrypt.addItemListener(e -> UIActionHandler.INSTANCE.onEncryptTypeChanged(((IEncryptHandler) e.getItem()).getTypeCode()));
142+
}
143+
144+
private void initTextPanel() {
131145
mTpResponse.addMouseListener(new MouseInputAdapter() {
132146
@Override
133147
public void mouseClicked(MouseEvent e) {
@@ -205,8 +219,12 @@ protected SizeRequirements calculateMinorAxisRequirements(int axis, SizeRequirem
205219
};
206220
mTpResponse.setEditorKit(editorKit);
207221
mTpInfo.setEditorKit(editorKit);
208-
mJep.jTree.setCellRenderer(new JsonTreeCellRenderer());
209-
mTbParame.addKeyListener(new KeyListener() {
222+
}
223+
224+
private void initTable() {
225+
mMyTableModel = new MyTableModel();
226+
mTbParams.setModel(mMyTableModel);
227+
mTbParams.addKeyListener(new KeyListener() {
210228
@Override
211229
public void keyTyped(KeyEvent e) {
212230

@@ -220,27 +238,21 @@ public void keyPressed(KeyEvent e) {
220238
@Override
221239
public void keyReleased(KeyEvent e) {
222240
if (e.getKeyCode() == KeyEvent.VK_DELETE) {
223-
mMyTableModel.removeRow(mTbParame.getSelectedRow());
241+
mMyTableModel.removeRow(mTbParams.getSelectedRow());
224242
}
225243
}
226244
});
227-
mTbParame.getColumnModel().getColumn(0).setPreferredWidth(50);
228-
mTbParame.getColumnModel().getColumn(1).setPreferredWidth(120);
229-
mTbParame.getColumnModel().getColumn(2).setPreferredWidth(350);
245+
mTbParams.getColumnModel().getColumn(0).setPreferredWidth(50);
246+
mTbParams.getColumnModel().getColumn(1).setPreferredWidth(120);
247+
mTbParams.getColumnModel().getColumn(2).setPreferredWidth(350);
230248
btnAddRow.addActionListener(e -> {
231249
mMyTableModel.addEmptyRow();
232-
mTbParame.requestFocus();
250+
mTbParams.requestFocus();
233251
int index = mMyTableModel.getRowCount() - 1;
234-
mTbParame.setRowSelectionInterval(index, index);//最后一行获得焦点
235-
mTbParame.editCellAt(index, 1);
252+
mTbParams.setRowSelectionInterval(index, index);//最后一行获得焦点
253+
mTbParams.editCellAt(index, 1);
236254
});
237-
btnDelRow.addActionListener(e -> mMyTableModel.removeRow(mTbParame.getSelectedRow()));
238-
pack();
239-
Dimension screensize = Toolkit.getDefaultToolkit().getScreenSize();
240-
int x = (int) screensize.getWidth() / 2 - baseP.getPreferredSize().width / 2;
241-
int y = (int) screensize.getHeight() / 2 - baseP.getPreferredSize().height / 2 - 40;
242-
setLocation(x, y);
243-
setVisible(true);
255+
btnDelRow.addActionListener(e -> mMyTableModel.removeRow(mTbParams.getSelectedRow()));
244256
}
245257

246258
private void createUIComponents() {
@@ -262,7 +274,7 @@ public int getCurMethod() {
262274
}
263275

264276
public int getCurEncryptCode() {
265-
return mCbMethod.getSelectedIndex();
277+
return mCbEncrypt.getSelectedIndex();
266278
}
267279

268280
public String getCurBaseUrl() {
@@ -299,9 +311,9 @@ public String getCurBaseUrl() {
299311
final JScrollPane scrollPane1 = new JScrollPane();
300312
baseP.add(scrollPane1, cc.xyw(1, 8, 11, CellConstraints.FILL, CellConstraints.FILL));
301313
scrollPane1.setBorder(BorderFactory.createTitledBorder("Request Parameter"));
302-
mTbParame = new JTable();
303-
mTbParame.setRowHeight(25);
304-
scrollPane1.setViewportView(mTbParame);
314+
mTbParams = new JTable();
315+
mTbParams.setRowHeight(25);
316+
scrollPane1.setViewportView(mTbParams);
305317
final JScrollPane scrollPane2 = new JScrollPane();
306318
scrollPane2.setHorizontalScrollBarPolicy(31);
307319
baseP.add(scrollPane2, cc.xyw(1, 12, 11, CellConstraints.FILL, CellConstraints.FILL));

‎src/main/kotlin/com/longforus/apidebugger/HttpManage.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ object HttpManage {
2424

2525

2626
fun sendRequest() {
27-
val request = buildRequest(getAbsoluteUrl(mainPanel.curApiUrl), UIActionHandler.getParameMap(mainPanel.tbParame,false), mainPanel.curMethod, mainPanel.curEncryptCode)
27+
val request = buildRequest(getAbsoluteUrl(mainPanel.curApiUrl), UIActionHandler.getParameMap(mainPanel.tbParams,false), mainPanel.curMethod, mainPanel.curEncryptCode)
2828
doRequest(request)
2929
}
3030

‎src/main/kotlin/com/longforus/apidebugger/UIActionHandler.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ object UIActionHandler {
3131
apiBean = ApiBean(selectedItem, it.id)
3232
apiBean.encryptType = mainPanel.selectedEncryptID
3333
apiBean.method = mainPanel.selectedMethodType
34-
apiBean.parameMap = getParameMap(mainPanel.tbParame)
34+
apiBean.parameMap = getParameMap(mainPanel.tbParams)
3535
it.apis.add(0, apiBean)
3636
val model = mainPanel.cbApiUrl.model as DefaultComboBoxModel
3737
model.insertElementAt(apiBean, 0)
@@ -40,7 +40,7 @@ object UIActionHandler {
4040
apiBean = selectedItem as ApiBean
4141
apiBean.encryptType = mainPanel.selectedEncryptID
4242
apiBean.method = mainPanel.selectedMethodType
43-
apiBean.parameMap = getParameMap(mainPanel.tbParame)
43+
apiBean.parameMap = getParameMap(mainPanel.tbParams)
4444
}
4545
OB.apiBox.put(apiBean)
4646
}

‎src/main/kotlin/com/longforus/apidebugger/UILifecycleHandler.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ object UILifecycleHandler {
4545
if (api == null) {
4646
mainPanel.cbEncrypt.selectedIndex = 0
4747
mainPanel.cbMethod.selectedIndex = 0
48-
mainPanel.tbParame.model = DefaultTableModel(arrayOf( "key", "value"), MyValueHandler.PARAME_TABLE_ROW_COUNT)
48+
mainPanel.tbParams.model = DefaultTableModel(arrayOf( "key", "value"), MyValueHandler.PARAME_TABLE_ROW_COUNT)
4949
} else {
5050
val id2Index = MyValueHandler.encryptId2Index(api.encryptType)
5151
mainPanel.cbEncrypt.selectedIndex = id2Index
5252
mainPanel.cbMethod.selectedIndex = api.method
5353
if (api.parameMap.isEmpty()) {
54-
mainPanel.tbParame.model = DefaultTableModel(arrayOf( "key", "value"), MyValueHandler.PARAME_TABLE_ROW_COUNT)
54+
mainPanel.tbParams.model = DefaultTableModel(arrayOf( "key", "value"), MyValueHandler.PARAME_TABLE_ROW_COUNT)
5555
} else {
5656
// api.parameMap.entries.forEachIndexed { index, entry ->
5757
// mainPanel.tbParame.model.setValueAt(entry.key, index, 1)

‎src/main/kotlin/com/longforus/apidebugger/encrypt/DefaultEncryptHandler.kt‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,22 @@ import okhttp3.RequestBody
1010
* Created by XQ Yang on 8/30/2018 5:13 PM.
1111
* Description :
1212
*/
13-
class DefaultEncryptHandler:IEncryptHandler(){
14-
override val typeCode: Int= 0
13+
class DefaultEncryptHandler : IEncryptHandler() {
14+
override val typeCode: Int = 0
1515
override val title: String = "default"
1616

1717

1818
override fun onPostMethodEncrypt(params: Map<String, String>?, builder: Request.Builder, url: String): RequestBody {
19+
val sb = StringBuilder("?")
1920
val encodingBuilder = FormBody.Builder()
2021
params?.forEach {
21-
encodingBuilder.add(it.key,it.value)
22+
encodingBuilder.add(it.key, it.value)
23+
sb.append(it.key).append("=").append(it.value).append("&")
2224
mainPanel.tpInfo.append("key = ${it.key} value = ${it.value} \n")
2325
}
24-
return encodingBuilder.build()
26+
val resultUrl = url + if (sb.endsWith("?") || sb.endsWith("&")) sb.subSequence(0, sb.length - 1) else sb.toString()
27+
mainPanel.tpInfo.append("Url :\n$resultUrl \n")
28+
return encodingBuilder.build()
2529
}
2630

2731
override fun onGetMethodEncrypt(params: Map<String, String>?, builder: Request.Builder, url: String) {
@@ -33,7 +37,7 @@ class DefaultEncryptHandler:IEncryptHandler(){
3337
}
3438
val resultUrl = url + if (sb.endsWith("?") || sb.endsWith("&")) sb.subSequence(0, sb.length - 1) else sb.toString()
3539
builder.url(resultUrl)
36-
mainPanel.tpInfo.append(" url : $resultUrl \n")
40+
mainPanel.tpInfo.append("Url :\n$resultUrl \n")
3741
}
3842

3943
}

0 commit comments

Comments
 (0)