From 8552dc9722ac1ca64e2b9064d289cad817c3de38 Mon Sep 17 00:00:00 2001 From: Jack <46790855@qq.com> Date: Thu, 31 Oct 2024 00:18:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=EF=BC=8Cmy?= =?UTF-8?q?sql=E6=95=B0=E6=8D=AE=E5=BA=93=E7=A7=BB=E5=88=B0pom.xml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.MD | 19 +- .../src/main/resources/bootstrap-dev.yml | 8 +- .../src/main/resources/bootstrap-local.yml | 8 +- .../src/main/resources/bootstrap-prod.yml | 8 +- .../src/main/resources/bootstrap-test.yml | 8 +- .../src/main/resources/bootstrap-uat.yml | 8 +- .../src/main/resources/bootstrap-dev.yml | 8 +- .../src/main/resources/bootstrap-local.yml | 8 +- .../src/main/resources/bootstrap-prod.yml | 8 +- .../src/main/resources/bootstrap-test.yml | 8 +- .../src/main/resources/bootstrap-uat.yml | 8 +- mall-cms/src/main/resources/bootstrap-dev.yml | 8 +- .../src/main/resources/bootstrap-local.yml | 8 +- .../src/main/resources/bootstrap-prod.yml | 8 +- .../src/main/resources/bootstrap-test.yml | 8 +- mall-cms/src/main/resources/bootstrap-uat.yml | 8 +- .../pojo/res/FeiePrinterApiDataRes.java | 43 ++ .../common/pojo/res/FeiePrinterApiRes.java | 42 ++ .../compile/default-compile/createdFiles.lst | 463 --------------- .../compile/default-compile/inputFiles.lst | 2 + mall-im/src/main/resources/bootstrap-dev.yml | 8 +- .../src/main/resources/bootstrap-local.yml | 8 +- mall-im/src/main/resources/bootstrap-prod.yml | 8 +- mall-im/src/main/resources/bootstrap-test.yml | 8 +- mall-im/src/main/resources/bootstrap-uat.yml | 8 +- mall-pay/src/main/resources/bootstrap-dev.yml | 8 +- .../src/main/resources/bootstrap-local.yml | 8 +- .../src/main/resources/bootstrap-prod.yml | 8 +- .../src/main/resources/bootstrap-test.yml | 8 +- mall-pay/src/main/resources/bootstrap-uat.yml | 8 +- .../src/main/resources/bootstrap-dev.yml | 8 +- .../src/main/resources/bootstrap-local.yml | 8 +- .../src/main/resources/bootstrap-prod.yml | 8 +- .../src/main/resources/bootstrap-test.yml | 8 +- .../src/main/resources/bootstrap-uat.yml | 8 +- .../admin/ShopStorePrinterController.java | 15 - .../service/ShopStorePrinterModelService.java | 19 +- .../ShopStorePrinterRegionService.java | 7 +- .../service/ShopStorePrinterService.java | 22 +- .../impl/ShopStorePrinterServiceImpl.java | 63 +- .../mall/shop/store/utis/FeieUtil.java | 545 +++++------------- .../src/main/resources/bootstrap-dev.yml | 14 +- .../src/main/resources/bootstrap-local.yml | 8 +- .../src/main/resources/bootstrap-prod.yml | 8 +- .../src/main/resources/bootstrap-test.yml | 8 +- .../src/main/resources/bootstrap-uat.yml | 8 +- mall-sns/src/main/resources/bootstrap-dev.yml | 8 +- .../src/main/resources/bootstrap-local.yml | 8 +- .../src/main/resources/bootstrap-prod.yml | 8 +- .../src/main/resources/bootstrap-test.yml | 8 +- mall-sns/src/main/resources/bootstrap-uat.yml | 8 +- pom.xml | 36 +- 52 files changed, 525 insertions(+), 1077 deletions(-) create mode 100644 mall-common/src/main/java/com/suisung/mall/common/pojo/res/FeiePrinterApiDataRes.java create mode 100644 mall-common/src/main/java/com/suisung/mall/common/pojo/res/FeiePrinterApiRes.java diff --git a/README.MD b/README.MD index abc947b6..4dc2d561 100644 --- a/README.MD +++ b/README.MD @@ -9,4 +9,21 @@ mall-sns mall-pay mall-cms mall-search -mall-im \ No newline at end of file +mall-im + + +微信支付配置 +{ +"mchid": 商户ID, +"key": "商户API秘钥", +"wechat_app_id": "公众号开发者ID", +"wechat_app_secret": "公众号开发者密码", +"wechat_xcx_app_id": "小程序开发者ID", +"wechat_xcx_app_secret": "小程序开发者秘钥", +"weixin_app_id": "开放平台移动应用开发者ID", +"weixin_app_key": "开放平台移动应用开发者密钥", +"weixin_mchid": 商户ID, +"weixin_key": "商户API秘钥", +"apiclient_cert": "apiclient_cert.pem", +"sslkey_name": "apiclient_key.pem" +} \ 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 664b0610..2c7b866b 100644 --- a/mall-account/src/main/resources/bootstrap-dev.yml +++ b/mall-account/src/main/resources/bootstrap-dev.yml @@ -1,9 +1,9 @@ spring: datasource: - 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 + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-account/src/main/resources/bootstrap-local.yml b/mall-account/src/main/resources/bootstrap-local.yml index 664b0610..2c7b866b 100644 --- a/mall-account/src/main/resources/bootstrap-local.yml +++ b/mall-account/src/main/resources/bootstrap-local.yml @@ -1,9 +1,9 @@ spring: datasource: - 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 + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-account/src/main/resources/bootstrap-prod.yml b/mall-account/src/main/resources/bootstrap-prod.yml index 5811584a..f9a8fb82 100644 --- a/mall-account/src/main/resources/bootstrap-prod.yml +++ b/mall-account/src/main/resources/bootstrap-prod.yml @@ -1,9 +1,9 @@ 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 - driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-account/src/main/resources/bootstrap-test.yml b/mall-account/src/main/resources/bootstrap-test.yml index 8fb786bf..2c7b866b 100644 --- a/mall-account/src/main/resources/bootstrap-test.yml +++ b/mall-account/src/main/resources/bootstrap-test.yml @@ -1,9 +1,9 @@ spring: datasource: - 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 + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-account/src/main/resources/bootstrap-uat.yml b/mall-account/src/main/resources/bootstrap-uat.yml index 619d2084..2c7b866b 100644 --- a/mall-account/src/main/resources/bootstrap-uat.yml +++ b/mall-account/src/main/resources/bootstrap-uat.yml @@ -1,9 +1,9 @@ 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 - driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-admin/src/main/resources/bootstrap-dev.yml b/mall-admin/src/main/resources/bootstrap-dev.yml index f4a1a5a5..1d0b0b2b 100644 --- a/mall-admin/src/main/resources/bootstrap-dev.yml +++ b/mall-admin/src/main/resources/bootstrap-dev.yml @@ -4,10 +4,10 @@ spring: mvc: static-path-pattern: /admin/static/** datasource: - 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 + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-admin/src/main/resources/bootstrap-local.yml b/mall-admin/src/main/resources/bootstrap-local.yml index f4a1a5a5..1d0b0b2b 100644 --- a/mall-admin/src/main/resources/bootstrap-local.yml +++ b/mall-admin/src/main/resources/bootstrap-local.yml @@ -4,10 +4,10 @@ spring: mvc: static-path-pattern: /admin/static/** datasource: - 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 + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-admin/src/main/resources/bootstrap-prod.yml b/mall-admin/src/main/resources/bootstrap-prod.yml index e7ac47fc..c53554bf 100644 --- a/mall-admin/src/main/resources/bootstrap-prod.yml +++ b/mall-admin/src/main/resources/bootstrap-prod.yml @@ -4,10 +4,10 @@ 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 - driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-admin/src/main/resources/bootstrap-test.yml b/mall-admin/src/main/resources/bootstrap-test.yml index 280e6845..f29ab330 100644 --- a/mall-admin/src/main/resources/bootstrap-test.yml +++ b/mall-admin/src/main/resources/bootstrap-test.yml @@ -4,10 +4,10 @@ spring: mvc: static-path-pattern: /admin/static/** datasource: - 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 + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-admin/src/main/resources/bootstrap-uat.yml b/mall-admin/src/main/resources/bootstrap-uat.yml index cc9b3f89..f29ab330 100644 --- a/mall-admin/src/main/resources/bootstrap-uat.yml +++ b/mall-admin/src/main/resources/bootstrap-uat.yml @@ -4,10 +4,10 @@ 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 - driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-cms/src/main/resources/bootstrap-dev.yml b/mall-cms/src/main/resources/bootstrap-dev.yml index cde19193..1fcb1206 100644 --- a/mall-cms/src/main/resources/bootstrap-dev.yml +++ b/mall-cms/src/main/resources/bootstrap-dev.yml @@ -1,9 +1,9 @@ spring: datasource: - 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 + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-cms/src/main/resources/bootstrap-local.yml b/mall-cms/src/main/resources/bootstrap-local.yml index cde19193..1fcb1206 100644 --- a/mall-cms/src/main/resources/bootstrap-local.yml +++ b/mall-cms/src/main/resources/bootstrap-local.yml @@ -1,9 +1,9 @@ spring: datasource: - 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 + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-cms/src/main/resources/bootstrap-prod.yml b/mall-cms/src/main/resources/bootstrap-prod.yml index 4250a2e1..bb923ccc 100644 --- a/mall-cms/src/main/resources/bootstrap-prod.yml +++ b/mall-cms/src/main/resources/bootstrap-prod.yml @@ -1,9 +1,9 @@ spring: datasource: - url: jdbc:mysql://172.16.0.11:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: fafamall - password: brCnv0qLt8s0VqhI - driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-cms/src/main/resources/bootstrap-test.yml b/mall-cms/src/main/resources/bootstrap-test.yml index cde19193..1fcb1206 100644 --- a/mall-cms/src/main/resources/bootstrap-test.yml +++ b/mall-cms/src/main/resources/bootstrap-test.yml @@ -1,9 +1,9 @@ spring: datasource: - 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 + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-cms/src/main/resources/bootstrap-uat.yml b/mall-cms/src/main/resources/bootstrap-uat.yml index cd09e7e3..1fcb1206 100644 --- a/mall-cms/src/main/resources/bootstrap-uat.yml +++ b/mall-cms/src/main/resources/bootstrap-uat.yml @@ -1,9 +1,9 @@ spring: datasource: - url: jdbc:mysql://172.16.0.11:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: fafamall - password: brCnv0qLt8s0VqhI - driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-common/src/main/java/com/suisung/mall/common/pojo/res/FeiePrinterApiDataRes.java b/mall-common/src/main/java/com/suisung/mall/common/pojo/res/FeiePrinterApiDataRes.java new file mode 100644 index 00000000..c6e0a2b3 --- /dev/null +++ b/mall-common/src/main/java/com/suisung/mall/common/pojo/res/FeiePrinterApiDataRes.java @@ -0,0 +1,43 @@ +package com.suisung.mall.common.pojo.res; + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 飞鹅云打印机接口响应结果 + * + * @author 潘军杰 + * @since 2024-10-30 10:10:02 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FeiePrinterApiDataRes implements Serializable { + private static final long serialVersionUID = 2L; + + @ApiModelProperty(value = "成功信息数组") + private String[] ok; + + @ApiModelProperty(value = "失败信息数组") + private String[] no; + + @ApiModelProperty(value = "失败指导信息数组") + private NoGuide[] noGuide; + + @Data + @NoArgsConstructor + @AllArgsConstructor + public class NoGuide implements Serializable { + private static final long serialVersionUID = 3L; + + @ApiModelProperty(value = "设备编号标识") + private String sn; + + @ApiModelProperty(value = "指导图片路径") + private String imgUrl; + } +} diff --git a/mall-common/src/main/java/com/suisung/mall/common/pojo/res/FeiePrinterApiRes.java b/mall-common/src/main/java/com/suisung/mall/common/pojo/res/FeiePrinterApiRes.java new file mode 100644 index 00000000..18734f00 --- /dev/null +++ b/mall-common/src/main/java/com/suisung/mall/common/pojo/res/FeiePrinterApiRes.java @@ -0,0 +1,42 @@ +package com.suisung.mall.common.pojo.res; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * 飞鹅云打印机接口响应结果 + * + * @author 潘军杰 + * @since 2024-10-30 10:10:02 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FeiePrinterApiRes implements Serializable { + private static final long serialVersionUID = 1L; + + public FeiePrinterApiRes fail(String msg) { + this.ret = 1001; + this.msg = msg; + this.serverExecutedTime = System.currentTimeMillis()/1000; + return this; + } + + @ApiModelProperty(value = "返回码，正确返回0，【注意：结果正确与否的判断请用此返回参数】 ，错误返回非零。") + private Integer ret; + + @ApiModelProperty(value = "结果提示信息，正确返回”ok”，如果有错误，返回错误信息。") + private String msg; + + @ApiModelProperty(value = "服务器程序执行时间，单位：毫秒。") + private Long serverExecutedTime; + + @ApiModelProperty("数据类型和内容详看私有返回参数data，如果有错误，返回null。") + private T data; +} diff --git a/mall-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/mall-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index e0a0e287..e69de29b 100644 --- a/mall-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/mall-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,463 +0,0 @@ -com/suisung/mall/common/utils/JChardetFacadeUtil$nsUCS2LEVerifier.class -com/suisung/mall/common/utils/CoordinateTransformUtil.class -com/suisung/mall/common/pojo/input/TimelineInput.class -com/suisung/mall/common/modules/product/ShopProductData.class -com/suisung/mall/common/modules/order/ShopOrderReturn.class -com/suisung/mall/common/config/MybatisPlusConfig.class -com/suisung/mall/common/utils/JChardetFacadeUtil$nsGB2312Verifier.class -com/suisung/mall/common/utils/JChardetFacadeUtil$EUCKRStatistics.class -com/suisung/mall/common/modules/user/ShopUserVoucher.class -com/suisung/mall/common/pojo/input/AnalyticsProductInput.class -com/suisung/mall/common/modules/store/ShopStoreEmployeeDepartment.class -com/suisung/mall/common/support/AuthInterceptor.class -com/suisung/mall/common/modules/product/ShopProductItemSeq.class -com/suisung/mall/common/constant/ConstantError.class -com/suisung/mall/common/modules/hall/HallSupplyOrderBase.class -com/suisung/mall/common/utils/JChardetFacadeUtil$Big5Statistics.class -com/suisung/mall/common/modules/invoicing/InvoicingStockBillItem.class -com/suisung/mall/common/modules/edu/EduLecturerStore.class -com/suisung/mall/common/modules/sns/LiveUserRoom.class -com/suisung/mall/common/modules/store/ShopStoreConfig.class -com/suisung/mall/common/pojo/vo/DistrictVo.class -com/suisung/mall/common/modules/sns/WxLiveRoom.class -com/suisung/mall/common/modules/base/ShopBaseStateCode.class -com/suisung/mall/common/feignService/ImService.class -com/suisung/mall/common/feignService/CmsService.class -com/suisung/mall/common/modules/base/ShopBaseLangMeta.class -com/suisung/mall/common/modules/product/ShopProductPreSale.class -com/suisung/mall/common/modules/plantform/ShopPlantformSubsiteUser.class -com/suisung/mall/common/modules/user/ShopUserFavoritesBrand.class -com/suisung/mall/common/modules/store/dto/MediaDTO.class -com/suisung/mall/common/domain/QueryParamBase.class -com/suisung/mall/common/modules/mq/MqMessage.class -com/suisung/mall/common/service/IBaseController.class -com/suisung/mall/common/utils/JChardetFacadeUtil$ICodepageDetector.class -com/suisung/mall/common/pojo/to/MsgTO.class -com/suisung/mall/common/modules/activity/ShopActivityCutpriceHistory.class -com/suisung/mall/common/service/impl/MessageServiceImpl.class -com/suisung/mall/common/modules/distribution/ShopPlantformHighReturnUser.class -com/suisung/mall/common/modules/edu/EduTopicCategory.class -com/suisung/mall/common/modules/base/ShopBaseDistrict.class -com/suisung/mall/common/config/SentinelConfig.class -com/suisung/mall/common/modules/activity/ShopActivityMarketingHistory.class -com/suisung/mall/common/modules/admin/AdminBaseProtocol.class -com/suisung/mall/common/modules/pay/PayConsumeDeposit.class -com/suisung/mall/common/modules/edu/EduExamBase.class -com/suisung/mall/common/modules/store/ShopStoreEmployeeRightsBase.class -com/suisung/mall/common/modules/product/ShopProductValidPeriod.class -com/suisung/mall/common/modules/store/ShopStoreTransportType.class -com/suisung/mall/common/modules/user/ShopUserExpHistory.class -com/suisung/mall/common/modules/store/ShopStoreActivityBase.class -com/suisung/mall/common/modules/pay/PayConsumeWithdraw.class -com/suisung/mall/common/modules/pay/PayConsumeTradeCombine.class -com/suisung/mall/common/pojo/dto/OssCallbackResultDTO.class -com/suisung/mall/common/modules/edu/vo/EduCourseChapterVO.class -com/suisung/mall/common/utils/JChardetFacadeUtil$nsDetector.class -com/suisung/mall/common/utils/pojo/dto/SmsDTO.class -com/suisung/mall/common/modules/plantform/ShopPlantformMedia.class -com/suisung/mall/common/pojo/input/AccessItemTimelineInput.class -com/suisung/mall/common/modules/edu/EduUserLearnStock.class -com/suisung/mall/common/modules/order/ShopOrderDeliveryAddress.class -com/suisung/mall/common/modules/base/ShopBaseSiteNav.class -com/suisung/mall/common/pojo/req/OrderItemNumTimelineReq.class -com/suisung/mall/common/modules/base/ShopBaseConfig.class -com/suisung/mall/common/modules/store/ShopStoreContract.class -com/suisung/mall/common/utils/JChardetFacadeUtil$nsGB18030Verifier.class -com/suisung/mall/common/utils/constbank/MCipherDecode.class -com/suisung/mall/common/modules/edu/EduTopicBase.class -com/suisung/mall/common/modules/account/AccountUserBindConnect.class -com/suisung/mall/common/utils/constbank/MD5Util.class -com/suisung/mall/common/modules/base/ShopPageModule.class -com/suisung/mall/common/pojo/req/AnalyticsVoucherReq.class -com/suisung/mall/common/modules/chain/ShopChainUserRightsGroup.class -com/suisung/mall/common/modules/activity/ShopActivityGroupbuyStore.class -com/suisung/mall/common/log/WebLogAspect.class -com/suisung/mall/common/utils/JChardetFacadeUtil$nsISO2022CNVerifier.class -com/suisung/mall/common/utils/JChardetFacadeUtil$AbstractCodepageDetector.class -com/suisung/mall/common/modules/store/ShopStoreProductCategory.class -com/suisung/mall/common/utils/JChardetFacadeUtil$nsISO2022KRVerifier.class -com/suisung/mall/common/modules/distribution/ShopDistributionUserCommission.class -com/suisung/mall/common/utils/WxHttpUtil$WxType.class -com/suisung/mall/common/feignService/AuthService.class -com/suisung/mall/common/feignService/SearchService.class -com/suisung/mall/common/weblog/IgnoreLog.class -com/suisung/mall/common/modules/product/ShopProductAssistIndex.class -com/suisung/mall/common/modules/store/ShopStorePrinterRegion.class -com/suisung/mall/common/modules/edu/EduClassesCycle.class -com/suisung/mall/common/modules/edu/EduCourseContractCategory.class -com/suisung/mall/common/modules/wechat/ShopWechatMenu.class -com/suisung/mall/common/pojo/to/UserLevelTO.class -com/suisung/mall/common/modules/chain/ShopChainItem.class -com/suisung/mall/common/domain/OssDto.class -com/suisung/mall/common/modules/pay/PayUserResource.class -com/suisung/mall/common/modules/pay/PayConsumeTrade.class -com/suisung/mall/common/modules/cms/CmsArticleBase.class -com/suisung/mall/common/modules/cms/CmsArticleAnalytics.class -com/suisung/mall/common/api/ResultCode.class -com/suisung/mall/common/modules/invoicing/InvoicingWarehouseBase.class -com/suisung/mall/common/utils/I18nUtil.class -com/suisung/mall/common/utils/JChardetFacadeUtil$EUCJPStatistics.class -com/suisung/mall/common/pojo/res/DashboardTopRes.class -com/suisung/mall/common/modules/distribution/ShopDistributionUserWithdraw.class -com/suisung/mall/common/utils/excel/ExcelSelected.class -com/suisung/mall/common/modules/store/ShopStorePrinter.class -com/suisung/mall/common/modules/edu/EduClassesUser.class -com/suisung/mall/common/pojo/dto/ProductSearchDTO.class -com/suisung/mall/common/modules/distribution/ShopDistributionPlantformUserGeneratedCommission.class -com/suisung/mall/common/modules/account/AccountUserChannel.class -com/suisung/mall/common/modules/edu/EduPaperTopic.class -com/suisung/mall/common/modules/product/ShopProductComment.class -com/suisung/mall/common/modules/product/ShopProductPricingPolicyWholesale.class -com/suisung/mall/common/modules/sns/SnsBaseFilterKeyword.class -com/suisung/mall/common/pojo/dto/OrderCheckoutDTO.class -com/suisung/mall/common/modules/sns/SnsStoryCommentReplyHelpful.class -com/suisung/mall/common/modules/page/ShopPageBase.class -com/suisung/mall/common/utils/JChardetFacadeUtil$nsUCS2BEVerifier.class -com/suisung/mall/common/modules/edu/EduUserPaperTopicDetail.class -com/suisung/mall/common/modules/base/ShopBaseMarketCategory.class -com/suisung/mall/common/utils/ContextUtil.class -com/suisung/mall/common/modules/hall/HallPurchaseOrderBase.class -com/suisung/mall/common/pojo/output/TimelineOutput.class -com/suisung/mall/common/utils/StringUtils$RandomType.class -com/suisung/mall/common/modules/edu/EduUserPaperInfo.class -com/suisung/mall/common/utils/JChardetFacadeUtil$nsEUCStatistics.class -com/suisung/mall/common/pojo/vo/TradeAmountVo.class -com/suisung/mall/common/modules/user/ShopUserPointsHistory.class -com/suisung/mall/common/modules/order/ShopOrderStateLog.class -com/suisung/mall/common/modules/sns/SnsStoryComment.class -com/suisung/mall/common/modules/sns/LiveAnchor.class -com/suisung/mall/common/utils/TimeUtil.class -com/suisung/mall/common/api/LevelCode.class -com/suisung/mall/common/modules/product/ShopProductImage.class -com/suisung/mall/common/modules/store/ShopStoreExpressLogistics.class -com/suisung/mall/common/modules/base/ShopBaseLangStandard.class -com/suisung/mall/common/modules/order/ShopOrderReturnItem.class -com/suisung/mall/common/modules/sns/SnsStoryAdvertisement.class -com/suisung/mall/common/modules/account/AccountUserLogin.class -com/suisung/mall/common/utils/JChardetFacadeUtil$nsISO2022JPVerifier.class -com/suisung/mall/common/modules/account/AccountUserChannelBring.class -com/suisung/mall/common/constant/SignConstant.class -com/suisung/mall/common/utils/JChardetFacadeUtil$nsBIG5Verifier.class -com/suisung/mall/common/modules/sns/SnsUserGroup.class -com/suisung/mall/common/modules/pay/PayBaseRechargeLevel.class -com/suisung/mall/common/modules/edu/EduExamAward.class -com/suisung/mall/common/pojo/res/BaseListRes.class -com/suisung/mall/common/utils/HideStrUtil.class -com/suisung/mall/common/utils/excel/ExcelSelectedResolve.class -com/suisung/mall/common/feignService/EduService.class -com/suisung/mall/common/modules/store/ShopStoreTransportItem.class -com/suisung/mall/common/pojo/res/TimelineRes.class -com/suisung/mall/common/modules/sns/SnsUserGroupRel.class -com/suisung/mall/common/modules/message/ShopMessageTemplate.class -com/suisung/mall/common/pojo/to/ExperienceTO.class -com/suisung/mall/common/config/MyWebConfig.class -com/suisung/mall/common/domain/TokenDto$TokenDtoBuilder.class -com/suisung/mall/common/modules/edu/EduCourseContract.class -com/suisung/mall/common/modules/plantform/ShopPlantformActivity.class -com/suisung/mall/common/modules/activity/ShopActivityCutprice.class -com/suisung/mall/common/modules/base/ShopBaseProductSpec.class -com/suisung/mall/common/modules/edu/EduLecturerCategory.class -com/suisung/mall/common/modules/pay/PayCardType.class -com/suisung/mall/common/utils/JChardetFacadeUtil$nsICharsetDetectionObserver.class -com/suisung/mall/common/utils/AesEncryptUtil.class -com/suisung/mall/common/modules/city/CityPaotuiOrderBase.class -com/suisung/mall/common/modules/admin/AdminRightsGroup.class -com/suisung/mall/common/api/CommonPage.class -com/suisung/mall/common/modules/store/ShopStoreEmployeeRightsGroup.class -com/suisung/mall/common/service/MessageService.class -com/suisung/mall/common/api/PayType.class -com/suisung/mall/common/modules/user/ShopUserInvoice.class -com/suisung/mall/common/modules/order/ShopOrderData.class -com/suisung/mall/common/modules/store/ShopStorePrinterModel.class -com/suisung/mall/common/modules/edu/EduPaperBase.class -com/suisung/mall/common/pojo/input/AnalyticsVoucherInput.class -com/suisung/mall/common/modules/city/CityPaotuiOrderInfo.class -com/suisung/mall/common/modules/store/ShopStoreAnalytics.class -com/suisung/mall/common/pojo/dto/ProductRecommendDTO.class -com/suisung/mall/common/pojo/req/TimelineReq.class -com/suisung/mall/common/modules/store/ShopStoreEmployee.class -com/suisung/mall/common/modules/edu/EduStoreLecturer.class -com/suisung/mall/common/modules/store/ShopStoreMediaGallery.class -com/suisung/mall/common/constant/AuthConstant.class -com/suisung/mall/common/utils/AudioUtil.class -com/suisung/mall/common/pojo/dto/OssCallbackParamDTO.class -com/suisung/mall/common/modules/edu/EduCourseCategory.class -com/suisung/mall/common/modules/edu/EduClassesCategory.class -com/suisung/mall/common/utils/JChardetFacadeUtil$nsPSMDetector.class -com/suisung/mall/common/modules/product/ShopProductAnalytics.class -com/suisung/mall/common/modules/store/ShopStoreFestival.class -com/suisung/mall/common/modules/account/AccountBaseRoleLevel.class -com/suisung/mall/common/utils/PropertiesUtil.class -com/suisung/mall/common/modules/sns/SnsUserFriend.class -com/suisung/mall/common/pojo/vo/RegUserVo.class -com/suisung/mall/common/modules/account/AccountUserChannelCode.class -com/suisung/mall/common/modules/cms/CmsArticleCommentReply.class -com/suisung/mall/common/modules/edu/EduUserLearnTarget.class -com/suisung/mall/common/utils/constbank/RSAUtil.class -com/suisung/mall/common/modules/pay/dto/ItemActivityInfoDTO.class -com/suisung/mall/common/utils/phone/PhoneNumberUtils.class -com/suisung/mall/common/modules/product/ShopProductIndex.class -com/suisung/mall/common/modules/pay/PayPlantformResource.class -com/suisung/mall/common/modules/store/ShopStoreEmployeeKefu.class -com/suisung/mall/common/modules/edu/vo/EduCourseDetailVO.class -com/suisung/mall/common/modules/order/ShopOrderItem.class -com/suisung/mall/common/utils/VideoUtil.class -com/suisung/mall/common/modules/sns/SnsStoryCategory.class -com/suisung/mall/common/modules/order/ShopPurchaseInvoice.class -com/suisung/mall/common/utils/HttpServletUtils.class -com/suisung/mall/common/modules/user/ShopUserProductBuy.class -com/suisung/mall/common/modules/pay/PayPaymentChannel.class -com/suisung/mall/common/feignService/PayService.class -com/suisung/mall/common/api/CommonResult.class -com/suisung/mall/common/modules/chain/ShopChainCategory.class -com/suisung/mall/common/modules/invoicing/InvoicingCustomerBase.class -com/suisung/mall/common/modules/admin/AdminLogError.class -com/suisung/mall/common/modules/edu/EduCertTemplate.class -com/suisung/mall/common/modules/city/CityUserPaotuier.class -com/suisung/mall/common/pojo/vo/PayConsumeWithdrawOrderVo.class -com/suisung/mall/common/modules/account/AccountUserLevelLog.class -com/suisung/mall/common/modules/distribution/ShopPlantformHighReturn.class -com/suisung/mall/common/modules/user/ShopUserSearchHistory.class -com/suisung/mall/common/modules/invoicing/InvoicingWarehouseItem.class -com/suisung/mall/common/modules/base/ShopBaseProductTag.class -com/suisung/mall/common/modules/edu/EduSubscribeLecturer.class -com/suisung/mall/common/modules/account/AccountUserInfo.class -com/suisung/mall/common/modules/base/ShopBaseStoreCategory.class -com/suisung/mall/common/modules/base/ShopBaseExpress.class -com/suisung/mall/common/modules/edu/EduUserLecturer.class -com/suisung/mall/common/pojo/vo/CommonNumVo.class -com/suisung/mall/common/modules/city/CityMarketOrderBase.class -com/suisung/mall/common/modules/base/ShopBaseCrontab.class -com/suisung/mall/common/domain/SwaggerProperties.class -com/suisung/mall/common/modules/activity/ShopStoreActivityShare.class -com/suisung/mall/common/modules/product/ShopProductDetail.class -com/suisung/mall/common/modules/account/AccountUserSns.class -com/suisung/mall/common/modules/account/AccountUserBase.class -com/suisung/mall/common/utils/FontUtil.class -com/suisung/mall/common/support/Auth.class -com/suisung/mall/common/modules/pay/PayConsumeRecord.class -com/suisung/mall/common/weblog/ControllerLogAspect.class -com/suisung/mall/common/modules/edu/EduUserCert.class -com/suisung/mall/common/modules/sns/SnsUserZone.class -com/suisung/mall/common/api/PaymentType.class -com/suisung/mall/common/modules/user/ShopUserServiceMessage.class -com/suisung/mall/common/modules/base/ShopBaseActivityType.class -com/suisung/mall/common/modules/distribution/ShopPlantformActivityZerobuy.class -com/suisung/mall/common/modules/wechat/ShopWechatKeyword.class -com/suisung/mall/common/pojo/res/AdminDashBoardRes.class -com/suisung/mall/common/modules/base/ShopBaseProductCategory.class -com/suisung/mall/common/modules/base/ShopBaseCurrency.class -com/suisung/mall/common/utils/InputStreamRunnable.class -com/suisung/mall/common/modules/chain/ShopChainDetail.class -com/suisung/mall/common/modules/edu/EduLecturerExamine.class -com/suisung/mall/common/modules/page/ShopPageApp.class -com/suisung/mall/common/weblog/RequestNoContext.class -com/suisung/mall/common/modules/distribution/ShopDistributionUserOrder.class -com/suisung/mall/common/pojo/output/AnalyticsNumOutput.class -com/suisung/mall/common/modules/order/ShopOrderReturnReason.class -com/suisung/mall/common/modules/distribution/ShopDistributionUser.class -com/suisung/mall/common/pojo/vo/UserChannelBringVO.class -com/suisung/mall/common/modules/product/ShopProductMeta.class -com/suisung/mall/common/modules/sns/SnsStoryBase.class -com/suisung/mall/common/utils/CompressionUtils.class -com/suisung/mall/common/constant/ConfigConstant.class -com/suisung/mall/common/exception/GlobalExceptionHandler.class -com/suisung/mall/common/pojo/to/PayPointTO.class -com/suisung/mall/common/modules/admin/AdminRightsBase.class -com/suisung/mall/common/annotation/CacheException.class -com/suisung/mall/common/modules/sns/SnsStoryCommentReply.class -com/suisung/mall/common/modules/activity/ShopActivityGroupbookingHistory.class -com/suisung/mall/common/modules/analytics/AnalyticsAccessHistory.class -com/suisung/mall/common/modules/chain/ShopChainUser.class -com/suisung/mall/common/modules/product/ShopPageUserForm.class -com/suisung/mall/common/modules/store/ShopStoreActivityItem.class -com/suisung/mall/common/utils/JChardetFacadeUtil$nsHZVerifier.class -com/suisung/mall/common/modules/plantform/ShopPlantformFeedback.class -com/suisung/mall/common/modules/cms/CmsArticleTag.class -com/suisung/mall/common/modules/pay/PayCardMedia.class -com/suisung/mall/common/utils/JChardetFacadeUtil$nsSJISVerifier.class -com/suisung/mall/common/pojo/req/AccessItemTimelineReq.class -com/suisung/mall/common/utils/excel/ExcelDynamicSelect.class -com/suisung/mall/common/utils/IdUtil.class -com/suisung/mall/common/pojo/to/PayMoneyTO.class -com/suisung/mall/common/feignService/SnsService.class -com/suisung/mall/common/pojo/output/AnalyticsAccessItemOutput.class -com/suisung/mall/common/modules/sns/SnsStoryCollection.class -com/suisung/mall/common/modules/order/ShopOrderInvoice.class -com/suisung/mall/common/modules/base/ShopBaseProductUnit.class -com/suisung/mall/common/constant/MqConstant.class -com/suisung/mall/common/modules/activity/ShopActivityPfGroupbuyStoreHistory.class -com/suisung/mall/common/modules/order/ShopOrderInfo.class -com/suisung/mall/common/pojo/vo/AnalyticsNumVo.class -com/suisung/mall/common/modules/edu/EduCourseDetail.class -com/suisung/mall/common/modules/account/AccountBaseUserLevel.class -com/suisung/mall/common/modules/edu/EduCertificate.class -com/suisung/mall/common/utils/JChardetFacadeUtil$nsVerifier.class -com/suisung/mall/common/pojo/res/AmountRes.class -com/suisung/mall/common/utils/WxHttpUtil$MethodType.class -com/suisung/mall/common/annotation/OssMedia.class -com/suisung/mall/common/api/BindCode.class -com/suisung/mall/common/utils/JChardetFacadeUtil$nsEUCKRVerifier.class -com/suisung/mall/common/utils/CommonUtil.class -com/suisung/mall/common/modules/admin/ElTree.class -com/suisung/mall/common/modules/edu/EduCourseChapter.class -com/suisung/mall/common/modules/order/ShopOrderBase.class -com/suisung/mall/common/utils/excel/ExcelUtil.class -com/suisung/mall/common/domain/SwaggerProperties$SwaggerPropertiesBuilder.class -com/suisung/mall/common/modules/number/ShopNumberSeq.class -com/suisung/mall/common/modules/cms/CmsArticleCategory.class -com/suisung/mall/common/modules/user/ShopUserFavoritesStore.class -com/suisung/mall/common/modules/pay/PayBaseBank.class -com/suisung/mall/common/modules/account/AccountBaseConfig.class -com/suisung/mall/common/api/MobileResult.class -com/suisung/mall/common/modules/user/ShopUserFavoritesItem.class -com/suisung/mall/common/modules/product/ShopProductCommentHelpful.class -com/suisung/mall/common/modules/admin/AdminLogAction.class -com/suisung/mall/common/utils/JChardetFacadeUtil$nsEUCJPVerifier.class -com/suisung/mall/common/modules/cms/CmsArticleComment.class -com/suisung/mall/common/feignService/AccountService.class -com/suisung/mall/common/modules/base/ShopBaseProductType.class -com/suisung/mall/common/modules/product/ShopProductBase.class -com/suisung/mall/common/modules/store/ShopStoreBusinessCategory.class -com/suisung/mall/common/pojo/input/AnalyticsReturnInput.class -com/suisung/mall/common/modules/pay/PayCardInfo.class -com/suisung/mall/common/modules/pay/PayCardHistory.class -com/suisung/mall/common/modules/edu/EduClassesCoursesCategory.class -com/suisung/mall/common/modules/cms/CmsArticleCommentReplyHelpful.class -com/suisung/mall/common/modules/wechat/ShopWechatTplmsg.class -com/suisung/mall/common/modules/product/ShopProductCommentReply.class -com/suisung/mall/common/modules/chain/ShopChainTn.class -com/suisung/mall/common/modules/edu/EduPaperCategory.class -com/suisung/mall/common/utils/LogUtil.class -com/suisung/mall/common/utils/JChardetFacadeUtil$nsICharsetDetector.class -com/suisung/mall/common/modules/activity/ShopActivityLotteryHistory.class -com/suisung/mall/common/modules/plantform/ShopPlantformFeedbackType.class -com/suisung/mall/common/modules/product/ShopProductInfo.class -com/suisung/mall/common/utils/pojo/dto/EmailDTO.class -com/suisung/mall/common/utils/JChardetFacadeUtil$nsEUCTWVerifier.class -com/suisung/mall/common/utils/RegexUtil.class -com/suisung/mall/common/pojo/dto/BaiduAiBriefDTO.class -com/suisung/mall/common/modules/pay/PayUserPay.class -com/suisung/mall/common/modules/order/ShopOrderComment.class -com/suisung/mall/common/modules/distribution/ShopDistributionStoreDirectsellerProduct.class -com/suisung/mall/common/modules/edu/EduUserCourseStock.class -com/suisung/mall/common/modules/pay/dto/WithdrawDTO.class -com/suisung/mall/common/modules/order/ShopOrderShippingAddress.class -com/suisung/mall/common/modules/user/ShopUserCart.class -com/suisung/mall/common/utils/VideoUtil$1.class -com/suisung/mall/common/modules/store/ShopStoreShippingAddress.class -com/suisung/mall/common/service/impl/BaseControllerImpl.class -com/suisung/mall/common/utils/WxHttpUtil.class -com/suisung/mall/common/domain/TokenDto.class -com/suisung/mall/common/modules/base/ShopBaseProductCategoryNav.class -com/suisung/mall/common/modules/base/ShopBaseStoreGrade.class -com/suisung/mall/common/modules/invoicing/InvoicingStockBill.class -com/suisung/mall/common/feignService/AdminService.class -com/suisung/mall/common/pojo/dto/EduCourseDetailDTO.class -com/suisung/mall/common/modules/admin/Meta.class -com/suisung/mall/common/pojo/output/AnalyticsOrderItemNumOutput.class -com/suisung/mall/common/modules/base/ShopBaseContractType.class -com/suisung/mall/common/modules/distribution/ShopDistributionUserOrderItem.class -com/suisung/mall/common/utils/TimeRange.class -com/suisung/mall/common/pojo/req/AnalyticsReturnReq.class -com/suisung/mall/common/modules/order/ShopOrderChainCode.class -com/suisung/mall/common/modules/store/ShopStoreBase.class -com/suisung/mall/common/utils/JChardetFacadeUtil$GB2312Statistics.class -com/suisung/mall/common/domain/WebLog.class -com/suisung/mall/common/pojo/req/AnalyticsOrderReq.class -com/suisung/mall/common/modules/invoicing/InvoicingCustomerLevel.class -com/suisung/mall/common/modules/admin/AdminBaseMenu.class -com/suisung/mall/common/utils/CookieUtils.class -com/suisung/mall/common/utils/JChardetFacadeUtil$EUCTWStatistics.class -com/suisung/mall/common/modules/plantform/ShopPlantformFeedbackCategory.class -com/suisung/mall/common/pojo/res/DashBoardTimelineRes.class -com/suisung/mall/common/modules/distribution/ShopDistributionStoreBase.class -com/suisung/mall/common/modules/store/ShopStoreInfo.class -com/suisung/mall/common/modules/order/ShopOrderUserForm.class -com/suisung/mall/common/modules/store/ShopStoreCustomService.class -com/suisung/mall/common/modules/activity/ShopActivityGroupbuyStoreHistory.class -com/suisung/mall/common/modules/product/ShopProductSpecItem.class -com/suisung/mall/common/utils/CheckUtil.class -com/suisung/mall/common/constant/RedisConstant.class -com/suisung/mall/common/modules/admin/Router.class -com/suisung/mall/common/modules/plantform/ShopPlantformActivityItem.class -com/suisung/mall/common/modules/product/ShopProductPricingPolicy.class -com/suisung/mall/common/modules/order/ShopOrderCb.class -com/suisung/mall/common/exception/ExceptionErrorDecoder.class -com/suisung/mall/common/modules/user/ShopUserProductBrowse.class -com/suisung/mall/common/pojo/vo/ShopStoreActivityCodeVo.class -com/suisung/mall/common/modules/pay/PayUserBankCard.class -com/suisung/mall/common/modules/product/ShopProductItem.class -com/suisung/mall/common/modules/cms/CmsArticleCommentHelpful.class -com/suisung/mall/common/exception/ApiException.class -com/suisung/mall/common/domain/RoleIdEnum.class -com/suisung/mall/common/modules/plantform/ShopPlantformMediaGallery.class -com/suisung/mall/common/pojo/vo/VisitorVo.class -com/suisung/mall/common/modules/edu/EduUserChapterStock.class -com/suisung/mall/common/modules/chain/vo/ShopChainCategoryVO.class -com/suisung/mall/common/modules/product/ShopProductAskBase.class -com/suisung/mall/common/modules/store/ShopStoreMedia.class -com/suisung/mall/common/modules/edu/dto/ProductDataDTO.class -com/suisung/mall/common/modules/sns/WxLiveGood.class -com/suisung/mall/common/modules/edu/EduClassesBase.class -com/suisung/mall/common/utils/excel/SelectedSheetWriteHandler.class -com/suisung/mall/common/modules/chain/ShopChainBase.class -com/suisung/mall/common/modules/invoicing/InvoicingSupplierContacter.class -com/suisung/mall/common/modules/base/ShopBaseProductAssistItem.class -com/suisung/mall/common/utils/ExecutorUtil.class -com/suisung/mall/common/modules/sns/SnsUserMessage.class -com/suisung/mall/common/modules/activity/ShopActivityGroupbooking.class -com/suisung/mall/common/modules/order/ShopOrderLogistics.class -com/suisung/mall/common/modules/store/ShopStoreProductTag.class -com/suisung/mall/common/utils/JChardetFacadeUtil$nsUTF8Verifier.class -com/suisung/mall/common/modules/edu/dto/LecturerDataDTO.class -com/suisung/mall/common/modules/store/ShopStoreCompany.class -com/suisung/mall/common/modules/account/AccountUserAnalytics.class -com/suisung/mall/common/modules/base/ShopBaseProductBrand.class -com/suisung/mall/common/modules/user/ShopUserDeliveryAddress.class -com/suisung/mall/common/modules/activity/ShopStoreActivityCode.class -com/suisung/mall/common/modules/account/AccountUserType.class -com/suisung/mall/common/utils/CSVUtils.class -com/suisung/mall/common/utils/EmailUtil.class -com/suisung/mall/common/utils/JChardetFacadeUtil.class -com/suisung/mall/common/modules/invoicing/InvoicingSupplierBase.class -com/suisung/mall/common/modules/account/AccountUserChain.class -com/suisung/mall/common/modules/sns/SnsStoryLike.class -com/suisung/mall/common/modules/product/ShopProductPricingPolicyLevel.class -com/suisung/mall/common/pojo/dto/OssPolicyResultDTO.class -com/suisung/mall/common/utils/SmsUtil.class -com/suisung/mall/common/modules/sns/LiveUserHistory.class -com/suisung/mall/common/mybatisplus/SqlLogInterceptor.class -com/suisung/mall/common/modules/invoicing/InvoicingCustomerContacter.class -com/suisung/mall/common/modules/distribution/ShopDistributionPlantformUser.class -com/suisung/mall/common/exception/Asserts.class -com/suisung/mall/common/modules/store/ShopStoreTransportAmount.class -com/suisung/mall/common/modules/sns/SnsStoryCommentHelpful.class -com/suisung/mall/common/utils/StringUtils.class -com/suisung/mall/common/utils/phone/PhoneModel.class -com/suisung/mall/common/pojo/req/AnalyticsProductReq.class -com/suisung/mall/common/pojo/vo/ShopStorePrinterVO.class -com/suisung/mall/common/api/StateCode.class -com/suisung/mall/common/modules/base/ShopBaseProductCategoryMobile.class -com/suisung/mall/common/utils/MybatisPlusQueryUtil.class -com/suisung/mall/common/utils/JChardetFacadeUtil$nsCP1252Verifier.class -com/suisung/mall/common/pojo/input/AnalyticsOrderInput.class -com/suisung/mall/common/utils/JChardetFacadeUtil$JChardetFacade.class -com/suisung/mall/common/modules/plantform/ShopPlantformSubsite.class -com/suisung/mall/common/modules/base/ShopBaseProductAssist.class -com/suisung/mall/common/exception/ApiUserException.class -com/suisung/mall/common/utils/UploadUtil.class -com/suisung/mall/common/utils/JChardetFacadeUtil$nsEUCSampler.class -com/suisung/mall/common/pojo/vo/OrderNumVo.class -com/suisung/mall/common/pojo/input/OrderItemNumTimelineInput.class -com/suisung/mall/common/feignService/ShopService.class -com/suisung/mall/common/modules/chain/ShopChainUserRightsBase.class -com/suisung/mall/common/modules/product/ShopProductDriveModel.class -com/suisung/mall/common/modules/sns/LiveLiveTag.class -com/suisung/mall/common/utils/excel/EasyExcelUtil.class -com/suisung/mall/common/api/PointsType.class -com/suisung/mall/common/api/IErrorCode.class -com/suisung/mall/common/modules/sns/SnsUserZoneRel.class -com/suisung/mall/common/utils/excel/ExportFactory.class -com/suisung/mall/common/utils/JsonUtil.class -com/suisung/mall/common/modules/chain/ShopChainProject.class diff --git a/mall-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/mall-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 17834c1c..e0f93f78 100644 --- a/mall-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/mall-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -146,6 +146,7 @@ /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/activity/ShopActivityGroupbookingHistory.java /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStoreEmployee.java /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/base/ShopBaseProductCategoryMobile.java +/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/pojo/res/FeiePrinterApiDataRes.java /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/order/ShopOrderChainCode.java /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/plantform/ShopPlantformMediaGallery.java /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/pojo/res/AdminDashBoardRes.java @@ -212,6 +213,7 @@ /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/feignService/EduService.java /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/api/IErrorCode.java /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/city/CityMarketOrderBase.java +/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/pojo/res/FeiePrinterApiRes.java /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/product/ShopProductAssistIndex.java /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/pojo/dto/ProductSearchDTO.java /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/utils/JChardetFacadeUtil.java diff --git a/mall-im/src/main/resources/bootstrap-dev.yml b/mall-im/src/main/resources/bootstrap-dev.yml index 3999ab3b..d42ee698 100644 --- a/mall-im/src/main/resources/bootstrap-dev.yml +++ b/mall-im/src/main/resources/bootstrap-dev.yml @@ -1,9 +1,9 @@ spring: datasource: - 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 + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-im/src/main/resources/bootstrap-local.yml b/mall-im/src/main/resources/bootstrap-local.yml index 3999ab3b..d42ee698 100644 --- a/mall-im/src/main/resources/bootstrap-local.yml +++ b/mall-im/src/main/resources/bootstrap-local.yml @@ -1,9 +1,9 @@ spring: datasource: - 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 + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-im/src/main/resources/bootstrap-prod.yml b/mall-im/src/main/resources/bootstrap-prod.yml index 3b12dcb3..48243b2b 100644 --- a/mall-im/src/main/resources/bootstrap-prod.yml +++ b/mall-im/src/main/resources/bootstrap-prod.yml @@ -1,9 +1,9 @@ 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 - driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-im/src/main/resources/bootstrap-test.yml b/mall-im/src/main/resources/bootstrap-test.yml index 86575908..d42ee698 100644 --- a/mall-im/src/main/resources/bootstrap-test.yml +++ b/mall-im/src/main/resources/bootstrap-test.yml @@ -1,9 +1,9 @@ spring: datasource: - 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 + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-im/src/main/resources/bootstrap-uat.yml b/mall-im/src/main/resources/bootstrap-uat.yml index 5d8e9519..d42ee698 100644 --- a/mall-im/src/main/resources/bootstrap-uat.yml +++ b/mall-im/src/main/resources/bootstrap-uat.yml @@ -1,9 +1,9 @@ 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 - driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-pay/src/main/resources/bootstrap-dev.yml b/mall-pay/src/main/resources/bootstrap-dev.yml index 2e46dfad..5c6f0879 100644 --- a/mall-pay/src/main/resources/bootstrap-dev.yml +++ b/mall-pay/src/main/resources/bootstrap-dev.yml @@ -1,9 +1,9 @@ spring: datasource: - 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 + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-pay/src/main/resources/bootstrap-local.yml b/mall-pay/src/main/resources/bootstrap-local.yml index 2e46dfad..5c6f0879 100644 --- a/mall-pay/src/main/resources/bootstrap-local.yml +++ b/mall-pay/src/main/resources/bootstrap-local.yml @@ -1,9 +1,9 @@ spring: datasource: - 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 + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-pay/src/main/resources/bootstrap-prod.yml b/mall-pay/src/main/resources/bootstrap-prod.yml index cad85321..3fe8b65c 100644 --- a/mall-pay/src/main/resources/bootstrap-prod.yml +++ b/mall-pay/src/main/resources/bootstrap-prod.yml @@ -1,9 +1,9 @@ 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 - driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-pay/src/main/resources/bootstrap-test.yml b/mall-pay/src/main/resources/bootstrap-test.yml index ba960975..5c6f0879 100644 --- a/mall-pay/src/main/resources/bootstrap-test.yml +++ b/mall-pay/src/main/resources/bootstrap-test.yml @@ -1,9 +1,9 @@ spring: datasource: - 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 + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-pay/src/main/resources/bootstrap-uat.yml b/mall-pay/src/main/resources/bootstrap-uat.yml index 805178f0..5c6f0879 100644 --- a/mall-pay/src/main/resources/bootstrap-uat.yml +++ b/mall-pay/src/main/resources/bootstrap-uat.yml @@ -1,9 +1,9 @@ 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 - driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-search/src/main/resources/bootstrap-dev.yml b/mall-search/src/main/resources/bootstrap-dev.yml index 58f25205..410b3595 100644 --- a/mall-search/src/main/resources/bootstrap-dev.yml +++ b/mall-search/src/main/resources/bootstrap-dev.yml @@ -1,9 +1,9 @@ spring: datasource: - 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 + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-search/src/main/resources/bootstrap-local.yml b/mall-search/src/main/resources/bootstrap-local.yml index 58f25205..410b3595 100644 --- a/mall-search/src/main/resources/bootstrap-local.yml +++ b/mall-search/src/main/resources/bootstrap-local.yml @@ -1,9 +1,9 @@ spring: datasource: - 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 + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-search/src/main/resources/bootstrap-prod.yml b/mall-search/src/main/resources/bootstrap-prod.yml index 6c9d72a6..83bd2978 100644 --- a/mall-search/src/main/resources/bootstrap-prod.yml +++ b/mall-search/src/main/resources/bootstrap-prod.yml @@ -1,9 +1,9 @@ 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 - driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-search/src/main/resources/bootstrap-test.yml b/mall-search/src/main/resources/bootstrap-test.yml index 842821f9..7f2c33bd 100644 --- a/mall-search/src/main/resources/bootstrap-test.yml +++ b/mall-search/src/main/resources/bootstrap-test.yml @@ -1,9 +1,9 @@ spring: datasource: - 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 + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-search/src/main/resources/bootstrap-uat.yml b/mall-search/src/main/resources/bootstrap-uat.yml index bc14344d..7f2c33bd 100644 --- a/mall-search/src/main/resources/bootstrap-uat.yml +++ b/mall-search/src/main/resources/bootstrap-uat.yml @@ -1,9 +1,9 @@ spring: datasource: - url: jdbc:mysql://172.16.0.11:3306/fafamall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: fafamall - password: brCnv0qLt8s0VqhI - driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterController.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterController.java index 32800cca..ecf28263 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterController.java @@ -75,19 +75,4 @@ public class ShopStorePrinterController { public CommonResult deleteShopStorePrinter(@RequestParam(name = "printer_id" , required = true) Long printer_id) { return shopStorePrinterService.deleteShopStorePrinter(printer_id); } - - - @ApiOperation(value = "店铺添加打票机", notes = "店铺添加打票机") - @RequestMapping(value = "/add/printers", method = {RequestMethod.POST, RequestMethod.GET}) - public String addPrinters() { - String snlist = "922441475#r6ZXPvHH#核销柜台"; - return FeieUtil.addprinter(snlist); - } - - - @ApiOperation(value = "店铺添加打票机", notes = "店铺添加打票机") - @RequestMapping(value = "/print/order", method = {RequestMethod.POST, RequestMethod.GET}) - public String printOrder() { - return FeieUtil.print("922441475"); - } } \ No newline at end of file diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStorePrinterModelService.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStorePrinterModelService.java index b727b1a3..9c25f6ea 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStorePrinterModelService.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStorePrinterModelService.java @@ -7,17 +7,19 @@ import com.suisung.mall.core.web.service.IBaseService; public interface ShopStorePrinterModelService extends IBaseService { - /** - * 根据动态条件门店打打票机型号分页列表查询 - * @param keyword - * @param pageNum - * @param pageSize - * @return - */ + /** + * 根据动态条件门店打打票机型号分页列表查询 + * + * @param keyword + * @param pageNum + * @param pageSize + * @return + */ Page shopStorePrinterModelPageList(String keyword, Integer pageNum, Integer pageSize); /** * 打票机型号列表查询 + * * @param count * @return */ @@ -25,6 +27,7 @@ public interface ShopStorePrinterModelService extends IBaseService { /** * 根据动态条件门店打打票机型号分页列表查询 + * * @param keyword * @param pageNum * @param pageSize @@ -15,9 +16,10 @@ public interface ShopStorePrinterRegionService extends IBaseService shopStorePrinterRegionPageList(String keyword, Integer pageNum, Integer pageSize); - + /** * 打票机可选摆放区域列表查询 + * * @param count 指定记录条数 * @return */ @@ -25,6 +27,7 @@ public interface ShopStorePrinterRegionService extends IBaseService { +public interface ShopStorePrinterService extends IBaseService { - /** - * 根据动态条件门店打打票机分页列表查询 - * @param keyword - * @param pageNum - * @param pageSize - * @return - */ + /** + * 根据动态条件门店打打票机分页列表查询 + * + * @param keyword + * @param pageNum + * @param pageSize + * @return + */ IPage shopStorePrinterPageList(String keyword, Integer pageNum, Integer pageSize); /** * 门店新增一个打票机 + * * @param record * @return */ @@ -29,6 +29,7 @@ public interface ShopStorePrinterService extends IBaseService /** * 门店修改一个打票机 + * * @param record * @return */ @@ -36,6 +37,7 @@ public interface ShopStorePrinterService extends IBaseService /** * 门店删除一个打票机 + * * @param printer_id * @return */ diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterServiceImpl.java index 4c809ec5..8abe60c4 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterServiceImpl.java @@ -14,6 +14,7 @@ import com.suisung.mall.shop.store.service.ShopStorePrinterService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.suisung.mall.common.modules.store.ShopStorePrinter; import com.suisung.mall.common.pojo.vo.ShopStorePrinterVO; +import com.suisung.mall.shop.store.utis.FeieUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -26,15 +27,11 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl shopStorePrinterPageList(String keyword, Integer pageNum, Integer pageSize) { -// QueryWrapper queryWrapper = new QueryWrapper<>(); -// if (StrUtil.isNotBlank(keyword)) { -// queryWrapper.like("printer_name", keyword); -// } -// queryWrapper.orderByAsc("printer_id"); -// return lists(queryWrapper,pageNum,pageSize); Page page = new Page(); page.setCurrent(pageNum); page.setSize(pageSize); @@ -55,24 +52,32 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl 0) { if (existRecord.getFlag()== ConstantError.Disable2){ - // TODO 往厂商添加打印机 - // "922441475#r6ZXPvHH#核销柜台"; - // FeieUtil.addprinter(String.format("%s#%s#%s", record.getPrinter_sn(), record.getPrinter_key(),record.getPrinter_name())); + UpdateWrapper updateWrapper = new UpdateWrapper(); + updateWrapper.eq("printer_id", existRecord.getPrinter_id()); + updateWrapper.set("updated_by",1); + updateWrapper.set("updated_at",new Date()); + + // 往厂商添加打印机 + // "922441475#r6ZXPvHH#核销柜台"; + boolean success = feieUtil.addPrinter(String.format("%s#%s#%s", existRecord.getPrinter_sn(), existRecord.getPrinter_key(),existRecord.getPrinter_name())); + if(success) { + updateWrapper.set("flag",ConstantError.Enable); + } + + update(updateWrapper); - existRecord.setFlag(ConstantError.Enable); - existRecord.setUpdated_by(1); - existRecord.setUpdated_at(new Date()); - updateById(existRecord); return CommonResult.success("添加成功！"); } return CommonResult.success("打票机已添加，请勿重复操作"); } - // TODO 往厂商添加打印机 + // 往厂商添加打印机 // "922441475#r6ZXPvHH#核销柜台"; - // FeieUtil.addprinter(String.format("%s#%s#%s", record.getPrinter_sn(), record.getPrinter_key(),record.getPrinter_name())); - // record.setFlag(ConstantError.Enable) + boolean success = feieUtil.addPrinter(String.format("%s#%s#%s", record.getPrinter_sn(), record.getPrinter_key(),record.getPrinter_name())); + if(success) { + record.setFlag(ConstantError.Enable); + } if (add(record)){ return CommonResult.success(); @@ -86,6 +91,7 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl nvps = new ArrayList(); - nvps.add(new BasicNameValuePair("user", USER)); - String STIME = String.valueOf(System.currentTimeMillis() / 1000); - nvps.add(new BasicNameValuePair("stime", STIME)); - nvps.add(new BasicNameValuePair("sig", signature(USER, UKEY, STIME))); - nvps.add(new BasicNameValuePair("apiname", "Open_printerAddlist"));//固定值,不需要修改 - nvps.add(new BasicNameValuePair("printerContent", snlist)); + nvps.add(new BasicNameValuePair("printerContent", printerInfo)); + FeiePrinterApiRes reps = sendHttpPost("Open_printerAddlist", nvps); - CloseableHttpResponse response = null; - String result = null; - try { - post.setEntity(new UrlEncodedFormEntity(nvps, "utf-8")); - response = httpClient.execute(post); - int statecode = response.getStatusLine().getStatusCode(); - if (statecode == 200) { - HttpEntity httpentity = response.getEntity(); - if (httpentity != null) { - result = EntityUtils.toString(httpentity); - } - } - } catch (Exception e) { - e.printStackTrace(); - } finally { - try { - if (response != null) { - response.close(); - } - } catch (IOException e) { - e.printStackTrace(); - } - try { - post.abort(); - } catch (Exception e) { - e.printStackTrace(); - } - try { - httpClient.close(); - } catch (IOException e) { - e.printStackTrace(); - } + if (reps != null && reps.getRet().equals(0)) { + // && reps.getData()!=null && reps.getData().getOk()!=null &&reps.getData().getOk().length>0 + return true; } - return result; + logger.error(reps.getMsg()); + return false; } - - //方法1 - public static String print(String sn) { - //标签说明： - //单标签: - //"
"为换行,""为切刀指令(主动切纸,仅限切刀打印机使用才有效果) - //""为打印LOGO指令(前提是预先在机器内置LOGO图片),""为钱箱或者外置音响指令 - //成对标签： - //""为居中放大一倍,""为放大一倍,""为居中,字体变高一倍 - //字体变宽一倍,""为二维码,""为字体加粗,""为右对齐 - //拼凑订单内容时可参考如下格式 - //根据打印纸张的宽度，自行调整内容的格式，可参考下面的样例格式 - - String content; - content = "测试打印
"; - content += "名称　　　　　 单价 数量 金额
"; - content += "--------------------------------
"; - content += "饭　　　　　　 1.0 1 1.0
"; - content += "炒饭　　　　　 10.0 10 10.0
"; - content += "蛋炒饭　　　　 10.0 10 100.0
"; - content += "鸡蛋炒饭　　　 100.0 1 100.0
"; - content += "番茄蛋炒饭　　 1000.0 1 100.0
"; - content += "西红柿蛋炒饭　 1000.0 1 100.0
"; - content += "西红柿鸡蛋炒饭 100.0 10 100.0
"; - content += "备注：加辣
"; - content += "--------------------------------
"; - content += "合计：xx.0元
"; - content += "送货地点：广州市南沙区xx路xx号
"; - content += "联系电话：13888888888888
"; - content += "订餐时间：2016-08-08 08:08:08
"; - content += "http://www.dzist.com"; - - //通过POST请求，发送打印信息到服务器 - RequestConfig requestConfig = RequestConfig.custom() - .setSocketTimeout(30000)//读取超时 - .setConnectTimeout(30000)//连接超时 - .build(); - - CloseableHttpClient httpClient = HttpClients.custom() - .setDefaultRequestConfig(requestConfig) - .build(); - - HttpPost post = new HttpPost(URL); + /** + * 从厂家删除一个或多个打印机 + * + * @param snList 打印机编号，多台打印机请用减号“-”连接起来。如：316500010-316500011-316500012 + * @return + */ + public boolean delPrinter(String snList) { + List nvps = new ArrayList(); + nvps.add(new BasicNameValuePair("snlist", snList)); + + FeiePrinterApiRes reps = sendHttpPost("Open_printerDelList", nvps); + if (reps != null && reps.getRet().equals(0)) { + return true; + } + + logger.error(reps.getMsg()); + return false; + } + + /** + * 打票机打印 订单，取消订单等操作 + * + * @param sn + * @param printContent 打印等内容，参考 飞鹅 模版格式 + * @return + */ + public boolean printContent(String sn, String printContent) { List nvps = new ArrayList(); - nvps.add(new BasicNameValuePair("user", USER)); - String STIME = String.valueOf(System.currentTimeMillis() / 1000); - nvps.add(new BasicNameValuePair("stime", STIME)); - nvps.add(new BasicNameValuePair("sig", signature(USER, UKEY, STIME))); - nvps.add(new BasicNameValuePair("apiname", "Open_printMsg"));//固定值,不需要修改 nvps.add(new BasicNameValuePair("sn", sn)); - nvps.add(new BasicNameValuePair("content", content)); - nvps.add(new BasicNameValuePair("times", "1"));//打印联数 + nvps.add(new BasicNameValuePair("printContent", printContent)); - CloseableHttpResponse response = null; - String result = null; - try { - post.setEntity(new UrlEncodedFormEntity(nvps, "utf-8")); - response = httpClient.execute(post); - int statecode = response.getStatusLine().getStatusCode(); - if (statecode == 200) { - HttpEntity httpentity = response.getEntity(); - if (httpentity != null) { - //服务器返回的JSON字符串，建议要当做日志记录起来 - result = EntityUtils.toString(httpentity); - } - } - } catch (Exception e) { - e.printStackTrace(); - } finally { - try { - if (response != null) { - response.close(); - } - } catch (IOException e) { - e.printStackTrace(); - } - try { - post.abort(); - } catch (Exception e) { - e.printStackTrace(); - } - try { - httpClient.close(); - } catch (IOException e) { - e.printStackTrace(); - } + FeiePrinterApiRes reps = sendHttpPost("Open_printMsg", nvps); + if (reps != null && reps.getRet().equals(0)) { + return true; } - return result; + logger.error(reps.getMsg()); + return false; } - //方法2 - public static String printLabelMsg(String sn) { - - String content; - content = "1";//设定打印时出纸和打印字体的方向，n 0 或 1，每次设备重启后都会初始化为 0 值设置，1：正向出纸，0：反向出纸， - content += "#001 五号桌 1/3可乐鸡翅张三先生 13800138000";//40mm宽度标签纸打印例子，打开注释调用标签打印接口打印 - - //通过POST请求，发送打印信息到服务器 - RequestConfig requestConfig = RequestConfig.custom() - .setSocketTimeout(30000)//读取超时 - .setConnectTimeout(30000)//连接超时 - .build(); - - CloseableHttpClient httpClient = HttpClients.custom() - .setDefaultRequestConfig(requestConfig) - .build(); - - HttpPost post = new HttpPost(URL); - List nvps = new ArrayList(); - nvps.add(new BasicNameValuePair("user", USER)); - String STIME = String.valueOf(System.currentTimeMillis() / 1000); - nvps.add(new BasicNameValuePair("stime", STIME)); - nvps.add(new BasicNameValuePair("sig", signature(USER, UKEY, STIME))); - nvps.add(new BasicNameValuePair("apiname", "Open_printLabelMsg"));//固定值,不需要修改 - nvps.add(new BasicNameValuePair("sn", sn)); - nvps.add(new BasicNameValuePair("content", content)); - nvps.add(new BasicNameValuePair("times", "1"));//打印联数 - - CloseableHttpResponse response = null; - String result = null; - try { - post.setEntity(new UrlEncodedFormEntity(nvps, "utf-8")); - response = httpClient.execute(post); - int statecode = response.getStatusLine().getStatusCode(); - if (statecode == 200) { - HttpEntity httpentity = response.getEntity(); - if (httpentity != null) { - //服务器返回的JSON字符串，建议要当做日志记录起来 - result = EntityUtils.toString(httpentity); - } - } - } catch (Exception e) { - e.printStackTrace(); - } finally { - try { - if (response != null) { - response.close(); - } - } catch (IOException e) { - e.printStackTrace(); - } - try { - post.abort(); - } catch (Exception e) { - e.printStackTrace(); - } - try { - httpClient.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - return result; - - } - - - //方法3 - public static String queryOrderState(String orderid) { - - //通过POST请求，发送打印信息到服务器 - RequestConfig requestConfig = RequestConfig.custom() - .setSocketTimeout(30000)//读取超时 - .setConnectTimeout(30000)//连接超时 - .build(); - - CloseableHttpClient httpClient = HttpClients.custom() - .setDefaultRequestConfig(requestConfig) - .build(); - - HttpPost post = new HttpPost(URL); - List nvps = new ArrayList(); - nvps.add(new BasicNameValuePair("user", USER)); - String STIME = String.valueOf(System.currentTimeMillis() / 1000); - nvps.add(new BasicNameValuePair("stime", STIME)); - nvps.add(new BasicNameValuePair("sig", signature(USER, UKEY, STIME))); - nvps.add(new BasicNameValuePair("apiname", "Open_queryOrderState"));//固定值,不需要修改 - nvps.add(new BasicNameValuePair("orderid", orderid)); - - CloseableHttpResponse response = null; - String result = null; - try { - post.setEntity(new UrlEncodedFormEntity(nvps, "utf-8")); - response = httpClient.execute(post); - int statecode = response.getStatusLine().getStatusCode(); - if (statecode == 200) { - HttpEntity httpentity = response.getEntity(); - if (httpentity != null) { - //服务器返回 - result = EntityUtils.toString(httpentity); - } - } - } catch (Exception e) { - e.printStackTrace(); - } finally { - try { - if (response != null) { - response.close(); - } - } catch (IOException e) { - e.printStackTrace(); - } - try { - post.abort(); - } catch (Exception e) { - e.printStackTrace(); - } - try { - httpClient.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - return result; - - } - - - //方法4 - public static String queryOrderInfoByDate(String sn, String strdate) { - - //通过POST请求，发送打印信息到服务器 - RequestConfig requestConfig = RequestConfig.custom() - .setSocketTimeout(30000)//读取超时 - .setConnectTimeout(30000)//连接超时 - .build(); - - CloseableHttpClient httpClient = HttpClients.custom() - .setDefaultRequestConfig(requestConfig) - .build(); - - HttpPost post = new HttpPost(URL); - List nvps = new ArrayList(); - nvps.add(new BasicNameValuePair("user", USER)); - String STIME = String.valueOf(System.currentTimeMillis() / 1000); - nvps.add(new BasicNameValuePair("stime", STIME)); - nvps.add(new BasicNameValuePair("sig", signature(USER, UKEY, STIME))); - nvps.add(new BasicNameValuePair("apiname", "Open_queryOrderInfoByDate"));//固定值,不需要修改 - nvps.add(new BasicNameValuePair("sn", sn)); - nvps.add(new BasicNameValuePair("date", strdate));//yyyy-MM-dd格式 - - CloseableHttpResponse response = null; - String result = null; - try { - post.setEntity(new UrlEncodedFormEntity(nvps, "utf-8")); - response = httpClient.execute(post); - int statecode = response.getStatusLine().getStatusCode(); - if (statecode == 200) { - HttpEntity httpentity = response.getEntity(); - if (httpentity != null) { - //服务器返回 - result = EntityUtils.toString(httpentity); - } - } - } catch (Exception e) { - e.printStackTrace(); - } finally { - try { - if (response != null) { - response.close(); - } - } catch (IOException e) { - e.printStackTrace(); - } - try { - post.abort(); - } catch (Exception e) { - e.printStackTrace(); - } - try { - httpClient.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - return result; - - } - - - //方法5 - private static String queryPrinterStatus(String sn) { - - //通过POST请求，发送打印信息到服务器 - RequestConfig requestConfig = RequestConfig.custom() - .setSocketTimeout(30000)//读取超时 - .setConnectTimeout(30000)//连接超时 - .build(); - - CloseableHttpClient httpClient = HttpClients.custom() - .setDefaultRequestConfig(requestConfig) - .build(); - - HttpPost post = new HttpPost(URL); - List nvps = new ArrayList(); - nvps.add(new BasicNameValuePair("user", USER)); - String STIME = String.valueOf(System.currentTimeMillis() / 1000); - nvps.add(new BasicNameValuePair("stime", STIME)); - nvps.add(new BasicNameValuePair("sig", signature(USER, UKEY, STIME))); - nvps.add(new BasicNameValuePair("apiname", "Open_queryPrinterStatus"));//固定值,不需要修改 - nvps.add(new BasicNameValuePair("sn", sn)); - - CloseableHttpResponse response = null; - String result = null; - try { - post.setEntity(new UrlEncodedFormEntity(nvps, "utf-8")); - response = httpClient.execute(post); - int statecode = response.getStatusLine().getStatusCode(); - if (statecode == 200) { - HttpEntity httpentity = response.getEntity(); - if (httpentity != null) { - //服务器返回 - result = EntityUtils.toString(httpentity); - } - } - } catch (Exception e) { - e.printStackTrace(); - } finally { - try { - if (response != null) { - response.close(); - } - } catch (IOException e) { - e.printStackTrace(); - } - try { - post.abort(); - } catch (Exception e) { - e.printStackTrace(); - } - try { - httpClient.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - return result; - - } - - - //生成签名字符串 - private static String signature(String USER, String UKEY, String STIME) { + /** + * 生成签名字符串 + * + * @param USER 开发者账号 + * @param UKEY 开发者账号密钥 + * @param STIME 秒时间戳 + * @return + */ + private String signature(String USER, String UKEY, String STIME) { String s = DigestUtils.sha1Hex(USER + UKEY + STIME); return s; } + /** + * 发送 http post 请求 + * + * @param apiName + * @param paramPair + * @return + */ + private FeiePrinterApiRes sendHttpPost(String apiName, List paramPair) { + if (StrUtil.isBlank(apiName) || CollectionUtil.isEmpty(paramPair)) { + return new FeiePrinterApiRes().fail("缺少必要参数！"); + } + //通过POST请求，发送打印信息到服务器 + RequestConfig requestConfig = RequestConfig.custom() + .setSocketTimeout(30000)//读取超时 + .setConnectTimeout(30000)//连接超时 + .build(); + + CloseableHttpClient httpClient = HttpClients.custom() + .setDefaultRequestConfig(requestConfig) + .build(); + + HttpPost post = new HttpPost(URL); + + paramPair.add(new BasicNameValuePair("user", USER)); + String STIME = String.valueOf(System.currentTimeMillis() / 1000); + paramPair.add(new BasicNameValuePair("stime", STIME)); + paramPair.add(new BasicNameValuePair("sig", signature(USER, UKEY, STIME))); + paramPair.add(new BasicNameValuePair("apiname", apiName)); + + CloseableHttpResponse response = null; + try { + post.setEntity(new UrlEncodedFormEntity(paramPair, "utf-8")); + response = httpClient.execute(post); + int stateCode = response.getStatusLine().getStatusCode(); + if (stateCode == 200) { + HttpEntity httpentity = response.getEntity(); + if (httpentity != null) { + String result = EntityUtils.toString(httpentity); + logger.info("飞鹅云返回到信息：\n" + result); + return JsonUtil.json2object(result, FeiePrinterApiRes.class); + } + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + if (response != null) { + response.close(); + } + } catch (IOException e) { + e.printStackTrace(); + } + + try { + post.abort(); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + httpClient.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + return null; + } } diff --git a/mall-shop/src/main/resources/bootstrap-dev.yml b/mall-shop/src/main/resources/bootstrap-dev.yml index 3a2500d5..726db0c4 100644 --- a/mall-shop/src/main/resources/bootstrap-dev.yml +++ b/mall-shop/src/main/resources/bootstrap-dev.yml @@ -8,10 +8,10 @@ spring: mvc: static-path-pattern: /shop/static/** datasource: - 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 + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true @@ -126,4 +126,8 @@ getui: appSecret: cTBzsJbcZSAOeBXIREr4y2 masterSecret: ybdUcVJJKw5bAcQB4DpC0A logstash: - host: @logstash.host@ \ No newline at end of file + host: @logstash.host@ +feieyun: + url: http://api.feieyun.cn/Api/Open/ + user: 46790855@qq.com + ukey: 5NIBL2gWV5yqZDUN \ No newline at end of file diff --git a/mall-shop/src/main/resources/bootstrap-local.yml b/mall-shop/src/main/resources/bootstrap-local.yml index 3a2500d5..c27027cd 100644 --- a/mall-shop/src/main/resources/bootstrap-local.yml +++ b/mall-shop/src/main/resources/bootstrap-local.yml @@ -8,10 +8,10 @@ spring: mvc: static-path-pattern: /shop/static/** datasource: - 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 + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-shop/src/main/resources/bootstrap-prod.yml b/mall-shop/src/main/resources/bootstrap-prod.yml index 601f0046..42f2adc6 100644 --- a/mall-shop/src/main/resources/bootstrap-prod.yml +++ b/mall-shop/src/main/resources/bootstrap-prod.yml @@ -6,10 +6,10 @@ 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 - driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-shop/src/main/resources/bootstrap-test.yml b/mall-shop/src/main/resources/bootstrap-test.yml index 43f113ec..39868852 100644 --- a/mall-shop/src/main/resources/bootstrap-test.yml +++ b/mall-shop/src/main/resources/bootstrap-test.yml @@ -6,10 +6,10 @@ spring: mvc: static-path-pattern: /shop/static/** datasource: - 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 + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-shop/src/main/resources/bootstrap-uat.yml b/mall-shop/src/main/resources/bootstrap-uat.yml index 127114c3..39868852 100644 --- a/mall-shop/src/main/resources/bootstrap-uat.yml +++ b/mall-shop/src/main/resources/bootstrap-uat.yml @@ -6,10 +6,10 @@ 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 - driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-sns/src/main/resources/bootstrap-dev.yml b/mall-sns/src/main/resources/bootstrap-dev.yml index eb032033..d971e7e7 100644 --- a/mall-sns/src/main/resources/bootstrap-dev.yml +++ b/mall-sns/src/main/resources/bootstrap-dev.yml @@ -1,9 +1,9 @@ spring: datasource: - 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 + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-sns/src/main/resources/bootstrap-local.yml b/mall-sns/src/main/resources/bootstrap-local.yml index eb032033..d971e7e7 100644 --- a/mall-sns/src/main/resources/bootstrap-local.yml +++ b/mall-sns/src/main/resources/bootstrap-local.yml @@ -1,9 +1,9 @@ spring: datasource: - 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 + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-sns/src/main/resources/bootstrap-prod.yml b/mall-sns/src/main/resources/bootstrap-prod.yml index abc87f27..96e6f61d 100644 --- a/mall-sns/src/main/resources/bootstrap-prod.yml +++ b/mall-sns/src/main/resources/bootstrap-prod.yml @@ -1,9 +1,9 @@ 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 - driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-sns/src/main/resources/bootstrap-test.yml b/mall-sns/src/main/resources/bootstrap-test.yml index 28d23eb1..06dc79a0 100644 --- a/mall-sns/src/main/resources/bootstrap-test.yml +++ b/mall-sns/src/main/resources/bootstrap-test.yml @@ -1,9 +1,9 @@ spring: datasource: - 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 + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/mall-sns/src/main/resources/bootstrap-uat.yml b/mall-sns/src/main/resources/bootstrap-uat.yml index 9f03a0b9..06dc79a0 100644 --- a/mall-sns/src/main/resources/bootstrap-uat.yml +++ b/mall-sns/src/main/resources/bootstrap-uat.yml @@ -1,9 +1,9 @@ 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 - driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://@mysql.host@:@mysql.port@/@mysql.db@?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&&zeroDateTimeBehavior=convertToNull + username: @mysql.user@ + password: @mysql.pwd@ + driver-class-name: @mysql.driver@ type: com.alibaba.druid.pool.DruidDataSource druid: async-init: true diff --git a/pom.xml b/pom.xml index 5a367833..b70c4a73 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ UTF-8 true - https://42.194.196.179:2375 + 1.2.2 1.8 Hoxton.SR5 @@ -305,6 +305,13 @@ my_test_tx_group 114.132.210.208:8718 + + 114.132.210.208 + 3306 + fafamall + web_dev + Abc654321$^ + com.mysql.cj.jdbc.Driver 114.132.210.208 15 @@ -330,6 +337,8 @@ dev dev + + https://42.194.196.179:2375 114.132.210.208:8848 public @@ -342,6 +351,13 @@ my_test_tx_group 114.132.210.208:8718 + + 114.132.210.208 + 3306 + fafamall + web_dev + Abc654321$^ + com.mysql.cj.jdbc.Driver 114.132.210.208 15 @@ -367,6 +383,8 @@ test test + + https://42.194.196.179:2375 10.1.8.3:8848 public @@ -379,6 +397,13 @@ my_test_tx_group 10.1.8.3:8718 + + 114.132.210.208 + 3306 + fafamall + web_dev + Abc654321$^ + com.mysql.cj.jdbc.Driver 10.1.8.3 0 @@ -404,6 +429,8 @@ prod prod + + https://42.194.196.179:2375 172.16.0.11:8848 public @@ -416,6 +443,13 @@ my_test_tx_group 172.16.0.11:8718 + + 172.16.0.11 + 3306 + fafamall + fafamall + brCnv0qLt8s0VqhI + com.mysql.cj.jdbc.Driver 172.16.0.11 0