From 4c923fb20ad8abc55e7050cdc90cd0849ac31c0e Mon Sep 17 00:00:00 2001 From: YunaiV Date: Mon, 13 May 2019 19:34:43 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=90=8E=E7=AB=AF=EF=BC=9A=E6=95=B4?= =?UTF-8?q?=E7=90=86=E4=B8=8B=20system=20pom=20=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 61 ++++++++++++------- system/system-application/pom.xml | 45 ++++++-------- system/system-sdk/pom.xml | 25 +++----- system/system-service-api/pom.xml | 5 ++ system/system-service-impl/pom.xml | 39 ++++++++---- .../admin/config/DatabaseConfiguration.java | 4 +- .../config/ServiceExceptionConfiguration.java | 9 +-- 7 files changed, 103 insertions(+), 85 deletions(-) diff --git a/pom.xml b/pom.xml index 9094866d3..5e924ee3e 100644 --- a/pom.xml +++ b/pom.xml @@ -28,6 +28,7 @@ 2.1.3.RELEASE + 2.1.3 2.7.1 5.1.46 @@ -51,6 +52,8 @@ 7.2.18 + 2.5 + 0.5.1 @@ -67,6 +70,14 @@ + + javax.servlet + servlet-api + provided + ${servlet.version} + true + + org.springframework.boot spring-boot-starter-web @@ -74,11 +85,19 @@ - javax.servlet - servlet-api - - 2.5 - true + io.springfox + springfox-swagger2 + ${springfox-swagger.version} + + + io.springfox + springfox-swagger-ui + ${springfox-swagger.version} + + + com.github.xiaoymin + swagger-bootstrap-ui + ${swagger-bootstrap-ui.version} @@ -120,6 +139,12 @@ com.baomidou mybatis-plus-boot-starter ${mybatis-plus.version} + + + org.springframework.boot + spring-boot-starter-jdbc + + @@ -144,7 +169,6 @@ - com.xuxueli xxl-job-core @@ -177,6 +201,15 @@ ${qiniu.version} + + + de.codecentric + spring-boot-admin-starter-client + ${spring-boot-admin-starter-client.version} + + + + org.mapstruct @@ -195,22 +228,6 @@ ${org.projectlombok.version} - - io.springfox - springfox-swagger2 - ${springfox-swagger.version} - - - io.springfox - springfox-swagger-ui - ${springfox-swagger.version} - - - com.github.xiaoymin - swagger-bootstrap-ui - ${swagger-bootstrap-ui.version} - - com.google.guava guava diff --git a/system/system-application/pom.xml b/system/system-application/pom.xml index 6301ab829..84f761223 100644 --- a/system/system-application/pom.xml +++ b/system/system-application/pom.xml @@ -12,6 +12,7 @@ system-application + cn.iocoder.mall common-framework @@ -22,7 +23,6 @@ mall-spring-boot 1.0-SNAPSHOT - cn.iocoder.mall system-service-impl @@ -34,17 +34,12 @@ 1.0-SNAPSHOT + org.springframework.boot spring-boot-starter-web - - org.springframework.boot - spring-boot-starter-test - test - - io.springfox springfox-swagger2 @@ -52,41 +47,37 @@ com.github.xiaoymin swagger-bootstrap-ui - true - - - - - - - - - - - - - - - - + + + com.qiniu + qiniu-java-sdk + + de.codecentric spring-boot-admin-starter-client - 2.1.3 org.springframework.boot spring-boot-starter-actuator + - com.qiniu - qiniu-java-sdk + org.springframework.boot + spring-boot-starter-test + test + + + + + + diff --git a/system/system-sdk/pom.xml b/system/system-sdk/pom.xml index 00a82e164..3a4722870 100644 --- a/system/system-sdk/pom.xml +++ b/system/system-sdk/pom.xml @@ -13,7 +13,7 @@ system-sdk - + cn.iocoder.mall common-framework @@ -25,19 +25,24 @@ 1.0-SNAPSHOT - + javax.servlet servlet-api - 2.5 - provided + + org.springframework + spring-webmvc + + + + com.google.guava guava - + org.apache.dubbo dubbo @@ -46,16 +51,6 @@ org.apache.dubbo dubbo-spring-boot-starter - - org.springframework - spring-context - 5.1.5.RELEASE - - - org.springframework - spring-webmvc - 5.1.5.RELEASE - diff --git a/system/system-service-api/pom.xml b/system/system-service-api/pom.xml index 829f195f9..bd03c95eb 100644 --- a/system/system-service-api/pom.xml +++ b/system/system-service-api/pom.xml @@ -12,15 +12,19 @@ system-service-api + cn.iocoder.mall common-framework 1.0-SNAPSHOT + + javax.validation validation-api + org.mapstruct mapstruct @@ -29,6 +33,7 @@ org.mapstruct mapstruct-jdk8 + org.projectlombok lombok diff --git a/system/system-service-impl/pom.xml b/system/system-service-impl/pom.xml index 4a85eda25..f592477e2 100644 --- a/system/system-service-impl/pom.xml +++ b/system/system-service-impl/pom.xml @@ -10,22 +10,48 @@ 4.0.0 system-service-impl - + cn.iocoder.mall system-service-api 1.0-SNAPSHOT + mysql mysql-connector-java + + org.springframework + spring-tx + + + org.springframework + spring-jdbc + + + + com.alibaba + druid-spring-boot-starter + + + com.baomidou + mybatis-plus-boot-starter + + + org.apache.dubbo dubbo + + org.apache.dubbo + dubbo-spring-boot-starter + + + org.apache.curator curator-framework @@ -34,16 +60,8 @@ org.apache.curator curator-recipes - - org.apache.dubbo - dubbo-spring-boot-starter - - - - com.baomidou - mybatis-plus-boot-starter - + com.google.guava guava @@ -61,5 +79,4 @@ - diff --git a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/config/DatabaseConfiguration.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/config/DatabaseConfiguration.java index efa7bf84a..0d68d1b89 100644 --- a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/config/DatabaseConfiguration.java +++ b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/config/DatabaseConfiguration.java @@ -9,6 +9,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @EnableTransactionManagement(proxyTargetClass = true) // 启动事务管理。为什么使用 proxyTargetClass 参数，参见 https://blog.csdn.net/huang_550/article/details/76492600 public class DatabaseConfiguration { - // 数据源，使用 HikariCP + // 数据库连接池 Druid -} \ No newline at end of file +} diff --git a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/config/ServiceExceptionConfiguration.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/config/ServiceExceptionConfiguration.java index de21043ac..2a37244b3 100644 --- a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/config/ServiceExceptionConfiguration.java +++ b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/config/ServiceExceptionConfiguration.java @@ -11,16 +11,9 @@ public class ServiceExceptionConfiguration { @EventListener(ApplicationReadyEvent.class) // 可参考 https://www.cnblogs.com/ssslinppp/p/7607509.html public void initMessages() { -// 从 service_exception_message.properties 加载错误码的方案 -// Properties properties; -// try { -// properties = PropertiesLoaderUtils.loadAllProperties("classpath:service_exception_message.properties"); -// } catch (IOException e) { -// throw new RuntimeException(e); -// } for (AdminErrorCodeEnum item : AdminErrorCodeEnum.values()) { ServiceExceptionUtil.put(item.getCode(), item.getMessage()); } } -} \ No newline at end of file +}