Skip to content

G
gogirl-miniapp-backend
Commit 2cb917dd by huluobin
Options

update

parent 076069ca
Showing with 289 additions and 122 deletions
SyncGogirlProd.sql 0 → 100644
ALTER TABLE `bailun_gogirl`.`base_produce` ADD COLUMN `sales_num` int(11) NULL DEFAULT NULL COMMENT '销量' AFTER `produce_label_id`;
ALTER TABLE `bailun_gogirl`.`base_produce` ADD COLUMN `serve_type_id` int(11) NULL DEFAULT NULL COMMENT '服务类型id' AFTER `sales_num`;
ALTER TABLE `bailun_gogirl`.`career` ADD COLUMN `tech_score` int(21) NOT NULL DEFAULT 0 AFTER `total_serve_num`;
ALTER TABLE `bailun_gogirl`.`career_works` MODIFY COLUMN `id` bigint(20) NOT NULL FIRST;
ALTER TABLE `bailun_gogirl`.`career_works` MODIFY COLUMN `id` bigint(20) NOT NULL AUTO_INCREMENT;
ALTER TABLE `bailun_gogirl`.`career_works_images` MODIFY COLUMN `id` bigint(20) NOT NULL FIRST;
ALTER TABLE `bailun_gogirl`.`career_works_images` MODIFY COLUMN `id` bigint(20) NOT NULL AUTO_INCREMENT;
ALTER TABLE `bailun_gogirl`.`coupon_customer_relevance` MODIFY COLUMN `state` int(11) NOT NULL COMMENT '该优惠券使用状态1.正常,2.已使用,3.已过期' AFTER `coupon_id`;
ALTER TABLE `bailun_gogirl`.`coupon_customer_relevance` MODIFY COLUMN `discount_amount` decimal(19, 0) NULL DEFAULT NULL AFTER `coupon_name`;
ALTER TABLE `bailun_gogirl`.`coupon_customer_relevance` MODIFY COLUMN `pay_amount` decimal(19, 0) NULL DEFAULT NULL AFTER `order_id`;
ALTER TABLE `bailun_gogirl`.`coupon_customer_relevance` MODIFY COLUMN `reaching_amount` decimal(19, 0) NULL DEFAULT NULL AFTER `pay_amount`;
ALTER TABLE `bailun_gogirl`.`coupon_customer_relevance` MODIFY COLUMN `is_calc_achievement` int(11) NOT NULL DEFAULT 0 AFTER `type`;
ALTER TABLE `bailun_gogirl`.`coupon_order_relevance` ADD COLUMN `serve_name` varchar(255) NULL DEFAULT NULL COMMENT '服务名称' AFTER `pay_for_order_serve`;
ALTER TABLE `bailun_gogirl`.`coupon_order_relevance` ADD COLUMN `coupon_name` varchar(255) NULL DEFAULT NULL COMMENT '卡券名称' AFTER `serve_name`;
ALTER TABLE `bailun_gogirl`.`coupon_order_relevance` ADD COLUMN `achievement` decimal(11, 2) NULL DEFAULT NULL AFTER `coupon_name`;
ALTER TABLE `bailun_gogirl`.`customer_message` MODIFY COLUMN `id` bigint(20) NOT NULL FIRST;
ALTER TABLE `bailun_gogirl`.`customer_message` MODIFY COLUMN `id` bigint(20) NOT NULL AUTO_INCREMENT;
ALTER TABLE `bailun_gogirl`.`features_mapping` ADD INDEX `features_id`(`features_id`) USING BTREE;
ALTER TABLE `bailun_gogirl`.`gogirl_token` ADD COLUMN `technician_id` int(11) NULL DEFAULT NULL COMMENT '美甲师id' AFTER `phone`;
ALTER TABLE `bailun_gogirl`.`gogirl_token` ADD COLUMN `department_id` int(11) NULL DEFAULT NULL COMMENT '店铺id' AFTER `technician_id`;
ALTER TABLE `bailun_gogirl`.`history_order_manage` DROP COLUMN `is_send_comment_msg`;
ALTER TABLE `bailun_gogirl`.`history_order_manage` DROP COLUMN `pay_time`;
ALTER TABLE `bailun_gogirl`.`history_order_serve` DROP COLUMN `service_duration`;
ALTER TABLE `bailun_gogirl`.`mall_product` MODIFY COLUMN `is_bargain_price` int(4) NOT NULL DEFAULT 2 COMMENT '是否开启特价1-是 2-否' AFTER `bargain_price`;
ALTER TABLE `bailun_gogirl`.`message` MODIFY COLUMN `param_json` varchar(2000) NULL DEFAULT NULL AFTER `content`;
ALTER TABLE `bailun_gogirl`.`order_comment` DROP INDEX `order_serve_id`;
ALTER TABLE `bailun_gogirl`.`order_comment` ADD INDEX `order_serve_id`(`order_serve_id`) USING BTREE;
ALTER TABLE `bailun_gogirl`.`order_comment_label` ADD COLUMN `serve_type_id` int(11) NULL DEFAULT NULL COMMENT '标签分类id 0=common' AFTER `update_user`;
ALTER TABLE `bailun_gogirl`.`order_manage` MODIFY COLUMN `is_send_comment_msg` int(11) NOT NULL DEFAULT 0 AFTER `card_amount`;
ALTER TABLE `bailun_gogirl`.`order_serve` DROP COLUMN `leisure_discount_price`;
ALTER TABLE `bailun_gogirl`.`order_serve` ADD COLUMN `serve_type_id` int(11) NULL DEFAULT NULL COMMENT '服务分类id' AFTER `leisure_discount_config_id`;
ALTER TABLE `bailun_gogirl`.`order_serve` ADD COLUMN `serve_duration` int(11) NULL DEFAULT NULL COMMENT '服务配置时长' AFTER `serve_type_id`;
ALTER TABLE `bailun_gogirl`.`order_serve` ADD COLUMN `bind_coupon` int(11) NULL DEFAULT NULL AFTER `service_duration`;
ALTER TABLE `bailun_gogirl`.`order_serve` ADD COLUMN `produce_promotion_time_id` int(11) NULL DEFAULT NULL COMMENT '活动配置id' AFTER `bind_coupon`;
ALTER TABLE `bailun_gogirl`.`order_serve` ADD COLUMN `promotion_price` decimal(10, 2) NULL DEFAULT NULL COMMENT '活动价格' AFTER `produce_promotion_time_id`;
ALTER TABLE `bailun_gogirl`.`order_serve` ADD COLUMN `discount_rate` decimal(11, 2) NULL DEFAULT NULL AFTER `promotion_price`;
ALTER TABLE `bailun_gogirl`.`order_serve` ADD COLUMN `leisure_price` decimal(10, 2) NULL DEFAULT NULL AFTER `discount_rate`;
ALTER TABLE `bailun_gogirl`.`order_serve` ADD COLUMN `bind_inner_coupon` int(11) NOT NULL DEFAULT 2 AFTER `leisure_price`;
ALTER TABLE `bailun_gogirl`.`order_serve` ADD COLUMN `bind_outer_coupon` int(11) NOT NULL DEFAULT 2 AFTER `bind_inner_coupon`;
ALTER TABLE `bailun_gogirl`.`order_serve` ADD COLUMN `bind_times_card` int(11) NOT NULL DEFAULT 2 AFTER `bind_outer_coupon`;
ALTER TABLE `bailun_gogirl`.`over_time_record` MODIFY COLUMN `id` bigint(20) NOT NULL FIRST;
ALTER TABLE `bailun_gogirl`.`over_time_record` MODIFY COLUMN `id` bigint(20) NOT NULL AUTO_INCREMENT;
ALTER TABLE `bailun_gogirl`.`over_time_record_log` MODIFY COLUMN `id` bigint(20) NOT NULL FIRST;
ALTER TABLE `bailun_gogirl`.`over_time_record_log` MODIFY COLUMN `id` bigint(20) NOT NULL AUTO_INCREMENT;
ALTER TABLE `bailun_gogirl`.`scheduled_manage` ADD INDEX `order_id`(`order_id`) USING BTREE;
ALTER TABLE `bailun_gogirl`.`scheduled_serve` MODIFY COLUMN `produce_bargain_price` decimal(19, 2) NULL DEFAULT NULL COMMENT '款式原价' AFTER `price`;
ALTER TABLE `bailun_gogirl`.`scheduled_serve` MODIFY COLUMN `produce_current_price` decimal(19, 2) NULL DEFAULT NULL COMMENT '款式现价' AFTER `produce_bargain_price`;
ALTER TABLE `bailun_gogirl`.`scheduled_serve` MODIFY COLUMN `produce_picture_path` varchar(2000) NULL DEFAULT NULL COMMENT '款式图片' AFTER `produce_current_price`;
ALTER TABLE `bailun_gogirl`.`scheduled_serve` MODIFY COLUMN `serve_name` varchar(255) NULL DEFAULT NULL COMMENT '服务名称' AFTER `produce_picture_path`;
ALTER TABLE `bailun_gogirl`.`scheduled_serve` MODIFY COLUMN `serve_picture_path` varchar(2000) NULL DEFAULT NULL COMMENT '服务图片' AFTER `serve_name`;
ALTER TABLE `bailun_gogirl`.`scheduled_serve` MODIFY COLUMN `serve_price` decimal(19, 2) NULL DEFAULT NULL COMMENT '服务价格base_serve.price' AFTER `serve_picture_path`;
ALTER TABLE `bailun_gogirl`.`scheduled_serve` MODIFY COLUMN `serve_type` varchar(255) NULL DEFAULT NULL COMMENT '服务类型' AFTER `serve_price`;
ALTER TABLE `bailun_gogirl`.`scheduled_serve` MODIFY COLUMN `discount_rate` decimal(11, 1) NULL DEFAULT NULL COMMENT '闲时折扣率' AFTER `technician_name`;
ALTER TABLE `bailun_gogirl`.`scheduled_serve` MODIFY COLUMN `actual_start_time` datetime(0) NULL DEFAULT NULL COMMENT '实际开始时间' AFTER `leisure_discount_config_id`;
ALTER TABLE `bailun_gogirl`.`scheduled_serve` MODIFY COLUMN `actual_end_time` datetime(0) NULL DEFAULT NULL COMMENT '实际结束时间' AFTER `actual_start_time`;
ALTER TABLE `bailun_gogirl`.`scheduled_serve` ADD COLUMN `promotion_price` decimal(10, 2) NULL DEFAULT NULL COMMENT '活动特价' AFTER `status`;
ALTER TABLE `bailun_gogirl`.`scheduled_serve` ADD COLUMN `produce_promotion_time_id` int(20) NULL DEFAULT NULL COMMENT '活动id' AFTER `promotion_price`;
ALTER TABLE `bailun_gogirl`.`scheduled_serve` ADD COLUMN `leisure_price` decimal(10, 2) NULL DEFAULT NULL AFTER `produce_promotion_time_id`;
ALTER TABLE `bailun_gogirl`.`store_technician` ADD COLUMN `jobs` varchar(255) NULL DEFAULT NULL COMMENT '岗位职责' AFTER `operate_user_id`;
ALTER TABLE `bailun_gogirl`.`take_leave_event` MODIFY COLUMN `id` bigint(20) NOT NULL FIRST;
ALTER TABLE `bailun_gogirl`.`take_leave_event` MODIFY COLUMN `id` bigint(20) NOT NULL AUTO_INCREMENT;
ALTER TABLE `bailun_gogirl`.`tech_score_rules` MODIFY COLUMN `id` int(11) NOT NULL FIRST;
ALTER TABLE `bailun_gogirl`.`tech_score_rules` ADD PRIMARY KEY (`id`) USING BTREE;
ALTER TABLE `bailun_gogirl`.`tech_score_rules` MODIFY COLUMN `id` int(11) NOT NULL AUTO_INCREMENT;
ALTER TABLE `bailun_gogirl`.`times_card_order_serve_detail` ADD COLUMN `order_id` int(11) NULL DEFAULT NULL AFTER `times_card_user_record_id`;
ALTER TABLE `bailun_gogirl`.`times_card_order_serve_detail` ADD COLUMN `achievement` decimal(11, 2) NULL DEFAULT NULL AFTER `order_id`;
ALTER TABLE `bailun_gogirl`.`times_card_used_record` ADD COLUMN `actual_discount_amount` decimal(11, 2) NULL DEFAULT NULL AFTER `technician_name`;
CREATE TABLE `bailun_gogirl`.`color_system_type` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(255) NULL DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE
);
CREATE TABLE `bailun_gogirl`.`time_node` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`time_node` time(0) NULL DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE
);
CREATE TABLE `bailun_gogirl`.`week_config` (
`id` int(19) NOT NULL AUTO_INCREMENT,
`week` int(11) NULL DEFAULT NULL COMMENT '周几',
`week_date` date NULL DEFAULT NULL COMMENT '这个周几是几号',
`week_str` varchar(255) NULL DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE
);
\ No newline at end of file
src/main/java/com/gogirl/infrastructure/schedule/Schedule.java
......@@ -539,11 +539,15 @@ public class Schedule {
orderManageList.forEach(orderManage -> {
try {
Customer customer = customerService.getById(orderManage.getOrderUser());
subscribeService.testPaper(customer.getOpenid1(), orderManage.getId());
orderManage.setIsSendCommentMsg(1);
orderManageMapper.updateById(orderManage);
} catch (Exception e) {
log.error("推送失败 订单id：{}", orderManage.getId());
}
});
log.info("评价提醒推送");
}
......
src/main/resources/application-dev.yml
# 微信小程序相关配置
wechat:
#公众号
mp-app-id: wx29745c13ddde71aa
mp-secret: c4ce4651cdd50057e7a168e3239e6378
mp-app-id: wx7d344dc5ffd20745
mp-secret: 71fbda40bff334fcce4aca284f788821
#用户端小程序
customer-mini-app-id: wxd5e3224465422206
customer-mini-secret: 92e9030129889dbafcb5a41e0eba7393
customer-mini-app-id: wx058b46db3cd0e979
customer-mini-secret: 7f4d1707caf9abaaf0b37aa03e6674f3
#美甲师小程序
store-mini-app-id: wxa380df91bda2b909
store-mini-secret: ce0074f095049791d3c4879cc604fc33
store-mini-app-id: wxdfa614160f40492d
store-mini-secret: cee8748c023b1b97859a047e95ebf14c
# 预约提醒订阅消息模板id
schedule-tpl: tnGwUDcjbF9sj60btEsdrEBUHhNhIfww3AR9Qmtc0Hg
schedule-tpl: pVbpuB_ZpZ_yE3UPdFHBLZv56erGxekapyiudyi-cYI
# 预约过期订阅消息模板id
over-schedule-tpl: aVUjDB2E6jrU2io_dpVs9FqZnOWElsRTyFrQy6UPSsk
over-schedule-tpl: z-HSJIJxFX1FxB8PDowCICkoRdsmzEBdgYKckIhwxFA
# 支付成功订阅消息模板id
pay-success-tpl: 8-HIDcPpgDfbmBYPd1Z9yTUXwJm3Ogn6ApWTRHAzVpM
pay-success-tpl: 8-wrvS6YmUTmFqw8N-aS7MO86EbaELQOaVQbcBpUSpbyI
# 订单支付订阅消息模板id
order-pay-notify-tpl: s-8lqwTRQSDo_O8t_rYIVt9GNpU_bDuySSE2NU5e10A
order-pay-notify-tpl: s-uzlPNEsfaMeILjpDcM7Xxuo-SaYwvOoxS8QRq-DMVzE
# 预约提醒订阅店铺消息模板id
shop-schedule-tpl: mk75H3St_zEs5Cy5llC2bVyfnQX8T0HWy5r3i1ExNXQ
shop-schedule-tpl: ZONkV2BTzD-TjqK0M5QDQCRdkcmODs9j5DyxKZAAvXw
# 预约过期订阅店铺消息模板id
shop-over-schedule-tpl: g-H8tAAqU3f8YdJzvU7G-fShqIwaytrWZA9gOr4QmnA
shop-over-schedule-tpl: xk-r4XxtbZAKLLpBFsfhyjVTTNIgGmwjLhnINsvSAMw
# 取消预约店铺提醒
shop-cancel-schedule-tpl: EyvDd0EwLHPQb9JyAd9607mZu23HaIcgOCCtSxsAyqM
#
test-paper-tpl: 77cxQdb-U8VgqHSZrXK1wHK0YLMXAypqqYlwLeUy0vo
shop-cancel-schedule-tpl: Llf2ZQc910gdtJvjgpRm9zQDrqqYweMYg_yZtypYaFc
#提醒评论模板消息
test-paper-tpl: 2UUgED4B_n73HeXN9XkF1QbGCzO0Ik4VzjjQ6hUsHg0
spring:
#微服务名称
# 微服务名称
application:
name: gogirl-wxapp-member-backend
#数据源配置
name: gogirl-miniapp-backend
# 数据配置
datasource:
url: jdbc:mysql://gz-cdb-c0sq6eax.sql.tencentcdb.com:60779/gogirl_pre?useUnicode=true&characterEncoding=utf-8&useSSL=false&&zeroDateTimeBehavior=convertToNull
# url: jdbc:mysql://localhost:3306/gogril_dev?useUnicode=true&characterEncoding=utf-8&useSSL=false&&zeroDateTimeBehavior=convertToNull
# url: jdbc:mysql://10.0.0.9:3306/bailun_gogirl?useUnicode=true&characterEncoding=utf-8&useSSL=false&&zeroDateTimeBehavior=convertToNull
url: jdbc:mysql://127.0.0.1:3306/gogirl_dev?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull
username: root
# password: "123456"
password: "#7kfnymAM$Y9-Ntf"
password: "123456"
driver-class-name: com.mysql.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
......@@ -55,37 +54,37 @@ spring:
min-idle: 0
timeout: 2000ms
#项目属性
gogirl:
#充值回调地址
notify-charge: "http://t.begogirls.com/customer/pay/notifyCharge"
notify-charge: "http://www.begogirls.com/customer/pay/notifyCharge"
#次卡购买回调地址
notify-timescard: "http://t.begogirls.com/customer/pay/notifyTimesCard"
notify-timescard: "http://www.begogirls.com/customer/pay/notifyTimesCard"
#预约订单支付回调地址
notify-order: "http://t.begogirls.com/customer/pay/notifyOrder"
notify-order: "http://www.begogirls.com/customer/pay/notifyOrder"
#商城订单支付回调
notify-mall-order: "http://t.begogirls.com/customer/mallOrderPay/notifyMallOrder"
notify-mall-order: "http://www.begogirls.com/customer/mallOrderPay/notifyMallOrder"
#商城退款订单回调
notify-refund-mall-order: "http://t.begogirls.com/customer/mallOrderPay/notifyRefundMallOrder"
notify-balance-wx-pay: "http://t.begogirls.com/customer/pay/notifyBalanceWxPay"
notify-refund-mall-order: "http://www.begogirls.com/customer/mallOrderPay/notifyRefundMallOrder"
#微信余额支付回调接口
notify-balance-wx-pay: "http://wwww.begogirls.com/customer/pay/notifyBalanceWxPay"
#服务器图片临时地址
picture-path: /Users/huluobin/upload/pictures/
picture-path: /upload/grouppic/
end-time: "22:00:00"
#
start-time: "10:00:00"
#评论延迟时间
test-paper-time: 1
server:
port: 5444
#用户微信支付商户配置
wx:
pay:
appId: wxd5e3224465422206
mchId: 1516547781
appId: wx058b46db3cd0e979
mchId: 1515628551
mchKey: gogirl2018gogirl2018gogirl2018go
keyPath: "/Users/huluobin/cert/1516547781_20191226_cert/apiclient_cert.p12"
\ No newline at end of file
keyPath: "/usr/local/src/gogirl/gogirl-payment/apiclient_cert.p12"
server:
port: 5444
\ No newline at end of file
src/main/resources/application-pre.yml
# 微信小程序相关配置
wechat:
#公众号
mp-app-id: wx29745c13ddde71aa
mp-secret: c4ce4651cdd50057e7a168e3239e6378
mp-app-id: wx7d344dc5ffd20745
mp-secret: 71fbda40bff334fcce4aca284f788821
#用户端小程序
customer-mini-app-id: wxd5e3224465422206
customer-mini-secret: 92e9030129889dbafcb5a41e0eba7393
customer-mini-app-id: wx058b46db3cd0e979
customer-mini-secret: 7f4d1707caf9abaaf0b37aa03e6674f3
#美甲师小程序
store-mini-app-id: wxa380df91bda2b909
store-mini-secret: ce0074f095049791d3c4879cc604fc33
store-mini-app-id: wxdfa614160f40492d
store-mini-secret: cee8748c023b1b97859a047e95ebf14c
# 预约提醒订阅消息模板id
schedule-tpl: tnGwUDcjbF9sj60btEsdrEBUHhNhIfww3AR9Qmtc0Hg
schedule-tpl: pVbpuB_ZpZ_yE3UPdFHBLZv56erGxekapyiudyi-cYI
# 预约过期订阅消息模板id
over-schedule-tpl: aVUjDB2E6jrU2io_dpVs9FqZnOWElsRTyFrQy6UPSsk
over-schedule-tpl: z-HSJIJxFX1FxB8PDowCICkoRdsmzEBdgYKckIhwxFA
# 支付成功订阅消息模板id
pay-success-tpl: 8-HIDcPpgDfbmBYPd1Z9yTUXwJm3Ogn6ApWTRHAzVpM
pay-success-tpl: 8-wrvS6YmUTmFqw8N-aS7MO86EbaELQOaVQbcBpUSpbyI
# 订单支付订阅消息模板id
order-pay-notify-tpl: s-8lqwTRQSDo_O8t_rYIVt9GNpU_bDuySSE2NU5e10A
order-pay-notify-tpl: s-uzlPNEsfaMeILjpDcM7Xxuo-SaYwvOoxS8QRq-DMVzE
# 预约提醒订阅店铺消息模板id
shop-schedule-tpl: mk75H3St_zEs5Cy5llC2bVyfnQX8T0HWy5r3i1ExNXQ
shop-schedule-tpl: ZONkV2BTzD-TjqK0M5QDQCRdkcmODs9j5DyxKZAAvXw
# 预约过期订阅店铺消息模板id
shop-over-schedule-tpl: g-H8tAAqU3f8YdJzvU7G-fShqIwaytrWZA9gOr4QmnA
shop-over-schedule-tpl: xk-r4XxtbZAKLLpBFsfhyjVTTNIgGmwjLhnINsvSAMw
# 取消预约店铺提醒
shop-cancel-schedule-tpl: EyvDd0EwLHPQb9JyAd9607mZu23HaIcgOCCtSxsAyqM
#
test-paper-tpl: 77cxQdb-U8VgqHSZrXK1wHK0YLMXAypqqYlwLeUy0vo
shop-cancel-schedule-tpl: Llf2ZQc910gdtJvjgpRm9zQDrqqYweMYg_yZtypYaFc
#提醒评论模板消息
test-paper-tpl: 2UUgED4B_n73HeXN9XkF1QbGCzO0Ik4VzjjQ6hUsHg0
spring:
#微服务名称
# 微服务名称
application:
name: gogirl-wxapp-member-backend
#数据配置
name: gogirl-miniapp-backend
# 数据配置
datasource:
url: jdbc:mysql://10.0.0.9:3306/gogirl_pre?useUnicode=true&characterEncoding=utf-8&useSSL=false&&zeroDateTimeBehavior=convertToNull
# url: jdbc:mysql://gz-cdb-c0sq6eax.sql.tencentcdb.com:60779/gogirl_pre?useUnicode=true&characterEncoding=utf-8&useSSL=false&&zeroDateTimeBehavior=convertToNull
# url: jdbc:mysql://10.0.0.9:3306/bailun_gogirl?useUnicode=true&characterEncoding=utf-8&useSSL=false&&zeroDateTimeBehavior=convertToNull
url: jdbc:mysql://gz-cdb-c0sq6eax.sql.tencentcdb.com:60779/gogirl_pre?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull
username: root
password: "#7kfnymAM$Y9-Ntf"
driver-class-name: com.mysql.jdbc.Driver
......@@ -57,17 +58,17 @@ spring:
#项目属性
gogirl:
#充值回调地址
notify-charge: "http://t.begogirls.com/customer/pay/notifyCharge"
notify-charge: "http://www.begogirls.com/customer/pay/notifyCharge"
#次卡购买回调地址
notify-timescard: "http://t.begogirls.com/customer/pay/notifyTimesCard"
notify-timescard: "http://www.begogirls.com/customer/pay/notifyTimesCard"
#预约订单支付回调地址
notify-order: "http://t.begogirls.com/customer/pay/notifyOrder"
notify-order: "http://www.begogirls.com/customer/pay/notifyOrder"
#商城订单支付回调
notify-mall-order: "http://t.begogirls.com/customer/mallOrderPay/notifyMallOrder"
notify-mall-order: "http://www.begogirls.com/customer/mallOrderPay/notifyMallOrder"
#商城退款订单回调
notify-refund-mall-order: "http://t.begogirls.com/customer/mallOrderPay/notifyRefundMallOrder"
notify-balance-wx-pay: "http://t.begogirls.com/customer/pay/notifyBalanceWxPay"
notify-refund-mall-order: "http://www.begogirls.com/customer/mallOrderPay/notifyRefundMallOrder"
#微信余额支付回调接口
notify-balance-wx-pay: "http://wwww.begogirls.com/customer/pay/notifyBalanceWxPay"
#服务器图片临时地址
picture-path: /upload/grouppic/
......@@ -78,10 +79,10 @@ gogirl:
test-paper-time: 1
wx:
pay:
appId: wxd5e3224465422206
mchId: 1516547781
appId: wx058b46db3cd0e979
mchId: 1515628551
mchKey: gogirl2018gogirl2018gogirl2018go
keyPath: "/Users/huluobin/cert/1516547781_20191226_cert/apiclient_cert.p12"
keyPath: "/usr/local/src/gogirl/gogirl-payment/apiclient_cert.p12"
server:
port: 5444
\ No newline at end of file
src/main/resources/application-prod.yml
......@@ -25,17 +25,17 @@ wechat:
shop-over-schedule-tpl: xk-r4XxtbZAKLLpBFsfhyjVTTNIgGmwjLhnINsvSAMw
# 取消预约店铺提醒
shop-cancel-schedule-tpl: Llf2ZQc910gdtJvjgpRm9zQDrqqYweMYg_yZtypYaFc
#提醒评论模板消息
test-paper-tpl: 2UUgED4B_n73HeXN9XkF1QbGCzO0Ik4VzjjQ6hUsHg0
spring:
# 微服务名称
application:
name: gogirl-wxapp-member-backend
name: gogirl-miniapp-backend
# 数据配置
datasource:
# url: jdbc:mysql://10.0.0.9:3306/bailun_gogirl?useUnicode=true&characterEncoding=utf-8&useSSL=false&&zeroDateTimeBehavior=convertToNull
url: jdbc:mysql://gz-cdb-c0sq6eax.sql.tencentcdb.com:60779/gogirl_pre?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull
# url: jdbc:mysql://10.0.0.9:3306/bailun_gogirl?useUnicode=true&characterEncoding=utf-8&useSSL=false&&zeroDateTimeBehavior=convertToNull
url: jdbc:mysql://gz-cdb-c0sq6eax.sql.tencentcdb.com:60779/bailun_gogirl?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull
username: root
password: "#7kfnymAM$Y9-Ntf"
driver-class-name: com.mysql.jdbc.Driver
......@@ -55,7 +55,6 @@ spring:
timeout: 2000ms
#项目属性
gogirl:
#充值回调地址
......@@ -68,7 +67,7 @@ gogirl:
notify-mall-order: "http://www.begogirls.com/customer/mallOrderPay/notifyMallOrder"
#商城退款订单回调
notify-refund-mall-order: "http://www.begogirls.com/customer/mallOrderPay/notifyRefundMallOrder"
#
#微信余额支付回调接口
notify-balance-wx-pay: "http://wwww.begogirls.com/customer/pay/notifyBalanceWxPay"
#服务器图片临时地址
......@@ -76,22 +75,12 @@ gogirl:
end-time: "22:00:00"
start-time: "10:00:00"
#评论延迟时间
test-paper-time: 1
# 注册中心配置
eureka:
client:
service-url:
defaultZone: http://127.0.0.1:1111/eureka/
wx:
pay:
#用户端小程序正式appId
appId: wx058b46db3cd0e979
#用户端小程序正式
mchId: 1515628551
mchKey: gogirl2018gogirl2018gogirl2018go
keyPath: "/usr/local/src/gogirl/gogirl-payment/apiclient_cert.p12"
......
src/main/resources/application-test.yml
# 微信小程序相关配置
wechat:
#公众号
mp-app-id: wx29745c13ddde71aa
mp-secret: c4ce4651cdd50057e7a168e3239e6378
mp-app-id: wx7d344dc5ffd20745
mp-secret: 71fbda40bff334fcce4aca284f788821
#用户端小程序
customer-mini-app-id: wxd5e3224465422206
customer-mini-secret: 92e9030129889dbafcb5a41e0eba7393
customer-mini-app-id: wx058b46db3cd0e979
customer-mini-secret: 7f4d1707caf9abaaf0b37aa03e6674f3
#美甲师小程序
store-mini-app-id: wxa380df91bda2b909
store-mini-secret: ce0074f095049791d3c4879cc604fc33
store-mini-app-id: wxdfa614160f40492d
store-mini-secret: cee8748c023b1b97859a047e95ebf14c
# 预约提醒订阅消息模板id
schedule-tpl: tnGwUDcjbF9sj60btEsdrEBUHhNhIfww3AR9Qmtc0Hg
schedule-tpl: pVbpuB_ZpZ_yE3UPdFHBLZv56erGxekapyiudyi-cYI
# 预约过期订阅消息模板id
over-schedule-tpl: aVUjDB2E6jrU2io_dpVs9FqZnOWElsRTyFrQy6UPSsk
over-schedule-tpl: z-HSJIJxFX1FxB8PDowCICkoRdsmzEBdgYKckIhwxFA
# 支付成功订阅消息模板id
pay-success-tpl: 8-HIDcPpgDfbmBYPd1Z9yTUXwJm3Ogn6ApWTRHAzVpM
pay-success-tpl: 8-wrvS6YmUTmFqw8N-aS7MO86EbaELQOaVQbcBpUSpbyI
# 订单支付订阅消息模板id
order-pay-notify-tpl: s-8lqwTRQSDo_O8t_rYIVt9GNpU_bDuySSE2NU5e10A
order-pay-notify-tpl: s-uzlPNEsfaMeILjpDcM7Xxuo-SaYwvOoxS8QRq-DMVzE
# 预约提醒订阅店铺消息模板id
shop-schedule-tpl: mk75H3St_zEs5Cy5llC2bVyfnQX8T0HWy5r3i1ExNXQ
shop-schedule-tpl: ZONkV2BTzD-TjqK0M5QDQCRdkcmODs9j5DyxKZAAvXw
# 预约过期订阅店铺消息模板id
shop-over-schedule-tpl: g-H8tAAqU3f8YdJzvU7G-fShqIwaytrWZA9gOr4QmnA
shop-over-schedule-tpl: xk-r4XxtbZAKLLpBFsfhyjVTTNIgGmwjLhnINsvSAMw
# 取消预约店铺提醒
shop-cancel-schedule-tpl: EyvDd0EwLHPQb9JyAd9607mZu23HaIcgOCCtSxsAyqM
#
test-paper-tpl: 77cxQdb-U8VgqHSZrXK1wHK0YLMXAypqqYlwLeUy0vo
shop-cancel-schedule-tpl: Llf2ZQc910gdtJvjgpRm9zQDrqqYweMYg_yZtypYaFc
#提醒评论模板消息
test-paper-tpl: 2UUgED4B_n73HeXN9XkF1QbGCzO0Ik4VzjjQ6hUsHg0
spring:
#微服务名称
# 微服务名称
application:
name: gogirl-wxapp-member-backend
#数据配置
name: gogirl-miniapp-backend
# 数据配置
datasource:
url: jdbc:mysql://gz-cdb-c0sq6eax.sql.tencentcdb.com:60779/bailun_manicure?useUnicode=true&characterEncoding=utf-8&useSSL=false
# url: jdbc:mysql://10.0.0.9:3306/bailun_gogirl?useUnicode=true&characterEncoding=utf-8&useSSL=false&&zeroDateTimeBehavior=convertToNull
url: jdbc:mysql://gz-cdb-c0sq6eax.sql.tencentcdb.com:60779/gogirl_pre?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull
username: root
password: "#7kfnymAM$Y9-Ntf"
driver-class-name: com.mysql.jdbc.Driver
......@@ -44,31 +46,43 @@ spring:
host: 127.0.0.1
port: 6379
database: 0
lettuce:
pool:
max-active: 200
max-wait: -1ms
max-idle: 20
min-idle: 0
timeout: 2000ms
#项目属性
gogirl:
#充值回调地址
notify-charge: "http://t.begogirls.com/customer/pay/notifyCharge"
notify-charge: "http://www.begogirls.com/customer/pay/notifyCharge"
#次卡购买回调地址
notify-timescard: "http://t.begogirls.com/customer/pay/notifyTimesCard"
notify-timescard: "http://www.begogirls.com/customer/pay/notifyTimesCard"
#预约订单支付回调地址
notify-order: "http://t.begogirls.com/customer/pay/notifyOrder"
notify-order: "http://www.begogirls.com/customer/pay/notifyOrder"
#商城订单支付回调
notify-mall-order: "http://t.begogirls.com/customer/mallOrderPay/notifyMallOrder"
notify-mall-order: "http://www.begogirls.com/customer/mallOrderPay/notifyMallOrder"
#商城退款订单回调
notify-refund-mall-order: "http://t.begogirls.com/customer/mallOrderPay/notifyRefundMallOrder"
#微信余额支付回调
notify-balance-wx-pay: "http://t.begogirls.com/customer/pay/notifyBalanceWxPay"
notify-refund-mall-order: "http://www.begogirls.com/customer/mallOrderPay/notifyRefundMallOrder"
#微信余额支付回调接口
notify-balance-wx-pay: "http://wwww.begogirls.com/customer/pay/notifyBalanceWxPay"
#服务器图片临时地址
picture-path: /upload/grouppic/
#注册中心配置
eureka:
client:
service-url:
defaultZone: http://127.0.0.1:1111/eureka/
end-time: "22:00:00"
start-time: "10:00:00"
#评论延迟时间
test-paper-time: 1
wx:
pay:
appId: wx058b46db3cd0e979
mchId: 1515628551
mchKey: gogirl2018gogirl2018gogirl2018go
keyPath: "/usr/local/src/gogirl/gogirl-payment/apiclient_cert.p12"
server:
port: 8094
port: 5444
\ No newline at end of file
src/main/resources/application.yml
spring:
profiles:
active: prod
active: dev
servlet:
#文件上传最大容量
multipart:
......
src/test/java/com/gogirl/Test.java
......@@ -35,7 +35,7 @@ public class Test {
private TimeNodeMapper timeNodeMapper;
@org.junit.Test
public void test() throws ParseException {
public void timeNode() throws ParseException {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
LocalTime localTime = LocalTime.of(0, 0);
LocalTime localTime2 = LocalTime.of(23, 45);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment