diff --git a/product/product-application/pom.xml b/product/product-application/pom.xml index eca936e10..2549c1527 100644 --- a/product/product-application/pom.xml +++ b/product/product-application/pom.xml @@ -12,6 +12,7 @@ product-application + cn.iocoder.mall common-framework @@ -37,29 +38,18 @@ user-sdk 1.0-SNAPSHOT - - - - - - cn.iocoder.mall system-sdk 1.0-SNAPSHOT + org.springframework.boot spring-boot-starter-web - - org.springframework.boot - spring-boot-starter-test - test - - io.springfox springfox-swagger2 @@ -69,6 +59,13 @@ swagger-bootstrap-ui + + + org.springframework.boot + spring-boot-starter-test + test + + diff --git a/product/product-service-api/pom.xml b/product/product-service-api/pom.xml index 03c2efe52..663b24a9a 100644 --- a/product/product-service-api/pom.xml +++ b/product/product-service-api/pom.xml @@ -12,17 +12,14 @@ product-service-api + cn.iocoder.mall common-framework 1.0-SNAPSHOT - - javax.validation - validation-api - - + org.mapstruct mapstruct @@ -31,6 +28,7 @@ org.mapstruct mapstruct-jdk8 + org.projectlombok lombok diff --git a/product/product-service-impl/pom.xml b/product/product-service-impl/pom.xml index 5ecd08a71..95498304c 100644 --- a/product/product-service-impl/pom.xml +++ b/product/product-service-impl/pom.xml @@ -12,30 +12,55 @@ product-service-impl + cn.iocoder.mall product-service-api 1.0-SNAPSHOT + mysql mysql-connector-java + - org.mybatis.spring.boot - mybatis-spring-boot-starter + org.springframework + spring-tx + + + org.springframework + spring-jdbc - org.springframework.boot - spring-boot-starter-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.rocketmq + rocketmq-spring-boot-starter + + + org.apache.curator curator-framework @@ -44,21 +69,13 @@ org.apache.curator curator-recipes - - org.apache.dubbo - dubbo-spring-boot-starter - + com.google.guava guava - - org.apache.rocketmq - rocketmq-spring-boot-starter - - diff --git a/product/product-service-impl/src/main/resources/config/application.yaml b/product/product-service-impl/src/main/resources/config/application.yaml index d9dc2665d..a7d3cee8d 100644 --- a/product/product-service-impl/src/main/resources/config/application.yaml +++ b/product/product-service-impl/src/main/resources/config/application.yaml @@ -7,7 +7,7 @@ spring: password: ${MALL_MYSQL_PASSWORD} # mybatis -mybatis: +mybatis-plus: config-location: classpath:mybatis-config.xml mapper-locations: classpath:mapper/*.xml type-aliases-package: cn.iocoder.mall.product.dataobject diff --git a/promotion/promotion-service-impl/pom.xml b/promotion/promotion-service-impl/pom.xml index a9f4293b5..9b6a5704b 100644 --- a/promotion/promotion-service-impl/pom.xml +++ b/promotion/promotion-service-impl/pom.xml @@ -103,6 +103,10 @@ io.seata seata-dubbo + + io.seata + seata-discovery-zk + diff --git a/promotion/promotion-service-impl/src/main/resources/file.conf b/promotion/promotion-service-impl/src/main/resources/file.conf new file mode 100644 index 000000000..8b60b29c3 --- /dev/null +++ b/promotion/promotion-service-impl/src/main/resources/file.conf @@ -0,0 +1,69 @@ +transport { + # tcp udt unix-domain-socket + type = "TCP" + #NIO NATIVE + server = "NIO" + #enable heartbeat + heartbeat = true + #thread factory for netty + thread-factory { + boss-thread-prefix = "NettyBoss" + worker-thread-prefix = "NettyServerNIOWorker" + server-executor-thread-prefix = "NettyServerBizHandler" + share-boss-worker = false + client-selector-thread-prefix = "NettyClientSelector" + client-selector-thread-size = 1 + client-worker-thread-prefix = "NettyClientWorkerThread" + # netty boss thread size,will not be used for UDT + boss-thread-size = 1 + #auto default pin or 8 + worker-thread-size = 8 + } +} + +service { + #vgroup->rgroup + vgroup_mapping.my_test_tx_group = "default" + #only support single node + default.grouplist = "180.167.213.26:8091" + #degrade current not support + enableDegrade = false + #disable + disable = false +} + +client { + async.commit.buffer.limit = 10000 + lock { + retry.internal = 10 + retry.times = 30 + } +} +## transaction log store +store { + ## store mode: file、db + mode = "file" + + ## file store + file { + dir = "file_store/data" + + # branch session size , if exceeded first try compress lockkey, still exceeded throws exceptions + max-branch-session-size = 16384 + # globe session size , if exceeded throws exceptions + max-global-session-size = 512 + # file buffer size , if exceeded allocate new buffer + file-write-buffer-cache-size = 16384 + # when recover batch read size + session.reload.read_size = 100 + } + + ## database store + db { + driver_class = "" + url = "" + user = "" + password = "" + } +} + diff --git a/promotion/promotion-service-impl/src/main/resources/registry.conf b/promotion/promotion-service-impl/src/main/resources/registry.conf new file mode 100644 index 000000000..f73989514 --- /dev/null +++ b/promotion/promotion-service-impl/src/main/resources/registry.conf @@ -0,0 +1,14 @@ +registry { + type = "file" + + file { + name = "file.conf" + } + + zk { + cluster = "default" + serverAddr = "192.168.88.10:2181" + session.timeout = 6000 + connect.timeout = 2000 + } +} diff --git a/system/system-sdk/pom.xml b/system/system-sdk/pom.xml index 3a4722870..9b180faa7 100644 --- a/system/system-sdk/pom.xml +++ b/system/system-sdk/pom.xml @@ -30,27 +30,17 @@ javax.servlet servlet-api + org.springframework spring-webmvc - - - - com.google.guava - guava - - org.apache.dubbo dubbo - - org.apache.dubbo - dubbo-spring-boot-starter - diff --git a/system/system-service-api/pom.xml b/system/system-service-api/pom.xml index bd03c95eb..8fc8754ce 100644 --- a/system/system-service-api/pom.xml +++ b/system/system-service-api/pom.xml @@ -20,11 +20,6 @@ - - javax.validation - validation-api - - org.mapstruct mapstruct diff --git a/system/system-service-impl/pom.xml b/system/system-service-impl/pom.xml index f592477e2..3360a821c 100644 --- a/system/system-service-impl/pom.xml +++ b/system/system-service-impl/pom.xml @@ -36,6 +36,7 @@ com.alibaba druid-spring-boot-starter + com.baomidou mybatis-plus-boot-starter diff --git a/user/pom.xml b/user/pom.xml index 5eef8792a..4be0b008d 100644 --- a/user/pom.xml +++ b/user/pom.xml @@ -18,5 +18,4 @@ user-service-impl - - \ No newline at end of file + diff --git a/user/user-application/pom.xml b/user/user-application/pom.xml index 3d3582be2..4edc53e4c 100644 --- a/user/user-application/pom.xml +++ b/user/user-application/pom.xml @@ -12,10 +12,10 @@ user-application - 1.3.0.Final + cn.iocoder.mall common-framework @@ -26,7 +26,6 @@ mall-spring-boot 1.0-SNAPSHOT - cn.iocoder.mall user-service-api @@ -48,17 +47,12 @@ 1.0-SNAPSHOT + org.springframework.boot spring-boot-starter-web - - org.springframework.boot - spring-boot-starter-test - test - - io.springfox springfox-swagger2 @@ -68,6 +62,12 @@ swagger-bootstrap-ui + + + org.springframework.boot + spring-boot-starter-test + test + diff --git a/user/user-sdk/pom.xml b/user/user-sdk/pom.xml index 3a0b3ae28..8a80f9dbf 100644 --- a/user/user-sdk/pom.xml +++ b/user/user-sdk/pom.xml @@ -11,6 +11,7 @@ user-sdk + cn.iocoder.mall common-framework @@ -22,32 +23,21 @@ 1.0-SNAPSHOT - - org.springframework - spring-context - 5.1.5.RELEASE - - - org.springframework - spring-webmvc - 5.1.5.RELEASE - - - org.springframework - spring-webmvc - 5.1.5.RELEASE - - - - org.apache.dubbo - dubbo - - + javax.servlet servlet-api - 2.5 - provided + + + + org.springframework + spring-webmvc + + + + + org.apache.dubbo + dubbo diff --git a/user/user-service-api/pom.xml b/user/user-service-api/pom.xml index 5220c770d..8054f41cd 100644 --- a/user/user-service-api/pom.xml +++ b/user/user-service-api/pom.xml @@ -11,12 +11,14 @@ user-service-api + cn.iocoder.mall common-framework 1.0-SNAPSHOT + org.mapstruct mapstruct @@ -25,6 +27,7 @@ org.mapstruct mapstruct-jdk8 + org.projectlombok lombok diff --git a/user/user-service-impl/pom.xml b/user/user-service-impl/pom.xml index c5546ec9e..7f0f6123e 100644 --- a/user/user-service-impl/pom.xml +++ b/user/user-service-impl/pom.xml @@ -8,26 +8,28 @@ 1.0-SNAPSHOT 4.0.0 - - - 1.3.0.Final - - user-service-impl + cn.iocoder.mall user-service-api 1.0-SNAPSHOT + mysql mysql-connector-java + - org.springframework.boot - spring-boot-starter-jdbc + org.springframework + spring-tx + + + org.springframework + spring-jdbc @@ -35,21 +37,34 @@ mybatis-spring-boot-starter + + com.alibaba + druid-spring-boot-starter + + + + com.baomidou + mybatis-plus-boot-starter + + + org.apache.dubbo dubbo - org.apache.curator - curator-framework + org.apache.dubbo + dubbo-spring-boot-starter + + org.apache.curator curator-recipes - org.apache.dubbo - dubbo-spring-boot-starter + org.apache.curator + curator-framework diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/config/DatabaseConfiguration.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/config/DatabaseConfiguration.java index d77b47807..f712638ca 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/config/DatabaseConfiguration.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/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 +}