Merge remote-tracking branch 'origin/master' into package

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/exception/BaseException.java

@@ -1,59 +0,0 @@
-package com.zanxiang.game.module.base.exception;
-
-/**
- * 基础异常
- */
-public class BaseException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 所属模块
-     */
-    private String module;
-
-    /**
-     * 错误码
-     */
-    private String code;
-
-    /**
-     * 错误码对应的参数
-     */
-    private Object[] args;
-
-    public BaseException(String module, String code, Object[] args, String message) {
-        super(message);
-        this.module = module;
-        this.code = code;
-        this.args = args;
-    }
-
-    public BaseException(String module, String code, Object[] args) {
-        this(module, code, args, null);
-    }
-
-    public BaseException(String module, String message) {
-        this(module, null, null, message);
-    }
-
-    public BaseException(String code, Object[] args) {
-        this(null, code, args, null);
-    }
-
-    public BaseException(String message) {
-        this(null, null, null, message);
-    }
-
-    public String getModule() {
-        return module;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public Object[] getArgs() {
-        return args;
-    }
-}
-

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/exception/CustomException.java

@@ -1,42 +0,0 @@
-package com.zanxiang.game.module.base.exception;
-
-import com.zanxiang.game.module.base.enums.HttpStatusEnum;
-
-/**
- * 自定义异常
- */
-public class CustomException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
-
-    private Integer code;
-
-    private String message;
-
-    public CustomException(String message) {
-        this.message = message;
-    }
-
-    public CustomException(String message, Integer code) {
-        this.message = message;
-        this.code = code;
-    }
-
-    public CustomException(HttpStatusEnum httpStatusEnum) {
-        this.message = httpStatusEnum.getMsg();
-        this.code = httpStatusEnum.getCode();
-    }
-
-    public CustomException(String message, Throwable e) {
-        super(message, e);
-        this.message = message;
-    }
-
-    @Override
-    public String getMessage() {
-        return message;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-}

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/exception/UtilException.java

@@ -1,22 +0,0 @@
-package com.zanxiang.game.module.base.exception;
-
-/**
- * 工具类异常
- *
- * @author ruoyi
- */
-public class UtilException extends RuntimeException {
-    private static final long serialVersionUID = 8247610319171014183L;
-
-    public UtilException(Throwable e) {
-        super(e.getMessage(), e);
-    }
-
-    public UtilException(String message) {
-        super(message);
-    }
-
-    public UtilException(String message, Throwable throwable) {
-        super(message, throwable);
-    }
-}

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/text/CharsetKit.java

@@ -1,91 +0,0 @@
-package com.zanxiang.game.module.base.text;
-
-import org.springframework.util.StringUtils;
-
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-
-/**
- * 字符集工具类
- *
- * @author ruoyi
- */
-public class CharsetKit {
-    /**
-     * ISO-8859-1
-     */
-    public static final String ISO_8859_1 = "ISO-8859-1";
-    /**
-     * UTF-8
-     */
-    public static final String UTF_8 = "UTF-8";
-    /**
-     * GBK
-     */
-    public static final String GBK = "GBK";
-
-    /**
-     * ISO-8859-1
-     */
-    public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1);
-    /**
-     * UTF-8
-     */
-    public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8);
-    /**
-     * GBK
-     */
-    public static final Charset CHARSET_GBK = Charset.forName(GBK);
-
-    /**
-     * 转换为Charset对象
-     *
-     * @param charset 字符集，为空则返回默认字符集
-     * @return Charset
-     */
-    public static Charset charset(String charset) {
-        return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset);
-    }
-
-    /**
-     * 转换字符串的字符集编码
-     *
-     * @param source      字符串
-     * @param srcCharset  源字符集，默认ISO-8859-1
-     * @param destCharset 目标字符集，默认UTF-8
-     * @return 转换后的字符集
-     */
-    public static String convert(String source, String srcCharset, String destCharset) {
-        return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset));
-    }
-
-    /**
-     * 转换字符串的字符集编码
-     *
-     * @param source      字符串
-     * @param srcCharset  源字符集，默认ISO-8859-1
-     * @param destCharset 目标字符集，默认UTF-8
-     * @return 转换后的字符集
-     */
-    public static String convert(String source, Charset srcCharset, Charset destCharset) {
-        if (null == srcCharset) {
-            srcCharset = StandardCharsets.ISO_8859_1;
-        }
-
-        if (null == destCharset) {
-            srcCharset = StandardCharsets.UTF_8;
-        }
-
-        if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset)) {
-            return source;
-        }
-        return new String(source.getBytes(srcCharset), destCharset);
-    }
-
-    /**
-     * @return 系统字符集编码
-     */
-    public static String systemCharset() {
-        return Charset.defaultCharset().name();
-    }
-}

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/text/Convert.java

@@ -1,870 +0,0 @@
-package com.zanxiang.game.module.base.text;
-
-
-import com.zanxiang.game.module.base.utils.StringUtils;
-import com.zanxiang.module.util.JsonUtil;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.text.NumberFormat;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * 类型转换器
- *
- * @author ruoyi
- */
-public class Convert {
-    /**
-     * 转换为字符串<br>
-     * 如果给定的值为null，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static String toStr(Object value, String defaultValue) {
-        if (null == value) {
-            return defaultValue;
-        }
-        if (value instanceof String) {
-            return (String) value;
-        }
-        return value.toString();
-    }
-
-    /**
-     * 转换为字符串<br>
-     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static String toStr(Object value) {
-        return toStr(value, null);
-    }
-
-    /**
-     * 转换为字符<br>
-     * 如果给定的值为null，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static Character toChar(Object value, Character defaultValue) {
-        if (null == value) {
-            return defaultValue;
-        }
-        if (value instanceof Character) {
-            return (Character) value;
-        }
-
-        final String valueStr = toStr(value, null);
-        return StringUtils.isEmpty(valueStr) ? defaultValue : valueStr.charAt(0);
-    }
-
-    /**
-     * 转换为字符<br>
-     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static Character toChar(Object value) {
-        return toChar(value, null);
-    }
-
-    /**
-     * 转换为byte<br>
-     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static Byte toByte(Object value, Byte defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Byte) {
-            return (Byte) value;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).byteValue();
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return Byte.parseByte(valueStr);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为byte<br>
-     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static Byte toByte(Object value) {
-        return toByte(value, null);
-    }
-
-    /**
-     * 转换为Short<br>
-     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static Short toShort(Object value, Short defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Short) {
-            return (Short) value;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).shortValue();
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return Short.parseShort(valueStr.trim());
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为Short<br>
-     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static Short toShort(Object value) {
-        return toShort(value, null);
-    }
-
-    /**
-     * 转换为Number<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static Number toNumber(Object value, Number defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Number) {
-            return (Number) value;
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return NumberFormat.getInstance().parse(valueStr);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为Number<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static Number toNumber(Object value) {
-        return toNumber(value, null);
-    }
-
-    /**
-     * 转换为int<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static Integer toInt(Object value, Integer defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Integer) {
-            return (Integer) value;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).intValue();
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return Integer.parseInt(valueStr.trim());
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为int<br>
-     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static Integer toInt(Object value) {
-        return toInt(value, null);
-    }
-
-    /**
-     * 转换为Integer数组<br>
-     *
-     * @param str 被转换的值
-     * @return 结果
-     */
-    public static Integer[] toIntArray(String str) {
-        return toIntArray(",", str);
-    }
-
-    /**
-     * 转换为Long数组<br>
-     *
-     * @param str 被转换的值
-     * @return 结果
-     */
-    public static Long[] toLongArray(String str) {
-        return toLongArray(",", str);
-    }
-
-    /**
-     * 转换为Integer数组<br>
-     *
-     * @param split 分隔符
-     * @param split 被转换的值
-     * @return 结果
-     */
-    public static Integer[] toIntArray(String split, String str) {
-        if (StringUtils.isEmpty(str)) {
-            return new Integer[]{};
-        }
-        String[] arr = str.split(split);
-        final Integer[] ints = new Integer[arr.length];
-        for (int i = 0; i < arr.length; i++) {
-            final Integer v = toInt(arr[i], 0);
-            ints[i] = v;
-        }
-        return ints;
-    }
-
-    /**
-     * 转换为Long数组<br>
-     *
-     * @param split 分隔符
-     * @param str   被转换的值
-     * @return 结果
-     */
-    public static Long[] toLongArray(String split, String str) {
-        if (StringUtils.isEmpty(str)) {
-            return new Long[]{};
-        }
-        String[] arr = str.split(split);
-        final Long[] longs = new Long[arr.length];
-        for (int i = 0; i < arr.length; i++) {
-            final Long v = toLong(arr[i], null);
-            longs[i] = v;
-        }
-        return longs;
-    }
-
-    /**
-     * 转换为String数组<br>
-     *
-     * @param str 被转换的值
-     * @return 结果
-     */
-    public static String[] toStrArray(String str) {
-        return toStrArray(",", str);
-    }
-
-    /**
-     * 转换为String数组<br>
-     *
-     * @param split 分隔符
-     * @param split 被转换的值
-     * @return 结果
-     */
-    public static String[] toStrArray(String split, String str) {
-        return str.split(split);
-    }
-
-    /**
-     * 转换为long<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static Long toLong(Object value, Long defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Long) {
-            return (Long) value;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).longValue();
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            // 支持科学计数法
-            return new BigDecimal(valueStr.trim()).longValue();
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为long<br>
-     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static Long toLong(Object value) {
-        return toLong(value, null);
-    }
-
-    /**
-     * 转换为double<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static Double toDouble(Object value, Double defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Double) {
-            return (Double) value;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).doubleValue();
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            // 支持科学计数法
-            return new BigDecimal(valueStr.trim()).doubleValue();
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为double<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static Double toDouble(Object value) {
-        return toDouble(value, null);
-    }
-
-    /**
-     * 转换为Float<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static Float toFloat(Object value, Float defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Float) {
-            return (Float) value;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).floatValue();
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return Float.parseFloat(valueStr.trim());
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为Float<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static Float toFloat(Object value) {
-        return toFloat(value, null);
-    }
-
-    /**
-     * 转换为boolean<br>
-     * String支持的值为：true、false、yes、ok、no，1,0 如果给定的值为空，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static Boolean toBool(Object value, Boolean defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Boolean) {
-            return (Boolean) value;
-        }
-        String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        valueStr = valueStr.trim().toLowerCase();
-        switch (valueStr) {
-            case "true":
-                return true;
-            case "false":
-                return false;
-            case "yes":
-                return true;
-            case "ok":
-                return true;
-            case "no":
-                return false;
-            case "1":
-                return true;
-            case "0":
-                return false;
-            default:
-                return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为boolean<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static Boolean toBool(Object value) {
-        return toBool(value, null);
-    }
-
-    /**
-     * 转换为Enum对象<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<br>
-     *
-     * @param clazz        Enum的Class
-     * @param value        值
-     * @param defaultValue 默认值
-     * @return Enum
-     */
-    public static <E extends Enum<E>> E toEnum(Class<E> clazz, Object value, E defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (clazz.isAssignableFrom(value.getClass())) {
-            @SuppressWarnings("unchecked")
-            E myE = (E) value;
-            return myE;
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return Enum.valueOf(clazz, valueStr);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为Enum对象<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
-     *
-     * @param clazz Enum的Class
-     * @param value 值
-     * @return Enum
-     */
-    public static <E extends Enum<E>> E toEnum(Class<E> clazz, Object value) {
-        return toEnum(clazz, value, null);
-    }
-
-    /**
-     * 转换为BigInteger<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static BigInteger toBigInteger(Object value, BigInteger defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof BigInteger) {
-            return (BigInteger) value;
-        }
-        if (value instanceof Long) {
-            return BigInteger.valueOf((Long) value);
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return new BigInteger(valueStr);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为BigInteger<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static BigInteger toBigInteger(Object value) {
-        return toBigInteger(value, null);
-    }
-
-    /**
-     * 转换为BigDecimal<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static BigDecimal toBigDecimal(Object value, BigDecimal defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof BigDecimal) {
-            return (BigDecimal) value;
-        }
-        if (value instanceof Long) {
-            return new BigDecimal((Long) value);
-        }
-        if (value instanceof Double) {
-            return new BigDecimal((Double) value);
-        }
-        if (value instanceof Integer) {
-            return new BigDecimal((Integer) value);
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return new BigDecimal(valueStr);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为BigDecimal<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static BigDecimal toBigDecimal(Object value) {
-        return toBigDecimal(value, null);
-    }
-
-    /**
-     * 将对象转为字符串<br>
-     * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
-     *
-     * @param obj 对象
-     * @return 字符串
-     */
-    public static String utf8Str(Object obj) {
-        return str(obj, CharsetKit.CHARSET_UTF_8);
-    }
-
-    /**
-     * 将对象转为字符串<br>
-     * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
-     *
-     * @param obj         对象
-     * @param charsetName 字符集
-     * @return 字符串
-     */
-    public static String str(Object obj, String charsetName) {
-        return str(obj, Charset.forName(charsetName));
-    }
-
-    /**
-     * 将对象转为字符串<br>
-     * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
-     *
-     * @param obj     对象
-     * @param charset 字符集
-     * @return 字符串
-     */
-    public static String str(Object obj, Charset charset) {
-        if (null == obj) {
-            return null;
-        }
-
-        if (obj instanceof String) {
-            return (String) obj;
-        } else if (obj instanceof byte[] || obj instanceof Byte[]) {
-            return str((Byte[]) obj, charset);
-        } else if (obj instanceof ByteBuffer) {
-            return str((ByteBuffer) obj, charset);
-        }
-        return obj.toString();
-    }
-
-    /**
-     * 将byte数组转为字符串
-     *
-     * @param bytes   byte数组
-     * @param charset 字符集
-     * @return 字符串
-     */
-    public static String str(byte[] bytes, String charset) {
-        return str(bytes, StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset));
-    }
-
-    /**
-     * 解码字节码
-     *
-     * @param data    字符串
-     * @param charset 字符集，如果此字段为空，则解码的结果取决于平台
-     * @return 解码后的字符串
-     */
-    public static String str(byte[] data, Charset charset) {
-        if (data == null) {
-            return null;
-        }
-
-        if (null == charset) {
-            return new String(data);
-        }
-        return new String(data, charset);
-    }
-
-    /**
-     * 将编码的byteBuffer数据转换为字符串
-     *
-     * @param data    数据
-     * @param charset 字符集，如果为空使用当前系统字符集
-     * @return 字符串
-     */
-    public static String str(ByteBuffer data, String charset) {
-        if (data == null) {
-            return null;
-        }
-
-        return str(data, Charset.forName(charset));
-    }
-
-    /**
-     * 将编码的byteBuffer数据转换为字符串
-     *
-     * @param data    数据
-     * @param charset 字符集，如果为空使用当前系统字符集
-     * @return 字符串
-     */
-    public static String str(ByteBuffer data, Charset charset) {
-        if (null == charset) {
-            charset = Charset.defaultCharset();
-        }
-        return charset.decode(data).toString();
-    }
-
-    /**
-     * 半角转全角
-     *
-     * @param input String.
-     * @return 全角字符串.
-     */
-    public static String toSBC(String input) {
-        return toSBC(input, null);
-    }
-
-    /**
-     * 半角转全角
-     *
-     * @param input         String
-     * @param notConvertSet 不替换的字符集合
-     * @return 全角字符串.
-     */
-    public static String toSBC(String input, Set<Character> notConvertSet) {
-        char c[] = input.toCharArray();
-        for (int i = 0; i < c.length; i++) {
-            if (null != notConvertSet && notConvertSet.contains(c[i])) {
-                // 跳过不替换的字符
-                continue;
-            }
-
-            if (c[i] == ' ') {
-                c[i] = '\u3000';
-            } else if (c[i] < '\177') {
-                c[i] = (char) (c[i] + 65248);
-
-            }
-        }
-        return new String(c);
-    }
-
-    /**
-     * 全角转半角
-     *
-     * @param input String.
-     * @return 半角字符串
-     */
-    public static String toDBC(String input) {
-        return toDBC(input, null);
-    }
-
-    /**
-     * 替换全角为半角
-     *
-     * @param text          文本
-     * @param notConvertSet 不替换的字符集合
-     * @return 替换后的字符
-     */
-    public static String toDBC(String text, Set<Character> notConvertSet) {
-        char c[] = text.toCharArray();
-        for (int i = 0; i < c.length; i++) {
-            if (null != notConvertSet && notConvertSet.contains(c[i])) {
-                // 跳过不替换的字符
-                continue;
-            }
-
-            if (c[i] == '\u3000') {
-                c[i] = ' ';
-            } else if (c[i] > '\uFF00' && c[i] < '\uFF5F') {
-                c[i] = (char) (c[i] - 65248);
-            }
-        }
-        String returnString = new String(c);
-
-        return returnString;
-    }
-
-    /**
-     * 数字金额大写转换 先写个完整的然后将如零拾替换成零
-     *
-     * @param n 数字
-     * @return 中文大写数字
-     */
-    public static String digitUppercase(double n) {
-        String[] fraction = {"角", "分"};
-        String[] digit = {"零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖"};
-        String[][] unit = {{"元", "万", "亿"}, {"", "拾", "佰", "仟"}};
-
-        String head = n < 0 ? "负" : "";
-        n = Math.abs(n);
-
-        String s = "";
-        for (int i = 0; i < fraction.length; i++) {
-            s += (digit[(int) (Math.floor(n * 10 * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", "");
-        }
-        if (s.length() < 1) {
-            s = "整";
-        }
-        int integerPart = (int) Math.floor(n);
-
-        for (int i = 0; i < unit[0].length && integerPart > 0; i++) {
-            String p = "";
-            for (int j = 0; j < unit[1].length && n > 0; j++) {
-                p = digit[integerPart % 10] + unit[1][j] + p;
-                integerPart = integerPart / 10;
-            }
-            s = p.replaceAll("(零.)*零$", "").replaceAll("^$", "零") + unit[0][i] + s;
-        }
-        return head + s.replaceAll("(零.)*零元", "元").replaceFirst("(零.)+", "").replaceAll("(零.)+", "零").replaceAll("^整$", "零元整");
-    }
-
-    /**
-     * unicode编码转换中文
-     *
-     * @param object: 需要转码的字符串
-     * @return : 转码之后的结果
-     */
-    public static String unicodeToString(Object object) {
-        String str = JsonUtil.toString(object);
-        Pattern pattern = Pattern.compile("(\\\\u(\\p{XDigit}{4}))");
-        Matcher matcher = pattern.matcher(str);
-        char ch;
-        while (matcher.find()) {
-            ch = (char) Integer.parseInt(matcher.group(2), 16);
-            str = str.replace(matcher.group(1), ch + "");
-        }
-        return str;
-    }
-}

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/text/StrFormatter.java

@@ -1,77 +0,0 @@
-package com.zanxiang.game.module.base.text;
-
-
-import com.zanxiang.game.module.base.utils.StringUtils;
-
-/**
- * 字符串格式化
- *
- * @author ruoyi
- */
-public class StrFormatter {
-    public static final String EMPTY_JSON = "{}";
-    public static final char C_BACKSLASH = '\\';
-    public static final char C_DELIM_START = '{';
-    public static final char C_DELIM_END = '}';
-
-    /**
-     * 格式化字符串<br>
-     * 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
-     * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可<br>
-     * 例：<br>
-     * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b<br>
-     * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
-     * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
-     *
-     * @param strPattern 字符串模板
-     * @param argArray   参数列表
-     * @return 结果
-     */
-    public static String format(final String strPattern, final Object... argArray) {
-        if (StringUtils.isEmpty(strPattern) || StringUtils.isEmpty(argArray)) {
-            return strPattern;
-        }
-        final int strPatternLength = strPattern.length();
-
-        // 初始化定义好的长度以获得更好的性能
-        StringBuilder sbuf = new StringBuilder(strPatternLength + 50);
-
-        int handledPosition = 0;
-        int delimIndex;// 占位符所在位置
-        for (int argIndex = 0; argIndex < argArray.length; argIndex++) {
-            delimIndex = strPattern.indexOf(EMPTY_JSON, handledPosition);
-            if (delimIndex == -1) {
-                if (handledPosition == 0) {
-                    return strPattern;
-                } else { // 字符串模板剩余部分不再包含占位符，加入剩余部分后返回结果
-                    sbuf.append(strPattern, handledPosition, strPatternLength);
-                    return sbuf.toString();
-                }
-            } else {
-                if (delimIndex > 0 && strPattern.charAt(delimIndex - 1) == C_BACKSLASH) {
-                    if (delimIndex > 1 && strPattern.charAt(delimIndex - 2) == C_BACKSLASH) {
-                        // 转义符之前还有一个转义符，占位符依旧有效
-                        sbuf.append(strPattern, handledPosition, delimIndex - 1);
-                        sbuf.append(Convert.utf8Str(argArray[argIndex]));
-                        handledPosition = delimIndex + 2;
-                    } else {
-                        // 占位符被转义
-                        argIndex--;
-                        sbuf.append(strPattern, handledPosition, delimIndex - 1);
-                        sbuf.append(C_DELIM_START);
-                        handledPosition = delimIndex + 1;
-                    }
-                } else {
-                    // 正常占位符
-                    sbuf.append(strPattern, handledPosition, delimIndex);
-                    sbuf.append(Convert.utf8Str(argArray[argIndex]));
-                    handledPosition = delimIndex + 2;
-                }
-            }
-        }
-        // 加入最后一个占位符后所有的字符
-        sbuf.append(strPattern, handledPosition, strPattern.length());
-
-        return sbuf.toString();
-    }
-}

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/text/UUID.java

@@ -1,441 +0,0 @@
-package com.zanxiang.game.module.base.text;
-
-
-import com.zanxiang.game.module.base.exception.UtilException;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.util.Random;
-import java.util.concurrent.ThreadLocalRandom;
-
-/**
- * 提供通用唯一识别码（universally unique identifier）（UUID）实现
- *
- * @author ruoyi
- */
-public final class UUID implements java.io.Serializable, Comparable<UUID> {
-    private static final long serialVersionUID = -1185015143654744140L;
-
-    /**
-     * SecureRandom 的单例
-     */
-    private static class Holder {
-        static final SecureRandom numberGenerator = getSecureRandom();
-    }
-
-    /**
-     * 此UUID的最高64有效位
-     */
-    private final long mostSigBits;
-
-    /**
-     * 此UUID的最低64有效位
-     */
-    private final long leastSigBits;
-
-    /**
-     * 私有构造
-     *
-     * @param data 数据
-     */
-    private UUID(byte[] data) {
-        long msb = 0;
-        long lsb = 0;
-        assert data.length == 16 : "data must be 16 bytes in length";
-        for (int i = 0; i < 8; i++) {
-            msb = (msb << 8) | (data[i] & 0xff);
-        }
-        for (int i = 8; i < 16; i++) {
-            lsb = (lsb << 8) | (data[i] & 0xff);
-        }
-        this.mostSigBits = msb;
-        this.leastSigBits = lsb;
-    }
-
-    /**
-     * 使用指定的数据构造新的 UUID。
-     *
-     * @param mostSigBits  用于 {@code UUID} 的最高有效 64 位
-     * @param leastSigBits 用于 {@code UUID} 的最低有效 64 位
-     */
-    public UUID(long mostSigBits, long leastSigBits) {
-        this.mostSigBits = mostSigBits;
-        this.leastSigBits = leastSigBits;
-    }
-
-    /**
-     * 获取类型 4（伪随机生成的）UUID 的静态工厂。 使用加密的本地线程伪随机数生成器生成该 UUID。
-     *
-     * @return 随机生成的 {@code UUID}
-     */
-    public static UUID fastUUID() {
-        return randomUUID(false);
-    }
-
-    /**
-     * 获取类型 4（伪随机生成的）UUID 的静态工厂。 使用加密的强伪随机数生成器生成该 UUID。
-     *
-     * @return 随机生成的 {@code UUID}
-     */
-    public static UUID randomUUID() {
-        return randomUUID(true);
-    }
-
-    /**
-     * 获取类型 4（伪随机生成的）UUID 的静态工厂。 使用加密的强伪随机数生成器生成该 UUID。
-     *
-     * @param isSecure 是否使用{@link SecureRandom}如果是可以获得更安全的随机码，否则可以得到更好的性能
-     * @return 随机生成的 {@code UUID}
-     */
-    public static UUID randomUUID(boolean isSecure) {
-        final Random ng = isSecure ? Holder.numberGenerator : getRandom();
-
-        byte[] randomBytes = new byte[16];
-        ng.nextBytes(randomBytes);
-        randomBytes[6] &= 0x0f; /* clear version */
-        randomBytes[6] |= 0x40; /* set to version 4 */
-        randomBytes[8] &= 0x3f; /* clear variant */
-        randomBytes[8] |= 0x80; /* set to IETF variant */
-        return new UUID(randomBytes);
-    }
-
-    /**
-     * 根据指定的字节数组获取类型 3（基于名称的）UUID 的静态工厂。
-     *
-     * @param name 用于构造 UUID 的字节数组。
-     * @return 根据指定数组生成的 {@code UUID}
-     */
-    public static UUID nameUUIDFromBytes(byte[] name) {
-        MessageDigest md;
-        try {
-            md = MessageDigest.getInstance("MD5");
-        } catch (NoSuchAlgorithmException nsae) {
-            throw new InternalError("MD5 not supported");
-        }
-        byte[] md5Bytes = md.digest(name);
-        md5Bytes[6] &= 0x0f; /* clear version */
-        md5Bytes[6] |= 0x30; /* set to version 3 */
-        md5Bytes[8] &= 0x3f; /* clear variant */
-        md5Bytes[8] |= 0x80; /* set to IETF variant */
-        return new UUID(md5Bytes);
-    }
-
-    /**
-     * 根据 {@link #toString()} 方法中描述的字符串标准表示形式创建{@code UUID}。
-     *
-     * @param name 指定 {@code UUID} 字符串
-     * @return 具有指定值的 {@code UUID}
-     * @throws IllegalArgumentException 如果 name 与 {@link #toString} 中描述的字符串表示形式不符抛出此异常
-     */
-    public static UUID fromString(String name) {
-        String[] components = name.split("-");
-        if (components.length != 5) {
-            throw new IllegalArgumentException("Invalid UUID string: " + name);
-        }
-        for (int i = 0; i < 5; i++) {
-            components[i] = "0x" + components[i];
-        }
-
-        long mostSigBits = Long.decode(components[0]).longValue();
-        mostSigBits <<= 16;
-        mostSigBits |= Long.decode(components[1]).longValue();
-        mostSigBits <<= 16;
-        mostSigBits |= Long.decode(components[2]).longValue();
-
-        long leastSigBits = Long.decode(components[3]).longValue();
-        leastSigBits <<= 48;
-        leastSigBits |= Long.decode(components[4]).longValue();
-
-        return new UUID(mostSigBits, leastSigBits);
-    }
-
-    /**
-     * 返回此 UUID 的 128 位值中的最低有效 64 位。
-     *
-     * @return 此 UUID 的 128 位值中的最低有效 64 位。
-     */
-    public long getLeastSignificantBits() {
-        return leastSigBits;
-    }
-
-    /**
-     * 返回此 UUID 的 128 位值中的最高有效 64 位。
-     *
-     * @return 此 UUID 的 128 位值中最高有效 64 位。
-     */
-    public long getMostSignificantBits() {
-        return mostSigBits;
-    }
-
-    /**
-     * 与此 {@code UUID} 相关联的版本号. 版本号描述此 {@code UUID} 是如何生成的。
-     * <p>
-     * 版本号具有以下含意:
-     * <ul>
-     * <li>1 基于时间的 UUID
-     * <li>2 DCE 安全 UUID
-     * <li>3 基于名称的 UUID
-     * <li>4 随机生成的 UUID
-     * </ul>
-     *
-     * @return 此 {@code UUID} 的版本号
-     */
-    public int version() {
-        // Version is bits masked by 0x000000000000F000 in MS long
-        return (int) ((mostSigBits >> 12) & 0x0f);
-    }
-
-    /**
-     * 与此 {@code UUID} 相关联的变体号。变体号描述 {@code UUID} 的布局。
-     * <p>
-     * 变体号具有以下含意：
-     * <ul>
-     * <li>0 为 NCS 向后兼容保留
-     * <li>2 <a href="http://www.ietf.org/rfc/rfc4122.txt">IETF&nbsp;RFC&nbsp;4122</a>(Leach-Salz), 用于此类
-     * <li>6 保留，微软向后兼容
-     * <li>7 保留供以后定义使用
-     * </ul>
-     *
-     * @return 此 {@code UUID} 相关联的变体号
-     */
-    public int variant() {
-        // This field is composed of a varying number of bits.
-        // 0 - - Reserved for NCS backward compatibility
-        // 1 0 - The IETF aka Leach-Salz variant (used by this class)
-        // 1 1 0 Reserved, Microsoft backward compatibility
-        // 1 1 1 Reserved for future definition.
-        return (int) ((leastSigBits >>> (64 - (leastSigBits >>> 62))) & (leastSigBits >> 63));
-    }
-
-    /**
-     * 与此 UUID 相关联的时间戳值。
-     *
-     * <p>
-     * 60 位的时间戳值根据此 {@code UUID} 的 time_low、time_mid 和 time_hi 字段构造。<br>
-     * 所得到的时间戳以 100 毫微秒为单位，从 UTC（通用协调时间） 1582 年 10 月 15 日零时开始。
-     *
-     * <p>
-     * 时间戳值仅在在基于时间的 UUID（其 version 类型为 1）中才有意义。<br>
-     * 如果此 {@code UUID} 不是基于时间的 UUID，则此方法抛出 UnsupportedOperationException。
-     *
-     * @throws UnsupportedOperationException 如果此 {@code UUID} 不是 version 为 1 的 UUID。
-     */
-    public long timestamp() throws UnsupportedOperationException {
-        checkTimeBase();
-        return (mostSigBits & 0x0FFFL) << 48//
-                | ((mostSigBits >> 16) & 0x0FFFFL) << 32//
-                | mostSigBits >>> 32;
-    }
-
-    /**
-     * 与此 UUID 相关联的时钟序列值。
-     *
-     * <p>
-     * 14 位的时钟序列值根据此 UUID 的 clock_seq 字段构造。clock_seq 字段用于保证在基于时间的 UUID 中的时间唯一性。
-     * <p>
-     * {@code clockSequence} 值仅在基于时间的 UUID（其 version 类型为 1）中才有意义。 如果此 UUID 不是基于时间的 UUID，则此方法抛出
-     * UnsupportedOperationException。
-     *
-     * @return 此 {@code UUID} 的时钟序列
-     * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1
-     */
-    public int clockSequence() throws UnsupportedOperationException {
-        checkTimeBase();
-        return (int) ((leastSigBits & 0x3FFF000000000000L) >>> 48);
-    }
-
-    /**
-     * 与此 UUID 相关的节点值。
-     *
-     * <p>
-     * 48 位的节点值根据此 UUID 的 node 字段构造。此字段旨在用于保存机器的 IEEE 802 地址，该地址用于生成此 UUID 以保证空间唯一性。
-     * <p>
-     * 节点值仅在基于时间的 UUID（其 version 类型为 1）中才有意义。<br>
-     * 如果此 UUID 不是基于时间的 UUID，则此方法抛出 UnsupportedOperationException。
-     *
-     * @return 此 {@code UUID} 的节点值
-     * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1
-     */
-    public long node() throws UnsupportedOperationException {
-        checkTimeBase();
-        return leastSigBits & 0x0000FFFFFFFFFFFFL;
-    }
-
-    /**
-     * 返回此{@code UUID} 的字符串表现形式。
-     *
-     * <p>
-     * UUID 的字符串表示形式由此 BNF 描述：
-     *
-     * <pre>
-     * {@code
-     * UUID                   = <time_low>-<time_mid>-<time_high_and_version>-<variant_and_sequence>-<node>
-     * time_low               = 4*<hexOctet>
-     * time_mid               = 2*<hexOctet>
-     * time_high_and_version  = 2*<hexOctet>
-     * variant_and_sequence   = 2*<hexOctet>
-     * node                   = 6*<hexOctet>
-     * hexOctet               = <hexDigit><hexDigit>
-     * hexDigit               = [0-9a-fA-F]
-     * }
-     * </pre>
-     *
-     * </blockquote>
-     *
-     * @return 此{@code UUID} 的字符串表现形式
-     * @see #toString(boolean)
-     */
-    @Override
-    public String toString() {
-        return toString(false);
-    }
-
-    /**
-     * 返回此{@code UUID} 的字符串表现形式。
-     *
-     * <p>
-     * UUID 的字符串表示形式由此 BNF 描述：
-     *
-     * <pre>
-     * {@code
-     * UUID                   = <time_low>-<time_mid>-<time_high_and_version>-<variant_and_sequence>-<node>
-     * time_low               = 4*<hexOctet>
-     * time_mid               = 2*<hexOctet>
-     * time_high_and_version  = 2*<hexOctet>
-     * variant_and_sequence   = 2*<hexOctet>
-     * node                   = 6*<hexOctet>
-     * hexOctet               = <hexDigit><hexDigit>
-     * hexDigit               = [0-9a-fA-F]
-     * }
-     * </pre>
-     *
-     * </blockquote>
-     *
-     * @param isSimple 是否简单模式，简单模式为不带'-'的UUID字符串
-     * @return 此{@code UUID} 的字符串表现形式
-     */
-    public String toString(boolean isSimple) {
-        final StringBuilder builder = new StringBuilder(isSimple ? 32 : 36);
-        // time_low
-        builder.append(digits(mostSigBits >> 32, 8));
-        if (false == isSimple) {
-            builder.append('-');
-        }
-        // time_mid
-        builder.append(digits(mostSigBits >> 16, 4));
-        if (false == isSimple) {
-            builder.append('-');
-        }
-        // time_high_and_version
-        builder.append(digits(mostSigBits, 4));
-        if (false == isSimple) {
-            builder.append('-');
-        }
-        // variant_and_sequence
-        builder.append(digits(leastSigBits >> 48, 4));
-        if (false == isSimple) {
-            builder.append('-');
-        }
-        // node
-        builder.append(digits(leastSigBits, 12));
-
-        return builder.toString();
-    }
-
-    /**
-     * 返回此 UUID 的哈希码。
-     *
-     * @return UUID 的哈希码值。
-     */
-    @Override
-    public int hashCode() {
-        long hilo = mostSigBits ^ leastSigBits;
-        return ((int) (hilo >> 32)) ^ (int) hilo;
-    }
-
-    /**
-     * 将此对象与指定对象比较。
-     * <p>
-     * 当且仅当参数不为 {@code null}、而是一个 UUID 对象、具有与此 UUID 相同的 varriant、包含相同的值（每一位均相同）时，结果才为 {@code true}。
-     *
-     * @param obj 要与之比较的对象
-     * @return 如果对象相同，则返回 {@code true}；否则返回 {@code false}
-     */
-    @Override
-    public boolean equals(Object obj) {
-        if ((null == obj) || (obj.getClass() != UUID.class)) {
-            return false;
-        }
-        UUID id = (UUID) obj;
-        return (mostSigBits == id.mostSigBits && leastSigBits == id.leastSigBits);
-    }
-
-    // Comparison Operations
-
-    /**
-     * 将此 UUID 与指定的 UUID 比较。
-     *
-     * <p>
-     * 如果两个 UUID 不同，且第一个 UUID 的最高有效字段大于第二个 UUID 的对应字段，则第一个 UUID 大于第二个 UUID。
-     *
-     * @param val 与此 UUID 比较的 UUID
-     * @return 在此 UUID 小于、等于或大于 val 时，分别返回 -1、0 或 1。
-     */
-    @Override
-    public int compareTo(UUID val) {
-        // The ordering is intentionally set up so that the UUIDs
-        // can simply be numerically compared as two numbers
-        return (this.mostSigBits < val.mostSigBits ? -1 : //
-                (this.mostSigBits > val.mostSigBits ? 1 : //
-                        (this.leastSigBits < val.leastSigBits ? -1 : //
-                                (this.leastSigBits > val.leastSigBits ? 1 : //
-                                        0))));
-    }
-
-    // Private method start
-
-    /**
-     * 返回指定数字对应的hex值
-     *
-     * @param val    值
-     * @param digits 位
-     * @return 值
-     */
-    private static String digits(long val, int digits) {
-        long hi = 1L << (digits * 4);
-        return Long.toHexString(hi | (val & (hi - 1))).substring(1);
-    }
-
-    /**
-     * 检查是否为time-based版本UUID
-     */
-    private void checkTimeBase() {
-        if (version() != 1) {
-            throw new UnsupportedOperationException("Not a time-based UUID");
-        }
-    }
-
-    /**
-     * 获取{@link SecureRandom}，类提供加密的强随机数生成器 (RNG)
-     *
-     * @return {@link SecureRandom}
-     */
-    public static SecureRandom getSecureRandom() {
-        try {
-            return SecureRandom.getInstance("SHA1PRNG");
-        } catch (NoSuchAlgorithmException e) {
-            throw new UtilException(e);
-        }
-    }
-
-    /**
-     * 获取随机数生成器对象<br>
-     * ThreadLocalRandom是JDK 7之后提供并发产生随机数，能够解决多个线程发生的竞争争夺。
-     *
-     * @return {@link ThreadLocalRandom}
-     */
-    public static ThreadLocalRandom getRandom() {
-        return ThreadLocalRandom.current();
-    }
-}

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/utils/MD5Util.java

@@ -1,44 +0,0 @@
-package com.zanxiang.game.module.base.utils;
-
-import java.security.MessageDigest;
-
-/**
- * MD5加密
- */
-public class MD5Util {
-
-    private static String byteArrayToHexString(byte[] b) {
-        StringBuffer resultSb = new StringBuffer();
-        for (int i = 0; i < b.length; i++) {
-            resultSb.append(byteToHexString(b[i]));
-        }
-        return resultSb.toString();
-    }
-
-    private static String byteToHexString(byte b) {
-        int n = b;
-        if (n < 0) {
-            n += 256;
-        }
-        int d1 = n / 16;
-        int d2 = n % 16;
-        return hexDigits[d1] + hexDigits[d2];
-    }
-
-    public static String MD5Encode(String origin, String charsetName) {
-        String resultString = null;
-        try {
-            resultString = origin;
-            MessageDigest md = MessageDigest.getInstance("MD5");
-            if (StringUtils.isBlank(charsetName)) {
-                resultString = byteArrayToHexString(md.digest(resultString.getBytes()));
-            } else {
-                resultString = byteArrayToHexString(md.digest(resultString.getBytes(charsetName)));
-            }
-        } catch (Exception exception) {
-        }
-        return resultString;
-    }
-
-    private static final String[] hexDigits = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f"};
-}

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/utils/StringUtils.java

@@ -1,6 +1,5 @@
 package com.zanxiang.game.module.base.utils;
 
-import com.zanxiang.game.module.base.text.StrFormatter;
 import org.apache.commons.lang3.ArrayUtils;
 
 import java.util.Collection;
@@ -18,21 +17,6 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
      */
     private static final String NULLSTR = "";
 
-    /**
-     * 下划线
-     */
-    private static final char SEPARATOR = '_';
-
-    /**
-     * 获取参数不为空值
-     *
-     * @param value defaultValue 要判断的value
-     * @return value 返回值
-     */
-    public static <T> T nvl(T value, T defaultValue) {
-        return value != null ? value : defaultValue;
-    }
-
     /**
      * * 判断一个Collection是否为空， 包含List，Set，Queue
      *
@@ -43,16 +27,6 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
         return isNull(coll) || coll.isEmpty();
     }
 
-    /**
-     * * 判断一个Collection是否非空，包含List，Set，Queue
-     *
-     * @param coll 要判断的Collection
-     * @return true：非空 false：空
-     */
-    public static boolean isNotEmpty(Collection<?> coll) {
-        return !isEmpty(coll);
-    }
-
     /**
      * * 判断一个对象数组是否为空
      *
@@ -63,16 +37,6 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
         return isNull(objects) || (objects.length == 0);
     }
 
-    /**
-     * * 判断一个对象数组是否非空
-     *
-     * @param objects 要判断的对象数组
-     * @return true：非空 false：空
-     */
-    public static boolean isNotEmpty(Object[] objects) {
-        return !isEmpty(objects);
-    }
-
     /**
      * * 判断一个Map是否为空
      *
@@ -83,16 +47,6 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
         return isNull(map) || map.isEmpty();
     }
 
-    /**
-     * * 判断一个Map是否为空
-     *
-     * @param map 要判断的Map
-     * @return true：非空 false：空
-     */
-    public static boolean isNotEmpty(Map<?, ?> map) {
-        return !isEmpty(map);
-    }
-
     /**
      * * 判断一个字符串是否为空串
      *
@@ -123,229 +77,6 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
         return object == null;
     }
 
-    /**
-     * * 判断一个对象是否非空
-     *
-     * @param object Object
-     * @return true：非空 false：空
-     */
-    public static boolean isNotNull(Object object) {
-        return !isNull(object);
-    }
-
-    /**
-     * * 判断一个对象是否是数组类型（Java基本型别的数组）
-     *
-     * @param object 对象
-     * @return true：是数组 false：不是数组
-     */
-    public static boolean isArray(Object object) {
-        return isNotNull(object) && object.getClass().isArray();
-    }
-
-    /**
-     * 去空格
-     */
-    public static String trim(String str) {
-        return (str == null ? "" : str.trim());
-    }
-
-    /**
-     * 截取字符串
-     *
-     * @param str   字符串
-     * @param start 开始
-     * @return 结果
-     */
-    public static String substring(final String str, int start) {
-        if (str == null) {
-            return NULLSTR;
-        }
-
-        if (start < 0) {
-            start = str.length() + start;
-        }
-
-        if (start < 0) {
-            start = 0;
-        }
-        if (start > str.length()) {
-            return NULLSTR;
-        }
-
-        return str.substring(start);
-    }
-
-    /**
-     * 截取字符串
-     *
-     * @param str   字符串
-     * @param start 开始
-     * @param end   结束
-     * @return 结果
-     */
-    public static String substring(final String str, int start, int end) {
-        if (str == null) {
-            return NULLSTR;
-        }
-
-        if (end < 0) {
-            end = str.length() + end;
-        }
-        if (start < 0) {
-            start = str.length() + start;
-        }
-
-        if (end > str.length()) {
-            end = str.length();
-        }
-
-        if (start > end) {
-            return NULLSTR;
-        }
-
-        if (start < 0) {
-            start = 0;
-        }
-        if (end < 0) {
-            end = 0;
-        }
-
-        return str.substring(start, end);
-    }
-
-    /**
-     * 格式化文本, {} 表示占位符<br>
-     * 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
-     * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可<br>
-     * 例：<br>
-     * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b<br>
-     * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
-     * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
-     *
-     * @param template 文本模板，被替换的部分用 {} 表示
-     * @param params   参数值
-     * @return 格式化后的文本
-     */
-    public static String format(String template, Object... params) {
-        if (isEmpty(params) || isEmpty(template)) {
-            return template;
-        }
-        return StrFormatter.format(template, params);
-    }
-
-    /**
-     * 下划线转驼峰命名
-     */
-    public static String toUnderScoreCase(String str) {
-        if (str == null) {
-            return null;
-        }
-        StringBuilder sb = new StringBuilder();
-        // 前置字符是否大写
-        boolean preCharIsUpperCase = true;
-        // 当前字符是否大写
-        boolean curreCharIsUpperCase = true;
-        // 下一字符是否大写
-        boolean nexteCharIsUpperCase = true;
-        for (int i = 0; i < str.length(); i++) {
-            char c = str.charAt(i);
-            if (i > 0) {
-                preCharIsUpperCase = Character.isUpperCase(str.charAt(i - 1));
-            } else {
-                preCharIsUpperCase = false;
-            }
-
-            curreCharIsUpperCase = Character.isUpperCase(c);
-
-            if (i < (str.length() - 1)) {
-                nexteCharIsUpperCase = Character.isUpperCase(str.charAt(i + 1));
-            }
-
-            if (preCharIsUpperCase && curreCharIsUpperCase && !nexteCharIsUpperCase) {
-                sb.append(SEPARATOR);
-            } else if ((i != 0 && !preCharIsUpperCase) && curreCharIsUpperCase) {
-                sb.append(SEPARATOR);
-            }
-            sb.append(Character.toLowerCase(c));
-        }
-
-        return sb.toString();
-    }
-
-    /**
-     * 是否包含字符串
-     *
-     * @param str  验证字符串
-     * @param strs 字符串组
-     * @return 包含返回true
-     */
-    public static boolean inStringIgnoreCase(String str, String... strs) {
-        if (str != null && strs != null) {
-            for (String s : strs) {
-                if (str.equalsIgnoreCase(trim(s))) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld
-     *
-     * @param name 转换前的下划线大写方式命名的字符串
-     * @return 转换后的驼峰式命名的字符串
-     */
-    public static String convertToCamelCase(String name) {
-        StringBuilder result = new StringBuilder();
-        // 快速检查
-        if (name == null || name.isEmpty()) {
-            // 没必要转换
-            return "";
-        } else if (!name.contains("_")) {
-            // 不含下划线，仅将首字母大写
-            return name.substring(0, 1).toUpperCase() + name.substring(1);
-        }
-        // 用下划线将原始字符串分割
-        String[] camels = name.split("_");
-        for (String camel : camels) {
-            // 跳过原始字符串中开头、结尾的下换线或双重下划线
-            if (camel.isEmpty()) {
-                continue;
-            }
-            // 首字母大写
-            result.append(camel.substring(0, 1).toUpperCase());
-            result.append(camel.substring(1).toLowerCase());
-        }
-        return result.toString();
-    }
-
-    /**
-     * 驼峰式命名法 例如：user_name->userName
-     */
-    public static String toCamelCase(String s) {
-        if (s == null) {
-            return null;
-        }
-        s = s.toLowerCase();
-        StringBuilder sb = new StringBuilder(s.length());
-        boolean upperCase = false;
-        for (int i = 0; i < s.length(); i++) {
-            char c = s.charAt(i);
-
-            if (c == SEPARATOR) {
-                upperCase = true;
-            } else if (upperCase) {
-                sb.append(Character.toUpperCase(c));
-                upperCase = false;
-            } else {
-                sb.append(c);
-            }
-        }
-        return sb.toString();
-    }
-
     /**
      * 判断数组里的字符串是否存在空值
      *

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/ManageApplication.java

@@ -21,7 +21,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功_0001 ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功_0003 ( ´･･)ﾉ(._.`) \n" +
                 " ______  __     __     \n" +
                 "/_____/\\/__/\\ /__/\\    \n" +
                 "\\:::__\\/\\ \\::\\\\:.\\ \\   \n" +

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/ChoiceController.java

@@ -4,7 +4,7 @@ import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.module.base.domain.ResultVO;
 import com.zanxiang.game.module.base.enums.*;
 import com.zanxiang.game.module.base.utils.BeanUtils;
-import com.zanxiang.game.module.manage.domain.vo.*;
+import com.zanxiang.game.module.manage.pojo.vo.*;
 import com.zanxiang.game.module.manage.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/CpController.java

@@ -3,9 +3,9 @@ package com.zanxiang.game.module.manage.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.module.base.domain.ResultVO;
-import com.zanxiang.game.module.manage.domain.params.CpAddUpdateParam;
-import com.zanxiang.game.module.manage.domain.params.CpListParam;
-import com.zanxiang.game.module.manage.domain.vo.CpVO;
+import com.zanxiang.game.module.manage.pojo.params.CpAddUpdateParam;
+import com.zanxiang.game.module.manage.pojo.params.CpListParam;
+import com.zanxiang.game.module.manage.pojo.vo.CpVO;
 import com.zanxiang.game.module.manage.service.ICpService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/GameAppletController.java

@@ -2,8 +2,8 @@ package com.zanxiang.game.module.manage.controller;
 
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.module.base.domain.ResultVO;
-import com.zanxiang.game.module.manage.domain.params.GameAccountUpdateParam;
-import com.zanxiang.game.module.manage.domain.vo.GameAccountVO;
+import com.zanxiang.game.module.manage.pojo.params.GameAccountUpdateParam;
+import com.zanxiang.game.module.manage.pojo.vo.GameAccountVO;
 import com.zanxiang.game.module.manage.service.IGameAppletService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/GameController.java

@@ -3,11 +3,11 @@ package com.zanxiang.game.module.manage.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.module.base.domain.ResultVO;
-import com.zanxiang.game.module.manage.domain.params.*;
-import com.zanxiang.game.module.manage.domain.vo.GameDockVO;
-import com.zanxiang.game.module.manage.domain.vo.GameInfoVO;
-import com.zanxiang.game.module.manage.domain.vo.GameListVO;
-import com.zanxiang.game.module.manage.domain.vo.GameRelationVO;
+import com.zanxiang.game.module.manage.pojo.params.*;
+import com.zanxiang.game.module.manage.pojo.vo.GameDockVO;
+import com.zanxiang.game.module.manage.pojo.vo.GameInfoVO;
+import com.zanxiang.game.module.manage.pojo.vo.GameListVO;
+import com.zanxiang.game.module.manage.pojo.vo.GameRelationVO;
 import com.zanxiang.game.module.manage.service.IGameService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/GamePayStrategyController.java

@@ -3,9 +3,9 @@ package com.zanxiang.game.module.manage.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.module.base.domain.ResultVO;
-import com.zanxiang.game.module.manage.domain.params.GamePayStrategyAddUpdateParam;
-import com.zanxiang.game.module.manage.domain.params.GamePayStrategyListParam;
-import com.zanxiang.game.module.manage.domain.vo.GamePayStrategyListVO;
+import com.zanxiang.game.module.manage.pojo.params.GamePayStrategyAddUpdateParam;
+import com.zanxiang.game.module.manage.pojo.params.GamePayStrategyListParam;
+import com.zanxiang.game.module.manage.pojo.vo.GamePayStrategyListVO;
 import com.zanxiang.game.module.manage.service.IGamePayStrategyService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/GamePayWayController.java

@@ -3,9 +3,9 @@ package com.zanxiang.game.module.manage.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.module.base.domain.ResultVO;
-import com.zanxiang.game.module.manage.domain.params.GamePayWayAddUpdateParam;
-import com.zanxiang.game.module.manage.domain.params.GamePayWayListParam;
-import com.zanxiang.game.module.manage.domain.vo.GamePayWayListVO;
+import com.zanxiang.game.module.manage.pojo.params.GamePayWayAddUpdateParam;
+import com.zanxiang.game.module.manage.pojo.params.GamePayWayListParam;
+import com.zanxiang.game.module.manage.pojo.vo.GamePayWayListVO;
 import com.zanxiang.game.module.manage.service.IGamePayWayService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/GamePictureController.java

@@ -2,8 +2,8 @@ package com.zanxiang.game.module.manage.controller;
 
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.module.base.domain.ResultVO;
-import com.zanxiang.game.module.manage.domain.params.GamePictureParam;
-import com.zanxiang.game.module.manage.domain.vo.GamePictureVO;
+import com.zanxiang.game.module.manage.pojo.params.GamePictureParam;
+import com.zanxiang.game.module.manage.pojo.vo.GamePictureVO;
 import com.zanxiang.game.module.manage.service.IGamePictureService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/GameTagController.java

@@ -3,9 +3,9 @@ package com.zanxiang.game.module.manage.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.module.base.domain.ResultVO;
-import com.zanxiang.game.module.manage.domain.params.GameTagAddUpdateParam;
-import com.zanxiang.game.module.manage.domain.params.GameTagListParam;
-import com.zanxiang.game.module.manage.domain.vo.GameTagVO;
+import com.zanxiang.game.module.manage.pojo.params.GameTagAddUpdateParam;
+import com.zanxiang.game.module.manage.pojo.params.GameTagListParam;
+import com.zanxiang.game.module.manage.pojo.vo.GameTagVO;
 import com.zanxiang.game.module.manage.service.IGameTagService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/OrderController.java

@@ -3,10 +3,10 @@ package com.zanxiang.game.module.manage.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.module.base.domain.ResultVO;
-import com.zanxiang.game.module.manage.domain.params.LogPayCpParam;
-import com.zanxiang.game.module.manage.domain.params.OrderParam;
-import com.zanxiang.game.module.manage.domain.vo.LogPayCpVO;
-import com.zanxiang.game.module.manage.domain.vo.OrderListVO;
+import com.zanxiang.game.module.manage.pojo.params.LogPayCpParam;
+import com.zanxiang.game.module.manage.pojo.params.OrderParam;
+import com.zanxiang.game.module.manage.pojo.vo.LogPayCpVO;
+import com.zanxiang.game.module.manage.pojo.vo.OrderListVO;
 import com.zanxiang.game.module.manage.service.ILogPayCpService;
 import com.zanxiang.game.module.manage.service.IOrderService;
 import io.swagger.annotations.Api;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/OssController.java

@@ -3,10 +3,10 @@ package com.zanxiang.game.module.manage.controller;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.module.base.domain.ResultVO;
 import com.zanxiang.game.module.base.enums.FileTypeEnum;
-import com.zanxiang.game.module.base.exception.BaseException;
 import com.zanxiang.module.oss.pojo.OssUploadCallback;
 import com.zanxiang.module.oss.pojo.dto.OssUploadDTO;
 import com.zanxiang.module.oss.service.IOssService;
+import com.zanxiang.module.util.exception.BaseException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/PayApplicationController.java

@@ -3,9 +3,9 @@ package com.zanxiang.game.module.manage.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.module.base.domain.ResultVO;
-import com.zanxiang.game.module.manage.domain.params.PayApplicationAddUpdateParam;
-import com.zanxiang.game.module.manage.domain.params.PayApplicationListParam;
-import com.zanxiang.game.module.manage.domain.vo.PayApplicationVO;
+import com.zanxiang.game.module.manage.pojo.params.PayApplicationAddUpdateParam;
+import com.zanxiang.game.module.manage.pojo.params.PayApplicationListParam;
+import com.zanxiang.game.module.manage.pojo.vo.PayApplicationVO;
 import com.zanxiang.game.module.manage.service.IPayApplicationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/PayBoxController.java

@@ -3,9 +3,9 @@ package com.zanxiang.game.module.manage.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.module.base.domain.ResultVO;
-import com.zanxiang.game.module.manage.domain.params.PayBoxAddUpdateParam;
-import com.zanxiang.game.module.manage.domain.params.PayBoxListParam;
-import com.zanxiang.game.module.manage.domain.vo.PayBoxListVO;
+import com.zanxiang.game.module.manage.pojo.params.PayBoxAddUpdateParam;
+import com.zanxiang.game.module.manage.pojo.params.PayBoxListParam;
+import com.zanxiang.game.module.manage.pojo.vo.PayBoxListVO;
 import com.zanxiang.game.module.manage.service.IPayBoxService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/PayMerchantController.java

@@ -3,9 +3,9 @@ package com.zanxiang.game.module.manage.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.module.base.domain.ResultVO;
-import com.zanxiang.game.module.manage.domain.params.PayMerchantAddUpdateParam;
-import com.zanxiang.game.module.manage.domain.params.PayMerchantListParam;
-import com.zanxiang.game.module.manage.domain.vo.PayMerchantListVO;
+import com.zanxiang.game.module.manage.pojo.params.PayMerchantAddUpdateParam;
+import com.zanxiang.game.module.manage.pojo.params.PayMerchantListParam;
+import com.zanxiang.game.module.manage.pojo.vo.PayMerchantListVO;
 import com.zanxiang.game.module.manage.service.IPayMerchantService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/PromoAccountController.java

@@ -3,10 +3,10 @@ package com.zanxiang.game.module.manage.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.module.base.domain.ResultVO;
-import com.zanxiang.game.module.manage.domain.params.PromoAccountAddUpdateParam;
-import com.zanxiang.game.module.manage.domain.params.PromoAccountAssignParam;
-import com.zanxiang.game.module.manage.domain.params.PromoAccountListParam;
-import com.zanxiang.game.module.manage.domain.vo.PromoAccountListVO;
+import com.zanxiang.game.module.manage.pojo.params.PromoAccountAddUpdateParam;
+import com.zanxiang.game.module.manage.pojo.params.PromoAccountAssignParam;
+import com.zanxiang.game.module.manage.pojo.params.PromoAccountListParam;
+import com.zanxiang.game.module.manage.pojo.vo.PromoAccountListVO;
 import com.zanxiang.game.module.manage.service.IPromoAccountService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/PromoChannelController.java

@@ -3,9 +3,9 @@ package com.zanxiang.game.module.manage.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.module.base.domain.ResultVO;
-import com.zanxiang.game.module.manage.domain.params.PromoChannelAddUpdateParam;
-import com.zanxiang.game.module.manage.domain.params.PromoChannelListParam;
-import com.zanxiang.game.module.manage.domain.vo.PromoChannelListVO;
+import com.zanxiang.game.module.manage.pojo.params.PromoChannelAddUpdateParam;
+import com.zanxiang.game.module.manage.pojo.params.PromoChannelListParam;
+import com.zanxiang.game.module.manage.pojo.vo.PromoChannelListVO;
 import com.zanxiang.game.module.manage.service.IPromoChannelService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/PromoMediaController.java

@@ -3,9 +3,9 @@ package com.zanxiang.game.module.manage.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.module.base.domain.ResultVO;
-import com.zanxiang.game.module.manage.domain.params.PromoMediaAddUpdateParam;
-import com.zanxiang.game.module.manage.domain.params.PromoMediaListParam;
-import com.zanxiang.game.module.manage.domain.vo.PromoMediaListVO;
+import com.zanxiang.game.module.manage.pojo.params.PromoMediaAddUpdateParam;
+import com.zanxiang.game.module.manage.pojo.params.PromoMediaListParam;
+import com.zanxiang.game.module.manage.pojo.vo.PromoMediaListVO;
 import com.zanxiang.game.module.manage.service.IPromoMediaService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/PromoSiteController.java

@@ -3,9 +3,9 @@ package com.zanxiang.game.module.manage.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.module.base.domain.ResultVO;
-import com.zanxiang.game.module.manage.domain.params.PromoSiteAddOrUpdateParam;
-import com.zanxiang.game.module.manage.domain.params.PromoSiteListParam;
-import com.zanxiang.game.module.manage.domain.vo.PromoSiteListVO;
+import com.zanxiang.game.module.manage.pojo.params.PromoSiteAddOrUpdateParam;
+import com.zanxiang.game.module.manage.pojo.params.PromoSiteListParam;
+import com.zanxiang.game.module.manage.pojo.vo.PromoSiteListVO;
 import com.zanxiang.game.module.manage.service.IPromoSiteService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/UserBanController.java

@@ -3,9 +3,9 @@ package com.zanxiang.game.module.manage.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.module.base.domain.ResultVO;
-import com.zanxiang.game.module.manage.domain.params.*;
-import com.zanxiang.game.module.manage.domain.vo.IpBanVO;
-import com.zanxiang.game.module.manage.domain.vo.UserBanVO;
+import com.zanxiang.game.module.manage.pojo.params.*;
+import com.zanxiang.game.module.manage.pojo.vo.IpBanVO;
+import com.zanxiang.game.module.manage.pojo.vo.UserBanVO;
 import com.zanxiang.game.module.manage.service.IIpBanService;
 import com.zanxiang.game.module.manage.service.IUserBanService;
 import io.swagger.annotations.Api;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/UserController.java

@@ -3,8 +3,8 @@ package com.zanxiang.game.module.manage.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.module.base.domain.ResultVO;
-import com.zanxiang.game.module.manage.domain.params.*;
-import com.zanxiang.game.module.manage.domain.vo.*;
+import com.zanxiang.game.module.manage.pojo.params.*;
+import com.zanxiang.game.module.manage.pojo.vo.*;
 import com.zanxiang.game.module.manage.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/handler/GlobalExceptionHandler.java

@@ -0,0 +1,100 @@
+package com.zanxiang.game.module.manage.handler;
+
+import com.zanxiang.erp.security.exception.NoPermissionException;
+import com.zanxiang.module.util.DateUtil;
+import com.zanxiang.module.util.exception.BaseException;
+import com.zanxiang.module.util.pojo.ResultVO;
+import com.zanxiang.module.web.util.ServletUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.validation.BindException;
+import org.springframework.web.HttpRequestMethodNotSupportedException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
+
+import java.time.LocalDateTime;
+
+/**
+ * 全局异常代理
+ *
+ * @author bilingfeng
+ */
+@Slf4j
+@RestControllerAdvice
+public class GlobalExceptionHandler {
+
+    /**
+     * 业务异常
+     */
+    @ExceptionHandler(BaseException.class)
+    public ResultVO<?> baseException(BaseException e) {
+        return ResultVO.fail(e.getMessage());
+    }
+
+    /**
+     * http method错误
+     *
+     * @param e
+     * @return
+     */
+    @ExceptionHandler(HttpRequestMethodNotSupportedException.class)
+    public ResultVO<?> methodNotSupportedException(HttpRequestMethodNotSupportedException e) {
+        log.error("URL：{}, 请求 method：{}, 支持的 method：{}", ServletUtil.getRequest().getRequestURL(), ServletUtil.getRequest().getMethod(), e.getSupportedMethods());
+        return ResultVO.fail("http method错误！");
+    }
+
+    /**
+     * 自定义参数校验错误
+     */
+    @ExceptionHandler(BindException.class)
+    public ResultVO<?> validatedBindException(BindException e) {
+        String message = e.getAllErrors().get(0).getDefaultMessage();
+        return ResultVO.fail(message);
+    }
+
+    /**
+     * 自定义参数校验错误
+     */
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResultVO<?> validExceptionHandler(MethodArgumentNotValidException e) {
+        String message = e.getBindingResult().getFieldError().getDefaultMessage();
+        return ResultVO.fail(message);
+    }
+
+    /**
+     * 自定义参数校验错误
+     */
+    @ExceptionHandler(HttpMessageNotReadableException.class)
+    public ResultVO<?> validExceptionHandler(HttpMessageNotReadableException e) {
+        log.error(e.getMessage(), e);
+        return ResultVO.fail("参数异常，请勿非法操作");
+    }
+
+    /**
+     * 参数类型不匹配导致转换异常
+     *
+     * @param e
+     * @return
+     */
+    @ExceptionHandler(MethodArgumentTypeMismatchException.class)
+    public ResultVO<?> mismatchErrorHandler(MethodArgumentTypeMismatchException e) {
+        log.error("方法:{},字段:{},参数:{},错误信息:{}", e.getParameter().getMethod(), e.getName(), e.getValue(), e.getMessage());
+        return ResultVO.fail("请求参数异常，请勿非法操作");
+    }
+
+    /**
+     * 权限异常
+     */
+    @ExceptionHandler(NoPermissionException.class)
+    public ResultVO<?> preAuthorizeException(NoPermissionException e) {
+        return ResultVO.fail("没有权限，请联系管理员授权");
+    }
+
+    @ExceptionHandler(Exception.class)
+    public ResultVO<?> handleException(Exception e) {
+        log.error(e.getMessage(), e);
+        return ResultVO.fail(DateUtil.formatLocalDateTime(LocalDateTime.now()) + ": 服务异常，请联系管理员");
+    }
+}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/dto/CpDTO.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/CpDTO.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.dto;
+package com.zanxiang.game.module.manage.pojo.dto;
 
 import lombok.Data;
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/dto/GameAppletDTO.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/GameAppletDTO.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.dto;
+package com.zanxiang.game.module.manage.pojo.dto;
 
 import lombok.Data;
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/dto/GameCategoryDTO.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/GameCategoryDTO.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.dto;
+package com.zanxiang.game.module.manage.pojo.dto;
 
 import lombok.Data;
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/dto/GameDTO.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/GameDTO.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.dto;
+package com.zanxiang.game.module.manage.pojo.dto;
 
 import lombok.Data;
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/dto/GamePayWayDTO.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/GamePayWayDTO.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.dto;
+package com.zanxiang.game.module.manage.pojo.dto;
 
 import lombok.Data;
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/dto/GameTagDTO.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/GameTagDTO.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.dto;
+package com.zanxiang.game.module.manage.pojo.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/dto/GameUserRoleDTO.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/GameUserRoleDTO.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.dto;
+package com.zanxiang.game.module.manage.pojo.dto;
 
 import lombok.Data;
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/dto/PayApplicationDTO.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/PayApplicationDTO.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.dto;
+package com.zanxiang.game.module.manage.pojo.dto;
 
 import lombok.Data;
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/dto/PayBoxDTO.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/PayBoxDTO.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.dto;
+package com.zanxiang.game.module.manage.pojo.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/dto/PayDeviceDTO.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/PayDeviceDTO.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.dto;
+package com.zanxiang.game.module.manage.pojo.dto;
 
 import lombok.Data;
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/dto/PayMerchantDTO.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/PayMerchantDTO.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.dto;
+package com.zanxiang.game.module.manage.pojo.dto;
 
 import lombok.Data;
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/dto/PayWayDTO.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/PayWayDTO.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.dto;
+package com.zanxiang.game.module.manage.pojo.dto;
 
 import lombok.Data;
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/dto/PromoAccountDTO.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/PromoAccountDTO.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.dto;
+package com.zanxiang.game.module.manage.pojo.dto;
 
 import lombok.Data;
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/dto/PromoChannelDTO.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/PromoChannelDTO.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.dto;
+package com.zanxiang.game.module.manage.pojo.dto;
 
 import lombok.Data;
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/dto/PromoMediaDTO.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/PromoMediaDTO.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.dto;
+package com.zanxiang.game.module.manage.pojo.dto;
 
 import lombok.Data;
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/dto/PromoSiteDTO.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/PromoSiteDTO.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.dto;
+package com.zanxiang.game.module.manage.pojo.dto;
 
 import lombok.Data;
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/dto/UserCardDTO.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/UserCardDTO.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.dto;
+package com.zanxiang.game.module.manage.pojo.dto;
 
 import lombok.Data;
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/dto/UserDTO.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/UserDTO.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.dto;
+package com.zanxiang.game.module.manage.pojo.dto;
 
 import lombok.Data;
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/dto/UserExtDTO.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/dto/UserExtDTO.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.dto;
+package com.zanxiang.game.module.manage.pojo.dto;
 
 import lombok.Data;
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/CpAddUpdateParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/CpAddUpdateParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/CpListParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/CpListParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.Cp;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/GameAccountUpdateParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameAccountUpdateParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/GameAddParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameAddParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/GameDockParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameDockParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/GameListParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameListParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.Game;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/GamePayStrategyAddUpdateParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GamePayStrategyAddUpdateParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/GamePayStrategyListParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GamePayStrategyListParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.GamePayStrategy;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/GamePayWayAddUpdateParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GamePayWayAddUpdateParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/GamePayWayListParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GamePayWayListParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.GamePayWay;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/GamePictureParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GamePictureParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/GameTagAddUpdateParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameTagAddUpdateParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/GameTagListParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameTagListParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.GameTag;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/GameUpdateParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameUpdateParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/GameUserListParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameUserListParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.GameUser;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/GameUserRoleListParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameUserRoleListParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.GameUserRole;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/GuideGameUpdateParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GuideGameUpdateParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/IpBanAddParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/IpBanAddParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import lombok.Data;
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/IpBanListParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/IpBanListParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.IpBan;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/IpBanUpdateParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/IpBanUpdateParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/LogPayCpParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/LogPayCpParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.LogPayCp;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/OrderParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/OrderParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zanxiang.game.module.base.base.BasePage;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/PayApplicationAddUpdateParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PayApplicationAddUpdateParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/PayApplicationListParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PayApplicationListParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.PayApplication;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/PayBoxAddUpdateParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PayBoxAddUpdateParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/PayBoxListParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PayBoxListParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.PayBox;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/PayMerchantAddUpdateParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PayMerchantAddUpdateParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/PayMerchantListParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PayMerchantListParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.PayMerchant;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/PromoAccountAddUpdateParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PromoAccountAddUpdateParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/PromoAccountAssignParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PromoAccountAssignParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/PromoAccountListParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PromoAccountListParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.PromoAccount;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/PromoChannelAddUpdateParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PromoChannelAddUpdateParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/PromoChannelListParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PromoChannelListParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.PromoChannel;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/PromoMediaAddUpdateParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PromoMediaAddUpdateParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/PromoMediaListParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PromoMediaListParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.PromoMedia;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/PromoSiteAddOrUpdateParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PromoSiteAddOrUpdateParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/PromoSiteListParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PromoSiteListParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.PromoSite;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/RelationGameUpdateParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/RelationGameUpdateParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/UserBanListParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/UserBanListParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zanxiang.game.module.base.base.BasePage;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/UserBanUpdateParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/UserBanUpdateParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/UserListParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/UserListParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.User;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/UserLoginLogParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/UserLoginLogParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.UserLoginLog;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/UserNameAuthListParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/UserNameAuthListParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.UserCard;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/UserOrderListParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/UserOrderListParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import com.zanxiang.game.module.base.base.BasePage;
 import com.zanxiang.game.module.mybatis.entity.Order;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/params/UserUpdateParam.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/UserUpdateParam.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.params;
+package com.zanxiang.game.module.manage.pojo.params;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/vo/ApplicationTypeChoiceVO.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/ApplicationTypeChoiceVO.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.vo;
+package com.zanxiang.game.module.manage.pojo.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/vo/AuthPlatformVO.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/AuthPlatformVO.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.vo;
+package com.zanxiang.game.module.manage.pojo.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/vo/CpChoiceVO.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/CpChoiceVO.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.vo;
+package com.zanxiang.game.module.manage.pojo.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/vo/CpVO.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/CpVO.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.vo;
+package com.zanxiang.game.module.manage.pojo.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/vo/GameAccountVO.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/GameAccountVO.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.vo;
+package com.zanxiang.game.module.manage.pojo.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/domain/vo/GameAlipayPayVO.java → game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/GameAlipayPayVO.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.domain.vo;
+package com.zanxiang.game.module.manage.pojo.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;