From b82a9ec102b3f74b29c52e15ca953bde14fd8e35 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Thu, 8 Nov 2018 10:36:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/busi/FactoryStoreController.java | 6 +++--- .../i3plus/core/apiservice/dao/IFactoryStoreDao.java | 2 +- .../core/apiservice/daoimpl/FactoryStoreDaoImpl.java | 4 ++-- .../i3plus/core/apiservice/schedulejob/DemoJob.java | 16 ++++++++++------ 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java index 7a9ab59..8a4279f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java @@ -34,7 +34,7 @@ public class FactoryStoreController { FactoryStore fs = new FactoryStore(); fs.setStoreName(name); fs.setStoreCode(code); - dataMoreService.insertFactory(fs); + //dataMoreService.insertFactory(fs); return new ResultBean(true,"工厂已保存"); } @@ -43,8 +43,8 @@ public class FactoryStoreController { @GetMapping(value="/list") @ApiOperation(value="查询服务",notes="返回列表") public ResultBean list(){ - List fsList = dataMoreService.listFactoryStoreMore(); + //List fsList = dataMoreService.listFactoryStoreMore(); - return new ResultBean(true,"查询结果:" + fsList.size(),fsList); + return new ResultBean(true); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IFactoryStoreDao.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IFactoryStoreDao.java index 7a5a10a..9c4b473 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IFactoryStoreDao.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IFactoryStoreDao.java @@ -14,7 +14,7 @@ import java.util.List; @Repository public interface IFactoryStoreDao { - List listFactoryStore(); + // List listFactoryStore(); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/FactoryStoreDaoImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/FactoryStoreDaoImpl.java index 2b40885..aa782ea 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/FactoryStoreDaoImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/FactoryStoreDaoImpl.java @@ -20,12 +20,12 @@ public class FactoryStoreDaoImpl implements IFactoryStoreDao { @Autowired private EntityManager entityManager; - public List listFactoryStore(){ + /*public List listFactoryStore(){ List list = entityManager.createQuery("from FactoryStore").getResultList(); for(FactoryStore fs : list){ fs.setStoreCode(""); } return list; - } + }*/ } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java index edf8b84..232fb58 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.core.apiservice.schedulejob; +import cn.estsh.impp.framework.base.BaseImppScheduleJob; import cn.estsh.impp.framework.boot.core.ApplicationProperties; import cn.estsh.impp.framework.boot.quartz.job.ImppJob; +import io.swagger.annotations.ApiOperation; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; @@ -11,20 +13,22 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; /** - * @Description : + * @Description : 定时任务 * @Reference : * @Author : alwaysfrin * @CreateDate : 2018-09-30 13:25 * @Modify: **/ -public class DemoJob implements Job { +@ApiOperation("定时任务demo") +public class DemoJob extends BaseImppScheduleJob { public static final Logger LOGGER = LoggerFactory.getLogger(DemoJob.class); - @Autowired - public ApplicationProperties applicationProperties; - - public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { + public DemoJob() { + super(DemoJob.class,"定时任务demo"); + } + @Override + public void executeImppJob(JobExecutionContext context, ApplicationProperties applicationProperties) { LOGGER.info("projectName：{},port:{}",applicationProperties.getApplicationName(),applicationProperties.getServerPort()); } } From 0a8c8a925256e470b26370a73ce860495abeb8ae Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 8 Nov 2018 13:44:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?wms=E5=B7=A5=E5=8E=82=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E7=B1=BB=E4=B9=A6=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/apiservice/controller/busi/FactoryStoreController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java index 2f83ae4..f0dc009 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java @@ -44,7 +44,7 @@ public class FactoryStoreController { @GetMapping(value="/list") @ApiOperation(value="查询服务",notes="返回列表") public ResultBean list(){ - List fsList = dataMoreService.listFactoryStore(); + List fsList = null; return new ResultBean(true,"查询结果:" + fsList.size(),fsList); } From 7adb45b3bcf811bdf800e179e1dd2ed9357f1f06 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Thu, 8 Nov 2018 13:52:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-test.properties | 26 +++++++++++++--------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties index dda671f..ccf06e4 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties @@ -1,5 +1,5 @@ #项目端口 -server.port=8080 +server.port=51010 #用户登陆路径 filter.shiro.user.loginuri = /login @@ -21,7 +21,11 @@ impp.web.cross = false impp.web.cross.hosts = http://localhost ################ log-db据源 ################ -spring.data.mongodb.uri=mongodb://sa:i3plus@192.168.1.55:27017/i3plus +spring.data.mongodb.database=mongoDBSource +spring.data.mongodb.uri=192.168.1.55:27017 +spring.data.mongodb.username=sa +spring.data.mongodb.password=i3plus +spring.data.mongodb.port=27017 ################ 主数据源 ################ # mysql @@ -39,22 +43,22 @@ spring.data.mongodb.uri=mongodb://sa:i3plus@192.168.1.55:27017/i3plus ##主数据源，读写 #impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.write.datasource.username=i3_dev_core -impp.write.datasource.password=i3_core_pass +impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/test_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.write.datasource.username=impp_test_zzm +impp.write.datasource.password=123456 ##辅数据源，只读 #impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.read.datasource.username=i3_dev_core -impp.read.datasource.password=i3_core_pass +impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/test_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.read.datasource.username=impp_test_zzm +impp.read.datasource.password=123456 ##############定时任务持久化############## impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.schedule.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.schedule.datasource.username=i3_dev_schedule -impp.schedule.datasource.password=i3_schedule_pass +impp.schedule.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/test_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.schedule.datasource.username=impp_test_zzm +impp.schedule.datasource.password=123456 impp.schedule.datasource.max-connections=20 #定时任务在服务启动后多少秒执行 impp.schedule.start.after-second=20