• 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
Name
Last commit
Last update
license Loading commit data...
.gitignore Loading commit data...