Commit Graph

2216 Commits

Author SHA1 Message Date
a38a2c49aa Merge pull request '海康服务模块补充 修改接口参数' (#91) from cgt into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #91
2025-01-22 11:47:26 +08:00
punchhhh
aebdb97cee 海康服务模块补充 2025-01-22 09:38:28 +08:00
punchhhh
8b696e1ce2 海康服务后台模块 获取资源工具类 2025-01-22 09:06:17 +08:00
1b9365e558 Merge pull request '添加海康接口 优化票务服务' (#90) from cgt into master
Reviewed-on: #90
2025-01-22 09:03:15 +08:00
punchhhh
7174c59e8e 海康服务后台模块 2025-01-22 09:00:31 +08:00
punchhhh
48a6241a42 添加海康接口 优化票务服务 2025-01-21 21:01:21 +08:00
fb038b16d0 '售票按性别统计数量 增加身份证为空的处理' 添加海康接口 优化票务接口
'售票按性别统计数量  增加身份证为空的处理'   添加海康接口  优化票务接口
2025-01-21 20:45:41 +08:00
punchhhh
31378273e1 Merge remote-tracking branch 'origin/cgt' into cgt 2025-01-21 20:43:39 +08:00
punchhhh
2a7e798917 添加海康接口 优化票务服务 2025-01-21 20:41:52 +08:00
bebc3ac904 revert c47e0f0ffc
revert 添加海康接口 优化票务服务
2025-01-21 20:39:38 +08:00
punchhhh
c47e0f0ffc 添加海康接口 优化票务服务 2025-01-21 20:37:50 +08:00
punchhhh
2163c4482c Merge remote-tracking branch 'origin/cgt' into cgt
# Conflicts:
#	ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/CameraApi.java
#	ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/camera/vo/CameraDO.java
#	ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/camera/vo/CameraDTO.java
#	ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/camera/vo/CameraPageReqVO.java
#	ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/camera/vo/CameraRespVO.java
#	ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/camera/vo/CameraSaveReqVO.java
#	ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/mysql/camera/CameraMapper.java
#	ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/camera/CameraService.java
#	ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/camera/CameraServiceImpl.java
2025-01-21 20:22:57 +08:00
punchhhh
b17fb5c6eb 添加海康接口 优化票务服务 2025-01-21 20:21:42 +08:00
969532c4dd revert be97de9e40
revert datacenter 全球眼
2025-01-17 14:48:16 +08:00
2f99e49c23 revert c672fb03fd
revert datacenter 全球眼 更改数据源为hiking
2025-01-17 14:47:59 +08:00
e20623db48 revert 12a2f7b7cd
revert revert 4a0f6af423

revert 注册中心地址变更
2025-01-17 14:47:07 +08:00
12a2f7b7cd revert 4a0f6af423
revert 注册中心地址变更
2025-01-17 14:41:30 +08:00
punchhhh
019a3f5be7 售票查询按性别统计数量 增加身份证非空判断 2025-01-17 14:38:56 +08:00
punchhhh
c672fb03fd datacenter 全球眼 更改数据源为hiking 2025-01-12 11:04:47 +08:00
punchhhh
be97de9e40 datacenter 全球眼 2025-01-12 11:00:19 +08:00
Hokin
4a0f6af423 注册中心地址变更
All checks were successful
continuous-integration/drone Build is passing
2024-12-23 10:28:53 +08:00
Hokin
1a637a2810 注册中心地址变更
All checks were successful
continuous-integration/drone Build is passing
2024-12-23 09:54:22 +08:00
8959ccdb04 更新 yudao-module-infra/yudao-module-infra-biz/src/main/resources/bootstrap.yaml
All checks were successful
continuous-integration/drone Build is passing
2024-12-22 23:22:04 +08:00
7282e6102b 更新 yudao-module-system/yudao-module-system-biz/src/main/resources/bootstrap.yaml 2024-12-22 23:21:28 +08:00
f304601267 更新 yudao-gateway/src/main/resources/bootstrap.yaml 2024-12-22 23:20:55 +08:00
5196516c85 更新 ludu-module-ticketing/ludu-module-ticketing-biz/src/main/resources/bootstrap.yaml 2024-12-22 23:20:21 +08:00
b2e98edfca 更新 ludu-module-parking/ludu-module-parking-biz/src/main/resources/bootstrap.yaml 2024-12-22 23:19:55 +08:00
3ef98337d4 更新 ludu-module-datacenter/ludu-module-datacenter-biz/src/main/resources/bootstrap.yaml 2024-12-22 23:19:03 +08:00
96ae0eb665 更新 ludu-job-admin/ludu-job-admin-biz/src/main/resources/bootstrap.yaml 2024-12-22 23:18:31 +08:00
87657c940b 更新 yudao-module-system/yudao-module-system-biz/src/main/resources/bootstrap.yaml
All checks were successful
continuous-integration/drone Build is passing
2024-12-20 21:36:27 +08:00
07bc82f108 更新 yudao-module-system/yudao-module-system-biz/src/main/resources/bootstrap.yaml
All checks were successful
continuous-integration/drone Build is passing
2024-12-20 21:20:16 +08:00
Hokin
04f0668ff9 “切换ip”
All checks were successful
continuous-integration/drone Build is passing
2024-12-20 17:26:10 +08:00
60d8df8877 Merge pull request '端口修改' (#88) from xinwei into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #88
2024-10-29 17:54:42 +08:00
6ecacae9ec 端口修改 2024-10-29 17:37:10 +08:00
4d6f425281 Merge pull request '端口修改' (#87) from xinwei into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #87
2024-10-29 17:30:46 +08:00
b552b333d4 端口修改 2024-10-29 17:30:09 +08:00
86d5c08012 Merge pull request 'xxl-job跳转路径修改' (#86) from xinwei into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #86
2024-10-29 17:21:11 +08:00
b01210098d xxl-job跳转路径修改 2024-10-29 17:20:21 +08:00
072c6367ba Merge pull request 'xxl-job跳转路径修改' (#85) from xinwei into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #85
2024-10-29 17:00:06 +08:00
3b027745b2 xxl-job跳转路径修改 2024-10-29 16:54:22 +08:00
f43a69d354 Merge pull request 'nacos端口修改为服务器内网ip' (#84) from xinwei into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #84
2024-10-29 15:50:41 +08:00
ef76377db1 Merge pull request '心跳数据推送' (#80) from zzw-one into master
Reviewed-on: #80
2024-10-29 15:49:53 +08:00
852fff920d nacos端口修改为服务器内网ip 2024-10-29 15:44:56 +08:00
60e7023409 Merge pull request 'nacos端口修改测试' (#83) from xinwei into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #83
2024-10-29 15:26:53 +08:00
67df1bdabf nacos端口修改测试 2024-10-29 15:26:14 +08:00
52e8330f2a Merge pull request 'nacos端口修改测试' (#82) from xinwei into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #82
2024-10-29 15:09:07 +08:00
3d18011fcd nacos端口修改测试 2024-10-29 15:04:19 +08:00
92c5925902 Merge pull request 'nacos地址调整和构建脚本优化' (#81) from xinwei into master
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone Build is passing
Reviewed-on: #81
2024-10-28 16:22:26 +08:00
7c3fb1f6da nacos地址修改 2024-10-28 16:21:08 +08:00
9782b2f1e8 构建顺序优化 2024-10-28 16:12:08 +08:00