Skip to content

I
ioc_sixiang_license
Switch branch/tag
  1. 02 Dec, 2022 7 commits
    • AfirSraftGarrier's avatar
      合并修改 · 5c56d65c
      AfirSraftGarrier authored
      5c56d65c
    • AfirSraftGarrier's avatar
      合并修改 · aba86e90
      AfirSraftGarrier authored
      aba86e90
    • AfirSraftGarrier's avatar
      Merge remote-tracking branch 'origin/master' into for-yx · dc9ff49d
      AfirSraftGarrier authored
      dc9ff49d
    • AfirSraftGarrier's avatar
      合并修改 · f725f03f
      AfirSraftGarrier authored
      f725f03f
    • AfirSraftGarrier's avatar
      合并修改 · 6f87e226
      AfirSraftGarrier authored
      6f87e226
    • AfirSraftGarrier's avatar
      Merge branch 'master' into for-yx · 3aa797e5
      AfirSraftGarrier authored 
      # 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
    • ma's avatar
      完善sql · 239c324e
      ma authored
      239c324e
  3. 01 Dec, 2022 3 commits
  5. 30 Nov, 2022 5 commits
  7. 29 Nov, 2022 6 commits
  9. 28 Nov, 2022 3 commits
  11. 27 Nov, 2022 8 commits
  13. 26 Nov, 2022 1 commit
  15. 25 Nov, 2022 7 commits