|
|
7773cae0ea
|
配置文件提交2
|
2025-09-05 10:52:53 +08:00 |
|
|
|
75756eb8ab
|
Merge remote-tracking branch 'upstream/6170'
# Conflicts:
# fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/utils/EncryptUtilsTest.java
|
2025-08-19 14:11:02 +08:00 |
|
|
|
8a6c196fb9
|
访问控制
|
2025-08-14 11:51:27 +08:00 |
|
|
|
07bc831f1a
|
登录测试
|
2025-08-13 19:21:57 +08:00 |
|
|
|
83458d0060
|
Merge remote-tracking branch 'upstream/main'
# Conflicts:
# fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceBizService.java
# fys-admin/src/main/java/com/fuyuanshen/app/service/AppLoginService.java
# fys-admin/src/main/java/com/fuyuanshen/web/handler/mqtt/DeviceReceiverMessageHandler.java
# fys-admin/src/main/resources/application-prod.yml
# fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppUserServiceImpl.java
|
2025-08-07 18:10:47 +08:00 |
|
|
|
f67e848256
|
晶全6710
|
2025-08-07 15:41:57 +08:00 |
|
|
|
c2eb5ba524
|
日志配置
|
2025-08-06 09:12:47 +08:00 |
|
|
|
8770c217ae
|
设备日志
|
2025-08-01 15:19:41 +08:00 |
|
|
|
e7c8e245ba
|
Merge remote-tracking branch 'upstream/main'
|
2025-07-23 11:01:01 +08:00 |
|
|
|
e4dbee15dd
|
设备分享功能开发
|
2025-07-22 18:37:02 +08:00 |
|
|
|
3ed2f97752
|
app接口功能实现
|
2025-07-11 16:40:20 +08:00 |
|
|
|
1eb2502a21
|
revert 2815e27240
revert 晶全代码同步，app接口开发
|
2025-07-11 16:20:24 +08:00 |
|
|
|
2815e27240
|
晶全代码同步，app接口开发
|
2025-07-11 16:03:36 +08:00 |
|
|
|
f41bb097fd
|
添加设备编号
|
2025-07-08 14:43:28 +08:00 |
|
|
|
b26cb873b5
|
Merge remote-tracking branch 'origin/main' into dyf-device
# Conflicts:
# fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java
# fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java
|
2025-07-08 09:05:31 +08:00 |
|
|
|
43f6f2ca0b
|
设备绑定，解绑
|
2025-07-08 09:00:14 +08:00 |
|
|
|
d301e9da3c
|
短信验证码
|
2025-07-07 15:34:02 +08:00 |
|
|
|
6b2ebf2414
|
mqtt协议
|
2025-07-07 09:46:39 +08:00 |
|
|
|
407103a71e
|
修改成晶全服务器配置
|
2025-07-05 14:08:27 +08:00 |
|
|
|
e0bc282097
|
Merge remote-tracking branch 'origin/APP权限登录改造'
# Conflicts:
# fys-modules/pom.xml
# pom.xml
|
2025-07-01 13:58:39 +08:00 |
|
|
|
eac1b2e016
|
添加设备
|
2025-06-30 16:59:12 +08:00 |
|
|
|
f78ba3199c
|
APP登录
|
2025-06-28 16:28:15 +08:00 |
|
|
|
b94549185c
|
fys
|
2025-06-27 10:23:57 +08:00 |
|
