diff --git a/.classpath b/.classpath index f60209c..4f9c127 100644 --- a/.classpath +++ b/.classpath @@ -1,18 +1,18 @@ - + + + + - + - + - + - - - diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index 5348eae..24cccd6 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,6 +1,6 @@ - + diff --git a/build/classes/.gitignore b/build/classes/.gitignore new file mode 100644 index 0000000..c6875ce --- /dev/null +++ b/build/classes/.gitignore @@ -0,0 +1,13 @@ +/Controller/ +/DAO/ +/Factory/ +/Interfaces/ +/Listener/ +/OuterInterfaces/ +/Service/ +/ServiceImpl/ +/Units/ +/Utils/ +/WebUI/ +/domain/ +/filter/ diff --git a/build/classes/DAO/BlogArticle2DB.class b/build/classes/DAO/BlogArticle2DB.class index 3547fba..128cb78 100644 Binary files a/build/classes/DAO/BlogArticle2DB.class and b/build/classes/DAO/BlogArticle2DB.class differ diff --git a/build/classes/DAO/BlogHolder2DB.class b/build/classes/DAO/BlogHolder2DB.class index f31780f..9961834 100644 Binary files a/build/classes/DAO/BlogHolder2DB.class and b/build/classes/DAO/BlogHolder2DB.class differ diff --git a/build/classes/DAO/BlogIndex2DB.class b/build/classes/DAO/BlogIndex2DB.class index 2a640c3..76f9802 100644 Binary files a/build/classes/DAO/BlogIndex2DB.class and b/build/classes/DAO/BlogIndex2DB.class differ diff --git a/build/classes/DAO/BlogMessage2DB.class b/build/classes/DAO/BlogMessage2DB.class index cd604bc..8ef43c6 100644 Binary files a/build/classes/DAO/BlogMessage2DB.class and b/build/classes/DAO/BlogMessage2DB.class differ diff --git a/build/classes/DAO/BlogNotice2DB.class b/build/classes/DAO/BlogNotice2DB.class index eca0563..154c630 100644 Binary files a/build/classes/DAO/BlogNotice2DB.class and b/build/classes/DAO/BlogNotice2DB.class differ diff --git a/build/classes/DAO/BlogStatus2DB.class b/build/classes/DAO/BlogStatus2DB.class index df61540..d373ab8 100644 Binary files a/build/classes/DAO/BlogStatus2DB.class and b/build/classes/DAO/BlogStatus2DB.class differ diff --git a/build/classes/DAO/BlogVisit2DB.class b/build/classes/DAO/BlogVisit2DB.class index 490b20d..b8a1064 100644 Binary files a/build/classes/DAO/BlogVisit2DB.class and b/build/classes/DAO/BlogVisit2DB.class differ diff --git a/build/classes/DAO/BlogVisitArticle2DB.class b/build/classes/DAO/BlogVisitArticle2DB.class index 29498d8..71084a3 100644 Binary files a/build/classes/DAO/BlogVisitArticle2DB.class and b/build/classes/DAO/BlogVisitArticle2DB.class differ diff --git a/build/classes/DAO/BlogVisitor2DB.class b/build/classes/DAO/BlogVisitor2DB.class index 480ef0e..47880c7 100644 Binary files a/build/classes/DAO/BlogVisitor2DB.class and b/build/classes/DAO/BlogVisitor2DB.class differ diff --git a/build/classes/Interfaces/ResultSetHandler.class b/build/classes/Interfaces/ResultSetHandler.class index 1140dc9..3876166 100644 Binary files a/build/classes/Interfaces/ResultSetHandler.class and b/build/classes/Interfaces/ResultSetHandler.class differ diff --git a/build/classes/Service/BlogArticle2DBService.class b/build/classes/Service/BlogArticle2DBService.class index c76a4b0..f9e9171 100644 Binary files a/build/classes/Service/BlogArticle2DBService.class and b/build/classes/Service/BlogArticle2DBService.class differ diff --git a/build/classes/Service/BlogHolder2DBService.class b/build/classes/Service/BlogHolder2DBService.class index cb28d52..b29b225 100644 Binary files a/build/classes/Service/BlogHolder2DBService.class and b/build/classes/Service/BlogHolder2DBService.class differ diff --git a/build/classes/Service/BlogIndex2DBService.class b/build/classes/Service/BlogIndex2DBService.class index e63a3e0..0ae900c 100644 Binary files a/build/classes/Service/BlogIndex2DBService.class and b/build/classes/Service/BlogIndex2DBService.class differ diff --git a/build/classes/Service/BlogMessage2DBService.class b/build/classes/Service/BlogMessage2DBService.class index f9d7cbf..b2a9c86 100644 Binary files a/build/classes/Service/BlogMessage2DBService.class and b/build/classes/Service/BlogMessage2DBService.class differ diff --git a/build/classes/Service/BlogNotice2DBService.class b/build/classes/Service/BlogNotice2DBService.class index 4445a83..1fa08f6 100644 Binary files a/build/classes/Service/BlogNotice2DBService.class and b/build/classes/Service/BlogNotice2DBService.class differ diff --git a/build/classes/Service/BlogStatus2DBService.class b/build/classes/Service/BlogStatus2DBService.class index 0706f80..f60f59d 100644 Binary files a/build/classes/Service/BlogStatus2DBService.class and b/build/classes/Service/BlogStatus2DBService.class differ diff --git a/build/classes/Service/BlogVisit2DBService.class b/build/classes/Service/BlogVisit2DBService.class index 0a05783..b4b88ad 100644 Binary files a/build/classes/Service/BlogVisit2DBService.class and b/build/classes/Service/BlogVisit2DBService.class differ diff --git a/build/classes/Service/BlogVisitArticle2DBService.class b/build/classes/Service/BlogVisitArticle2DBService.class index 192094f..9734d0b 100644 Binary files a/build/classes/Service/BlogVisitArticle2DBService.class and b/build/classes/Service/BlogVisitArticle2DBService.class differ diff --git a/build/classes/Service/BlogVisitor2DBService.class b/build/classes/Service/BlogVisitor2DBService.class index a62614a..4cd2daa 100644 Binary files a/build/classes/Service/BlogVisitor2DBService.class and b/build/classes/Service/BlogVisitor2DBService.class differ diff --git a/build/classes/ServiceImpl/DataObject2DB.class b/build/classes/ServiceImpl/DataObject2DB.class index d64ce84..0f97638 100644 Binary files a/build/classes/ServiceImpl/DataObject2DB.class and b/build/classes/ServiceImpl/DataObject2DB.class differ diff --git a/build/classes/ServiceImpl/UserAccess2DB.class b/build/classes/ServiceImpl/UserAccess2DB.class index 1ae0937..78b006e 100644 Binary files a/build/classes/ServiceImpl/UserAccess2DB.class and b/build/classes/ServiceImpl/UserAccess2DB.class differ diff --git a/build/classes/Units/DBUnit.class b/build/classes/Units/DBUnit.class index 5a9a365..bfb46be 100644 Binary files a/build/classes/Units/DBUnit.class and b/build/classes/Units/DBUnit.class differ diff --git a/build/classes/Units/UnitUtils.class b/build/classes/Units/UnitUtils.class index 09297a2..c95be3d 100644 Binary files a/build/classes/Units/UnitUtils.class and b/build/classes/Units/UnitUtils.class differ diff --git a/build/classes/Utils/BeanHandler.class b/build/classes/Utils/BeanHandler.class index 7ea1dfc..0eda121 100644 Binary files a/build/classes/Utils/BeanHandler.class and b/build/classes/Utils/BeanHandler.class differ diff --git a/build/classes/Utils/DBUtils.class b/build/classes/Utils/DBUtils.class index e0f3dde..41ede66 100644 Binary files a/build/classes/Utils/DBUtils.class and b/build/classes/Utils/DBUtils.class differ diff --git a/build/classes/Utils/IntegerHandler.class b/build/classes/Utils/IntegerHandler.class index c5fb0c4..aa584ad 100644 Binary files a/build/classes/Utils/IntegerHandler.class and b/build/classes/Utils/IntegerHandler.class differ diff --git a/build/classes/Utils/ListHandler.class b/build/classes/Utils/ListHandler.class index d4a2857..6579c8c 100644 Binary files a/build/classes/Utils/ListHandler.class and b/build/classes/Utils/ListHandler.class differ diff --git a/build/classes/Utils/MD5Utils.class b/build/classes/Utils/MD5Utils.class index f64fbf8..9f31b0f 100644 Binary files a/build/classes/Utils/MD5Utils.class and b/build/classes/Utils/MD5Utils.class differ diff --git a/build/classes/filter/GZIPServletOutputStream.class b/build/classes/filter/GZIPServletOutputStream.class index 9602ed6..0f530cb 100644 Binary files a/build/classes/filter/GZIPServletOutputStream.class and b/build/classes/filter/GZIPServletOutputStream.class differ diff --git a/build/classes/filter/charsetFilter$1.class b/build/classes/filter/charsetFilter$1.class index 1b54352..7a72e54 100644 Binary files a/build/classes/filter/charsetFilter$1.class and b/build/classes/filter/charsetFilter$1.class differ diff --git a/build/classes/filter/gzipFilter$1.class b/build/classes/filter/gzipFilter$1.class index ffff90a..a2a4dc2 100644 Binary files a/build/classes/filter/gzipFilter$1.class and b/build/classes/filter/gzipFilter$1.class differ diff --git a/build/classes/filter/gzipFilter.class b/build/classes/filter/gzipFilter.class index d5cad7a..3d58eee 100644 Binary files a/build/classes/filter/gzipFilter.class and b/build/classes/filter/gzipFilter.class differ diff --git a/src/DAO/BlogArticle2DB.java b/src/DAO/BlogArticle2DB.java index 5c6ac5d..dd31c5b 100644 --- a/src/DAO/BlogArticle2DB.java +++ b/src/DAO/BlogArticle2DB.java @@ -13,13 +13,13 @@ import domain.blog_index; import domain.blog_page; -public class BlogArticle2DB implements DataObject2DB { +public class BlogArticle2DB implements DataObject2DB { @Override public int getTotalRecord() { String sql = "select count(*) from blog_article"; Object[] params = {}; - return (int)DBUtils.query(sql, params, new IntegerHandler()); + return (int)DBUtils.query(sql, params, new IntegerHandler()); } @Override @@ -76,7 +76,7 @@ public blog_page selectData(int currentPage, int pageContain, int pageInFrame) { } String sql = "select article_id, article_content, article_title, holder_id, create_time from blog_artilce_view limit ?,?"; Object[] params = {start, page.getPageContain()}; - page.setList((List) DBUtils.query(sql, params, new ListHandler(blog_article.class))); + page.setList(DBUtils.query(sql, params, new ListHandler(blog_article.class))); return page; } @@ -90,14 +90,14 @@ public blog_page selectIndexData(int currentPage, int pageContain, int pageInFra } String sql = "select article_id, article_title, holder_id, create_time from blog_artilce_view limit ?,?"; Object[] params = {start, page.getPageContain()}; - page.setList((List) DBUtils.query(sql, params, new ListHandler(blog_article.class))); + page.setList(DBUtils.query(sql, params, new ListHandler(blog_article.class))); return page; } @Override - public Object selectByID(String id) { + public T selectByID(String id) { String sql = "select * from blog_article where article_id=?"; Object[] params = {id}; - return DBUtils.query(sql, params, new BeanHandler(blog_article.class)); + return DBUtils.query(sql, params, new BeanHandler(blog_article.class)); } } diff --git a/src/DAO/BlogHolder2DB.java b/src/DAO/BlogHolder2DB.java index 6170587..ab3644c 100644 --- a/src/DAO/BlogHolder2DB.java +++ b/src/DAO/BlogHolder2DB.java @@ -13,7 +13,7 @@ import domain.blog_holder; import domain.blog_page; -public class BlogHolder2DB implements UserAccess2DB{ +public class BlogHolder2DB implements UserAccess2DB{ @Override public int insertUser(Object obj) { @@ -90,10 +90,10 @@ public int updateUser(Object obj) { } @Override - public Object selectUser(String name) { + public T selectUser(String name) { String sql = "select holder_city_en,holder_city_zh,holder_email,holder_img,holder_name_en,holder_name_zh,holder_province_en,holder_province_zh,holder_pwd,holder_school_en,holder_school_year,holder_school_zh,holder_id from blog_holder where holder_name_zh=?"; Object[] params = {name}; - return DBUtils.query(sql, params, new BeanHandler(blog_holder.class)); + return DBUtils.query(sql, params, new BeanHandler(blog_holder.class)); } @Override @@ -106,10 +106,10 @@ public boolean isExist(String name) { } @Override - public Object selectUserByIndex() { + public T selectUserByIndex() { String sql = "select holder_city_en,holder_city_zh,holder_email,holder_img,holder_name_en,holder_name_zh,holder_province_en,holder_province_zh,holder_pwd,holder_school_en,holder_school_year,holder_school_zh,holder_id from blog_holder limit 0,1"; Object[] params = {}; - return DBUtils.query(sql, params, new BeanHandler(blog_holder.class)); + return DBUtils.query(sql, params, new BeanHandler(blog_holder.class)); } @Override diff --git a/src/DAO/BlogIndex2DB.java b/src/DAO/BlogIndex2DB.java index 9c73b87..856cc87 100644 --- a/src/DAO/BlogIndex2DB.java +++ b/src/DAO/BlogIndex2DB.java @@ -10,7 +10,7 @@ import domain.blog_index; import domain.blog_page; -public class BlogIndex2DB implements DataObject2DB { +public class BlogIndex2DB implements DataObject2DB { @Override public int getTotalRecord() { @@ -47,7 +47,7 @@ public blog_page selectData(int currentPage, int pageContain, int pageInFrame) { } String sql = "select * from blog_index_view limit ?,?"; Object[] params = {start, page.getPageContain()}; - page.setList((List) DBUtils.query(sql, params, new ListHandler(blog_index.class))); + page.setList(DBUtils.query(sql, params, new ListHandler>(blog_index.class))); return page; } @@ -58,7 +58,7 @@ public blog_page selectIndexData(int currentPage, int pageContain, int pageInFra } @Override - public Object selectByID(String id) { + public T selectByID(String id) { // TODO Auto-generated method stub return null; } diff --git a/src/DAO/BlogMessage2DB.java b/src/DAO/BlogMessage2DB.java index b76a424..c6e2bec 100644 --- a/src/DAO/BlogMessage2DB.java +++ b/src/DAO/BlogMessage2DB.java @@ -12,7 +12,7 @@ import domain.blog_page; import domain.blog_status; -public class BlogMessage2DB implements DataObject2DB { +public class BlogMessage2DB implements DataObject2DB { @Override public int getTotalRecord() { @@ -54,7 +54,7 @@ public blog_page selectData(int currentPage, int pageContain, int pageInFrame) { } String sql = "select * from blog_message_view limit ?,?"; Object[] params = {start, page.getPageContain()}; - page.setList((List) DBUtils.query(sql, params, new ListHandler(blog_message.class))); + page.setList(DBUtils.query(sql, params, new ListHandler>(blog_message.class))); return page; } @@ -65,7 +65,7 @@ public blog_page selectIndexData(int currentPage, int pageContain, int pageInFra } @Override - public Object selectByID(String id) { + public T selectByID(String id) { // TODO Auto-generated method stub return null; } diff --git a/src/DAO/BlogNotice2DB.java b/src/DAO/BlogNotice2DB.java index ffa36bc..aa1c4a7 100644 --- a/src/DAO/BlogNotice2DB.java +++ b/src/DAO/BlogNotice2DB.java @@ -9,7 +9,7 @@ import domain.blog_notice; import domain.blog_page; -public class BlogNotice2DB implements DataObject2DB { +public class BlogNotice2DB implements DataObject2DB { @Override public int getTotalRecord() { @@ -48,7 +48,7 @@ public blog_page selectData(int currentPage, int pageContain, int pageInFrame) { } String sql = "select * from blog_notice order by publish_date desc limit ?,?"; Object[] params = {start, page.getPageContain()}; - page.setList((List) DBUtils.query(sql, params, new ListHandler(blog_notice.class))); + page.setList(DBUtils.query(sql, params, new ListHandler>(blog_notice.class))); return page; } @@ -59,7 +59,7 @@ public blog_page selectIndexData(int currentPage, int pageContain, int pageInFra } @Override - public Object selectByID(String id) { + public T selectByID(String id) { // TODO Auto-generated method stub return null; } diff --git a/src/DAO/BlogStatus2DB.java b/src/DAO/BlogStatus2DB.java index 74a735a..f9c346c 100644 --- a/src/DAO/BlogStatus2DB.java +++ b/src/DAO/BlogStatus2DB.java @@ -12,7 +12,7 @@ import domain.blog_page; import domain.blog_status; -public class BlogStatus2DB implements DataObject2DB { +public class BlogStatus2DB implements DataObject2DB { @Override public int getTotalRecord() { @@ -66,7 +66,7 @@ public blog_page selectData(int currentPage, int pageContain, int pageInFrame) { } String sql = "select status_id, status_content, publish_date, holder_id from blog_status_view limit ?,?"; Object[] params = {start, page.getPageContain()}; - page.setList((List) DBUtils.query(sql, params, new ListHandler(blog_status.class))); + page.setList(DBUtils.query(sql, params, new ListHandler>(blog_status.class))); return page; } @@ -77,7 +77,7 @@ public blog_page selectIndexData(int currentPage, int pageContain, int pageInFra } @Override - public Object selectByID(String id) { + public T selectByID(String id) { // TODO Auto-generated method stub return null; } diff --git a/src/DAO/BlogVisit2DB.java b/src/DAO/BlogVisit2DB.java index 6cd84d6..51f4a8f 100644 --- a/src/DAO/BlogVisit2DB.java +++ b/src/DAO/BlogVisit2DB.java @@ -10,7 +10,7 @@ import domain.blog_page; import domain.blog_visit; -public class BlogVisit2DB implements DataObject2DB { +public class BlogVisit2DB implements DataObject2DB { @Override public int getTotalRecord() { @@ -48,7 +48,7 @@ public blog_page selectData(int currentPage, int pageContain, int pageInFrame) { } String sql = "select * from blog_visit_view limit ?,?"; Object[] params = {start, page.getPageContain()}; - page.setList((List) DBUtils.query(sql, params, new ListHandler(blog_visit.class))); + page.setList(DBUtils.query(sql, params, new ListHandler>(blog_visit.class))); return page; } @@ -59,7 +59,7 @@ public blog_page selectIndexData(int currentPage, int pageContain, int pageInFra } @Override - public Object selectByID(String id) { + public T selectByID(String id) { // TODO Auto-generated method stub return null; } diff --git a/src/DAO/BlogVisitArticle2DB.java b/src/DAO/BlogVisitArticle2DB.java index a5bc74f..9db85b1 100644 --- a/src/DAO/BlogVisitArticle2DB.java +++ b/src/DAO/BlogVisitArticle2DB.java @@ -10,7 +10,7 @@ import domain.blog_visit; import domain.blog_visit_article; -public class BlogVisitArticle2DB implements DataObject2DB{ +public class BlogVisitArticle2DB implements DataObject2DB{ @Override public int getTotalRecord() { @@ -50,7 +50,7 @@ public blog_page selectData(int currentPage, int pageContain, int pageInFrame) { } String sql = "select * from blog_article_visit_view limit ?,?"; Object[] params = {start, page.getPageContain()}; - page.setList((List) DBUtils.query(sql, params, new ListHandler(blog_visit_article.class))); + page.setList(DBUtils.query(sql, params, new ListHandler>(blog_visit_article.class))); return page; } @@ -61,7 +61,7 @@ public blog_page selectIndexData(int currentPage, int pageContain, int pageInFra } @Override - public Object selectByID(String id) { + public T selectByID(String id) { // TODO Auto-generated method stub return null; } diff --git a/src/DAO/BlogVisitor2DB.java b/src/DAO/BlogVisitor2DB.java index 9d41cad..0fbc5ab 100644 --- a/src/DAO/BlogVisitor2DB.java +++ b/src/DAO/BlogVisitor2DB.java @@ -12,7 +12,7 @@ import domain.blog_page; import domain.blog_visitor; -public class BlogVisitor2DB implements UserAccess2DB{ +public class BlogVisitor2DB implements UserAccess2DB{ @Override public int insertUser(Object obj) { @@ -41,10 +41,10 @@ public int updateUser(Object obj) { } @Override - public Object selectUser(String name) { + public T selectUser(String name) { String sql = "select visitor_id,visitor_pwd,visitor_nickname,visitor_gender from blog_visitor where visitor_nickname=?"; Object[] params = {name}; - return DBUtils.query(sql, params, new BeanHandler(blog_visitor.class)); + return DBUtils.query(sql, params, new BeanHandler(blog_visitor.class)); } @Override @@ -55,7 +55,7 @@ public boolean isExist(String name) { } @Override - public Object selectUserByIndex() { + public T selectUserByIndex() { // TODO Auto-generated method stub return null; } @@ -70,7 +70,7 @@ public blog_page selectUserByList(int currentPage, int pageContain, int pageInFr } String sql = "select * from blog_visitor limit ?,?"; Object[] params = {start, page.getPageContain()}; - page.setList((List) DBUtils.query(sql, params, new ListHandler(blog_visitor.class))); + page.setList(DBUtils.query(sql, params, new ListHandler>(blog_visitor.class))); return page; } @@ -78,6 +78,6 @@ public blog_page selectUserByList(int currentPage, int pageContain, int pageInFr public int getTotalRecord() { String sql = "select count(*) from blog_visitor"; Object[] params = {}; - return (int)DBUtils.query(sql, params, new IntegerHandler()); + return (int)DBUtils.query(sql, params, new IntegerHandler()); } } diff --git a/src/Interfaces/ResultSetHandler.java b/src/Interfaces/ResultSetHandler.java index 8fa4ae7..4af769f 100644 --- a/src/Interfaces/ResultSetHandler.java +++ b/src/Interfaces/ResultSetHandler.java @@ -2,6 +2,6 @@ import java.sql.ResultSet; -public interface ResultSetHandler { - public Object operate(ResultSet result); +public interface ResultSetHandler { + public T operate(ResultSet result); } diff --git a/src/Service/BlogArticle2DBService.java b/src/Service/BlogArticle2DBService.java index 6440443..46b7aa7 100644 --- a/src/Service/BlogArticle2DBService.java +++ b/src/Service/BlogArticle2DBService.java @@ -6,7 +6,7 @@ import domain.blog_page; public class BlogArticle2DBService { - private DataObject2DB impl = null; + private DataObject2DB impl = null; public BlogArticle2DBService(){ impl = DataAccessFactory.getFactory("DAO.BlogArticle2DB").getImpleInstance(); } @@ -40,6 +40,6 @@ public blog_page selectArticleIndex(int currentPage, int pageContain, int pageIn } public blog_article selectArticleByID(String article_id){ - return (blog_article) impl.selectByID(article_id); + return impl.selectByID(article_id); } } diff --git a/src/Service/BlogHolder2DBService.java b/src/Service/BlogHolder2DBService.java index 4337ba9..4b82ff6 100644 --- a/src/Service/BlogHolder2DBService.java +++ b/src/Service/BlogHolder2DBService.java @@ -6,7 +6,7 @@ public class BlogHolder2DBService { - private UserAccess2DB impl = null; + private UserAccess2DB impl = null; public BlogHolder2DBService(){ impl = UserAccessFactory.getFactory("DAO.BlogHolder2DB").getImplInstance(); } @@ -32,7 +32,7 @@ public boolean isExist(String name){ } public blog_holder selectHolder(){ - return (blog_holder) impl.selectUserByIndex(); + return impl.selectUserByIndex(); } } diff --git a/src/Service/BlogIndex2DBService.java b/src/Service/BlogIndex2DBService.java index 98ddf9f..3a18194 100644 --- a/src/Service/BlogIndex2DBService.java +++ b/src/Service/BlogIndex2DBService.java @@ -4,10 +4,11 @@ import Factory.DataAccessFactory; import ServiceImpl.DataObject2DB; +import domain.blog_index; import domain.blog_page; public class BlogIndex2DBService { - public DataObject2DB impl = null; + public DataObject2DB impl = null; public BlogIndex2DBService(){ impl = DataAccessFactory.getFactory("DAO.BlogIndex2DB").getImpleInstance(); } diff --git a/src/Service/BlogMessage2DBService.java b/src/Service/BlogMessage2DBService.java index 0790857..0f6d26e 100644 --- a/src/Service/BlogMessage2DBService.java +++ b/src/Service/BlogMessage2DBService.java @@ -6,7 +6,7 @@ import domain.blog_page; public class BlogMessage2DBService { - private DataObject2DB impl = null; + private DataObject2DB impl = null; public BlogMessage2DBService(){ impl = DataAccessFactory.getFactory("DAO.BlogMessage2DB").getImpleInstance(); } diff --git a/src/Service/BlogNotice2DBService.java b/src/Service/BlogNotice2DBService.java index 555b72f..f0b76d2 100644 --- a/src/Service/BlogNotice2DBService.java +++ b/src/Service/BlogNotice2DBService.java @@ -6,7 +6,7 @@ import domain.blog_page; public class BlogNotice2DBService { - private DataObject2DB impl = null; + private DataObject2DB impl = null; public BlogNotice2DBService(){ impl = DataAccessFactory.getFactory("DAO.BlogNotice2DB").getImpleInstance(); } diff --git a/src/Service/BlogStatus2DBService.java b/src/Service/BlogStatus2DBService.java index c26a205..6f673b8 100644 --- a/src/Service/BlogStatus2DBService.java +++ b/src/Service/BlogStatus2DBService.java @@ -6,7 +6,7 @@ import domain.blog_status; public class BlogStatus2DBService { - private DataObject2DB impl = null; + private DataObject2DB impl = null; public BlogStatus2DBService(){ impl = DataAccessFactory.getFactory("DAO.BlogStatus2DB").getImpleInstance(); } diff --git a/src/Service/BlogVisit2DBService.java b/src/Service/BlogVisit2DBService.java index dea287d..1b06ff9 100644 --- a/src/Service/BlogVisit2DBService.java +++ b/src/Service/BlogVisit2DBService.java @@ -6,7 +6,7 @@ import domain.blog_visit; public class BlogVisit2DBService { - private DataObject2DB impl = null; + private DataObject2DB impl = null; public BlogVisit2DBService(){ impl = DataAccessFactory.getFactory("DAO.BlogVisit2DB").getImpleInstance(); } diff --git a/src/Service/BlogVisitArticle2DBService.java b/src/Service/BlogVisitArticle2DBService.java index 956402d..47d2e1b 100644 --- a/src/Service/BlogVisitArticle2DBService.java +++ b/src/Service/BlogVisitArticle2DBService.java @@ -6,7 +6,7 @@ import domain.blog_visit_article; public class BlogVisitArticle2DBService { - private DataObject2DB impl = null; + private DataObject2DB impl = null; public BlogVisitArticle2DBService(){ impl = DataAccessFactory.getFactory("DAO.BlogVisitArticle2DB").getImpleInstance(); } diff --git a/src/Service/BlogVisitor2DBService.java b/src/Service/BlogVisitor2DBService.java index f8848e5..2ceeae9 100644 --- a/src/Service/BlogVisitor2DBService.java +++ b/src/Service/BlogVisitor2DBService.java @@ -7,7 +7,7 @@ public class BlogVisitor2DBService { - private UserAccess2DB impl = null; + private UserAccess2DB impl = null; public BlogVisitor2DBService(){ this.impl = UserAccessFactory.getFactory("DAO.BlogVisitor2DB").getImplInstance(); } @@ -25,7 +25,7 @@ public int updateVisitor(blog_visitor visitor){ } //查询一个用户，此处需要传入用户的名字 public blog_visitor selectVisitor(String name){ - return (blog_visitor)impl.selectUser(name); + return impl.selectUser(name); } //查看用户是否存在 public boolean isExist(String name){ diff --git a/src/ServiceImpl/DataObject2DB.java b/src/ServiceImpl/DataObject2DB.java index 3bb56a9..89c93e9 100644 --- a/src/ServiceImpl/DataObject2DB.java +++ b/src/ServiceImpl/DataObject2DB.java @@ -2,7 +2,7 @@ import domain.blog_page; -public interface DataObject2DB { +public interface DataObject2DB { //得到该数据的全部数目 public int getTotalRecord(); @@ -23,6 +23,6 @@ public interface DataObject2DB { public blog_page selectIndexData(int currentPage, int pageContain, int pageInFrame); //查询文id章索引一个条目 - public Object selectByID(String id); + public T selectByID(String id); } diff --git a/src/ServiceImpl/UserAccess2DB.java b/src/ServiceImpl/UserAccess2DB.java index 93ef434..f6ea740 100644 --- a/src/ServiceImpl/UserAccess2DB.java +++ b/src/ServiceImpl/UserAccess2DB.java @@ -2,7 +2,7 @@ import domain.blog_page; -public interface UserAccess2DB {//设置与用户有关的数据库操作接口 +public interface UserAccess2DB {//设置与用户有关的数据库操作接口 public int getTotalRecord(); //插入一个用户 @@ -12,11 +12,11 @@ //更改一个用户的信息 public int updateUser(Object obj); //查询一个用户，此处需要传入用户的名字 - public Object selectUser(String name); + public T selectUser(String name); //查看用户是否存在 public boolean isExist(String name); - public Object selectUserByIndex(); + public T selectUserByIndex(); public blog_page selectUserByList(int currentPage, int pageContain, int pageInFrame); } diff --git a/src/Units/DBUnit.java b/src/Units/DBUnit.java index ca63997..d79ea70 100644 --- a/src/Units/DBUnit.java +++ b/src/Units/DBUnit.java @@ -20,6 +20,7 @@ import java.util.Date; import java.util.List; +import org.apache.tomcat.util.codec.binary.Base64; import org.junit.Test; import com.fasterxml.jackson.core.JsonProcessingException; @@ -56,7 +57,6 @@ import domain.blog_visit; import domain.blog_visit_article; import domain.blog_visitor; -import sun.misc.BASE64Encoder; public class DBUnit { @@ -268,6 +268,7 @@ public void test17(){ @Test public void test18() throws Exception{ BlogIndex2DBService service = new BlogIndex2DBService(); + System.out.println(service.getTotalRecord()); } @@ -293,8 +294,8 @@ public void test20() throws NoSuchAlgorithmException, UnsupportedEncodingExcepti //System.out.println(MD5Utils.getToken("940805")); MessageDigest digest = MessageDigest.getInstance("md5"); byte[] buffer = digest.digest("yanghang19940805".getBytes()); - BASE64Encoder encoder = new BASE64Encoder(); - System.out.println(encoder.encode(buffer)); + Base64 encoder = new Base64(); + System.out.println(encoder.encodeToString(buffer)); } @Test diff --git a/src/Utils/BeanHandler.java b/src/Utils/BeanHandler.java index fca5f2c..8e39d94 100644 --- a/src/Utils/BeanHandler.java +++ b/src/Utils/BeanHandler.java @@ -8,7 +8,7 @@ import Interfaces.ResultSetHandler; -public class BeanHandler implements ResultSetHandler { +public class BeanHandler implements ResultSetHandler { private Class clazz = null; @@ -16,7 +16,7 @@ public BeanHandler(Class clazz){ this.clazz = clazz; } @Override - public Object operate(ResultSet result) { + public T operate(ResultSet result) { if(result == null){ return null; @@ -24,7 +24,7 @@ public Object operate(ResultSet result) { try { if(result.next()){ - Object obj = clazz.newInstance(); + T obj = (T) clazz.newInstance(); ResultSetMetaData metaData = result.getMetaData(); int count = metaData.getColumnCount(); for(int i = 0; i < count; i++){ diff --git a/src/Utils/DBUtils.java b/src/Utils/DBUtils.java index 2458fe1..3bf98c9 100644 --- a/src/Utils/DBUtils.java +++ b/src/Utils/DBUtils.java @@ -121,7 +121,7 @@ public static int update(String sql, Object[] params){ return -1; } - public static Object query(String sql, Object[] params, ResultSetHandler resHandler){ + public static T query(String sql, Object[] params, ResultSetHandler resHandler){ Connection con = null; PreparedStatement state = null; diff --git a/src/Utils/IntegerHandler.java b/src/Utils/IntegerHandler.java index 90e8431..1ea6c6e 100644 --- a/src/Utils/IntegerHandler.java +++ b/src/Utils/IntegerHandler.java @@ -5,13 +5,13 @@ import Interfaces.ResultSetHandler; -public class IntegerHandler implements ResultSetHandler{ +public class IntegerHandler implements ResultSetHandler{ @Override - public Object operate(ResultSet result) { + public T operate(ResultSet result) { try { if(result.next()){ - return new Integer(result.getInt(1)); + return (T) new Integer(result.getInt(1)); } } catch (SQLException e) { e.printStackTrace(); diff --git a/src/Utils/ListHandler.java b/src/Utils/ListHandler.java index a31d730..c29f3af 100644 --- a/src/Utils/ListHandler.java +++ b/src/Utils/ListHandler.java @@ -10,13 +10,13 @@ import Interfaces.ResultSetHandler; -public class ListHandler implements ResultSetHandler { +public class ListHandler implements ResultSetHandler { private Class clazz = null; public ListHandler(Class clazz){ this.clazz = clazz; } - public Object operate(ResultSet result) { + public T operate(ResultSet result) { if(result== null) return null; List list = new LinkedList(); @@ -34,7 +34,7 @@ public Object operate(ResultSet result) { } list.add(obj); } - return list; + return (T) list; } catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/src/Utils/MD5Utils.java b/src/Utils/MD5Utils.java index 45cf50f..6fe8d25 100644 --- a/src/Utils/MD5Utils.java +++ b/src/Utils/MD5Utils.java @@ -3,7 +3,8 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import sun.misc.BASE64Encoder; +import org.apache.tomcat.util.codec.binary.Base64; + public class MD5Utils { @@ -12,8 +13,8 @@ public static String getToken(String info){ try { MessageDigest diggest = MessageDigest.getInstance("md5"); byte[] buffer = diggest.digest(info.getBytes()); - BASE64Encoder encoder = new BASE64Encoder(); - return encoder.encode(buffer); + Base64 encoder = new Base64(); + return encoder.encodeToString(buffer); } catch (NoSuchAlgorithmException e) { e.printStackTrace(); } diff --git a/src/filter/gzipFilter.java b/src/filter/gzipFilter.java index 699906e..638139b 100644 --- a/src/filter/gzipFilter.java +++ b/src/filter/gzipFilter.java @@ -16,6 +16,7 @@ import javax.servlet.ServletOutputStream; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import javax.servlet.WriteListener; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -74,4 +75,14 @@ public GZIPServletOutputStream(ByteArrayOutputStream buffer){ public void write(int b) throws IOException { buffer.write(b); } + @Override + public boolean isReady() { + // TODO Auto-generated method stub + return false; + } + @Override + public void setWriteListener(WriteListener arg0) { + // TODO Auto-generated method stub + + } }