Skip to content

G
gdtel-gztel-school-center
Commit 4dc9c334 by 罗承锋
Options

更新测试版启动配置

parent b7411a5d
Showing with 35 additions and 32 deletions
apply-net/src/main/resources/application-test.yml
eureka:
instance:
hostname: localhost
hostname: eureka
# 心跳时间，即服务续约间隔时间（缺省为30s）
lease-renewal-interval-in-seconds: 10
# 发呆时间，即服务续约到期时间（缺省为90s）
......@@ -8,7 +8,7 @@ eureka:
client:
registry-fetch-interval-seconds: 5
serviceUrl:
defaultZone: http://eureka:20000/eureka/
defaultZone: http://172.18.101.171:20000/eureka/
server:
port: 11092
servlet:
......@@ -94,7 +94,7 @@ spring:
# republish failures to the DLQ with diagnostic headers
republish-to-dlq: true
rabbitmq:
host: schoolcenterrabbitmq
host: 172.18.101.171
port: 5672
username: guest
password: guest
......
common/src/main/java/com/winsun/mapper/OrderMapper.java
......@@ -41,14 +41,14 @@ public interface OrderMapper extends BaseMapper<Order> {
@Param("acceptDate") Date acceptDate,@Param("successTime")Date successTime);
@Update("update `hhr_order` set order_status = #{orderStatus},company = #{company},kuaidi_order = #{kuaidiOrder},send_type = #{sendType} where order_number = #{orderNumber}")
Integer updateOrderKDIsNotNull(@Param("orderNumber") String orderNumber,@Param("company") String company,@Param("kuaidiOrder") String kuaidiOrder,@Param("sendType") String sendType,@Param("orderStatus") String orderStatus);
Integer updateOrderKDNotNull(@Param("orderNumber") String orderNumber,@Param("company") String company,@Param("kuaidiOrder") String kuaidiOrder,@Param("sendType") String sendType,@Param("orderStatus") String orderStatus);
@Update("update `hhr_order` set order_status = #{orderStatus},company = #{company},kuaidi_order = #{kuaidiOrder},send_type = #{sendType},success_time=#{successTime} where order_number = #{orderNumber}")
Integer updateOrderKDIsNotNullByTime(@Param("orderNumber") String orderNumber,@Param("company") String company,@Param("kuaidiOrder") String kuaidiOrder,@Param("sendType") String sendType,@Param("orderStatus") String orderStatus,@Param("successTime")Date successTime);
@Update("update `hhr_order` set order_status = #{orderStatus},send_type = #{sendType} where order_number = #{orderNumber}")
Integer updateOrderKDIsNull(@Param("orderNumber") String orderNumber,@Param("sendType") String sendType,@Param("orderStatus") String orderStatus);
Integer updateOrderKDNull(@Param("orderNumber") String orderNumber,@Param("sendType") String sendType,@Param("orderStatus") String orderStatus);
@Update("update `hhr_order` set order_status = #{orderStatus},send_type = #{sendType},success_time=#{successTime} where order_number = #{orderNumber}")
Integer updateOrderKDIsNullByTime(@Param("orderNumber") String orderNumber,@Param("sendType") String sendType,@Param("orderStatus") String orderStatus,@Param("successTime")Date successTime);
......
core-service/src/main/resources/application-test.yml
eureka:
instance:
hostname: localhost
hostname: eureka
prefer-ip-address: true
instance-id: ${spring.application.name}:${spring.cloud.client.ipAddress}:${spring.application.instance_id:${server.port}}
# 心跳时间，即服务续约间隔时间（缺省为30s）
lease-renewal-interval-in-seconds: 10
# 发呆时间，即服务续约到期时间（缺省为90s）
......@@ -8,7 +10,7 @@ eureka:
client:
registry-fetch-interval-seconds: 5
serviceUrl:
defaultZone: http://eureka:20000/eureka/
defaultZone: http://172.18.101.171:20000/eureka/
server:
port: 10002
servlet:
......@@ -69,7 +71,7 @@ spring:
# republish failures to the DLQ with diagnostic headers
republish-to-dlq: true
rabbitmq:
host: schoolcenterrabbitmq
host: 172.18.101.171
port: 5672
username: guest
password: guest
......
deploy/prod/docker-gdtel-gztel-hhr/push.cmd
@echo off
:: 每次发版都需要改的版本号
SET APP_VERSION=0.0.10
SET APP_VERSION=0.0.15
SET HOST_NAME=172.18.101.172
SET APP_NAME=gateway
......
gateway/src/main/resources/application-test.yml
......@@ -10,7 +10,7 @@ eureka:
client:
registry-fetch-interval-seconds: 5
serviceUrl:
defaultZone: http://eureka:20000/eureka/
defaultZone: http://172.18.101.171:20000/eureka/
server:
port: 10001
tomcat:
......
new-user/src/main/resources/application-test.yml
eureka:
instance:
hostname: localhost
hostname: eureka
prefer-ip-address: true
instance-id: ${spring.application.name}:${spring.cloud.client.ipAddress}:${spring.application.instance_id:${server.port}}
# 心跳时间，即服务续约间隔时间（缺省为30s）
lease-renewal-interval-in-seconds: 10
# 发呆时间，即服务续约到期时间（缺省为90s）
......@@ -8,7 +10,7 @@ eureka:
client:
registry-fetch-interval-seconds: 5
serviceUrl:
defaultZone: http://eureka:20000/eureka
defaultZone: http://172.18.101.171:20000/eureka/
server:
port: 11093
servlet:
......@@ -96,7 +98,7 @@ spring:
# republish failures to the DLQ with diagnostic headers
republish-to-dlq: true
rabbitmq:
host: schoolcenterrabbitmq
host: 172.18.101.171
port: 5672
username: guest
password: guest
......
old-user/src/main/resources/application-test.yml
......@@ -10,7 +10,7 @@ eureka:
client:
registry-fetch-interval-seconds: 5
serviceUrl:
defaultZone: http://eureka:20000/eureka/
defaultZone: http://172.18.101.171:20000/eureka/
server:
port: 11094
servlet:
......@@ -95,10 +95,10 @@ spring:
# republish failures to the DLQ with diagnostic headers
republish-to-dlq: true
rabbitmq:
host: schoolcenterrabbitmq
host: 172.18.101.171
port: 5672
username: root
password: root
username: guest
password: guest
redis:
clusterWhether: false
cluster:
......
renewal-user/src/main/resources/application-test.yml
......@@ -10,7 +10,7 @@ eureka:
client:
registry-fetch-interval-seconds: 5
serviceUrl:
defaultZone: http://eureka:20000/eureka/
defaultZone: http://172.18.101.171:20000/eureka/
server:
port: 11095
servlet:
......@@ -95,10 +95,10 @@ spring:
# republish failures to the DLQ with diagnostic headers
republish-to-dlq: true
rabbitmq:
host: schoolcenterrabbitmq
host: 172.18.101.171
port: 5672
username: root
password: root
username: guest
password: guest
redis:
clusterWhether: false
cluster:
......
service-manager/src/main/java/com/winsun/controller/OrderController.java
......@@ -844,17 +844,16 @@ public class OrderController extends BaseController {
Integer integer = null;
if (StringUtils.isBlank(company) || StringUtils.isBlank(kuaidiOrder)) {
if(successTime == null){
integer = orderMapper.updateOrderKDIsNull(orderNumber, sendType, orderStatus);
integer = orderMapper.updateOrderKDNull(orderNumber, sendType, orderStatus);
}else {
integer = orderMapper.updateOrderKDIsNullByTime(orderNumber, sendType, orderStatus,successTime);
}
} else {
if(successTime == null){
integer = orderMapper.updateOrderKDIsNotNull(orderNumber, company, kuaidiOrder, sendType, orderStatus);
integer = orderMapper.updateOrderKDNotNull(orderNumber, company, kuaidiOrder, sendType, orderStatus);
}else {
integer = orderMapper.updateOrderKDIsNotNullByTime(orderNumber, company, kuaidiOrder, sendType, orderStatus,successTime);
}
}
if (integer == 1) {
number++;
......
service-manager/src/main/resources/application-test.yml
......@@ -10,7 +10,7 @@ eureka:
client:
registry-fetch-interval-seconds: 5
serviceUrl:
defaultZone: http://eureka:20000/eureka/
defaultZone: http://172.18.101.171:20000/eureka/
server:
port: 11091
servlet:
......@@ -95,10 +95,10 @@ spring:
# republish failures to the DLQ with diagnostic headers
republish-to-dlq: true
rabbitmq:
host: schoolcenterrabbitmq
host: 172.18.101.171
port: 5672
username: root
password: root
username: guest
password: guest
redis:
clusterWhether: false
cluster:
......
task/src/main/resources/application-test.yml
......@@ -10,7 +10,7 @@ eureka:
client:
registry-fetch-interval-seconds: 5
serviceUrl:
defaultZone: http://eureka:20000/eureka/
defaultZone: http://172.18.101.171:20000/eureka/
server:
port: 11191
servlet:
......@@ -96,10 +96,10 @@ spring:
# republish failures to the DLQ with diagnostic headers
republish-to-dlq: true
rabbitmq:
host: schoolcenterrabbitmq
host: 172.18.101.171
port: 5672
username: root
password: root
username: guest
password: guest
redis:
clusterWhether: false
cluster:
......
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