From 53b8feceb60ad40601aac3ea711e9c92b6ee8158 Mon Sep 17 00:00:00 2001 From: ywang1999 <40171072+ywang1999@users.noreply.github.com> Date: Sun, 1 Jul 2018 19:58:19 +0800 Subject: [PATCH 1/7] Create training-ppt-stater --- training-parent/training-ppt-stater | 1 + 1 file changed, 1 insertion(+) create mode 100644 training-parent/training-ppt-stater diff --git a/training-parent/training-ppt-stater b/training-parent/training-ppt-stater new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/training-parent/training-ppt-stater @@ -0,0 +1 @@ + From f60360eb52170185249a1d7acea62455cee29eac Mon Sep 17 00:00:00 2001 From: ywang1999 <40171072+ywang1999@users.noreply.github.com> Date: Sun, 1 Jul 2018 20:16:30 +0800 Subject: [PATCH 2/7] Delete training-ppt-stater --- training-parent/training-ppt-stater | 1 - 1 file changed, 1 deletion(-) delete mode 100644 training-parent/training-ppt-stater diff --git a/training-parent/training-ppt-stater b/training-parent/training-ppt-stater deleted file mode 100644 index 8b13789..0000000 --- a/training-parent/training-ppt-stater +++ /dev/null @@ -1 +0,0 @@ - From f0014ec267274c0287d500a17f59a66a0f13f881 Mon Sep 17 00:00:00 2001 From: Freud Date: Sun, 1 Jul 2018 14:24:50 +0800 Subject: [PATCH 3/7] separate-to-different-projects --- .DS_Store | Bin 6148 -> 6148 bytes .../.gitignore | 0 .../pom.xml | 2 +- .../src/main/resources/application.yml | 0 .../TrainingBusinessApplicationTests.java | 0 training-training/.gitignore | 25 +++++ training-training/pom.xml | 87 ++++++++++++++++++ .../training/TrainingBusinessApplication.java | 0 .../controller/TrainingController.java | 0 .../controller/TrainingHistoryController.java | 0 .../training/domain/TrainingDomain.java | 0 .../training/domain/TrainingDomainImpl.java | 0 .../domain/TrainingHistoryDomain.java | 0 .../domain/TrainingHistoryDomainImpl.java | 0 .../module/training/dto/Training.java | 0 .../module/training/dto/TrainingHistory.java | 0 .../exception/TrainingExceptionCode.java | 0 .../training/model/TrainingDetailRequest.java | 0 .../model/TrainingDetailResponse.java | 0 .../training/model/TrainingHistoryDetail.java | 0 .../model/TrainingHistoryRequest.java | 0 .../model/TrainingHistoryResponse.java | 0 .../repository/TrainingHistoryResposity.java | 0 .../repository/TrainingRepository.java | 0 .../service/TrainingHistoryService.java | 0 .../service/TrainingHistoryServiceImpl.java | 0 .../training/service/TrainingService.java | 0 .../training/service/TrainingServiceImpl.java | 0 .../src/main/resources/application.yml | 14 +++ .../src/main/resources}/training/Training.sql | 0 .../TrainingBusinessApplicationTests.java | 16 ++++ training-user/.gitignore | 25 +++++ training-user/pom.xml | 87 ++++++++++++++++++ .../src/main/resources/application.yml | 14 +++ .../src/main/resources}/user/user.sql | 0 .../TrainingBusinessApplicationTests.java | 16 ++++ 36 files changed, 285 insertions(+), 1 deletion(-) rename {training-business => training-common}/.gitignore (100%) rename {training-business => training-common}/pom.xml (98%) rename {training-business => training-common}/src/main/resources/application.yml (100%) rename {training-business => training-common}/src/test/java/com/msclub/training/TrainingBusinessApplicationTests.java (100%) create mode 100644 training-training/.gitignore create mode 100644 training-training/pom.xml rename {training-business => training-training}/src/main/java/com/msclub/training/TrainingBusinessApplication.java (100%) rename {training-business => training-training}/src/main/java/com/msclub/training/module/training/controller/TrainingController.java (100%) rename {training-business => training-training}/src/main/java/com/msclub/training/module/training/controller/TrainingHistoryController.java (100%) rename {training-business => training-training}/src/main/java/com/msclub/training/module/training/domain/TrainingDomain.java (100%) rename {training-business => training-training}/src/main/java/com/msclub/training/module/training/domain/TrainingDomainImpl.java (100%) rename {training-business => training-training}/src/main/java/com/msclub/training/module/training/domain/TrainingHistoryDomain.java (100%) rename {training-business => training-training}/src/main/java/com/msclub/training/module/training/domain/TrainingHistoryDomainImpl.java (100%) rename {training-business => training-training}/src/main/java/com/msclub/training/module/training/dto/Training.java (100%) rename {training-business => training-training}/src/main/java/com/msclub/training/module/training/dto/TrainingHistory.java (100%) rename {training-business => training-training}/src/main/java/com/msclub/training/module/training/exception/TrainingExceptionCode.java (100%) rename {training-business => training-training}/src/main/java/com/msclub/training/module/training/model/TrainingDetailRequest.java (100%) rename {training-business => training-training}/src/main/java/com/msclub/training/module/training/model/TrainingDetailResponse.java (100%) rename {training-business => training-training}/src/main/java/com/msclub/training/module/training/model/TrainingHistoryDetail.java (100%) rename {training-business => training-training}/src/main/java/com/msclub/training/module/training/model/TrainingHistoryRequest.java (100%) rename {training-business => training-training}/src/main/java/com/msclub/training/module/training/model/TrainingHistoryResponse.java (100%) rename {training-business => training-training}/src/main/java/com/msclub/training/module/training/repository/TrainingHistoryResposity.java (100%) rename {training-business => training-training}/src/main/java/com/msclub/training/module/training/repository/TrainingRepository.java (100%) rename {training-business => training-training}/src/main/java/com/msclub/training/module/training/service/TrainingHistoryService.java (100%) rename {training-business => training-training}/src/main/java/com/msclub/training/module/training/service/TrainingHistoryServiceImpl.java (100%) rename {training-business => training-training}/src/main/java/com/msclub/training/module/training/service/TrainingService.java (100%) rename {training-business => training-training}/src/main/java/com/msclub/training/module/training/service/TrainingServiceImpl.java (100%) create mode 100644 training-training/src/main/resources/application.yml rename {training-business/src/main/resources/module => training-training/src/main/resources}/training/Training.sql (100%) create mode 100644 training-training/src/test/java/com/msclub/training/TrainingBusinessApplicationTests.java create mode 100644 training-user/.gitignore create mode 100644 training-user/pom.xml create mode 100644 training-user/src/main/resources/application.yml rename {training-business/src/main/resources/module => training-user/src/main/resources}/user/user.sql (100%) create mode 100644 training-user/src/test/java/com/msclub/training/TrainingBusinessApplicationTests.java diff --git a/.DS_Store b/.DS_Store index 06a0082e998dca7498bbd33db944850457beb22b..29ddc457a4adabc9a9f59c129a4b97b65b0e39b5 100644 GIT binary patch delta 173 zcmZoMXfc@J&&a(oU^g=(_hds>mCXh$EKHNr*hH+88S)u&fiRyTuPnGIFDE}Qoq>UY z5r_pCN*Ib55*acX^1wKqL6;#N$S+|?Whe*Im6OBSY$uzriMXPvLo 4.0.0 - training-business + training-common jar diff --git a/training-business/src/main/resources/application.yml b/training-common/src/main/resources/application.yml similarity index 100% rename from training-business/src/main/resources/application.yml rename to training-common/src/main/resources/application.yml diff --git a/training-business/src/test/java/com/msclub/training/TrainingBusinessApplicationTests.java b/training-common/src/test/java/com/msclub/training/TrainingBusinessApplicationTests.java similarity index 100% rename from training-business/src/test/java/com/msclub/training/TrainingBusinessApplicationTests.java rename to training-common/src/test/java/com/msclub/training/TrainingBusinessApplicationTests.java diff --git a/training-training/.gitignore b/training-training/.gitignore new file mode 100644 index 0000000..82eca33 --- /dev/null +++ b/training-training/.gitignore @@ -0,0 +1,25 @@ +/target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/build/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ \ No newline at end of file diff --git a/training-training/pom.xml b/training-training/pom.xml new file mode 100644 index 0000000..3aa863f --- /dev/null +++ b/training-training/pom.xml @@ -0,0 +1,87 @@ + + + 4.0.0 + + training-training + jar + + + com.msclub.training + training-starter-parent + 0.0.1-SNAPSHOT + + + + UTF-8 + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter-web + + + + com.msclub.base + msclub-web-starter + + + + com.msclub.base + msclub-exception-starter + + + + com.msclub.base + msclub-swagger-starter + + + + com.msclub.training + training-web-stater + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + org.hsqldb + hsqldb + + + + mysql + mysql-connector-java + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.7 + 1.7 + + + + + + + diff --git a/training-business/src/main/java/com/msclub/training/TrainingBusinessApplication.java b/training-training/src/main/java/com/msclub/training/TrainingBusinessApplication.java similarity index 100% rename from training-business/src/main/java/com/msclub/training/TrainingBusinessApplication.java rename to training-training/src/main/java/com/msclub/training/TrainingBusinessApplication.java diff --git a/training-business/src/main/java/com/msclub/training/module/training/controller/TrainingController.java b/training-training/src/main/java/com/msclub/training/module/training/controller/TrainingController.java similarity index 100% rename from training-business/src/main/java/com/msclub/training/module/training/controller/TrainingController.java rename to training-training/src/main/java/com/msclub/training/module/training/controller/TrainingController.java diff --git a/training-business/src/main/java/com/msclub/training/module/training/controller/TrainingHistoryController.java b/training-training/src/main/java/com/msclub/training/module/training/controller/TrainingHistoryController.java similarity index 100% rename from training-business/src/main/java/com/msclub/training/module/training/controller/TrainingHistoryController.java rename to training-training/src/main/java/com/msclub/training/module/training/controller/TrainingHistoryController.java diff --git a/training-business/src/main/java/com/msclub/training/module/training/domain/TrainingDomain.java b/training-training/src/main/java/com/msclub/training/module/training/domain/TrainingDomain.java similarity index 100% rename from training-business/src/main/java/com/msclub/training/module/training/domain/TrainingDomain.java rename to training-training/src/main/java/com/msclub/training/module/training/domain/TrainingDomain.java diff --git a/training-business/src/main/java/com/msclub/training/module/training/domain/TrainingDomainImpl.java b/training-training/src/main/java/com/msclub/training/module/training/domain/TrainingDomainImpl.java similarity index 100% rename from training-business/src/main/java/com/msclub/training/module/training/domain/TrainingDomainImpl.java rename to training-training/src/main/java/com/msclub/training/module/training/domain/TrainingDomainImpl.java diff --git a/training-business/src/main/java/com/msclub/training/module/training/domain/TrainingHistoryDomain.java b/training-training/src/main/java/com/msclub/training/module/training/domain/TrainingHistoryDomain.java similarity index 100% rename from training-business/src/main/java/com/msclub/training/module/training/domain/TrainingHistoryDomain.java rename to training-training/src/main/java/com/msclub/training/module/training/domain/TrainingHistoryDomain.java diff --git a/training-business/src/main/java/com/msclub/training/module/training/domain/TrainingHistoryDomainImpl.java b/training-training/src/main/java/com/msclub/training/module/training/domain/TrainingHistoryDomainImpl.java similarity index 100% rename from training-business/src/main/java/com/msclub/training/module/training/domain/TrainingHistoryDomainImpl.java rename to training-training/src/main/java/com/msclub/training/module/training/domain/TrainingHistoryDomainImpl.java diff --git a/training-business/src/main/java/com/msclub/training/module/training/dto/Training.java b/training-training/src/main/java/com/msclub/training/module/training/dto/Training.java similarity index 100% rename from training-business/src/main/java/com/msclub/training/module/training/dto/Training.java rename to training-training/src/main/java/com/msclub/training/module/training/dto/Training.java diff --git a/training-business/src/main/java/com/msclub/training/module/training/dto/TrainingHistory.java b/training-training/src/main/java/com/msclub/training/module/training/dto/TrainingHistory.java similarity index 100% rename from training-business/src/main/java/com/msclub/training/module/training/dto/TrainingHistory.java rename to training-training/src/main/java/com/msclub/training/module/training/dto/TrainingHistory.java diff --git a/training-business/src/main/java/com/msclub/training/module/training/exception/TrainingExceptionCode.java b/training-training/src/main/java/com/msclub/training/module/training/exception/TrainingExceptionCode.java similarity index 100% rename from training-business/src/main/java/com/msclub/training/module/training/exception/TrainingExceptionCode.java rename to training-training/src/main/java/com/msclub/training/module/training/exception/TrainingExceptionCode.java diff --git a/training-business/src/main/java/com/msclub/training/module/training/model/TrainingDetailRequest.java b/training-training/src/main/java/com/msclub/training/module/training/model/TrainingDetailRequest.java similarity index 100% rename from training-business/src/main/java/com/msclub/training/module/training/model/TrainingDetailRequest.java rename to training-training/src/main/java/com/msclub/training/module/training/model/TrainingDetailRequest.java diff --git a/training-business/src/main/java/com/msclub/training/module/training/model/TrainingDetailResponse.java b/training-training/src/main/java/com/msclub/training/module/training/model/TrainingDetailResponse.java similarity index 100% rename from training-business/src/main/java/com/msclub/training/module/training/model/TrainingDetailResponse.java rename to training-training/src/main/java/com/msclub/training/module/training/model/TrainingDetailResponse.java diff --git a/training-business/src/main/java/com/msclub/training/module/training/model/TrainingHistoryDetail.java b/training-training/src/main/java/com/msclub/training/module/training/model/TrainingHistoryDetail.java similarity index 100% rename from training-business/src/main/java/com/msclub/training/module/training/model/TrainingHistoryDetail.java rename to training-training/src/main/java/com/msclub/training/module/training/model/TrainingHistoryDetail.java diff --git a/training-business/src/main/java/com/msclub/training/module/training/model/TrainingHistoryRequest.java b/training-training/src/main/java/com/msclub/training/module/training/model/TrainingHistoryRequest.java similarity index 100% rename from training-business/src/main/java/com/msclub/training/module/training/model/TrainingHistoryRequest.java rename to training-training/src/main/java/com/msclub/training/module/training/model/TrainingHistoryRequest.java diff --git a/training-business/src/main/java/com/msclub/training/module/training/model/TrainingHistoryResponse.java b/training-training/src/main/java/com/msclub/training/module/training/model/TrainingHistoryResponse.java similarity index 100% rename from training-business/src/main/java/com/msclub/training/module/training/model/TrainingHistoryResponse.java rename to training-training/src/main/java/com/msclub/training/module/training/model/TrainingHistoryResponse.java diff --git a/training-business/src/main/java/com/msclub/training/module/training/repository/TrainingHistoryResposity.java b/training-training/src/main/java/com/msclub/training/module/training/repository/TrainingHistoryResposity.java similarity index 100% rename from training-business/src/main/java/com/msclub/training/module/training/repository/TrainingHistoryResposity.java rename to training-training/src/main/java/com/msclub/training/module/training/repository/TrainingHistoryResposity.java diff --git a/training-business/src/main/java/com/msclub/training/module/training/repository/TrainingRepository.java b/training-training/src/main/java/com/msclub/training/module/training/repository/TrainingRepository.java similarity index 100% rename from training-business/src/main/java/com/msclub/training/module/training/repository/TrainingRepository.java rename to training-training/src/main/java/com/msclub/training/module/training/repository/TrainingRepository.java diff --git a/training-business/src/main/java/com/msclub/training/module/training/service/TrainingHistoryService.java b/training-training/src/main/java/com/msclub/training/module/training/service/TrainingHistoryService.java similarity index 100% rename from training-business/src/main/java/com/msclub/training/module/training/service/TrainingHistoryService.java rename to training-training/src/main/java/com/msclub/training/module/training/service/TrainingHistoryService.java diff --git a/training-business/src/main/java/com/msclub/training/module/training/service/TrainingHistoryServiceImpl.java b/training-training/src/main/java/com/msclub/training/module/training/service/TrainingHistoryServiceImpl.java similarity index 100% rename from training-business/src/main/java/com/msclub/training/module/training/service/TrainingHistoryServiceImpl.java rename to training-training/src/main/java/com/msclub/training/module/training/service/TrainingHistoryServiceImpl.java diff --git a/training-business/src/main/java/com/msclub/training/module/training/service/TrainingService.java b/training-training/src/main/java/com/msclub/training/module/training/service/TrainingService.java similarity index 100% rename from training-business/src/main/java/com/msclub/training/module/training/service/TrainingService.java rename to training-training/src/main/java/com/msclub/training/module/training/service/TrainingService.java diff --git a/training-business/src/main/java/com/msclub/training/module/training/service/TrainingServiceImpl.java b/training-training/src/main/java/com/msclub/training/module/training/service/TrainingServiceImpl.java similarity index 100% rename from training-business/src/main/java/com/msclub/training/module/training/service/TrainingServiceImpl.java rename to training-training/src/main/java/com/msclub/training/module/training/service/TrainingServiceImpl.java diff --git a/training-training/src/main/resources/application.yml b/training-training/src/main/resources/application.yml new file mode 100644 index 0000000..1e92341 --- /dev/null +++ b/training-training/src/main/resources/application.yml @@ -0,0 +1,14 @@ +server: + port: 8081 + +spring: + jpa: + show-sql: true + hibernate: + ddl-auto: false + datasource: + driver-class-name: com.mysql.jdbc.Driver + url: jdbc:mysql://127.0.0.1:3306/MICROSERVICEDEV?useUnicode=true&characterEncoding=UTF-8 + username: root + password: root + \ No newline at end of file diff --git a/training-business/src/main/resources/module/training/Training.sql b/training-training/src/main/resources/training/Training.sql similarity index 100% rename from training-business/src/main/resources/module/training/Training.sql rename to training-training/src/main/resources/training/Training.sql diff --git a/training-training/src/test/java/com/msclub/training/TrainingBusinessApplicationTests.java b/training-training/src/test/java/com/msclub/training/TrainingBusinessApplicationTests.java new file mode 100644 index 0000000..cf6c0bb --- /dev/null +++ b/training-training/src/test/java/com/msclub/training/TrainingBusinessApplicationTests.java @@ -0,0 +1,16 @@ +package com.msclub.training; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class TrainingBusinessApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/training-user/.gitignore b/training-user/.gitignore new file mode 100644 index 0000000..82eca33 --- /dev/null +++ b/training-user/.gitignore @@ -0,0 +1,25 @@ +/target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/build/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ \ No newline at end of file diff --git a/training-user/pom.xml b/training-user/pom.xml new file mode 100644 index 0000000..fb2b0b5 --- /dev/null +++ b/training-user/pom.xml @@ -0,0 +1,87 @@ + + + 4.0.0 + + training-user + jar + + + com.msclub.training + training-starter-parent + 0.0.1-SNAPSHOT + + + + UTF-8 + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter-web + + + + com.msclub.base + msclub-web-starter + + + + com.msclub.base + msclub-exception-starter + + + + com.msclub.base + msclub-swagger-starter + + + + com.msclub.training + training-web-stater + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + org.hsqldb + hsqldb + + + + mysql + mysql-connector-java + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.7 + 1.7 + + + + + + + diff --git a/training-user/src/main/resources/application.yml b/training-user/src/main/resources/application.yml new file mode 100644 index 0000000..1e92341 --- /dev/null +++ b/training-user/src/main/resources/application.yml @@ -0,0 +1,14 @@ +server: + port: 8081 + +spring: + jpa: + show-sql: true + hibernate: + ddl-auto: false + datasource: + driver-class-name: com.mysql.jdbc.Driver + url: jdbc:mysql://127.0.0.1:3306/MICROSERVICEDEV?useUnicode=true&characterEncoding=UTF-8 + username: root + password: root + \ No newline at end of file diff --git a/training-business/src/main/resources/module/user/user.sql b/training-user/src/main/resources/user/user.sql similarity index 100% rename from training-business/src/main/resources/module/user/user.sql rename to training-user/src/main/resources/user/user.sql diff --git a/training-user/src/test/java/com/msclub/training/TrainingBusinessApplicationTests.java b/training-user/src/test/java/com/msclub/training/TrainingBusinessApplicationTests.java new file mode 100644 index 0000000..cf6c0bb --- /dev/null +++ b/training-user/src/test/java/com/msclub/training/TrainingBusinessApplicationTests.java @@ -0,0 +1,16 @@ +package com.msclub.training; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class TrainingBusinessApplicationTests { + + @Test + public void contextLoads() { + } + +} From 790f582c03ad5a889521b2d429465739b11f372e Mon Sep 17 00:00:00 2001 From: Freud Date: Sun, 1 Jul 2018 14:33:36 +0800 Subject: [PATCH 4/7] fix the package names --- .../{training => }/TrainingBusinessApplication.java | 2 +- .../training => }/controller/TrainingController.java | 10 +++++----- .../controller/TrainingHistoryController.java | 12 ++++++------ .../com/msclub/training/domain/TrainingDomain.java | 9 +++++++++ .../training => }/domain/TrainingDomainImpl.java | 8 ++++---- .../training => }/domain/TrainingHistoryDomain.java | 4 ++-- .../domain/TrainingHistoryDomainImpl.java | 8 ++++---- .../training/{module/training => }/dto/Training.java | 2 +- .../{module/training => }/dto/TrainingHistory.java | 2 +- .../exception/TrainingExceptionCode.java | 2 +- .../training => }/model/TrainingDetailRequest.java | 2 +- .../training => }/model/TrainingDetailResponse.java | 2 +- .../training => }/model/TrainingHistoryDetail.java | 2 +- .../training => }/model/TrainingHistoryRequest.java | 2 +- .../training => }/model/TrainingHistoryResponse.java | 2 +- .../module/training/domain/TrainingDomain.java | 9 --------- .../module/training/service/TrainingService.java | 8 -------- .../repository/TrainingHistoryResposity.java | 4 ++-- .../training => }/repository/TrainingRepository.java | 4 ++-- .../service/TrainingHistoryService.java | 4 ++-- .../service/TrainingHistoryServiceImpl.java | 6 +++--- .../com/msclub/training/service/TrainingService.java | 8 ++++++++ .../training => }/service/TrainingServiceImpl.java | 6 +++--- 23 files changed, 59 insertions(+), 59 deletions(-) rename training-training/src/main/java/com/msclub/{training => }/TrainingBusinessApplication.java (91%) rename training-training/src/main/java/com/msclub/training/{module/training => }/controller/TrainingController.java (85%) rename training-training/src/main/java/com/msclub/training/{module/training => }/controller/TrainingHistoryController.java (86%) create mode 100644 training-training/src/main/java/com/msclub/training/domain/TrainingDomain.java rename training-training/src/main/java/com/msclub/training/{module/training => }/domain/TrainingDomainImpl.java (67%) rename training-training/src/main/java/com/msclub/training/{module/training => }/domain/TrainingHistoryDomain.java (55%) rename training-training/src/main/java/com/msclub/training/{module/training => }/domain/TrainingHistoryDomainImpl.java (77%) rename training-training/src/main/java/com/msclub/training/{module/training => }/dto/Training.java (99%) rename training-training/src/main/java/com/msclub/training/{module/training => }/dto/TrainingHistory.java (98%) rename training-training/src/main/java/com/msclub/training/{module/training => }/exception/TrainingExceptionCode.java (94%) rename training-training/src/main/java/com/msclub/training/{module/training => }/model/TrainingDetailRequest.java (75%) rename training-training/src/main/java/com/msclub/training/{module/training => }/model/TrainingDetailResponse.java (98%) rename training-training/src/main/java/com/msclub/training/{module/training => }/model/TrainingHistoryDetail.java (98%) rename training-training/src/main/java/com/msclub/training/{module/training => }/model/TrainingHistoryRequest.java (80%) rename training-training/src/main/java/com/msclub/training/{module/training => }/model/TrainingHistoryResponse.java (88%) delete mode 100644 training-training/src/main/java/com/msclub/training/module/training/domain/TrainingDomain.java delete mode 100644 training-training/src/main/java/com/msclub/training/module/training/service/TrainingService.java rename training-training/src/main/java/com/msclub/training/{module/training => }/repository/TrainingHistoryResposity.java (67%) rename training-training/src/main/java/com/msclub/training/{module/training => }/repository/TrainingRepository.java (56%) rename training-training/src/main/java/com/msclub/training/{module/training => }/service/TrainingHistoryService.java (56%) rename training-training/src/main/java/com/msclub/training/{module/training => }/service/TrainingHistoryServiceImpl.java (70%) create mode 100644 training-training/src/main/java/com/msclub/training/service/TrainingService.java rename training-training/src/main/java/com/msclub/training/{module/training => }/service/TrainingServiceImpl.java (66%) diff --git a/training-training/src/main/java/com/msclub/training/TrainingBusinessApplication.java b/training-training/src/main/java/com/msclub/TrainingBusinessApplication.java similarity index 91% rename from training-training/src/main/java/com/msclub/training/TrainingBusinessApplication.java rename to training-training/src/main/java/com/msclub/TrainingBusinessApplication.java index a4d66ca..eff3675 100644 --- a/training-training/src/main/java/com/msclub/training/TrainingBusinessApplication.java +++ b/training-training/src/main/java/com/msclub/TrainingBusinessApplication.java @@ -1,4 +1,4 @@ -package com.msclub.training; +package com.msclub; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/training-training/src/main/java/com/msclub/training/module/training/controller/TrainingController.java b/training-training/src/main/java/com/msclub/training/controller/TrainingController.java similarity index 85% rename from training-training/src/main/java/com/msclub/training/module/training/controller/TrainingController.java rename to training-training/src/main/java/com/msclub/training/controller/TrainingController.java index 6d42321..640e97b 100644 --- a/training-training/src/main/java/com/msclub/training/module/training/controller/TrainingController.java +++ b/training-training/src/main/java/com/msclub/training/controller/TrainingController.java @@ -1,4 +1,4 @@ -package com.msclub.training.module.training.controller; +package com.msclub.training.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -6,10 +6,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.msclub.training.module.training.dto.Training; -import com.msclub.training.module.training.model.TrainingDetailRequest; -import com.msclub.training.module.training.model.TrainingDetailResponse; -import com.msclub.training.module.training.service.TrainingService; +import com.msclub.training.dto.Training; +import com.msclub.training.model.TrainingDetailRequest; +import com.msclub.training.model.TrainingDetailResponse; +import com.msclub.training.service.TrainingService; @RestController @RequestMapping("/training") diff --git a/training-training/src/main/java/com/msclub/training/module/training/controller/TrainingHistoryController.java b/training-training/src/main/java/com/msclub/training/controller/TrainingHistoryController.java similarity index 86% rename from training-training/src/main/java/com/msclub/training/module/training/controller/TrainingHistoryController.java rename to training-training/src/main/java/com/msclub/training/controller/TrainingHistoryController.java index 4a20734..38723a3 100644 --- a/training-training/src/main/java/com/msclub/training/module/training/controller/TrainingHistoryController.java +++ b/training-training/src/main/java/com/msclub/training/controller/TrainingHistoryController.java @@ -1,4 +1,4 @@ -package com.msclub.training.module.training.controller; +package com.msclub.training.controller; import java.util.ArrayList; import java.util.List; @@ -9,11 +9,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.msclub.training.module.training.dto.TrainingHistory; -import com.msclub.training.module.training.model.TrainingHistoryDetail; -import com.msclub.training.module.training.model.TrainingHistoryRequest; -import com.msclub.training.module.training.model.TrainingHistoryResponse; -import com.msclub.training.module.training.service.TrainingHistoryService; +import com.msclub.training.dto.TrainingHistory; +import com.msclub.training.model.TrainingHistoryDetail; +import com.msclub.training.model.TrainingHistoryRequest; +import com.msclub.training.model.TrainingHistoryResponse; +import com.msclub.training.service.TrainingHistoryService; @RestController @RequestMapping("/training") diff --git a/training-training/src/main/java/com/msclub/training/domain/TrainingDomain.java b/training-training/src/main/java/com/msclub/training/domain/TrainingDomain.java new file mode 100644 index 0000000..fe6218d --- /dev/null +++ b/training-training/src/main/java/com/msclub/training/domain/TrainingDomain.java @@ -0,0 +1,9 @@ +package com.msclub.training.domain; + +import com.msclub.training.dto.Training; + +public interface TrainingDomain { + + public Training getTrainingById(Integer id); + +} diff --git a/training-training/src/main/java/com/msclub/training/module/training/domain/TrainingDomainImpl.java b/training-training/src/main/java/com/msclub/training/domain/TrainingDomainImpl.java similarity index 67% rename from training-training/src/main/java/com/msclub/training/module/training/domain/TrainingDomainImpl.java rename to training-training/src/main/java/com/msclub/training/domain/TrainingDomainImpl.java index e8b5897..ba4d287 100644 --- a/training-training/src/main/java/com/msclub/training/module/training/domain/TrainingDomainImpl.java +++ b/training-training/src/main/java/com/msclub/training/domain/TrainingDomainImpl.java @@ -1,12 +1,12 @@ -package com.msclub.training.module.training.domain; +package com.msclub.training.domain; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.msclub.base.exception.TechnicalFailureException; -import com.msclub.training.module.training.dto.Training; -import com.msclub.training.module.training.exception.TrainingExceptionCode; -import com.msclub.training.module.training.repository.TrainingRepository; +import com.msclub.training.dto.Training; +import com.msclub.training.exception.TrainingExceptionCode; +import com.msclub.training.repository.TrainingRepository; @Service public class TrainingDomainImpl implements TrainingDomain { diff --git a/training-training/src/main/java/com/msclub/training/module/training/domain/TrainingHistoryDomain.java b/training-training/src/main/java/com/msclub/training/domain/TrainingHistoryDomain.java similarity index 55% rename from training-training/src/main/java/com/msclub/training/module/training/domain/TrainingHistoryDomain.java rename to training-training/src/main/java/com/msclub/training/domain/TrainingHistoryDomain.java index 7ef9b75..b0c293d 100644 --- a/training-training/src/main/java/com/msclub/training/module/training/domain/TrainingHistoryDomain.java +++ b/training-training/src/main/java/com/msclub/training/domain/TrainingHistoryDomain.java @@ -1,8 +1,8 @@ -package com.msclub.training.module.training.domain; +package com.msclub.training.domain; import java.util.List; -import com.msclub.training.module.training.dto.TrainingHistory; +import com.msclub.training.dto.TrainingHistory; public interface TrainingHistoryDomain { diff --git a/training-training/src/main/java/com/msclub/training/module/training/domain/TrainingHistoryDomainImpl.java b/training-training/src/main/java/com/msclub/training/domain/TrainingHistoryDomainImpl.java similarity index 77% rename from training-training/src/main/java/com/msclub/training/module/training/domain/TrainingHistoryDomainImpl.java rename to training-training/src/main/java/com/msclub/training/domain/TrainingHistoryDomainImpl.java index 2c3f2bc..c11dbf6 100644 --- a/training-training/src/main/java/com/msclub/training/module/training/domain/TrainingHistoryDomainImpl.java +++ b/training-training/src/main/java/com/msclub/training/domain/TrainingHistoryDomainImpl.java @@ -1,4 +1,4 @@ -package com.msclub.training.module.training.domain; +package com.msclub.training.domain; import java.util.List; @@ -8,9 +8,9 @@ import com.msclub.base.exception.DataNotFoundException; import com.msclub.base.exception.TechnicalFailureException; -import com.msclub.training.module.training.dto.TrainingHistory; -import com.msclub.training.module.training.exception.TrainingExceptionCode; -import com.msclub.training.module.training.repository.TrainingHistoryResposity; +import com.msclub.training.dto.TrainingHistory; +import com.msclub.training.exception.TrainingExceptionCode; +import com.msclub.training.repository.TrainingHistoryResposity; @Service public class TrainingHistoryDomainImpl implements TrainingHistoryDomain{ diff --git a/training-training/src/main/java/com/msclub/training/module/training/dto/Training.java b/training-training/src/main/java/com/msclub/training/dto/Training.java similarity index 99% rename from training-training/src/main/java/com/msclub/training/module/training/dto/Training.java rename to training-training/src/main/java/com/msclub/training/dto/Training.java index 0065e30..3e04690 100644 --- a/training-training/src/main/java/com/msclub/training/module/training/dto/Training.java +++ b/training-training/src/main/java/com/msclub/training/dto/Training.java @@ -1,4 +1,4 @@ -package com.msclub.training.module.training.dto; +package com.msclub.training.dto; import java.io.Serializable; import java.sql.Date; diff --git a/training-training/src/main/java/com/msclub/training/module/training/dto/TrainingHistory.java b/training-training/src/main/java/com/msclub/training/dto/TrainingHistory.java similarity index 98% rename from training-training/src/main/java/com/msclub/training/module/training/dto/TrainingHistory.java rename to training-training/src/main/java/com/msclub/training/dto/TrainingHistory.java index ae6f350..9f67a6b 100644 --- a/training-training/src/main/java/com/msclub/training/module/training/dto/TrainingHistory.java +++ b/training-training/src/main/java/com/msclub/training/dto/TrainingHistory.java @@ -1,4 +1,4 @@ -package com.msclub.training.module.training.dto; +package com.msclub.training.dto; import java.io.Serializable; import java.sql.Date; diff --git a/training-training/src/main/java/com/msclub/training/module/training/exception/TrainingExceptionCode.java b/training-training/src/main/java/com/msclub/training/exception/TrainingExceptionCode.java similarity index 94% rename from training-training/src/main/java/com/msclub/training/module/training/exception/TrainingExceptionCode.java rename to training-training/src/main/java/com/msclub/training/exception/TrainingExceptionCode.java index 447240b..99ed115 100644 --- a/training-training/src/main/java/com/msclub/training/module/training/exception/TrainingExceptionCode.java +++ b/training-training/src/main/java/com/msclub/training/exception/TrainingExceptionCode.java @@ -1,4 +1,4 @@ -package com.msclub.training.module.training.exception; +package com.msclub.training.exception; import org.springframework.http.HttpStatus; diff --git a/training-training/src/main/java/com/msclub/training/module/training/model/TrainingDetailRequest.java b/training-training/src/main/java/com/msclub/training/model/TrainingDetailRequest.java similarity index 75% rename from training-training/src/main/java/com/msclub/training/module/training/model/TrainingDetailRequest.java rename to training-training/src/main/java/com/msclub/training/model/TrainingDetailRequest.java index e64d4fc..0af5957 100644 --- a/training-training/src/main/java/com/msclub/training/module/training/model/TrainingDetailRequest.java +++ b/training-training/src/main/java/com/msclub/training/model/TrainingDetailRequest.java @@ -1,4 +1,4 @@ -package com.msclub.training.module.training.model; +package com.msclub.training.model; public class TrainingDetailRequest { diff --git a/training-training/src/main/java/com/msclub/training/module/training/model/TrainingDetailResponse.java b/training-training/src/main/java/com/msclub/training/model/TrainingDetailResponse.java similarity index 98% rename from training-training/src/main/java/com/msclub/training/module/training/model/TrainingDetailResponse.java rename to training-training/src/main/java/com/msclub/training/model/TrainingDetailResponse.java index 471b5c7..4de93e5 100644 --- a/training-training/src/main/java/com/msclub/training/module/training/model/TrainingDetailResponse.java +++ b/training-training/src/main/java/com/msclub/training/model/TrainingDetailResponse.java @@ -1,4 +1,4 @@ -package com.msclub.training.module.training.model; +package com.msclub.training.model; import java.sql.Date; diff --git a/training-training/src/main/java/com/msclub/training/module/training/model/TrainingHistoryDetail.java b/training-training/src/main/java/com/msclub/training/model/TrainingHistoryDetail.java similarity index 98% rename from training-training/src/main/java/com/msclub/training/module/training/model/TrainingHistoryDetail.java rename to training-training/src/main/java/com/msclub/training/model/TrainingHistoryDetail.java index 5c699a1..7debe11 100644 --- a/training-training/src/main/java/com/msclub/training/module/training/model/TrainingHistoryDetail.java +++ b/training-training/src/main/java/com/msclub/training/model/TrainingHistoryDetail.java @@ -1,4 +1,4 @@ -package com.msclub.training.module.training.model; +package com.msclub.training.model; import java.sql.Date; diff --git a/training-training/src/main/java/com/msclub/training/module/training/model/TrainingHistoryRequest.java b/training-training/src/main/java/com/msclub/training/model/TrainingHistoryRequest.java similarity index 80% rename from training-training/src/main/java/com/msclub/training/module/training/model/TrainingHistoryRequest.java rename to training-training/src/main/java/com/msclub/training/model/TrainingHistoryRequest.java index e9d221c..101ab7e 100644 --- a/training-training/src/main/java/com/msclub/training/module/training/model/TrainingHistoryRequest.java +++ b/training-training/src/main/java/com/msclub/training/model/TrainingHistoryRequest.java @@ -1,4 +1,4 @@ -package com.msclub.training.module.training.model; +package com.msclub.training.model; public class TrainingHistoryRequest { diff --git a/training-training/src/main/java/com/msclub/training/module/training/model/TrainingHistoryResponse.java b/training-training/src/main/java/com/msclub/training/model/TrainingHistoryResponse.java similarity index 88% rename from training-training/src/main/java/com/msclub/training/module/training/model/TrainingHistoryResponse.java rename to training-training/src/main/java/com/msclub/training/model/TrainingHistoryResponse.java index 8a6f3f1..d141822 100644 --- a/training-training/src/main/java/com/msclub/training/module/training/model/TrainingHistoryResponse.java +++ b/training-training/src/main/java/com/msclub/training/model/TrainingHistoryResponse.java @@ -1,4 +1,4 @@ -package com.msclub.training.module.training.model; +package com.msclub.training.model; import java.util.List; diff --git a/training-training/src/main/java/com/msclub/training/module/training/domain/TrainingDomain.java b/training-training/src/main/java/com/msclub/training/module/training/domain/TrainingDomain.java deleted file mode 100644 index 5dfb86b..0000000 --- a/training-training/src/main/java/com/msclub/training/module/training/domain/TrainingDomain.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.msclub.training.module.training.domain; - -import com.msclub.training.module.training.dto.Training; - -public interface TrainingDomain { - - public Training getTrainingById(Integer id); - -} diff --git a/training-training/src/main/java/com/msclub/training/module/training/service/TrainingService.java b/training-training/src/main/java/com/msclub/training/module/training/service/TrainingService.java deleted file mode 100644 index 8a2c99d..0000000 --- a/training-training/src/main/java/com/msclub/training/module/training/service/TrainingService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.msclub.training.module.training.service; - -import com.msclub.training.module.training.dto.Training; - -public interface TrainingService { - - public Training getTrainingById(Integer id); -} diff --git a/training-training/src/main/java/com/msclub/training/module/training/repository/TrainingHistoryResposity.java b/training-training/src/main/java/com/msclub/training/repository/TrainingHistoryResposity.java similarity index 67% rename from training-training/src/main/java/com/msclub/training/module/training/repository/TrainingHistoryResposity.java rename to training-training/src/main/java/com/msclub/training/repository/TrainingHistoryResposity.java index e0029ca..9e03f85 100644 --- a/training-training/src/main/java/com/msclub/training/module/training/repository/TrainingHistoryResposity.java +++ b/training-training/src/main/java/com/msclub/training/repository/TrainingHistoryResposity.java @@ -1,10 +1,10 @@ -package com.msclub.training.module.training.repository; +package com.msclub.training.repository; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; -import com.msclub.training.module.training.dto.TrainingHistory; +import com.msclub.training.dto.TrainingHistory; public interface TrainingHistoryResposity extends JpaRepository{ diff --git a/training-training/src/main/java/com/msclub/training/module/training/repository/TrainingRepository.java b/training-training/src/main/java/com/msclub/training/repository/TrainingRepository.java similarity index 56% rename from training-training/src/main/java/com/msclub/training/module/training/repository/TrainingRepository.java rename to training-training/src/main/java/com/msclub/training/repository/TrainingRepository.java index eed9ac7..97878f4 100644 --- a/training-training/src/main/java/com/msclub/training/module/training/repository/TrainingRepository.java +++ b/training-training/src/main/java/com/msclub/training/repository/TrainingRepository.java @@ -1,8 +1,8 @@ -package com.msclub.training.module.training.repository; +package com.msclub.training.repository; import org.springframework.data.jpa.repository.JpaRepository; -import com.msclub.training.module.training.dto.Training; +import com.msclub.training.dto.Training; public interface TrainingRepository extends JpaRepository { diff --git a/training-training/src/main/java/com/msclub/training/module/training/service/TrainingHistoryService.java b/training-training/src/main/java/com/msclub/training/service/TrainingHistoryService.java similarity index 56% rename from training-training/src/main/java/com/msclub/training/module/training/service/TrainingHistoryService.java rename to training-training/src/main/java/com/msclub/training/service/TrainingHistoryService.java index 8fe103f..c0b4142 100644 --- a/training-training/src/main/java/com/msclub/training/module/training/service/TrainingHistoryService.java +++ b/training-training/src/main/java/com/msclub/training/service/TrainingHistoryService.java @@ -1,8 +1,8 @@ -package com.msclub.training.module.training.service; +package com.msclub.training.service; import java.util.List; -import com.msclub.training.module.training.dto.TrainingHistory; +import com.msclub.training.dto.TrainingHistory; public interface TrainingHistoryService { diff --git a/training-training/src/main/java/com/msclub/training/module/training/service/TrainingHistoryServiceImpl.java b/training-training/src/main/java/com/msclub/training/service/TrainingHistoryServiceImpl.java similarity index 70% rename from training-training/src/main/java/com/msclub/training/module/training/service/TrainingHistoryServiceImpl.java rename to training-training/src/main/java/com/msclub/training/service/TrainingHistoryServiceImpl.java index abecc27..89f554a 100644 --- a/training-training/src/main/java/com/msclub/training/module/training/service/TrainingHistoryServiceImpl.java +++ b/training-training/src/main/java/com/msclub/training/service/TrainingHistoryServiceImpl.java @@ -1,12 +1,12 @@ -package com.msclub.training.module.training.service; +package com.msclub.training.service; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.msclub.training.module.training.domain.TrainingHistoryDomain; -import com.msclub.training.module.training.dto.TrainingHistory; +import com.msclub.training.domain.TrainingHistoryDomain; +import com.msclub.training.dto.TrainingHistory; @Service public class TrainingHistoryServiceImpl implements TrainingHistoryService { diff --git a/training-training/src/main/java/com/msclub/training/service/TrainingService.java b/training-training/src/main/java/com/msclub/training/service/TrainingService.java new file mode 100644 index 0000000..f5a60c4 --- /dev/null +++ b/training-training/src/main/java/com/msclub/training/service/TrainingService.java @@ -0,0 +1,8 @@ +package com.msclub.training.service; + +import com.msclub.training.dto.Training; + +public interface TrainingService { + + public Training getTrainingById(Integer id); +} diff --git a/training-training/src/main/java/com/msclub/training/module/training/service/TrainingServiceImpl.java b/training-training/src/main/java/com/msclub/training/service/TrainingServiceImpl.java similarity index 66% rename from training-training/src/main/java/com/msclub/training/module/training/service/TrainingServiceImpl.java rename to training-training/src/main/java/com/msclub/training/service/TrainingServiceImpl.java index 58318cf..cde4ead 100644 --- a/training-training/src/main/java/com/msclub/training/module/training/service/TrainingServiceImpl.java +++ b/training-training/src/main/java/com/msclub/training/service/TrainingServiceImpl.java @@ -1,10 +1,10 @@ -package com.msclub.training.module.training.service; +package com.msclub.training.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.msclub.training.module.training.domain.TrainingDomain; -import com.msclub.training.module.training.dto.Training; +import com.msclub.training.domain.TrainingDomain; +import com.msclub.training.dto.Training; @Service public class TrainingServiceImpl implements TrainingService { From 84dea0d3a7bb17fe072707a60d4f5abda61d1d8f Mon Sep 17 00:00:00 2001 From: qi wu Date: Sun, 1 Jul 2018 20:37:56 +0800 Subject: [PATCH 5/7] training ppt starter --- training-parent/training-ppt-stater/pom.xml | 26 +++++++++ .../training/ppt/stater/PptOperation.java | 54 +++++++++++++++++++ .../main/resources/META-INF/spring.factories | 2 + .../src/main/resources/logback-spring.xml | 30 +++++++++++ .../src/test/java/PptOperationTest.java | 24 +++++++++ 5 files changed, 136 insertions(+) create mode 100644 training-parent/training-ppt-stater/pom.xml create mode 100644 training-parent/training-ppt-stater/src/main/java/com/msclub/training/ppt/stater/PptOperation.java create mode 100644 training-parent/training-ppt-stater/src/main/resources/META-INF/spring.factories create mode 100644 training-parent/training-ppt-stater/src/main/resources/logback-spring.xml create mode 100644 training-parent/training-ppt-stater/src/test/java/PptOperationTest.java diff --git a/training-parent/training-ppt-stater/pom.xml b/training-parent/training-ppt-stater/pom.xml new file mode 100644 index 0000000..fa39660 --- /dev/null +++ b/training-parent/training-ppt-stater/pom.xml @@ -0,0 +1,26 @@ + + + 4.0.0 + + com.msclub.training + training-parent + 0.0.1-SNAPSHOT + + training-ppt-stater + + UTF-8 + + + + com.msclub.base + msclub-exception-starter + + + junit + junit + test + + + diff --git a/training-parent/training-ppt-stater/src/main/java/com/msclub/training/ppt/stater/PptOperation.java b/training-parent/training-ppt-stater/src/main/java/com/msclub/training/ppt/stater/PptOperation.java new file mode 100644 index 0000000..582cdd8 --- /dev/null +++ b/training-parent/training-ppt-stater/src/main/java/com/msclub/training/ppt/stater/PptOperation.java @@ -0,0 +1,54 @@ +package com.msclub.training.ppt.stater; + +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Graphics2D; +import java.awt.geom.Rectangle2D; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.util.List; + +import org.apache.poi.xslf.usermodel.XMLSlideShow; +import org.apache.poi.xslf.usermodel.XSLFSlide; + +public class PptOperation { + +public void pptToImage(String pptPath, String imagePath) throws Exception { + + int lastIndex = pptPath.lastIndexOf("\\"); + String imageName = pptPath.substring(lastIndex, pptPath.length()) + .replace("\\", ""); + + // creating an empty presentation + File serverFile = new File(pptPath); + XMLSlideShow ppt = new XMLSlideShow(new FileInputStream(serverFile)); + + // getting the dimensions and size of the slide + Dimension pgsize = ppt.getPageSize(); + List slide = ppt.getSlides(); + BufferedImage img = null; + FileOutputStream outPpt = null; + + for (int i = 0; i < slide.size(); i++) { + img = new BufferedImage(pgsize.width, pgsize.height, BufferedImage.TYPE_INT_RGB); + Graphics2D graphics = img.createGraphics(); + + // clear the drawing area + graphics.setPaint(Color.white); + graphics.fill(new Rectangle2D.Float(0, 0, pgsize.width, pgsize.height)); + + // render + slide.get(i).draw(graphics); + + // creating an image file as output + outPpt = new FileOutputStream(imagePath+imageName+"_"+i+".png"); + + javax.imageio.ImageIO.write(img, "png", outPpt); + ppt.write(outPpt); + } + + outPpt.close(); + } +} diff --git a/training-parent/training-ppt-stater/src/main/resources/META-INF/spring.factories b/training-parent/training-ppt-stater/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..3133924 --- /dev/null +++ b/training-parent/training-ppt-stater/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +com.msclub.training.web.stater.WebAutoconfiguration \ No newline at end of file diff --git a/training-parent/training-ppt-stater/src/main/resources/logback-spring.xml b/training-parent/training-ppt-stater/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..1a96bed --- /dev/null +++ b/training-parent/training-ppt-stater/src/main/resources/logback-spring.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/training-parent/training-ppt-stater/src/test/java/PptOperationTest.java b/training-parent/training-ppt-stater/src/test/java/PptOperationTest.java new file mode 100644 index 0000000..9a2647e --- /dev/null +++ b/training-parent/training-ppt-stater/src/test/java/PptOperationTest.java @@ -0,0 +1,24 @@ + + +import static org.junit.Assert.*; + +import org.junit.Before; +import org.junit.Test; + +import com.msclub.training.ppt.stater.PptOperation; + +public class PptOperationTest { + + private static PptOperation test = new PptOperation(); + + @Before + public void setUp() throws Exception { + } + + @Test + public void testPptToImage() throws Exception { + test.pptToImage("C:\\Users\\dell\\Desktop\\NewIT\\workspace\\第四讲中国特色社.pptx", + "C:\\Users\\dell\\Desktop\\NewIT\\workspace\\"); + } + +} From bacfe082cc3a80dcd016830d61cb408ebddf4e38 Mon Sep 17 00:00:00 2001 From: qi wu Date: Sun, 1 Jul 2018 21:02:44 +0800 Subject: [PATCH 6/7] upload ppt starter --- .../src/test/java/PptOperationTest.java | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 training-parent/training-ppt-stater/src/test/java/PptOperationTest.java diff --git a/training-parent/training-ppt-stater/src/test/java/PptOperationTest.java b/training-parent/training-ppt-stater/src/test/java/PptOperationTest.java deleted file mode 100644 index 9a2647e..0000000 --- a/training-parent/training-ppt-stater/src/test/java/PptOperationTest.java +++ /dev/null @@ -1,24 +0,0 @@ - - -import static org.junit.Assert.*; - -import org.junit.Before; -import org.junit.Test; - -import com.msclub.training.ppt.stater.PptOperation; - -public class PptOperationTest { - - private static PptOperation test = new PptOperation(); - - @Before - public void setUp() throws Exception { - } - - @Test - public void testPptToImage() throws Exception { - test.pptToImage("C:\\Users\\dell\\Desktop\\NewIT\\workspace\\第四讲中国特色社.pptx", - "C:\\Users\\dell\\Desktop\\NewIT\\workspace\\"); - } - -} From 8f20142e471fa85f4f9822dcb5028b85df3c9033 Mon Sep 17 00:00:00 2001 From: qi wu Date: Sun, 1 Jul 2018 21:08:27 +0800 Subject: [PATCH 7/7] pull video starter --- training-parent/training-video-stater/pom.xml | 26 ++++++++ .../training/video/stater/VideoOperation.java | 60 +++++++++++++++++++ .../main/resources/META-INF/spring.factories | 2 + .../src/main/resources/logback-spring.xml | 30 ++++++++++ 4 files changed, 118 insertions(+) create mode 100644 training-parent/training-video-stater/pom.xml create mode 100644 training-parent/training-video-stater/src/main/java/com/msclub/training/video/stater/VideoOperation.java create mode 100644 training-parent/training-video-stater/src/main/resources/META-INF/spring.factories create mode 100644 training-parent/training-video-stater/src/main/resources/logback-spring.xml diff --git a/training-parent/training-video-stater/pom.xml b/training-parent/training-video-stater/pom.xml new file mode 100644 index 0000000..1bb8c7a --- /dev/null +++ b/training-parent/training-video-stater/pom.xml @@ -0,0 +1,26 @@ + + + 4.0.0 + + com.msclub.training + training-parent + 0.0.1-SNAPSHOT + + training-video-stater + + UTF-8 + + + + com.msclub.base + msclub-exception-starter + + + junit + junit + test + + + diff --git a/training-parent/training-video-stater/src/main/java/com/msclub/training/video/stater/VideoOperation.java b/training-parent/training-video-stater/src/main/java/com/msclub/training/video/stater/VideoOperation.java new file mode 100644 index 0000000..e91e686 --- /dev/null +++ b/training-parent/training-video-stater/src/main/java/com/msclub/training/video/stater/VideoOperation.java @@ -0,0 +1,60 @@ +package com.msclub.training.video.stater; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; + +public class VideoOperation { + + private void getThumb(String videoFilename, String thumbFilename, int width, + int height, int hour, int min, float sec) throws IOException, + InterruptedException + { + String systemTpye = System.getProperty("os.name").toLowerCase(); + String ffmpegApp = ""; + + if (systemTpye.indexOf("linux")>=0) { + ffmpegApp = "/usr/local/ffmpeg2/bin/./ffmpeg"; + } else { + ffmpegApp = "C:\\Users\\dell\\Desktop\\NewIT\\MicroService\\ffmpeg\\bin\\ffmpeg.exe"; + } + + ProcessBuilder processBuilder = new ProcessBuilder(ffmpegApp, "-y", + "-i", videoFilename, "-vframes", "1", "-ss", hour + ":" + min + + ":" + sec, "-f", "mjpeg", "-s", width + "*" + height, + "-an", thumbFilename); + + Process process = processBuilder.start(); + + InputStream stderr = process.getErrorStream(); + InputStreamReader isr = new InputStreamReader(stderr); + BufferedReader br = new BufferedReader(isr); + String line; + while ((line = br.readLine()) != null) + ; + process.waitFor(); + + if(br != null) + br.close(); + if(isr != null) + isr.close(); + if(stderr != null) + stderr.close(); + } + + public void firstBlameToImage(String videoPath, String imagePath) throws Exception + { + int lastIndex = videoPath.lastIndexOf("\\"); + String videoName = videoPath.substring(lastIndex, videoPath.length()); + String videoName2 = videoName.substring(1, videoName.length()); + String imageName = videoName2 + ".png"; + String imageFile = imagePath + imageName; + + VideoOperation videoThumbTaker = new VideoOperation(); + videoThumbTaker.getThumb( + videoPath, + imageFile, + 800, 600, 0, 0, 1); + } +} diff --git a/training-parent/training-video-stater/src/main/resources/META-INF/spring.factories b/training-parent/training-video-stater/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..3133924 --- /dev/null +++ b/training-parent/training-video-stater/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +com.msclub.training.web.stater.WebAutoconfiguration \ No newline at end of file diff --git a/training-parent/training-video-stater/src/main/resources/logback-spring.xml b/training-parent/training-video-stater/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..1a96bed --- /dev/null +++ b/training-parent/training-video-stater/src/main/resources/logback-spring.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +