From 2b11c0b496aee2f9c6119f29591f3cf6045e117f Mon Sep 17 00:00:00 2001 From: Shaun Chyxion Date: Sun, 29 May 2022 22:29:16 +0800 Subject: [PATCH] add thread pool --- server/crm/pom.xml | 2 -- .../pudonghot/ambition/crm/AmbitionCRM.java | 4 ++++ .../crm/service/ExportTaskService.java | 20 ++++++++++++++++ .../support/CustomerServiceSupport.java | 16 ------------- .../support/ExportTaskServiceSupport.java | 24 +++++++++++++++++++ .../main/resources/application_dev.properties | 9 +++---- server/crm/src/main/resources/log4j2_dev.xml | 4 ++-- .../crm/service/DiskFileStoreTest.java | 9 +++++-- server/file-api/pom.xml | 1 - server/file-disk/pom.xml | 2 -- server/lib/pom.xml | 1 - server/mapper/pom.xml | 2 -- .../resources/spring/spring-ambition-db.xml | 15 +----------- server/model/pom.xml | 1 - 14 files changed, 63 insertions(+), 47 deletions(-) create mode 100644 server/crm/src/main/java/com/pudonghot/ambition/crm/service/ExportTaskService.java create mode 100644 server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/ExportTaskServiceSupport.java diff --git a/server/crm/pom.xml b/server/crm/pom.xml index 4ca0c80..1fac438 100644 --- a/server/crm/pom.xml +++ b/server/crm/pom.xml @@ -6,13 +6,11 @@ 4.0.0 crm Ambition CRM - jar com.pudonghot.ambition ambition-crm 0.0.1-SNAPSHOT - ../ diff --git a/server/crm/src/main/java/com/pudonghot/ambition/crm/AmbitionCRM.java b/server/crm/src/main/java/com/pudonghot/ambition/crm/AmbitionCRM.java index 32b8941..dbd7632 100644 --- a/server/crm/src/main/java/com/pudonghot/ambition/crm/AmbitionCRM.java +++ b/server/crm/src/main/java/com/pudonghot/ambition/crm/AmbitionCRM.java @@ -1,6 +1,8 @@ package com.pudonghot.ambition.crm; import org.springframework.boot.SpringApplication; +import org.springframework.context.annotation.EnableAspectJAutoProxy; +import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; @@ -9,6 +11,8 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; * chyxion@163.com
* Mar 05, 2017 14:40:30 */ +@EnableAsync +@EnableAspectJAutoProxy(proxyTargetClass = true) @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) public class AmbitionCRM { diff --git a/server/crm/src/main/java/com/pudonghot/ambition/crm/service/ExportTaskService.java b/server/crm/src/main/java/com/pudonghot/ambition/crm/service/ExportTaskService.java new file mode 100644 index 0000000..73cd68e --- /dev/null +++ b/server/crm/src/main/java/com/pudonghot/ambition/crm/service/ExportTaskService.java @@ -0,0 +1,20 @@ +package com.pudonghot.ambition.crm.service; + +import javax.validation.constraints.NotBlank; +import org.springframework.validation.annotation.Validated; + +/** + * @author Donghuang + * @date May 29, 2022 21:24:42 + */ +@Validated +public interface ExportTaskService { + + /** + * do export + * + * @param operator + */ + void doExport(@NotBlank String operator); +} + diff --git a/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/CustomerServiceSupport.java b/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/CustomerServiceSupport.java index f351b10..fbf4ea1 100644 --- a/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/CustomerServiceSupport.java +++ b/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/CustomerServiceSupport.java @@ -470,22 +470,6 @@ public class CustomerServiceSupport .asc(Customer.ID), this::exportList, this::exportCount, c -> { -// "Customer ID", -// "Name", -// "Sum Sales(3 Years)", -// "Sales", -// "Comment", -// "Application", -// "Status", -// "Year Added", -// "Year", -// "Country", -// "State", -// "City", -// "MS", -// "Region", -// "Sales Person"); - try { log.info("Export Customer [{}].", c); printer.printRecord(c.getId2(), diff --git a/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/ExportTaskServiceSupport.java b/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/ExportTaskServiceSupport.java new file mode 100644 index 0000000..92852b4 --- /dev/null +++ b/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/ExportTaskServiceSupport.java @@ -0,0 +1,24 @@ +package com.pudonghot.ambition.crm.service.support; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; +import org.springframework.stereotype.Service; +import com.pudonghot.ambition.crm.service.ExportTaskService; + +/** + * @author Donghuang + * @date May 29, 2022 21:29:06 + */ +@Service +public class ExportTaskServiceSupport implements ExportTaskService { + @Autowired + private ThreadPoolTaskExecutor threadPoolTaskExecutor; + + /** + * {@inheritDoc} + */ + @Override + public void doExport(final String operator) { + + } +} diff --git a/server/crm/src/main/resources/application_dev.properties b/server/crm/src/main/resources/application_dev.properties index d19e2fc..d5542a7 100644 --- a/server/crm/src/main/resources/application_dev.properties +++ b/server/crm/src/main/resources/application_dev.properties @@ -3,11 +3,12 @@ server.port=8088 # MySQL -datasource.host=127.0.0.1 -datasource.port=63306 -datasource.database-name=ambition_crm_test +datasource.host=172.16.4.6 +datasource.port=3306 +datasource.database-name=ambition-crm datasource.username=root -datasource.password=696@2^~)oZ@^#*Q +datasource.password=MySQL2b||!2b + database.backup-dir=/Users/chyxion/Workspaces/ambition-crm/database_backups database.restore-shell=/data/program/mysql-backup/bin/mysql_restore.sh diff --git a/server/crm/src/main/resources/log4j2_dev.xml b/server/crm/src/main/resources/log4j2_dev.xml index 94490c0..6744678 100644 --- a/server/crm/src/main/resources/log4j2_dev.xml +++ b/server/crm/src/main/resources/log4j2_dev.xml @@ -10,8 +10,8 @@ + fileName="${log.dir}/app.log" + filePattern="${log.dir}/$${date:yyyy-MM}/app-%d{yyyy-MM-dd}-%i.log.gz"> diff --git a/server/crm/src/test/java/com/pudonghot/ambition/crm/service/DiskFileStoreTest.java b/server/crm/src/test/java/com/pudonghot/ambition/crm/service/DiskFileStoreTest.java index fc295ef..c13c2f4 100644 --- a/server/crm/src/test/java/com/pudonghot/ambition/crm/service/DiskFileStoreTest.java +++ b/server/crm/src/test/java/com/pudonghot/ambition/crm/service/DiskFileStoreTest.java @@ -1,12 +1,14 @@ package com.pudonghot.ambition.crm.service; import java.io.File; +import lombok.val; import org.junit.Test; import org.junit.runner.RunWith; import lombok.extern.slf4j.Slf4j; import com.pudonghot.ambition.crm.AmbitionCRM; import com.pudonghot.ambition.crm.model.FileInfo; import com.pudonghot.ambition.file.AmbitionFileApi; +import com.pudonghot.ambition.file.request.AmFileUploadReq; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; import org.springframework.beans.factory.annotation.Autowired; @@ -27,8 +29,11 @@ public class DiskFileStoreTest { private AmbitionFileApi fileApi; @Test - public void testUpload() throws Exception { - final FileInfo foobar = fileApi.upload(new File("/Users/chyxion/Workspaces//Eclipse/Default/bzush-schoolmate-api/src/main/java/cn/edu/bzu/schoolmate/controllers/FileController.java"), "foobar"); + public void testUpload() { + val req = new AmFileUploadReq(); + req.setFile(new File("/Users/chyxion/Workspaces/FileController.java")); + req.setName("foobar"); + final FileInfo foobar = fileApi.upload(req); log.info("Upload result [{}].", foobar); } } diff --git a/server/file-api/pom.xml b/server/file-api/pom.xml index ee60c89..0607141 100644 --- a/server/file-api/pom.xml +++ b/server/file-api/pom.xml @@ -12,7 +12,6 @@ com.pudonghot.ambition ambition-crm 0.0.1-SNAPSHOT - ../ diff --git a/server/file-disk/pom.xml b/server/file-disk/pom.xml index 8a0a218..dcd4340 100644 --- a/server/file-disk/pom.xml +++ b/server/file-disk/pom.xml @@ -6,13 +6,11 @@ 4.0.0 file-disk Ambition File Disk - jar com.pudonghot.ambition ambition-crm 0.0.1-SNAPSHOT - ../ diff --git a/server/lib/pom.xml b/server/lib/pom.xml index 4e7c32e..01f018b 100644 --- a/server/lib/pom.xml +++ b/server/lib/pom.xml @@ -13,7 +13,6 @@ com.pudonghot.ambition ambition-crm 0.0.1-SNAPSHOT - ../ diff --git a/server/mapper/pom.xml b/server/mapper/pom.xml index 2180893..6b045a6 100644 --- a/server/mapper/pom.xml +++ b/server/mapper/pom.xml @@ -6,13 +6,11 @@ 4.0.0 crm-mapper Ambition Mapper - jar com.pudonghot.ambition ambition-crm 0.0.1-SNAPSHOT - ../ diff --git a/server/mapper/src/main/resources/spring/spring-ambition-db.xml b/server/mapper/src/main/resources/spring/spring-ambition-db.xml index ea72415..65b9317 100644 --- a/server/mapper/src/main/resources/spring/spring-ambition-db.xml +++ b/server/mapper/src/main/resources/spring/spring-ambition-db.xml @@ -2,16 +2,8 @@ - - + http://www.springframework.org/schema/beans/spring-beans.xsd"> - - - - com.pudonghot.ambition ambition-crm 0.0.1-SNAPSHOT - ../