Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5

data/init/sys_oss_config.json

@@ -1,26 +1,26 @@
  [
-    {
-      "id": 1,
-      "tenantId": "000000",
-      "configKey": "minio",
-      "accessKey": "ruoyi",
-      "secretKey": "ruoyi123",
-      "bucketName": "ruoyi",
-      "prefix": "",
-      "endpoint": "127.0.0.1:9000",
-      "domain": "",
-      "is_https": "N",
-      "region": "",
-      "accessPolicy": "1",
-      "status": "0",
-      "ext1": "",
-      "createDept": 103,
-      "createBy": 1,
+   {
+     "id": 1,
+     "tenantId": "000000",
+     "configKey": "minio",
+     "accessKey": "admin",
+     "secretKey": "iita@123",
+     "bucketName": "iotkit",
+     "prefix": "",
+     "endpoint": "159.75.222.119:9000",
+     "domain": "",
+     "is_https": "N",
+     "region": "",
+     "accessPolicy": "1",
+     "status": "0",
+     "ext1": "",
+     "createDept": 103,
+     "createBy": 1,
 
-      "updateBy": 1,
+     "updateBy": 1,
 
-      "remark": null
-    },
+     "remark": null
+   },
     {
       "id": 2,
       "tenantId": "000000",

iot-components/iot-component-tcp/dependency-reduced-pom.xml

@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>iot-components</artifactId>
-    <groupId>cc.iotkit</groupId>
-    <version>${revision}</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>iot-component-tcp</artifactId>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.4</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <artifactSet>
-            <includes>
-              <include>io.vertx:vertx-core</include>
-            </includes>
-          </artifactSet>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>${java.version}</source>
-          <target>${java.version}</target>
-          <forceJavacCompilerUse>true</forceJavacCompilerUse>
-          <useIncrementalCompilation>false</useIncrementalCompilation>
-          <encoding>utf8</encoding>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.13.2</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>hamcrest-core</artifactId>
-          <groupId>org.hamcrest</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>io.projectreactor</groupId>
-      <artifactId>reactor-core</artifactId>
-      <version>3.4.29</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.projectlombok</groupId>
-      <artifactId>lombok</artifactId>
-      <version>1.18.26</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.36</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>cc.iotkit</groupId>
-      <artifactId>iot-common-core</artifactId>
-      <version>0.4.5-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>cc.iotkit</groupId>
-      <artifactId>iot-component-base</artifactId>
-      <version>0.4.5-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>cc.iotkit</groupId>
-      <artifactId>iot-data-service</artifactId>
-      <version>0.4.5-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>cc.iotkit</groupId>
-      <artifactId>iot-script-engine</artifactId>
-      <version>0.4.5-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysOssConfigController.java

@@ -7,18 +7,18 @@ import cc.iotkit.common.log.annotation.Log;
 import cc.iotkit.common.log.enums.BusinessType;
 import cc.iotkit.common.validate.AddGroup;
 import cc.iotkit.common.validate.EditGroup;
-import cc.iotkit.common.validate.QueryGroup;
 import cc.iotkit.common.web.core.BaseController;
 import cc.iotkit.system.dto.bo.SysOssConfigBo;
 import cc.iotkit.system.dto.vo.SysOssConfigVo;
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import cc.iotkit.system.service.ISysOssConfigService;
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.annotations.ApiOperation;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -72,9 +72,10 @@ public class SysOssConfigController extends BaseController {
     /**
      * 修改对象存储配置
      */
+    @ApiOperation(value = "修改对象存储配置", notes = "修改对象存储配置")
     @SaCheckPermission("system:oss:edit")
     @Log(title = "对象存储配置", businessType = BusinessType.UPDATE)
-    @PutMapping()
+    @PostMapping()
     public void edit(@Validated(EditGroup.class) @RequestBody Request<SysOssConfigBo> bo) {
         ossConfigService.updateByBo(bo.getData());
     }
@@ -83,6 +84,7 @@ public class SysOssConfigController extends BaseController {
      * 删除对象存储配置
      *
      */
+    @ApiOperation(value = "删除对象存储配置", notes = "删除对象存储配置")
     @SaCheckPermission("system:oss:remove")
     @Log(title = "对象存储配置", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
@@ -93,6 +95,7 @@ public class SysOssConfigController extends BaseController {
     /**
      * 状态修改
      */
+    @ApiOperation(value = "状态修改", notes = "状态修改")
     @SaCheckPermission("system:oss:edit")
     @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE)
     @PostMapping("/changeStatus")