From 0a94406f828c5ec2a75ee2accbb1551ee0523802 Mon Sep 17 00:00:00 2001 From: WuXianChaoPin <1029559041@qq.com> Date: Thu, 21 Jun 2018 18:34:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/bilibili/ScheduledTaskEntity.java | 2 + pom-webjar.xml | 8 +-- web/pom.xml | 1 + web/src/main/java/web/aop/Advisor.java | 3 +- .../java/web/config/AbstractWebConfig.java | 2 + .../java/web/controller/AdminController.java | 11 +-- .../java/web/controller/BaseController.java | 37 +++++++--- .../java/web/controller/DataController.java | 10 +-- .../java/web/controller/MenuController.java | 9 --- .../java/web/controller/TableController.java | 14 +--- web/src/main/java/web/html/OtherResult.java | 5 -- web/src/main/java/web/html/Table.java | 12 +--- .../main/java/web/html/data/DataTable.java | 2 +- .../java/web/html/data/OtherDataResult.java | 7 -- .../main/java/web/service/DataService.java | 2 + web/src/main/webapp/WEB-INF/jsp/head.jsp | 4 +- web/src/main/webapp/WEB-INF/jsp/index.jsp | 2 +- web/src/main/webapp/WEB-INF/jsp/menu.jsp | 5 +- web/src/main/webapp/index.html | 1 - web/src/test/java/HibernateTest.java | 63 +++++++++++++++++ web/src/test/java/MainTest.java | 4 ++ web/src/test/java/SpringMVCTest.java | 69 ++----------------- web/src/test/java/db/model/TaskModel.java | 3 + .../SpringConfig.java} | 4 +- .../java/{ => thrift}/ThriftServerDemo.java | 2 + .../test/java/{ => thrift}/ThriftTest.java | 20 +++--- 26 files changed, 148 insertions(+), 154 deletions(-) delete mode 100644 web/src/main/java/web/html/OtherResult.java delete mode 100644 web/src/main/java/web/html/data/OtherDataResult.java create mode 100644 web/src/test/java/HibernateTest.java create mode 100644 web/src/test/java/MainTest.java rename web/src/test/java/{SpringTestThrift.java => thrift/SpringConfig.java} (83%) rename web/src/test/java/{ => thrift}/ThriftServerDemo.java (98%) rename web/src/test/java/{ => thrift}/ThriftTest.java (72%) diff --git a/db/src/main/java/db/model/bilibili/ScheduledTaskEntity.java b/db/src/main/java/db/model/bilibili/ScheduledTaskEntity.java index f8662ff..392f059 100644 --- a/db/src/main/java/db/model/bilibili/ScheduledTaskEntity.java +++ b/db/src/main/java/db/model/bilibili/ScheduledTaskEntity.java @@ -1,5 +1,6 @@ package db.model.bilibili; +import db.annotation.Aliyun; import db.model.AbstractModel; import javax.persistence.*; @@ -9,6 +10,7 @@ import java.util.Objects; @Entity @Table(name = "scheduled_task") +@Aliyun public class ScheduledTaskEntity extends AbstractModel { private int id; private String description; diff --git a/pom-webjar.xml b/pom-webjar.xml index 654eff9..63d2419 100644 --- a/pom-webjar.xml +++ b/pom-webjar.xml @@ -10,10 +10,10 @@ https://gitee.com/WuXianChaoPin/WebCrawler - RELEASE - RELEASE - RELEASE - RELEASE + 3.3.1-1 + 4.1.1 + 5.0.13 + beta1.0.0-1 1.8 UTF-8 UTF-8 diff --git a/web/pom.xml b/web/pom.xml index c5c8577..60eefdd 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -135,6 +135,7 @@ 1.0-SNAPSHOT + Webcrawler diff --git a/web/src/main/java/web/aop/Advisor.java b/web/src/main/java/web/aop/Advisor.java index 5138b1c..2627736 100644 --- a/web/src/main/java/web/aop/Advisor.java +++ b/web/src/main/java/web/aop/Advisor.java @@ -4,6 +4,7 @@ import org.aopalliance.aop.Advice; import org.springframework.aop.support.StaticMethodMatcherPointcutAdvisor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import org.springframework.util.ClassUtils; import web.service.BaseService; import java.lang.reflect.Method; @@ -21,6 +22,6 @@ public class Advisor extends StaticMethodMatcherPointcutAdvisor { @Override public boolean matches(Method method, Class aClass) { - return BaseService.class.isAssignableFrom(aClass); + return BaseService.class.isAssignableFrom(ClassUtils.getUserClass(aClass))&&method.getName().equals("save"); } } diff --git a/web/src/main/java/web/config/AbstractWebConfig.java b/web/src/main/java/web/config/AbstractWebConfig.java index 19b792e..2fa13c8 100644 --- a/web/src/main/java/web/config/AbstractWebConfig.java +++ b/web/src/main/java/web/config/AbstractWebConfig.java @@ -41,6 +41,8 @@ public class AbstractWebConfig extends AbstractAnnotationConfigDispatcherServlet ServletRegistration.Dynamic servlet=servletContext.addServlet("DruidStatView", StatViewServlet.class); servlet.addMapping("/druid/*"); + + } } diff --git a/web/src/main/java/web/controller/AdminController.java b/web/src/main/java/web/controller/AdminController.java index 79f1e82..8e2760c 100644 --- a/web/src/main/java/web/controller/AdminController.java +++ b/web/src/main/java/web/controller/AdminController.java @@ -1,5 +1,7 @@ package web.controller; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; @@ -11,21 +13,22 @@ import javax.servlet.http.HttpServletRequest; * Created by reborn on 2017/9/14. */ @Controller -public class AdminController extends BiliController{ +public class AdminController{ + private Logger log=LogManager.getLogger(); - @RequestMapping("index") + @RequestMapping("/index") private String index(HttpServletRequest request,Model model){ log.info("进入首页"); model.addAttribute("elementPreifx",ElementId.getAll()); return "index"; } - @RequestMapping("test") + @RequestMapping("/test") private String test(){ return "test"; } - @RequestMapping("test2") + @RequestMapping("/test2") private String test2(){ return "test2"; } diff --git a/web/src/main/java/web/controller/BaseController.java b/web/src/main/java/web/controller/BaseController.java index 98911c3..c2ebc8c 100644 --- a/web/src/main/java/web/controller/BaseController.java +++ b/web/src/main/java/web/controller/BaseController.java @@ -15,12 +15,18 @@ import org.springframework.core.ResolvableType; import org.springframework.dao.DataAccessException; import org.springframework.http.MediaType; import org.springframework.util.ClassUtils; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import web.service.BaseService; +import java.util.List; + /** * Created by reborn on 2017/9/14. */ + public abstract class BaseController{ protected static Logger log=LogManager.getLogger(); @@ -45,8 +51,6 @@ public abstract class BaseController result=new JsonResult(); result.setAction(DBAction.R); try { - service.get(model); + result.setData(service.get(model)); result.setType(Type.success); } catch (DataAccessException e) { e.printStackTrace(); @@ -76,7 +79,20 @@ public abstract class BaseController result=new JsonResult(); + result.setAction(DBAction.R); + try { + result.setData(service.find(getDetachedCriteria(queryCommand), firstResult, maxResults)); + result.setType(Type.success); + } catch (DataAccessException e) { + e.printStackTrace(); + result.setType(Type.fail); + } + return result; + } + public JsonResult update(T model){ JsonResult result=new JsonResult(); result.setAction(DBAction.U); @@ -90,9 +106,6 @@ public abstract class BaseController getResolvableType() { return getResolvableType(0); } diff --git a/web/src/main/java/web/controller/DataController.java b/web/src/main/java/web/controller/DataController.java index 2626532..080f20f 100644 --- a/web/src/main/java/web/controller/DataController.java +++ b/web/src/main/java/web/controller/DataController.java @@ -21,20 +21,18 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import web.html.data.DataTable; -import web.html.data.OtherDataResult; import web.model.DataModelForm; import web.service.DataService; import java.io.File; import java.io.IOException; import java.nio.charset.Charset; -import java.util.ArrayList; import java.util.EnumSet; import java.util.List; @Controller @RequestMapping("/data") -public class DataController extends TableController> { +public class DataController extends TableController> { private final String regionJson = IOUtils.toString(DataController.class.getResourceAsStream("/region.json"), Charset.forName("UTF-8")); @@ -113,12 +111,6 @@ public class DataController extends TableController otherDatas(DataModelForm command) { - return new ArrayList() {{ - add(new OtherDataResult()); - }}; - } @Override protected void setModel(Model model) { diff --git a/web/src/main/java/web/controller/MenuController.java b/web/src/main/java/web/controller/MenuController.java index 7a58c2e..1780c1f 100644 --- a/web/src/main/java/web/controller/MenuController.java +++ b/web/src/main/java/web/controller/MenuController.java @@ -6,21 +6,12 @@ import org.hibernate.criterion.DetachedCriteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Property; import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; @Controller @RequestMapping("/menu") public class MenuController extends BiliController { - - @RequestMapping - public String find(Model model, MenuModel queryCommand, @RequestParam Integer firstResult, @RequestParam Integer maxResults){ - model.addAttribute("menus", service.find(getDetachedCriteria(queryCommand), firstResult, maxResults).toString()); - return "menu"; - } - @Override public boolean checkAction(DBAction action) { return DBAction.R.equals(action); diff --git a/web/src/main/java/web/controller/TableController.java b/web/src/main/java/web/controller/TableController.java index f56ddce..9b55526 100644 --- a/web/src/main/java/web/controller/TableController.java +++ b/web/src/main/java/web/controller/TableController.java @@ -7,13 +7,12 @@ import org.springframework.dao.DataAccessException; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import web.html.OtherResult; import web.html.Table; import web.service.BaseService; import java.util.List; -public abstract class TableController> extends BaseController { +public abstract class TableController> extends BaseController { @RequestMapping("table") public String find(Model model,@ModelAttribute("command") A command,B pageResult) { @@ -26,13 +25,11 @@ public abstract class TableController0) { List list = find(command, pageResult.getCurrentPage()*pageResult.getPageSize(), pageResult.getPageSize()); - List otherDatas= otherDatas(command); result.setCount(rowCount); result.setCurrentPage(pageResult.getCurrentPage()+1); result.setDatas(list); result.setPageSize(pageResult.getPageSize()); result.setType(Type.success); - result.setOtherData(otherDatas); result.setPages(); }else{ result.setType(Type.fail); @@ -72,13 +69,4 @@ public abstract class TableController otherDatas(A command){ - return null; - } - } diff --git a/web/src/main/java/web/html/OtherResult.java b/web/src/main/java/web/html/OtherResult.java deleted file mode 100644 index fd4e364..0000000 --- a/web/src/main/java/web/html/OtherResult.java +++ /dev/null @@ -1,5 +0,0 @@ -package web.html; - -public interface OtherResult { - -} diff --git a/web/src/main/java/web/html/Table.java b/web/src/main/java/web/html/Table.java index 4888f13..c86d8b2 100644 --- a/web/src/main/java/web/html/Table.java +++ b/web/src/main/java/web/html/Table.java @@ -5,7 +5,7 @@ import db.model.AbstractModel; import java.util.List; -public abstract class Table extends PageResult implements TableResult{ +public abstract class Table extends PageResult implements TableResult{ private static String importJspPath; @@ -16,9 +16,6 @@ public abstract class Table exten private static List columns; - private List otherData; - - public String getImportJspPath() { if(importJspPath==null){ importJspPath=importJspPath(); @@ -47,13 +44,6 @@ public abstract class Table exten return columns; } - public List getOtherData() { - return otherData; - } - - public void setOtherData(List otherData) { - this.otherData = otherData; - } } diff --git a/web/src/main/java/web/html/data/DataTable.java b/web/src/main/java/web/html/data/DataTable.java index c7ac768..d92b2a8 100644 --- a/web/src/main/java/web/html/data/DataTable.java +++ b/web/src/main/java/web/html/data/DataTable.java @@ -6,7 +6,7 @@ import web.html.Table; import java.util.ArrayList; import java.util.List; -public class DataTable extends Table { +public class DataTable extends Table { @Override public int getPageSize() { diff --git a/web/src/main/java/web/html/data/OtherDataResult.java b/web/src/main/java/web/html/data/OtherDataResult.java deleted file mode 100644 index e0ceab8..0000000 --- a/web/src/main/java/web/html/data/OtherDataResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package web.html.data; - -import web.html.OtherResult; - -public class OtherDataResult implements OtherResult { - -} diff --git a/web/src/main/java/web/service/DataService.java b/web/src/main/java/web/service/DataService.java index 11d7b5d..73662a5 100644 --- a/web/src/main/java/web/service/DataService.java +++ b/web/src/main/java/web/service/DataService.java @@ -173,4 +173,6 @@ public class DataService extends BaseService { return getHibernateTemplate().execute(session -> session.createNativeQuery(sql.toString(),DataModel.class).setFirstResult(firstResult).setMaxResults(maxResults>getMaxResults()?getMaxResults():maxResults).getResultList()); } + + } diff --git a/web/src/main/webapp/WEB-INF/jsp/head.jsp b/web/src/main/webapp/WEB-INF/jsp/head.jsp index 63b9a75..2ab699c 100644 --- a/web/src/main/webapp/WEB-INF/jsp/head.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/head.jsp @@ -19,7 +19,7 @@ WebCrawler - + @@ -29,7 +29,7 @@ <%----%> - + diff --git a/web/src/main/webapp/WEB-INF/jsp/index.jsp b/web/src/main/webapp/WEB-INF/jsp/index.jsp index c56e04b..3132ea9 100644 --- a/web/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/index.jsp @@ -85,7 +85,7 @@ - + diff --git a/web/src/main/webapp/WEB-INF/jsp/menu.jsp b/web/src/main/webapp/WEB-INF/jsp/menu.jsp index a176912..1f06026 100644 --- a/web/src/main/webapp/WEB-INF/jsp/menu.jsp +++ b/web/src/main/webapp/WEB-INF/jsp/menu.jsp @@ -115,9 +115,10 @@ } $(function () { - addMenu(${menus}['data']); + $.get('/menu/batch_C',function(json){ + addMenu(json['data']); + }); - $("#datatmlp").tmpl() }); diff --git a/web/src/main/webapp/index.html b/web/src/main/webapp/index.html index 9488c53..513bb28 100644 --- a/web/src/main/webapp/index.html +++ b/web/src/main/webapp/index.html @@ -4,7 +4,6 @@ Title diff --git a/web/src/test/java/HibernateTest.java b/web/src/test/java/HibernateTest.java new file mode 100644 index 0000000..a1f7ae2 --- /dev/null +++ b/web/src/test/java/HibernateTest.java @@ -0,0 +1,63 @@ +import db.model.TaskModel; +import db.model.bilibili.ScheduledTaskEntity; +import db.util.ExportUtil; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.criterion.DetachedCriteria; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.orm.hibernate5.HibernateTemplate; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.web.SpringJUnitWebConfig; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import web.config.AppConfig; +import web.config.SpringConfig; +import web.model.DataModelForm; +import web.service.BiliService; +import web.service.DataService; + +import java.io.IOException; +import java.util.ArrayList; + +//让测试运行于SpringMVC +@RunWith(SpringJUnit4ClassRunner.class) +@SpringJUnitWebConfig +@ContextConfiguration(classes = {AppConfig.class, SpringConfig.class}) +public class HibernateTest { + + private Logger log=LogManager.getLogger(); + + @Autowired + private DataService dataService; + + @Autowired + private BiliService biliService; + + @Test + public void count() { + DataModelForm form=new DataModelForm(); + form.setTypeIds(new ArrayList(){{add(32);add(33);}}); + long c=dataService.rowCount(form); + log.info(c); + } + + @Test + public void exportSql() throws IOException { + ExportUtil sql=new ExportUtil(biliService.getHibernateTemplate(),"E:\\Projects\\JAVA\\WebCrawler\\init\\typeid"); + sql.exportType(); + } + + @Test + public void get(){ + TaskModel taskModel=new TaskModel(); + taskModel.setId(3); + log.info(biliService.get(taskModel)); + } + + @Test + public void findAll(){ + biliService.find(DetachedCriteria.forClass(ScheduledTaskEntity.class)).forEach(a->log.info(a)); + } +} diff --git a/web/src/test/java/MainTest.java b/web/src/test/java/MainTest.java new file mode 100644 index 0000000..db30d14 --- /dev/null +++ b/web/src/test/java/MainTest.java @@ -0,0 +1,4 @@ +public class MainTest { + public static void main(String[] args) { + } +} diff --git a/web/src/test/java/SpringMVCTest.java b/web/src/test/java/SpringMVCTest.java index 4d62366..d2df299 100644 --- a/web/src/test/java/SpringMVCTest.java +++ b/web/src/test/java/SpringMVCTest.java @@ -1,17 +1,9 @@ -import core.thrift.MyAsyncMethodCallback; -import core.thrift.ThriftClientPool; -import db.model.bilibili.ScheduledTaskEntity; -import db.util.ExportUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.hibernate.criterion.DetachedCriteria; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.beans.factory.support.DefaultListableBeanFactory; -import org.springframework.orm.hibernate5.HibernateTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.web.SpringJUnitWebConfig; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -23,14 +15,8 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; import web.config.AppConfig; import web.config.SpringConfig; -import web.model.DataModelForm; -import web.service.BiliService; -import web.service.DataService; -import java.io.IOException; -import java.util.ArrayList; - -//让测试运行于Spring环境 +//让测试运行于SpringMVC @RunWith(SpringJUnit4ClassRunner.class) @SpringJUnitWebConfig @ContextConfiguration(classes = {AppConfig.class, SpringConfig.class}) @@ -42,16 +28,6 @@ public class SpringMVCTest { @Autowired WebApplicationContext wac; - @Autowired - private DataService dataService; - - @Autowired - private BiliService biliService; - - @Autowired - @Qualifier("Hweb.service.BiliService") - private HibernateTemplate template2; - @Before public void setup() { mockMvc = MockMvcBuilders.webAppContextSetup(wac).build(); @@ -59,52 +35,17 @@ public class SpringMVCTest { @Test - public void test() throws Exception { - ResultActions resultActions = this.mockMvc.perform(MockMvcRequestBuilders.get("/data/table").param("currentPage", "0").param("pageSize", "10").param("typeIds","33")); - resultActions.andDo(MockMvcResultHandlers.print()).andReturn(); - } - - @Test - public void test2() throws Exception { - ResultActions resultActions = this.mockMvc.perform(MockMvcRequestBuilders.get("/data/R").param("cid","9987062")); + public void dataTable() throws Exception { + ResultActions resultActions = mockMvc.perform(MockMvcRequestBuilders.get("/data/table").param("currentPage", "0").param("pageSize", "10").param("typeIds","33")); resultActions.andDo(MockMvcResultHandlers.print()).andReturn(); } - - @Test - public void test3() { - // 查询总条数 -// log.info("记录数:"+dataService.rowCount(DetachedCriteria.forClass(DataModel.class))); - -// log.info(dataService.rowCount(null)); - DataModelForm form=new DataModelForm(); - form.setTypeIds(new ArrayList(){{add(32);add(33);}}); - long c=dataService.rowCount(form); - log.info(c); - } - - @Test - public void test4() throws IOException { - ExportUtil sql=new ExportUtil(template2,"E:\\Projects\\JAVA\\WebCrawler\\init\\typeid"); - sql.exportType(); - } - - @Test - public void test5(){ - dataService.getHibernateTemplate(); - biliService.getHibernateTemplate(); - } - @Test - public void test6() throws Exception { - ResultActions resultActions = this.mockMvc.perform(MockMvcRequestBuilders.get("/data/count").param("cids","49052")); + public void get() throws Exception { + ResultActions resultActions=mockMvc.perform(MockMvcRequestBuilders.get("/menu/batch_C")); resultActions.andDo(MockMvcResultHandlers.print()).andReturn(); } - @Test - public void findAll(){ - biliService.find(DetachedCriteria.forClass(ScheduledTaskEntity.class)).forEach(a->log.info(a)); - } } diff --git a/web/src/test/java/db/model/TaskModel.java b/web/src/test/java/db/model/TaskModel.java index 98d3be5..42f2394 100644 --- a/web/src/test/java/db/model/TaskModel.java +++ b/web/src/test/java/db/model/TaskModel.java @@ -1,11 +1,14 @@ package db.model; +import db.annotation.Aliyun; + import javax.persistence.*; import java.io.Serializable; import java.util.Objects; @Entity @Table(name = "task") +@Aliyun public class TaskModel extends AbstractModel { private int id; private String api; diff --git a/web/src/test/java/SpringTestThrift.java b/web/src/test/java/thrift/SpringConfig.java similarity index 83% rename from web/src/test/java/SpringTestThrift.java rename to web/src/test/java/thrift/SpringConfig.java index 3697eb7..ef2fa0b 100644 --- a/web/src/test/java/SpringTestThrift.java +++ b/web/src/test/java/thrift/SpringConfig.java @@ -1,3 +1,5 @@ +package thrift; + import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; @@ -6,6 +8,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @Configuration @PropertySource({"classpath:config.properties"}) @ComponentScan("core.thrift") -public class SpringTestThrift implements WebMvcConfigurer { +public class SpringConfig implements WebMvcConfigurer { } diff --git a/web/src/test/java/ThriftServerDemo.java b/web/src/test/java/thrift/ThriftServerDemo.java similarity index 98% rename from web/src/test/java/ThriftServerDemo.java rename to web/src/test/java/thrift/ThriftServerDemo.java index 100a6d1..ee54d72 100644 --- a/web/src/test/java/ThriftServerDemo.java +++ b/web/src/test/java/thrift/ThriftServerDemo.java @@ -1,3 +1,5 @@ +package thrift; + import core.thrift.comment.QueryComment; import org.apache.thrift.TProcessorFactory; import org.apache.thrift.protocol.TBinaryProtocol; diff --git a/web/src/test/java/ThriftTest.java b/web/src/test/java/thrift/ThriftTest.java similarity index 72% rename from web/src/test/java/ThriftTest.java rename to web/src/test/java/thrift/ThriftTest.java index a44265f..ce3cfe7 100644 --- a/web/src/test/java/ThriftTest.java +++ b/web/src/test/java/thrift/ThriftTest.java @@ -1,3 +1,5 @@ +package thrift; + import core.thrift.MyAsyncMethodCallback; import core.thrift.ThriftClientPool; import core.thrift.comment.QueryComment; @@ -16,7 +18,7 @@ import java.util.ArrayList; //让测试运行于Spring环境 @RunWith(SpringJUnit4ClassRunner.class) @SpringJUnitWebConfig -@ContextConfiguration(classes = SpringTestThrift.class) +@ContextConfiguration(classes = SpringConfig.class) @ComponentScan("core.thrift") public class ThriftTest { @@ -24,24 +26,26 @@ public class ThriftTest { @Test public void commentSum() throws Exception { - MyAsyncMethodCallback call = new MyAsyncMethodCallback<>(); - ThriftClientPool.doExecute(client -> client.commentSum(49052,call),QueryComment.AsyncClient.class); - log.info(call.getResult()); + + MyAsyncMethodCallback call = new MyAsyncMethodCallback<>(); + ThriftClientPool.doExecute(client -> client.commentSum(49052, call), QueryComment.AsyncClient.class); + log.info(call.getResult()); + } @Test public void download() throws Exception { MyAsyncMethodCallback call = new MyAsyncMethodCallback<>(); - ThriftClientPool.doExecute(client ->client.download(new ArrayList(){{ - add(49052); - }},"test",call),QueryComment.AsyncClient.class); + ThriftClientPool.doExecute(client -> client.download(new ArrayList() {{ + add(49052); + }}, "test", call), QueryComment.AsyncClient.class); log.info(call.getResult()); } @Test public void work() throws Exception { MyAsyncMethodCallback call = new MyAsyncMethodCallback<>(); - ThriftClientPool.doExecute(client -> client.qiandao(call),TSDM.AsyncClient.class); + ThriftClientPool.doExecute(client -> client.qiandao(call), TSDM.AsyncClient.class); log.info(call.getResult()); }