Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev

dev-discount
袁野 2 years ago
commit f8d5ffd872
  1. 15
      hai-order/src/main/resources/prod/application.yml
  2. 8
      hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java
  3. 95
      hai-user/src/main/resources/prod/application.yml
  4. 5
      hai-user/src/main/resources/prod/config.properties
  5. 93
      hai-user/src/main/resources/prod/logback.xml

@ -4,14 +4,14 @@ server:
context-path: /order context-path: /order
#配置是否为debug模式,debug模式下,不开启权限校验 #配置是否为debug模式,debug模式下,不开启权限校验
debug: true debug: false
#datasource数据源设置 #datasource数据源设置
spring: spring:
datasource: datasource:
url: jdbc:mysql://139.159.177.244:3306/hfkj?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8 url: jdbc:mysql://192.168.0.63:21100/hsg?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
username: hfkj username: hsg
password: HF123456. password: HUfukeji123456!@#
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
filters: stat filters: stat
@ -51,11 +51,11 @@ spring:
#MQTT配置信息 #MQTT配置信息
mqtt: mqtt:
#MQTT服务地址 #MQTT服务地址
url: ws://139.159.177.244:8083/mqtt url: ws://122.9.135.148:8083/mqtt
#用户名 #用户名
username: printer_provider username: printer_provider
#密码 #密码
password: 123654 password: abcd123!
#客户端id(不能重复) #客户端id(不能重复)
# client: # client:
# id: provider-id # id: provider-id
@ -63,10 +63,11 @@ spring:
# default: # default:
# topic: topic # topic: topic
rocketmq: rocketmq:
name-server: 139.159.177.244:9876 name-server: 122.9.135.148:9876
producer: producer:
#必须指定group #必须指定group
group: default-group group: default-group
mybatis: mybatis:
mapperLocations: mapperLocations:
- classpath*:sqlmap*/*.xml - classpath*:sqlmap*/*.xml

@ -183,15 +183,23 @@ public class OrderPaySuccessServiceImpl implements OrderPaySuccessService {
for (HighChildOrder childOrder : order.getHighChildOrderList()) { for (HighChildOrder childOrder : order.getHighChildOrderList()) {
if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE1.getNumber())) { if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE1.getNumber())) {
childOrder.setChildOrderStatus(OrderChildStatus.STATUS3.getNumber());
couponHandle(order, childOrder); couponHandle(order, childOrder);
} else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE2.getNumber())) { } else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE2.getNumber())) {
order.setOrderStatus(OrderStatus.STATUS3.getNumber());
order.setFinishTime(new Date());
integralHandle(order,childOrder); integralHandle(order,childOrder);
childOrder.setChildOrderStatus(OrderChildStatus.STATUS3.getNumber());
orderService.updateOrderData(order);
} else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE3.getNumber())) { } else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE3.getNumber())) {
order.setOrderStatus(OrderStatus.STATUS3.getNumber()); order.setOrderStatus(OrderStatus.STATUS3.getNumber());
order.setFinishTime(new Date()); order.setFinishTime(new Date());
oilHandle(order,childOrder); oilHandle(order,childOrder);
childOrder.setChildOrderStatus(OrderChildStatus.STATUS3.getNumber());
orderService.updateOrderData(order); orderService.updateOrderData(order);
} else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE4.getNumber())) { } else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE4.getNumber())) {

@ -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

@ -0,0 +1,5 @@
wxMiniAppId=wx8d49e2f83025229d
wxMiniAppSecret=d8d6dcaef77d3b659258a01b5ddba5df
fileUrl=/home/project/hsg/filesystem

@ -0,0 +1,93 @@
<configuration>
<!-- %m输出的信息,%p日志级别,%t线程名,%d日期,%c类的全名,,,, -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d %p (%file:%line\)- %m%n</pattern>
<charset>UTF-8</charset>
</encoder>
</appender>
<appender name="baselog"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<File>log/base.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>log/base.log.%d.%i</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<!-- or whenever the file size reaches 64 MB -->
<maxFileSize>64 MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
<encoder>
<pattern>
%d %p (%file:%line\)- %m%n
</pattern>
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
</encoder>
</appender>
<appender name="daolog"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<File>log/dao.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>log/dao.log.%d.%i</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<!-- or whenever the file size reaches 64 MB -->
<maxFileSize>64 MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
<encoder>
<pattern>
%d %p (%file:%line\)- %m%n
</pattern>
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
</encoder>
</appender>
<appender name="errorlog"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<File>log/error.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>log/error.log.%d.%i</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<!-- or whenever the file size reaches 64 MB -->
<maxFileSize>64 MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
<encoder>
<pattern>
%d %p (%file:%line\)- %m%n
</pattern>
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
</encoder>
</appender>
<root level="DEBUG">
<appender-ref ref="STDOUT" />
</root>
<logger name="com.hai" level="INFO">
<appender-ref ref="baselog" />
</logger>
<logger name="com.hai.dao" level="DEBUG">
<appender-ref ref="daolog" />
</logger>
<logger name="com.hai" level="ERROR">
<appender-ref ref="errorlog" />
</logger>
<appender name="ChongQingCNPC" class="ch.qos.logback.core.rolling.RollingFileAppender">
<File>log/ChongQingCNPCService.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>log/ChongQingCNPCService.log.%d.%i</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<!-- or whenever the file size reaches 64 MB -->
<maxFileSize>64 MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
<encoder>
<pattern>
%d %p (%file:%line\)- %m%n
</pattern>
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
</encoder>
</appender>
<logger name="com.hai.config.ChongQingCNPCService" level="INFO">
<appender-ref ref="ChongQingCNPC" />
</logger>
</configuration>
Loading…
Cancel
Save