Commits · b94e7e4d7d436d47ef64340f7bb286b6693b6455 · zengtianlai3 / ioc_sixiang_license

09 Dec, 2022 2 commits

合并 · b94e7e4d
ma authored Dec 09, 2022

b94e7e4d

Merge remote-tracking branch 'remotes/origin/master' into for-yx · ede6dc08

ma authored Dec 09, 2022

# Conflicts:
#	license/pom.xml
#	license/src/main/java/iot/sixiang/license/device/DeviceServerHandler.java
#	license/src/main/java/iot/sixiang/license/util/CommonUtil.java

ede6dc08

08 Dec, 2022 13 commits
- Merge branch 'master' of http://120.77.240.215:9701/tianlai3/ioc_sixiang_license · 388cfef0
  ma authored Dec 08, 2022
  
  388cfef0
- 注释无用接口 · 72cd63aa
  ma authored Dec 08, 2022
  
  72cd63aa
- 上报错误方法改变 · 86a4d7d2
  AfirSraftGarrier authored Dec 08, 2022
  
  86a4d7d2
- Merge remote-tracking branch 'origin/master' · 6b49317b
  AfirSraftGarrier authored Dec 08, 2022
  
  6b49317b
- 上报错误方法改变 · d466a828
  AfirSraftGarrier authored Dec 08, 2022
  
  d466a828
- Merge branch 'master' of http://120.77.240.215:9701/tianlai3/ioc_sixiang_license · 93a74fd4
  ma authored Dec 08, 2022
  
  93a74fd4
- 修改错误上报处理接口 · c613c756
  ma authored Dec 08, 2022
  
  c613c756
- 上报错误方法改变 · 529de2a9
  AfirSraftGarrier authored Dec 08, 2022
  
  529de2a9
- 更新设备初始化信息 · 9fd060ef
  ma authored Dec 08, 2022
  
  9fd060ef
- Merge remote-tracking branch 'origin/master' · a260218c
  AfirSraftGarrier authored Dec 08, 2022
  
  a260218c
- 上报错误方法改变 · c108a349
  AfirSraftGarrier authored Dec 08, 2022
  
  c108a349
- 新增平台绑定接口 · 57f7cc77
  ma authored Dec 08, 2022
  
  57f7cc77
- 修改 · 0493c149
  AfirSraftGarrier authored Dec 08, 2022
  
  0493c149
05 Dec, 2022 3 commits
- 优化XSS处理 · 5b4098c8
  ma authored Dec 05, 2022
  
  5b4098c8
- Merge branch 'for-yx' of http://120.77.240.215:9701/tianlai3/ioc_sixiang_license into for-yx · 39d50ddd
  ma authored Dec 05, 2022
  
  39d50ddd
- 使用记录降序排序 · 66286c10
  ma authored Dec 05, 2022
  
  66286c10
02 Dec, 2022 16 commits
- 合并修改 · 37b49467
  AfirSraftGarrier authored Dec 02, 2022
  
  37b49467
- 微调 · 55b0b615
  ma authored Dec 02, 2022
  
  55b0b615
- Merge branch 'for-yx' of http://120.77.240.215:9701/tianlai3/ioc_sixiang_license into for-yx · 0b7b3a07
  ma authored Dec 02, 2022
  
  0b7b3a07
- 合并修改 · ca62d1da
  AfirSraftGarrier authored Dec 02, 2022
  
  ca62d1da
- Merge branch 'for-yx' of http://120.77.240.215:9701/tianlai3/ioc_sixiang_license into for-yx · 919313d3
  ma authored Dec 02, 2022
  
  919313d3
- 合并修改 · 5c56d65c
  AfirSraftGarrier authored Dec 02, 2022
  
  5c56d65c
- 合并修改 · aba86e90
  AfirSraftGarrier authored Dec 02, 2022
  
  aba86e90
- Merge branch 'for-yx' of http://120.77.240.215:9701/tianlai3/ioc_sixiang_license into for-yx · f89d785b
  ma authored Dec 02, 2022
  
  f89d785b
- Merge remote-tracking branch 'origin/master' into for-yx · dc9ff49d
  AfirSraftGarrier authored Dec 02, 2022
  
  dc9ff49d
- 合并修改 · f725f03f
  AfirSraftGarrier authored Dec 02, 2022
  
  f725f03f
- Merge branch 'for-yx' of http://120.77.240.215:9701/tianlai3/ioc_sixiang_license into for-yx · eaec19aa
  ma authored Dec 02, 2022
  
  eaec19aa
- 合并修改 · 6f87e226
  AfirSraftGarrier authored Dec 02, 2022
  
  6f87e226
- Revert "撤销merge" · a7d5b2f3
  ma authored Dec 02, 2022
```
This reverts commit ff60f483
```
  a7d5b2f3
- 撤销merge · ff60f483
  ma authored Dec 02, 2022
  
  ff60f483
- Merge branch 'master' into for-yx · 3aa797e5
  AfirSraftGarrier authored Dec 02, 2022
```
# Conflicts:
#	license/.gitignore
#	license/pom.xml
#	license/src/main/java/iot/sixiang/license/LicenseApplication.java
#	license/src/main/java/iot/sixiang/license/controller/DeviceController.java
#	license/src/main/java/iot/sixiang/license/controller/LoginController.java
#	license/src/main/java/iot/sixiang/license/device/DeviceManager.java
#	license/src/main/java/iot/sixiang/license/device/DeviceServerHandler.java
#	license/src/main/java/iot/sixiang/license/forward/ForwardClient.java
#	license/src/main/java/iot/sixiang/license/forward/ForwardManager.java
#	license/src/main/java/iot/sixiang/license/jwt/JwtFilter.java
#	license/src/main/java/iot/sixiang/license/model/ResResult.java
#	license/src/main/resources/application.yml
```
  3aa797e5
- 完善sql · 239c324e
  ma authored Dec 02, 2022
  
  239c324e
01 Dec, 2022 3 commits
- 下载文件新增设备SN列 · 2ae2b1d3
  ma authored Dec 01, 2022
  
  2ae2b1d3
- 放行查询绑定状态接口 · d65e92dc
  ma authored Dec 01, 2022
  
  d65e92dc
- 新增查询绑定状态接口 · 234b7e94
  ma authored Dec 01, 2022
  
  234b7e94
30 Nov, 2022 3 commits
- 修改bug · 8ee9100e
  马33 authored Nov 30, 2022
  
  8ee9100e
- 修改解绑bug · b121a3ed
  马33 authored Nov 30, 2022
  
  b121a3ed
- 修改bug · 2f7f426c
  马33 authored Nov 30, 2022
  
  2f7f426c