修改测试案例
This commit is contained in:
parent
9b16614794
commit
d950b74fd7
@ -1,6 +1,6 @@
|
|||||||
spring:
|
spring:
|
||||||
profiles:
|
profiles:
|
||||||
active: local
|
active: prod
|
||||||
application:
|
application:
|
||||||
name: mall-account
|
name: mall-account
|
||||||
jackson:
|
jackson:
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
spring:
|
spring:
|
||||||
profiles:
|
profiles:
|
||||||
active: local
|
active: prod
|
||||||
application:
|
application:
|
||||||
name: mall-admin
|
name: mall-admin
|
||||||
jackson:
|
jackson:
|
||||||
|
|||||||
@ -2,13 +2,13 @@ spring:
|
|||||||
cloud:
|
cloud:
|
||||||
nacos:
|
nacos:
|
||||||
discovery:
|
discovery:
|
||||||
server-addr: 114.132.210.208:8848
|
server-addr: 172.16.0.11:8848
|
||||||
config:
|
config:
|
||||||
server-addr: 114.132.210.208:8848
|
server-addr: 172.16.0.11:8848
|
||||||
file-extension: yaml
|
file-extension: yaml
|
||||||
sentinel:
|
sentinel:
|
||||||
transport:
|
transport:
|
||||||
dashboard: 114.132.210.208:8718
|
dashboard: 172.16.0.11:8718
|
||||||
eager: true
|
eager: true
|
||||||
# 控制台日志信息
|
# 控制台日志信息
|
||||||
logging:
|
logging:
|
||||||
@ -25,4 +25,4 @@ logging:
|
|||||||
config: error
|
config: error
|
||||||
netflix: error
|
netflix: error
|
||||||
logstash:
|
logstash:
|
||||||
host: 114.132.210.208
|
host: 172.16.0.11
|
||||||
@ -2,13 +2,13 @@ spring:
|
|||||||
cloud:
|
cloud:
|
||||||
nacos:
|
nacos:
|
||||||
discovery:
|
discovery:
|
||||||
server-addr: 114.132.210.208:8848
|
server-addr: 172.16.0.11:8848
|
||||||
config:
|
config:
|
||||||
server-addr: 114.132.210.208:8848
|
server-addr: 172.16.0.11:8848
|
||||||
file-extension: yaml
|
file-extension: yaml
|
||||||
sentinel:
|
sentinel:
|
||||||
transport:
|
transport:
|
||||||
dashboard: 114.132.210.208:8718
|
dashboard: 172.16.0.11:8718
|
||||||
eager: true
|
eager: true
|
||||||
# 控制台日志信息
|
# 控制台日志信息
|
||||||
logging:
|
logging:
|
||||||
@ -25,4 +25,4 @@ logging:
|
|||||||
config: error
|
config: error
|
||||||
netflix: error
|
netflix: error
|
||||||
logstash:
|
logstash:
|
||||||
host: 114.132.210.208
|
host: 172.16.0.11
|
||||||
@ -2,13 +2,13 @@ spring:
|
|||||||
cloud:
|
cloud:
|
||||||
nacos:
|
nacos:
|
||||||
discovery:
|
discovery:
|
||||||
server-addr: 114.132.210.208:8848
|
server-addr: 172.16.0.11:8848
|
||||||
config:
|
config:
|
||||||
server-addr: 114.132.210.208:8848
|
server-addr: 172.16.0.11:8848
|
||||||
file-extension: yaml
|
file-extension: yaml
|
||||||
sentinel:
|
sentinel:
|
||||||
transport:
|
transport:
|
||||||
dashboard: 114.132.210.208:8718
|
dashboard: 172.16.0.11:8718
|
||||||
eager: true
|
eager: true
|
||||||
# 控制台日志信息
|
# 控制台日志信息
|
||||||
logging:
|
logging:
|
||||||
@ -25,4 +25,4 @@ logging:
|
|||||||
config: error
|
config: error
|
||||||
netflix: error
|
netflix: error
|
||||||
logstash:
|
logstash:
|
||||||
host: 114.132.210.208
|
host: 172.16.0.11
|
||||||
@ -2,13 +2,13 @@ spring:
|
|||||||
cloud:
|
cloud:
|
||||||
nacos:
|
nacos:
|
||||||
discovery:
|
discovery:
|
||||||
server-addr: 114.132.210.208:8848
|
server-addr: 172.16.0.11:8848
|
||||||
config:
|
config:
|
||||||
server-addr: 114.132.210.208:8848
|
server-addr: 172.16.0.11:8848
|
||||||
file-extension: yaml
|
file-extension: yaml
|
||||||
sentinel:
|
sentinel:
|
||||||
transport:
|
transport:
|
||||||
dashboard: 114.132.210.208:8718
|
dashboard: 172.16.0.11:8718
|
||||||
eager: true
|
eager: true
|
||||||
# 控制台日志信息
|
# 控制台日志信息
|
||||||
logging:
|
logging:
|
||||||
@ -25,4 +25,4 @@ logging:
|
|||||||
config: error
|
config: error
|
||||||
netflix: error
|
netflix: error
|
||||||
logstash:
|
logstash:
|
||||||
host: 114.132.210.208
|
host: 172.16.0.11
|
||||||
@ -2,13 +2,13 @@ spring:
|
|||||||
cloud:
|
cloud:
|
||||||
nacos:
|
nacos:
|
||||||
discovery:
|
discovery:
|
||||||
server-addr: 114.132.210.208:8848
|
server-addr: 172.16.0.11:8848
|
||||||
config:
|
config:
|
||||||
server-addr: 114.132.210.208:8848
|
server-addr: 172.16.0.11:8848
|
||||||
file-extension: yaml
|
file-extension: yaml
|
||||||
sentinel:
|
sentinel:
|
||||||
transport:
|
transport:
|
||||||
dashboard: 114.132.210.208:8718
|
dashboard: 172.16.0.11:8718
|
||||||
eager: true
|
eager: true
|
||||||
# 控制台日志信息
|
# 控制台日志信息
|
||||||
logging:
|
logging:
|
||||||
@ -25,4 +25,4 @@ logging:
|
|||||||
config: error
|
config: error
|
||||||
netflix: error
|
netflix: error
|
||||||
logstash:
|
logstash:
|
||||||
host: 114.132.210.208
|
host: 172.16.0.11
|
||||||
@ -1,6 +1,6 @@
|
|||||||
spring:
|
spring:
|
||||||
profiles:
|
profiles:
|
||||||
active: local
|
active: prod
|
||||||
application:
|
application:
|
||||||
name: mall-auth
|
name: mall-auth
|
||||||
jackson:
|
jackson:
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
spring:
|
spring:
|
||||||
profiles:
|
profiles:
|
||||||
active: local
|
active: prod
|
||||||
application:
|
application:
|
||||||
name: mall-cms
|
name: mall-cms
|
||||||
jackson:
|
jackson:
|
||||||
|
|||||||
@ -127,6 +127,7 @@ com/suisung/mall/common/utils/StringUtils$RandomType.class
|
|||||||
com/suisung/mall/common/modules/edu/EduUserPaperInfo.class
|
com/suisung/mall/common/modules/edu/EduUserPaperInfo.class
|
||||||
com/suisung/mall/common/utils/JChardetFacadeUtil$nsEUCStatistics.class
|
com/suisung/mall/common/utils/JChardetFacadeUtil$nsEUCStatistics.class
|
||||||
com/suisung/mall/common/pojo/vo/TradeAmountVo.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/user/ShopUserPointsHistory.class
|
||||||
com/suisung/mall/common/modules/order/ShopOrderStateLog.class
|
com/suisung/mall/common/modules/order/ShopOrderStateLog.class
|
||||||
com/suisung/mall/common/modules/sns/SnsStoryComment.class
|
com/suisung/mall/common/modules/sns/SnsStoryComment.class
|
||||||
|
|||||||
@ -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/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/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/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/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/modules/edu/EduCourseCategory.java
|
||||||
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/api/ResultCode.java
|
/Users/panjunjie/code/java-mall/mall-common/src/main/java/com/suisung/mall/common/api/ResultCode.java
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
spring:
|
spring:
|
||||||
profiles:
|
profiles:
|
||||||
active: local
|
active: prod
|
||||||
application:
|
application:
|
||||||
name: mall-gateway
|
name: mall-gateway
|
||||||
jackson:
|
jackson:
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
spring:
|
spring:
|
||||||
profiles:
|
profiles:
|
||||||
active: local
|
active: prod
|
||||||
application:
|
application:
|
||||||
name: mall-im
|
name: mall-im
|
||||||
jackson:
|
jackson:
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
spring:
|
spring:
|
||||||
profiles:
|
profiles:
|
||||||
active: local
|
active: prod
|
||||||
application:
|
application:
|
||||||
name: mall-pay
|
name: mall-pay
|
||||||
jackson:
|
jackson:
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
spring:
|
spring:
|
||||||
profiles:
|
profiles:
|
||||||
active: local
|
active: prod
|
||||||
application:
|
application:
|
||||||
name: mall-search
|
name: mall-search
|
||||||
jackson:
|
jackson:
|
||||||
|
|||||||
@ -365,14 +365,6 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl<ShopStorePrinte
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 特殊处理,订单商品详情,由于有逻辑判断,无法模版化,所以直接生成模版的字符串
|
|
||||||
// String order_items_tmpl = feieUtil.genProductStr((List<ShopStoreOrderProductPrintVO>) 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);
|
String printContent = FreeMakerUtils.processTemplate(template.getTemplate_name(), template.getTemplate_value(), binding);
|
||||||
if (StrUtil.isBlank(printContent)) {
|
if (StrUtil.isBlank(printContent)) {
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
spring:
|
spring:
|
||||||
profiles:
|
profiles:
|
||||||
active: local
|
active: prod
|
||||||
application:
|
application:
|
||||||
name: mall-shop
|
name: mall-shop
|
||||||
jackson:
|
jackson:
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@ -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/page/controller/mobile/UploadController.class
|
||||||
com/suisung/mall/shop/order/vo/OrdeListVo.class
|
com/suisung/mall/shop/order/vo/OrdeListVo.class
|
||||||
com/suisung/mall/shop/base/controller/admin/ShopBaseMarketCategoryController.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/page/dto/PageBaseListReq.class
|
||||||
com/suisung/mall/shop/order/mapper/ShopOrderUserFormMapper.class
|
com/suisung/mall/shop/order/mapper/ShopOrderUserFormMapper.class
|
||||||
com/suisung/mall/shop/base/service/impl/ShopBaseDistrictServiceImpl.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/wechat/controller/ShopWechatKeywordController.class
|
||||||
com/suisung/mall/shop/components/quartz/job/UpdateProductStatusJob.class
|
com/suisung/mall/shop/components/quartz/job/UpdateProductStatusJob.class
|
||||||
com/suisung/mall/shop/store/controller/admin/ShopStorePrinterTemplateController.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/store/mapper/ShopStoreEmployeeRightsBaseMapper.class
|
||||||
com/suisung/mall/shop/hall/service/HallPurchaseOrderBaseService.class
|
com/suisung/mall/shop/hall/service/HallPurchaseOrderBaseService.class
|
||||||
com/suisung/mall/shop/analytics/mapper/ShopUserBaseMapper.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/impl/ShopUserFavoritesStoreServiceImpl.class
|
||||||
com/suisung/mall/shop/user/service/ShopUserSearchHistoryService.class
|
com/suisung/mall/shop/user/service/ShopUserSearchHistoryService.class
|
||||||
com/suisung/mall/shop/plantform/service/ShopPlantformSubsiteUserService.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/analytics/service/AnalyticsReturnService.class
|
||||||
com/suisung/mall/shop/page/dto/PageMobileVo.class
|
com/suisung/mall/shop/page/dto/PageMobileVo.class
|
||||||
com/suisung/mall/shop/order/service/ShopOrderInvoiceService.class
|
com/suisung/mall/shop/order/service/ShopOrderInvoiceService.class
|
||||||
|
|||||||
@ -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/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/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/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/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/analytics/mapper/AnalyticsStoreDao.java
|
||||||
/Users/panjunjie/code/java-mall/mall-shop/src/main/java/com/suisung/mall/shop/distribution/service/ShopDistributionPlantformUserService.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/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/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/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/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/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/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/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/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/order/controller/admin/ShopOrderReturnController.java
|
||||||
/Users/panjunjie/code/java-mall/mall-shop/src/main/java/com/suisung/mall/shop/city/mapper/CityPaotuiOrderInfoMapper.java
|
/Users/panjunjie/code/java-mall/mall-shop/src/main/java/com/suisung/mall/shop/city/mapper/CityPaotuiOrderInfoMapper.java
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
spring:
|
spring:
|
||||||
profiles:
|
profiles:
|
||||||
active: local
|
active: prod
|
||||||
application:
|
application:
|
||||||
name: mall-sns
|
name: mall-sns
|
||||||
jackson:
|
jackson:
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user