diff --git a/mall-account/target/classes/bootstrap.yml b/mall-account/target/classes/bootstrap.yml index 0203d260..727787dc 100644 --- a/mall-account/target/classes/bootstrap.yml +++ b/mall-account/target/classes/bootstrap.yml @@ -1,6 +1,6 @@ spring: profiles: - active: local + active: prod application: name: mall-account jackson: diff --git a/mall-admin/target/classes/bootstrap.yml b/mall-admin/target/classes/bootstrap.yml index f31c3f03..418ec0c5 100644 --- a/mall-admin/target/classes/bootstrap.yml +++ b/mall-admin/target/classes/bootstrap.yml @@ -1,6 +1,6 @@ spring: profiles: - active: local + active: prod application: name: mall-admin jackson: diff --git a/mall-auth/target/classes/bootstrap-dev.yml b/mall-auth/target/classes/bootstrap-dev.yml index d7ed5697..ce4c20cc 100644 --- a/mall-auth/target/classes/bootstrap-dev.yml +++ b/mall-auth/target/classes/bootstrap-dev.yml @@ -2,13 +2,13 @@ spring: cloud: nacos: discovery: - server-addr: 114.132.210.208:8848 + server-addr: 172.16.0.11:8848 config: - server-addr: 114.132.210.208:8848 + server-addr: 172.16.0.11:8848 file-extension: yaml sentinel: transport: - dashboard: 114.132.210.208:8718 + dashboard: 172.16.0.11:8718 eager: true # 控制台日志信息 logging: @@ -25,4 +25,4 @@ logging: config: error netflix: error logstash: - host: 114.132.210.208 \ No newline at end of file + host: 172.16.0.11 \ No newline at end of file diff --git a/mall-auth/target/classes/bootstrap-local.yml b/mall-auth/target/classes/bootstrap-local.yml index d7ed5697..ce4c20cc 100644 --- a/mall-auth/target/classes/bootstrap-local.yml +++ b/mall-auth/target/classes/bootstrap-local.yml @@ -2,13 +2,13 @@ spring: cloud: nacos: discovery: - server-addr: 114.132.210.208:8848 + server-addr: 172.16.0.11:8848 config: - server-addr: 114.132.210.208:8848 + server-addr: 172.16.0.11:8848 file-extension: yaml sentinel: transport: - dashboard: 114.132.210.208:8718 + dashboard: 172.16.0.11:8718 eager: true # 控制台日志信息 logging: @@ -25,4 +25,4 @@ logging: config: error netflix: error logstash: - host: 114.132.210.208 \ No newline at end of file + host: 172.16.0.11 \ No newline at end of file diff --git a/mall-auth/target/classes/bootstrap-prod.yml b/mall-auth/target/classes/bootstrap-prod.yml index d7ed5697..ce4c20cc 100644 --- a/mall-auth/target/classes/bootstrap-prod.yml +++ b/mall-auth/target/classes/bootstrap-prod.yml @@ -2,13 +2,13 @@ spring: cloud: nacos: discovery: - server-addr: 114.132.210.208:8848 + server-addr: 172.16.0.11:8848 config: - server-addr: 114.132.210.208:8848 + server-addr: 172.16.0.11:8848 file-extension: yaml sentinel: transport: - dashboard: 114.132.210.208:8718 + dashboard: 172.16.0.11:8718 eager: true # 控制台日志信息 logging: @@ -25,4 +25,4 @@ logging: config: error netflix: error logstash: - host: 114.132.210.208 \ No newline at end of file + host: 172.16.0.11 \ No newline at end of file diff --git a/mall-auth/target/classes/bootstrap-test.yml b/mall-auth/target/classes/bootstrap-test.yml index d7ed5697..ce4c20cc 100644 --- a/mall-auth/target/classes/bootstrap-test.yml +++ b/mall-auth/target/classes/bootstrap-test.yml @@ -2,13 +2,13 @@ spring: cloud: nacos: discovery: - server-addr: 114.132.210.208:8848 + server-addr: 172.16.0.11:8848 config: - server-addr: 114.132.210.208:8848 + server-addr: 172.16.0.11:8848 file-extension: yaml sentinel: transport: - dashboard: 114.132.210.208:8718 + dashboard: 172.16.0.11:8718 eager: true # 控制台日志信息 logging: @@ -25,4 +25,4 @@ logging: config: error netflix: error logstash: - host: 114.132.210.208 \ No newline at end of file + host: 172.16.0.11 \ No newline at end of file diff --git a/mall-auth/target/classes/bootstrap-uat.yml b/mall-auth/target/classes/bootstrap-uat.yml index d7ed5697..ce4c20cc 100644 --- a/mall-auth/target/classes/bootstrap-uat.yml +++ b/mall-auth/target/classes/bootstrap-uat.yml @@ -2,13 +2,13 @@ spring: cloud: nacos: discovery: - server-addr: 114.132.210.208:8848 + server-addr: 172.16.0.11:8848 config: - server-addr: 114.132.210.208:8848 + server-addr: 172.16.0.11:8848 file-extension: yaml sentinel: transport: - dashboard: 114.132.210.208:8718 + dashboard: 172.16.0.11:8718 eager: true # 控制台日志信息 logging: @@ -25,4 +25,4 @@ logging: config: error netflix: error logstash: - host: 114.132.210.208 \ No newline at end of file + host: 172.16.0.11 \ No newline at end of file diff --git a/mall-auth/target/classes/bootstrap.yml b/mall-auth/target/classes/bootstrap.yml index 9f24c2ea..71cd354c 100644 --- a/mall-auth/target/classes/bootstrap.yml +++ b/mall-auth/target/classes/bootstrap.yml @@ -1,6 +1,6 @@ spring: profiles: - active: local + active: prod application: name: mall-auth jackson: diff --git a/mall-cms/target/classes/bootstrap.yml b/mall-cms/target/classes/bootstrap.yml index 0ff62536..69021b03 100644 --- a/mall-cms/target/classes/bootstrap.yml +++ b/mall-cms/target/classes/bootstrap.yml @@ -1,6 +1,6 @@ spring: profiles: - active: local + active: prod application: name: mall-cms jackson: 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 f0f58316..b139dada 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 @@ -127,6 +127,7 @@ 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/store/ShopStorePrinterLog.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 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 8dca235e..f95a98a7 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 @@ -49,6 +49,7 @@ /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/product/ShopProductIndex.java /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/cms/CmsArticleBase.java /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/sns/SnsStoryCollection.java +/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStorePrinterLog.java /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/utils/VideoUtil.java /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/modules/edu/EduCourseCategory.java /Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/api/ResultCode.java diff --git a/mall-gateway/target/classes/bootstrap.yml b/mall-gateway/target/classes/bootstrap.yml index 3d5e0735..8520af1d 100644 --- a/mall-gateway/target/classes/bootstrap.yml +++ b/mall-gateway/target/classes/bootstrap.yml @@ -1,6 +1,6 @@ spring: profiles: - active: local + active: prod application: name: mall-gateway jackson: diff --git a/mall-im/target/classes/bootstrap.yml b/mall-im/target/classes/bootstrap.yml index 4cc7f2e9..fe668b61 100644 --- a/mall-im/target/classes/bootstrap.yml +++ b/mall-im/target/classes/bootstrap.yml @@ -1,6 +1,6 @@ spring: profiles: - active: local + active: prod application: name: mall-im jackson: diff --git a/mall-pay/target/classes/bootstrap.yml b/mall-pay/target/classes/bootstrap.yml index 534982be..2e73f879 100644 --- a/mall-pay/target/classes/bootstrap.yml +++ b/mall-pay/target/classes/bootstrap.yml @@ -1,6 +1,6 @@ spring: profiles: - active: local + active: prod application: name: mall-pay jackson: diff --git a/mall-search/target/classes/bootstrap.yml b/mall-search/target/classes/bootstrap.yml index 0ba3cebc..7a177388 100644 --- a/mall-search/target/classes/bootstrap.yml +++ b/mall-search/target/classes/bootstrap.yml @@ -1,6 +1,6 @@ spring: profiles: - active: local + active: prod application: name: mall-search jackson: 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 899b1f45..8c21d645 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 @@ -365,14 +365,6 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl) binding.get("order_items"), 18, 6, 8); -// if (StrUtil.isBlank(order_items_tmpl)) { -// logger.info("订单{}详情列表模版渲染异常，无法打印小票。", orderId); -// return false; -// } -// binding.put("order_items_tmpl", order_items_tmpl); - // 生成打印内容（暂时飞鹅打票机的内容） String printContent = FreeMakerUtils.processTemplate(template.getTemplate_name(), template.getTemplate_value(), binding); if (StrUtil.isBlank(printContent)) { diff --git a/mall-shop/target/classes/bootstrap.yml b/mall-shop/target/classes/bootstrap.yml index dad7c49a..e00688bc 100644 --- a/mall-shop/target/classes/bootstrap.yml +++ b/mall-shop/target/classes/bootstrap.yml @@ -1,6 +1,6 @@ spring: profiles: - active: local + active: prod application: name: mall-shop jackson: diff --git a/mall-shop/target/classes/com/suisung/mall/shop/order/listener/OrderPayedListener.class b/mall-shop/target/classes/com/suisung/mall/shop/order/listener/OrderPayedListener.class index 61439533..8d55455a 100644 Binary files a/mall-shop/target/classes/com/suisung/mall/shop/order/listener/OrderPayedListener.class and b/mall-shop/target/classes/com/suisung/mall/shop/order/listener/OrderPayedListener.class differ diff --git a/mall-shop/target/classes/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.class b/mall-shop/target/classes/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.class index f6bebd96..bb92ee1f 100644 Binary files a/mall-shop/target/classes/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.class and b/mall-shop/target/classes/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.class differ diff --git a/mall-shop/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/mall-shop/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 96e063f4..11a001a5 100644 --- a/mall-shop/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/mall-shop/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -192,6 +192,7 @@ com/suisung/mall/shop/store/controller/admin/ShopStoreFestivalController.class com/suisung/mall/shop/page/controller/mobile/UploadController.class com/suisung/mall/shop/order/vo/OrdeListVo.class com/suisung/mall/shop/base/controller/admin/ShopBaseMarketCategoryController.class +com/suisung/mall/shop/store/service/ShopStorePrinterLogService.class com/suisung/mall/shop/page/dto/PageBaseListReq.class com/suisung/mall/shop/order/mapper/ShopOrderUserFormMapper.class com/suisung/mall/shop/base/service/impl/ShopBaseDistrictServiceImpl.class @@ -430,6 +431,7 @@ com/suisung/mall/shop/wechat/controller/WxQrCodeContorller.class com/suisung/mall/shop/wechat/controller/ShopWechatKeywordController.class com/suisung/mall/shop/components/quartz/job/UpdateProductStatusJob.class com/suisung/mall/shop/store/controller/admin/ShopStorePrinterTemplateController.class +com/suisung/mall/shop/store/service/impl/ShopStorePrinterLogServiceImpl.class com/suisung/mall/shop/store/mapper/ShopStoreEmployeeRightsBaseMapper.class com/suisung/mall/shop/hall/service/HallPurchaseOrderBaseService.class com/suisung/mall/shop/analytics/mapper/ShopUserBaseMapper.class @@ -581,6 +583,7 @@ com/suisung/mall/shop/product/mapper/ShopProductAskBaseMapper.class com/suisung/mall/shop/user/service/impl/ShopUserFavoritesStoreServiceImpl.class com/suisung/mall/shop/user/service/ShopUserSearchHistoryService.class com/suisung/mall/shop/plantform/service/ShopPlantformSubsiteUserService.class +com/suisung/mall/shop/store/mapper/ShopStorePrinterLogMapper.class com/suisung/mall/shop/analytics/service/AnalyticsReturnService.class com/suisung/mall/shop/page/dto/PageMobileVo.class com/suisung/mall/shop/order/service/ShopOrderInvoiceService.class diff --git a/mall-shop/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/mall-shop/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 28e7119e..d5ee0159 100644 --- a/mall-shop/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/mall-shop/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -22,6 +22,7 @@ /Users/panjunjie/code/java-mall/mall-shop/src/main/java/com/suisung/mall/shop/components/quartz/job/UpdateOrderStatusJob.java /Users/panjunjie/code/java-mall/mall-shop/src/main/java/com/suisung/mall/shop/product/mapper/ShopProductCommentMapper.java /Users/panjunjie/code/java-mall/mall-shop/src/main/java/com/suisung/mall/shop/distribution/service/ShopDistributionStoreDirectsellerProductService.java +/Users/panjunjie/code/java-mall/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterLogServiceImpl.java /Users/panjunjie/code/java-mall/mall-shop/src/main/java/com/suisung/mall/shop/plantform/mapper/ShopPlantformActivityMapper.java /Users/panjunjie/code/java-mall/mall-shop/src/main/java/com/suisung/mall/shop/analytics/mapper/AnalyticsStoreDao.java /Users/panjunjie/code/java-mall/mall-shop/src/main/java/com/suisung/mall/shop/distribution/service/ShopDistributionPlantformUserService.java @@ -39,10 +40,12 @@ /Users/panjunjie/code/java-mall/mall-shop/src/main/java/com/suisung/mall/shop/distribution/service/impl/ShopDistributionUserWithdrawServiceImpl.java /Users/panjunjie/code/java-mall/mall-shop/src/main/java/com/suisung/mall/shop/components/poster/annotation/PosterImageCss.java /Users/panjunjie/code/java-mall/mall-shop/src/main/java/com/suisung/mall/shop/product/controller/admin/ShopProductPricingPolicyController.java +/Users/panjunjie/code/java-mall/mall-shop/src/main/java/com/suisung/mall/shop/store/mapper/ShopStorePrinterLogMapper.java /Users/panjunjie/code/java-mall/mall-shop/src/main/java/com/suisung/mall/shop/components/quartz/job/StoreValidTimeJod.java /Users/panjunjie/code/java-mall/mall-shop/src/main/java/com/suisung/mall/shop/hall/service/impl/HallPurchaseOrderBaseServiceImpl.java /Users/panjunjie/code/java-mall/mall-shop/src/main/java/com/suisung/mall/shop/distribution/controller/admin/ShopDistributionUserOrderController.java /Users/panjunjie/code/java-mall/mall-shop/src/main/java/com/suisung/mall/shop/user/mapper/ShopUserVoucherMapper.java +/Users/panjunjie/code/java-mall/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStorePrinterLogService.java /Users/panjunjie/code/java-mall/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStorePrinterTemplateController.java /Users/panjunjie/code/java-mall/mall-shop/src/main/java/com/suisung/mall/shop/order/controller/admin/ShopOrderReturnController.java /Users/panjunjie/code/java-mall/mall-shop/src/main/java/com/suisung/mall/shop/city/mapper/CityPaotuiOrderInfoMapper.java diff --git a/mall-sns/target/classes/bootstrap.yml b/mall-sns/target/classes/bootstrap.yml index 1b925379..f4c050c3 100644 --- a/mall-sns/target/classes/bootstrap.yml +++ b/mall-sns/target/classes/bootstrap.yml @@ -1,6 +1,6 @@ spring: profiles: - active: local + active: prod application: name: mall-sns jackson: