Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot

# Conflicts: # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thinkmodelfunction/IotThinkModelFunctionController.http
2025-02-09 07:23:17 +08:00
parent bc9b3715b1 949fa22509
commit bb11fdd3fa
68 changed files with 707 additions and 359 deletions
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.http
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.http
@@ -1,7 +1,7 @@
 ### 请求 /login 接口 => 成功
 POST {{baseUrl}}/system/auth/login
 Content-Type: application/json
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}
 tag: Yunai.local

 {
@@ -14,7 +14,7 @@ tag: Yunai.local
 ### 请求 /login 接口 => 成功（无验证码)
 POST {{baseUrl}}/system/auth/login
 Content-Type: application/json
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}

 {
  "username": "admin",
@@ -24,10 +24,10 @@ tenant-id: {{adminTenentId}}
 ### 请求 /get-permission-info 接口 => 成功
 GET {{baseUrl}}/system/auth/get-permission-info
 Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}

 ### 请求 /list-menus 接口 => 成功
 GET {{baseUrl}}/system/list-menus
 Authorization: Bearer {{token}}
 #Authorization: Bearer a6aa7714a2e44c95aaa8a2c5adc2a67a
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.http
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.http
@@ -1,4 +1,4 @@
 ### 请求 /menu/list 接口 => 成功
 GET {{baseUrl}}/system/dict-data/list-all-simple
 Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ip/AreaController.http
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ip/AreaController.http
@@ -1,5 +1,5 @@
 ### 获得地区树
 GET {{baseUrl}}/system/area/tree
 Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}

--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.http
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.http
@@ -1,4 +1,4 @@
 ### 请求 /system/operate-log/page 接口 => 成功
 GET {{baseUrl}}/system/operate-log/page
 Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.http
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.http
@@ -2,7 +2,7 @@
 POST {{baseUrl}}/system/mail-template/send-mail
 Authorization: Bearer {{token}}
 Content-Type: application/json
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}

 {
  "templateCode": "test_01",
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2ClientController.http
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2ClientController.http
@@ -2,7 +2,7 @@
 POST {{baseUrl}}/system/oauth2-client/create
 Content-Type: application/json
 Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}

 {
  "id": "1",
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2OpenController.http
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2OpenController.http
@@ -1,13 +1,13 @@
 ### 请求 /system/oauth2/authorize 接口 => 成功
 GET {{baseUrl}}/system/oauth2/authorize?clientId=default
 Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}

 ### 请求 /system/oauth2/authorize + token 接口 => 成功
 POST {{baseUrl}}/system/oauth2/authorize
 Content-Type: application/x-www-form-urlencoded
 Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}

 response_type=token&client_id=default&scope={"user.read": true}&redirect_uri=https://www.iocoder.cn&auto_approve=true

@@ -15,7 +15,7 @@ response_type=token&client_id=default&scope={"user.read": true}&redirect_uri=htt
 POST {{baseUrl}}/system/oauth2/authorize
 Content-Type: application/x-www-form-urlencoded
 Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}

 response_type=code&client_id=default&scope={"user.read": true}&redirect_uri=https://www.iocoder.cn&auto_approve=false

@@ -23,7 +23,7 @@ response_type=code&client_id=default&scope={"user.read": true}&redirect_uri=http
 POST {{baseUrl}}/system/oauth2/token
 Content-Type: application/x-www-form-urlencoded
 Authorization: Basic ZGVmYXVsdDphZG1pbjEyMw==
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}

 grant_type=authorization_code&redirect_uri=https://www.iocoder.cn&code=189956c07a174588a97157eabef2f93a

@@ -31,7 +31,7 @@ grant_type=authorization_code&redirect_uri=https://www.iocoder.cn&code=189956c07
 POST {{baseUrl}}/system/oauth2/token
 Content-Type: application/x-www-form-urlencoded
 Authorization: Basic ZGVmYXVsdDphZG1pbjEyMw==
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}

 grant_type=password&username=admin&password=admin123&scope=user.read

@@ -39,16 +39,16 @@ grant_type=password&username=admin&password=admin123&scope=user.read
 POST {{baseUrl}}/system/oauth2/token
 Content-Type: application/x-www-form-urlencoded
 Authorization: Basic ZGVmYXVsdDphZG1pbjEyMw==
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}

 grant_type=refresh_token&refresh_token=00895465d6994f72a9d926ceeed0f588

 ### 请求 /system/oauth2/token + DELETE 接口 => 成功
 DELETE {{baseUrl}}/system/oauth2/token?token=ca8a188f464441d6949c51493a2b7596
 Authorization: Basic ZGVmYXVsdDphZG1pbjEyMw==
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}

 ### 请求 /system/oauth2/check-token 接口 => 成功
 POST {{baseUrl}}/system/oauth2/check-token?token=620d307c5b4148df8a98dd6c6c547106
 Authorization: Basic ZGVmYXVsdDphZG1pbjEyMw==
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2UserController.http
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2UserController.http
@@ -1,13 +1,13 @@
 ### 请求 /system/oauth2/user/get 接口 => 成功
 GET {{baseUrl}}/system/oauth2/user/get
 Authorization: Bearer 47f9c74ec11041f193b777ebb95c3b0d
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}

 ### 请求 /system/oauth2/user/update 接口 => 成功
 PUT {{baseUrl}}/system/oauth2/user/update
 Content-Type: application/json
 Authorization: Bearer 47f9c74ec11041f193b777ebb95c3b0d
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}

 {
  "nickname": "芋道源码"
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.http
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.http
@@ -1,4 +1,4 @@
 ### 请求 /menu/list 接口 => 成功
 GET {{baseUrl}}/system/menu/list
 Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.http
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.http
@@ -2,7 +2,7 @@
 POST {{baseUrl}}/system/role/create
 Authorization: Bearer {{token}}
 Content-Type: application/json
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}

 {
  "name": "测试角色",
@@ -14,7 +14,7 @@ tenant-id: {{adminTenentId}}
 POST {{baseUrl}}/system/role/update
 Authorization: Bearer {{token}}
 Content-Type: application/json
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}

 {
  "id": 100,
@@ -26,7 +26,7 @@ tenant-id: {{adminTenentId}}
 POST {{baseUrl}}/system/role/delete
 Content-Type: application/x-www-form-urlencoded
 Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}

 roleId=14

@@ -34,9 +34,9 @@ roleId=14
 GET {{baseUrl}}/system/role/get?id=100
 Content-Type: application/x-www-form-urlencoded
 Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}

 ### /role/page 成功
 GET {{baseUrl}}/system/role/page?pageNo=1&pageSize=10
 Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsTemplateController.http
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsTemplateController.http
@@ -2,7 +2,7 @@
 POST {{baseUrl}}/system/sms-template/send-sms
 Authorization: Bearer {{token}}
 Content-Type: application/json
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}

 {
  "templateCode": "test_01",
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialClientController.http
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialClientController.http
@@ -3,7 +3,7 @@ POST {{baseUrl}}/system/social-client/send-subscribe-message
 Authorization: Bearer {{token}}
 Content-Type: application/json
 #Authorization: Bearer test100
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}

 {
  "userId": 247,
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.http
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.http
@@ -5,7 +5,7 @@ GET {{baseUrl}}/system/tenant/get-id-by-name?name=芋道源码
 POST {{baseUrl}}/system/tenant/create
 Content-Type: application/json
 Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}

 {
  "name": "芋道",
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.http
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.http
@@ -2,4 +2,4 @@
 GET {{baseUrl}}/system/user/page?pageNo=1&pageSize=10
 Authorization: Bearer {{token}}
 #Authorization: Bearer test100
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserProfileController.http
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserProfileController.http
@@ -1,4 +1,4 @@
 ### 请求 /system/user/profile/get 接口 => 没有权限
 GET {{baseUrl}}/system/user/profile/get
 Authorization: Bearer {{token}}
-tenant-id: {{adminTenentId}}
+tenant-id: {{adminTenantId}}