From fba9665d6ee022f58dbad9522d4d610762357b15 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Fri, 3 Feb 2023 11:53:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4diam?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hai-order/src/main/resources/prod/application.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/hai-order/src/main/resources/prod/application.yml b/hai-order/src/main/resources/prod/application.yml index fd57f96a..83d9d50b 100644 --- a/hai-order/src/main/resources/prod/application.yml +++ b/hai-order/src/main/resources/prod/application.yml @@ -4,14 +4,14 @@ server: context-path: /order #配置是否为debug模式，debug模式下，不开启权限校验 -debug: true +debug: false #datasource数据源设置 spring: datasource: - url: jdbc:mysql://139.159.177.244:3306/hfkj?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8 - username: hfkj - password: HF123456. + url: jdbc:mysql://192.168.0.63:21100/hsg?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8 + username: hsg + password: HUfukeji123456!@# type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver filters: stat @@ -51,11 +51,11 @@ spring: #MQTT配置信息 mqtt: #MQTT服务地址 - url: ws://139.159.177.244:8083/mqtt + url: ws://122.9.135.148:8083/mqtt #用户名 username: printer_provider #密码 - password: 123654 + password: abcd123! #客户端id(不能重复) # client: # id: provider-id @@ -63,10 +63,11 @@ spring: # default: # topic: topic rocketmq: - name-server: 139.159.177.244:9876 + name-server: 122.9.135.148:9876 producer: #必须指定group group: default-group + mybatis: mapperLocations: - classpath*:sqlmap*/*.xml From ce70828354c0117f0e6ee1bcad1a2f15bf2c70c0 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Fri, 3 Feb 2023 13:57:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/prod/application.yml | 95 +++++++++++++++++++ .../src/main/resources/prod/config.properties | 5 + hai-user/src/main/resources/prod/logback.xml | 93 ++++++++++++++++++ 3 files changed, 193 insertions(+) create mode 100644 hai-user/src/main/resources/prod/application.yml create mode 100644 hai-user/src/main/resources/prod/config.properties create mode 100644 hai-user/src/main/resources/prod/logback.xml diff --git a/hai-user/src/main/resources/prod/application.yml b/hai-user/src/main/resources/prod/application.yml new file mode 100644 index 00000000..912c0ab5 --- /dev/null +++ b/hai-user/src/main/resources/prod/application.yml @@ -0,0 +1,95 @@ +server: + port: 9305 + servlet: + context-path: /user + +#配置是否为debug模式，debug模式下，不开启权限校验 +debug: false + +#datasource数据源设置 +spring: + datasource: + url: jdbc:mysql://192.168.0.63:21100/hsg?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8 + username: hsg + password: HUfukeji123456!@# + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.jdbc.Driver + filters: stat + maxActive: 10 + initialSize: 5 + maxWait: 60000 + minIdle: 5 + timeBetweenEvictionRunsMillis: 60000 + minEvictableIdleTimeMillis: 300000 + validationQuery: select 'x' + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + poolPreparedStatements: true + maxOpenPreparedStatements: 20 + + redis: + database: 0 + host: 127.0.0.1 + port: 36379 + password: HF123456.Redis + timeout: 1000 + jedis: + pool: + max-active: 20 + max-wait: -1 + max-idle: 10 + min-idle: 0 + #MQTT配置信息 + mqtt: + #MQTT服务地址 + url: ws://122.9.135.148:8083/mqtt + #用户名 + username: printer_provider + #密码 + password: abcd123! + #客户端id(不能重复) + # client: + # id: provider-id + #MQTT默认的消息推送主题，实际可在调用接口是指定 + # default: + # topic: topic + #thymelea模板配置 + thymeleaf: + prefix: classpath:/templates/ + suffix: .html + mode: HTML5 + encoding: UTF-8 + #热部署文件，页面不产生缓存，及时更新 + cache: false + #配置日期返回至前台为时间戳 + jackson: + serialization: + write-dates-as-timestamps: true + + + thymeleaf: + cache: false + prefix: classpath:/templates/ + suffix: .html + encoding: UTF-8 + content-type: text/html + mode: HTML5 + +rocketmq: + name-server: 122.9.135.148:9876 + producer: + #必须指定group + group: default-group + +mybatis: + mapperLocations: + - classpath*:sqlmap*/*.xml + type-aliases-package: + org.springboot.sample.entity + +pagehelper: + helperDialect: mysql + reasonable: true + supportMethodsArguments: true + params: count=countSql diff --git a/hai-user/src/main/resources/prod/config.properties b/hai-user/src/main/resources/prod/config.properties new file mode 100644 index 00000000..78e36477 --- /dev/null +++ b/hai-user/src/main/resources/prod/config.properties @@ -0,0 +1,5 @@ + +wxMiniAppId=wx8d49e2f83025229d +wxMiniAppSecret=d8d6dcaef77d3b659258a01b5ddba5df + +fileUrl=/home/project/hsg/filesystem diff --git a/hai-user/src/main/resources/prod/logback.xml b/hai-user/src/main/resources/prod/logback.xml new file mode 100644 index 00000000..0f091738 --- /dev/null +++ b/hai-user/src/main/resources/prod/logback.xml @@ -0,0 +1,93 @@ + + + + + %d %p (%file:%line\)- %m%n + UTF-8 + + + + log/base.log + + log/base.log.%d.%i + + + 64 MB + + + + + %d %p (%file:%line\)- %m%n + + UTF-8 + + + + log/dao.log + + log/dao.log.%d.%i + + + 64 MB + + + + + %d %p (%file:%line\)- %m%n + + UTF-8 + + + + log/error.log + + log/error.log.%d.%i + + + 64 MB + + + + + %d %p (%file:%line\)- %m%n + + UTF-8 + + + + + + + + + + + + + + + + + + log/ChongQingCNPCService.log + + log/ChongQingCNPCService.log.%d.%i + + + 64 MB + + + + + %d %p (%file:%line\)- %m%n + + UTF-8 + + + + + + From 584bc2d18c92b3a42be2515f3b03535d11933229 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Fri, 3 Feb 2023 15:32:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/OrderPaySuccessServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java index f9ddeefd..5b7b3180 100644 --- a/hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java +++ b/hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java @@ -183,15 +183,23 @@ public class OrderPaySuccessServiceImpl implements OrderPaySuccessService { for (HighChildOrder childOrder : order.getHighChildOrderList()) { if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE1.getNumber())) { + childOrder.setChildOrderStatus(OrderChildStatus.STATUS3.getNumber()); couponHandle(order, childOrder); } else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE2.getNumber())) { + order.setOrderStatus(OrderStatus.STATUS3.getNumber()); + order.setFinishTime(new Date()); integralHandle(order,childOrder); + childOrder.setChildOrderStatus(OrderChildStatus.STATUS3.getNumber()); + orderService.updateOrderData(order); + } else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE3.getNumber())) { order.setOrderStatus(OrderStatus.STATUS3.getNumber()); order.setFinishTime(new Date()); oilHandle(order,childOrder); + + childOrder.setChildOrderStatus(OrderChildStatus.STATUS3.getNumber()); orderService.updateOrderData(order); } else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE4.getNumber())) {