Commit Graph

11 Commits

Author SHA1 Message Date
ddc10ecc10 rev:netty ndc 2024-02-20 14:55:04 +08:00
zhangzq
4afc8d43b2 Merge branch 'feature/sanxian_acs_1213' into feature/sanxianacs1213
# Conflicts:
#	wcs/nladmin-system/src/main/java/org/nl/modules/loki/service/impl/LokiServiceImpl.java
#	wcs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneServiceImpl.java
#	wcs/nladmin-system/src/main/resources/config/application-dev.yml
#	wcs/nladmin-system/src/main/resources/config/application-prod.yml
#	wcs/nladmin-system/src/main/resources/config/application-test.yml
#	wcs/nladmin-system/src/main/resources/config/application.yml
#	wcs/nladmin-system/src/main/resources/logback-spring.xml
2024-02-19 17:00:49 +08:00
zhangzq
b0b9dedaee add:接入mqtt(td:项目启停时设备信号读写) 2024-02-01 17:54:08 +08:00
d967103c17 rev:替换lucene 2024-01-02 17:21:53 +08:00
a3c6f9bb3b rev:删除loki 2023-12-19 08:51:01 +08:00
zhangzq
45a102eed0 rev:pom 2023-12-04 16:42:12 +08:00
zhangzq
1d28c7cf9e rev:工单下发接口兼容暂停工单;opt:删除useragent 2023-12-04 16:02:16 +08:00
jiaoliming
6af1fbb14c rev :acs
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
2023-09-25 09:53:33 +08:00
e8f6b19560 rev:提交aps相关代码 2023-09-18 13:26:48 +08:00
f6c8f65177 add lucene 2023-05-09 15:37:26 +08:00
USER-20220102CG\noblelift
c5077035c1 更新最新ACS 2023-03-21 20:24:04 +08:00