Commits · 42b36476d8601e469184a0628432dc9ee7b997fd · zengtianlai3 / ioc_sixiang_license

31 Jan, 2023 4 commits
- Merge branch 'master' of http://120.77.240.215:9701/tianlai3/ioc_sixiang_license · 42b36476
  ma authored Jan 31, 2023
  
  42b36476
- 用户模块变更 · e1a9b743
  ma authored Jan 31, 2023
  
  e1a9b743
- 更新文档 · 2bbf70a3
  AfirSraftGarrier authored Jan 31, 2023
  
  2bbf70a3
- 更新文档 · 609280a3
  AfirSraftGarrier authored Jan 31, 2023
  
  609280a3
30 Jan, 2023 13 commits
- 增加线程池 · fae7b1f2
  AfirSraftGarrier authored Jan 30, 2023
  
  fae7b1f2
- 更新 · ebabb02e
  AfirSraftGarrier authored Jan 30, 2023
  
  ebabb02e
- 用户新增字段 · 876dfa9e
  AfirSraftGarrier authored Jan 30, 2023
  
  876dfa9e
- 报警相关表 · 842385a7
  AfirSraftGarrier authored Jan 30, 2023
  
  842385a7
- 回退一些代码 · 3f6fc03e
  AfirSraftGarrier authored Jan 30, 2023
  
  3f6fc03e
- Merge branch 'for-yx' · d9b4a048
  AfirSraftGarrier authored Jan 30, 2023
```
# Conflicts:
#	license/pom.xml
#	license/src/main/java/iot/sixiang/license/controller/SysOperLogController.java
#	license/src/main/java/iot/sixiang/license/controller/UserController.java
#	license/src/main/java/iot/sixiang/license/handler/GlobalExceptionHandler.java
#	license/src/main/java/iot/sixiang/license/mapper/SysOperLogMapper.java
#	license/src/main/java/iot/sixiang/license/net/TcpClient.java
#	license/src/main/java/iot/sixiang/license/service/SysOperLogService.java
#	license/src/main/java/iot/sixiang/license/service/UserService.java
#	license/src/main/java/iot/sixiang/license/service/impl/SysOperLogServiceImpl.java
#	license/src/main/java/iot/sixiang/license/service/impl/UserServiceImpl.java
#	license/src/main/java/iot/sixiang/license/util/CommonUtil.java
#	license/src/main/resources/mapper/PmsUseLogMapper.xml
#	license/src/main/resources/mapper/SysOperLogMapper.xml
```
  d9b4a048
- Merge remote-tracking branch 'origin/master' · 0e466f24
  AfirSraftGarrier authored Jan 30, 2023
  
  0e466f24
- 增加报警表 · 7d5cb5cf
  AfirSraftGarrier authored Jan 30, 2023
  
  7d5cb5cf
- 修改报警通知的邮箱 · 25e5d8db
  ma authored Jan 30, 2023
  
  25e5d8db
- Merge branch 'master' of http://120.77.240.215:9701/tianlai3/ioc_sixiang_license · 279681d1
  ma authored Jan 30, 2023
  
  279681d1
- 修改日志模块 · ce877ab0
  ma authored Jan 30, 2023
  
  ce877ab0
- 增加权限和用户权限表 · c43d4c1f
  AfirSraftGarrier authored Jan 30, 2023
  
  c43d4c1f
- 用户表增加字段 · 04dee544
  AfirSraftGarrier authored Jan 30, 2023
  
  04dee544
06 Jan, 2023 1 commit
- 测试 · 11ef370f
  AfirSraftGarrier authored Jan 06, 2023
  
  11ef370f
09 Dec, 2022 13 commits
- Merge remote-tracking branch 'origin/master' into for-yx · cdff0268
  AfirSraftGarrier authored Dec 09, 2022
  
  cdff0268
- 上报错误方法改变 · 14de6597
  AfirSraftGarrier authored Dec 09, 2022
  
  14de6597
- 上报错误方法改变 · 4429867a
  AfirSraftGarrier authored Dec 09, 2022
  
  4429867a
- Merge remote-tracking branch 'origin/master' · a01e923e
  AfirSraftGarrier authored Dec 09, 2022
  
  a01e923e
- 上报错误方法改变 · cf191ace
  AfirSraftGarrier authored Dec 09, 2022
  
  cf191ace
- 解绑授权SN置为NULL · 2eb4ac13
  ma authored Dec 09, 2022
  
  2eb4ac13
- 解决授权信息与绑定sn不一致但鉴权成功问题 · 799fad48
  ma authored Dec 09, 2022
  
  799fad48
- Merge remote-tracking branch 'remotes/origin/master' into for-yx · 7f895196
  ma authored Dec 09, 2022
  
  7f895196
- 解绑更新授权SN · 42978028
  ma authored Dec 09, 2022
  
  42978028
- 解绑更新授权SN · e3dc1784
  ma authored Dec 09, 2022
  
  e3dc1784
- 解绑更新授权SN · 1964c25f
  ma authored Dec 09, 2022
  
  1964c25f
- 合并 · 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 9 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