diff --git a/iot-auth-server/pom.xml b/iot-auth-server/pom.xml index 321cdcd0..98fc008a 100755 --- a/iot-auth-server/pom.xml +++ b/iot-auth-server/pom.xml @@ -5,11 +5,14 @@ iotkit-parent cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 iot-auth-server + + 此模块为认证服务，提供oauth2认证界面和接口 + diff --git a/iot-auth-server/readme.txt b/iot-auth-server/readme.txt deleted file mode 100755 index 44d079b1..00000000 --- a/iot-auth-server/readme.txt +++ /dev/null @@ -1 +0,0 @@ -此模块为认证服务，提供oauth2认证界面和接口 diff --git a/iot-common/iot-common-core/pom.xml b/iot-common/iot-common-core/pom.xml new file mode 100644 index 00000000..1d35ffa9 --- /dev/null +++ b/iot-common/iot-common-core/pom.xml @@ -0,0 +1,58 @@ + + + 4.0.0 + + iot-common + cc.iotkit + ${revision} + + + iot-common-core + + + 此模块为通用业务逻辑或工具类 + + + + + + org.apache.commons + commons-lang3 + + + + commons-codec + commons-codec + + + + commons-io + commons-io + + + + com.fasterxml.jackson.core + jackson-core + + + + com.fasterxml.jackson.core + jackson-databind + + + + commons-beanutils + commons-beanutils + + + + org.projectlombok + lombok + true + + + + + \ No newline at end of file diff --git a/iot-common/src/main/java/cc/iotkit/common/ComponentClassLoader.java b/iot-common/iot-common-core/src/main/java/cc/iotkit/common/ComponentClassLoader.java old mode 100755 new mode 100644 similarity index 100% rename from iot-common/src/main/java/cc/iotkit/common/ComponentClassLoader.java rename to iot-common/iot-common-core/src/main/java/cc/iotkit/common/ComponentClassLoader.java diff --git a/iot-common/src/main/java/cc/iotkit/common/Constants.java b/iot-common/iot-common-core/src/main/java/cc/iotkit/common/Constants.java old mode 100755 new mode 100644 similarity index 100% rename from iot-common/src/main/java/cc/iotkit/common/Constants.java rename to iot-common/iot-common-core/src/main/java/cc/iotkit/common/Constants.java diff --git a/iot-common/src/main/java/cc/iotkit/common/enums/ErrCode.java b/iot-common/iot-common-core/src/main/java/cc/iotkit/common/enums/ErrCode.java similarity index 100% rename from iot-common/src/main/java/cc/iotkit/common/enums/ErrCode.java rename to iot-common/iot-common-core/src/main/java/cc/iotkit/common/enums/ErrCode.java diff --git a/iot-common/src/main/java/cc/iotkit/common/enums/IEnum.java b/iot-common/iot-common-core/src/main/java/cc/iotkit/common/enums/IEnum.java similarity index 100% rename from iot-common/src/main/java/cc/iotkit/common/enums/IEnum.java rename to iot-common/iot-common-core/src/main/java/cc/iotkit/common/enums/IEnum.java diff --git a/iot-common/src/main/java/cc/iotkit/common/exception/BizException.java b/iot-common/iot-common-core/src/main/java/cc/iotkit/common/exception/BizException.java old mode 100755 new mode 100644 similarity index 100% rename from iot-common/src/main/java/cc/iotkit/common/exception/BizException.java rename to iot-common/iot-common-core/src/main/java/cc/iotkit/common/exception/BizException.java diff --git a/iot-common/src/main/java/cc/iotkit/common/function/IfHandler.java b/iot-common/iot-common-core/src/main/java/cc/iotkit/common/function/IfHandler.java similarity index 100% rename from iot-common/src/main/java/cc/iotkit/common/function/IfHandler.java rename to iot-common/iot-common-core/src/main/java/cc/iotkit/common/function/IfHandler.java diff --git a/iot-common/src/main/java/cc/iotkit/common/thing/ThingService.java b/iot-common/iot-common-core/src/main/java/cc/iotkit/common/thing/ThingService.java old mode 100755 new mode 100644 similarity index 100% rename from iot-common/src/main/java/cc/iotkit/common/thing/ThingService.java rename to iot-common/iot-common-core/src/main/java/cc/iotkit/common/thing/ThingService.java diff --git a/iot-common/src/main/java/cc/iotkit/common/utils/CodecUtil.java b/iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/CodecUtil.java old mode 100755 new mode 100644 similarity index 100% rename from iot-common/src/main/java/cc/iotkit/common/utils/CodecUtil.java rename to iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/CodecUtil.java diff --git a/iot-common/src/main/java/cc/iotkit/common/utils/DeviceUtil.java b/iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/DeviceUtil.java old mode 100755 new mode 100644 similarity index 100% rename from iot-common/src/main/java/cc/iotkit/common/utils/DeviceUtil.java rename to iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/DeviceUtil.java diff --git a/iot-common/src/main/java/cc/iotkit/common/utils/FIUtil.java b/iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/FIUtil.java similarity index 100% rename from iot-common/src/main/java/cc/iotkit/common/utils/FIUtil.java rename to iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/FIUtil.java diff --git a/iot-common/src/main/java/cc/iotkit/common/utils/HexUtil.java b/iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/HexUtil.java old mode 100755 new mode 100644 similarity index 97% rename from iot-common/src/main/java/cc/iotkit/common/utils/HexUtil.java rename to iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/HexUtil.java index 3f048740..43c8256c --- a/iot-common/src/main/java/cc/iotkit/common/utils/HexUtil.java +++ b/iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/HexUtil.java @@ -1,311 +1,311 @@ -/* - * +---------------------------------------------------------------------- - * | Copyright (c) 奇特物联 2021-2022 All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed 未经许可不能去掉「奇特物联」相关版权 - * +---------------------------------------------------------------------- - * | Author: xw2sy@163.com - * +---------------------------------------------------------------------- - */ -package cc.iotkit.common.utils; - - -import org.apache.commons.lang3.StringUtils; - -import java.nio.ByteBuffer; - -public class HexUtil { - - private static final char[] CHARS_TABLES = "0123456789ABCDEF".toCharArray(); - static final byte[] BYTES = new byte[128]; - - static { - for (int i = 0; i < 10; i++) { - BYTES['0' + i] = (byte) i; - BYTES['A' + i] = (byte) (10 + i); - BYTES['a' + i] = (byte) (10 + i); - } - } - - public static String toHexString(byte[] aBytes) { - return toHexString(aBytes, 0, aBytes.length); - } - - public static String toFormattedHexString(byte[] aBytes) { - return toFormattedHexString(aBytes, 0, aBytes.length); - } - - public static String toHexString(byte[] aBytes, int aLength) { - return toHexString(aBytes, 0, aLength); - } - - public static byte[] parseHex(String aHexString) { - char[] src = aHexString.replace("\n", "").replace(" ", "").toUpperCase().toCharArray(); - byte[] dst = new byte[src.length / 2]; - - for (int si = 0, di = 0; di < dst.length; di++) { - byte high = BYTES[src[si++] & 0x7f]; - byte low = BYTES[src[si++] & 0x7f]; - dst[di] = (byte) ((high << 4) + low); - } - - return dst; - } - - public static String toFormattedHexString(byte[] aBytes, int aOffset, int aLength) { - StringBuilder sb = new StringBuilder(); - sb.append("["); - sb.append(aLength); - sb.append("] :"); - for (int si = aOffset, di = 0; si < aOffset + aLength; si++, di++) { - byte b = aBytes[si]; - if (di % 4 == 0) { - sb.append(" "); - } else { - sb.append(' '); - } - sb.append(CHARS_TABLES[(b & 0xf0) >>> 4]); - sb.append(CHARS_TABLES[(b & 0x0f)]); - - } - - return sb.toString(); - - } - - public static String toHexString(byte[] aBytes, int aOffset, int aLength) { - char[] dst = new char[aLength * 2]; - - for (int si = aOffset, di = 0; si < aOffset + aLength; si++) { - byte b = aBytes[si]; - dst[di++] = CHARS_TABLES[(b & 0xf0) >>> 4]; - dst[di++] = CHARS_TABLES[(b & 0x0f)]; - } - - return new String(dst); - } - - public static String unwrapCharString(String charStr) { - byte[] bytes = parseHex(charStr); - StringBuilder rawStr = new StringBuilder(); - for (byte aByte : bytes) { - rawStr.append((char) aByte); - } - return rawStr.toString(); - } - - /** - * int转bytes - */ - public static byte[] intToBytes(int x) { - ByteBuffer buffer = ByteBuffer.allocate(4); - buffer.putInt(0, x); - return buffer.array(); - } - - /** - * bytes转int - */ - public static int bytesToInt(byte[] bytes) { - ByteBuffer buffer = ByteBuffer.wrap(bytes); - buffer.flip(); - return buffer.getInt(); - } - - public static int checkSum(ByteBuffer buffer) { - buffer.flip(); - byte sum = 0; - while (buffer.hasRemaining()) { - sum += buffer.get(); - } - buffer.limit(buffer.capacity()); - return sum % 256; - } - - public static byte[] toLowerBytes(byte[] bytes) { - int len = bytes.length; - byte[] r = new byte[len]; - for (int i = 0; i < len; i++) { - r[len - i - 1] = bytes[i]; - } - return r; - } - - public static int toLowerInt(byte[] bytes) { - int len = bytes.length; - byte[] r = new byte[len]; - for (int i = 0; i < len; i++) { - r[len - i - 1] = (byte) (bytes[i] - 0x33); - } - return ByteBuffer.wrap(r).getInt(); - } - - public static byte[] shortToBytes(short x) { - ByteBuffer buffer = ByteBuffer.allocate(2); - buffer.putShort(0, x); - return buffer.array(); - } - - public static String readString(ByteBuffer buffer, int len) { - byte[] dest = new byte[len]; - buffer.get(dest, 0, len); - return new String(dest); - } - -// public static int readLowerInt(ByteBuffer buffer, int len) { -// int r = 0; -// for (int i = 0; i < len; i++) { -// byte b = buffer.get(); -// r += (i == 0 ? b - 0x33 : ((b - 0x33) * Math.pow(10, i))); -// } -// return r; -// } - - public static String readHexIntString(ByteBuffer buffer) { - int b = buffer.get(); - String hex = Integer.toHexString(b - 0x33).replace("f", ""); - return StringUtils.leftPad(hex, 2, "0"); - } - - public static byte[] add33Bytes(byte[] bytes) { - for (int i = 0; i < bytes.length; i++) { - bytes[i] = (byte) (bytes[i] + 0x33); - } - return bytes; - } - - public static byte[] minus33Bytes(byte[] bytes) { - for (int i = 0; i < bytes.length; i++) { - bytes[i] = (byte) (bytes[i] - 0x33); - } - return bytes; - } - - public static byte[] readBytes(ByteBuffer buffer, int len) { - byte[] data = new byte[len]; - for (int i = 0; i < len; i++) { - data[i] = buffer.get(); - } - return data; - } - - public static byte[] readAndMinus33Bytes(ByteBuffer buffer, int len) { - byte[] data = new byte[len]; - for (int i = 0; i < len; i++) { - data[i] = (byte) (buffer.get() - 0x33); - } - return data; - } - - public static int bcdInt(String row) { - String bcd = bcdString(row); - bcd = bcd.replace("FF", "0"); - return Integer.parseInt(bcd); - } - - public static int bcdInt(ByteBuffer buffer, int len) { - byte[] bytes = readAndMinus33Bytes(buffer, len); - return bcdInt(HexUtil.toHexString(bytes)); - } - - public static String bcdString(String row) { - char[] chars = row.toCharArray(); - int len = chars.length; - char[] newChars = new char[len]; - - for (int i = 0; i < len; i += 2) { - newChars[i] = chars[len - i - 2]; - newChars[i + 1] = chars[len - i - 1]; - } - return String.valueOf(newChars); - } - - public static byte[] intBcdAdd33(int v, int len) { - String strV = String.valueOf(v); - strV = StringUtils.leftPad(strV, len * 2, '0'); - - return add33Bytes(HexUtil.parseHex(bcdString(strV))); - } - - /** - * 计算CRC16校验 - * - * @param data 需要计算的数组 - * @param offset 起始位置 - * @param len 长度 - * @return CRC16校验值 - */ - public static int calcCrc16(byte[] data, int offset, int len) { - byte[] crc16_tab_h = { - (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, - (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, - (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, - (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, - (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, - (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, - (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, - (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, - (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, - (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, - - (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, - (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, - (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, - (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, - (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, - (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, - (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, - (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, - (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, - (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, - - (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, - (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, - (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, - (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, - (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, - (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40 - }; - byte[] crc16_tab_l = { - (byte) 0x00, (byte) 0xC0, (byte) 0xC1, (byte) 0x01, (byte) 0xC3, (byte) 0x03, (byte) 0x02, (byte) 0xC2, (byte) 0xC6, (byte) 0x06, - (byte) 0x07, (byte) 0xC7, (byte) 0x05, (byte) 0xC5, (byte) 0xC4, (byte) 0x04, (byte) 0xCC, (byte) 0x0C, (byte) 0x0D, (byte) 0xCD, - (byte) 0x0F, (byte) 0xCF, (byte) 0xCE, (byte) 0x0E, (byte) 0x0A, (byte) 0xCA, (byte) 0xCB, (byte) 0x0B, (byte) 0xC9, (byte) 0x09, - (byte) 0x08, (byte) 0xC8, (byte) 0xD8, (byte) 0x18, (byte) 0x19, (byte) 0xD9, (byte) 0x1B, (byte) 0xDB, (byte) 0xDA, (byte) 0x1A, - (byte) 0x1E, (byte) 0xDE, (byte) 0xDF, (byte) 0x1F, (byte) 0xDD, (byte) 0x1D, (byte) 0x1C, (byte) 0xDC, (byte) 0x14, (byte) 0xD4, - (byte) 0xD5, (byte) 0x15, (byte) 0xD7, (byte) 0x17, (byte) 0x16, (byte) 0xD6, (byte) 0xD2, (byte) 0x12, (byte) 0x13, (byte) 0xD3, - (byte) 0x11, (byte) 0xD1, (byte) 0xD0, (byte) 0x10, (byte) 0xF0, (byte) 0x30, (byte) 0x31, (byte) 0xF1, (byte) 0x33, (byte) 0xF3, - (byte) 0xF2, (byte) 0x32, (byte) 0x36, (byte) 0xF6, (byte) 0xF7, (byte) 0x37, (byte) 0xF5, (byte) 0x35, (byte) 0x34, (byte) 0xF4, - (byte) 0x3C, (byte) 0xFC, (byte) 0xFD, (byte) 0x3D, (byte) 0xFF, (byte) 0x3F, (byte) 0x3E, (byte) 0xFE, (byte) 0xFA, (byte) 0x3A, - (byte) 0x3B, (byte) 0xFB, (byte) 0x39, (byte) 0xF9, (byte) 0xF8, (byte) 0x38, (byte) 0x28, (byte) 0xE8, (byte) 0xE9, (byte) 0x29, - - (byte) 0xEB, (byte) 0x2B, (byte) 0x2A, (byte) 0xEA, (byte) 0xEE, (byte) 0x2E, (byte) 0x2F, (byte) 0xEF, (byte) 0x2D, (byte) 0xED, - (byte) 0xEC, (byte) 0x2C, (byte) 0xE4, (byte) 0x24, (byte) 0x25, (byte) 0xE5, (byte) 0x27, (byte) 0xE7, (byte) 0xE6, (byte) 0x26, - (byte) 0x22, (byte) 0xE2, (byte) 0xE3, (byte) 0x23, (byte) 0xE1, (byte) 0x21, (byte) 0x20, (byte) 0xE0, (byte) 0xA0, (byte) 0x60, - (byte) 0x61, (byte) 0xA1, (byte) 0x63, (byte) 0xA3, (byte) 0xA2, (byte) 0x62, (byte) 0x66, (byte) 0xA6, (byte) 0xA7, (byte) 0x67, - (byte) 0xA5, (byte) 0x65, (byte) 0x64, (byte) 0xA4, (byte) 0x6C, (byte) 0xAC, (byte) 0xAD, (byte) 0x6D, (byte) 0xAF, (byte) 0x6F, - (byte) 0x6E, (byte) 0xAE, (byte) 0xAA, (byte) 0x6A, (byte) 0x6B, (byte) 0xAB, (byte) 0x69, (byte) 0xA9, (byte) 0xA8, (byte) 0x68, - (byte) 0x78, (byte) 0xB8, (byte) 0xB9, (byte) 0x79, (byte) 0xBB, (byte) 0x7B, (byte) 0x7A, (byte) 0xBA, (byte) 0xBE, (byte) 0x7E, - (byte) 0x7F, (byte) 0xBF, (byte) 0x7D, (byte) 0xBD, (byte) 0xBC, (byte) 0x7C, (byte) 0xB4, (byte) 0x74, (byte) 0x75, (byte) 0xB5, - (byte) 0x77, (byte) 0xB7, (byte) 0xB6, (byte) 0x76, (byte) 0x72, (byte) 0xB2, (byte) 0xB3, (byte) 0x73, (byte) 0xB1, (byte) 0x71, - (byte) 0x70, (byte) 0xB0, (byte) 0x50, (byte) 0x90, (byte) 0x91, (byte) 0x51, (byte) 0x93, (byte) 0x53, (byte) 0x52, (byte) 0x92, - - (byte) 0x96, (byte) 0x56, (byte) 0x57, (byte) 0x97, (byte) 0x55, (byte) 0x95, (byte) 0x94, (byte) 0x54, (byte) 0x9C, (byte) 0x5C, - (byte) 0x5D, (byte) 0x9D, (byte) 0x5F, (byte) 0x9F, (byte) 0x9E, (byte) 0x5E, (byte) 0x5A, (byte) 0x9A, (byte) 0x9B, (byte) 0x5B, - (byte) 0x99, (byte) 0x59, (byte) 0x58, (byte) 0x98, (byte) 0x88, (byte) 0x48, (byte) 0x49, (byte) 0x89, (byte) 0x4B, (byte) 0x8B, - (byte) 0x8A, (byte) 0x4A, (byte) 0x4E, (byte) 0x8E, (byte) 0x8F, (byte) 0x4F, (byte) 0x8D, (byte) 0x4D, (byte) 0x4C, (byte) 0x8C, - (byte) 0x44, (byte) 0x84, (byte) 0x85, (byte) 0x45, (byte) 0x87, (byte) 0x47, (byte) 0x46, (byte) 0x86, (byte) 0x82, (byte) 0x42, - - (byte) 0x43, (byte) 0x83, (byte) 0x41, (byte) 0x81, (byte) 0x80, (byte) 0x40 - }; - int pre = 0xffff; - int ucCRCHi = (pre & 0xff00) >> 8; - int ucCRCLo = pre & 0x00ff; - int iIndex; - for (int i = 0; i < len; ++i) { - iIndex = (ucCRCLo ^ data[offset + i]) & 0x00ff; - ucCRCLo = ucCRCHi ^ crc16_tab_h[iIndex]; - ucCRCHi = crc16_tab_l[iIndex]; - } - return ((ucCRCHi & 0x00ff) << 8) | (ucCRCLo & 0x00ff) & 0xffff; - } +/* + * +---------------------------------------------------------------------- + * | Copyright (c) 奇特物联 2021-2022 All rights reserved. + * +---------------------------------------------------------------------- + * | Licensed 未经许可不能去掉「奇特物联」相关版权 + * +---------------------------------------------------------------------- + * | Author: xw2sy@163.com + * +---------------------------------------------------------------------- + */ +package cc.iotkit.common.utils; + + +import org.apache.commons.lang3.StringUtils; + +import java.nio.ByteBuffer; + +public class HexUtil { + + private static final char[] CHARS_TABLES = "0123456789ABCDEF".toCharArray(); + static final byte[] BYTES = new byte[128]; + + static { + for (int i = 0; i < 10; i++) { + BYTES['0' + i] = (byte) i; + BYTES['A' + i] = (byte) (10 + i); + BYTES['a' + i] = (byte) (10 + i); + } + } + + public static String toHexString(byte[] aBytes) { + return toHexString(aBytes, 0, aBytes.length); + } + + public static String toFormattedHexString(byte[] aBytes) { + return toFormattedHexString(aBytes, 0, aBytes.length); + } + + public static String toHexString(byte[] aBytes, int aLength) { + return toHexString(aBytes, 0, aLength); + } + + public static byte[] parseHex(String aHexString) { + char[] src = aHexString.replace("\n", "").replace(" ", "").toUpperCase().toCharArray(); + byte[] dst = new byte[src.length / 2]; + + for (int si = 0, di = 0; di < dst.length; di++) { + byte high = BYTES[src[si++] & 0x7f]; + byte low = BYTES[src[si++] & 0x7f]; + dst[di] = (byte) ((high << 4) + low); + } + + return dst; + } + + public static String toFormattedHexString(byte[] aBytes, int aOffset, int aLength) { + StringBuilder sb = new StringBuilder(); + sb.append("["); + sb.append(aLength); + sb.append("] :"); + for (int si = aOffset, di = 0; si < aOffset + aLength; si++, di++) { + byte b = aBytes[si]; + if (di % 4 == 0) { + sb.append(" "); + } else { + sb.append(' '); + } + sb.append(CHARS_TABLES[(b & 0xf0) >>> 4]); + sb.append(CHARS_TABLES[(b & 0x0f)]); + + } + + return sb.toString(); + + } + + public static String toHexString(byte[] aBytes, int aOffset, int aLength) { + char[] dst = new char[aLength * 2]; + + for (int si = aOffset, di = 0; si < aOffset + aLength; si++) { + byte b = aBytes[si]; + dst[di++] = CHARS_TABLES[(b & 0xf0) >>> 4]; + dst[di++] = CHARS_TABLES[(b & 0x0f)]; + } + + return new String(dst); + } + + public static String unwrapCharString(String charStr) { + byte[] bytes = parseHex(charStr); + StringBuilder rawStr = new StringBuilder(); + for (byte aByte : bytes) { + rawStr.append((char) aByte); + } + return rawStr.toString(); + } + + /** + * int转bytes + */ + public static byte[] intToBytes(int x) { + ByteBuffer buffer = ByteBuffer.allocate(4); + buffer.putInt(0, x); + return buffer.array(); + } + + /** + * bytes转int + */ + public static int bytesToInt(byte[] bytes) { + ByteBuffer buffer = ByteBuffer.wrap(bytes); + buffer.flip(); + return buffer.getInt(); + } + + public static int checkSum(ByteBuffer buffer) { + buffer.flip(); + byte sum = 0; + while (buffer.hasRemaining()) { + sum += buffer.get(); + } + buffer.limit(buffer.capacity()); + return sum % 256; + } + + public static byte[] toLowerBytes(byte[] bytes) { + int len = bytes.length; + byte[] r = new byte[len]; + for (int i = 0; i < len; i++) { + r[len - i - 1] = bytes[i]; + } + return r; + } + + public static int toLowerInt(byte[] bytes) { + int len = bytes.length; + byte[] r = new byte[len]; + for (int i = 0; i < len; i++) { + r[len - i - 1] = (byte) (bytes[i] - 0x33); + } + return ByteBuffer.wrap(r).getInt(); + } + + public static byte[] shortToBytes(short x) { + ByteBuffer buffer = ByteBuffer.allocate(2); + buffer.putShort(0, x); + return buffer.array(); + } + + public static String readString(ByteBuffer buffer, int len) { + byte[] dest = new byte[len]; + buffer.get(dest, 0, len); + return new String(dest); + } + +// public static int readLowerInt(ByteBuffer buffer, int len) { +// int r = 0; +// for (int i = 0; i < len; i++) { +// byte b = buffer.get(); +// r += (i == 0 ? b - 0x33 : ((b - 0x33) * Math.pow(10, i))); +// } +// return r; +// } + + public static String readHexIntString(ByteBuffer buffer) { + int b = buffer.get(); + String hex = Integer.toHexString(b - 0x33).replace("f", ""); + return StringUtils.leftPad(hex, 2, "0"); + } + + public static byte[] add33Bytes(byte[] bytes) { + for (int i = 0; i < bytes.length; i++) { + bytes[i] = (byte) (bytes[i] + 0x33); + } + return bytes; + } + + public static byte[] minus33Bytes(byte[] bytes) { + for (int i = 0; i < bytes.length; i++) { + bytes[i] = (byte) (bytes[i] - 0x33); + } + return bytes; + } + + public static byte[] readBytes(ByteBuffer buffer, int len) { + byte[] data = new byte[len]; + for (int i = 0; i < len; i++) { + data[i] = buffer.get(); + } + return data; + } + + public static byte[] readAndMinus33Bytes(ByteBuffer buffer, int len) { + byte[] data = new byte[len]; + for (int i = 0; i < len; i++) { + data[i] = (byte) (buffer.get() - 0x33); + } + return data; + } + + public static int bcdInt(String row) { + String bcd = bcdString(row); + bcd = bcd.replace("FF", "0"); + return Integer.parseInt(bcd); + } + + public static int bcdInt(ByteBuffer buffer, int len) { + byte[] bytes = readAndMinus33Bytes(buffer, len); + return bcdInt(HexUtil.toHexString(bytes)); + } + + public static String bcdString(String row) { + char[] chars = row.toCharArray(); + int len = chars.length; + char[] newChars = new char[len]; + + for (int i = 0; i < len; i += 2) { + newChars[i] = chars[len - i - 2]; + newChars[i + 1] = chars[len - i - 1]; + } + return String.valueOf(newChars); + } + + public static byte[] intBcdAdd33(int v, int len) { + String strV = String.valueOf(v); + strV = StringUtils.leftPad(strV, len * 2, '0'); + + return add33Bytes(HexUtil.parseHex(bcdString(strV))); + } + + /** + * 计算CRC16校验 + * + * @param data 需要计算的数组 + * @param offset 起始位置 + * @param len 长度 + * @return CRC16校验值 + */ + public static int calcCrc16(byte[] data, int offset, int len) { + byte[] crc16_tab_h = { + (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, + (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, + (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, + (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, + (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, + (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, + (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, + (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, + (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, + (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, + + (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, + (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, + (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, + (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, + (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, + (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, + (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, + (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, + (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, + (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, + + (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, + (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, + (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, + (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, + (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, + (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40 + }; + byte[] crc16_tab_l = { + (byte) 0x00, (byte) 0xC0, (byte) 0xC1, (byte) 0x01, (byte) 0xC3, (byte) 0x03, (byte) 0x02, (byte) 0xC2, (byte) 0xC6, (byte) 0x06, + (byte) 0x07, (byte) 0xC7, (byte) 0x05, (byte) 0xC5, (byte) 0xC4, (byte) 0x04, (byte) 0xCC, (byte) 0x0C, (byte) 0x0D, (byte) 0xCD, + (byte) 0x0F, (byte) 0xCF, (byte) 0xCE, (byte) 0x0E, (byte) 0x0A, (byte) 0xCA, (byte) 0xCB, (byte) 0x0B, (byte) 0xC9, (byte) 0x09, + (byte) 0x08, (byte) 0xC8, (byte) 0xD8, (byte) 0x18, (byte) 0x19, (byte) 0xD9, (byte) 0x1B, (byte) 0xDB, (byte) 0xDA, (byte) 0x1A, + (byte) 0x1E, (byte) 0xDE, (byte) 0xDF, (byte) 0x1F, (byte) 0xDD, (byte) 0x1D, (byte) 0x1C, (byte) 0xDC, (byte) 0x14, (byte) 0xD4, + (byte) 0xD5, (byte) 0x15, (byte) 0xD7, (byte) 0x17, (byte) 0x16, (byte) 0xD6, (byte) 0xD2, (byte) 0x12, (byte) 0x13, (byte) 0xD3, + (byte) 0x11, (byte) 0xD1, (byte) 0xD0, (byte) 0x10, (byte) 0xF0, (byte) 0x30, (byte) 0x31, (byte) 0xF1, (byte) 0x33, (byte) 0xF3, + (byte) 0xF2, (byte) 0x32, (byte) 0x36, (byte) 0xF6, (byte) 0xF7, (byte) 0x37, (byte) 0xF5, (byte) 0x35, (byte) 0x34, (byte) 0xF4, + (byte) 0x3C, (byte) 0xFC, (byte) 0xFD, (byte) 0x3D, (byte) 0xFF, (byte) 0x3F, (byte) 0x3E, (byte) 0xFE, (byte) 0xFA, (byte) 0x3A, + (byte) 0x3B, (byte) 0xFB, (byte) 0x39, (byte) 0xF9, (byte) 0xF8, (byte) 0x38, (byte) 0x28, (byte) 0xE8, (byte) 0xE9, (byte) 0x29, + + (byte) 0xEB, (byte) 0x2B, (byte) 0x2A, (byte) 0xEA, (byte) 0xEE, (byte) 0x2E, (byte) 0x2F, (byte) 0xEF, (byte) 0x2D, (byte) 0xED, + (byte) 0xEC, (byte) 0x2C, (byte) 0xE4, (byte) 0x24, (byte) 0x25, (byte) 0xE5, (byte) 0x27, (byte) 0xE7, (byte) 0xE6, (byte) 0x26, + (byte) 0x22, (byte) 0xE2, (byte) 0xE3, (byte) 0x23, (byte) 0xE1, (byte) 0x21, (byte) 0x20, (byte) 0xE0, (byte) 0xA0, (byte) 0x60, + (byte) 0x61, (byte) 0xA1, (byte) 0x63, (byte) 0xA3, (byte) 0xA2, (byte) 0x62, (byte) 0x66, (byte) 0xA6, (byte) 0xA7, (byte) 0x67, + (byte) 0xA5, (byte) 0x65, (byte) 0x64, (byte) 0xA4, (byte) 0x6C, (byte) 0xAC, (byte) 0xAD, (byte) 0x6D, (byte) 0xAF, (byte) 0x6F, + (byte) 0x6E, (byte) 0xAE, (byte) 0xAA, (byte) 0x6A, (byte) 0x6B, (byte) 0xAB, (byte) 0x69, (byte) 0xA9, (byte) 0xA8, (byte) 0x68, + (byte) 0x78, (byte) 0xB8, (byte) 0xB9, (byte) 0x79, (byte) 0xBB, (byte) 0x7B, (byte) 0x7A, (byte) 0xBA, (byte) 0xBE, (byte) 0x7E, + (byte) 0x7F, (byte) 0xBF, (byte) 0x7D, (byte) 0xBD, (byte) 0xBC, (byte) 0x7C, (byte) 0xB4, (byte) 0x74, (byte) 0x75, (byte) 0xB5, + (byte) 0x77, (byte) 0xB7, (byte) 0xB6, (byte) 0x76, (byte) 0x72, (byte) 0xB2, (byte) 0xB3, (byte) 0x73, (byte) 0xB1, (byte) 0x71, + (byte) 0x70, (byte) 0xB0, (byte) 0x50, (byte) 0x90, (byte) 0x91, (byte) 0x51, (byte) 0x93, (byte) 0x53, (byte) 0x52, (byte) 0x92, + + (byte) 0x96, (byte) 0x56, (byte) 0x57, (byte) 0x97, (byte) 0x55, (byte) 0x95, (byte) 0x94, (byte) 0x54, (byte) 0x9C, (byte) 0x5C, + (byte) 0x5D, (byte) 0x9D, (byte) 0x5F, (byte) 0x9F, (byte) 0x9E, (byte) 0x5E, (byte) 0x5A, (byte) 0x9A, (byte) 0x9B, (byte) 0x5B, + (byte) 0x99, (byte) 0x59, (byte) 0x58, (byte) 0x98, (byte) 0x88, (byte) 0x48, (byte) 0x49, (byte) 0x89, (byte) 0x4B, (byte) 0x8B, + (byte) 0x8A, (byte) 0x4A, (byte) 0x4E, (byte) 0x8E, (byte) 0x8F, (byte) 0x4F, (byte) 0x8D, (byte) 0x4D, (byte) 0x4C, (byte) 0x8C, + (byte) 0x44, (byte) 0x84, (byte) 0x85, (byte) 0x45, (byte) 0x87, (byte) 0x47, (byte) 0x46, (byte) 0x86, (byte) 0x82, (byte) 0x42, + + (byte) 0x43, (byte) 0x83, (byte) 0x41, (byte) 0x81, (byte) 0x80, (byte) 0x40 + }; + int pre = 0xffff; + int ucCRCHi = (pre & 0xff00) >> 8; + int ucCRCLo = pre & 0x00ff; + int iIndex; + for (int i = 0; i < len; ++i) { + iIndex = (ucCRCLo ^ data[offset + i]) & 0x00ff; + ucCRCLo = ucCRCHi ^ crc16_tab_h[iIndex]; + ucCRCHi = crc16_tab_l[iIndex]; + } + return ((ucCRCHi & 0x00ff) << 8) | (ucCRCLo & 0x00ff) & 0xffff; + } } \ No newline at end of file diff --git a/iot-common/src/main/java/cc/iotkit/common/utils/JsonUtil.java b/iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/JsonUtil.java old mode 100755 new mode 100644 similarity index 97% rename from iot-common/src/main/java/cc/iotkit/common/utils/JsonUtil.java rename to iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/JsonUtil.java index 7d66e953..cde8dde6 --- a/iot-common/src/main/java/cc/iotkit/common/utils/JsonUtil.java +++ b/iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/JsonUtil.java @@ -1,44 +1,44 @@ -/* - * +---------------------------------------------------------------------- - * | Copyright (c) 奇特物联 2021-2022 All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed 未经许可不能去掉「奇特物联」相关版权 - * +---------------------------------------------------------------------- - * | Author: xw2sy@163.com - * +---------------------------------------------------------------------- - */ -package cc.iotkit.common.utils; - -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; -import lombok.SneakyThrows; - -public final class JsonUtil { - - private final static ObjectMapper MAPPER = new ObjectMapper() - .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS) - .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); - - @SneakyThrows - public static String toJsonString(Object obj) { - return MAPPER.writeValueAsString(obj); - } - - @SneakyThrows - public static T parse(String json, Class cls) { - return MAPPER.readValue(json, cls); - } - - @SneakyThrows - public static T parse(String json, TypeReference type) { - return MAPPER.readValue(json, type); - } - - @SneakyThrows - public static JsonNode parse(String json) { - return MAPPER.readTree(json); - } -} +/* + * +---------------------------------------------------------------------- + * | Copyright (c) 奇特物联 2021-2022 All rights reserved. + * +---------------------------------------------------------------------- + * | Licensed 未经许可不能去掉「奇特物联」相关版权 + * +---------------------------------------------------------------------- + * | Author: xw2sy@163.com + * +---------------------------------------------------------------------- + */ +package cc.iotkit.common.utils; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import lombok.SneakyThrows; + +public final class JsonUtil { + + private final static ObjectMapper MAPPER = new ObjectMapper() + .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS) + .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); + + @SneakyThrows + public static String toJsonString(Object obj) { + return MAPPER.writeValueAsString(obj); + } + + @SneakyThrows + public static T parse(String json, Class cls) { + return MAPPER.readValue(json, cls); + } + + @SneakyThrows + public static T parse(String json, TypeReference type) { + return MAPPER.readValue(json, type); + } + + @SneakyThrows + public static JsonNode parse(String json) { + return MAPPER.readTree(json); + } +} diff --git a/iot-common/src/main/java/cc/iotkit/common/utils/ReflectUtil.java b/iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/ReflectUtil.java old mode 100755 new mode 100644 similarity index 100% rename from iot-common/src/main/java/cc/iotkit/common/utils/ReflectUtil.java rename to iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/ReflectUtil.java diff --git a/iot-common/src/main/java/cc/iotkit/common/utils/ThreadUtil.java b/iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/ThreadUtil.java old mode 100755 new mode 100644 similarity index 97% rename from iot-common/src/main/java/cc/iotkit/common/utils/ThreadUtil.java rename to iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/ThreadUtil.java index 3a4908cf..20ec1381 --- a/iot-common/src/main/java/cc/iotkit/common/utils/ThreadUtil.java +++ b/iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/ThreadUtil.java @@ -1,34 +1,34 @@ -/* - * +---------------------------------------------------------------------- - * | Copyright (c) 奇特物联 2021-2022 All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed 未经许可不能去掉「奇特物联」相关版权 - * +---------------------------------------------------------------------- - * | Author: xw2sy@163.com - * +---------------------------------------------------------------------- - */ -package cc.iotkit.common.utils; - -import java.util.concurrent.ScheduledThreadPoolExecutor; - -public class ThreadUtil { - - public static ScheduledThreadPoolExecutor newScheduled(int poolSize, String threadName) { - return new ScheduledThreadPoolExecutor(poolSize, (Runnable r) -> { - SecurityManager s = System.getSecurityManager(); - ThreadGroup group = (s != null) ? s.getThreadGroup() : - Thread.currentThread().getThreadGroup(); - Thread t = new Thread(group, r, - threadName, - 0); - if (t.isDaemon()) { - t.setDaemon(false); - } - if (t.getPriority() != Thread.NORM_PRIORITY) { - t.setPriority(Thread.NORM_PRIORITY); - } - return t; - }); - } - -} +/* + * +---------------------------------------------------------------------- + * | Copyright (c) 奇特物联 2021-2022 All rights reserved. + * +---------------------------------------------------------------------- + * | Licensed 未经许可不能去掉「奇特物联」相关版权 + * +---------------------------------------------------------------------- + * | Author: xw2sy@163.com + * +---------------------------------------------------------------------- + */ +package cc.iotkit.common.utils; + +import java.util.concurrent.ScheduledThreadPoolExecutor; + +public class ThreadUtil { + + public static ScheduledThreadPoolExecutor newScheduled(int poolSize, String threadName) { + return new ScheduledThreadPoolExecutor(poolSize, (Runnable r) -> { + SecurityManager s = System.getSecurityManager(); + ThreadGroup group = (s != null) ? s.getThreadGroup() : + Thread.currentThread().getThreadGroup(); + Thread t = new Thread(group, r, + threadName, + 0); + if (t.isDaemon()) { + t.setDaemon(false); + } + if (t.getPriority() != Thread.NORM_PRIORITY) { + t.setPriority(Thread.NORM_PRIORITY); + } + return t; + }); + } + +} diff --git a/iot-common/src/main/java/cc/iotkit/common/utils/UniqueIdUtil.java b/iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/UniqueIdUtil.java old mode 100755 new mode 100644 similarity index 97% rename from iot-common/src/main/java/cc/iotkit/common/utils/UniqueIdUtil.java rename to iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/UniqueIdUtil.java index b157d292..1668fb1e --- a/iot-common/src/main/java/cc/iotkit/common/utils/UniqueIdUtil.java +++ b/iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/UniqueIdUtil.java @@ -1,37 +1,37 @@ -/* - * +---------------------------------------------------------------------- - * | Copyright (c) 奇特物联 2021-2022 All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed 未经许可不能去掉「奇特物联」相关版权 - * +---------------------------------------------------------------------- - * | Author: xw2sy@163.com - * +---------------------------------------------------------------------- - */ -package cc.iotkit.common.utils; - -import org.apache.commons.lang3.RandomUtils; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.concurrent.atomic.AtomicInteger; - -public final class UniqueIdUtil { - - private static final int MACHINE_ID = RandomUtils.nextInt(10, 99); - - private static final AtomicInteger SEQUENCE = new AtomicInteger(1000); - - public static String newRequestId() { - return newUniqueId("RID"); - } - - public static String newUniqueId(String prefix) { - int id = SEQUENCE.getAndIncrement(); - if (id >= 5000) { - SEQUENCE.set(1000); - } - - return prefix + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")) + id + MACHINE_ID; - } - -} +/* + * +---------------------------------------------------------------------- + * | Copyright (c) 奇特物联 2021-2022 All rights reserved. + * +---------------------------------------------------------------------- + * | Licensed 未经许可不能去掉「奇特物联」相关版权 + * +---------------------------------------------------------------------- + * | Author: xw2sy@163.com + * +---------------------------------------------------------------------- + */ +package cc.iotkit.common.utils; + +import org.apache.commons.lang3.RandomUtils; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.concurrent.atomic.AtomicInteger; + +public final class UniqueIdUtil { + + private static final int MACHINE_ID = RandomUtils.nextInt(10, 99); + + private static final AtomicInteger SEQUENCE = new AtomicInteger(1000); + + public static String newRequestId() { + return newUniqueId("RID"); + } + + public static String newUniqueId(String prefix) { + int id = SEQUENCE.getAndIncrement(); + if (id >= 5000) { + SEQUENCE.set(1000); + } + + return prefix + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")) + id + MACHINE_ID; + } + +} diff --git a/iot-message-bus/iot-message-core/pom.xml b/iot-common/iot-message-bus/iot-message-core/pom.xml similarity index 89% rename from iot-message-bus/iot-message-core/pom.xml rename to iot-common/iot-message-bus/iot-message-core/pom.xml index 58770dfd..dab4a34b 100644 --- a/iot-message-bus/iot-message-core/pom.xml +++ b/iot-common/iot-message-bus/iot-message-core/pom.xml @@ -5,7 +5,7 @@ iot-message-bus cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 diff --git a/iot-message-bus/iot-message-core/src/main/java/cc/iotkit/mq/ConsumerHandler.java b/iot-common/iot-message-bus/iot-message-core/src/main/java/cc/iotkit/mq/ConsumerHandler.java similarity index 100% rename from iot-message-bus/iot-message-core/src/main/java/cc/iotkit/mq/ConsumerHandler.java rename to iot-common/iot-message-bus/iot-message-core/src/main/java/cc/iotkit/mq/ConsumerHandler.java diff --git a/iot-message-bus/iot-message-core/src/main/java/cc/iotkit/mq/MqConsumer.java b/iot-common/iot-message-bus/iot-message-core/src/main/java/cc/iotkit/mq/MqConsumer.java similarity index 100% rename from iot-message-bus/iot-message-core/src/main/java/cc/iotkit/mq/MqConsumer.java rename to iot-common/iot-message-bus/iot-message-core/src/main/java/cc/iotkit/mq/MqConsumer.java diff --git a/iot-message-bus/iot-message-core/src/main/java/cc/iotkit/mq/MqProducer.java b/iot-common/iot-message-bus/iot-message-core/src/main/java/cc/iotkit/mq/MqProducer.java similarity index 100% rename from iot-message-bus/iot-message-core/src/main/java/cc/iotkit/mq/MqProducer.java rename to iot-common/iot-message-bus/iot-message-core/src/main/java/cc/iotkit/mq/MqProducer.java diff --git a/iot-message-bus/iot-message-rocketmq/pom.xml b/iot-common/iot-message-bus/iot-message-rocketmq/pom.xml similarity index 95% rename from iot-message-bus/iot-message-rocketmq/pom.xml rename to iot-common/iot-message-bus/iot-message-rocketmq/pom.xml index a09f4395..911ece5f 100644 --- a/iot-message-bus/iot-message-rocketmq/pom.xml +++ b/iot-common/iot-message-bus/iot-message-rocketmq/pom.xml @@ -5,7 +5,7 @@ iot-message-bus cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 diff --git a/iot-message-bus/iot-message-rocketmq/readme.md b/iot-common/iot-message-bus/iot-message-rocketmq/readme.md similarity index 100% rename from iot-message-bus/iot-message-rocketmq/readme.md rename to iot-common/iot-message-bus/iot-message-rocketmq/readme.md diff --git a/iot-message-bus/iot-message-rocketmq/src/main/java/cc/iotkit/rocketmq/RocketMqConsumer.java b/iot-common/iot-message-bus/iot-message-rocketmq/src/main/java/cc/iotkit/rocketmq/RocketMqConsumer.java similarity index 100% rename from iot-message-bus/iot-message-rocketmq/src/main/java/cc/iotkit/rocketmq/RocketMqConsumer.java rename to iot-common/iot-message-bus/iot-message-rocketmq/src/main/java/cc/iotkit/rocketmq/RocketMqConsumer.java diff --git a/iot-message-bus/iot-message-rocketmq/src/main/java/cc/iotkit/rocketmq/RocketMqProducer.java b/iot-common/iot-message-bus/iot-message-rocketmq/src/main/java/cc/iotkit/rocketmq/RocketMqProducer.java similarity index 100% rename from iot-message-bus/iot-message-rocketmq/src/main/java/cc/iotkit/rocketmq/RocketMqProducer.java rename to iot-common/iot-message-bus/iot-message-rocketmq/src/main/java/cc/iotkit/rocketmq/RocketMqProducer.java diff --git a/iot-message-bus/iot-message-rocketmq/src/main/java/cc/iotkit/rocketmq/config/RocketMqConfig.java b/iot-common/iot-message-bus/iot-message-rocketmq/src/main/java/cc/iotkit/rocketmq/config/RocketMqConfig.java similarity index 100% rename from iot-message-bus/iot-message-rocketmq/src/main/java/cc/iotkit/rocketmq/config/RocketMqConfig.java rename to iot-common/iot-message-bus/iot-message-rocketmq/src/main/java/cc/iotkit/rocketmq/config/RocketMqConfig.java diff --git a/iot-message-bus/iot-vertx-event-bus/pom.xml b/iot-common/iot-message-bus/iot-vertx-event-bus/pom.xml similarity index 94% rename from iot-message-bus/iot-vertx-event-bus/pom.xml rename to iot-common/iot-message-bus/iot-vertx-event-bus/pom.xml index 9e6824b9..08923bbf 100644 --- a/iot-message-bus/iot-vertx-event-bus/pom.xml +++ b/iot-common/iot-message-bus/iot-vertx-event-bus/pom.xml @@ -5,7 +5,7 @@ iot-message-bus cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 diff --git a/iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/BeanCodec.java b/iot-common/iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/BeanCodec.java similarity index 100% rename from iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/BeanCodec.java rename to iot-common/iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/BeanCodec.java diff --git a/iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/VertxManager.java b/iot-common/iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/VertxManager.java similarity index 100% rename from iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/VertxManager.java rename to iot-common/iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/VertxManager.java diff --git a/iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/VertxMqConsumer.java b/iot-common/iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/VertxMqConsumer.java similarity index 100% rename from iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/VertxMqConsumer.java rename to iot-common/iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/VertxMqConsumer.java diff --git a/iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/VertxMqProducer.java b/iot-common/iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/VertxMqProducer.java similarity index 100% rename from iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/VertxMqProducer.java rename to iot-common/iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/VertxMqProducer.java diff --git a/iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/config/VertxConfig.java b/iot-common/iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/config/VertxConfig.java similarity index 100% rename from iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/config/VertxConfig.java rename to iot-common/iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/config/VertxConfig.java diff --git a/iot-message-bus/iot-vertx-event-bus/src/test/java/test/MsgPubConsumeTest.java b/iot-common/iot-message-bus/iot-vertx-event-bus/src/test/java/test/MsgPubConsumeTest.java similarity index 100% rename from iot-message-bus/iot-vertx-event-bus/src/test/java/test/MsgPubConsumeTest.java rename to iot-common/iot-message-bus/iot-vertx-event-bus/src/test/java/test/MsgPubConsumeTest.java diff --git a/iot-message-bus/pom.xml b/iot-common/iot-message-bus/pom.xml old mode 100755 new mode 100644 similarity index 80% rename from iot-message-bus/pom.xml rename to iot-common/iot-message-bus/pom.xml index 980161d9..791b1e84 --- a/iot-message-bus/pom.xml +++ b/iot-common/iot-message-bus/pom.xml @@ -3,12 +3,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - iotkit-parent + iot-common cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 pom + + 消息队列适配模块，用于提供默认消息队列和适配不同消息队列接入 + iot-message-bus @@ -36,7 +39,7 @@ cc.iotkit - iot-common + iot-common-core diff --git a/iot-script-engine/pom.xml b/iot-common/iot-script-engine/pom.xml similarity index 89% rename from iot-script-engine/pom.xml rename to iot-common/iot-script-engine/pom.xml index 28a7d4cf..6ad250b1 100644 --- a/iot-script-engine/pom.xml +++ b/iot-common/iot-script-engine/pom.xml @@ -2,15 +2,21 @@ - - iotkit-parent - cc.iotkit - 0.4.3-SNAPSHOT - 4.0.0 + + iot-common + cc.iotkit + ${revision} + iot-script-engine + + + 此模块为脚本引擎 + + + 11 11 @@ -56,7 +62,7 @@ cc.iotkit - iot-common + iot-common-core diff --git a/iot-script-engine/src/main/java/cc/iotkit/script/IScriptEngine.java b/iot-common/iot-script-engine/src/main/java/cc/iotkit/script/IScriptEngine.java similarity index 100% rename from iot-script-engine/src/main/java/cc/iotkit/script/IScriptEngine.java rename to iot-common/iot-script-engine/src/main/java/cc/iotkit/script/IScriptEngine.java diff --git a/iot-script-engine/src/main/java/cc/iotkit/script/JavaScriptEngine.java b/iot-common/iot-script-engine/src/main/java/cc/iotkit/script/JavaScriptEngine.java similarity index 99% rename from iot-script-engine/src/main/java/cc/iotkit/script/JavaScriptEngine.java rename to iot-common/iot-script-engine/src/main/java/cc/iotkit/script/JavaScriptEngine.java index 3a179d6b..61557b69 100644 --- a/iot-script-engine/src/main/java/cc/iotkit/script/JavaScriptEngine.java +++ b/iot-common/iot-script-engine/src/main/java/cc/iotkit/script/JavaScriptEngine.java @@ -9,6 +9,7 @@ */ package cc.iotkit.script; + import cc.iotkit.common.utils.JsonUtil; import com.fasterxml.jackson.core.type.TypeReference; import lombok.extern.slf4j.Slf4j; diff --git a/iot-script-engine/src/main/java/cc/iotkit/script/ProcessStringToJsonExample.java b/iot-common/iot-script-engine/src/main/java/cc/iotkit/script/ProcessStringToJsonExample.java similarity index 100% rename from iot-script-engine/src/main/java/cc/iotkit/script/ProcessStringToJsonExample.java rename to iot-common/iot-script-engine/src/main/java/cc/iotkit/script/ProcessStringToJsonExample.java diff --git a/iot-script-engine/src/main/java/cc/iotkit/script/ScriptEngineFactory.java b/iot-common/iot-script-engine/src/main/java/cc/iotkit/script/ScriptEngineFactory.java similarity index 100% rename from iot-script-engine/src/main/java/cc/iotkit/script/ScriptEngineFactory.java rename to iot-common/iot-script-engine/src/main/java/cc/iotkit/script/ScriptEngineFactory.java diff --git a/iot-script-engine/src/main/java/cc/iotkit/script/ScriptException.java b/iot-common/iot-script-engine/src/main/java/cc/iotkit/script/ScriptException.java similarity index 100% rename from iot-script-engine/src/main/java/cc/iotkit/script/ScriptException.java rename to iot-common/iot-script-engine/src/main/java/cc/iotkit/script/ScriptException.java diff --git a/iot-common/pom.xml b/iot-common/pom.xml old mode 100755 new mode 100644 index 162ab68b..cf38493e --- a/iot-common/pom.xml +++ b/iot-common/pom.xml @@ -2,53 +2,32 @@ + 4.0.0 iotkit-parent cc.iotkit - 0.4.3-SNAPSHOT + ${revision} - 4.0.0 + pom iot-common + + 技术组件，也分成两类： + 1. 框架组件：脚本引擎、通讯总线等等的拓展 + 2. 业务组件：物模型、鉴权、工具 + - + + iot-common-core + iot-script-engine + iot-message-bus + - - org.apache.commons - commons-lang3 - - - - commons-codec - commons-codec - - - - commons-io - commons-io - - - - com.fasterxml.jackson.core - jackson-core - - - - com.fasterxml.jackson.core - jackson-databind - - - - commons-beanutils - commons-beanutils - - - - org.projectlombok - lombok - true - - - + + 11 + 11 + UTF-8 + + \ No newline at end of file diff --git a/iot-common/readme.txt b/iot-common/readme.txt deleted file mode 100755 index 539c28cd..00000000 --- a/iot-common/readme.txt +++ /dev/null @@ -1 +0,0 @@ -此模块为通用业务逻辑或工具类 diff --git a/iot-common/src/main/java/cc/iotkit/common/exception/NotFoundException.java b/iot-common/src/main/java/cc/iotkit/common/exception/NotFoundException.java deleted file mode 100755 index adddcb7a..00000000 --- a/iot-common/src/main/java/cc/iotkit/common/exception/NotFoundException.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * +---------------------------------------------------------------------- - * | Copyright (c) 奇特物联 2021-2022 All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed 未经许可不能去掉「奇特物联」相关版权 - * +---------------------------------------------------------------------- - * | Author: xw2sy@163.com - * +---------------------------------------------------------------------- - */ -package cc.iotkit.common.exception; - - -public class NotFoundException extends BizException { - public NotFoundException() { - } - - public NotFoundException(String message) { - super(message); - } - - public NotFoundException(String message, Throwable cause) { - super(message, cause); - } - - public NotFoundException(Throwable cause) { - super(cause); - } -} diff --git a/iot-common/src/main/java/cc/iotkit/common/exception/OfflineException.java b/iot-common/src/main/java/cc/iotkit/common/exception/OfflineException.java deleted file mode 100755 index 393a2a5d..00000000 --- a/iot-common/src/main/java/cc/iotkit/common/exception/OfflineException.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * +---------------------------------------------------------------------- - * | Copyright (c) 奇特物联 2021-2022 All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed 未经许可不能去掉「奇特物联」相关版权 - * +---------------------------------------------------------------------- - * | Author: xw2sy@163.com - * +---------------------------------------------------------------------- - */ -package cc.iotkit.common.exception; - - -public class OfflineException extends BizException { - - public OfflineException() { - } - - public OfflineException(String message) { - super(message); - } - - public OfflineException(String message, Throwable cause) { - super(message, cause); - } - - public OfflineException(Throwable cause) { - super(cause); - } -} diff --git a/iot-components/iot-DLT645-component/dependency-reduced-pom.xml b/iot-components/iot-DLT645-component/dependency-reduced-pom.xml index 23cb4449..3c910860 100644 --- a/iot-components/iot-DLT645-component/dependency-reduced-pom.xml +++ b/iot-components/iot-DLT645-component/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ iot-components cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 iot-DLT645-component @@ -61,6 +61,12 @@ 0.4.3-SNAPSHOT compile + + cc.iotkit + iot-common-core + 0.4.3-SNAPSHOT + compile + cn.hutool hutool-core diff --git a/iot-components/iot-DLT645-component/pom.xml b/iot-components/iot-DLT645-component/pom.xml index c3827155..5d940944 100644 --- a/iot-components/iot-DLT645-component/pom.xml +++ b/iot-components/iot-DLT645-component/pom.xml @@ -5,7 +5,7 @@ iot-components cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 @@ -30,7 +30,7 @@ cc.iotkit - iot-common + iot-common-core diff --git a/iot-components/iot-component-base/pom.xml b/iot-components/iot-component-base/pom.xml index e240f6cf..ec3794fd 100755 --- a/iot-components/iot-component-base/pom.xml +++ b/iot-components/iot-component-base/pom.xml @@ -5,7 +5,7 @@ iot-components cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 diff --git a/iot-components/iot-component-converter/pom.xml b/iot-components/iot-component-converter/pom.xml index 841439d6..554d0d52 100755 --- a/iot-components/iot-component-converter/pom.xml +++ b/iot-components/iot-component-converter/pom.xml @@ -5,7 +5,7 @@ iot-components cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 diff --git a/iot-components/iot-component-server/pom.xml b/iot-components/iot-component-server/pom.xml index 27f8e2d9..f8c341c8 100755 --- a/iot-components/iot-component-server/pom.xml +++ b/iot-components/iot-component-server/pom.xml @@ -5,7 +5,7 @@ iot-components cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 @@ -59,7 +59,7 @@ cc.iotkit - iot-common + iot-common-core diff --git a/iot-components/iot-component-tcp/dependency-reduced-pom.xml b/iot-components/iot-component-tcp/dependency-reduced-pom.xml index 38763667..66edf108 100644 --- a/iot-components/iot-component-tcp/dependency-reduced-pom.xml +++ b/iot-components/iot-component-tcp/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ iot-components cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 iot-component-tcp @@ -78,7 +78,7 @@ cc.iotkit - iot-common + iot-common-core 0.4.3-SNAPSHOT compile diff --git a/iot-components/iot-component-tcp/pom.xml b/iot-components/iot-component-tcp/pom.xml index 9765f4b2..7c08c507 100644 --- a/iot-components/iot-component-tcp/pom.xml +++ b/iot-components/iot-component-tcp/pom.xml @@ -5,7 +5,7 @@ iot-components cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 @@ -42,7 +42,7 @@ cc.iotkit - iot-common + iot-common-core diff --git a/iot-components/iot-ctwing-component/pom.xml b/iot-components/iot-ctwing-component/pom.xml index bec29b44..83213de4 100644 --- a/iot-components/iot-ctwing-component/pom.xml +++ b/iot-components/iot-ctwing-component/pom.xml @@ -5,7 +5,7 @@ iot-components cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 diff --git a/iot-components/iot-emqx-component/dependency-reduced-pom.xml b/iot-components/iot-emqx-component/dependency-reduced-pom.xml index 4ebeef75..c256e854 100644 --- a/iot-components/iot-emqx-component/dependency-reduced-pom.xml +++ b/iot-components/iot-emqx-component/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ iot-components cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 iot-emqx-component @@ -89,7 +89,7 @@ cc.iotkit - iot-common + iot-common-core 0.4.3-SNAPSHOT compile diff --git a/iot-components/iot-emqx-component/pom.xml b/iot-components/iot-emqx-component/pom.xml index cb2292b2..4d0f9586 100755 --- a/iot-components/iot-emqx-component/pom.xml +++ b/iot-components/iot-emqx-component/pom.xml @@ -5,7 +5,7 @@ iot-components cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 @@ -40,7 +40,7 @@ cc.iotkit - iot-common + iot-common-core diff --git a/iot-components/iot-http-biz-component/dependency-reduced-pom.xml b/iot-components/iot-http-biz-component/dependency-reduced-pom.xml index d3d2ddab..4a7d557c 100644 --- a/iot-components/iot-http-biz-component/dependency-reduced-pom.xml +++ b/iot-components/iot-http-biz-component/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ iot-components cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 iot-http-biz-component diff --git a/iot-components/iot-http-biz-component/pom.xml b/iot-components/iot-http-biz-component/pom.xml index 720495c4..cf82e266 100755 --- a/iot-components/iot-http-biz-component/pom.xml +++ b/iot-components/iot-http-biz-component/pom.xml @@ -5,7 +5,7 @@ iot-components cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 diff --git a/iot-components/iot-mqtt-component/dependency-reduced-pom.xml b/iot-components/iot-mqtt-component/dependency-reduced-pom.xml index e6e47463..2a282912 100644 --- a/iot-components/iot-mqtt-component/dependency-reduced-pom.xml +++ b/iot-components/iot-mqtt-component/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ iot-components cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 iot-mqtt-component @@ -81,7 +81,7 @@ cc.iotkit - iot-common + iot-common-core 0.4.3-SNAPSHOT compile diff --git a/iot-components/iot-mqtt-component/pom.xml b/iot-components/iot-mqtt-component/pom.xml index f910c0be..a3799454 100755 --- a/iot-components/iot-mqtt-component/pom.xml +++ b/iot-components/iot-mqtt-component/pom.xml @@ -5,7 +5,7 @@ iot-components cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 @@ -45,7 +45,7 @@ cc.iotkit - iot-common + iot-common-core diff --git a/iot-components/iot-websocket-component/dependency-reduced-pom.xml b/iot-components/iot-websocket-component/dependency-reduced-pom.xml index 6f800c29..6fde95e6 100644 --- a/iot-components/iot-websocket-component/dependency-reduced-pom.xml +++ b/iot-components/iot-websocket-component/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ iot-components cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 iot-websocket-component @@ -53,6 +53,12 @@ 1.18.24 compile + + cc.iotkit + iot-common-core + 0.4.3-SNAPSHOT + compile + org.slf4j slf4j-api diff --git a/iot-components/iot-websocket-component/pom.xml b/iot-components/iot-websocket-component/pom.xml index 0a79c76e..dc4060c9 100644 --- a/iot-components/iot-websocket-component/pom.xml +++ b/iot-components/iot-websocket-component/pom.xml @@ -5,7 +5,7 @@ iot-components cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 @@ -25,7 +25,7 @@ cc.iotkit - iot-common + iot-common-core diff --git a/iot-components/pom.xml b/iot-components/pom.xml index 9a920bbf..92cdb595 100755 --- a/iot-components/pom.xml +++ b/iot-components/pom.xml @@ -5,7 +5,7 @@ iotkit-parent cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 @@ -21,7 +21,7 @@ iot-component-tcp iot-DLT645-component iot-websocket-component - + \ No newline at end of file diff --git a/iot-data/iot-data-cache/pom.xml b/iot-data/iot-data-cache/pom.xml index f43db79f..45fb25be 100755 --- a/iot-data/iot-data-cache/pom.xml +++ b/iot-data/iot-data-cache/pom.xml @@ -5,7 +5,7 @@ iot-data cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 @@ -30,7 +30,7 @@ cc.iotkit - iot-common + iot-common-core diff --git a/iot-data/iot-data-service/pom.xml b/iot-data/iot-data-service/pom.xml index 67645f13..fa25d7cc 100755 --- a/iot-data/iot-data-service/pom.xml +++ b/iot-data/iot-data-service/pom.xml @@ -5,7 +5,7 @@ iot-data cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 diff --git a/iot-data/iot-es-temporal-service/pom.xml b/iot-data/iot-es-temporal-service/pom.xml index 8079ceeb..f1d57e8c 100755 --- a/iot-data/iot-es-temporal-service/pom.xml +++ b/iot-data/iot-es-temporal-service/pom.xml @@ -5,7 +5,7 @@ iot-data cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 diff --git a/iot-data/iot-model/pom.xml b/iot-data/iot-model/pom.xml index 948189cf..52ae0d66 100755 --- a/iot-data/iot-model/pom.xml +++ b/iot-data/iot-model/pom.xml @@ -5,9 +5,9 @@ iot-data cc.iotkit - 0.4.3-SNAPSHOT + ${revision} - 0.4.3-SNAPSHOT + ${revision} 4.0.0 iot-model @@ -27,7 +27,7 @@ cc.iotkit - iot-common + iot-common-core diff --git a/iot-data/iot-rdb-data-service/pom.xml b/iot-data/iot-rdb-data-service/pom.xml index 5f8232e9..de0fef69 100755 --- a/iot-data/iot-rdb-data-service/pom.xml +++ b/iot-data/iot-rdb-data-service/pom.xml @@ -5,12 +5,16 @@ iot-data cc.iotkit - 0.4.3-SNAPSHOT + ${revision} - 0.4.3-SNAPSHOT + ${revision} 4.0.0 iot-rdb-data-service + + 关系型数据库的数据服务实现模块 + 如：h2、mysql，由jpa兼容不同数据库 + diff --git a/iot-data/iot-rdb-data-service/readme.md b/iot-data/iot-rdb-data-service/readme.md deleted file mode 100755 index e93c095d..00000000 --- a/iot-data/iot-rdb-data-service/readme.md +++ /dev/null @@ -1,4 +0,0 @@ -## 关系型数据库的数据服务实现模块 - -如：h2、mysql，由jpa兼容不同数据库方言 - diff --git a/iot-data/iot-td-temporal-service/pom.xml b/iot-data/iot-td-temporal-service/pom.xml index b70c72ee..a39f5834 100644 --- a/iot-data/iot-td-temporal-service/pom.xml +++ b/iot-data/iot-td-temporal-service/pom.xml @@ -5,12 +5,19 @@ iot-data cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 iot-td-temporal-service + + 时序数据库服务接口的TDengine实现 + 支持版本：v0.4.1 + TDengine版本：2.6.0.12 + + + diff --git a/iot-data/iot-td-temporal-service/readme.md b/iot-data/iot-td-temporal-service/readme.md deleted file mode 100644 index 80d68d83..00000000 --- a/iot-data/iot-td-temporal-service/readme.md +++ /dev/null @@ -1,7 +0,0 @@ -### 时序数据库服务接口的TDengine实现 - -支持版本：v0.4.1 - -TDengine版本：2.6.0.12 - - diff --git a/iot-data/iot-temporal-service/pom.xml b/iot-data/iot-temporal-service/pom.xml index 5e577b34..c294eb36 100755 --- a/iot-data/iot-temporal-service/pom.xml +++ b/iot-data/iot-temporal-service/pom.xml @@ -5,7 +5,7 @@ iot-data cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 diff --git a/iot-data/iot-ts-temporal-service/pom.xml b/iot-data/iot-ts-temporal-service/pom.xml index 213c8638..18ac3af7 100644 --- a/iot-data/iot-ts-temporal-service/pom.xml +++ b/iot-data/iot-ts-temporal-service/pom.xml @@ -6,11 +6,17 @@ cc.iotkit iot-data - 0.4.3-SNAPSHOT + ${revision} iot-ts-temporal-service + + 时序数据库服务接口的TimescaleDB实现 + postgrep 14 + + + 11 11 diff --git a/iot-data/iot-ts-temporal-service/readme.md b/iot-data/iot-ts-temporal-service/readme.md deleted file mode 100644 index e84fc038..00000000 --- a/iot-data/iot-ts-temporal-service/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -### 时序数据库服务接口的TimescaleDB实现 - -postgrep 14 - - diff --git a/iot-data/pom.xml b/iot-data/pom.xml index ece7abdf..279d1033 100755 --- a/iot-data/pom.xml +++ b/iot-data/pom.xml @@ -5,11 +5,16 @@ iotkit-parent cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 pom + + 与数据存取相关内容的模块 + 包含：数据接口定义、数据实体类定义、关系型数据库接口实现、NoSQL数据库接口实现、数据缓存服务 + + iot-model iot-data-service diff --git a/iot-data/readme.md b/iot-data/readme.md deleted file mode 100755 index b10f5cbb..00000000 --- a/iot-data/readme.md +++ /dev/null @@ -1,4 +0,0 @@ -## 与数据存取相关内容的模块 - -包含：数据接口定义、数据实体类定义、关系型数据库接口实现、NoSQL数据库接口实现、数据缓存服务 - diff --git a/iot-message-bus/readme.txt b/iot-message-bus/readme.txt deleted file mode 100755 index 6ea1f220..00000000 --- a/iot-message-bus/readme.txt +++ /dev/null @@ -1 +0,0 @@ -消息队列适配模块，用于提供默认消息队列和适配不同消息队列接入 \ No newline at end of file diff --git a/iot-package/pom.xml b/iot-package/pom.xml deleted file mode 100755 index 968e9703..00000000 --- a/iot-package/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - iotkit-parent - cc.iotkit - 0.4.3-SNAPSHOT - - 4.0.0 - - iot-package - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.0 - - 11 - 11 - UTF-8 - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - - - - \ No newline at end of file diff --git a/iot-package/readme.txt b/iot-package/readme.txt deleted file mode 100755 index e884bd18..00000000 --- a/iot-package/readme.txt +++ /dev/null @@ -1,14 +0,0 @@ -用于将程序组织打包成zip包 - -打包后的结构： -lib - xx.jar - ... - - -打包后启动脚本： -如linux: -java -classpath ".:lib/*" cc.iotkit.manager.Application - - - diff --git a/iot-rule-engine/pom.xml b/iot-rule-engine/pom.xml index f413adbb..421d8c4d 100755 --- a/iot-rule-engine/pom.xml +++ b/iot-rule-engine/pom.xml @@ -5,11 +5,16 @@ iotkit-parent cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 iot-rule-engine + + 规则引擎模块，包含场景引擎、数据流转等 + + + @@ -70,7 +75,7 @@ cc.iotkit - iot-common + iot-common-core diff --git a/iot-rule-engine/readme.txt b/iot-rule-engine/readme.txt deleted file mode 100755 index eadfa1c2..00000000 --- a/iot-rule-engine/readme.txt +++ /dev/null @@ -1 +0,0 @@ -规则引擎模块，包含场景引擎、数据流转等 \ No newline at end of file diff --git a/iot-standalone/pom.xml b/iot-standalone/pom.xml deleted file mode 100755 index 2a5eceb7..00000000 --- a/iot-standalone/pom.xml +++ /dev/null @@ -1,263 +0,0 @@ - - - - iotkit-parent - cc.iotkit - 0.4.3-SNAPSHOT - - 4.0.0 - - iot-standalone - - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-logging - - - org.apache.logging.log4j - log4j-to-slf4j - - - - - - org.apache.logging.log4j - log4j-core - - - - org.projectlombok - lombok - true - - - - commons-beanutils - commons-beanutils - - - - org.apache.commons - commons-lang3 - - - - commons-codec - commons-codec - - - - commons-io - commons-io - - - - org.bouncycastle - bcprov-jdk15on - - - - com.aliyun.oss - aliyun-sdk-oss - - - - joda-time - joda-time - - - - it.ozimov - embedded-redis - - - slf4j-simple - org.slf4j - - - - - - org.elasticsearch - elasticsearch - - - - org.elasticsearch.plugin - transport-netty4-client - - - - cc.iotkit - iot-model - - - - cc.iotkit - iot-common - - - - cc.iotkit - iot-rule-engine - - - - cc.iotkit - iot-component-server - - - - cc.iotkit - iot-component-converter - - - - cc.iotkit - iot-auth-server - - - - cc.iotkit - iot-virtual-device - - - - cc.iotkit - iot-message-core - - - - - cc.iotkit - iot-vertx-event-bus - - - - - - - - - - cc.iotkit - iot-temporal-service - - - - cc.iotkit - iot-rdb-data-service - - - - - cc.iotkit - iot-es-temporal-service - - - - - - - - - - - - - - - - cc.iotkit - iot-data-cache - - - - - io.springfox - springfox-boot-starter - 3.0.0 - - - io.swagger - swagger-models - - - - - io.swagger - swagger-models - 1.6.8 - - - - - com.github.xiaoymin - knife4j-spring-boot-starter - 3.0.3 - - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.0 - - 11 - 11 - UTF-8 - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.apache.maven.plugins - maven-assembly-plugin - - - cc.iotkit - iot-package - ${project.version} - - - - false - - standalone-package - - - - - make-assembly - package - - single - - - - - - - - - - \ No newline at end of file diff --git a/iot-starter/pom.xml b/iot-starter/pom.xml new file mode 100644 index 00000000..ac2d2dfb --- /dev/null +++ b/iot-starter/pom.xml @@ -0,0 +1,249 @@ + + + + iotkit-parent + cc.iotkit + ${revision} + + 4.0.0 + + iot-starter + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-logging + + + org.apache.logging.log4j + log4j-to-slf4j + + + + + + org.apache.logging.log4j + log4j-core + + + + org.projectlombok + lombok + true + + + + commons-beanutils + commons-beanutils + + + + org.apache.commons + commons-lang3 + + + + commons-codec + commons-codec + + + + commons-io + commons-io + + + + org.bouncycastle + bcprov-jdk15on + + + + com.aliyun.oss + aliyun-sdk-oss + + + + joda-time + joda-time + + + + it.ozimov + embedded-redis + + + slf4j-simple + org.slf4j + + + + + + org.elasticsearch + elasticsearch + + + + org.elasticsearch.plugin + transport-netty4-client + + + + cc.iotkit + iot-model + + + + cc.iotkit + iot-common-core + + + + cc.iotkit + iot-rule-engine + + + + cc.iotkit + iot-component-server + + + + cc.iotkit + iot-component-converter + + + + cc.iotkit + iot-auth-server + + + + cc.iotkit + iot-virtual-device + + + + cc.iotkit + iot-message-core + + + + + cc.iotkit + iot-vertx-event-bus + + + + + + + + + + cc.iotkit + iot-temporal-service + + + + cc.iotkit + iot-rdb-data-service + + + + + cc.iotkit + iot-es-temporal-service + + + + + + + + + + + + + + + + cc.iotkit + iot-data-cache + + + + + io.springfox + springfox-boot-starter + 3.0.0 + + + io.swagger + swagger-models + + + + + io.swagger + swagger-models + 1.6.8 + + + + + com.github.xiaoymin + knife4j-spring-boot-starter + 3.0.3 + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.0 + + 11 + 11 + UTF-8 + + + + + org.apache.maven.plugins + maven-assembly-plugin + + false + + ${project.parent.basedir}/iot-starter/src/main/resources/assemblies/standalone-package.xml + + + + + make-assembly + package + + single + + + + + + + + + \ No newline at end of file diff --git a/iot-standalone/readme.md b/iot-starter/readme.md old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/readme.md rename to iot-starter/readme.md diff --git a/iot-standalone/src/main/bin/start.bat b/iot-starter/src/main/bin/start.bat similarity index 100% rename from iot-standalone/src/main/bin/start.bat rename to iot-starter/src/main/bin/start.bat diff --git a/iot-standalone/src/main/bin/start.sh b/iot-starter/src/main/bin/start.sh similarity index 100% rename from iot-standalone/src/main/bin/start.sh rename to iot-starter/src/main/bin/start.sh diff --git a/iot-standalone/src/main/bin/stop.sh b/iot-starter/src/main/bin/stop.sh similarity index 100% rename from iot-standalone/src/main/bin/stop.sh rename to iot-starter/src/main/bin/stop.sh diff --git a/iot-standalone/src/main/java/cc/iotkit/Application.java b/iot-starter/src/main/java/cc/iotkit/Application.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/Application.java rename to iot-starter/src/main/java/cc/iotkit/Application.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/config/AliyunConfig.java b/iot-starter/src/main/java/cc/iotkit/manager/config/AliyunConfig.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/config/AliyunConfig.java rename to iot-starter/src/main/java/cc/iotkit/manager/config/AliyunConfig.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/config/CrossConfig.java b/iot-starter/src/main/java/cc/iotkit/manager/config/CrossConfig.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/config/CrossConfig.java rename to iot-starter/src/main/java/cc/iotkit/manager/config/CrossConfig.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/config/EmbeddedElasticSearchConfig.java b/iot-starter/src/main/java/cc/iotkit/manager/config/EmbeddedElasticSearchConfig.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/config/EmbeddedElasticSearchConfig.java rename to iot-starter/src/main/java/cc/iotkit/manager/config/EmbeddedElasticSearchConfig.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/config/EmbeddedRedisConfig.java b/iot-starter/src/main/java/cc/iotkit/manager/config/EmbeddedRedisConfig.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/config/EmbeddedRedisConfig.java rename to iot-starter/src/main/java/cc/iotkit/manager/config/EmbeddedRedisConfig.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/config/GlobalExceptionHandler.java b/iot-starter/src/main/java/cc/iotkit/manager/config/GlobalExceptionHandler.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/config/GlobalExceptionHandler.java rename to iot-starter/src/main/java/cc/iotkit/manager/config/GlobalExceptionHandler.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/config/ResponseResultHandler.java b/iot-starter/src/main/java/cc/iotkit/manager/config/ResponseResultHandler.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/config/ResponseResultHandler.java rename to iot-starter/src/main/java/cc/iotkit/manager/config/ResponseResultHandler.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/config/SaTokenConfigure.java b/iot-starter/src/main/java/cc/iotkit/manager/config/SaTokenConfigure.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/config/SaTokenConfigure.java rename to iot-starter/src/main/java/cc/iotkit/manager/config/SaTokenConfigure.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/config/SwaggerConfig.java b/iot-starter/src/main/java/cc/iotkit/manager/config/SwaggerConfig.java similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/config/SwaggerConfig.java rename to iot-starter/src/main/java/cc/iotkit/manager/config/SwaggerConfig.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/controller/DeviceController.java b/iot-starter/src/main/java/cc/iotkit/manager/controller/DeviceController.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/controller/DeviceController.java rename to iot-starter/src/main/java/cc/iotkit/manager/controller/DeviceController.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/controller/ProductController.java b/iot-starter/src/main/java/cc/iotkit/manager/controller/ProductController.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/controller/ProductController.java rename to iot-starter/src/main/java/cc/iotkit/manager/controller/ProductController.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/controller/ProtocolController.java b/iot-starter/src/main/java/cc/iotkit/manager/controller/ProtocolController.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/controller/ProtocolController.java rename to iot-starter/src/main/java/cc/iotkit/manager/controller/ProtocolController.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/controller/RuleEngineController.java b/iot-starter/src/main/java/cc/iotkit/manager/controller/RuleEngineController.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/controller/RuleEngineController.java rename to iot-starter/src/main/java/cc/iotkit/manager/controller/RuleEngineController.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/controller/SpaceController.java b/iot-starter/src/main/java/cc/iotkit/manager/controller/SpaceController.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/controller/SpaceController.java rename to iot-starter/src/main/java/cc/iotkit/manager/controller/SpaceController.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/controller/SpaceDeviceController.java b/iot-starter/src/main/java/cc/iotkit/manager/controller/SpaceDeviceController.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/controller/SpaceDeviceController.java rename to iot-starter/src/main/java/cc/iotkit/manager/controller/SpaceDeviceController.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/controller/StatsController.java b/iot-starter/src/main/java/cc/iotkit/manager/controller/StatsController.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/controller/StatsController.java rename to iot-starter/src/main/java/cc/iotkit/manager/controller/StatsController.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/controller/UserInfoController.java b/iot-starter/src/main/java/cc/iotkit/manager/controller/UserInfoController.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/controller/UserInfoController.java rename to iot-starter/src/main/java/cc/iotkit/manager/controller/UserInfoController.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/controller/VirtualDeviceController.java b/iot-starter/src/main/java/cc/iotkit/manager/controller/VirtualDeviceController.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/controller/VirtualDeviceController.java rename to iot-starter/src/main/java/cc/iotkit/manager/controller/VirtualDeviceController.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/model/query/DeviceQuery.java b/iot-starter/src/main/java/cc/iotkit/manager/model/query/DeviceQuery.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/model/query/DeviceQuery.java rename to iot-starter/src/main/java/cc/iotkit/manager/model/query/DeviceQuery.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/model/stats/MainStats.java b/iot-starter/src/main/java/cc/iotkit/manager/model/stats/MainStats.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/model/stats/MainStats.java rename to iot-starter/src/main/java/cc/iotkit/manager/model/stats/MainStats.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/model/vo/AppDesignVo.java b/iot-starter/src/main/java/cc/iotkit/manager/model/vo/AppDesignVo.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/model/vo/AppDesignVo.java rename to iot-starter/src/main/java/cc/iotkit/manager/model/vo/AppDesignVo.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/model/vo/AppPageNode.java b/iot-starter/src/main/java/cc/iotkit/manager/model/vo/AppPageNode.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/model/vo/AppPageNode.java rename to iot-starter/src/main/java/cc/iotkit/manager/model/vo/AppPageNode.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/model/vo/DeviceLog.java b/iot-starter/src/main/java/cc/iotkit/manager/model/vo/DeviceLog.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/model/vo/DeviceLog.java rename to iot-starter/src/main/java/cc/iotkit/manager/model/vo/DeviceLog.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/model/vo/FindDeviceVo.java b/iot-starter/src/main/java/cc/iotkit/manager/model/vo/FindDeviceVo.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/model/vo/FindDeviceVo.java rename to iot-starter/src/main/java/cc/iotkit/manager/model/vo/FindDeviceVo.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/model/vo/LoginResult.java b/iot-starter/src/main/java/cc/iotkit/manager/model/vo/LoginResult.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/model/vo/LoginResult.java rename to iot-starter/src/main/java/cc/iotkit/manager/model/vo/LoginResult.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/model/vo/MessageVo.java b/iot-starter/src/main/java/cc/iotkit/manager/model/vo/MessageVo.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/model/vo/MessageVo.java rename to iot-starter/src/main/java/cc/iotkit/manager/model/vo/MessageVo.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/model/vo/SpaceDeviceVo.java b/iot-starter/src/main/java/cc/iotkit/manager/model/vo/SpaceDeviceVo.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/model/vo/SpaceDeviceVo.java rename to iot-starter/src/main/java/cc/iotkit/manager/model/vo/SpaceDeviceVo.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/model/vo/SpaceInfo.java b/iot-starter/src/main/java/cc/iotkit/manager/model/vo/SpaceInfo.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/model/vo/SpaceInfo.java rename to iot-starter/src/main/java/cc/iotkit/manager/model/vo/SpaceInfo.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/service/DataOwnerService.java b/iot-starter/src/main/java/cc/iotkit/manager/service/DataOwnerService.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/service/DataOwnerService.java rename to iot-starter/src/main/java/cc/iotkit/manager/service/DataOwnerService.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/service/DeferredDataConsumer.java b/iot-starter/src/main/java/cc/iotkit/manager/service/DeferredDataConsumer.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/service/DeferredDataConsumer.java rename to iot-starter/src/main/java/cc/iotkit/manager/service/DeferredDataConsumer.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/service/DeviceService.java b/iot-starter/src/main/java/cc/iotkit/manager/service/DeviceService.java old mode 100755 new mode 100644 similarity index 95% rename from iot-standalone/src/main/java/cc/iotkit/manager/service/DeviceService.java rename to iot-starter/src/main/java/cc/iotkit/manager/service/DeviceService.java index bb49a870..479b0ec0 --- a/iot-standalone/src/main/java/cc/iotkit/manager/service/DeviceService.java +++ b/iot-starter/src/main/java/cc/iotkit/manager/service/DeviceService.java @@ -9,12 +9,14 @@ */ package cc.iotkit.manager.service; -import cc.iotkit.common.exception.NotFoundException; -import cc.iotkit.common.exception.OfflineException; +import static cc.iotkit.common.enums.ErrCode.DEVICE_NOT_FOUND; +import static cc.iotkit.common.enums.ErrCode.DEVICE_OFFLINE; + +import cc.iotkit.common.exception.BizException; +import cc.iotkit.common.thing.ThingService; import cc.iotkit.common.utils.JsonUtil; import cc.iotkit.common.utils.UniqueIdUtil; import cc.iotkit.comps.DeviceComponentManager; -import cc.iotkit.common.thing.ThingService; import cc.iotkit.data.IDeviceConfigData; import cc.iotkit.data.IDeviceInfoData; import cc.iotkit.model.device.DeviceConfig; @@ -22,14 +24,13 @@ import cc.iotkit.model.device.DeviceInfo; import cc.iotkit.model.device.message.ThingModelMessage; import cc.iotkit.temporal.IThingModelMessageData; import cc.iotkit.virtualdevice.VirtualManager; +import java.util.List; +import java.util.Map; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Map; - @Slf4j @Service public class DeviceService { @@ -124,7 +125,7 @@ public class DeviceService { private DeviceInfo getAndCheckDevice(String deviceId, boolean checkOwner) { DeviceInfo device = deviceInfoData.findByDeviceId(deviceId); if (device == null) { - throw new NotFoundException("device not found by deviceId"); + throw new BizException(DEVICE_NOT_FOUND); } if (checkOwner) { @@ -132,7 +133,7 @@ public class DeviceService { } if (!device.getState().isOnline()) { - throw new OfflineException("device is offline"); + throw new BizException(DEVICE_OFFLINE); } return device; } diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/service/DeviceStateCheckTask.java b/iot-starter/src/main/java/cc/iotkit/manager/service/DeviceStateCheckTask.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/service/DeviceStateCheckTask.java rename to iot-starter/src/main/java/cc/iotkit/manager/service/DeviceStateCheckTask.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/service/ExampleDataInit.java b/iot-starter/src/main/java/cc/iotkit/manager/service/ExampleDataInit.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/service/ExampleDataInit.java rename to iot-starter/src/main/java/cc/iotkit/manager/service/ExampleDataInit.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/service/SpaceDeviceService.java b/iot-starter/src/main/java/cc/iotkit/manager/service/SpaceDeviceService.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/service/SpaceDeviceService.java rename to iot-starter/src/main/java/cc/iotkit/manager/service/SpaceDeviceService.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/service/ThingModelService.java b/iot-starter/src/main/java/cc/iotkit/manager/service/ThingModelService.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/service/ThingModelService.java rename to iot-starter/src/main/java/cc/iotkit/manager/service/ThingModelService.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/service/WeChatService.java b/iot-starter/src/main/java/cc/iotkit/manager/service/WeChatService.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/service/WeChatService.java rename to iot-starter/src/main/java/cc/iotkit/manager/service/WeChatService.java diff --git a/iot-standalone/src/main/java/cc/iotkit/manager/utils/WeChatUtil.java b/iot-starter/src/main/java/cc/iotkit/manager/utils/WeChatUtil.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/java/cc/iotkit/manager/utils/WeChatUtil.java rename to iot-starter/src/main/java/cc/iotkit/manager/utils/WeChatUtil.java diff --git a/iot-standalone/src/main/resources/application-dev.yml b/iot-starter/src/main/resources/application-dev.yml old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/resources/application-dev.yml rename to iot-starter/src/main/resources/application-dev.yml diff --git a/iot-standalone/src/main/resources/application-mysql.yml b/iot-starter/src/main/resources/application-mysql.yml similarity index 100% rename from iot-standalone/src/main/resources/application-mysql.yml rename to iot-starter/src/main/resources/application-mysql.yml diff --git a/iot-standalone/src/main/resources/application.yml b/iot-starter/src/main/resources/application.yml old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/resources/application.yml rename to iot-starter/src/main/resources/application.yml diff --git a/iot-package/src/main/resources/assemblies/standalone-package.xml b/iot-starter/src/main/resources/assemblies/standalone-package.xml old mode 100755 new mode 100644 similarity index 94% rename from iot-package/src/main/resources/assemblies/standalone-package.xml rename to iot-starter/src/main/resources/assemblies/standalone-package.xml index 7e41e334..baf05812 --- a/iot-package/src/main/resources/assemblies/standalone-package.xml +++ b/iot-starter/src/main/resources/assemblies/standalone-package.xml @@ -15,7 +15,7 @@ --> - ${project.parent.basedir}/iot-standalone/src/main/bin + ${project.parent.basedir}/iot-starter/src/main/bin /bin **/*.bat @@ -29,7 +29,7 @@ - ${project.parent.basedir}/iot-standalone/src/main/resources + ${project.parent.basedir}/iot-starter/src/main/resources /config **/*.xml diff --git a/iot-standalone/src/main/resources/logback-spring.xml b/iot-starter/src/main/resources/logback-spring.xml old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/main/resources/logback-spring.xml rename to iot-starter/src/main/resources/logback-spring.xml diff --git a/iot-standalone/src/test/java/JsTest.java b/iot-starter/src/test/java/JsTest.java old mode 100755 new mode 100644 similarity index 100% rename from iot-standalone/src/test/java/JsTest.java rename to iot-starter/src/test/java/JsTest.java diff --git a/iot-test-tool/iot-test-mqtt/pom.xml b/iot-test-tool/iot-test-mqtt/pom.xml index 0fb880d0..c5da22f3 100755 --- a/iot-test-tool/iot-test-mqtt/pom.xml +++ b/iot-test-tool/iot-test-mqtt/pom.xml @@ -5,7 +5,7 @@ iot-test-tool cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 @@ -39,7 +39,7 @@ cc.iotkit - iot-common + iot-common-core diff --git a/iot-virtual-device/pom.xml b/iot-test-tool/iot-virtual-device/pom.xml old mode 100755 new mode 100644 similarity index 85% rename from iot-virtual-device/pom.xml rename to iot-test-tool/iot-virtual-device/pom.xml index 113ec720..f3d21d9f --- a/iot-virtual-device/pom.xml +++ b/iot-test-tool/iot-virtual-device/pom.xml @@ -3,14 +3,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - iotkit-parent + iot-test-tool cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 iot-virtual-device - + + 虚拟设备模块，用于虚拟真实设备数据上报 + diff --git a/iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/VirtualExecutor.java b/iot-test-tool/iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/VirtualExecutor.java old mode 100755 new mode 100644 similarity index 100% rename from iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/VirtualExecutor.java rename to iot-test-tool/iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/VirtualExecutor.java diff --git a/iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/VirtualManager.java b/iot-test-tool/iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/VirtualManager.java old mode 100755 new mode 100644 similarity index 100% rename from iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/VirtualManager.java rename to iot-test-tool/iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/VirtualManager.java diff --git a/iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/config/VirtualConfig.java b/iot-test-tool/iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/config/VirtualConfig.java old mode 100755 new mode 100644 similarity index 100% rename from iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/config/VirtualConfig.java rename to iot-test-tool/iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/config/VirtualConfig.java diff --git a/iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/trigger/RandomScheduleBuilder.java b/iot-test-tool/iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/trigger/RandomScheduleBuilder.java old mode 100755 new mode 100644 similarity index 100% rename from iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/trigger/RandomScheduleBuilder.java rename to iot-test-tool/iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/trigger/RandomScheduleBuilder.java diff --git a/iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/trigger/RandomTrigger.java b/iot-test-tool/iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/trigger/RandomTrigger.java old mode 100755 new mode 100644 similarity index 100% rename from iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/trigger/RandomTrigger.java rename to iot-test-tool/iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/trigger/RandomTrigger.java diff --git a/iot-virtual-device/src/main/resources/spring.factories b/iot-test-tool/iot-virtual-device/src/main/resources/spring.factories old mode 100755 new mode 100644 similarity index 100% rename from iot-virtual-device/src/main/resources/spring.factories rename to iot-test-tool/iot-virtual-device/src/main/resources/spring.factories diff --git a/iot-test-tool/pom.xml b/iot-test-tool/pom.xml index 821c7007..39ee8098 100755 --- a/iot-test-tool/pom.xml +++ b/iot-test-tool/pom.xml @@ -5,13 +5,18 @@ iotkit-parent cc.iotkit - 0.4.3-SNAPSHOT + ${revision} 4.0.0 pom + + 提供用于测试的相关工具的模块 + + iot-test-mqtt + iot-virtual-device iot-test-tool diff --git a/iot-test-tool/readme.txt b/iot-test-tool/readme.txt deleted file mode 100755 index 665412cd..00000000 --- a/iot-test-tool/readme.txt +++ /dev/null @@ -1 +0,0 @@ -提供用于测试的相关工具的模块 diff --git a/iot-virtual-device/readme.txt b/iot-virtual-device/readme.txt deleted file mode 100755 index 7051f096..00000000 --- a/iot-virtual-device/readme.txt +++ /dev/null @@ -1 +0,0 @@ -虚拟设备模块，用于虚拟真实设备数据上报 diff --git a/pom.xml b/pom.xml index 3ec65b8e..8d7e6d80 100755 --- a/pom.xml +++ b/pom.xml @@ -2,37 +2,44 @@ 4.0.0 - pom - - iot-rule-engine - iot-common - iot-standalone - iot-components - iot-package - iot-auth-server - iot-virtual-device - iot-message-bus - iot-test-tool - iot-data - iot-script-engine - org.springframework.boot spring-boot-starter-parent 2.6.2 - + cc.iotkit iotkit-parent - 0.4.3-SNAPSHOT - iotkit-parent - iotkit parent + ${revision} + ${project.artifactId} + 奇特物联是一个开源的物联网基础开发平台，提供了物联网及相关业务开发的常见基础功能, 能帮助你快速搭建自己的物联网相关业务平台。 + https://gitee.com/iotkit-open-source/iotkit-parent + pom + + + iot-rule-engine + iot-components + iot-data + + iot-auth-server + iot-common + iot-starter + iot-test-tool + + + 0.4.3-SNAPSHOT 11 4.2.2 1.30.0 21.1.0 + 1.9.3 + 2.13.1 + 3.7 + 2.11.0 + 1.14 + @@ -49,31 +56,31 @@ commons-beanutils commons-beanutils - 1.9.3 + ${beanutils.version} com.fasterxml.jackson.core jackson-core - 2.13.1 + ${jackson.version} org.apache.commons commons-lang3 - 3.7 + ${lang3.version} commons-io commons-io - 2.11.0 + ${io.version} commons-codec commons-codec - 1.14 + ${codec.version} @@ -242,7 +249,7 @@ cc.iotkit - iot-common + iot-common-core ${project.version}