Browse Source

和物理世界的返回格式保持相同,格式化代码结构

luoguangyi 3 years ago
parent
commit
6753d7fdef
100 changed files with 274 additions and 135 deletions
  1. 10 2
      .gitignore
  2. 3 2
      iot-admin-server/src/main/java/com/yushu/modules/tool/service/codegen/impl/ToolCodegenSQLParser.java
  3. 19 0
      iot-business/pom.xml
  4. 0 73
      iot-common/src/main/java/com/yushu/framework/common/util/json/FastJsonUtil.java
  5. 0 18
      iot-common/src/main/resources/rebel.xml
  6. 1 1
      iot-common/pom.xml
  7. 0 0
      iot-framework/iot-common/src/main/java/com/yushu/framework/common/core/IntArrayValuable.java
  8. 0 0
      iot-framework/iot-common/src/main/java/com/yushu/framework/common/core/KeyValue.java
  9. 2 2
      iot-common/src/main/java/com/yushu/framework/common/exception/ErrorCode.java
  10. 1 1
      iot-common/src/main/java/com/yushu/framework/common/exception/ServiceException.java
  11. 1 2
      iot-common/src/main/java/com/yushu/framework/common/exception/enums/GlobalErrorCodeConstants.java
  12. 0 0
      iot-framework/iot-common/src/main/java/com/yushu/framework/common/exception/enums/ServiceErrorCodeRange.java
  13. 2 2
      iot-common/src/main/java/com/yushu/framework/common/exception/util/ServiceExceptionUtil.java
  14. 51 9
      iot-common/src/main/java/com/yushu/framework/common/pojo/CommonResult.java
  15. 0 0
      iot-framework/iot-common/src/main/java/com/yushu/framework/common/pojo/PageParam.java
  16. 0 0
      iot-framework/iot-common/src/main/java/com/yushu/framework/common/pojo/PageResult.java
  17. 0 0
      iot-framework/iot-common/src/main/java/com/yushu/framework/common/pojo/SortingField.java
  18. 0 0
      iot-framework/iot-common/src/main/java/com/yushu/framework/common/test/WebFilterOrderEnum.java
  19. 0 0
      iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/collection/ArrayUtils.java
  20. 0 0
      iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/collection/CollectionUtils.java
  21. 0 0
      iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/collection/MapUtils.java
  22. 0 0
      iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/collection/SetUtils.java
  23. 0 0
      iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/date/DateUtils.java
  24. 0 0
      iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/io/FileUtils.java
  25. 76 0
      iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/json/FastJsonUtil.java
  26. 0 0
      iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/json/JsonUtils.java
  27. 0 0
      iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/monitor/TracerUtils.java
  28. 0 0
      iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/object/ObjectUtils.java
  29. 0 0
      iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/servlet/ServletUtils.java
  30. 0 0
      iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/sping/SpringAopUtils.java
  31. 0 0
      iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/sping/SpringExpressionUtils.java
  32. 0 0
      iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/string/StrUtils.java
  33. 26 0
      iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/validation/ValidationUtils.java
  34. 0 0
      iot-framework/iot-common/src/main/java/com/yushu/framework/common/validation/InEnum.java
  35. 0 0
      iot-framework/iot-common/src/main/java/com/yushu/framework/common/validation/InEnumValidator.java
  36. 28 0
      iot-framework/iot-common/src/main/java/com/yushu/framework/common/validation/Mobile.java
  37. 25 0
      iot-framework/iot-common/src/main/java/com/yushu/framework/common/validation/MobileValidator.java
  38. 2 1
      iot-spring-boot-starter-excel/pom.xml
  39. 0 0
      iot-framework/iot-spring-boot-starter-excel/src/main/java/com/yushu/framework/excel/core/convert/JsonConvert.java
  40. 0 0
      iot-framework/iot-spring-boot-starter-excel/src/main/java/com/yushu/framework/excel/core/util/ExcelListener.java
  41. 0 0
      iot-framework/iot-spring-boot-starter-excel/src/main/java/com/yushu/framework/excel/core/util/ExcelUtils.java
  42. 2 1
      iot-spring-boot-starter-extension/pom.xml
  43. 0 0
      iot-framework/iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/config/ExtensionAutoConfiguration.java
  44. 0 0
      iot-framework/iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/BusinessScenario.java
  45. 0 0
      iot-framework/iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/ExtensionBootstrap.java
  46. 0 0
      iot-framework/iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/context/AbstractComponentExecutor.java
  47. 0 0
      iot-framework/iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/context/ExtensionContext.java
  48. 0 0
      iot-framework/iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/context/ExtensionContextHolder.java
  49. 0 0
      iot-framework/iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/context/ExtensionExecutor.java
  50. 0 0
      iot-framework/iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/factory/ExtensionDefinition.java
  51. 0 0
      iot-framework/iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/factory/ExtensionFactory.java
  52. 0 0
      iot-framework/iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/factory/ExtensionRegisterFactory.java
  53. 0 0
      iot-framework/iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/package-info.java
  54. 0 0
      iot-framework/iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/point/ExtensionPoint.java
  55. 0 0
      iot-framework/iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/stereotype/Extension.java
  56. 0 0
      iot-framework/iot-spring-boot-starter-extension/src/main/resources/META-INF/spring.factories
  57. 0 0
      iot-framework/iot-spring-boot-starter-extension/src/test/java/com/yushu/framework/extension/Application.java
  58. 0 0
      iot-framework/iot-spring-boot-starter-extension/src/test/java/com/yushu/framework/extension/ExtensionTest.java
  59. 0 0
      iot-framework/iot-spring-boot-starter-extension/src/test/java/com/yushu/framework/extension/package-info.java
  60. 0 0
      iot-framework/iot-spring-boot-starter-extension/src/test/java/com/yushu/framework/extension/pay/PayExtensionPoint.java
  61. 0 0
      iot-framework/iot-spring-boot-starter-extension/src/test/java/com/yushu/framework/extension/pay/command/TransactionsCommand.java
  62. 0 0
      iot-framework/iot-spring-boot-starter-extension/src/test/java/com/yushu/framework/extension/pay/domain/TransactionsResult.java
  63. 0 0
      iot-framework/iot-spring-boot-starter-extension/src/test/java/com/yushu/framework/extension/pay/impl/AlipayService.java
  64. 0 0
      iot-framework/iot-spring-boot-starter-extension/src/test/java/com/yushu/framework/extension/pay/impl/WechatPayService.java
  65. 2 1
      iot-spring-boot-starter-mybatis/pom.xml
  66. 0 0
      iot-framework/iot-spring-boot-starter-mybatis/src/main/java/com/yushu/framework/datasource/config/DataSourceAutoConfiguration.java
  67. 0 0
      iot-framework/iot-spring-boot-starter-mybatis/src/main/java/com/yushu/framework/datasource/core/enums/DataSourceEnum.java
  68. 0 0
      iot-framework/iot-spring-boot-starter-mybatis/src/main/java/com/yushu/framework/datasource/core/filter/DruidAdRemoveFilter.java
  69. 0 0
      iot-framework/iot-spring-boot-starter-mybatis/src/main/java/com/yushu/framework/mybatis/config/MybatisAutoConfiguration.java
  70. 2 2
      iot-spring-boot-starter-mybatis/src/main/java/com/yushu/framework/mybatis/core/dataobject/BaseDO.java
  71. 4 4
      iot-spring-boot-starter-mybatis/src/main/java/com/yushu/framework/mybatis/core/handler/DefaultDBFieldHandler.java
  72. 0 0
      iot-framework/iot-spring-boot-starter-mybatis/src/main/java/com/yushu/framework/mybatis/core/mapper/BaseMapperX.java
  73. 0 0
      iot-framework/iot-spring-boot-starter-mybatis/src/main/java/com/yushu/framework/mybatis/core/query/QueryWrapperX.java
  74. 2 2
      iot-spring-boot-starter-mybatis/src/main/java/com/yushu/framework/mybatis/core/type/JsonLongSetTypeHandler.java
  75. 0 0
      iot-framework/iot-spring-boot-starter-mybatis/src/main/java/com/yushu/framework/mybatis/core/util/MyBatisUtils.java
  76. 0 0
      iot-framework/iot-spring-boot-starter-mybatis/src/main/resources/META-INF/spring.factories
  77. 2 1
      iot-spring-boot-starter-redis/pom.xml
  78. 0 0
      iot-framework/iot-spring-boot-starter-redis/src/main/java/com/yushu/framework/redis/config/RedisAutoConfiguration.java
  79. 0 0
      iot-framework/iot-spring-boot-starter-redis/src/main/java/com/yushu/framework/redis/core/RedisKeyDefine.java
  80. 4 4
      iot-spring-boot-starter-redis/src/main/java/com/yushu/framework/redis/core/RedisKeyRegistry.java
  81. 0 0
      iot-framework/iot-spring-boot-starter-redis/src/main/resources/META-INF/spring.factories
  82. 2 1
      iot-spring-boot-starter-test/pom.xml
  83. 0 0
      iot-framework/iot-spring-boot-starter-test/src/main/java/com/yushu/framework/test/core/ut/BaseMockitoUnitTest.java
  84. 1 1
      iot-spring-boot-starter-test/src/main/java/com/yushu/framework/test/core/util/AssertUtils.java
  85. 1 1
      iot-spring-boot-starter-test/src/main/java/com/yushu/framework/test/core/util/RandomUtils.java
  86. 2 1
      iot-spring-boot-starter-web/pom.xml
  87. 2 2
      iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/RequestLogAspect.java
  88. 0 0
      iot-framework/iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/config/ApiLogAutoConfiguration.java
  89. 1 1
      iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/core/filter/ApiAccessLogFilter.java
  90. 0 0
      iot-framework/iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/core/service/ApiAccessLogFrameworkService.java
  91. 0 0
      iot-framework/iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/core/service/ApiErrorLogFrameworkService.java
  92. 0 0
      iot-framework/iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/core/service/ApiLogServiceImpl.java
  93. 0 0
      iot-framework/iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/core/service/dto/ApiAccessLogCreateDTO.java
  94. 0 0
      iot-framework/iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/core/service/dto/ApiErrorLogCreateDTO.java
  95. 0 0
      iot-framework/iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/serializer/FastJsonSerializer.java
  96. 0 0
      iot-framework/iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/serializer/JacksonJsonSerializer.java
  97. 0 0
      iot-framework/iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/serializer/JsonSerializer.java
  98. 0 0
      iot-framework/iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/serializer/SerializerWrapper.java
  99. 0 0
      iot-framework/iot-spring-boot-starter-web/src/main/java/com/yushu/framework/jackson/config/JacksonAutoConfiguration.java
  100. 0 0
      iot-spring-boot-starter-web/src/main/java/com/yushu/framework/jackson/core/databind/LocalDateTimeDeserializer.java

+ 10 - 2
.gitignore

@@ -29,6 +29,14 @@ build/
 
 ### VS Code ###
 .vscode/
-demo/
+
+### JRebel ###
 rebel.xml
-spring-cloud-alibaba-examples/
+rebel-remote.xml
+
+### Others ###
+*.log
+*/log
+
+demo/
+spring-cloud-alibaba-examples/

+ 3 - 2
iot-admin-server/src/main/java/com/yushu/modules/tool/service/codegen/impl/ToolCodegenSQLParser.java

@@ -16,6 +16,7 @@ import org.apache.commons.collections4.keyvalue.DefaultKeyValue;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import static com.alibaba.druid.sql.SQLUtils.normalize;
 
@@ -23,7 +24,7 @@ import static com.alibaba.druid.sql.SQLUtils.normalize;
  * SQL 解析器,将创建表的 SQL,解析成 {@link ToolSchemaTableDO} 和 {@link ToolSchemaColumnDO} 对象,
  * 后续可以基于它们,生成代码~
  *
- * @author
+ * @author 芋道源码
  */
 public class ToolCodegenSQLParser {
 
@@ -97,7 +98,7 @@ public class ToolCodegenSQLParser {
         columns.add(ToolSchemaColumnDO.builder()
                 .columnName(normalize(definition.getColumnName()))
                 .columnType(definition.getDataType().toString())
-                .columnComment(normalize(definition.getComment().toString()))
+                .columnComment(Objects.isNull(definition.getComment()) ? "" : normalize(definition.getComment().toString()))
                 .nullable(!text.contains(" NOT NULL"))
                 .primaryKey(false)
                 .autoIncrement(text.contains("AUTO_INCREMENT"))

+ 19 - 0
iot-business/pom.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>iot</artifactId>
+        <groupId>com.yushu</groupId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>iot-business</artifactId>
+    <packaging>pom</packaging>
+    <name>${project.artifactId}</name>
+    <description>iot业务代码</description>
+    <modules>
+    </modules>
+
+</project>

+ 0 - 73
iot-common/src/main/java/com/yushu/framework/common/util/json/FastJsonUtil.java

@@ -1,73 +0,0 @@
-//package com.yushu.framework.common.util.json;
-//
-//
-//import cn.hutool.core.util.StrUtil;
-//import lombok.extern.slf4j.Slf4j;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * @description: fastJson工具类
-// * @author: luoguangyi
-// * @company: yushu Technology Co.,Ltd
-// * @since: 2020/7/9 14:48
-// * @version: V1.0
-// **/
-//@Slf4j
-//public class FastJsonUtil {
-//    /**
-//     * @param content:
-//     * @param t:
-//     * @description:将json数据转换成pojo对象list
-//     * @exception:
-//     * @author: LuoGuangyi
-//     * @company: yushu Technology Co.,Ltd
-//     * @return: java.util.List<T>
-//     * @since: 2020/10/31 21:24
-//     * @version: V1.0
-//     */
-//    public static <T> List<T> jsonToList(String content, Class<T> t) {
-//        if (StrUtil.isNotBlank(content)) {
-//            // 把字符串转成json对象
-//            return JSONArray.parseArray(content, t);
-//        }
-//        return new ArrayList<T>();
-//    }
-//
-//    /**
-//     * 将json字符串反序列号成对象
-//     *
-//     * @param <T>
-//     * @param json
-//     * @param clazz
-//     * @return
-//     */
-//    public static <T> T readValue(String json, Class<T> clazz) throws Exception {
-//        if (StringUtils.isNotBlank(json)) {
-//            return JSONObject.parseObject(json, clazz);
-//        }
-//        return clazz.newInstance();
-//    }
-//
-//    /**
-//     * @param json
-//     * @param type
-//     * @return
-//     * @Title: readValue
-//     * @return: T
-//     */
-//    public static <T> T parseObject(String json, TypeReference<T> type) {
-//        return JSONObject.parseObject(json, type);
-//    }
-//
-//    /**
-//     * 将对象序列号json字符串
-//     *
-//     * @param obj
-//     * @return
-//     */
-//    public static String writeValue(Object obj) {
-//        return JSONObject.toJSONString(obj);
-//    }
-//}

+ 0 - 18
iot-common/src/main/resources/rebel.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
-  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
--->
-<application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" generated-by="intellij"
-             xmlns="http://www.zeroturnaround.com"
-             xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
-
-    <id>iot-common</id>
-
-    <classpath>
-        <dir name="D:/workspace/iot/iot-common/target/classes">
-        </dir>
-    </classpath>
-
-</application>

+ 1 - 1
iot-common/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>com.yushu</groupId>
-        <artifactId>iot</artifactId>
+        <artifactId>iot-framework</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

iot-common/src/main/java/com/yushu/framework/common/core/IntArrayValuable.java → iot-framework/iot-common/src/main/java/com/yushu/framework/common/core/IntArrayValuable.java


iot-common/src/main/java/com/yushu/framework/common/core/KeyValue.java → iot-framework/iot-common/src/main/java/com/yushu/framework/common/core/KeyValue.java


+ 2 - 2
iot-common/src/main/java/com/yushu/framework/common/exception/ErrorCode.java

@@ -22,11 +22,11 @@ public class ErrorCode {
     /**
      * 错误提示
      */
-    private final String msg;
+    private final String message;
 
     public ErrorCode(Integer code, String message) {
         this.code = code;
-        this.msg = message;
+        this.message = message;
     }
 
 }

+ 1 - 1
iot-common/src/main/java/com/yushu/framework/common/exception/ServiceException.java

@@ -30,7 +30,7 @@ public final class ServiceException extends RuntimeException {
 
     public ServiceException(ErrorCode errorCode) {
         this.code = errorCode.getCode();
-        this.message = errorCode.getMsg();
+        this.message = errorCode.getMessage();
     }
 
     public ServiceException(Integer code, String message) {

+ 1 - 2
iot-common/src/main/java/com/yushu/framework/common/exception/enums/GlobalErrorCodeConstants.java

@@ -8,13 +8,12 @@ import com.yushu.framework.common.exception.ErrorCode;
  * <p>
  * 一般情况下,使用 HTTP 响应状态码 https://developer.mozilla.org/zh-CN/docs/Web/HTTP/Status
  * 虽然说,HTTP 响应状态码作为业务使用表达能力偏弱,但是使用在系统层面还是非常不错的
- * 比较特殊的是,因为之前一直使用 0 作为成功,就不使用 200 啦。
  *
  * @author
  */
 public interface GlobalErrorCodeConstants {
 
-    ErrorCode SUCCESS = new ErrorCode(0, "成功");
+    ErrorCode SUCCESS = new ErrorCode(200, "成功");
 
     // ========== 客户端错误段 ==========
 

iot-common/src/main/java/com/yushu/framework/common/exception/enums/ServiceErrorCodeRange.java → iot-framework/iot-common/src/main/java/com/yushu/framework/common/exception/enums/ServiceErrorCodeRange.java


+ 2 - 2
iot-common/src/main/java/com/yushu/framework/common/exception/util/ServiceExceptionUtil.java

@@ -45,12 +45,12 @@ public class ServiceExceptionUtil {
     // ========== 和 ServiceException 的集成 ==========
 
     public static ServiceException exception(ErrorCode errorCode) {
-        String messagePattern = MESSAGES.getOrDefault(errorCode.getCode(), errorCode.getMsg());
+        String messagePattern = MESSAGES.getOrDefault(errorCode.getCode(), errorCode.getMessage());
         return exception0(errorCode.getCode(), messagePattern);
     }
 
     public static ServiceException exception(ErrorCode errorCode, Object... params) {
-        String messagePattern = MESSAGES.getOrDefault(errorCode.getCode(), errorCode.getMsg());
+        String messagePattern = MESSAGES.getOrDefault(errorCode.getCode(), errorCode.getMessage());
         return exception0(errorCode.getCode(), messagePattern, params);
     }
 

+ 51 - 9
iot-common/src/main/java/com/yushu/framework/common/pojo/CommonResult.java

@@ -1,5 +1,6 @@
 package com.yushu.framework.common.pojo;
 
+import cn.hutool.core.collection.CollUtil;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.yushu.framework.common.exception.ErrorCode;
 import com.yushu.framework.common.exception.ServiceException;
@@ -8,6 +9,7 @@ import lombok.Data;
 import org.springframework.util.Assert;
 
 import java.io.Serializable;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -17,6 +19,14 @@ import java.util.Objects;
  */
 @Data
 public class CommonResult<T> implements Serializable {
+    /**
+     * 成功
+     */
+    private static final String SUCCESS = "success";
+    /**
+     * 失败
+     */
+    private static final String FAIL = "fail";
 
     /**
      * 错误码
@@ -25,15 +35,28 @@ public class CommonResult<T> implements Serializable {
      */
     private Integer code;
     /**
+     * success、fail
+     */
+    private String result;
+    /**
      * 返回数据
      */
     private T data;
     /**
      * 错误提示,用户可阅读
      *
-     * @see ErrorCode#getMsg() ()
+     * @see ErrorCode#getMessage() ()
      */
-    private String msg;
+    private String message;
+    /**
+     * 返回记录条数或者操作记录条数
+     */
+    private Long count;
+    /**
+     * 记录总条数
+     */
+    private Long total;
+
 
     /**
      * 将传入的 result 对象,转换成另外一个泛型结果的对象
@@ -45,26 +68,28 @@ public class CommonResult<T> implements Serializable {
      * @return 新的 CommonResult 对象
      */
     public static <T> CommonResult<T> error(CommonResult<?> result) {
-        return error(result.getCode(), result.getMsg());
+        return error(result.getCode(), result.getMessage());
     }
 
     public static <T> CommonResult<T> error(Integer code, String message) {
         Assert.isTrue(!GlobalErrorCodeConstants.SUCCESS.getCode().equals(code), "code 必须是错误的!");
         CommonResult<T> result = new CommonResult<>();
         result.code = code;
-        result.msg = message;
+        result.message = message;
+        result.result = FAIL;
         return result;
     }
 
     public static <T> CommonResult<T> error(ErrorCode errorCode) {
-        return error(errorCode.getCode(), errorCode.getMsg());
+        return error(errorCode.getCode(), errorCode.getMessage());
     }
 
     public static <T> CommonResult<T> success(T data) {
         CommonResult<T> result = new CommonResult<>();
         result.code = GlobalErrorCodeConstants.SUCCESS.getCode();
         result.data = data;
-        result.msg = "";
+        result.result = SUCCESS;
+        result.message = "";
         return result;
     }
 
@@ -76,13 +101,30 @@ public class CommonResult<T> implements Serializable {
         return error(serviceException.getCode(), serviceException.getMessage());
     }
 
+    /**
+     * 多个数据
+     *
+     * @param records
+     * @param total
+     * @param <T>
+     * @return
+     */
+    public static <T> CommonResult<List<T>> multi(List<T> records, long total) {
+        // 容错处理,出现总数比实际数少时,以实际数为准(page查询全部时,total为0)
+        int size = CollUtil.size(records);
+        CommonResult<List<T>> result = success(records);
+        result.setCount(Long.valueOf(CollUtil.size(records)));
+        result.setTotal(total);
+        return result;
+    }
+
+    // ========= 和 Exception 异常体系集成 =========
+
     @JsonIgnore // 避免 jackson 序列化
     public boolean isSuccess() {
         return isSuccess(code);
     }
 
-    // ========= 和 Exception 异常体系集成 =========
-
     @JsonIgnore // 避免 jackson 序列化
     public boolean isError() {
         return !isSuccess();
@@ -96,7 +138,7 @@ public class CommonResult<T> implements Serializable {
             return;
         }
         // 业务异常
-        throw new ServiceException(code, msg);
+        throw new ServiceException(code, message);
     }
 
 }

iot-common/src/main/java/com/yushu/framework/common/pojo/PageParam.java → iot-framework/iot-common/src/main/java/com/yushu/framework/common/pojo/PageParam.java


iot-common/src/main/java/com/yushu/framework/common/pojo/PageResult.java → iot-framework/iot-common/src/main/java/com/yushu/framework/common/pojo/PageResult.java


iot-common/src/main/java/com/yushu/framework/common/pojo/SortingField.java → iot-framework/iot-common/src/main/java/com/yushu/framework/common/pojo/SortingField.java


iot-common/src/main/java/com/yushu/framework/common/test/WebFilterOrderEnum.java → iot-framework/iot-common/src/main/java/com/yushu/framework/common/test/WebFilterOrderEnum.java


iot-common/src/main/java/com/yushu/framework/common/util/collection/ArrayUtils.java → iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/collection/ArrayUtils.java


iot-common/src/main/java/com/yushu/framework/common/util/collection/CollectionUtils.java → iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/collection/CollectionUtils.java


iot-common/src/main/java/com/yushu/framework/common/util/collection/MapUtils.java → iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/collection/MapUtils.java


iot-common/src/main/java/com/yushu/framework/common/util/collection/SetUtils.java → iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/collection/SetUtils.java


iot-common/src/main/java/com/yushu/framework/common/util/date/DateUtils.java → iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/date/DateUtils.java


iot-common/src/main/java/com/yushu/framework/common/util/io/FileUtils.java → iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/io/FileUtils.java


+ 76 - 0
iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/json/FastJsonUtil.java

@@ -0,0 +1,76 @@
+package com.yushu.framework.common.util.json;
+
+
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description: fastJson工具类
+ * @author: luoguangyi
+ * @company: yushu Technology Co.,Ltd
+ * @since: 2020/7/9 14:48
+ * @version: V1.0
+ **/
+@Slf4j
+public class FastJsonUtil {
+    /**
+     * @param content:
+     * @param t:
+     * @description:将json数据转换成pojo对象list
+     * @exception:
+     * @author: LuoGuangyi
+     * @company: yushu Technology Co.,Ltd
+     * @return: java.util.List<T>
+     * @since: 2020/10/31 21:24
+     * @version: V1.0
+     */
+    public static <T> List<T> jsonToList(String content, Class<T> t) {
+        if (StrUtil.isNotBlank(content)) {
+            // 把字符串转成json对象
+            return JSONArray.parseArray(content, t);
+        }
+        return new ArrayList<T>();
+    }
+
+    /**
+     * 将json字符串反序列号成对象
+     *
+     * @param <T>
+     * @param json
+     * @param clazz
+     * @return
+     */
+    public static <T> T readValue(String json, Class<T> clazz) throws Exception {
+        if (StrUtil.isNotBlank(json)) {
+            return JSONObject.parseObject(json, clazz);
+        }
+        return clazz.newInstance();
+    }
+
+    /**
+     * @param json
+     * @param type
+     * @return
+     * @Title: readValue
+     * @return: T
+     */
+    public static <T> T parseObject(String json, TypeReference<T> type) {
+        return JSONObject.parseObject(json, type);
+    }
+
+    /**
+     * 将对象序列号json字符串
+     *
+     * @param obj
+     * @return
+     */
+    public static String writeValue(Object obj) {
+        return JSONObject.toJSONString(obj);
+    }
+}

iot-common/src/main/java/com/yushu/framework/common/util/json/JsonUtils.java → iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/json/JsonUtils.java


iot-common/src/main/java/com/yushu/framework/common/util/monitor/TracerUtils.java → iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/monitor/TracerUtils.java


iot-common/src/main/java/com/yushu/framework/common/util/object/ObjectUtils.java → iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/object/ObjectUtils.java


iot-common/src/main/java/com/yushu/framework/common/util/servlet/ServletUtils.java → iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/servlet/ServletUtils.java


iot-common/src/main/java/com/yushu/framework/common/util/sping/SpringAopUtils.java → iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/sping/SpringAopUtils.java


iot-common/src/main/java/com/yushu/framework/common/util/sping/SpringExpressionUtils.java → iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/sping/SpringExpressionUtils.java


iot-common/src/main/java/com/yushu/framework/common/util/string/StrUtils.java → iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/string/StrUtils.java


+ 26 - 0
iot-framework/iot-common/src/main/java/com/yushu/framework/common/util/validation/ValidationUtils.java

@@ -0,0 +1,26 @@
+package com.yushu.framework.common.util.validation;
+
+import cn.hutool.core.util.PhoneUtil;
+import org.springframework.util.StringUtils;
+
+import java.util.regex.Pattern;
+
+/**
+ * 校验工具类
+ *
+ * @author 芋道源码
+ */
+public class ValidationUtils {
+
+    private static Pattern PATTERN_URL = Pattern.compile("^(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]");
+
+    public static boolean isMobile(String mobile) {
+        return PhoneUtil.isMobile(mobile);
+    }
+
+    public static boolean isURL(String url) {
+        //URLUtil.isJarFileURL()
+        return StringUtils.hasText(url) && PATTERN_URL.matcher(url).matches();
+    }
+
+}

iot-common/src/main/java/com/yushu/framework/common/validation/InEnum.java → iot-framework/iot-common/src/main/java/com/yushu/framework/common/validation/InEnum.java


iot-common/src/main/java/com/yushu/framework/common/validation/InEnumValidator.java → iot-framework/iot-common/src/main/java/com/yushu/framework/common/validation/InEnumValidator.java


+ 28 - 0
iot-framework/iot-common/src/main/java/com/yushu/framework/common/validation/Mobile.java

@@ -0,0 +1,28 @@
+package com.yushu.framework.common.validation;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import java.lang.annotation.*;
+
+@Target({
+        ElementType.METHOD,
+        ElementType.FIELD,
+        ElementType.ANNOTATION_TYPE,
+        ElementType.CONSTRUCTOR,
+        ElementType.PARAMETER,
+        ElementType.TYPE_USE
+})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Constraint(
+        validatedBy = MobileValidator.class
+)
+public @interface Mobile {
+
+    String message() default "手机号格式不正确";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+
+}

+ 25 - 0
iot-framework/iot-common/src/main/java/com/yushu/framework/common/validation/MobileValidator.java

@@ -0,0 +1,25 @@
+package com.yushu.framework.common.validation;
+
+import cn.hutool.core.util.StrUtil;
+import com.yushu.framework.common.util.validation.ValidationUtils;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+public class MobileValidator implements ConstraintValidator<Mobile, String> {
+
+    @Override
+    public void initialize(Mobile annotation) {
+    }
+
+    @Override
+    public boolean isValid(String value, ConstraintValidatorContext context) {
+        // 如果手机号为空,默认不校验,即校验通过
+        if (StrUtil.isEmpty(value)) {
+            return true;
+        }
+        // 校验手机
+        return ValidationUtils.isMobile(value);
+    }
+
+}

+ 2 - 1
iot-spring-boot-starter-excel/pom.xml

@@ -4,8 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>com.yushu</groupId>
-        <artifactId>iot</artifactId>
+        <artifactId>iot-framework</artifactId>
         <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>iot-spring-boot-starter-excel</artifactId>

iot-spring-boot-starter-excel/src/main/java/com/yushu/framework/excel/core/convert/JsonConvert.java → iot-framework/iot-spring-boot-starter-excel/src/main/java/com/yushu/framework/excel/core/convert/JsonConvert.java


iot-spring-boot-starter-excel/src/main/java/com/yushu/framework/excel/core/util/ExcelListener.java → iot-framework/iot-spring-boot-starter-excel/src/main/java/com/yushu/framework/excel/core/util/ExcelListener.java


iot-spring-boot-starter-excel/src/main/java/com/yushu/framework/excel/core/util/ExcelUtils.java → iot-framework/iot-spring-boot-starter-excel/src/main/java/com/yushu/framework/excel/core/util/ExcelUtils.java


+ 2 - 1
iot-spring-boot-starter-extension/pom.xml

@@ -4,8 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>com.yushu</groupId>
-        <artifactId>iot</artifactId>
+        <artifactId>iot-framework</artifactId>
         <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/config/ExtensionAutoConfiguration.java → iot-framework/iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/config/ExtensionAutoConfiguration.java


iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/BusinessScenario.java → iot-framework/iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/BusinessScenario.java


iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/ExtensionBootstrap.java → iot-framework/iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/ExtensionBootstrap.java


iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/context/AbstractComponentExecutor.java → iot-framework/iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/context/AbstractComponentExecutor.java


iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/context/ExtensionContext.java → iot-framework/iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/context/ExtensionContext.java


iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/context/ExtensionContextHolder.java → iot-framework/iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/context/ExtensionContextHolder.java


iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/context/ExtensionExecutor.java → iot-framework/iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/context/ExtensionExecutor.java


iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/factory/ExtensionDefinition.java → iot-framework/iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/factory/ExtensionDefinition.java


iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/factory/ExtensionFactory.java → iot-framework/iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/factory/ExtensionFactory.java


iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/factory/ExtensionRegisterFactory.java → iot-framework/iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/factory/ExtensionRegisterFactory.java


iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/package-info.java → iot-framework/iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/package-info.java


iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/point/ExtensionPoint.java → iot-framework/iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/point/ExtensionPoint.java


iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/stereotype/Extension.java → iot-framework/iot-spring-boot-starter-extension/src/main/java/com/yushu/framework/extension/core/stereotype/Extension.java


iot-spring-boot-starter-extension/src/main/resources/META-INF/spring.factories → iot-framework/iot-spring-boot-starter-extension/src/main/resources/META-INF/spring.factories


iot-spring-boot-starter-extension/src/test/java/com/yushu/framework/extension/Application.java → iot-framework/iot-spring-boot-starter-extension/src/test/java/com/yushu/framework/extension/Application.java


iot-spring-boot-starter-extension/src/test/java/com/yushu/framework/extension/ExtensionTest.java → iot-framework/iot-spring-boot-starter-extension/src/test/java/com/yushu/framework/extension/ExtensionTest.java


iot-spring-boot-starter-extension/src/test/java/com/yushu/framework/extension/package-info.java → iot-framework/iot-spring-boot-starter-extension/src/test/java/com/yushu/framework/extension/package-info.java


iot-spring-boot-starter-extension/src/test/java/com/yushu/framework/extension/pay/PayExtensionPoint.java → iot-framework/iot-spring-boot-starter-extension/src/test/java/com/yushu/framework/extension/pay/PayExtensionPoint.java


iot-spring-boot-starter-extension/src/test/java/com/yushu/framework/extension/pay/command/TransactionsCommand.java → iot-framework/iot-spring-boot-starter-extension/src/test/java/com/yushu/framework/extension/pay/command/TransactionsCommand.java


iot-spring-boot-starter-extension/src/test/java/com/yushu/framework/extension/pay/domain/TransactionsResult.java → iot-framework/iot-spring-boot-starter-extension/src/test/java/com/yushu/framework/extension/pay/domain/TransactionsResult.java


iot-spring-boot-starter-extension/src/test/java/com/yushu/framework/extension/pay/impl/AlipayService.java → iot-framework/iot-spring-boot-starter-extension/src/test/java/com/yushu/framework/extension/pay/impl/AlipayService.java


iot-spring-boot-starter-extension/src/test/java/com/yushu/framework/extension/pay/impl/WechatPayService.java → iot-framework/iot-spring-boot-starter-extension/src/test/java/com/yushu/framework/extension/pay/impl/WechatPayService.java


+ 2 - 1
iot-spring-boot-starter-mybatis/pom.xml

@@ -4,8 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>com.yushu</groupId>
-        <artifactId>iot</artifactId>
+        <artifactId>iot-framework</artifactId>
         <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>iot-spring-boot-starter-mybatis</artifactId>

iot-spring-boot-starter-mybatis/src/main/java/com/yushu/framework/datasource/config/DataSourceAutoConfiguration.java → iot-framework/iot-spring-boot-starter-mybatis/src/main/java/com/yushu/framework/datasource/config/DataSourceAutoConfiguration.java


iot-spring-boot-starter-mybatis/src/main/java/com/yushu/framework/datasource/core/enums/DataSourceEnum.java → iot-framework/iot-spring-boot-starter-mybatis/src/main/java/com/yushu/framework/datasource/core/enums/DataSourceEnum.java


iot-spring-boot-starter-mybatis/src/main/java/com/yushu/framework/datasource/core/filter/DruidAdRemoveFilter.java → iot-framework/iot-spring-boot-starter-mybatis/src/main/java/com/yushu/framework/datasource/core/filter/DruidAdRemoveFilter.java


iot-spring-boot-starter-mybatis/src/main/java/com/yushu/framework/mybatis/config/MybatisAutoConfiguration.java → iot-framework/iot-spring-boot-starter-mybatis/src/main/java/com/yushu/framework/mybatis/config/MybatisAutoConfiguration.java


+ 2 - 2
iot-spring-boot-starter-mybatis/src/main/java/com/yushu/framework/mybatis/core/dataobject/BaseDO.java

@@ -30,14 +30,14 @@ public class BaseDO implements Serializable {
      * 使用 String 类型的原因是,未来可能会存在非数值的情况,留好拓展性。
      */
     @TableField(fill = FieldFill.INSERT)
-    private String creator;
+    private String createUser;
     /**
      * 更新者,目前使用 SysUser 的 id 编号
      * <p>
      * 使用 String 类型的原因是,未来可能会存在非数值的情况,留好拓展性。
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updater;
+    private String updateUser;
     /**
      * 是否删除
      */

+ 4 - 4
iot-spring-boot-starter-mybatis/src/main/java/com/yushu/framework/mybatis/core/handler/DefaultDBFieldHandler.java

@@ -34,12 +34,12 @@ public class DefaultDBFieldHandler implements MetaObjectHandler {
 
             Long userId = WebFrameworkUtils.getLoginUserId();
             // 当前登录用户不为空,创建人为空,则当前登录用户为创建人
-            if (Objects.nonNull(userId) && Objects.isNull(baseDO.getCreator())) {
-                baseDO.setCreator(userId.toString());
+            if (Objects.nonNull(userId) && Objects.isNull(baseDO.getCreateUser())) {
+                baseDO.setCreateUser(userId.toString());
             }
             // 当前登录用户不为空,更新人为空,则当前登录用户为更新人
-            if (Objects.nonNull(userId) && Objects.isNull(baseDO.getUpdater())) {
-                baseDO.setUpdater(userId.toString());
+            if (Objects.nonNull(userId) && Objects.isNull(baseDO.getUpdateUser())) {
+                baseDO.setUpdateUser(userId.toString());
             }
         }
     }

iot-spring-boot-starter-mybatis/src/main/java/com/yushu/framework/mybatis/core/mapper/BaseMapperX.java → iot-framework/iot-spring-boot-starter-mybatis/src/main/java/com/yushu/framework/mybatis/core/mapper/BaseMapperX.java


iot-spring-boot-starter-mybatis/src/main/java/com/yushu/framework/mybatis/core/query/QueryWrapperX.java → iot-framework/iot-spring-boot-starter-mybatis/src/main/java/com/yushu/framework/mybatis/core/query/QueryWrapperX.java


+ 2 - 2
iot-spring-boot-starter-mybatis/src/main/java/com/yushu/framework/mybatis/core/type/JsonLongSetTypeHandler.java

@@ -16,12 +16,12 @@ import java.util.Set;
  */
 public class JsonLongSetTypeHandler extends AbstractJsonTypeHandler<Object> {
 
-    private static final TypeReference<Set<Long>> typeReference = new TypeReference<Set<Long>>() {
+    private static final TypeReference<Set<Long>> TYPE_REFERENCE = new TypeReference<Set<Long>>() {
     };
 
     @Override
     protected Object parse(String json) {
-        return JsonUtils.parseObject(json, typeReference);
+        return JsonUtils.parseObject(json, TYPE_REFERENCE);
     }
 
     @Override

iot-spring-boot-starter-mybatis/src/main/java/com/yushu/framework/mybatis/core/util/MyBatisUtils.java → iot-framework/iot-spring-boot-starter-mybatis/src/main/java/com/yushu/framework/mybatis/core/util/MyBatisUtils.java


iot-spring-boot-starter-mybatis/src/main/resources/META-INF/spring.factories → iot-framework/iot-spring-boot-starter-mybatis/src/main/resources/META-INF/spring.factories


+ 2 - 1
iot-spring-boot-starter-redis/pom.xml

@@ -4,8 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>com.yushu</groupId>
-        <artifactId>iot</artifactId>
+        <artifactId>iot-framework</artifactId>
         <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>iot-spring-boot-starter-redis</artifactId>

iot-spring-boot-starter-redis/src/main/java/com/yushu/framework/redis/config/RedisAutoConfiguration.java → iot-framework/iot-spring-boot-starter-redis/src/main/java/com/yushu/framework/redis/config/RedisAutoConfiguration.java


iot-spring-boot-starter-redis/src/main/java/com/yushu/framework/redis/core/RedisKeyDefine.java → iot-framework/iot-spring-boot-starter-redis/src/main/java/com/yushu/framework/redis/core/RedisKeyDefine.java


+ 4 - 4
iot-spring-boot-starter-redis/src/main/java/com/yushu/framework/redis/core/RedisKeyRegistry.java

@@ -11,18 +11,18 @@ public class RedisKeyRegistry {
     /**
      * Redis RedisKeyDefine 数组
      */
-    private static final List<RedisKeyDefine> defines = new ArrayList<>();
+    private static final List<RedisKeyDefine> DEFINES = new ArrayList<>();
 
     public static void add(RedisKeyDefine define) {
-        defines.add(define);
+        DEFINES.add(define);
     }
 
     public static List<RedisKeyDefine> list() {
-        return defines;
+        return DEFINES;
     }
 
     public static int size() {
-        return defines.size();
+        return DEFINES.size();
     }
 
 }

iot-spring-boot-starter-redis/src/main/resources/META-INF/spring.factories → iot-framework/iot-spring-boot-starter-redis/src/main/resources/META-INF/spring.factories


+ 2 - 1
iot-spring-boot-starter-test/pom.xml

@@ -4,8 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>com.yushu</groupId>
-        <artifactId>iot</artifactId>
+        <artifactId>iot-framework</artifactId>
         <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>iot-spring-boot-starter-test</artifactId>

iot-spring-boot-starter-test/src/main/java/com/yushu/framework/test/core/ut/BaseMockitoUnitTest.java → iot-framework/iot-spring-boot-starter-test/src/main/java/com/yushu/framework/test/core/ut/BaseMockitoUnitTest.java


+ 1 - 1
iot-spring-boot-starter-test/src/main/java/com/yushu/framework/test/core/util/AssertUtils.java

@@ -90,7 +90,7 @@ public class AssertUtils {
         ServiceException serviceException = assertThrows(ServiceException.class, executable);
         // 校验错误码
         Assertions.assertEquals(errorCode.getCode(), serviceException.getCode(), "错误码不匹配");
-        String message = ServiceExceptionUtil.doFormat(errorCode.getCode(), errorCode.getMsg(), messageParams);
+        String message = ServiceExceptionUtil.doFormat(errorCode.getCode(), errorCode.getMessage(), messageParams);
         Assertions.assertEquals(message, serviceException.getMessage(), "错误提示不匹配");
     }
 

+ 1 - 1
iot-spring-boot-starter-test/src/main/java/com/yushu/framework/test/core/util/RandomUtils.java

@@ -36,7 +36,7 @@ public class RandomUtils {
         // Boolean
         PODAM_FACTORY.getStrategy().addOrReplaceTypeManufacturer(Boolean.class, (dataProviderStrategy, attributeMetadata, map) -> {
             // 如果是 deleted 的字段,返回非删除
-            if (attributeMetadata.getAttributeName().equals("deleted")) {
+            if ("deleted".equals(attributeMetadata.getAttributeName())) {
                 return false;
             }
             return RandomUtil.randomBoolean();

+ 2 - 1
iot-spring-boot-starter-web/pom.xml

@@ -4,8 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>com.yushu</groupId>
-        <artifactId>iot</artifactId>
+        <artifactId>iot-framework</artifactId>
         <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>iot-spring-boot-starter-web</artifactId>

+ 2 - 2
iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/RequestLogAspect.java

@@ -40,7 +40,7 @@ import java.util.Map;
 @Slf4j
 public class RequestLogAspect {
 
-    private static final JacksonJsonSerializer serializer = new JacksonJsonSerializer();
+    private static final JacksonJsonSerializer SERIALIZER = new JacksonJsonSerializer();
     private SerializeConfig serializeConfig;
     private SerializerWrapper serializerWrapper;
 
@@ -63,7 +63,7 @@ public class RequestLogAspect {
     @Autowired
     public void setSerialize(SerializeConfig serialize) {
         this.serializeConfig = serialize;
-        this.serializerWrapper = new SerializerWrapper(serializer, serializeConfig);
+        this.serializerWrapper = new SerializerWrapper(SERIALIZER, serializeConfig);
     }
 
     //	@Pointcut("execution(* com.yushu..*.controller.*.*(..))")

iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/config/ApiLogAutoConfiguration.java → iot-framework/iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/config/ApiLogAutoConfiguration.java


+ 1 - 1
iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/core/filter/ApiAccessLogFilter.java

@@ -85,7 +85,7 @@ public class ApiAccessLogFilter extends OncePerRequestFilter {
         CommonResult<?> result = WebFrameworkUtils.getCommonResult(request);
         if (result != null) {
             accessLog.setResultCode(result.getCode());
-            accessLog.setResultMsg(result.getMsg());
+            accessLog.setResultMsg(result.getMessage());
         } else if (ex != null) {
             accessLog.setResultCode(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode());
             accessLog.setResultMsg(ExceptionUtil.getRootCauseMessage(ex));

iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/core/service/ApiAccessLogFrameworkService.java → iot-framework/iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/core/service/ApiAccessLogFrameworkService.java


iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/core/service/ApiErrorLogFrameworkService.java → iot-framework/iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/core/service/ApiErrorLogFrameworkService.java


iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/core/service/ApiLogServiceImpl.java → iot-framework/iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/core/service/ApiLogServiceImpl.java


iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/core/service/dto/ApiAccessLogCreateDTO.java → iot-framework/iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/core/service/dto/ApiAccessLogCreateDTO.java


iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/core/service/dto/ApiErrorLogCreateDTO.java → iot-framework/iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/core/service/dto/ApiErrorLogCreateDTO.java


iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/serializer/FastJsonSerializer.java → iot-framework/iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/serializer/FastJsonSerializer.java


iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/serializer/JacksonJsonSerializer.java → iot-framework/iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/serializer/JacksonJsonSerializer.java


iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/serializer/JsonSerializer.java → iot-framework/iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/serializer/JsonSerializer.java


iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/serializer/SerializerWrapper.java → iot-framework/iot-spring-boot-starter-web/src/main/java/com/yushu/framework/apilog/serializer/SerializerWrapper.java


iot-spring-boot-starter-web/src/main/java/com/yushu/framework/jackson/config/JacksonAutoConfiguration.java → iot-framework/iot-spring-boot-starter-web/src/main/java/com/yushu/framework/jackson/config/JacksonAutoConfiguration.java


+ 0 - 0
iot-spring-boot-starter-web/src/main/java/com/yushu/framework/jackson/core/databind/LocalDateTimeDeserializer.java


Some files were not shown because too many files changed in this diff