autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 02:55:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
YAS\29473
2025-08-12 10:00:15 +08:00
parent 65967ce394 247f55f62f
commit efa94d8a5f
5 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/service/PileService.java
View File

@@ -119,7 +119,7 @@ public class PileService {
List<String> snList = null;
if (StringUtils.equals(SoftwareProtocolEnum.YOU_DIAN.getValue(), softwareProtocol)) {
snList = snUtils.generateEBikeSN(dto.getNum());
} else if (StringUtils.equals(SoftwareProtocolEnum.YUN_KUAI_CHONG.getValue(), softwareProtocol)){
} else if (StringUtils.equals(SoftwareProtocolEnum.YUN_KUAI_CHONGV150.getValue(), softwareProtocol)){
snList = snUtils.generateEVPileSN(dto.getNum());
} else {
throw new BusinessException(ReturnCodeEnum.valueOf("软件协议不正确"));

10
jsowell-admin/src/main/resources/application-dev.yml
View File

@@ -9,7 +9,7 @@ spring:
# redis 配置
redis:
# 地址
host: 192.168.8.2
host: 192.168.0.32
# 端口，默认为6379
port: 6379
# 数据库索引
@@ -36,7 +36,7 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://192.168.8.2:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://192.168.0.32:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: jsowell_dev
# url: jdbc:mysql://192.168.2.46:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: jsowell_prd_copy
@@ -90,7 +90,7 @@ spring:
# rabbitmq配置 dev
rabbitmq:
host: 192.168.8.2
host: 192.168.0.32
port: 5672
username: admin
password: admin
@@ -259,13 +259,13 @@ dubbo:
name: wcc-server
qosEnable: false
registry:
address: nacos://192.168.8.2:8848
address: nacos://192.168.0.32:8848
parameters:
namespace: e328faaf-8516-42d0-817a-7406232b3581
username: nacos
password: 79HMu!6nlOiLm^Q[
protocol:
name: dubbo
port: 20880
port: -1
consumer:
check: false # 关键配置：启动时不检查提供者

10
jsowell-admin/src/main/resources/application-sit.yml
View File

@@ -8,7 +8,7 @@ spring:
# redis 配置
redis:
# 地址
host: 192.168.8.2
host: 192.168.0.32
# 端口，默认为6379
port: 6379
# 数据库索引
@@ -35,9 +35,9 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://192.168.8.2:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://192.168.0.32:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: jsowell_dev
# url: jdbc:mysql://192.168.8.2:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# url: jdbc:mysql://192.168.0.32:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: jsowell_prd_copy
password: 123456
# 从库数据源
@@ -89,7 +89,7 @@ spring:
# rabbitmq配置 sit
rabbitmq:
host: 192.168.8.2
host: 192.168.0.32
port: 5672
username: admin
password: admin
@@ -257,7 +257,7 @@ dubbo:
name: wcc-server
qosEnable: false
registry:
address: nacos://192.168.8.2:8848
address: nacos://192.168.0.32:8848
parameters:
namespace: e328faaf-8516-42d0-817a-7406232b3581
username: nacos

16
jsowell-common/src/main/java/com/jsowell/common/config/mq/DirectRabbitConfig.java
View File

@@ -35,10 +35,10 @@ public class DirectRabbitConfig {
// return new Queue(RabbitConstants.QUEUE_HEART_BEAT);
// }
//
// @Bean
// public Queue realtimeDataQueue() {
// return new Queue(RabbitConstants.QUEUE_REALTIME_DATA);
// }
@Bean
public Queue realtimeDataQueue() {
return new Queue(RabbitConstants.QUEUE_REALTIME_DATA);
}
//
// @Bean
// public Queue priceSenderQueue() {
@@ -88,10 +88,10 @@ public class DirectRabbitConfig {
// return BindingBuilder.bind(heartBeatQueue()).to(exchange()).with(RabbitConstants.QUEUE_HEART_BEAT);
// }
//
// @Bean
// public Binding bindRealtimeData() {
// return BindingBuilder.bind(realtimeDataQueue()).to(exchange()).with(RabbitConstants.QUEUE_REALTIME_DATA);
// }
@Bean
public Binding bindRealtimeData() {
return BindingBuilder.bind(realtimeDataQueue()).to(exchange()).with(RabbitConstants.QUEUE_REALTIME_DATA);
}
//
// @Bean
// public Binding bindPriceSender() {

7
jsowell-common/src/main/java/com/jsowell/common/enums/SoftwareProtocolEnum.java
View File

@@ -4,9 +4,10 @@ package com.jsowell.common.enums;
* 软件协议enum
*/
public enum SoftwareProtocolEnum {
YUN_KUAI_CHONG("1", "云快充"),
YONG_LIAN("2", "永联"),
YOU_DIAN("3", "友电"),
YUN_KUAI_CHONGV150("yunkuaichongV150", "云快充V1.5"),
YUN_KUAI_CHONGV160("yunkuaichongV160", "云快充V1.6"),
YONG_LIAN("yonglianV1", "永联"),
YOU_DIAN("youdianV1", "友电"),
;
private String value;