mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-20 02:55:04 +08:00
update
This commit is contained in:
@@ -8,17 +8,17 @@ spring:
|
||||
# redis 配置
|
||||
redis:
|
||||
# 地址
|
||||
host: r-uf6k0uet7mihr5z78f.redis.rds.aliyuncs.com
|
||||
# host: 106.14.94.149
|
||||
# host: r-uf6k0uet7mihr5z78f.redis.rds.aliyuncs.com
|
||||
host: 106.14.94.149
|
||||
# 端口,默认为6379
|
||||
port: 6379
|
||||
# 数据库索引
|
||||
database: 0
|
||||
# 账号
|
||||
username: jsowell
|
||||
# 密码
|
||||
password: js@160829
|
||||
# password: js160829
|
||||
# username: jsowell
|
||||
# # 密码
|
||||
# password: js@160829
|
||||
password: js160829
|
||||
# 连接超时时间
|
||||
timeout: 10s
|
||||
lettuce:
|
||||
@@ -38,12 +38,12 @@ spring:
|
||||
druid:
|
||||
# 主库数据源
|
||||
master:
|
||||
url: jdbc:mysql://rm-uf6ra51u33dc3798l.mysql.rds.aliyuncs.com:3306/jsowell_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
username: jsowell
|
||||
password: js@160829
|
||||
# url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
# username: jsowell_pre
|
||||
# password: Js@160829
|
||||
# url: jdbc:mysql://rm-uf6ra51u33dc3798l.mysql.rds.aliyuncs.com:3306/jsowell_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
# username: jsowell
|
||||
# password: js@160829
|
||||
url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
username: jsowell_pre
|
||||
password: Js@160829
|
||||
# 从库数据源
|
||||
slave:
|
||||
# 从数据源开关/默认关闭
|
||||
|
||||
@@ -1066,15 +1066,15 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
|
||||
orderInfo.setChargeDetails(chargeDetails);
|
||||
|
||||
// 由于订单在对方测试环境的LC658的站点,因此在这里将站点LC149改为LC658
|
||||
/* if (orderInfo.getStationID().equals("LC149")){
|
||||
if (orderInfo.getStationID().equals("LC149")){
|
||||
orderInfo.setStationID("LC658");
|
||||
}*/
|
||||
}
|
||||
|
||||
// 正确运营商"之禾"
|
||||
if(StringUtils.equals("149", orderInfo.getStationID())){
|
||||
/* if(StringUtils.equals("149", orderInfo.getStationID())){
|
||||
//使用EquipmentOwnerID = MA1JLFUU8
|
||||
orderInfo.setEquipmentOwnerID(Constants.OPERATORID_LIANLIAN);
|
||||
}
|
||||
}*/
|
||||
|
||||
|
||||
// 获取令牌
|
||||
|
||||
Reference in New Issue
Block a user