Skip to content

Commit 04ed841

Browse files
committed
调整图片上传后第二次不刷新
1 parent c6b01cc commit 04ed841

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+505
-66
lines changed

conf/nbs.db

0 Bytes
Binary file not shown.

src/main/java/UI/AppMainWindow.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import com.nbs.ipfs.entity.IpfsMessage;
1515
import com.nbs.tools.ConfigHelper;
1616
import com.nbs.tools.PropertyUtil;
17-
import com.nbs.ui.frames.MainFrame;
18-
import io.nbs.commons.utils.Base64CodecUtil;
17+
import com.nbs.ui.frames.MainFrameOld;
18+
import UI.common.Base64CodecUtil;
1919
import io.nbs.commons.utils.BaseURLUtil;
2020
import io.nbs.commons.helper.RadomCharactersHelper;
2121
import io.ipfs.api.IPFS;
@@ -27,6 +27,7 @@
2727
import org.slf4j.Logger;
2828
import org.slf4j.LoggerFactory;
2929

30+
3031
import javax.swing.*;
3132
import java.awt.*;
3233
import java.io.File;
@@ -60,7 +61,7 @@ public class AppMainWindow {
6061

6162
private static boolean boradcastSuccess = false;
6263

63-
public static MainFrame frame;
64+
public static MainFrameOld frame;
6465
/**
6566
* 主窗口
6667
*/
@@ -213,7 +214,7 @@ private void initialize(){
213214
e.printStackTrace();
214215
}
215216

216-
frame = new MainFrame();
217+
frame = new MainFrameOld();
217218
//set window Size
218219
frame.setBounds(ConstantsUI.MAIN_WINDOW_X,ConstantsUI.MAIN_WINDOW_Y
219220
,ConstantsUI.MAIN_WINDOW_WIDTH,ConstantsUI.MAIN_WINDOW_HEIGHT);

src/main/java/io/nbs/commons/utils/Base64CodecUtil.java renamed to src/main/java/UI/common/Base64CodecUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.nbs.commons.utils;
1+
package UI.common;
22

33
import com.alibaba.fastjson.JSON;
44
import com.nbs.entity.PeerBoradcastInfo;

src/main/java/UI/panel/im/IMPanel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
import com.nbs.ipfs.entity.IpfsMessage;
1414
import io.nbs.commons.helper.DateHelper;
1515
import io.nbs.client.cnsts.ColorCnst;
16-
import com.nbs.ui.panels.ChatPanel;
17-
import io.nbs.commons.utils.Base64CodecUtil;
16+
import io.nbs.client.ui.panels.im.ChatPanel;
17+
import UI.common.Base64CodecUtil;
1818
import io.ipfs.api.IPFS;
1919

2020
import org.apache.commons.lang3.StringUtils;

src/main/java/com/nbs/biz/data/dao/BasicDao.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.nbs.biz.data.dao;
22

3-
import com.nbs.biz.data.entity.BasicModel;
3+
import com.nbs.biz.data.entity.BasicEntity;
44
import org.apache.ibatis.exceptions.PersistenceException;
55
import org.apache.ibatis.session.SqlSession;
66
import org.slf4j.Logger;
@@ -30,7 +30,7 @@ public BasicDao(SqlSession session, Class clazz)
3030
this.className = clazz.getName();
3131
}
3232

33-
public int insert(BasicModel model)
33+
public int insert(BasicEntity model)
3434
{
3535
return session.insert(className + ".insert", model);
3636
}
@@ -60,12 +60,12 @@ private List _findAll(int time)
6060
}
6161
}
6262

63-
public BasicModel findById(String id)
63+
public BasicEntity findById(String id)
6464
{
6565
return _findById(id, 0);
6666
}
6767

68-
private BasicModel _findById(String id, int time)
68+
private BasicEntity _findById(String id, int time)
6969
{
7070
if (time > 10)
7171
{
@@ -75,7 +75,7 @@ private BasicModel _findById(String id, int time)
7575

7676
try
7777
{
78-
return (BasicModel) session.selectOne(className + ".findById", id);
78+
return (BasicEntity) session.selectOne(className + ".findById", id);
7979
} catch (PersistenceException exception)
8080
{
8181
System.out.println("没有查询到 BasicModel 对象,继续查询");
@@ -110,12 +110,12 @@ public int deleteAll()
110110
return session.delete(className + ".deleteAll");
111111
}
112112

113-
public int update(BasicModel model)
113+
public int update(BasicEntity model)
114114
{
115115
return session.update(className + ".update", model);
116116
}
117117

118-
public int updateIgnoreNull(BasicModel model)
118+
public int updateIgnoreNull(BasicEntity model)
119119
{
120120
return session.update(className + ".updateIgnoreNull", model);
121121
}

src/main/java/com/nbs/biz/dao/NBSTableDao.java renamed to src/main/java/com/nbs/biz/data/dao/NBSTableDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.nbs.biz.dao;
1+
package com.nbs.biz.data.dao;
22

33
import com.nbs.biz.model.NBSTest;
44
import org.apache.ibatis.session.SqlSession;
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package com.nbs.biz.data.dao;
2+
3+
import org.apache.ibatis.session.SqlSession;
4+
5+
/**
6+
* @Package : com.nbs.biz.data.dao
7+
* @Description : <p></p>
8+
* @Author : lambor.c
9+
* @Date : 2018/7/2-15:49
10+
* Copyright (c) 2018, NBS , lambor.c<[email protected]>.
11+
* All rights reserved.
12+
*/
13+
public class PeerMessageDao extends BasicDao {
14+
public PeerMessageDao(SqlSession session) {
15+
super(session, PeerMessageDao.class);
16+
}
17+
18+
19+
}

src/main/java/com/nbs/biz/data/entity/BasicModel.java renamed to src/main/java/com/nbs/biz/data/entity/BasicEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
* Copyright (c) 2018, NBS , lambor.c<[email protected]>.
99
* All rights reserved.
1010
*/
11-
public class BasicModel {
11+
public class BasicEntity {
1212
}

src/main/java/com/nbs/biz/data/entity/PeerContactsEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Copyright (c) 2018, NBS , lambor.c<[email protected]>.
99
* All rights reserved.
1010
*/
11-
public class PeerContactsEntity extends BasicModel {
11+
public class PeerContactsEntity extends BasicEntity {
1212
private String id;
1313
private String fromid;
1414
private String nick;

src/main/java/com/nbs/biz/data/entity/PeerLoginEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Copyright (c) 2018, NBS , lambor.c<[email protected]>.
99
* All rights reserved.
1010
*/
11-
public class PeerLoginEntity extends BasicModel {
11+
public class PeerLoginEntity extends BasicEntity {
1212

1313
private String id;
1414
private String fromid;

0 commit comments

Comments
 (0)