diff --git a/src/com/hellogithub/dao/articleDao.java b/src/com/hellogithub/dao/articleDao.java
index 8f1898f..b0bb72c 100644
--- a/src/com/hellogithub/dao/articleDao.java
+++ b/src/com/hellogithub/dao/articleDao.java
@@ -103,7 +103,7 @@ public class articleDao {
         ResultSet rs = null;
         String sql = "SELECT * FROM `article` WHERE articleId = ? AND isValid = 1;";
         String sql1 = "UPDATE article SET readCount = readCount+1 where articleId = ?";
-        articleEntity entity = null;
+        com.hellogithub.entity.articleEntity entity=null;
         try{
             conn = JdbcUtils.getConnection();
             preparedStatement.setInt(1, id);
@@ -122,19 +122,15 @@ public class articleDao {
                 int readcount = rs.getInt(6);
                 String articleTitle = rs.getString(7);
                 String articleIco = rs.getString(8);
-                entity.setArticleId(articleid);
-                entity.setUserId(userid);
-                entity.setArticleContent(articlecontent);
-                entity.setPublishTime(datetime);
-                entity.setIsValid(isvalid);
-                entity.setReadCount(readcount);
-                entity.setArticleTitle(articleTitle);
-                entity.setArticleIco(articleIco);
+                entity = new articleEntity(
+                        articleid,userid,articlecontent,datetime,isvalid,readcount,articleTitle,articleIco
+                );
+                preparedStatement1.close();
+                JdbcUtils.closeConnection(rs, preparedStatement, conn);
             }
-            return entity;
-        } catch (Exception e) {
+        } catch (SQLException e) {
             e.printStackTrace();
-            return entity;
         }
+        return entity;
     }
 }
\ No newline at end of file