diff --git a/README.MD b/README.MD new file mode 100644 index 00000000..abc947b6 --- /dev/null +++ b/README.MD @@ -0,0 +1,12 @@ + +项目启动顺序： +mall-gateway +mall-auth +mall-account +mall-admin +mall-shop +mall-sns +mall-pay +mall-cms +mall-search +mall-im \ No newline at end of file diff --git a/mall-account/src/main/resources/bootstrap-dev.yml b/mall-account/src/main/resources/bootstrap-dev.yml index 619d2084..664b0610 100644 --- a/mall-account/src/main/resources/bootstrap-dev.yml +++ b/mall-account/src/main/resources/bootstrap-dev.yml @@ -1,8 +1,8 @@ spring: datasource: - url: jdbc:mysql://172.16.0.11:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull - username: fafamall - password: brCnv0qLt8s0VqhI + url: jdbc:mysql://114.132.210.208:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: web_dev + password: Abc654321$^ driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: diff --git a/mall-account/src/main/resources/bootstrap-local.yml b/mall-account/src/main/resources/bootstrap-local.yml index cfe9c379..664b0610 100644 --- a/mall-account/src/main/resources/bootstrap-local.yml +++ b/mall-account/src/main/resources/bootstrap-local.yml @@ -1,8 +1,8 @@ spring: datasource: - url: jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull - username: fafamall - password: brCnv0qLt8s0VqhI + url: jdbc:mysql://114.132.210.208:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: web_dev + password: Abc654321$^ driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: diff --git a/mall-account/src/main/resources/bootstrap-test.yml b/mall-account/src/main/resources/bootstrap-test.yml index 619d2084..8fb786bf 100644 --- a/mall-account/src/main/resources/bootstrap-test.yml +++ b/mall-account/src/main/resources/bootstrap-test.yml @@ -1,8 +1,8 @@ spring: datasource: - url: jdbc:mysql://172.16.0.11:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull - username: fafamall - password: brCnv0qLt8s0VqhI + url: jdbc:mysql://10.1.8.3:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: web_dev + password: Abc654321$^ driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: diff --git a/mall-admin/src/main/resources/bootstrap-dev.yml b/mall-admin/src/main/resources/bootstrap-dev.yml index bd3bea80..f4a1a5a5 100644 --- a/mall-admin/src/main/resources/bootstrap-dev.yml +++ b/mall-admin/src/main/resources/bootstrap-dev.yml @@ -4,9 +4,9 @@ spring: mvc: static-path-pattern: /admin/static/** datasource: - url: jdbc:mysql://172.16.0.11:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=CONVERT_TO_NULL - username: fafamall - password: brCnv0qLt8s0VqhI + url: jdbc:mysql://114.132.210.208:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=CONVERT_TO_NULL + username: web_dev + password: Abc654321$^ driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: diff --git a/mall-admin/src/main/resources/bootstrap-local.yml b/mall-admin/src/main/resources/bootstrap-local.yml index b670120b..f4a1a5a5 100644 --- a/mall-admin/src/main/resources/bootstrap-local.yml +++ b/mall-admin/src/main/resources/bootstrap-local.yml @@ -4,9 +4,9 @@ spring: mvc: static-path-pattern: /admin/static/** datasource: - url: jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=CONVERT_TO_NULL - username: fafamall - password: brCnv0qLt8s0VqhI + url: jdbc:mysql://114.132.210.208:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=CONVERT_TO_NULL + username: web_dev + password: Abc654321$^ driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: diff --git a/mall-admin/src/main/resources/bootstrap-test.yml b/mall-admin/src/main/resources/bootstrap-test.yml index cc9b3f89..280e6845 100644 --- a/mall-admin/src/main/resources/bootstrap-test.yml +++ b/mall-admin/src/main/resources/bootstrap-test.yml @@ -4,9 +4,9 @@ spring: mvc: static-path-pattern: /admin/static/** datasource: - url: jdbc:mysql://172.16.0.11:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=CONVERT_TO_NULL - username: fafamall - password: brCnv0qLt8s0VqhI + url: jdbc:mysql://10.1.8.3:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=CONVERT_TO_NULL + username: web_dev + password: Abc654321$^ driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: diff --git a/mall-cms/src/main/resources/bootstrap-dev.yml b/mall-cms/src/main/resources/bootstrap-dev.yml index cd09e7e3..cde19193 100644 --- a/mall-cms/src/main/resources/bootstrap-dev.yml +++ b/mall-cms/src/main/resources/bootstrap-dev.yml @@ -1,8 +1,8 @@ spring: datasource: - url: jdbc:mysql://172.16.0.11:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: fafamall - password: brCnv0qLt8s0VqhI + url: jdbc:mysql://114.132.210.208:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: web_dev + password: Abc654321$^ driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: diff --git a/mall-cms/src/main/resources/bootstrap-local.yml b/mall-cms/src/main/resources/bootstrap-local.yml index c72cce99..cde19193 100644 --- a/mall-cms/src/main/resources/bootstrap-local.yml +++ b/mall-cms/src/main/resources/bootstrap-local.yml @@ -1,8 +1,8 @@ spring: datasource: - url: jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: fafamall - password: brCnv0qLt8s0VqhI + url: jdbc:mysql://114.132.210.208:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: web_dev + password: Abc654321$^ driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: diff --git a/mall-cms/src/main/resources/bootstrap-test.yml b/mall-cms/src/main/resources/bootstrap-test.yml index cd09e7e3..cde19193 100644 --- a/mall-cms/src/main/resources/bootstrap-test.yml +++ b/mall-cms/src/main/resources/bootstrap-test.yml @@ -1,8 +1,8 @@ spring: datasource: - url: jdbc:mysql://172.16.0.11:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: fafamall - password: brCnv0qLt8s0VqhI + url: jdbc:mysql://114.132.210.208:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: web_dev + password: Abc654321$^ driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: diff --git a/mall-im/src/main/resources/bootstrap-dev.yml b/mall-im/src/main/resources/bootstrap-dev.yml index 5d8e9519..3999ab3b 100644 --- a/mall-im/src/main/resources/bootstrap-dev.yml +++ b/mall-im/src/main/resources/bootstrap-dev.yml @@ -1,8 +1,8 @@ spring: datasource: - url: jdbc:mysql://172.16.0.11:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull - username: fafamall - password: brCnv0qLt8s0VqhI + url: jdbc:mysql://114.132.210.208:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: web_dev + password: Abc654321$^ driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: diff --git a/mall-im/src/main/resources/bootstrap-local.yml b/mall-im/src/main/resources/bootstrap-local.yml index e8c915cd..3999ab3b 100644 --- a/mall-im/src/main/resources/bootstrap-local.yml +++ b/mall-im/src/main/resources/bootstrap-local.yml @@ -1,8 +1,8 @@ spring: datasource: - url: jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull - username: fafamall - password: brCnv0qLt8s0VqhI + url: jdbc:mysql://114.132.210.208:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: web_dev + password: Abc654321$^ driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: diff --git a/mall-im/src/main/resources/bootstrap-test.yml b/mall-im/src/main/resources/bootstrap-test.yml index 5d8e9519..86575908 100644 --- a/mall-im/src/main/resources/bootstrap-test.yml +++ b/mall-im/src/main/resources/bootstrap-test.yml @@ -1,8 +1,8 @@ spring: datasource: - url: jdbc:mysql://172.16.0.11:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull - username: fafamall - password: brCnv0qLt8s0VqhI + url: jdbc:mysql://10.1.8.3:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: web_dev + password: Abc654321$^ driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: diff --git a/mall-pay/src/main/resources/bootstrap-dev.yml b/mall-pay/src/main/resources/bootstrap-dev.yml index 805178f0..2e46dfad 100644 --- a/mall-pay/src/main/resources/bootstrap-dev.yml +++ b/mall-pay/src/main/resources/bootstrap-dev.yml @@ -1,8 +1,8 @@ spring: datasource: - url: jdbc:mysql://172.16.0.11:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull - username: fafamall - password: brCnv0qLt8s0VqhI + url: jdbc:mysql://114.132.210.208:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: web_dev + password: Abc654321$^ driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: diff --git a/mall-pay/src/main/resources/bootstrap-local.yml b/mall-pay/src/main/resources/bootstrap-local.yml index 4c5feccc..2e46dfad 100644 --- a/mall-pay/src/main/resources/bootstrap-local.yml +++ b/mall-pay/src/main/resources/bootstrap-local.yml @@ -1,8 +1,8 @@ spring: datasource: - url: jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull - username: fafamall - password: brCnv0qLt8s0VqhI + url: jdbc:mysql://114.132.210.208:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: web_dev + password: Abc654321$^ driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: diff --git a/mall-pay/src/main/resources/bootstrap-test.yml b/mall-pay/src/main/resources/bootstrap-test.yml index 805178f0..ba960975 100644 --- a/mall-pay/src/main/resources/bootstrap-test.yml +++ b/mall-pay/src/main/resources/bootstrap-test.yml @@ -1,8 +1,8 @@ spring: datasource: - url: jdbc:mysql://172.16.0.11:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull - username: fafamall - password: brCnv0qLt8s0VqhI + url: jdbc:mysql://10.1.8.3:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: web_dev + password: Abc654321$^ driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: diff --git a/mall-search/src/main/resources/bootstrap-dev.yml b/mall-search/src/main/resources/bootstrap-dev.yml index 13d541fb..58f25205 100644 --- a/mall-search/src/main/resources/bootstrap-dev.yml +++ b/mall-search/src/main/resources/bootstrap-dev.yml @@ -1,8 +1,8 @@ spring: datasource: - url: jdbc:mysql://172.16.0.11:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: fafamall - password: brCnv0qLt8s0VqhI + url: jdbc:mysql://114.132.210.208:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: web_dev + password: Abc654321$^ driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: diff --git a/mall-search/src/main/resources/bootstrap-local.yml b/mall-search/src/main/resources/bootstrap-local.yml index a6722dde..58f25205 100644 --- a/mall-search/src/main/resources/bootstrap-local.yml +++ b/mall-search/src/main/resources/bootstrap-local.yml @@ -1,8 +1,8 @@ spring: datasource: - url: jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: fafamall - password: brCnv0qLt8s0VqhI + url: jdbc:mysql://114.132.210.208:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: web_dev + password: Abc654321$^ driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: diff --git a/mall-search/src/main/resources/bootstrap-test.yml b/mall-search/src/main/resources/bootstrap-test.yml index bc14344d..842821f9 100644 --- a/mall-search/src/main/resources/bootstrap-test.yml +++ b/mall-search/src/main/resources/bootstrap-test.yml @@ -1,8 +1,8 @@ spring: datasource: - url: jdbc:mysql://172.16.0.11:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: fafamall - password: brCnv0qLt8s0VqhI + url: jdbc:mysql://10.1.8.3:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: web_dev + password: Abc654321$^ driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/printing/controller/mobile/DemoController.java b/mall-shop/src/main/java/com/suisung/mall/shop/printing/controller/mobile/DemoController.java new file mode 100644 index 00000000..57365bb5 --- /dev/null +++ b/mall-shop/src/main/java/com/suisung/mall/shop/printing/controller/mobile/DemoController.java @@ -0,0 +1,21 @@ +package com.suisung.mall.shop.printing.controller.mobile; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.ws.rs.*; + +@Api(tags = "店铺打印业务") +@RestController +@RequestMapping("/admin/shop/printing") +public class DemoController { + + @ApiOperation(value = "店铺添加打票机", notes = "店铺添加打票机") + @RequestMapping(value = "/add/printers", method = {RequestMethod.POST,RequestMethod.GET}) + public String addPrinters() { + return "Hello, World!"; + } +} \ No newline at end of file diff --git a/mall-shop/src/main/resources/bootstrap-dev.yml b/mall-shop/src/main/resources/bootstrap-dev.yml index 7550228e..3a2500d5 100644 --- a/mall-shop/src/main/resources/bootstrap-dev.yml +++ b/mall-shop/src/main/resources/bootstrap-dev.yml @@ -8,9 +8,9 @@ spring: mvc: static-path-pattern: /shop/static/** datasource: - url: jdbc:mysql://172.16.0.11:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull - username: fafamall - password: brCnv0qLt8s0VqhI + url: jdbc:mysql://114.132.210.208:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: web_dev + password: Abc654321$^ driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: diff --git a/mall-shop/src/main/resources/bootstrap-local.yml b/mall-shop/src/main/resources/bootstrap-local.yml index 8bdfbd38..3a2500d5 100644 --- a/mall-shop/src/main/resources/bootstrap-local.yml +++ b/mall-shop/src/main/resources/bootstrap-local.yml @@ -8,9 +8,9 @@ spring: mvc: static-path-pattern: /shop/static/** datasource: - url: jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull - username: fafamall - password: brCnv0qLt8s0VqhI + url: jdbc:mysql://114.132.210.208:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: web_dev + password: Abc654321$^ driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: diff --git a/mall-shop/src/main/resources/bootstrap-test.yml b/mall-shop/src/main/resources/bootstrap-test.yml index 127114c3..43f113ec 100644 --- a/mall-shop/src/main/resources/bootstrap-test.yml +++ b/mall-shop/src/main/resources/bootstrap-test.yml @@ -6,9 +6,9 @@ spring: mvc: static-path-pattern: /shop/static/** datasource: - url: jdbc:mysql://172.16.0.11:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull - username: fafamall - password: brCnv0qLt8s0VqhI + url: jdbc:mysql://10.1.8.3:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: web_dev + password: Abc654321$^ driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: diff --git a/mall-shop/target/classes/static/ip/ip2region.xdb b/mall-shop/target/classes/static/ip/ip2region.xdb index bf62f4aa..7052c057 100644 Binary files a/mall-shop/target/classes/static/ip/ip2region.xdb and b/mall-shop/target/classes/static/ip/ip2region.xdb differ diff --git a/mall-sns/src/main/resources/bootstrap-dev.yml b/mall-sns/src/main/resources/bootstrap-dev.yml index 383e0e33..eb032033 100644 --- a/mall-sns/src/main/resources/bootstrap-dev.yml +++ b/mall-sns/src/main/resources/bootstrap-dev.yml @@ -1,8 +1,8 @@ spring: datasource: - url: jdbc:mysql://172.16.0.11:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull - username: fafamall - password: brCnv0qLt8s0VqhI + url: jdbc:mysql://114.132.210.208:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: web_dev + password: Abc654321$^ driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: diff --git a/mall-sns/src/main/resources/bootstrap-local.yml b/mall-sns/src/main/resources/bootstrap-local.yml index 5f2039d5..eb032033 100644 --- a/mall-sns/src/main/resources/bootstrap-local.yml +++ b/mall-sns/src/main/resources/bootstrap-local.yml @@ -1,8 +1,8 @@ spring: datasource: - url: jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull - username: fafamall - password: brCnv0qLt8s0VqhI + url: jdbc:mysql://114.132.210.208:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: web_dev + password: Abc654321$^ driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: diff --git a/mall-sns/src/main/resources/bootstrap-test.yml b/mall-sns/src/main/resources/bootstrap-test.yml index 9f03a0b9..28d23eb1 100644 --- a/mall-sns/src/main/resources/bootstrap-test.yml +++ b/mall-sns/src/main/resources/bootstrap-test.yml @@ -1,8 +1,8 @@ spring: datasource: - url: jdbc:mysql://172.16.0.11:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull - username: fafamall - password: brCnv0qLt8s0VqhI + url: jdbc:mysql://10.1.8.3:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: web_dev + password: Abc654321$^ driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: diff --git a/pom.xml b/pom.xml index feef1089..5a367833 100644 --- a/pom.xml +++ b/pom.xml @@ -294,7 +294,7 @@ local - 127.0.0.1:8848 + 114.132.210.208:8848 public nacos nacos @@ -304,20 +304,20 @@ SEATA_GROUP my_test_tx_group - 127.0.0.1:8718 + 114.132.210.208:8718 - 127.0.0.1 + 114.132.210.208 15 6379 - test + Gpff654321 - 127.0.0.1 + 114.132.210.208 5672 / guest guest - 127.0.0.1666 + 114.132.210.208 D:/wwwroot/mall/public/static @@ -331,7 +331,7 @@ dev - 127.0.0.1:8848 + 114.132.210.208:8848 public nacos nacos @@ -341,20 +341,20 @@ SEATA_GROUP my_test_tx_group - 127.0.0.1:8718 + 114.132.210.208:8718 - 127.0.0.1 + 114.132.210.208 15 6379 - test + Gpff654321 - 127.0.0.1 + 114.132.210.208 5672 / guest guest - 127.0.0.1666 + 114.132.210.208 D:/wwwroot/mall/public/static @@ -368,7 +368,7 @@ test - 127.0.0.1:8848 + 10.1.8.3:8848 public nacos nacos @@ -378,20 +378,20 @@ SEATA_GROUP my_test_tx_group - 127.0.0.1:8718 + 10.1.8.3:8718 - 127.0.0.1 + 10.1.8.3 0 6379 - test + Gpff654321 - 127.0.0.1 + 10.1.8.3 5672 / rabbit test - 127.0.0.1 + 10.1.8.3 /opt/apps/mall/public/static