Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
黄嘉阳
/
iot-platform-server
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
5e51b66a
authored
Nov 21, 2023
by
huangjy
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix:激活license接口,
parent
045d8f40
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
10 deletions
Jenkinsfile
saas-module/src/main/java/com/makeit/controller/device/SaasDeviceController.java
server-module/src/main/java/com/makeit/module/controller/device/PlatDeviceController.java
Jenkinsfile
View file @
5e51b66a
...
@@ -74,7 +74,7 @@ node {
...
@@ -74,7 +74,7 @@ node {
}
}
dir
(
module
)
{
dir
(
module
)
{
sh
"/dependencies/apache-maven-3.8.
6/bin/mvn -s /dependencies/apache-maven-3.8.6
/conf/settings.xml clean install -Dmaven.test.skip=true"
sh
"/dependencies/apache-maven-3.8.
1/bin/mvn -s /dependencies/apache-maven-3.8.1
/conf/settings.xml clean install -Dmaven.test.skip=true"
}
}
}
}
...
...
saas-module/src/main/java/com/makeit/controller/device/SaasDeviceController.java
View file @
5e51b66a
...
@@ -10,6 +10,7 @@ import com.makeit.dto.platform.device.PlatDeviceDetailDTO;
...
@@ -10,6 +10,7 @@ import com.makeit.dto.platform.device.PlatDeviceDetailDTO;
import
com.makeit.dto.saas.device.PlatDeviceEditSaasDTO
;
import
com.makeit.dto.saas.device.PlatDeviceEditSaasDTO
;
import
com.makeit.dto.wechat.device.PlatDeviceAttrWechatDTO
;
import
com.makeit.dto.wechat.device.PlatDeviceAttrWechatDTO
;
import
com.makeit.entity.platform.device.PlatDevice
;
import
com.makeit.entity.platform.device.PlatDevice
;
import
com.makeit.global.annotation.AuthIgnore
;
import
com.makeit.global.aspect.tenant.TenantIdIgnore
;
import
com.makeit.global.aspect.tenant.TenantIdIgnore
;
import
com.makeit.module.iot.vo.DeviceProperties
;
import
com.makeit.module.iot.vo.DeviceProperties
;
import
com.makeit.service.platform.device.PlatDeviceService
;
import
com.makeit.service.platform.device.PlatDeviceService
;
...
@@ -82,4 +83,13 @@ public class SaasDeviceController {
...
@@ -82,4 +83,13 @@ public class SaasDeviceController {
return
ApiResponseUtils
.
success
();
return
ApiResponseUtils
.
success
();
}
}
@ApiOperation
(
"激活设备license"
)
@PostMapping
(
"active"
)
@AuthIgnore
@TenantIdIgnore
public
ApiResponseEntity
active
(
@RequestBody
BaseIdDTO
dto
)
{
platDeviceService
.
active
(
dto
);
return
ApiResponseUtils
.
success
();
}
}
}
server-module/src/main/java/com/makeit/module/controller/device/PlatDeviceController.java
View file @
5e51b66a
...
@@ -109,15 +109,6 @@ public class PlatDeviceController {
...
@@ -109,15 +109,6 @@ public class PlatDeviceController {
}
}
@ApiOperation
(
"激活设备license"
)
@PostMapping
(
"active"
)
@AuthIgnore
@TenantIdIgnore
public
ApiResponseEntity
active
(
@RequestBody
BaseIdDTO
dto
)
{
platDeviceService
.
active
(
dto
);
return
ApiResponseUtils
.
success
();
}
@ApiOperation
(
"设备获取登录RTMtoken"
)
@ApiOperation
(
"设备获取登录RTMtoken"
)
@PostMapping
(
"getDeviceRtmToken"
)
@PostMapping
(
"getDeviceRtmToken"
)
@AuthIgnore
@AuthIgnore
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment