格式化所有java代码

hchyun/hchyun-admin/src/main/java/com/hchyun/HchYunServletInitializer.java

@@ -8,11 +8,9 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
  *
  * @author hchyun
  */
-public class HchYunServletInitializer extends SpringBootServletInitializer
+public class HchYunServletInitializer extends SpringBootServletInitializer {
-{
     @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-    {
         return application.sources(HchYunApplication.class);
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/annotation/DataScope.java

@@ -14,8 +14,7 @@ import java.lang.annotation.Target;
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-public @interface DataScope
+public @interface DataScope {
-{
     /**
      * 部门表的别名
      */

hchyun/hchyun-common/src/main/java/com/hchyun/common/annotation/DataSource.java

@@ -6,11 +6,12 @@ import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+
 import com.hchyun.common.enums.DataSourceType;
 
 /**
  * 自定义多数据源切换注解
- *
+ * <p>
  * 优先级：先方法，后类，如果方法覆盖了类上的数据源类型，以方法的为准，否则以类上的为准
  *
  * @author hchyun
@@ -19,8 +20,7 @@ import com.hchyun.common.enums.DataSourceType;
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @Inherited
-public @interface DataSource
+public @interface DataSource {
-{
     /**
      * 切换数据源名称
      */

hchyun/hchyun-common/src/main/java/com/hchyun/common/annotation/Excel.java

@@ -13,13 +13,11 @@ import java.math.BigDecimal;
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
-public @interface Excel
+public @interface Excel {
-{
     /**
      * 导出时在excel中排序
      */
 //    public int sort() default Integer.MAX_VALUE;
-
     public int sort() default 1;
 
     /**
@@ -113,34 +111,28 @@ public @interface Excel
      */
     Type type() default Type.ALL;
 
-    public enum Type
+    public enum Type {
-    {
         ALL(0), EXPORT(1), IMPORT(2);
         private final int value;
 
-        Type(int value)
+        Type(int value) {
-        {
             this.value = value;
         }
 
-        public int value()
+        public int value() {
-        {
             return this.value;
         }
     }
 
-    public enum ColumnType
+    public enum ColumnType {
-    {
         NUMERIC(0), STRING(1);
         private final int value;
 
-        ColumnType(int value)
+        ColumnType(int value) {
-        {
             this.value = value;
         }
 
-        public int value()
+        public int value() {
-        {
             return this.value;
         }
     }

hchyun/hchyun-common/src/main/java/com/hchyun/common/annotation/Excels.java

@@ -12,7 +12,6 @@ import java.lang.annotation.Target;
  */
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface Excels
+public @interface Excels {
-{
     Excel[] value();
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/annotation/Log.java

@@ -5,6 +5,7 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+
 import com.hchyun.common.enums.BusinessType;
 import com.hchyun.common.enums.OperatorType;
 
@@ -12,13 +13,11 @@ import com.hchyun.common.enums.OperatorType;
  * 自定义操作日志记录注解
  *
  * @author hchyun
- *
  */
 @Target({ElementType.PARAMETER, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-public @interface Log
+public @interface Log {
-{
     /**
      * 模块
      */

hchyun/hchyun-common/src/main/java/com/hchyun/common/annotation/RepeatSubmit.java

@@ -11,13 +11,11 @@ import java.lang.annotation.Target;
  * 自定义注解防止表单重复提交
  *
  * @author hchyun
- *
  */
 @Inherited
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-public @interface RepeatSubmit
+public @interface RepeatSubmit {
-{
 
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/config/HchYunConfig.java

@@ -91,7 +91,6 @@ public class HchYunConfig {
     }
 
 
-
     /**
      * 获取头像上传路径
      */

hchyun/hchyun-common/src/main/java/com/hchyun/common/constant/Constants.java

@@ -5,8 +5,7 @@ package com.hchyun.common.constant;
  *
  * @author hchyun
  */
-public class Constants
+public class Constants {
-{
     /**
      * UTF-8 字符集
      */

hchyun/hchyun-common/src/main/java/com/hchyun/common/constant/GenConstants.java

@@ -5,118 +5,191 @@ package com.hchyun.common.constant;
  *
  * @author hchyun
  */
-public class GenConstants
+public class GenConstants {
-{
+    /**
-    /** 单表（增删改查） */
+     * 单表（增删改查）
+     */
     public static final String TPL_CRUD = "crud";
 
-    /** 树表（增删改查） */
+    /**
+     * 树表（增删改查）
+     */
     public static final String TPL_TREE = "tree";
 
-    /** 主子表（增删改查） */
+    /**
+     * 主子表（增删改查）
+     */
     public static final String TPL_SUB = "sub";
 
-    /** 关联查询（增删改查） */
+    /**
+     * 关联查询（增删改查）
+     */
     public static final String TPL_ASS = "ass";
 
-    /** 树编码字段 */
+    /**
+     * 树编码字段
+     */
     public static final String TREE_CODE = "treeCode";
 
-    /** 树父编码字段 */
+    /**
+     * 树父编码字段
+     */
     public static final String TREE_PARENT_CODE = "treeParentCode";
 
-    /** 树名称字段 */
+    /**
+     * 树名称字段
+     */
     public static final String TREE_NAME = "treeName";
 
-    /** 上级菜单ID字段 */
+    /**
+     * 上级菜单ID字段
+     */
     public static final String PARENT_MENU_ID = "parentMenuId";
 
-    /** 上级菜单名称字段 */
+    /**
+     * 上级菜单名称字段
+     */
     public static final String PARENT_MENU_NAME = "parentMenuName";
 
-    /** 数据库字符串类型 */
+    /**
+     * 数据库字符串类型
+     */
     public static final String[] COLUMNTYPE_STR = {"char", "varchar", "nvarchar", "varchar2", "tinytext", "text",
             "mediumtext", "longtext"};
 
-    /** 数据库文本类型 */
+    /**
+     * 数据库文本类型
+     */
     public static final String[] COLUMNTYPE_TEXT = {"tinytext", "text", "mediumtext", "longtext"};
 
-    /** 数据库时间类型 */
+    /**
+     * 数据库时间类型
+     */
     public static final String[] COLUMNTYPE_TIME = {"datetime", "time", "date", "timestamp"};
 
-    /** 数据库数字类型 */
+    /**
+     * 数据库数字类型
+     */
     public static final String[] COLUMNTYPE_NUMBER = {"tinyint", "smallint", "mediumint", "int", "number", "integer",
             "bit", "bigint", "float", "float", "double", "decimal"};
 
-    /** 页面不需要编辑字段 */
+    /**
+     * 页面不需要编辑字段
+     */
     public static final String[] COLUMNNAME_NOT_EDIT = {"id", "create_by", "create_time", "del_flag"};
 
-    /** 页面不需要显示的列表字段 */
+    /**
+     * 页面不需要显示的列表字段
+     */
     public static final String[] COLUMNNAME_NOT_LIST = {"id", "create_by", "create_time", "del_flag", "update_by",
             "update_time"};
 
-    /** 页面不需要查询字段 */
+    /**
+     * 页面不需要查询字段
+     */
     public static final String[] COLUMNNAME_NOT_QUERY = {"id", "create_by", "create_time", "del_flag", "update_by",
             "update_time", "remark"};
 
-    /** Entity基类字段 */
+    /**
+     * Entity基类字段
+     */
     public static final String[] BASE_ENTITY = {"createBy", "createTime", "updateBy", "updateTime", "remark"};
 
-    /** Tree基类字段 */
+    /**
+     * Tree基类字段
+     */
     public static final String[] TREE_ENTITY = {"parentName", "parentId", "orderNum", "ancestors", "children"};
 
-    /** 文本框 */
+    /**
+     * 文本框
+     */
     public static final String HTML_INPUT = "input";
 
-    /** 文本域 */
+    /**
+     * 文本域
+     */
     public static final String HTML_TEXTAREA = "textarea";
 
-    /** 下拉框 */
+    /**
+     * 下拉框
+     */
     public static final String HTML_SELECT = "select";
 
-    /** 单选框 */
+    /**
+     * 单选框
+     */
     public static final String HTML_RADIO = "radio";
 
-    /** 复选框 */
+    /**
+     * 复选框
+     */
     public static final String HTML_CHECKBOX = "checkbox";
 
-    /** 日期控件 */
+    /**
+     * 日期控件
+     */
     public static final String HTML_DATETIME = "datetime";
 
-    /** 图片上传控件 */
+    /**
+     * 图片上传控件
+     */
     public static final String HTML_IMAGE_UPLOAD = "imageUpload";
 
-    /** 文件上传控件 */
+    /**
+     * 文件上传控件
+     */
     public static final String HTML_FILE_UPLOAD = "fileUpload";
 
-    /** 富文本控件 */
+    /**
+     * 富文本控件
+     */
     public static final String HTML_EDITOR = "editor";
 
-    /** 字符串类型 */
+    /**
+     * 字符串类型
+     */
     public static final String TYPE_STRING = "String";
 
-    /** 整型 */
+    /**
+     * 整型
+     */
     public static final String TYPE_INTEGER = "Integer";
 
-    /** 长整型 */
+    /**
+     * 长整型
+     */
     public static final String TYPE_LONG = "Long";
 
-    /** 浮点型 */
+    /**
+     * 浮点型
+     */
     public static final String TYPE_DOUBLE = "Double";
 
-    /** 高精度计算类型 */
+    /**
+     * 高精度计算类型
+     */
     public static final String TYPE_BIGDECIMAL = "BigDecimal";
 
-    /** 时间类型 */
+    /**
+     * 时间类型
+     */
     public static final String TYPE_DATE = "Date";
 
-    /** 模糊查询 */
+    /**
+     * 模糊查询
+     */
     public static final String QUERY_LIKE = "LIKE";
-    /** 精确查询 */
+    /**
+     * 精确查询
+     */
     public static final String QUERY_EQ = "EQ";
 
-    /** 需要 */
+    /**
+     * 需要
+     */
     public static final String REQUIRE = "1";
-    /** 不需要 */
+    /**
+     * 不需要
+     */
     public static final String NO_REQUIRE = "0";
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/constant/HttpStatus.java

@@ -5,8 +5,7 @@ package com.hchyun.common.constant;
  *
  * @author hchyun
  */
-public class HttpStatus
+public class HttpStatus {
-{
     /**
      * 操作成功
      */

hchyun/hchyun-common/src/main/java/com/hchyun/common/constant/ScheduleConstants.java

@@ -5,27 +5,35 @@ package com.hchyun.common.constant;
  *
  * @author hchyun
  */
-public class ScheduleConstants
+public class ScheduleConstants {
-{
     public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME";
 
-    /** 执行目标key */
+    /**
+     * 执行目标key
+     */
     public static final String TASK_PROPERTIES = "TASK_PROPERTIES";
 
-    /** 默认 */
+    /**
+     * 默认
+     */
     public static final String MISFIRE_DEFAULT = "0";
 
-    /** 立即触发执行 */
+    /**
+     * 立即触发执行
+     */
     public static final String MISFIRE_IGNORE_MISFIRES = "1";
 
-    /** 触发一次执行 */
+    /**
+     * 触发一次执行
+     */
     public static final String MISFIRE_FIRE_AND_PROCEED = "2";
 
-    /** 不触发立即执行 */
+    /**
+     * 不触发立即执行
+     */
     public static final String MISFIRE_DO_NOTHING = "3";
 
-    public enum Status
+    public enum Status {
-    {
         /**
          * 正常
          */
@@ -37,13 +45,11 @@ public class ScheduleConstants
 
         private String value;
 
-        private Status(String value)
+        private Status(String value) {
-        {
             this.value = value;
         }
 
-        public String getValue()
+        public String getValue() {
-        {
             return value;
         }
     }

hchyun/hchyun-common/src/main/java/com/hchyun/common/constant/UserConstants.java

@@ -5,56 +5,85 @@ package com.hchyun.common.constant;
  *
  * @author hchyun
  */
-public class UserConstants
+public class UserConstants {
-{
     /**
      * 平台内系统用户的唯一标志
      */
     public static final String SYS_USER = "SYS_USER";
 
-    /** 正常状态 */
+    /**
+     * 正常状态
+     */
     public static final String NORMAL = "0";
 
-    /** 异常状态 */
+    /**
+     * 异常状态
+     */
     public static final String EXCEPTION = "1";
 
-    /** 用户封禁状态 */
+    /**
+     * 用户封禁状态
+     */
     public static final String USER_DISABLE = "1";
 
-    /** 角色封禁状态 */
+    /**
+     * 角色封禁状态
+     */
     public static final String ROLE_DISABLE = "1";
 
-    /** 部门正常状态 */
+    /**
+     * 部门正常状态
+     */
     public static final String DEPT_NORMAL = "0";
 
-    /** 部门停用状态 */
+    /**
+     * 部门停用状态
+     */
     public static final String DEPT_DISABLE = "1";
 
-    /** 字典正常状态 */
+    /**
+     * 字典正常状态
+     */
     public static final String DICT_NORMAL = "0";
 
-    /** 是否为系统默认（是） */
+    /**
+     * 是否为系统默认（是）
+     */
     public static final String YES = "Y";
 
-    /** 是否菜单外链（是） */
+    /**
+     * 是否菜单外链（是）
+     */
     public static final String YES_FRAME = "0";
 
-    /** 是否菜单外链（否） */
+    /**
+     * 是否菜单外链（否）
+     */
     public static final String NO_FRAME = "1";
 
-    /** 菜单类型（目录） */
+    /**
+     * 菜单类型（目录）
+     */
     public static final String TYPE_DIR = "M";
 
-    /** 菜单类型（菜单） */
+    /**
+     * 菜单类型（菜单）
+     */
     public static final String TYPE_MENU = "C";
 
-    /** 菜单类型（按钮） */
+    /**
+     * 菜单类型（按钮）
+     */
     public static final String TYPE_BUTTON = "F";
 
-    /** Layout组件标识 */
+    /**
+     * Layout组件标识
+     */
     public final static String LAYOUT = "Layout";
 
-    /** 校验返回结果码 */
+    /**
+     * 校验返回结果码
+     */
     public final static String UNIQUE = "0";
     public final static String NOT_UNIQUE = "1";
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/core/controller/HcyBaseController.java

@@ -76,7 +76,6 @@ public class HcyBaseController {
     }
 
 
-
 //    /**
 //     * 响应返回结果
 //     *

hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/TreeEntity.java

@@ -8,72 +8,71 @@ import java.util.List;
  *
  * @author hchyun
  */
-public class TreeEntity extends BaseEntity
+public class TreeEntity extends BaseEntity {
-{
 
 
-    /** 父菜单名称 */
+    /**
+     * 父菜单名称
+     */
     private String parentName;
 
-    /** 父菜单ID */
+    /**
+     * 父菜单ID
+     */
     private Long parentId;
 
-    /** 显示顺序 */
+    /**
+     * 显示顺序
+     */
     private Integer orderNum;
 
-    /** 祖级列表 */
+    /**
+     * 祖级列表
+     */
     private String ancestors;
 
-    /** 子部门 */
+    /**
+     * 子部门
+     */
     private List<?> children = new ArrayList<>();
 
-    public String getParentName()
+    public String getParentName() {
-    {
         return parentName;
     }
 
-    public void setParentName(String parentName)
+    public void setParentName(String parentName) {
-    {
         this.parentName = parentName;
     }
 
-    public Long getParentId()
+    public Long getParentId() {
-    {
         return parentId;
     }
 
-    public void setParentId(Long parentId)
+    public void setParentId(Long parentId) {
-    {
         this.parentId = parentId;
     }
 
-    public Integer getOrderNum()
+    public Integer getOrderNum() {
-    {
         return orderNum;
     }
 
-    public void setOrderNum(Integer orderNum)
+    public void setOrderNum(Integer orderNum) {
-    {
         this.orderNum = orderNum;
     }
 
-    public String getAncestors()
+    public String getAncestors() {
-    {
         return ancestors;
     }
 
-    public void setAncestors(String ancestors)
+    public void setAncestors(String ancestors) {
-    {
         this.ancestors = ancestors;
     }
 
-    public List<?> getChildren()
+    public List<?> getChildren() {
-    {
         return children;
     }
 
-    public void setChildren(List<?> children)
+    public void setChildren(List<?> children) {
-    {
         this.children = children;
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/TreeSelect.java

@@ -3,6 +3,7 @@ package com.hchyun.common.core.entity;
 import java.io.Serializable;
 import java.util.List;
 import java.util.stream.Collectors;
+
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.hchyun.common.core.entity.entity.SysDept;
 import com.hchyun.common.core.entity.entity.SysMenu;
@@ -12,66 +13,62 @@ import com.hchyun.common.core.entity.entity.SysMenu;
  *
  * @author hchyun
  */
-public class TreeSelect implements Serializable
+public class TreeSelect implements Serializable {
-{
 
 
-    /** 节点ID */
+    /**
+     * 节点ID
+     */
     private Long id;
 
-    /** 节点名称 */
+    /**
+     * 节点名称
+     */
     private String label;
 
-    /** 子节点 */
+    /**
+     * 子节点
+     */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<TreeSelect> children;
 
-    public TreeSelect()
+    public TreeSelect() {
-    {
 
     }
 
-    public TreeSelect(SysDept dept)
+    public TreeSelect(SysDept dept) {
-    {
         this.id = dept.getDeptId();
         this.label = dept.getDeptName();
         this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
     }
 
-    public TreeSelect(SysMenu menu)
+    public TreeSelect(SysMenu menu) {
-    {
         this.id = menu.getMenuId();
         this.label = menu.getMenuName();
         this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
     }
 
-    public Long getId()
+    public Long getId() {
-    {
         return id;
     }
 
-    public void setId(Long id)
+    public void setId(Long id) {
-    {
         this.id = id;
     }
 
-    public String getLabel()
+    public String getLabel() {
-    {
         return label;
     }
 
-    public void setLabel(String label)
+    public void setLabel(String label) {
-    {
         this.label = label;
     }
 
-    public List<TreeSelect> getChildren()
+    public List<TreeSelect> getChildren() {
-    {
         return children;
     }
 
-    public void setChildren(List<TreeSelect> children)
+    public void setChildren(List<TreeSelect> children) {
-    {
         this.children = children;
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysDept.java

@@ -5,6 +5,7 @@ import java.util.List;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.hchyun.common.core.entity.BaseEntity;
@@ -14,169 +15,168 @@ import com.hchyun.common.core.entity.BaseEntity;
  *
  * @author hchyun
  */
-public class SysDept extends BaseEntity
+public class SysDept extends BaseEntity {
-{
 
 
-    /** 部门ID */
+    /**
+     * 部门ID
+     */
     private Long deptId;
 
-    /** 父部门ID */
+    /**
+     * 父部门ID
+     */
     private Long parentId;
 
-    /** 祖级列表 */
+    /**
+     * 祖级列表
+     */
     private String ancestors;
 
-    /** 部门名称 */
+    /**
+     * 部门名称
+     */
     private String deptName;
 
-    /** 显示顺序 */
+    /**
+     * 显示顺序
+     */
     private String orderNum;
 
-    /** 负责人 */
+    /**
+     * 负责人
+     */
     private String leader;
 
-    /** 联系电话 */
+    /**
+     * 联系电话
+     */
     private String phone;
 
-    /** 邮箱 */
+    /**
+     * 邮箱
+     */
     private String email;
 
-    /** 部门状态:0正常,1停用 */
+    /**
+     * 部门状态:0正常,1停用
+     */
     private String status;
 
-    /** 删除标志（0代表存在 2代表删除） */
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
     private String delFlag;
 
-    /** 父部门名称 */
+    /**
+     * 父部门名称
+     */
     private String parentName;
 
-    /** 子部门 */
+    /**
+     * 子部门
+     */
     private List<SysDept> children = new ArrayList<SysDept>();
 
-    public Long getDeptId()
+    public Long getDeptId() {
-    {
         return deptId;
     }
 
-    public void setDeptId(Long deptId)
+    public void setDeptId(Long deptId) {
-    {
         this.deptId = deptId;
     }
 
-    public Long getParentId()
+    public Long getParentId() {
-    {
         return parentId;
     }
 
-    public void setParentId(Long parentId)
+    public void setParentId(Long parentId) {
-    {
         this.parentId = parentId;
     }
 
-    public String getAncestors()
+    public String getAncestors() {
-    {
         return ancestors;
     }
 
-    public void setAncestors(String ancestors)
+    public void setAncestors(String ancestors) {
-    {
         this.ancestors = ancestors;
     }
 
     @NotBlank(message = "部门名称不能为空")
     @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
-    public String getDeptName()
+    public String getDeptName() {
-    {
         return deptName;
     }
 
-    public void setDeptName(String deptName)
+    public void setDeptName(String deptName) {
-    {
         this.deptName = deptName;
     }
 
     @NotBlank(message = "显示顺序不能为空")
-    public String getOrderNum()
+    public String getOrderNum() {
-    {
         return orderNum;
     }
 
-    public void setOrderNum(String orderNum)
+    public void setOrderNum(String orderNum) {
-    {
         this.orderNum = orderNum;
     }
 
-    public String getLeader()
+    public String getLeader() {
-    {
         return leader;
     }
 
-    public void setLeader(String leader)
+    public void setLeader(String leader) {
-    {
         this.leader = leader;
     }
 
     @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
-    public String getPhone()
+    public String getPhone() {
-    {
         return phone;
     }
 
-    public void setPhone(String phone)
+    public void setPhone(String phone) {
-    {
         this.phone = phone;
     }
 
     @Email(message = "邮箱格式不正确")
     @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
-    public String getEmail()
+    public String getEmail() {
-    {
         return email;
     }
 
-    public void setEmail(String email)
+    public void setEmail(String email) {
-    {
         this.email = email;
     }
 
-    public String getStatus()
+    public String getStatus() {
-    {
         return status;
     }
 
-    public void setStatus(String status)
+    public void setStatus(String status) {
-    {
         this.status = status;
     }
 
-    public String getDelFlag()
+    public String getDelFlag() {
-    {
         return delFlag;
     }
 
-    public void setDelFlag(String delFlag)
+    public void setDelFlag(String delFlag) {
-    {
         this.delFlag = delFlag;
     }
 
-    public String getParentName()
+    public String getParentName() {
-    {
         return parentName;
     }
 
-    public void setParentName(String parentName)
+    public void setParentName(String parentName) {
-    {
         this.parentName = parentName;
     }
 
-    public List<SysDept> getChildren()
+    public List<SysDept> getChildren() {
-    {
         return children;
     }
 
-    public void setChildren(List<SysDept> children)
+    public void setChildren(List<SysDept> children) {
-    {
         this.children = children;
     }
 

hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysDictData.java

@@ -2,6 +2,7 @@ package com.hchyun.common.core.entity.entity;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.hchyun.common.annotation.Excel;
@@ -14,143 +15,141 @@ import com.hchyun.common.core.entity.BaseEntity;
  *
  * @author hchyun
  */
-public class SysDictData extends BaseEntity
+public class SysDictData extends BaseEntity {
-{
 
 
-    /** 字典编码 */
+    /**
+     * 字典编码
+     */
     @Excel(name = "字典编码", cellType = ColumnType.NUMERIC)
     private Long dictCode;
 
-    /** 字典排序 */
+    /**
+     * 字典排序
+     */
     @Excel(name = "字典排序", cellType = ColumnType.NUMERIC)
     private Long dictSort;
 
-    /** 字典标签 */
+    /**
+     * 字典标签
+     */
     @Excel(name = "字典标签")
     private String dictLabel;
 
-    /** 字典键值 */
+    /**
+     * 字典键值
+     */
     @Excel(name = "字典键值")
     private String dictValue;
 
-    /** 字典类型 */
+    /**
+     * 字典类型
+     */
     @Excel(name = "字典类型")
     private String dictType;
 
-    /** 样式属性（其他样式扩展） */
+    /**
+     * 样式属性（其他样式扩展）
+     */
     private String cssClass;
 
-    /** 表格字典样式 */
+    /**
+     * 表格字典样式
+     */
     private String listClass;
 
-    /** 是否默认（Y是 N否） */
+    /**
+     * 是否默认（Y是 N否）
+     */
     @Excel(name = "是否默认", readConverterExp = "Y=是,N=否")
     private String isDefault;
 
-    /** 状态（0正常 1停用） */
+    /**
+     * 状态（0正常 1停用）
+     */
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
-    public Long getDictCode()
+    public Long getDictCode() {
-    {
         return dictCode;
     }
 
-    public void setDictCode(Long dictCode)
+    public void setDictCode(Long dictCode) {
-    {
         this.dictCode = dictCode;
     }
 
-    public Long getDictSort()
+    public Long getDictSort() {
-    {
         return dictSort;
     }
 
-    public void setDictSort(Long dictSort)
+    public void setDictSort(Long dictSort) {
-    {
         this.dictSort = dictSort;
     }
 
     @NotBlank(message = "字典标签不能为空")
     @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符")
-    public String getDictLabel()
+    public String getDictLabel() {
-    {
         return dictLabel;
     }
 
-    public void setDictLabel(String dictLabel)
+    public void setDictLabel(String dictLabel) {
-    {
         this.dictLabel = dictLabel;
     }
 
     @NotBlank(message = "字典键值不能为空")
     @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
-    public String getDictValue()
+    public String getDictValue() {
-    {
         return dictValue;
     }
 
-    public void setDictValue(String dictValue)
+    public void setDictValue(String dictValue) {
-    {
         this.dictValue = dictValue;
     }
 
     @NotBlank(message = "字典类型不能为空")
     @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
-    public String getDictType()
+    public String getDictType() {
-    {
         return dictType;
     }
 
-    public void setDictType(String dictType)
+    public void setDictType(String dictType) {
-    {
         this.dictType = dictType;
     }
 
     @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
-    public String getCssClass()
+    public String getCssClass() {
-    {
         return cssClass;
     }
 
-    public void setCssClass(String cssClass)
+    public void setCssClass(String cssClass) {
-    {
         this.cssClass = cssClass;
     }
 
-    public String getListClass()
+    public String getListClass() {
-    {
         return listClass;
     }
 
-    public void setListClass(String listClass)
+    public void setListClass(String listClass) {
-    {
         this.listClass = listClass;
     }
 
-    public boolean getDefault()
+    public boolean getDefault() {
-    {
         return UserConstants.YES.equals(this.isDefault) ? true : false;
     }
 
-    public String getIsDefault()
+    public String getIsDefault() {
-    {
         return isDefault;
     }
 
-    public void setIsDefault(String isDefault)
+    public void setIsDefault(String isDefault) {
-    {
         this.isDefault = isDefault;
     }
 
-    public String getStatus()
+    public String getStatus() {
-    {
         return status;
     }
 
-    public void setStatus(String status)
+    public void setStatus(String status) {
-    {
         this.status = status;
     }
 

hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysDictType.java

@@ -2,6 +2,7 @@ package com.hchyun.common.core.entity.entity;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.hchyun.common.annotation.Excel;
@@ -13,67 +14,66 @@ import com.hchyun.common.core.entity.BaseEntity;
  *
  * @author hchyun
  */
-public class SysDictType extends BaseEntity
+public class SysDictType extends BaseEntity {
-{
 
 
-    /** 字典主键 */
+    /**
+     * 字典主键
+     */
     @Excel(name = "字典主键", cellType = ColumnType.NUMERIC)
     private Long dictId;
 
-    /** 字典名称 */
+    /**
+     * 字典名称
+     */
     @Excel(name = "字典名称")
     private String dictName;
 
-    /** 字典类型 */
+    /**
+     * 字典类型
+     */
     @Excel(name = "字典类型")
     private String dictType;
 
-    /** 状态（0正常 1停用） */
+    /**
+     * 状态（0正常 1停用）
+     */
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
-    public Long getDictId()
+    public Long getDictId() {
-    {
         return dictId;
     }
 
-    public void setDictId(Long dictId)
+    public void setDictId(Long dictId) {
-    {
         this.dictId = dictId;
     }
 
     @NotBlank(message = "字典名称不能为空")
     @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符")
-    public String getDictName()
+    public String getDictName() {
-    {
         return dictName;
     }
 
-    public void setDictName(String dictName)
+    public void setDictName(String dictName) {
-    {
         this.dictName = dictName;
     }
 
     @NotBlank(message = "字典类型不能为空")
     @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
-    public String getDictType()
+    public String getDictType() {
-    {
         return dictType;
     }
 
-    public void setDictType(String dictType)
+    public void setDictType(String dictType) {
-    {
         this.dictType = dictType;
     }
 
-    public String getStatus()
+    public String getStatus() {
-    {
         return status;
     }
 
-    public void setStatus(String status)
+    public void setStatus(String status) {
-    {
         this.status = status;
     }
 

hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysUser.java

@@ -5,6 +5,7 @@ import java.util.List;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -20,283 +21,278 @@ import com.hchyun.common.core.entity.BaseEntity;
  *
  * @author hchyun
  */
-public class SysUser extends BaseEntity
+public class SysUser extends BaseEntity {
-{
 
 
-    /** 用户ID */
+    /**
+     * 用户ID
+     */
     @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
     private Long userId;
 
-    /** 部门ID */
+    /**
+     * 部门ID
+     */
     @Excel(name = "部门编号", type = Type.IMPORT)
     private Long deptId;
 
-    /** 用户账号 */
+    /**
+     * 用户账号
+     */
     @Excel(name = "登录名称")
     private String userName;
 
-    /** 用户昵称 */
+    /**
+     * 用户昵称
+     */
     @Excel(name = "用户名称")
     private String nickName;
 
-    /** 用户邮箱 */
+    /**
+     * 用户邮箱
+     */
     @Excel(name = "用户邮箱")
     private String email;
 
-    /** 手机号码 */
+    /**
+     * 手机号码
+     */
     @Excel(name = "手机号码")
     private String phonenumber;
 
-    /** 用户性别 */
+    /**
+     * 用户性别
+     */
     @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
     private String sex;
 
-    /** 用户头像 */
+    /**
+     * 用户头像
+     */
     private String avatar;
 
-    /** 密码 */
+    /**
+     * 密码
+     */
     private String password;
 
-    /** 盐加密 */
+    /**
+     * 盐加密
+     */
     private String salt;
 
-    /** 帐号状态（0正常 1停用） */
+    /**
+     * 帐号状态（0正常 1停用）
+     */
     @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
-    /** 删除标志（0代表存在 2代表删除） */
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
     private String delFlag;
 
-    /** 最后登录IP */
+    /**
+     * 最后登录IP
+     */
     @Excel(name = "最后登录IP", type = Type.EXPORT)
     private String loginIp;
 
-    /** 最后登录时间 */
+    /**
+     * 最后登录时间
+     */
     @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
     private Date loginDate;
 
-    /** 部门对象 */
+    /**
+     * 部门对象
+     */
     @Excels({
             @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
             @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
     })
     private SysDept dept;
 
-    /** 角色对象 */
+    /**
+     * 角色对象
+     */
     private List<SysRole> roles;
 
-    /** 角色组 */
+    /**
+     * 角色组
+     */
     private Long[] roleIds;
 
-    /** 岗位组 */
+    /**
+     * 岗位组
+     */
     private Long[] postIds;
 
-    public SysUser()
+    public SysUser() {
-    {
 
     }
 
-    public SysUser(Long userId)
+    public SysUser(Long userId) {
-    {
         this.userId = userId;
     }
 
-    public Long getUserId()
+    public Long getUserId() {
-    {
         return userId;
     }
 
-    public void setUserId(Long userId)
+    public void setUserId(Long userId) {
-    {
         this.userId = userId;
     }
 
-    public boolean isAdmin()
+    public boolean isAdmin() {
-    {
         return isAdmin(this.userId);
     }
 
-    public static boolean isAdmin(Long userId)
+    public static boolean isAdmin(Long userId) {
-    {
         return userId != null && 1L == userId;
     }
 
-    public Long getDeptId()
+    public Long getDeptId() {
-    {
         return deptId;
     }
 
-    public void setDeptId(Long deptId)
+    public void setDeptId(Long deptId) {
-    {
         this.deptId = deptId;
     }
 
     @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
-    public String getNickName()
+    public String getNickName() {
-    {
         return nickName;
     }
 
-    public void setNickName(String nickName)
+    public void setNickName(String nickName) {
-    {
         this.nickName = nickName;
     }
 
     @NotBlank(message = "用户账号不能为空")
     @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
-    public String getUserName()
+    public String getUserName() {
-    {
         return userName;
     }
 
-    public void setUserName(String userName)
+    public void setUserName(String userName) {
-    {
         this.userName = userName;
     }
 
     @Email(message = "邮箱格式不正确")
     @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
-    public String getEmail()
+    public String getEmail() {
-    {
         return email;
     }
 
-    public void setEmail(String email)
+    public void setEmail(String email) {
-    {
         this.email = email;
     }
 
     @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
-    public String getPhonenumber()
+    public String getPhonenumber() {
-    {
         return phonenumber;
     }
 
-    public void setPhonenumber(String phonenumber)
+    public void setPhonenumber(String phonenumber) {
-    {
         this.phonenumber = phonenumber;
     }
 
-    public String getSex()
+    public String getSex() {
-    {
         return sex;
     }
 
-    public void setSex(String sex)
+    public void setSex(String sex) {
-    {
         this.sex = sex;
     }
 
-    public String getAvatar()
+    public String getAvatar() {
-    {
         return avatar;
     }
 
-    public void setAvatar(String avatar)
+    public void setAvatar(String avatar) {
-    {
         this.avatar = avatar;
     }
 
     @JsonIgnore
     @JsonProperty
-    public String getPassword()
+    public String getPassword() {
-    {
         return password;
     }
 
-    public void setPassword(String password)
+    public void setPassword(String password) {
-    {
         this.password = password;
     }
 
-    public String getSalt()
+    public String getSalt() {
-    {
         return salt;
     }
 
-    public void setSalt(String salt)
+    public void setSalt(String salt) {
-    {
         this.salt = salt;
     }
 
-    public String getStatus()
+    public String getStatus() {
-    {
         return status;
     }
 
-    public void setStatus(String status)
+    public void setStatus(String status) {
-    {
         this.status = status;
     }
 
-    public String getDelFlag()
+    public String getDelFlag() {
-    {
         return delFlag;
     }
 
-    public void setDelFlag(String delFlag)
+    public void setDelFlag(String delFlag) {
-    {
         this.delFlag = delFlag;
     }
 
-    public String getLoginIp()
+    public String getLoginIp() {
-    {
         return loginIp;
     }
 
-    public void setLoginIp(String loginIp)
+    public void setLoginIp(String loginIp) {
-    {
         this.loginIp = loginIp;
     }
 
-    public Date getLoginDate()
+    public Date getLoginDate() {
-    {
         return loginDate;
     }
 
-    public void setLoginDate(Date loginDate)
+    public void setLoginDate(Date loginDate) {
-    {
         this.loginDate = loginDate;
     }
 
-    public SysDept getDept()
+    public SysDept getDept() {
-    {
         return dept;
     }
 
-    public void setDept(SysDept dept)
+    public void setDept(SysDept dept) {
-    {
         this.dept = dept;
     }
 
-    public List<SysRole> getRoles()
+    public List<SysRole> getRoles() {
-    {
         return roles;
     }
 
-    public void setRoles(List<SysRole> roles)
+    public void setRoles(List<SysRole> roles) {
-    {
         this.roles = roles;
     }
 
-    public Long[] getRoleIds()
+    public Long[] getRoleIds() {
-    {
         return roleIds;
     }
 
-    public void setRoleIds(Long[] roleIds)
+    public void setRoleIds(Long[] roleIds) {
-    {
         this.roleIds = roleIds;
     }
 
-    public Long[] getPostIds()
+    public Long[] getPostIds() {
-    {
         return postIds;
     }
 
-    public void setPostIds(Long[] postIds)
+    public void setPostIds(Long[] postIds) {
-    {
         this.postIds = postIds;
     }
 

hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/model/LoginBody.java

@@ -5,8 +5,7 @@ package com.hchyun.common.core.entity.model;
  *
  * @author hchyun
  */
-public class LoginBody
+public class LoginBody {
-{
     /**
      * 用户名
      */
@@ -27,43 +26,35 @@ public class LoginBody
      */
     private String uuid = "";
 
-    public String getUsername()
+    public String getUsername() {
-    {
         return username;
     }
 
-    public void setUsername(String username)
+    public void setUsername(String username) {
-    {
         this.username = username;
     }
 
-    public String getPassword()
+    public String getPassword() {
-    {
         return password;
     }
 
-    public void setPassword(String password)
+    public void setPassword(String password) {
-    {
         this.password = password;
     }
 
-    public String getCode()
+    public String getCode() {
-    {
         return code;
     }
 
-    public void setCode(String code)
+    public void setCode(String code) {
-    {
         this.code = code;
     }
 
-    public String getUuid()
+    public String getUuid() {
-    {
         return uuid;
     }
 
-    public void setUuid(String uuid)
+    public void setUuid(String uuid) {
-    {
         this.uuid = uuid;
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/model/LoginUser.java

@@ -2,6 +2,7 @@ package com.hchyun.common.core.entity.model;
 
 import java.util.Collection;
 import java.util.Set;
+
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -12,8 +13,7 @@ import com.hchyun.common.core.entity.entity.SysUser;
  *
  * @author hchyun
  */
-public class LoginUser implements UserDetails
+public class LoginUser implements UserDetails {
-{
 
 
     /**
@@ -61,36 +61,30 @@ public class LoginUser implements UserDetails
      */
     private SysUser user;
 
-    public String getToken()
+    public String getToken() {
-    {
         return token;
     }
 
-    public void setToken(String token)
+    public void setToken(String token) {
-    {
         this.token = token;
     }
 
-    public LoginUser()
+    public LoginUser() {
-    {
     }
 
-    public LoginUser(SysUser user, Set<String> permissions)
+    public LoginUser(SysUser user, Set<String> permissions) {
-    {
         this.user = user;
         this.permissions = permissions;
     }
 
     @JsonIgnore
     @Override
-    public String getPassword()
+    public String getPassword() {
-    {
         return user.getPassword();
     }
 
     @Override
-    public String getUsername()
+    public String getUsername() {
-    {
         return user.getUserName();
     }
 
@@ -99,8 +93,7 @@ public class LoginUser implements UserDetails
      */
     @JsonIgnore
     @Override
-    public boolean isAccountNonExpired()
+    public boolean isAccountNonExpired() {
-    {
         return true;
     }
 
@@ -111,8 +104,7 @@ public class LoginUser implements UserDetails
      */
     @JsonIgnore
     @Override
-    public boolean isAccountNonLocked()
+    public boolean isAccountNonLocked() {
-    {
         return true;
     }
 
@@ -123,8 +115,7 @@ public class LoginUser implements UserDetails
      */
     @JsonIgnore
     @Override
-    public boolean isCredentialsNonExpired()
+    public boolean isCredentialsNonExpired() {
-    {
         return true;
     }
 
@@ -135,94 +126,76 @@ public class LoginUser implements UserDetails
      */
     @JsonIgnore
     @Override
-    public boolean isEnabled()
+    public boolean isEnabled() {
-    {
         return true;
     }
 
-    public Long getLoginTime()
+    public Long getLoginTime() {
-    {
         return loginTime;
     }
 
-    public void setLoginTime(Long loginTime)
+    public void setLoginTime(Long loginTime) {
-    {
         this.loginTime = loginTime;
     }
 
-    public String getIpaddr()
+    public String getIpaddr() {
-    {
         return ipaddr;
     }
 
-    public void setIpaddr(String ipaddr)
+    public void setIpaddr(String ipaddr) {
-    {
         this.ipaddr = ipaddr;
     }
 
-    public String getLoginLocation()
+    public String getLoginLocation() {
-    {
         return loginLocation;
     }
 
-    public void setLoginLocation(String loginLocation)
+    public void setLoginLocation(String loginLocation) {
-    {
         this.loginLocation = loginLocation;
     }
 
-    public String getBrowser()
+    public String getBrowser() {
-    {
         return browser;
     }
 
-    public void setBrowser(String browser)
+    public void setBrowser(String browser) {
-    {
         this.browser = browser;
     }
 
-    public String getOs()
+    public String getOs() {
-    {
         return os;
     }
 
-    public void setOs(String os)
+    public void setOs(String os) {
-    {
         this.os = os;
     }
 
-    public Long getExpireTime()
+    public Long getExpireTime() {
-    {
         return expireTime;
     }
 
-    public void setExpireTime(Long expireTime)
+    public void setExpireTime(Long expireTime) {
-    {
         this.expireTime = expireTime;
     }
 
-    public Set<String> getPermissions()
+    public Set<String> getPermissions() {
-    {
         return permissions;
     }
 
-    public void setPermissions(Set<String> permissions)
+    public void setPermissions(Set<String> permissions) {
-    {
         this.permissions = permissions;
     }
 
-    public SysUser getUser()
+    public SysUser getUser() {
-    {
         return user;
     }
 
-    public void setUser(SysUser user)
+    public void setUser(SysUser user) {
-    {
         this.user = user;
     }
 
     @Override
-    public Collection<? extends GrantedAuthority> getAuthorities()
+    public Collection<? extends GrantedAuthority> getAuthorities() {
-    {
         return null;
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/core/page/PageDomain.java

@@ -7,66 +7,63 @@ import com.hchyun.common.utils.StringUtils;
  *
  * @author hchyun
  */
-public class PageDomain
+public class PageDomain {
-{
+    /**
-    /** 当前记录起始索引 */
+     * 当前记录起始索引
+     */
     private Integer pageNum;
 
-    /** 每页显示记录数 */
+    /**
+     * 每页显示记录数
+     */
     private Integer pageSize;
 
-    /** 排序列 */
+    /**
+     * 排序列
+     */
     private String orderByColumn;
 
-    /** 排序的方向desc或者asc */
+    /**
+     * 排序的方向desc或者asc
+     */
     private String isAsc = "asc";
 
-    public String getOrderBy()
+    public String getOrderBy() {
-    {
+        if (StringUtils.isEmpty(orderByColumn)) {
-        if (StringUtils.isEmpty(orderByColumn))
-        {
             return "";
         }
         return StringUtils.toUnderScoreCase(orderByColumn) + " " + isAsc;
     }
 
-    public Integer getPageNum()
+    public Integer getPageNum() {
-    {
         return pageNum;
     }
 
-    public void setPageNum(Integer pageNum)
+    public void setPageNum(Integer pageNum) {
-    {
         this.pageNum = pageNum;
     }
 
-    public Integer getPageSize()
+    public Integer getPageSize() {
-    {
         return pageSize;
     }
 
-    public void setPageSize(Integer pageSize)
+    public void setPageSize(Integer pageSize) {
-    {
         this.pageSize = pageSize;
     }
 
-    public String getOrderByColumn()
+    public String getOrderByColumn() {
-    {
         return orderByColumn;
     }
 
-    public void setOrderByColumn(String orderByColumn)
+    public void setOrderByColumn(String orderByColumn) {
-    {
         this.orderByColumn = orderByColumn;
     }
 
-    public String getIsAsc()
+    public String getIsAsc() {
-    {
         return isAsc;
     }
 
-    public void setIsAsc(String isAsc)
+    public void setIsAsc(String isAsc) {
-    {
         this.isAsc = isAsc;
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/core/page/TableDataInfo.java

@@ -8,27 +8,33 @@ import java.util.List;
  *
  * @author hchyun
  */
-public class TableDataInfo implements Serializable
+public class TableDataInfo implements Serializable {
-{
 
 
-    /** 总记录数 */
+    /**
+     * 总记录数
+     */
     private long total;
 
-    /** 列表数据 */
+    /**
+     * 列表数据
+     */
     private List<?> rows;
 
-    /** 消息状态码 */
+    /**
+     * 消息状态码
+     */
     private int code;
 
-    /** 消息内容 */
+    /**
+     * 消息内容
+     */
     private String msg;
 
     /**
      * 表格数据对象
      */
-    public TableDataInfo()
+    public TableDataInfo() {
-    {
     }
 
     /**
@@ -37,49 +43,40 @@ public class TableDataInfo implements Serializable
      * @param list  列表数据
      * @param total 总记录数
      */
-    public TableDataInfo(List<?> list, int total)
+    public TableDataInfo(List<?> list, int total) {
-    {
         this.rows = list;
         this.total = total;
     }
 
-    public long getTotal()
+    public long getTotal() {
-    {
         return total;
     }
 
-    public void setTotal(long total)
+    public void setTotal(long total) {
-    {
         this.total = total;
     }
 
-    public List<?> getRows()
+    public List<?> getRows() {
-    {
         return rows;
     }
 
-    public void setRows(List<?> rows)
+    public void setRows(List<?> rows) {
-    {
         this.rows = rows;
     }
 
-    public int getCode()
+    public int getCode() {
-    {
         return code;
     }
 
-    public void setCode(int code)
+    public void setCode(int code) {
-    {
         this.code = code;
     }
 
-    public String getMsg()
+    public String getMsg() {
-    {
         return msg;
     }
 
-    public void setMsg(String msg)
+    public void setMsg(String msg) {
-    {
         this.msg = msg;
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/core/page/TableSupport.java

@@ -7,8 +7,7 @@ import com.hchyun.common.utils.ServletUtils;
  *
  * @author hchyun
  */
-public class TableSupport
+public class TableSupport {
-{
     /**
      * 当前记录起始索引
      */
@@ -32,8 +31,7 @@ public class TableSupport
     /**
      * 封装分页对象
      */
-    public static PageDomain getPageDomain()
+    public static PageDomain getPageDomain() {
-    {
         PageDomain pageDomain = new PageDomain();
         pageDomain.setPageNum(ServletUtils.getParameterToInt(PAGE_NUM));
         pageDomain.setPageSize(ServletUtils.getParameterToInt(PAGE_SIZE));
@@ -42,8 +40,7 @@ public class TableSupport
         return pageDomain;
     }
 
-    public static PageDomain buildPageRequest()
+    public static PageDomain buildPageRequest() {
-    {
         return getPageDomain();
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/core/text/CharsetKit.java

@@ -2,6 +2,7 @@ package com.hchyun.common.core.text;
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+
 import com.hchyun.common.utils.StringUtils;
 
 /**
@@ -9,20 +10,31 @@ import com.hchyun.common.utils.StringUtils;
  *
  * @author hchyun
  */
-public class CharsetKit
+public class CharsetKit {
-{
+    /**
-    /** ISO-8859-1 */
+     * ISO-8859-1
+     */
     public static final String ISO_8859_1 = "ISO-8859-1";
-    /** UTF-8 */
+    /**
+     * UTF-8
+     */
     public static final String UTF_8 = "UTF-8";
-    /** GBK */
+    /**
+     * GBK
+     */
     public static final String GBK = "GBK";
 
-    /** ISO-8859-1 */
+    /**
+     * ISO-8859-1
+     */
     public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1);
-    /** UTF-8 */
+    /**
+     * UTF-8
+     */
     public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8);
-    /** GBK */
+    /**
+     * GBK
+     */
     public static final Charset CHARSET_GBK = Charset.forName(GBK);
 
     /**
@@ -31,8 +43,7 @@ public class CharsetKit
      * @param charset 字符集，为空则返回默认字符集
      * @return Charset
      */
-    public static Charset charset(String charset)
+    public static Charset charset(String charset) {
-    {
         return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset);
     }
 
@@ -44,8 +55,7 @@ public class CharsetKit
      * @param destCharset 目标字符集，默认UTF-8
      * @return 转换后的字符集
      */
-    public static String convert(String source, String srcCharset, String destCharset)
+    public static String convert(String source, String srcCharset, String destCharset) {
-    {
         return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset));
     }
 
@@ -57,20 +67,16 @@ public class CharsetKit
      * @param destCharset 目标字符集，默认UTF-8
      * @return 转换后的字符集
      */
-    public static String convert(String source, Charset srcCharset, Charset destCharset)
+    public static String convert(String source, Charset srcCharset, Charset destCharset) {
-    {
+        if (null == srcCharset) {
-        if (null == srcCharset)
-        {
             srcCharset = StandardCharsets.ISO_8859_1;
         }
 
-        if (null == destCharset)
+        if (null == destCharset) {
-        {
             srcCharset = StandardCharsets.UTF_8;
         }
 
-        if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset))
+        if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset)) {
-        {
             return source;
         }
         return new String(source.getBytes(srcCharset), destCharset);
@@ -79,8 +85,7 @@ public class CharsetKit
     /**
      * @return 系统字符集编码
      */
-    public static String systemCharset()
+    public static String systemCharset() {
-    {
         return Charset.defaultCharset().name();
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/core/text/Convert.java

@@ -6,6 +6,7 @@ import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.text.NumberFormat;
 import java.util.Set;
+
 import com.hchyun.common.utils.StringUtils;
 
 /**
@@ -13,8 +14,7 @@ import com.hchyun.common.utils.StringUtils;
  *
  * @author hchyun
  */
-public class Convert
+public class Convert {
-{
     /**
      * 转换为字符串<br>
      * 如果给定的值为null，或者转换失败，返回默认值<br>
@@ -24,14 +24,11 @@ public class Convert
      * @param defaultValue 转换错误时的默认值
      * @return 结果
      */
-    public static String toStr(Object value, String defaultValue)
+    public static String toStr(Object value, String defaultValue) {
-    {
+        if (null == value) {
-        if (null == value)
-        {
             return defaultValue;
         }
-        if (value instanceof String)
+        if (value instanceof String) {
-        {
             return (String) value;
         }
         return value.toString();
@@ -45,8 +42,7 @@ public class Convert
      * @param value 被转换的值
      * @return 结果
      */
-    public static String toStr(Object value)
+    public static String toStr(Object value) {
-    {
         return toStr(value, null);
     }
 
@@ -59,14 +55,11 @@ public class Convert
      * @param defaultValue 转换错误时的默认值
      * @return 结果
      */
-    public static Character toChar(Object value, Character defaultValue)
+    public static Character toChar(Object value, Character defaultValue) {
-    {
+        if (null == value) {
-        if (null == value)
-        {
             return defaultValue;
         }
-        if (value instanceof Character)
+        if (value instanceof Character) {
-        {
             return (Character) value;
         }
 
@@ -82,8 +75,7 @@ public class Convert
      * @param value 被转换的值
      * @return 结果
      */
-    public static Character toChar(Object value)
+    public static Character toChar(Object value) {
-    {
         return toChar(value, null);
     }
 
@@ -96,31 +88,23 @@ public class Convert
      * @param defaultValue 转换错误时的默认值
      * @return 结果
      */
-    public static Byte toByte(Object value, Byte defaultValue)
+    public static Byte toByte(Object value, Byte defaultValue) {
-    {
+        if (value == null) {
-        if (value == null)
-        {
             return defaultValue;
         }
-        if (value instanceof Byte)
+        if (value instanceof Byte) {
-        {
             return (Byte) value;
         }
-        if (value instanceof Number)
+        if (value instanceof Number) {
-        {
             return ((Number) value).byteValue();
         }
         final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr))
+        if (StringUtils.isEmpty(valueStr)) {
-        {
             return defaultValue;
         }
-        try
+        try {
-        {
             return Byte.parseByte(valueStr);
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             return defaultValue;
         }
     }
@@ -133,8 +117,7 @@ public class Convert
      * @param value 被转换的值
      * @return 结果
      */
-    public static Byte toByte(Object value)
+    public static Byte toByte(Object value) {
-    {
         return toByte(value, null);
     }
 
@@ -147,31 +130,23 @@ public class Convert
      * @param defaultValue 转换错误时的默认值
      * @return 结果
      */
-    public static Short toShort(Object value, Short defaultValue)
+    public static Short toShort(Object value, Short defaultValue) {
-    {
+        if (value == null) {
-        if (value == null)
-        {
             return defaultValue;
         }
-        if (value instanceof Short)
+        if (value instanceof Short) {
-        {
             return (Short) value;
         }
-        if (value instanceof Number)
+        if (value instanceof Number) {
-        {
             return ((Number) value).shortValue();
         }
         final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr))
+        if (StringUtils.isEmpty(valueStr)) {
-        {
             return defaultValue;
         }
-        try
+        try {
-        {
             return Short.parseShort(valueStr.trim());
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             return defaultValue;
         }
     }
@@ -184,8 +159,7 @@ public class Convert
      * @param value 被转换的值
      * @return 结果
      */
-    public static Short toShort(Object value)
+    public static Short toShort(Object value) {
-    {
         return toShort(value, null);
     }
 
@@ -198,27 +172,20 @@ public class Convert
      * @param defaultValue 转换错误时的默认值
      * @return 结果
      */
-    public static Number toNumber(Object value, Number defaultValue)
+    public static Number toNumber(Object value, Number defaultValue) {
-    {
+        if (value == null) {
-        if (value == null)
-        {
             return defaultValue;
         }
-        if (value instanceof Number)
+        if (value instanceof Number) {
-        {
             return (Number) value;
         }
         final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr))
+        if (StringUtils.isEmpty(valueStr)) {
-        {
             return defaultValue;
         }
-        try
+        try {
-        {
             return NumberFormat.getInstance().parse(valueStr);
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             return defaultValue;
         }
     }
@@ -231,8 +198,7 @@ public class Convert
      * @param value 被转换的值
      * @return 结果
      */
-    public static Number toNumber(Object value)
+    public static Number toNumber(Object value) {
-    {
         return toNumber(value, null);
     }
 
@@ -245,31 +211,23 @@ public class Convert
      * @param defaultValue 转换错误时的默认值
      * @return 结果
      */
-    public static Integer toInt(Object value, Integer defaultValue)
+    public static Integer toInt(Object value, Integer defaultValue) {
-    {
+        if (value == null) {
-        if (value == null)
-        {
             return defaultValue;
         }
-        if (value instanceof Integer)
+        if (value instanceof Integer) {
-        {
             return (Integer) value;
         }
-        if (value instanceof Number)
+        if (value instanceof Number) {
-        {
             return ((Number) value).intValue();
         }
         final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr))
+        if (StringUtils.isEmpty(valueStr)) {
-        {
             return defaultValue;
         }
-        try
+        try {
-        {
             return Integer.parseInt(valueStr.trim());
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             return defaultValue;
         }
     }
@@ -282,8 +240,7 @@ public class Convert
      * @param value 被转换的值
      * @return 结果
      */
-    public static Integer toInt(Object value)
+    public static Integer toInt(Object value) {
-    {
         return toInt(value, null);
     }
 
@@ -293,8 +250,7 @@ public class Convert
      * @param str 被转换的值
      * @return 结果
      */
-    public static Integer[] toIntArray(String str)
+    public static Integer[] toIntArray(String str) {
-    {
         return toIntArray(",", str);
     }
 
@@ -304,8 +260,7 @@ public class Convert
      * @param str 被转换的值
      * @return 结果
      */
-    public static Long[] toLongArray(String str)
+    public static Long[] toLongArray(String str) {
-    {
         return toLongArray(",", str);
     }
 
@@ -316,16 +271,13 @@ public class Convert
      * @param split 被转换的值
      * @return 结果
      */
-    public static Integer[] toIntArray(String split, String str)
+    public static Integer[] toIntArray(String split, String str) {
-    {
+        if (StringUtils.isEmpty(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++)
+        for (int i = 0; i < arr.length; i++) {
-        {
             final Integer v = toInt(arr[i], 0);
             ints[i] = v;
         }
@@ -339,16 +291,13 @@ public class Convert
      * @param str   被转换的值
      * @return 结果
      */
-    public static Long[] toLongArray(String split, String str)
+    public static Long[] toLongArray(String split, String str) {
-    {
+        if (StringUtils.isEmpty(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++)
+        for (int i = 0; i < arr.length; i++) {
-        {
             final Long v = toLong(arr[i], null);
             longs[i] = v;
         }
@@ -361,8 +310,7 @@ public class Convert
      * @param str 被转换的值
      * @return 结果
      */
-    public static String[] toStrArray(String str)
+    public static String[] toStrArray(String str) {
-    {
         return toStrArray(",", str);
     }
 
@@ -373,8 +321,7 @@ public class Convert
      * @param split 被转换的值
      * @return 结果
      */
-    public static String[] toStrArray(String split, String str)
+    public static String[] toStrArray(String split, String str) {
-    {
         return str.split(split);
     }
 
@@ -387,32 +334,24 @@ public class Convert
      * @param defaultValue 转换错误时的默认值
      * @return 结果
      */
-    public static Long toLong(Object value, Long defaultValue)
+    public static Long toLong(Object value, Long defaultValue) {
-    {
+        if (value == null) {
-        if (value == null)
-        {
             return defaultValue;
         }
-        if (value instanceof Long)
+        if (value instanceof Long) {
-        {
             return (Long) value;
         }
-        if (value instanceof Number)
+        if (value instanceof Number) {
-        {
             return ((Number) value).longValue();
         }
         final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr))
+        if (StringUtils.isEmpty(valueStr)) {
-        {
             return defaultValue;
         }
-        try
+        try {
-        {
             // 支持科学计数法
             return new BigDecimal(valueStr.trim()).longValue();
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             return defaultValue;
         }
     }
@@ -425,8 +364,7 @@ public class Convert
      * @param value 被转换的值
      * @return 结果
      */
-    public static Long toLong(Object value)
+    public static Long toLong(Object value) {
-    {
         return toLong(value, null);
     }
 
@@ -439,32 +377,24 @@ public class Convert
      * @param defaultValue 转换错误时的默认值
      * @return 结果
      */
-    public static Double toDouble(Object value, Double defaultValue)
+    public static Double toDouble(Object value, Double defaultValue) {
-    {
+        if (value == null) {
-        if (value == null)
-        {
             return defaultValue;
         }
-        if (value instanceof Double)
+        if (value instanceof Double) {
-        {
             return (Double) value;
         }
-        if (value instanceof Number)
+        if (value instanceof Number) {
-        {
             return ((Number) value).doubleValue();
         }
         final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr))
+        if (StringUtils.isEmpty(valueStr)) {
-        {
             return defaultValue;
         }
-        try
+        try {
-        {
             // 支持科学计数法
             return new BigDecimal(valueStr.trim()).doubleValue();
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             return defaultValue;
         }
     }
@@ -477,8 +407,7 @@ public class Convert
      * @param value 被转换的值
      * @return 结果
      */
-    public static Double toDouble(Object value)
+    public static Double toDouble(Object value) {
-    {
         return toDouble(value, null);
     }
 
@@ -491,31 +420,23 @@ public class Convert
      * @param defaultValue 转换错误时的默认值
      * @return 结果
      */
-    public static Float toFloat(Object value, Float defaultValue)
+    public static Float toFloat(Object value, Float defaultValue) {
-    {
+        if (value == null) {
-        if (value == null)
-        {
             return defaultValue;
         }
-        if (value instanceof Float)
+        if (value instanceof Float) {
-        {
             return (Float) value;
         }
-        if (value instanceof Number)
+        if (value instanceof Number) {
-        {
             return ((Number) value).floatValue();
         }
         final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr))
+        if (StringUtils.isEmpty(valueStr)) {
-        {
             return defaultValue;
         }
-        try
+        try {
-        {
             return Float.parseFloat(valueStr.trim());
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             return defaultValue;
         }
     }
@@ -528,8 +449,7 @@ public class Convert
      * @param value 被转换的值
      * @return 结果
      */
-    public static Float toFloat(Object value)
+    public static Float toFloat(Object value) {
-    {
         return toFloat(value, null);
     }
 
@@ -542,24 +462,19 @@ public class Convert
      * @param defaultValue 转换错误时的默认值
      * @return 结果
      */
-    public static Boolean toBool(Object value, Boolean defaultValue)
+    public static Boolean toBool(Object value, Boolean defaultValue) {
-    {
+        if (value == null) {
-        if (value == null)
-        {
             return defaultValue;
         }
-        if (value instanceof Boolean)
+        if (value instanceof Boolean) {
-        {
             return (Boolean) value;
         }
         String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr))
+        if (StringUtils.isEmpty(valueStr)) {
-        {
             return defaultValue;
         }
         valueStr = valueStr.trim().toLowerCase();
-        switch (valueStr)
+        switch (valueStr) {
-        {
             case "true":
                 return true;
             case "false":
@@ -587,8 +502,7 @@ public class Convert
      * @param value 被转换的值
      * @return 结果
      */
-    public static Boolean toBool(Object value)
+    public static Boolean toBool(Object value) {
-    {
         return toBool(value, null);
     }
 
@@ -601,29 +515,22 @@ public class Convert
      * @param defaultValue 默认值
      * @return Enum
      */
-    public static <E extends Enum<E>> E toEnum(Class<E> clazz, Object value, E defaultValue)
+    public static <E extends Enum<E>> E toEnum(Class<E> clazz, Object value, E defaultValue) {
-    {
+        if (value == null) {
-        if (value == null)
-        {
             return defaultValue;
         }
-        if (clazz.isAssignableFrom(value.getClass()))
+        if (clazz.isAssignableFrom(value.getClass())) {
-        {
             @SuppressWarnings("unchecked")
             E myE = (E) value;
             return myE;
         }
         final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr))
+        if (StringUtils.isEmpty(valueStr)) {
-        {
             return defaultValue;
         }
-        try
+        try {
-        {
             return Enum.valueOf(clazz, valueStr);
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             return defaultValue;
         }
     }
@@ -636,8 +543,7 @@ public class Convert
      * @param value 值
      * @return Enum
      */
-    public static <E extends Enum<E>> E toEnum(Class<E> clazz, Object value)
+    public static <E extends Enum<E>> E toEnum(Class<E> clazz, Object value) {
-    {
         return toEnum(clazz, value, null);
     }
 
@@ -650,31 +556,23 @@ public class Convert
      * @param defaultValue 转换错误时的默认值
      * @return 结果
      */
-    public static BigInteger toBigInteger(Object value, BigInteger defaultValue)
+    public static BigInteger toBigInteger(Object value, BigInteger defaultValue) {
-    {
+        if (value == null) {
-        if (value == null)
-        {
             return defaultValue;
         }
-        if (value instanceof BigInteger)
+        if (value instanceof BigInteger) {
-        {
             return (BigInteger) value;
         }
-        if (value instanceof Long)
+        if (value instanceof Long) {
-        {
             return BigInteger.valueOf((Long) value);
         }
         final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr))
+        if (StringUtils.isEmpty(valueStr)) {
-        {
             return defaultValue;
         }
-        try
+        try {
-        {
             return new BigInteger(valueStr);
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             return defaultValue;
         }
     }
@@ -687,8 +585,7 @@ public class Convert
      * @param value 被转换的值
      * @return 结果
      */
-    public static BigInteger toBigInteger(Object value)
+    public static BigInteger toBigInteger(Object value) {
-    {
         return toBigInteger(value, null);
     }
 
@@ -701,39 +598,29 @@ public class Convert
      * @param defaultValue 转换错误时的默认值
      * @return 结果
      */
-    public static BigDecimal toBigDecimal(Object value, BigDecimal defaultValue)
+    public static BigDecimal toBigDecimal(Object value, BigDecimal defaultValue) {
-    {
+        if (value == null) {
-        if (value == null)
-        {
             return defaultValue;
         }
-        if (value instanceof BigDecimal)
+        if (value instanceof BigDecimal) {
-        {
             return (BigDecimal) value;
         }
-        if (value instanceof Long)
+        if (value instanceof Long) {
-        {
             return new BigDecimal((Long) value);
         }
-        if (value instanceof Double)
+        if (value instanceof Double) {
-        {
             return new BigDecimal((Double) value);
         }
-        if (value instanceof Integer)
+        if (value instanceof Integer) {
-        {
             return new BigDecimal((Integer) value);
         }
         final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr))
+        if (StringUtils.isEmpty(valueStr)) {
-        {
             return defaultValue;
         }
-        try
+        try {
-        {
             return new BigDecimal(valueStr);
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             return defaultValue;
         }
     }
@@ -746,8 +633,7 @@ public class Convert
      * @param value 被转换的值
      * @return 结果
      */
-    public static BigDecimal toBigDecimal(Object value)
+    public static BigDecimal toBigDecimal(Object value) {
-    {
         return toBigDecimal(value, null);
     }
 
@@ -758,8 +644,7 @@ public class Convert
      * @param obj 对象
      * @return 字符串
      */
-    public static String utf8Str(Object obj)
+    public static String utf8Str(Object obj) {
-    {
         return str(obj, CharsetKit.CHARSET_UTF_8);
     }
 
@@ -771,8 +656,7 @@ public class Convert
      * @param charsetName 字符集
      * @return 字符串
      */
-    public static String str(Object obj, String charsetName)
+    public static String str(Object obj, String charsetName) {
-    {
         return str(obj, Charset.forName(charsetName));
     }
 
@@ -784,23 +668,16 @@ public class Convert
      * @param charset 字符集
      * @return 字符串
      */
-    public static String str(Object obj, Charset charset)
+    public static String str(Object obj, Charset charset) {
-    {
+        if (null == obj) {
-        if (null == obj)
-        {
             return null;
         }
 
-        if (obj instanceof String)
+        if (obj instanceof String) {
-        {
             return (String) obj;
-        }
+        } else if (obj instanceof byte[] || obj instanceof Byte[]) {
-        else if (obj instanceof byte[] || obj instanceof Byte[])
-        {
             return str((Byte[]) obj, charset);
-        }
+        } else if (obj instanceof ByteBuffer) {
-        else if (obj instanceof ByteBuffer)
-        {
             return str((ByteBuffer) obj, charset);
         }
         return obj.toString();
@@ -813,8 +690,7 @@ public class Convert
      * @param charset 字符集
      * @return 字符串
      */
-    public static String str(byte[] bytes, String charset)
+    public static String str(byte[] bytes, String charset) {
-    {
         return str(bytes, StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset));
     }
 
@@ -825,15 +701,12 @@ public class Convert
      * @param charset 字符集，如果此字段为空，则解码的结果取决于平台
      * @return 解码后的字符串
      */
-    public static String str(byte[] data, Charset charset)
+    public static String str(byte[] data, Charset charset) {
-    {
+        if (data == null) {
-        if (data == null)
-        {
             return null;
         }
 
-        if (null == charset)
+        if (null == charset) {
-        {
             return new String(data);
         }
         return new String(data, charset);
@@ -846,10 +719,8 @@ public class Convert
      * @param charset 字符集，如果为空使用当前系统字符集
      * @return 字符串
      */
-    public static String str(ByteBuffer data, String charset)
+    public static String str(ByteBuffer data, String charset) {
-    {
+        if (data == null) {
-        if (data == null)
-        {
             return null;
         }
 
@@ -863,24 +734,22 @@ public class Convert
      * @param charset 字符集，如果为空使用当前系统字符集
      * @return 字符串
      */
-    public static String str(ByteBuffer data, Charset charset)
+    public static String str(ByteBuffer data, Charset charset) {
-    {
+        if (null == charset) {
-        if (null == charset)
-        {
             charset = Charset.defaultCharset();
         }
         return charset.decode(data).toString();
     }
 
     // ----------------------------------------------------------------------- 全角半角转换
+
     /**
      * 半角转全角
      *
      * @param input String.
      * @return 全角字符串.
      */
-    public static String toSBC(String input)
+    public static String toSBC(String input) {
-    {
         return toSBC(input, null);
     }
 
@@ -891,23 +760,17 @@ public class Convert
      * @param notConvertSet 不替换的字符集合
      * @return 全角字符串.
      */
-    public static String toSBC(String input, Set<Character> notConvertSet)
+    public static String toSBC(String input, Set<Character> notConvertSet) {
-    {
         char c[] = input.toCharArray();
-        for (int i = 0; i < c.length; i++)
+        for (int i = 0; i < c.length; i++) {
-        {
+            if (null != notConvertSet && notConvertSet.contains(c[i])) {
-            if (null != notConvertSet && notConvertSet.contains(c[i]))
-            {
                 // 跳过不替换的字符
                 continue;
             }
 
-            if (c[i] == ' ')
+            if (c[i] == ' ') {
-            {
                 c[i] = '\u3000';
-            }
+            } else if (c[i] < '\177') {
-            else if (c[i] < '\177')
-            {
                 c[i] = (char) (c[i] + 65248);
 
             }
@@ -921,8 +784,7 @@ public class Convert
      * @param input String.
      * @return 半角字符串
      */
-    public static String toDBC(String input)
+    public static String toDBC(String input) {
-    {
         return toDBC(input, null);
     }
 
@@ -933,23 +795,17 @@ public class Convert
      * @param notConvertSet 不替换的字符集合
      * @return 替换后的字符
      */
-    public static String toDBC(String text, Set<Character> notConvertSet)
+    public static String toDBC(String text, Set<Character> notConvertSet) {
-    {
         char c[] = text.toCharArray();
-        for (int i = 0; i < c.length; i++)
+        for (int i = 0; i < c.length; i++) {
-        {
+            if (null != notConvertSet && notConvertSet.contains(c[i])) {
-            if (null != notConvertSet && notConvertSet.contains(c[i]))
-            {
                 // 跳过不替换的字符
                 continue;
             }
 
-            if (c[i] == '\u3000')
+            if (c[i] == '\u3000') {
-            {
                 c[i] = ' ';
-            }
+            } else if (c[i] > '\uFF00' && c[i] < '\uFF5F') {
-            else if (c[i] > '\uFF00' && c[i] < '\uFF5F')
-            {
                 c[i] = (char) (c[i] - 65248);
             }
         }
@@ -964,8 +820,7 @@ public class Convert
      * @param n 数字
      * @return 中文大写数字
      */
-    public static String digitUppercase(double n)
+    public static String digitUppercase(double n) {
-    {
         String[] fraction = {"角", "分"};
         String[] digit = {"零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖"};
         String[][] unit = {{"元", "万", "亿"}, {"", "拾", "佰", "仟"}};
@@ -974,21 +829,17 @@ public class Convert
         n = Math.abs(n);
 
         String s = "";
-        for (int i = 0; i < fraction.length; i++)
+        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)
+        if (s.length() < 1) {
-        {
             s = "整";
         }
         int integerPart = (int) Math.floor(n);
 
-        for (int i = 0; i < unit[0].length && integerPart > 0; i++)
+        for (int i = 0; i < unit[0].length && integerPart > 0; i++) {
-        {
             String p = "";
-            for (int j = 0; j < unit[1].length && n > 0; j++)
+            for (int j = 0; j < unit[1].length && n > 0; j++) {
-            {
                 p = digit[integerPart % 10] + unit[1][j] + p;
                 integerPart = integerPart / 10;
             }

hchyun/hchyun-common/src/main/java/com/hchyun/common/enums/BusinessStatus.java

@@ -4,10 +4,8 @@ package com.hchyun.common.enums;
  * 操作状态
  *
  * @author hchyun
- *
  */
-public enum BusinessStatus
+public enum BusinessStatus {
-{
     /**
      * 成功
      */

hchyun/hchyun-common/src/main/java/com/hchyun/common/enums/BusinessType.java

@@ -5,8 +5,7 @@ package com.hchyun.common.enums;
  *
  * @author hchyun
  */
-public enum BusinessType
+public enum BusinessType {
-{
     /**
      * 其它
      */

hchyun/hchyun-common/src/main/java/com/hchyun/common/enums/DataSourceType.java

@@ -5,8 +5,7 @@ package com.hchyun.common.enums;
  *
  * @author hchyun
  */
-public enum DataSourceType
+public enum DataSourceType {
-{
     /**
      * 主库
      */

hchyun/hchyun-common/src/main/java/com/hchyun/common/enums/HttpMethod.java

@@ -2,6 +2,7 @@ package com.hchyun.common.enums;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import org.springframework.lang.Nullable;
 
 /**
@@ -9,28 +10,23 @@ import org.springframework.lang.Nullable;
  *
  * @author hchyun
  */
-public enum HttpMethod
+public enum HttpMethod {
-{
     GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS, TRACE;
 
     private static final Map<String, HttpMethod> mappings = new HashMap<>(16);
 
-    static
+    static {
-    {
+        for (HttpMethod httpMethod : values()) {
-        for (HttpMethod httpMethod : values())
-        {
             mappings.put(httpMethod.name(), httpMethod);
         }
     }
 
     @Nullable
-    public static HttpMethod resolve(@Nullable String method)
+    public static HttpMethod resolve(@Nullable String method) {
-    {
         return (method != null ? mappings.get(method) : null);
     }
 
-    public boolean matches(String method)
+    public boolean matches(String method) {
-    {
         return (this == resolve(method));
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/enums/OperatorType.java

@@ -5,8 +5,7 @@ package com.hchyun.common.enums;
  *
  * @author hchyun
  */
-public enum OperatorType
+public enum OperatorType {
-{
     /**
      * 其它
      */

hchyun/hchyun-common/src/main/java/com/hchyun/common/enums/UserStatus.java

@@ -5,26 +5,22 @@ package com.hchyun.common.enums;
  *
  * @author hchyun
  */
-public enum UserStatus
+public enum UserStatus {
-{
     OK("0", "正常"), DISABLE("1", "停用"), DELETED("2", "删除");
 
     private final String code;
     private final String info;
 
-    UserStatus(String code, String info)
+    UserStatus(String code, String info) {
-    {
         this.code = code;
         this.info = info;
     }
 
-    public String getCode()
+    public String getCode() {
-    {
         return code;
     }
 
-    public String getInfo()
+    public String getInfo() {
-    {
         return info;
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/BaseException.java

@@ -8,8 +8,7 @@ import com.hchyun.common.utils.StringUtils;
  *
  * @author hchyun
  */
-public class BaseException extends RuntimeException
+public class BaseException extends RuntimeException {
-{
 
 
     /**
@@ -32,66 +31,54 @@ public class BaseException extends RuntimeException
      */
     private String defaultMessage;
 
-    public BaseException(String module, String code, Object[] args, String defaultMessage)
+    public BaseException(String module, String code, Object[] args, String defaultMessage) {
-    {
         this.module = module;
         this.code = code;
         this.args = args;
         this.defaultMessage = defaultMessage;
     }
 
-    public BaseException(String module, String code, Object[] args)
+    public BaseException(String module, String code, Object[] args) {
-    {
         this(module, code, args, null);
     }
 
-    public BaseException(String module, String defaultMessage)
+    public BaseException(String module, String defaultMessage) {
-    {
         this(module, null, null, defaultMessage);
     }
 
-    public BaseException(String code, Object[] args)
+    public BaseException(String code, Object[] args) {
-    {
         this(null, code, args, null);
     }
 
-    public BaseException(String defaultMessage)
+    public BaseException(String defaultMessage) {
-    {
         this(null, null, null, defaultMessage);
     }
 
     @Override
-    public String getMessage()
+    public String getMessage() {
-    {
         String message = null;
-        if (!StringUtils.isEmpty(code))
+        if (!StringUtils.isEmpty(code)) {
-        {
             message = MessageUtils.message(code, args);
         }
-        if (message == null)
+        if (message == null) {
-        {
             message = defaultMessage;
         }
         return message;
     }
 
-    public String getModule()
+    public String getModule() {
-    {
         return module;
     }
 
-    public String getCode()
+    public String getCode() {
-    {
         return code;
     }
 
-    public Object[] getArgs()
+    public Object[] getArgs() {
-    {
         return args;
     }
 
-    public String getDefaultMessage()
+    public String getDefaultMessage() {
-    {
         return defaultMessage;
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/CustomException.java

@@ -5,39 +5,33 @@ package com.hchyun.common.exception;
  *
  * @author hchyun
  */
-public class CustomException extends RuntimeException
+public class CustomException extends RuntimeException {
-{
 
 
     private Integer code;
 
     private String message;
 
-    public CustomException(String message)
+    public CustomException(String message) {
-    {
         this.message = message;
     }
 
-    public CustomException(String message, Integer code)
+    public CustomException(String message, Integer code) {
-    {
         this.message = message;
         this.code = code;
     }
 
-    public CustomException(String message, Throwable e)
+    public CustomException(String message, Throwable e) {
-    {
         super(message, e);
         this.message = message;
     }
 
     @Override
-    public String getMessage()
+    public String getMessage() {
-    {
         return message;
     }
 
-    public Integer getCode()
+    public Integer getCode() {
-    {
         return code;
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/DemoModeException.java

@@ -5,11 +5,9 @@ package com.hchyun.common.exception;
  *
  * @author hchyun
  */
-public class DemoModeException extends RuntimeException
+public class DemoModeException extends RuntimeException {
-{
 
 
-    public DemoModeException()
+    public DemoModeException() {
-    {
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/UtilException.java

@@ -5,22 +5,18 @@ package com.hchyun.common.exception;
  *
  * @author hchyun
  */
-public class UtilException extends RuntimeException
+public class UtilException extends RuntimeException {
-{
     private static final long serialVersionUID = 8247610319171014183L;
 
-    public UtilException(Throwable e)
+    public UtilException(Throwable e) {
-    {
         super(e.getMessage(), e);
     }
 
-    public UtilException(String message)
+    public UtilException(String message) {
-    {
         super(message);
     }
 
-    public UtilException(String message, Throwable throwable)
+    public UtilException(String message, Throwable throwable) {
-    {
         super(message, throwable);
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/file/FileException.java

@@ -7,12 +7,10 @@ import com.hchyun.common.exception.BaseException;
  *
  * @author hchyun
  */
-public class FileException extends BaseException
+public class FileException extends BaseException {
-{
 
 
-    public FileException(String code, Object[] args)
+    public FileException(String code, Object[] args) {
-    {
         super("file", code, args, null);
     }
 

hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/file/FileNameLengthLimitExceededException.java

@@ -5,12 +5,10 @@ package com.hchyun.common.exception.file;
  *
  * @author hchyun
  */
-public class FileNameLengthLimitExceededException extends FileException
+public class FileNameLengthLimitExceededException extends FileException {
-{
 
 
-    public FileNameLengthLimitExceededException(int defaultFileNameLength)
+    public FileNameLengthLimitExceededException(int defaultFileNameLength) {
-    {
         super("upload.filename.exceed.length", new Object[]{defaultFileNameLength});
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/file/FileSizeLimitExceededException.java

@@ -5,12 +5,10 @@ package com.hchyun.common.exception.file;
  *
  * @author hchyun
  */
-public class FileSizeLimitExceededException extends FileException
+public class FileSizeLimitExceededException extends FileException {
-{
 
 
-    public FileSizeLimitExceededException(long defaultMaxSize)
+    public FileSizeLimitExceededException(long defaultMaxSize) {
-    {
         super("upload.exceed.maxSize", new Object[]{defaultMaxSize});
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/file/InvalidExtensionException.java

@@ -1,6 +1,7 @@
 package com.hchyun.common.exception.file;
 
 import java.util.Arrays;
+
 import org.apache.commons.fileupload.FileUploadException;
 
 /**
@@ -8,63 +9,52 @@ import org.apache.commons.fileupload.FileUploadException;
  *
  * @author hchyun
  */
-public class InvalidExtensionException extends FileUploadException
+public class InvalidExtensionException extends FileUploadException {
-{
 
 
     private String[] allowedExtension;
     private String extension;
     private String filename;
 
-    public InvalidExtensionException(String[] allowedExtension, String extension, String filename)
+    public InvalidExtensionException(String[] allowedExtension, String extension, String filename) {
-    {
         super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]");
         this.allowedExtension = allowedExtension;
         this.extension = extension;
         this.filename = filename;
     }
 
-    public String[] getAllowedExtension()
+    public String[] getAllowedExtension() {
-    {
         return allowedExtension;
     }
 
-    public String getExtension()
+    public String getExtension() {
-    {
         return extension;
     }
 
-    public String getFilename()
+    public String getFilename() {
-    {
         return filename;
     }
 
-    public static class InvalidImageExtensionException extends InvalidExtensionException
+    public static class InvalidImageExtensionException extends InvalidExtensionException {
-    {
 
 
-        public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename)
+        public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename) {
-        {
             super(allowedExtension, extension, filename);
         }
     }
 
-    public static class InvalidFlashExtensionException extends InvalidExtensionException
+    public static class InvalidFlashExtensionException extends InvalidExtensionException {
-    {
 
 
-        public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename)
+        public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename) {
-        {
             super(allowedExtension, extension, filename);
         }
     }
 
-    public static class InvalidMediaExtensionException extends InvalidExtensionException
+    public static class InvalidMediaExtensionException extends InvalidExtensionException {
-    {
 
 
-        public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename)
+        public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename) {
-        {
             super(allowedExtension, extension, filename);
         }
     }

hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/job/TaskException.java

@@ -5,30 +5,25 @@ package com.hchyun.common.exception.job;
  *
  * @author hchyun
  */
-public class TaskException extends Exception
+public class TaskException extends Exception {
-{
 
 
     private Code code;
 
-    public TaskException(String msg, Code code)
+    public TaskException(String msg, Code code) {
-    {
         this(msg, code, null);
     }
 
-    public TaskException(String msg, Code code, Exception nestedEx)
+    public TaskException(String msg, Code code, Exception nestedEx) {
-    {
         super(msg, nestedEx);
         this.code = code;
     }
 
-    public Code getCode()
+    public Code getCode() {
-    {
         return code;
     }
 
-    public enum Code
+    public enum Code {
-    {
         TASK_EXISTS, NO_TASK_EXISTS, TASK_ALREADY_STARTED, UNKNOWN, CONFIG_ERROR, TASK_NODE_NOT_AVAILABLE
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/user/CaptchaException.java

@@ -5,12 +5,10 @@ package com.hchyun.common.exception.user;
  *
  * @author hchyun
  */
-public class CaptchaException extends UserException
+public class CaptchaException extends UserException {
-{
 
 
-    public CaptchaException()
+    public CaptchaException() {
-    {
         super("user.jcaptcha.error", null);
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/user/CaptchaExpireException.java

@@ -5,12 +5,10 @@ package com.hchyun.common.exception.user;
  *
  * @author hchyun
  */
-public class CaptchaExpireException extends UserException
+public class CaptchaExpireException extends UserException {
-{
 
 
-    public CaptchaExpireException()
+    public CaptchaExpireException() {
-    {
         super("user.jcaptcha.expire", null);
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/user/UserException.java

@@ -7,12 +7,10 @@ import com.hchyun.common.exception.BaseException;
  *
  * @author hchyun
  */
-public class UserException extends BaseException
+public class UserException extends BaseException {
-{
 
 
-    public UserException(String code, Object[] args)
+    public UserException(String code, Object[] args) {
-    {
         super("user", code, args, null);
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/user/UserPasswordNotMatchException.java

@@ -5,12 +5,10 @@ package com.hchyun.common.exception.user;
  *
  * @author hchyun
  */
-public class UserPasswordNotMatchException extends UserException
+public class UserPasswordNotMatchException extends UserException {
-{
 
 
-    public UserPasswordNotMatchException()
+    public UserPasswordNotMatchException() {
-    {
         super("user.password.not.match", null);
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/filter/RepeatableFilter.java

@@ -8,6 +8,7 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.http.MediaType;
 import com.hchyun.common.utils.StringUtils;
 
@@ -16,37 +17,29 @@ import com.hchyun.common.utils.StringUtils;
  *
  * @author hchyun
  */
-public class RepeatableFilter implements Filter
+public class RepeatableFilter implements Filter {
-{
     @Override
-    public void init(FilterConfig filterConfig) throws ServletException
+    public void init(FilterConfig filterConfig) throws ServletException {
-    {
 
     }
 
     @Override
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-            throws IOException, ServletException
+            throws IOException, ServletException {
-    {
         ServletRequest requestWrapper = null;
         if (request instanceof HttpServletRequest && StringUtils.equalsAnyIgnoreCase(request.getContentType(),
-                MediaType.APPLICATION_JSON_VALUE, MediaType.APPLICATION_JSON_UTF8_VALUE))
+                MediaType.APPLICATION_JSON_VALUE, MediaType.APPLICATION_JSON_UTF8_VALUE)) {
-        {
             requestWrapper = new RepeatedlyRequestWrapper((HttpServletRequest) request, response);
         }
-        if (null == requestWrapper)
+        if (null == requestWrapper) {
-        {
             chain.doFilter(request, response);
-        }
+        } else {
-        else
-        {
             chain.doFilter(requestWrapper, response);
         }
     }
 
     @Override
-    public void destroy()
+    public void destroy() {
-    {
 
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/filter/RepeatedlyRequestWrapper.java

@@ -9,6 +9,7 @@ import javax.servlet.ServletInputStream;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
+
 import com.hchyun.common.utils.http.HttpHelper;
 
 /**
@@ -16,12 +17,10 @@ import com.hchyun.common.utils.http.HttpHelper;
  *
  * @author hchyun
  */
-public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper
+public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper {
-{
     private final byte[] body;
 
-    public RepeatedlyRequestWrapper(HttpServletRequest request, ServletResponse response) throws IOException
+    public RepeatedlyRequestWrapper(HttpServletRequest request, ServletResponse response) throws IOException {
-    {
         super(request);
         request.setCharacterEncoding("UTF-8");
         response.setCharacterEncoding("UTF-8");
@@ -30,41 +29,34 @@ public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper
     }
 
     @Override
-    public BufferedReader getReader() throws IOException
+    public BufferedReader getReader() throws IOException {
-    {
         return new BufferedReader(new InputStreamReader(getInputStream()));
     }
 
     @Override
-    public ServletInputStream getInputStream() throws IOException
+    public ServletInputStream getInputStream() throws IOException {
-    {
 
         final ByteArrayInputStream bais = new ByteArrayInputStream(body);
 
-        return new ServletInputStream()
+        return new ServletInputStream() {
-        {
 
             @Override
-            public int read() throws IOException
+            public int read() throws IOException {
-            {
                 return bais.read();
             }
 
             @Override
-            public boolean isFinished()
+            public boolean isFinished() {
-            {
                 return false;
             }
 
             @Override
-            public boolean isReady()
+            public boolean isReady() {
-            {
                 return false;
             }
 
             @Override
-            public void setReadListener(ReadListener readListener)
+            public void setReadListener(ReadListener readListener) {
-            {
 
             }
         };

hchyun/hchyun-common/src/main/java/com/hchyun/common/filter/XssFilter.java

@@ -13,6 +13,7 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import com.hchyun.common.utils.StringUtils;
 
 /**
@@ -20,8 +21,7 @@ import com.hchyun.common.utils.StringUtils;
  *
  * @author hchyun
  */
-public class XssFilter implements Filter
+public class XssFilter implements Filter {
-{
     /**
      * 排除链接
      */
@@ -33,32 +33,26 @@ public class XssFilter implements Filter
     public boolean enabled = false;
 
     @Override
-    public void init(FilterConfig filterConfig) throws ServletException
+    public void init(FilterConfig filterConfig) throws ServletException {
-    {
         String tempExcludes = filterConfig.getInitParameter("excludes");
         String tempEnabled = filterConfig.getInitParameter("enabled");
-        if (StringUtils.isNotEmpty(tempExcludes))
+        if (StringUtils.isNotEmpty(tempExcludes)) {
-        {
             String[] url = tempExcludes.split(",");
-            for (int i = 0; url != null && i < url.length; i++)
+            for (int i = 0; url != null && i < url.length; i++) {
-            {
                 excludes.add(url[i]);
             }
         }
-        if (StringUtils.isNotEmpty(tempEnabled))
+        if (StringUtils.isNotEmpty(tempEnabled)) {
-        {
             enabled = Boolean.valueOf(tempEnabled);
         }
     }
 
     @Override
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-            throws IOException, ServletException
+            throws IOException, ServletException {
-    {
         HttpServletRequest req = (HttpServletRequest) request;
         HttpServletResponse resp = (HttpServletResponse) response;
-        if (handleExcludeURL(req, resp))
+        if (handleExcludeURL(req, resp)) {
-        {
             chain.doFilter(request, response);
             return;
         }
@@ -66,23 +60,18 @@ public class XssFilter implements Filter
         chain.doFilter(xssRequest, response);
     }
 
-    private boolean handleExcludeURL(HttpServletRequest request, HttpServletResponse response)
+    private boolean handleExcludeURL(HttpServletRequest request, HttpServletResponse response) {
-    {
+        if (!enabled) {
-        if (!enabled)
-        {
             return true;
         }
-        if (excludes == null || excludes.isEmpty())
+        if (excludes == null || excludes.isEmpty()) {
-        {
             return false;
         }
         String url = request.getServletPath();
-        for (String pattern : excludes)
+        for (String pattern : excludes) {
-        {
             Pattern p = Pattern.compile("^" + pattern);
             Matcher m = p.matcher(url);
-            if (m.find())
+            if (m.find()) {
-            {
                 return true;
             }
         }
@@ -90,8 +79,7 @@ public class XssFilter implements Filter
     }
 
     @Override
-    public void destroy()
+    public void destroy() {
-    {
 
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/filter/XssHttpServletRequestWrapper.java

@@ -6,6 +6,7 @@ import javax.servlet.ReadListener;
 import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
+
 import org.apache.commons.io.IOUtils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -17,26 +18,21 @@ import com.hchyun.common.utils.html.EscapeUtil;
  *
  * @author hchyun
  */
-public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
+public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
-{
     /**
      * @param request
      */
-    public XssHttpServletRequestWrapper(HttpServletRequest request)
+    public XssHttpServletRequestWrapper(HttpServletRequest request) {
-    {
         super(request);
     }
 
     @Override
-    public String[] getParameterValues(String name)
+    public String[] getParameterValues(String name) {
-    {
         String[] values = super.getParameterValues(name);
-        if (values != null)
+        if (values != null) {
-        {
             int length = values.length;
             String[] escapseValues = new String[length];
-            for (int i = 0; i < length; i++)
+            for (int i = 0; i < length; i++) {
-            {
                 // 防xss攻击和过滤前后空格
                 escapseValues[i] = EscapeUtil.clean(values[i]).trim();
             }
@@ -46,46 +42,38 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
     }
 
     @Override
-    public ServletInputStream getInputStream() throws IOException
+    public ServletInputStream getInputStream() throws IOException {
-    {
         // 非json类型，直接返回
-        if (!isJsonRequest())
+        if (!isJsonRequest()) {
-        {
             return super.getInputStream();
         }
 
         // 为空，直接返回
         String json = IOUtils.toString(super.getInputStream(), "utf-8");
-        if (StringUtils.isEmpty(json))
+        if (StringUtils.isEmpty(json)) {
-        {
             return super.getInputStream();
         }
 
         // xss过滤
         json = EscapeUtil.clean(json).trim();
         final ByteArrayInputStream bis = new ByteArrayInputStream(json.getBytes("utf-8"));
-        return new ServletInputStream()
+        return new ServletInputStream() {
-        {
             @Override
-            public boolean isFinished()
+            public boolean isFinished() {
-            {
                 return true;
             }
 
             @Override
-            public boolean isReady()
+            public boolean isReady() {
-            {
                 return true;
             }
 
             @Override
-            public void setReadListener(ReadListener readListener)
+            public void setReadListener(ReadListener readListener) {
-            {
             }
 
             @Override
-            public int read() throws IOException
+            public int read() throws IOException {
-            {
                 return bis.read();
             }
         };
@@ -96,8 +84,7 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
      *
      * @param request
      */
-    public boolean isJsonRequest()
+    public boolean isJsonRequest() {
-    {
         String header = super.getHeader(HttpHeaders.CONTENT_TYPE);
         return MediaType.APPLICATION_JSON_VALUE.equalsIgnoreCase(header)
                 || MediaType.APPLICATION_JSON_UTF8_VALUE.equalsIgnoreCase(header);

hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/Arith.java

@@ -8,25 +8,27 @@ import java.math.RoundingMode;
  *
  * @author hchyun
  */
-public class Arith
+public class Arith {
-{
 
-    /** 默认除法运算精度 */
+    /**
+     * 默认除法运算精度
+     */
     private static final int DEF_DIV_SCALE = 10;
 
-    /** 这个类不能实例化 */
+    /**
-    private Arith()
+     * 这个类不能实例化
-    {
+     */
+    private Arith() {
     }
 
     /**
      * 提供精确的加法运算。
+     *
      * @param v1 被加数
      * @param v2 加数
      * @return 两个参数的和
      */
-    public static double add(double v1, double v2)
+    public static double add(double v1, double v2) {
-    {
         BigDecimal b1 = new BigDecimal(Double.toString(v1));
         BigDecimal b2 = new BigDecimal(Double.toString(v2));
         return b1.add(b2).doubleValue();
@@ -34,12 +36,12 @@ public class Arith
 
     /**
      * 提供精确的减法运算。
+     *
      * @param v1 被减数
      * @param v2 减数
      * @return 两个参数的差
      */
-    public static double sub(double v1, double v2)
+    public static double sub(double v1, double v2) {
-    {
         BigDecimal b1 = new BigDecimal(Double.toString(v1));
         BigDecimal b2 = new BigDecimal(Double.toString(v2));
         return b1.subtract(b2).doubleValue();
@@ -47,12 +49,12 @@ public class Arith
 
     /**
      * 提供精确的乘法运算。
+     *
      * @param v1 被乘数
      * @param v2 乘数
      * @return 两个参数的积
      */
-    public static double mul(double v1, double v2)
+    public static double mul(double v1, double v2) {
-    {
         BigDecimal b1 = new BigDecimal(Double.toString(v1));
         BigDecimal b2 = new BigDecimal(Double.toString(v2));
         return b1.multiply(b2).doubleValue();
@@ -61,34 +63,32 @@ public class Arith
     /**
      * 提供（相对）精确的除法运算，当发生除不尽的情况时，精确到
      * 小数点以后10位，以后的数字四舍五入。
+     *
      * @param v1 被除数
      * @param v2 除数
      * @return 两个参数的商
      */
-    public static double div(double v1, double v2)
+    public static double div(double v1, double v2) {
-    {
         return div(v1, v2, DEF_DIV_SCALE);
     }
 
     /**
      * 提供（相对）精确的除法运算。当发生除不尽的情况时，由scale参数指
      * 定精度，以后的数字四舍五入。
+     *
      * @param v1    被除数
      * @param v2    除数
      * @param scale 表示表示需要精确到小数点以后几位。
      * @return 两个参数的商
      */
-    public static double div(double v1, double v2, int scale)
+    public static double div(double v1, double v2, int scale) {
-    {
+        if (scale < 0) {
-        if (scale < 0)
-        {
             throw new IllegalArgumentException(
                     "The scale must be a positive integer or zero");
         }
         BigDecimal b1 = new BigDecimal(Double.toString(v1));
         BigDecimal b2 = new BigDecimal(Double.toString(v2));
-        if (b1.compareTo(BigDecimal.ZERO) == 0)
+        if (b1.compareTo(BigDecimal.ZERO) == 0) {
-        {
             return BigDecimal.ZERO.doubleValue();
         }
         return b1.divide(b2, scale, RoundingMode.HALF_UP).doubleValue();
@@ -96,14 +96,13 @@ public class Arith
 
     /**
      * 提供精确的小数位四舍五入处理。
+     *
      * @param v     需要四舍五入的数字
      * @param scale 小数点后保留几位
      * @return 四舍五入后的结果
      */
-    public static double round(double v, int scale)
+    public static double round(double v, int scale) {
-    {
+        if (scale < 0) {
-        if (scale < 0)
-        {
             throw new IllegalArgumentException(
                     "The scale must be a positive integer or zero");
         }

hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/DateUtils.java

@@ -45,6 +45,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
     public static String getDate() {
         return dateTimeNow(YYYY_MM_DD);
     }
+
     public static String getDate(String time) {
         try {
             return new SimpleDateFormat(YYYY_MM_DD).parse(time).toString();

hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/DictUtils.java

@@ -2,6 +2,7 @@ package com.hchyun.common.utils;
 
 import java.util.Collection;
 import java.util.List;
+
 import com.hchyun.common.constant.Constants;
 import com.hchyun.common.core.entity.entity.SysDictData;
 import com.hchyun.common.core.redis.RedisCache;
@@ -12,8 +13,7 @@ import com.hchyun.common.utils.spring.SpringUtils;
  *
  * @author hchyun
  */
-public class DictUtils
+public class DictUtils {
-{
     /**
      * 分隔符
      */
@@ -25,8 +25,7 @@ public class DictUtils
      * @param key       参数键
      * @param dictDatas 字典数据列表
      */
-    public static void setDictCache(String key, List<SysDictData> dictDatas)
+    public static void setDictCache(String key, List<SysDictData> dictDatas) {
-    {
         SpringUtils.getBean(RedisCache.class).setCacheObject(getCacheKey(key), dictDatas);
     }
 
@@ -36,11 +35,9 @@ public class DictUtils
      * @param key 参数键
      * @return dictDatas 字典数据列表
      */
-    public static List<SysDictData> getDictCache(String key)
+    public static List<SysDictData> getDictCache(String key) {
-    {
         Object cacheObj = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key));
-        if (StringUtils.isNotNull(cacheObj))
+        if (StringUtils.isNotNull(cacheObj)) {
-        {
             List<SysDictData> dictDatas = StringUtils.cast(cacheObj);
             return dictDatas;
         }
@@ -54,8 +51,7 @@ public class DictUtils
      * @param dictValue 字典值
      * @return 字典标签
      */
-    public static String getDictLabel(String dictType, String dictValue)
+    public static String getDictLabel(String dictType, String dictValue) {
-    {
         return getDictLabel(dictType, dictValue, SEPARATOR);
     }
 
@@ -66,8 +62,7 @@ public class DictUtils
      * @param dictLabel 字典标签
      * @return 字典值
      */
-    public static String getDictValue(String dictType, String dictLabel)
+    public static String getDictValue(String dictType, String dictLabel) {
-    {
         return getDictValue(dictType, dictLabel, SEPARATOR);
     }
 
@@ -79,31 +74,22 @@ public class DictUtils
      * @param separator 分隔符
      * @return 字典标签
      */
-    public static String getDictLabel(String dictType, String dictValue, String separator)
+    public static String getDictLabel(String dictType, String dictValue, String separator) {
-    {
         StringBuilder propertyString = new StringBuilder();
         List<SysDictData> datas = getDictCache(dictType);
 
-        if (StringUtils.containsAny(separator, dictValue) && StringUtils.isNotEmpty(datas))
+        if (StringUtils.containsAny(separator, dictValue) && StringUtils.isNotEmpty(datas)) {
-        {
+            for (SysDictData dict : datas) {
-            for (SysDictData dict : datas)
+                for (String value : dictValue.split(separator)) {
-            {
+                    if (value.equals(dict.getDictValue())) {
-                for (String value : dictValue.split(separator))
-                {
-                    if (value.equals(dict.getDictValue()))
-                    {
                         propertyString.append(dict.getDictLabel() + separator);
                         break;
                     }
                 }
             }
-        }
+        } else {
-        else
+            for (SysDictData dict : datas) {
-        {
+                if (dictValue.equals(dict.getDictValue())) {
-            for (SysDictData dict : datas)
-            {
-                if (dictValue.equals(dict.getDictValue()))
-                {
                     return dict.getDictLabel();
                 }
             }
@@ -119,31 +105,22 @@ public class DictUtils
      * @param separator 分隔符
      * @return 字典值
      */
-    public static String getDictValue(String dictType, String dictLabel, String separator)
+    public static String getDictValue(String dictType, String dictLabel, String separator) {
-    {
         StringBuilder propertyString = new StringBuilder();
         List<SysDictData> datas = getDictCache(dictType);
 
-        if (StringUtils.containsAny(separator, dictLabel) && StringUtils.isNotEmpty(datas))
+        if (StringUtils.containsAny(separator, dictLabel) && StringUtils.isNotEmpty(datas)) {
-        {
+            for (SysDictData dict : datas) {
-            for (SysDictData dict : datas)
+                for (String label : dictLabel.split(separator)) {
-            {
+                    if (label.equals(dict.getDictLabel())) {
-                for (String label : dictLabel.split(separator))
-                {
-                    if (label.equals(dict.getDictLabel()))
-                    {
                         propertyString.append(dict.getDictValue() + separator);
                         break;
                     }
                 }
             }
-        }
+        } else {
-        else
+            for (SysDictData dict : datas) {
-        {
+                if (dictLabel.equals(dict.getDictLabel())) {
-            for (SysDictData dict : datas)
-            {
-                if (dictLabel.equals(dict.getDictLabel()))
-                {
                     return dict.getDictValue();
                 }
             }
@@ -154,8 +131,7 @@ public class DictUtils
     /**
      * 清空字典缓存
      */
-    public static void clearDictCache()
+    public static void clearDictCache() {
-    {
         Collection<String> keys = SpringUtils.getBean(RedisCache.class).keys(Constants.SYS_DICT_KEY + "*");
         SpringUtils.getBean(RedisCache.class).deleteObject(keys);
     }
@@ -166,8 +142,7 @@ public class DictUtils
      * @param configKey 参数键
      * @return 缓存键key
      */
-    public static String getCacheKey(String configKey)
+    public static String getCacheKey(String configKey) {
-    {
         return Constants.SYS_DICT_KEY + configKey;
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/ExceptionUtil.java

@@ -2,6 +2,7 @@ package com.hchyun.common.utils;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
+
 import org.apache.commons.lang3.exception.ExceptionUtils;
 
 /**
@@ -9,30 +10,25 @@ import org.apache.commons.lang3.exception.ExceptionUtils;
  *
  * @author hchyun
  */
-public class ExceptionUtil
+public class ExceptionUtil {
-{
     /**
      * 获取exception的详细错误信息。
      */
-    public static String getExceptionMessage(Throwable e)
+    public static String getExceptionMessage(Throwable e) {
-    {
         StringWriter sw = new StringWriter();
         e.printStackTrace(new PrintWriter(sw, true));
         String str = sw.toString();
         return str;
     }
 
-    public static String getRootErrorMseeage(Exception e)
+    public static String getRootErrorMseeage(Exception e) {
-    {
         Throwable root = ExceptionUtils.getRootCause(e);
         root = (root == null ? e : root);
-        if (root == null)
+        if (root == null) {
-        {
             return "";
         }
         String msg = root.getMessage();
-        if (msg == null)
+        if (msg == null) {
-        {
             return "null";
         }
         return StringUtils.defaultString(msg);

hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/LogUtils.java

@@ -5,12 +5,9 @@ package com.hchyun.common.utils;
  *
  * @author hchyun
  */
-public class LogUtils
+public class LogUtils {
-{
+    public static String getBlock(Object msg) {
-    public static String getBlock(Object msg)
+        if (msg == null) {
-    {
-        if (msg == null)
-        {
             msg = "";
         }
         return "[" + msg.toString() + "]";

hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/MessageUtils.java

@@ -9,8 +9,7 @@ import com.hchyun.common.utils.spring.SpringUtils;
  *
  * @author hchyun
  */
-public class MessageUtils
+public class MessageUtils {
-{
     /**
      * 根据消息键和参数 获取消息 委托给spring messageSource
      *
@@ -18,8 +17,7 @@ public class MessageUtils
      * @param args 参数
      * @return 获取国际化翻译值
      */
-    public static String message(String code, Object... args)
+    public static String message(String code, Object... args) {
-    {
         MessageSource messageSource = SpringUtils.getBean(MessageSource.class);
         return messageSource.getMessage(code, args, LocaleContextHolder.getLocale());
     }

hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/ServletUtils.java

@@ -4,6 +4,7 @@ import java.io.IOException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -14,66 +15,57 @@ import com.hchyun.common.core.text.Convert;
  *
  * @author hchyun
  */
-public class ServletUtils
+public class ServletUtils {
-{
     /**
      * 获取String参数
      */
-    public static String getParameter(String name)
+    public static String getParameter(String name) {
-    {
         return getRequest().getParameter(name);
     }
 
     /**
      * 获取String参数
      */
-    public static String getParameter(String name, String defaultValue)
+    public static String getParameter(String name, String defaultValue) {
-    {
         return Convert.toStr(getRequest().getParameter(name), defaultValue);
     }
 
     /**
      * 获取Integer参数
      */
-    public static Integer getParameterToInt(String name)
+    public static Integer getParameterToInt(String name) {
-    {
         return Convert.toInt(getRequest().getParameter(name));
     }
 
     /**
      * 获取Integer参数
      */
-    public static Integer getParameterToInt(String name, Integer defaultValue)
+    public static Integer getParameterToInt(String name, Integer defaultValue) {
-    {
         return Convert.toInt(getRequest().getParameter(name), defaultValue);
     }
 
     /**
      * 获取request
      */
-    public static HttpServletRequest getRequest()
+    public static HttpServletRequest getRequest() {
-    {
         return getRequestAttributes().getRequest();
     }
 
     /**
      * 获取response
      */
-    public static HttpServletResponse getResponse()
+    public static HttpServletResponse getResponse() {
-    {
         return getRequestAttributes().getResponse();
     }
 
     /**
      * 获取session
      */
-    public static HttpSession getSession()
+    public static HttpSession getSession() {
-    {
         return getRequest().getSession();
     }
 
-    public static ServletRequestAttributes getRequestAttributes()
+    public static ServletRequestAttributes getRequestAttributes() {
-    {
         RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
         return (ServletRequestAttributes) attributes;
     }
@@ -85,17 +77,13 @@ public class ServletUtils
      * @param string   待渲染的字符串
      * @return null
      */
-    public static String renderString(HttpServletResponse response, String string)
+    public static String renderString(HttpServletResponse response, String string) {
-    {
+        try {
-        try
-        {
             response.setStatus(200);
             response.setContentType("application/json");
             response.setCharacterEncoding("utf-8");
             response.getWriter().print(string);
-        }
+        } catch (IOException e) {
-        catch (IOException e)
-        {
             e.printStackTrace();
         }
         return null;
@@ -106,29 +94,24 @@ public class ServletUtils
      *
      * @param request
      */
-    public static boolean isAjaxRequest(HttpServletRequest request)
+    public static boolean isAjaxRequest(HttpServletRequest request) {
-    {
         String accept = request.getHeader("accept");
-        if (accept != null && accept.indexOf("application/json") != -1)
+        if (accept != null && accept.indexOf("application/json") != -1) {
-        {
             return true;
         }
 
         String xRequestedWith = request.getHeader("X-Requested-With");
-        if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1)
+        if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1) {
-        {
             return true;
         }
 
         String uri = request.getRequestURI();
-        if (StringUtils.inStringIgnoreCase(uri, ".json", ".xml"))
+        if (StringUtils.inStringIgnoreCase(uri, ".json", ".xml")) {
-        {
             return true;
         }
 
         String ajax = request.getParameter("__ajax");
-        if (StringUtils.inStringIgnoreCase(ajax, "json", "xml"))
+        if (StringUtils.inStringIgnoreCase(ajax, "json", "xml")) {
-        {
             return true;
         }
         return false;

hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/StringUtils.java

@@ -394,6 +394,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
 
     /**
      * 分割sql字符串
+     *
      * @param str
      * @return
      */

hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/Threads.java

@@ -5,6 +5,7 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -13,21 +14,16 @@ import org.slf4j.LoggerFactory;
  *
  * @author hchyun
  */
-public class Threads
+public class Threads {
-{
     private static final Logger logger = LoggerFactory.getLogger(Threads.class);
 
     /**
      * sleep等待,单位为毫秒
      */
-    public static void sleep(long milliseconds)
+    public static void sleep(long milliseconds) {
-    {
+        try {
-        try
-        {
             Thread.sleep(milliseconds);
-        }
+        } catch (InterruptedException e) {
-        catch (InterruptedException e)
-        {
             return;
         }
     }
@@ -39,24 +35,17 @@ public class Threads
      * 如果仍人超時，則強制退出.
      * 另对在shutdown时线程本身被调用中断做了处理.
      */
-    public static void shutdownAndAwaitTermination(ExecutorService pool)
+    public static void shutdownAndAwaitTermination(ExecutorService pool) {
-    {
+        if (pool != null && !pool.isShutdown()) {
-        if (pool != null && !pool.isShutdown())
-        {
             pool.shutdown();
-            try
+            try {
-            {
+                if (!pool.awaitTermination(120, TimeUnit.SECONDS)) {
-                if (!pool.awaitTermination(120, TimeUnit.SECONDS))
-                {
                     pool.shutdownNow();
-                    if (!pool.awaitTermination(120, TimeUnit.SECONDS))
+                    if (!pool.awaitTermination(120, TimeUnit.SECONDS)) {
-                    {
                         logger.info("Pool did not terminate");
                     }
                 }
-            }
+            } catch (InterruptedException ie) {
-            catch (InterruptedException ie)
-            {
                 pool.shutdownNow();
                 Thread.currentThread().interrupt();
             }
@@ -66,33 +55,22 @@ public class Threads
     /**
      * 打印线程异常信息
      */
-    public static void printException(Runnable r, Throwable t)
+    public static void printException(Runnable r, Throwable t) {
-    {
+        if (t == null && r instanceof Future<?>) {
-        if (t == null && r instanceof Future<?>)
+            try {
-        {
-            try
-            {
                 Future<?> future = (Future<?>) r;
-                if (future.isDone())
+                if (future.isDone()) {
-                {
                     future.get();
                 }
-            }
+            } catch (CancellationException ce) {
-            catch (CancellationException ce)
-            {
                 t = ce;
-            }
+            } catch (ExecutionException ee) {
-            catch (ExecutionException ee)
-            {
                 t = ee.getCause();
-            }
+            } catch (InterruptedException ie) {
-            catch (InterruptedException ie)
-            {
                 Thread.currentThread().interrupt();
             }
         }
-        if (t != null)
+        if (t != null) {
-        {
             logger.error(t.getMessage(), t);
         }
     }

hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/VerifyCodeUtils.java

@@ -19,8 +19,7 @@ import javax.imageio.ImageIO;
  *
  * @author hchyun
  */
-public class VerifyCodeUtils
+public class VerifyCodeUtils {
-{
     // 使用到Algerian字体，系统里没有的话需要安装字体，字体只显示大写，去掉了1,0,i,o几个容易混淆的字符
     public static final String VERIFY_CODES = "123456789ABCDEFGHJKLMNPQRSTUVWXYZ";
 
@@ -32,8 +31,7 @@ public class VerifyCodeUtils
      * @param verifySize 验证码长度
      * @return
      */
-    public static String generateVerifyCode(int verifySize)
+    public static String generateVerifyCode(int verifySize) {
-    {
         return generateVerifyCode(verifySize, VERIFY_CODES);
     }
 
@@ -44,17 +42,14 @@ public class VerifyCodeUtils
      * @param sources    验证码字符源
      * @return
      */
-    public static String generateVerifyCode(int verifySize, String sources)
+    public static String generateVerifyCode(int verifySize, String sources) {
-    {
+        if (sources == null || sources.length() == 0) {
-        if (sources == null || sources.length() == 0)
-        {
             sources = VERIFY_CODES;
         }
         int codesLen = sources.length();
         Random rand = new Random(System.currentTimeMillis());
         StringBuilder verifyCode = new StringBuilder(verifySize);
-        for (int i = 0; i < verifySize; i++)
+        for (int i = 0; i < verifySize; i++) {
-        {
             verifyCode.append(sources.charAt(rand.nextInt(codesLen - 1)));
         }
         return verifyCode.toString();
@@ -69,8 +64,7 @@ public class VerifyCodeUtils
      * @param code
      * @throws IOException
      */
-    public static void outputImage(int w, int h, OutputStream os, String code) throws IOException
+    public static void outputImage(int w, int h, OutputStream os, String code) throws IOException {
-    {
         int verifySize = code.length();
         BufferedImage image = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
         Random rand = new Random();
@@ -80,8 +74,7 @@ public class VerifyCodeUtils
         Color[] colorSpaces = new Color[]{Color.WHITE, Color.CYAN, Color.GRAY, Color.LIGHT_GRAY, Color.MAGENTA,
                 Color.ORANGE, Color.PINK, Color.YELLOW};
         float[] fractions = new float[colors.length];
-        for (int i = 0; i < colors.length; i++)
+        for (int i = 0; i < colors.length; i++) {
-        {
             colors[i] = colorSpaces[rand.nextInt(colorSpaces.length)];
             fractions[i] = rand.nextFloat();
         }
@@ -97,8 +90,7 @@ public class VerifyCodeUtils
         // 绘制干扰线
         Random random = new Random();
         g2.setColor(getRandColor(160, 200));// 设置线条的颜色
-        for (int i = 0; i < 20; i++)
+        for (int i = 0; i < 20; i++) {
-        {
             int x = random.nextInt(w - 1);
             int y = random.nextInt(h - 1);
             int xl = random.nextInt(6) + 1;
@@ -109,8 +101,7 @@ public class VerifyCodeUtils
         // 添加噪点
         float yawpRate = 0.05f;// 噪声率
         int area = (int) (yawpRate * w * h);
-        for (int i = 0; i < area; i++)
+        for (int i = 0; i < area; i++) {
-        {
             int x = random.nextInt(w);
             int y = random.nextInt(h);
             int rgb = getRandomIntColor();
@@ -124,8 +115,7 @@ public class VerifyCodeUtils
         Font font = new Font("Algerian", Font.ITALIC, fontSize);
         g2.setFont(font);
         char[] chars = code.toCharArray();
-        for (int i = 0; i < verifySize; i++)
+        for (int i = 0; i < verifySize; i++) {
-        {
             AffineTransform affine = new AffineTransform();
             affine.setToRotation(Math.PI / 4 * rand.nextDouble() * (rand.nextBoolean() ? 1 : -1),
                     (w / verifySize) * i + fontSize / 2, h / 2);
@@ -137,8 +127,7 @@ public class VerifyCodeUtils
         ImageIO.write(image, "jpg", os);
     }
 
-    private static Color getRandColor(int fc, int bc)
+    private static Color getRandColor(int fc, int bc) {
-    {
         if (fc > 255) {
             fc = 255;
         }
@@ -151,36 +140,30 @@ public class VerifyCodeUtils
         return new Color(r, g, b);
     }
 
-    private static int getRandomIntColor()
+    private static int getRandomIntColor() {
-    {
         int[] rgb = getRandomRgb();
         int color = 0;
-        for (int c : rgb)
+        for (int c : rgb) {
-        {
             color = color << 8;
             color = color | c;
         }
         return color;
     }
 
-    private static int[] getRandomRgb()
+    private static int[] getRandomRgb() {
-    {
         int[] rgb = new int[3];
-        for (int i = 0; i < 3; i++)
+        for (int i = 0; i < 3; i++) {
-        {
             rgb[i] = random.nextInt(255);
         }
         return rgb;
     }
 
-    private static void shear(Graphics g, int w1, int h1, Color color)
+    private static void shear(Graphics g, int w1, int h1, Color color) {
-    {
         shearX(g, w1, h1, color);
         shearY(g, w1, h1, color);
     }
 
-    private static void shearX(Graphics g, int w1, int h1, Color color)
+    private static void shearX(Graphics g, int w1, int h1, Color color) {
-    {
 
         int period = random.nextInt(2);
 
@@ -188,13 +171,11 @@ public class VerifyCodeUtils
         int frames = 1;
         int phase = random.nextInt(2);
 
-        for (int i = 0; i < h1; i++)
+        for (int i = 0; i < h1; i++) {
-        {
             double d = (double) (period >> 1)
                     * Math.sin((double) i / (double) period + (6.2831853071795862D * (double) phase) / (double) frames);
             g.copyArea(0, i, w1, 1, (int) d, 0);
-            if (borderGap)
+            if (borderGap) {
-            {
                 g.setColor(color);
                 g.drawLine((int) d, i, 0, i);
                 g.drawLine((int) d + w1, i, w1, i);
@@ -203,21 +184,18 @@ public class VerifyCodeUtils
 
     }
 
-    private static void shearY(Graphics g, int w1, int h1, Color color)
+    private static void shearY(Graphics g, int w1, int h1, Color color) {
-    {
 
         int period = random.nextInt(40) + 10; // 50;
 
         boolean borderGap = true;
         int frames = 20;
         int phase = 7;
-        for (int i = 0; i < w1; i++)
+        for (int i = 0; i < w1; i++) {
-        {
             double d = (double) (period >> 1)
                     * Math.sin((double) i / (double) period + (6.2831853071795862D * (double) phase) / (double) frames);
             g.copyArea(i, 0, 1, h1, 0, (int) d);
-            if (borderGap)
+            if (borderGap) {
-            {
                 g.setColor(color);
                 g.drawLine(i, (int) d, i, 0);
                 g.drawLine(i, (int) d + h1, i, h1);

hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/bean/BeanUtils.java

@@ -11,15 +11,20 @@ import java.util.regex.Pattern;
  *
  * @author hchyun
  */
-public class BeanUtils extends org.springframework.beans.BeanUtils
+public class BeanUtils extends org.springframework.beans.BeanUtils {
-{
+    /**
-    /** Bean方法名中属性名开始的下标 */
+     * Bean方法名中属性名开始的下标
+     */
     private static final int BEAN_METHOD_PROP_INDEX = 3;
 
-    /** * 匹配getter方法的正则表达式 */
+    /**
+     * 匹配getter方法的正则表达式
+     */
     private static final Pattern GET_PATTERN = Pattern.compile("get(\\p{javaUpperCase}\\w*)");
 
-    /** * 匹配setter方法的正则表达式 */
+    /**
+     * 匹配setter方法的正则表达式
+     */
     private static final Pattern SET_PATTERN = Pattern.compile("set(\\p{javaUpperCase}\\w*)");
 
     /**
@@ -28,14 +33,10 @@ public class BeanUtils extends org.springframework.beans.BeanUtils
      * @param dest 目标对象
      * @param src  源对象
      */
-    public static void copyBeanProp(Object dest, Object src)
+    public static void copyBeanProp(Object dest, Object src) {
-    {
+        try {
-        try
-        {
             copyProperties(src, dest);
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             e.printStackTrace();
         }
     }
@@ -46,8 +47,7 @@ public class BeanUtils extends org.springframework.beans.BeanUtils
      * @param obj 对象
      * @return 对象的setter方法列表
      */
-    public static List<Method> getSetterMethods(Object obj)
+    public static List<Method> getSetterMethods(Object obj) {
-    {
         // setter方法列表
         List<Method> setterMethods = new ArrayList<Method>();
 
@@ -56,11 +56,9 @@ public class BeanUtils extends org.springframework.beans.BeanUtils
 
         // 查找setter方法
 
-        for (Method method : methods)
+        for (Method method : methods) {
-        {
             Matcher m = SET_PATTERN.matcher(method.getName());
-            if (m.matches() && (method.getParameterTypes().length == 1))
+            if (m.matches() && (method.getParameterTypes().length == 1)) {
-            {
                 setterMethods.add(method);
             }
         }
@@ -75,18 +73,15 @@ public class BeanUtils extends org.springframework.beans.BeanUtils
      * @return 对象的getter方法列表
      */
 
-    public static List<Method> getGetterMethods(Object obj)
+    public static List<Method> getGetterMethods(Object obj) {
-    {
         // getter方法列表
         List<Method> getterMethods = new ArrayList<Method>();
         // 获取所有方法
         Method[] methods = obj.getClass().getMethods();
         // 查找getter方法
-        for (Method method : methods)
+        for (Method method : methods) {
-        {
             Matcher m = GET_PATTERN.matcher(method.getName());
-            if (m.matches() && (method.getParameterTypes().length == 0))
+            if (m.matches() && (method.getParameterTypes().length == 0)) {
-            {
                 getterMethods.add(method);
             }
         }
@@ -103,8 +98,7 @@ public class BeanUtils extends org.springframework.beans.BeanUtils
      * @return 属性名一样返回true，否则返回false
      */
 
-    public static boolean isMethodPropEquals(String m1, String m2)
+    public static boolean isMethodPropEquals(String m1, String m2) {
-    {
         return m1.substring(BEAN_METHOD_PROP_INDEX).equals(m2.substring(BEAN_METHOD_PROP_INDEX));
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/file/FileUploadUtils.java

@@ -129,7 +129,6 @@ public class FileUploadUtils {
     }
 
     /**
-     *
      * @param uploadDir
      * @param fileName
      * @return

hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/file/MimeTypeUtils.java

@@ -5,8 +5,7 @@ package com.hchyun.common.utils.file;
  *
  * @author hchyun
  */
-public class MimeTypeUtils
+public class MimeTypeUtils {
-{
     public static final String IMAGE_PNG = "image/png";
 
     public static final String IMAGE_JPG = "image/jpg";
@@ -34,10 +33,8 @@ public class MimeTypeUtils
             // pdf
             "pdf"};
 
-    public static String getExtension(String prefix)
+    public static String getExtension(String prefix) {
-    {
+        switch (prefix) {
-        switch (prefix)
-        {
             case IMAGE_PNG:
                 return "png";
             case IMAGE_JPG:

hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/html/EscapeUtil.java

@@ -7,16 +7,13 @@ import com.hchyun.common.utils.StringUtils;
  *
  * @author hchyun
  */
-public class EscapeUtil
+public class EscapeUtil {
-{
     public static final String RE_HTML_MARK = "(<[^<]*?>)|(<[\\s]*?/[^<]*?>)|(<[^<]*?/[\\s]*?>)";
 
     private static final char[][] TEXT = new char[64][];
 
-    static
+    static {
-    {
+        for (int i = 0; i < 64; i++) {
-        for (int i = 0; i < 64; i++)
-        {
             TEXT[i] = new char[]{(char) i};
         }
 
@@ -34,8 +31,7 @@ public class EscapeUtil
      * @param text 被转义的文本
      * @return 转义后的文本
      */
-    public static String escape(String text)
+    public static String escape(String text) {
-    {
         return encode(text);
     }
 
@@ -45,8 +41,7 @@ public class EscapeUtil
      * @param content 包含转义符的HTML内容
      * @return 转换后的字符串
      */
-    public static String unescape(String content)
+    public static String unescape(String content) {
-    {
         return decode(content);
     }
 
@@ -56,8 +51,7 @@ public class EscapeUtil
      * @param content 文本
      * @return 清除标签后的文本
      */
-    public static String clean(String content)
+    public static String clean(String content) {
-    {
         return new HTMLFilter().filter(content);
     }
 
@@ -67,24 +61,18 @@ public class EscapeUtil
      * @param text 被编码的文本
      * @return 编码后的字符
      */
-    private static String encode(String text)
+    private static String encode(String text) {
-    {
         int len;
-        if ((text == null) || ((len = text.length()) == 0))
+        if ((text == null) || ((len = text.length()) == 0)) {
-        {
             return StringUtils.EMPTY;
         }
         StringBuilder buffer = new StringBuilder(len + (len >> 2));
         char c;
-        for (int i = 0; i < len; i++)
+        for (int i = 0; i < len; i++) {
-        {
             c = text.charAt(i);
-            if (c < 64)
+            if (c < 64) {
-            {
                 buffer.append(TEXT[c]);
-            }
+            } else {
-            else
-            {
                 buffer.append(c);
             }
         }
@@ -97,43 +85,31 @@ public class EscapeUtil
      * @param content 被转义的内容
      * @return 解码后的字符串
      */
-    public static String decode(String content)
+    public static String decode(String content) {
-    {
+        if (StringUtils.isEmpty(content)) {
-        if (StringUtils.isEmpty(content))
-        {
             return content;
         }
 
         StringBuilder tmp = new StringBuilder(content.length());
         int lastPos = 0, pos = 0;
         char ch;
-        while (lastPos < content.length())
+        while (lastPos < content.length()) {
-        {
             pos = content.indexOf("%", lastPos);
-            if (pos == lastPos)
+            if (pos == lastPos) {
-            {
+                if (content.charAt(pos + 1) == 'u') {
-                if (content.charAt(pos + 1) == 'u')
-                {
                     ch = (char) Integer.parseInt(content.substring(pos + 2, pos + 6), 16);
                     tmp.append(ch);
                     lastPos = pos + 6;
-                }
+                } else {
-                else
-                {
                     ch = (char) Integer.parseInt(content.substring(pos + 1, pos + 3), 16);
                     tmp.append(ch);
                     lastPos = pos + 3;
                 }
-            }
+            } else {
-            else
+                if (pos == -1) {
-            {
-                if (pos == -1)
-                {
                     tmp.append(content.substring(lastPos));
                     lastPos = content.length();
-                }
+                } else {
-                else
-                {
                     tmp.append(content.substring(lastPos, pos));
                     lastPos = pos;
                 }
@@ -142,8 +118,7 @@ public class EscapeUtil
         return tmp.toString();
     }
 
-    public static void main(String[] args)
+    public static void main(String[] args) {
-    {
         String html = "<script>alert(1);</script>";
         // String html = "<scr<script>ipt>alert(\"XSS\")</scr<script>ipt>";
         // String html = "<123";

hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/html/HTMLFilter.java

@@ -15,8 +15,7 @@ import java.util.regex.Pattern;
  *
  * @author hchyun
  */
-public final class HTMLFilter
+public final class HTMLFilter {
-{
     /**
      * regex flag union representing /si modifiers in php
      **/
@@ -100,8 +99,7 @@ public final class HTMLFilter
     /**
      * Default constructor.
      */
-    public HTMLFilter()
+    public HTMLFilter() {
-    {
         vAllowed = new HashMap<>();
 
         final ArrayList<String> a_atts = new ArrayList<>();
@@ -140,8 +138,7 @@ public final class HTMLFilter
      * @param conf map containing configuration. keys match field names.
      */
     @SuppressWarnings("unchecked")
-    public HTMLFilter(final Map<String, Object> conf)
+    public HTMLFilter(final Map<String, Object> conf) {
-    {
 
         assert conf.containsKey("vAllowed") : "configuration requires vAllowed";
         assert conf.containsKey("vSelfClosingTags") : "configuration requires vSelfClosingTags";
@@ -165,20 +162,17 @@ public final class HTMLFilter
         alwaysMakeTags = conf.containsKey("alwaysMakeTags") ? (Boolean) conf.get("alwaysMakeTags") : true;
     }
 
-    private void reset()
+    private void reset() {
-    {
         vTagCounts.clear();
     }
 
     // ---------------------------------------------------------------
     // my versions of some PHP library functions
-    public static String chr(final int decimal)
+    public static String chr(final int decimal) {
-    {
         return String.valueOf((char) decimal);
     }
 
-    public static String htmlSpecialChars(final String s)
+    public static String htmlSpecialChars(final String s) {
-    {
         String result = s;
         result = regexReplace(P_AMP, "&amp;", result);
         result = regexReplace(P_QUOTE, "&quot;", result);
@@ -195,8 +189,7 @@ public final class HTMLFilter
      * @param input text (i.e. submitted by a user) than may contain html
      * @return "clean" version of input, with only valid, whitelisted html elements allowed
      */
-    public String filter(final String input)
+    public String filter(final String input) {
-    {
         reset();
         String s = input;
 
@@ -213,22 +206,18 @@ public final class HTMLFilter
         return s;
     }
 
-    public boolean isAlwaysMakeTags()
+    public boolean isAlwaysMakeTags() {
-    {
         return alwaysMakeTags;
     }
 
-    public boolean isStripComments()
+    public boolean isStripComments() {
-    {
         return stripComment;
     }
 
-    private String escapeComments(final String s)
+    private String escapeComments(final String s) {
-    {
         final Matcher m = P_COMMENTS.matcher(s);
         final StringBuffer buf = new StringBuffer();
-        if (m.find())
+        if (m.find()) {
-        {
             final String match = m.group(1); // (.*?)
             m.appendReplacement(buf, Matcher.quoteReplacement("<!--" + htmlSpecialChars(match) + "-->"));
         }
@@ -237,10 +226,8 @@ public final class HTMLFilter
         return buf.toString();
     }
 
-    private String balanceHTML(String s)
+    private String balanceHTML(String s) {
-    {
+        if (alwaysMakeTags) {
-        if (alwaysMakeTags)
-        {
             //
             // try and form html
             //
@@ -249,9 +236,7 @@ public final class HTMLFilter
             s = regexReplace(P_BODY_TO_END, "<$1>", s);
             s = regexReplace(P_XML_CONTENT, "$1<$2", s);
 
-        }
+        } else {
-        else
-        {
             //
             // escape stray brackets
             //
@@ -269,13 +254,11 @@ public final class HTMLFilter
         return s;
     }
 
-    private String checkTags(String s)
+    private String checkTags(String s) {
-    {
         Matcher m = P_TAGS.matcher(s);
 
         final StringBuffer buf = new StringBuffer();
-        while (m.find())
+        while (m.find()) {
-        {
             String replaceStr = m.group(1);
             replaceStr = processTag(replaceStr);
             m.appendReplacement(buf, Matcher.quoteReplacement(replaceStr));
@@ -285,10 +268,8 @@ public final class HTMLFilter
         // these get tallied in processTag
         // (remember to reset before subsequent calls to filter method)
         final StringBuilder sBuilder = new StringBuilder(buf.toString());
-        for (String key : vTagCounts.keySet())
+        for (String key : vTagCounts.keySet()) {
-        {
+            for (int ii = 0; ii < vTagCounts.get(key); ii++) {
-            for (int ii = 0; ii < vTagCounts.get(key); ii++)
-            {
                 sBuilder.append("</").append(key).append(">");
             }
         }
@@ -297,18 +278,14 @@ public final class HTMLFilter
         return s;
     }
 
-    private String processRemoveBlanks(final String s)
+    private String processRemoveBlanks(final String s) {
-    {
         String result = s;
-        for (String tag : vRemoveBlanks)
+        for (String tag : vRemoveBlanks) {
-        {
+            if (!P_REMOVE_PAIR_BLANKS.containsKey(tag)) {
-            if (!P_REMOVE_PAIR_BLANKS.containsKey(tag))
-            {
                 P_REMOVE_PAIR_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?></" + tag + ">"));
             }
             result = regexReplace(P_REMOVE_PAIR_BLANKS.get(tag), "", result);
-            if (!P_REMOVE_SELF_BLANKS.containsKey(tag))
+            if (!P_REMOVE_SELF_BLANKS.containsKey(tag)) {
-            {
                 P_REMOVE_SELF_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?/>"));
             }
             result = regexReplace(P_REMOVE_SELF_BLANKS.get(tag), "", result);
@@ -317,25 +294,19 @@ public final class HTMLFilter
         return result;
     }
 
-    private static String regexReplace(final Pattern regex_pattern, final String replacement, final String s)
+    private static String regexReplace(final Pattern regex_pattern, final String replacement, final String s) {
-    {
         Matcher m = regex_pattern.matcher(s);
         return m.replaceAll(replacement);
     }
 
-    private String processTag(final String s)
+    private String processTag(final String s) {
-    {
         // ending tags
         Matcher m = P_END_TAG.matcher(s);
-        if (m.find())
+        if (m.find()) {
-        {
             final String name = m.group(1).toLowerCase();
-            if (allowed(name))
+            if (allowed(name)) {
-            {
+                if (false == inArray(name, vSelfClosingTags)) {
-                if (false == inArray(name, vSelfClosingTags))
+                    if (vTagCounts.containsKey(name)) {
-                {
-                    if (vTagCounts.containsKey(name))
-                    {
                         vTagCounts.put(name, vTagCounts.get(name) - 1);
                         return "</" + name + ">";
                     }
@@ -345,35 +316,30 @@ public final class HTMLFilter
 
         // starting tags
         m = P_START_TAG.matcher(s);
-        if (m.find())
+        if (m.find()) {
-        {
             final String name = m.group(1).toLowerCase();
             final String body = m.group(2);
             String ending = m.group(3);
 
             // debug( "in a starting tag, name='" + name + "'; body='" + body + "'; ending='" + ending + "'" );
-            if (allowed(name))
+            if (allowed(name)) {
-            {
                 final StringBuilder params = new StringBuilder();
 
                 final Matcher m2 = P_QUOTED_ATTRIBUTES.matcher(body);
                 final Matcher m3 = P_UNQUOTED_ATTRIBUTES.matcher(body);
                 final List<String> paramNames = new ArrayList<>();
                 final List<String> paramValues = new ArrayList<>();
-                while (m2.find())
+                while (m2.find()) {
-                {
                     paramNames.add(m2.group(1)); // ([a-z0-9]+)
                     paramValues.add(m2.group(3)); // (.*?)
                 }
-                while (m3.find())
+                while (m3.find()) {
-                {
                     paramNames.add(m3.group(1)); // ([a-z0-9]+)
                     paramValues.add(m3.group(3)); // ([^\"\\s']+)
                 }
 
                 String paramName, paramValue;
-                for (int ii = 0; ii < paramNames.size(); ii++)
+                for (int ii = 0; ii < paramNames.size(); ii++) {
-                {
                     paramName = paramNames.get(ii).toLowerCase();
                     paramValue = paramValues.get(ii);
 
@@ -381,72 +347,55 @@ public final class HTMLFilter
                     // debug( "paramValue='" + paramValue + "'" );
                     // debug( "allowed? " + vAllowed.get( name ).contains( paramName ) );
 
-                    if (allowedAttribute(name, paramName))
+                    if (allowedAttribute(name, paramName)) {
-                    {
+                        if (inArray(paramName, vProtocolAtts)) {
-                        if (inArray(paramName, vProtocolAtts))
-                        {
                             paramValue = processParamProtocol(paramValue);
                         }
                         params.append(' ').append(paramName).append("=\"").append(paramValue).append("\"");
                     }
                 }
 
-                if (inArray(name, vSelfClosingTags))
+                if (inArray(name, vSelfClosingTags)) {
-                {
                     ending = " /";
                 }
 
-                if (inArray(name, vNeedClosingTags))
+                if (inArray(name, vNeedClosingTags)) {
-                {
                     ending = "";
                 }
 
-                if (ending == null || ending.length() < 1)
+                if (ending == null || ending.length() < 1) {
-                {
+                    if (vTagCounts.containsKey(name)) {
-                    if (vTagCounts.containsKey(name))
-                    {
                         vTagCounts.put(name, vTagCounts.get(name) + 1);
-                    }
+                    } else {
-                    else
-                    {
                         vTagCounts.put(name, 1);
                     }
-                }
+                } else {
-                else
-                {
                     ending = " /";
                 }
                 return "<" + name + params + ending + ">";
-            }
+            } else {
-            else
-            {
                 return "";
             }
         }
 
         // comments
         m = P_COMMENT.matcher(s);
-        if (!stripComment && m.find())
+        if (!stripComment && m.find()) {
-        {
             return "<" + m.group() + ">";
         }
 
         return "";
     }
 
-    private String processParamProtocol(String s)
+    private String processParamProtocol(String s) {
-    {
         s = decodeEntities(s);
         final Matcher m = P_PROTOCOL.matcher(s);
-        if (m.find())
+        if (m.find()) {
-        {
             final String protocol = m.group(1);
-            if (!inArray(protocol, vAllowedProtocols))
+            if (!inArray(protocol, vAllowedProtocols)) {
-            {
                 // bad protocol, turn into local anchor link instead
                 s = "#" + s.substring(protocol.length() + 1);
-                if (s.startsWith("#//"))
+                if (s.startsWith("#//")) {
-                {
                     s = "#" + s.substring(3);
                 }
             }
@@ -455,13 +404,11 @@ public final class HTMLFilter
         return s;
     }
 
-    private String decodeEntities(String s)
+    private String decodeEntities(String s) {
-    {
         StringBuffer buf = new StringBuffer();
 
         Matcher m = P_ENTITY.matcher(s);
-        while (m.find())
+        while (m.find()) {
-        {
             final String match = m.group(1);
             final int decimal = Integer.decode(match).intValue();
             m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal)));
@@ -471,8 +418,7 @@ public final class HTMLFilter
 
         buf = new StringBuffer();
         m = P_ENTITY_UNICODE.matcher(s);
-        while (m.find())
+        while (m.find()) {
-        {
             final String match = m.group(1);
             final int decimal = Integer.valueOf(match, 16).intValue();
             m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal)));
@@ -482,8 +428,7 @@ public final class HTMLFilter
 
         buf = new StringBuffer();
         m = P_ENCODE.matcher(s);
-        while (m.find())
+        while (m.find()) {
-        {
             final String match = m.group(1);
             final int decimal = Integer.valueOf(match, 16).intValue();
             m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal)));
@@ -495,14 +440,12 @@ public final class HTMLFilter
         return s;
     }
 
-    private String validateEntities(final String s)
+    private String validateEntities(final String s) {
-    {
         StringBuffer buf = new StringBuffer();
 
         // validate entities throughout the string
         Matcher m = P_VALID_ENTITIES.matcher(s);
-        while (m.find())
+        while (m.find()) {
-        {
             final String one = m.group(1); // ([^&;]*)
             final String two = m.group(2); // (?=(;|&|$))
             m.appendReplacement(buf, Matcher.quoteReplacement(checkEntity(one, two)));
@@ -512,14 +455,11 @@ public final class HTMLFilter
         return encodeQuotes(buf.toString());
     }
 
-    private String encodeQuotes(final String s)
+    private String encodeQuotes(final String s) {
-    {
+        if (encodeQuotes) {
-        if (encodeQuotes)
-        {
             StringBuffer buf = new StringBuffer();
             Matcher m = P_VALID_QUOTES.matcher(s);
-            while (m.find())
+            while (m.find()) {
-            {
                 final String one = m.group(1); // (>|^)
                 final String two = m.group(2); // ([^<]+?)
                 final String three = m.group(3); // (<|$)
@@ -528,43 +468,34 @@ public final class HTMLFilter
             }
             m.appendTail(buf);
             return buf.toString();
-        }
+        } else {
-        else
-        {
             return s;
         }
     }
 
-    private String checkEntity(final String preamble, final String term)
+    private String checkEntity(final String preamble, final String term) {
-    {
 
         return ";".equals(term) && isValidEntity(preamble) ? '&' + preamble : "&amp;" + preamble;
     }
 
-    private boolean isValidEntity(final String entity)
+    private boolean isValidEntity(final String entity) {
-    {
         return inArray(entity, vAllowedEntities);
     }
 
-    private static boolean inArray(final String s, final String[] array)
+    private static boolean inArray(final String s, final String[] array) {
-    {
+        for (String item : array) {
-        for (String item : array)
+            if (item != null && item.equals(s)) {
-        {
-            if (item != null && item.equals(s))
-            {
                 return true;
             }
         }
         return false;
     }
 
-    private boolean allowed(final String name)
+    private boolean allowed(final String name) {
-    {
         return (vAllowed.isEmpty() || vAllowed.containsKey(name)) && !inArray(name, vDisallowed);
     }
 
-    private boolean allowedAttribute(final String name, final String paramName)
+    private boolean allowedAttribute(final String name, final String paramName) {
-    {
         return allowed(name) && (vAllowed.isEmpty() || vAllowed.get(name).contains(paramName));
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/http/HttpHelper.java

@@ -6,6 +6,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.Charset;
 import javax.servlet.ServletRequest;
+
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,37 +16,25 @@ import org.slf4j.LoggerFactory;
  *
  * @author hchyun
  */
-public class HttpHelper
+public class HttpHelper {
-{
     private static final Logger LOGGER = LoggerFactory.getLogger(HttpHelper.class);
 
-    public static String getBodyString(ServletRequest request)
+    public static String getBodyString(ServletRequest request) {
-    {
         StringBuilder sb = new StringBuilder();
         BufferedReader reader = null;
-        try (InputStream inputStream = request.getInputStream())
+        try (InputStream inputStream = request.getInputStream()) {
-        {
             reader = new BufferedReader(new InputStreamReader(inputStream, Charset.forName("UTF-8")));
             String line = "";
-            while ((line = reader.readLine()) != null)
+            while ((line = reader.readLine()) != null) {
-            {
                 sb.append(line);
             }
-        }
+        } catch (IOException e) {
-        catch (IOException e)
-        {
             LOGGER.warn("getBodyString出现问题！");
-        }
+        } finally {
-        finally
+            if (reader != null) {
-        {
+                try {
-            if (reader != null)
-            {
-                try
-                {
                     reader.close();
-                }
+                } catch (IOException e) {
-                catch (IOException e)
-                {
                     LOGGER.error(ExceptionUtils.getMessage(e));
                 }
             }

hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/http/HttpUtils.java

@@ -16,6 +16,7 @@ import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSession;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.hchyun.common.constant.Constants;
@@ -25,8 +26,7 @@ import com.hchyun.common.constant.Constants;
  *
  * @author hchyun
  */
-public class HttpUtils
+public class HttpUtils {
-{
     private static final Logger log = LoggerFactory.getLogger(HttpUtils.class);
 
     /**
@@ -36,8 +36,7 @@ public class HttpUtils
      * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
      * @return 所代表远程资源的响应结果
      */
-    public static String sendGet(String url, String param)
+    public static String sendGet(String url, String param) {
-    {
         return sendGet(url, param, Constants.UTF8);
     }
 
@@ -49,12 +48,10 @@ public class HttpUtils
      * @param contentType 编码类型
      * @return 所代表远程资源的响应结果
      */
-    public static String sendGet(String url, String param, String contentType)
+    public static String sendGet(String url, String param, String contentType) {
-    {
         StringBuilder result = new StringBuilder();
         BufferedReader in = null;
-        try
+        try {
-        {
             String urlNameString = url + "?" + param;
             log.info("sendGet - {}", urlNameString);
             URL realUrl = new URL(urlNameString);
@@ -65,39 +62,24 @@ public class HttpUtils
             connection.connect();
             in = new BufferedReader(new InputStreamReader(connection.getInputStream(), contentType));
             String line;
-            while ((line = in.readLine()) != null)
+            while ((line = in.readLine()) != null) {
-            {
                 result.append(line);
             }
             log.info("recv - {}", result);
-        }
+        } catch (ConnectException e) {
-        catch (ConnectException e)
-        {
             log.error("调用HttpUtils.sendGet ConnectException, url=" + url + ",param=" + param, e);
-        }
+        } catch (SocketTimeoutException e) {
-        catch (SocketTimeoutException e)
-        {
             log.error("调用HttpUtils.sendGet SocketTimeoutException, url=" + url + ",param=" + param, e);
-        }
+        } catch (IOException e) {
-        catch (IOException e)
-        {
             log.error("调用HttpUtils.sendGet IOException, url=" + url + ",param=" + param, e);
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             log.error("调用HttpsUtil.sendGet Exception, url=" + url + ",param=" + param, e);
-        }
+        } finally {
-        finally
+            try {
-        {
+                if (in != null) {
-            try
-            {
-                if (in != null)
-                {
                     in.close();
                 }
-            }
+            } catch (Exception ex) {
-            catch (Exception ex)
-            {
                 log.error("调用in.close Exception, url=" + url + ",param=" + param, ex);
             }
         }
@@ -111,13 +93,11 @@ public class HttpUtils
      * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
      * @return 所代表远程资源的响应结果
      */
-    public static String sendPost(String url, String param)
+    public static String sendPost(String url, String param) {
-    {
         PrintWriter out = null;
         BufferedReader in = null;
         StringBuilder result = new StringBuilder();
-        try
+        try {
-        {
             String urlNameString = url;
             log.info("sendPost - {}", urlNameString);
             URL realUrl = new URL(urlNameString);
@@ -134,55 +114,37 @@ public class HttpUtils
             out.flush();
             in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "utf-8"));
             String line;
-            while ((line = in.readLine()) != null)
+            while ((line = in.readLine()) != null) {
-            {
                 result.append(line);
             }
             log.info("recv - {}", result);
-        }
+        } catch (ConnectException e) {
-        catch (ConnectException e)
-        {
             log.error("调用HttpUtils.sendPost ConnectException, url=" + url + ",param=" + param, e);
-        }
+        } catch (SocketTimeoutException e) {
-        catch (SocketTimeoutException e)
-        {
             log.error("调用HttpUtils.sendPost SocketTimeoutException, url=" + url + ",param=" + param, e);
-        }
+        } catch (IOException e) {
-        catch (IOException e)
-        {
             log.error("调用HttpUtils.sendPost IOException, url=" + url + ",param=" + param, e);
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             log.error("调用HttpsUtil.sendPost Exception, url=" + url + ",param=" + param, e);
-        }
+        } finally {
-        finally
+            try {
-        {
+                if (out != null) {
-            try
-            {
-                if (out != null)
-                {
                     out.close();
                 }
-                if (in != null)
+                if (in != null) {
-                {
                     in.close();
                 }
-            }
+            } catch (IOException ex) {
-            catch (IOException ex)
-            {
                 log.error("调用in.close Exception, url=" + url + ",param=" + param, ex);
             }
         }
         return result.toString();
     }
 
-    public static String sendSSLPost(String url, String param)
+    public static String sendSSLPost(String url, String param) {
-    {
         StringBuilder result = new StringBuilder();
         String urlNameString = url + "?" + param;
-        try
+        try {
-        {
             log.info("sendSSLPost - {}", urlNameString);
             SSLContext sc = SSLContext.getInstance("SSL");
             sc.init(null, new TrustManager[]{new TrustAnyTrustManager()}, new java.security.SecureRandom());
@@ -202,60 +164,44 @@ public class HttpUtils
             InputStream is = conn.getInputStream();
             BufferedReader br = new BufferedReader(new InputStreamReader(is));
             String ret = "";
-            while ((ret = br.readLine()) != null)
+            while ((ret = br.readLine()) != null) {
-            {
+                if (ret != null && !"".equals(ret.trim())) {
-                if (ret != null && !"".equals(ret.trim()))
-                {
                     result.append(new String(ret.getBytes("ISO-8859-1"), "utf-8"));
                 }
             }
             log.info("recv - {}", result);
             conn.disconnect();
             br.close();
-        }
+        } catch (ConnectException e) {
-        catch (ConnectException e)
-        {
             log.error("调用HttpUtils.sendSSLPost ConnectException, url=" + url + ",param=" + param, e);
-        }
+        } catch (SocketTimeoutException e) {
-        catch (SocketTimeoutException e)
-        {
             log.error("调用HttpUtils.sendSSLPost SocketTimeoutException, url=" + url + ",param=" + param, e);
-        }
+        } catch (IOException e) {
-        catch (IOException e)
-        {
             log.error("调用HttpUtils.sendSSLPost IOException, url=" + url + ",param=" + param, e);
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             log.error("调用HttpsUtil.sendSSLPost Exception, url=" + url + ",param=" + param, e);
         }
         return result.toString();
     }
 
-    private static class TrustAnyTrustManager implements X509TrustManager
+    private static class TrustAnyTrustManager implements X509TrustManager {
-    {
         @Override
-        public void checkClientTrusted(X509Certificate[] chain, String authType)
+        public void checkClientTrusted(X509Certificate[] chain, String authType) {
-        {
         }
 
         @Override
-        public void checkServerTrusted(X509Certificate[] chain, String authType)
+        public void checkServerTrusted(X509Certificate[] chain, String authType) {
-        {
         }
 
         @Override
-        public X509Certificate[] getAcceptedIssuers()
+        public X509Certificate[] getAcceptedIssuers() {
-        {
             return new X509Certificate[]{};
         }
     }
 
-    private static class TrustAnyHostnameVerifier implements HostnameVerifier
+    private static class TrustAnyHostnameVerifier implements HostnameVerifier {
-    {
         @Override
-        public boolean verify(String hostname, SSLSession session)
+        public boolean verify(String hostname, SSLSession session) {
-        {
             return true;
         }
     }

hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/ip/IpUtils.java

@@ -3,6 +3,7 @@ package com.hchyun.common.utils.ip;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import javax.servlet.http.HttpServletRequest;
+
 import com.hchyun.common.utils.StringUtils;
 import com.hchyun.common.utils.html.EscapeUtil;
 
@@ -11,49 +12,38 @@ import com.hchyun.common.utils.html.EscapeUtil;
  *
  * @author hchyun
  */
-public class IpUtils
+public class IpUtils {
-{
+    public static String getIpAddr(HttpServletRequest request) {
-    public static String getIpAddr(HttpServletRequest request)
+        if (request == null) {
-    {
-        if (request == null)
-        {
             return "unknown";
         }
         String ip = request.getHeader("x-forwarded-for");
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-        {
             ip = request.getHeader("Proxy-Client-IP");
         }
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-        {
             ip = request.getHeader("X-Forwarded-For");
         }
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-        {
             ip = request.getHeader("WL-Proxy-Client-IP");
         }
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-        {
             ip = request.getHeader("X-Real-IP");
         }
 
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-        {
             ip = request.getRemoteAddr();
         }
         return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : EscapeUtil.clean(ip);
     }
 
-    public static boolean internalIp(String ip)
+    public static boolean internalIp(String ip) {
-    {
         byte[] addr = textToNumericFormatV4(ip);
         return internalIp(addr) || "127.0.0.1".equals(ip);
     }
 
-    private static boolean internalIp(byte[] addr)
+    private static boolean internalIp(byte[] addr) {
-    {
+        if (StringUtils.isNull(addr) || addr.length < 2) {
-        if (StringUtils.isNull(addr) || addr.length < 2)
-        {
             return true;
         }
         final byte b0 = addr[0];
@@ -67,18 +57,15 @@ public class IpUtils
         // 192.168.x.x/16
         final byte SECTION_5 = (byte) 0xC0;
         final byte SECTION_6 = (byte) 0xA8;
-        switch (b0)
+        switch (b0) {
-        {
             case SECTION_1:
                 return true;
             case SECTION_2:
-                if (b1 >= SECTION_3 && b1 <= SECTION_4)
+                if (b1 >= SECTION_3 && b1 <= SECTION_4) {
-                {
                     return true;
                 }
             case SECTION_5:
-                switch (b1)
+                switch (b1) {
-                {
                     case SECTION_6:
                         return true;
                 }
@@ -93,21 +80,17 @@ public class IpUtils
      * @param text IPv4地址
      * @return byte 字节
      */
-    public static byte[] textToNumericFormatV4(String text)
+    public static byte[] textToNumericFormatV4(String text) {
-    {
+        if (text.length() == 0) {
-        if (text.length() == 0)
-        {
             return null;
         }
 
         byte[] bytes = new byte[4];
         String[] elements = text.split("\\.", -1);
-        try
+        try {
-        {
             long l;
             int i;
-            switch (elements.length)
+            switch (elements.length) {
-            {
                 case 1:
                     l = Long.parseLong(elements[0]);
                     if ((l < 0L) || (l > 4294967295L)) {
@@ -133,8 +116,7 @@ public class IpUtils
                     bytes[3] = (byte) (int) (l & 0xFF);
                     break;
                 case 3:
-                    for (i = 0; i < 2; ++i)
+                    for (i = 0; i < 2; ++i) {
-                    {
                         l = Integer.parseInt(elements[i]);
                         if ((l < 0L) || (l > 255L)) {
                             return null;
@@ -149,8 +131,7 @@ public class IpUtils
                     bytes[3] = (byte) (int) (l & 0xFF);
                     break;
                 case 4:
-                    for (i = 0; i < 4; ++i)
+                    for (i = 0; i < 4; ++i) {
-                    {
                         l = Integer.parseInt(elements[i]);
                         if ((l < 0L) || (l > 255L)) {
                             return null;
@@ -161,34 +142,24 @@ public class IpUtils
                 default:
                     return null;
             }
-        }
+        } catch (NumberFormatException e) {
-        catch (NumberFormatException e)
-        {
             return null;
         }
         return bytes;
     }
 
-    public static String getHostIp()
+    public static String getHostIp() {
-    {
+        try {
-        try
-        {
             return InetAddress.getLocalHost().getHostAddress();
-        }
+        } catch (UnknownHostException e) {
-        catch (UnknownHostException e)
-        {
         }
         return "127.0.0.1";
     }
 
-    public static String getHostName()
+    public static String getHostName() {
-    {
+        try {
-        try
-        {
             return InetAddress.getLocalHost().getHostName();
-        }
+        } catch (UnknownHostException e) {
-        catch (UnknownHostException e)
-        {
         }
         return "未知";
     }

hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/poi/ExcelUtil.java

@@ -736,7 +736,8 @@ public class ExcelUtil<T> {
         return o;
     }
 
-    /** todo
+    /**
+     * todo
      * 得到所有定义字段
      */
     private void createExcelField() {

hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/reflect/ReflectUtils.java

@@ -7,6 +7,7 @@ import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.Date;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.apache.poi.ss.usermodel.DateUtil;
@@ -21,8 +22,7 @@ import com.hchyun.common.utils.DateUtils;
  * @author hchyun
  */
 @SuppressWarnings("rawtypes")
-public class ReflectUtils
+public class ReflectUtils {
-{
     private static final String SETTER_PREFIX = "set";
 
     private static final String GETTER_PREFIX = "get";
@@ -36,11 +36,9 @@ public class ReflectUtils
      * 支持多级，如：对象名.对象名.方法
      */
     @SuppressWarnings("unchecked")
-    public static <E> E invokeGetter(Object obj, String propertyName)
+    public static <E> E invokeGetter(Object obj, String propertyName) {
-    {
         Object object = obj;
-        for (String name : StringUtils.split(propertyName, "."))
+        for (String name : StringUtils.split(propertyName, ".")) {
-        {
             String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(name);
             object = invokeMethod(object, getterMethodName, new Class[]{}, new Object[]{});
         }
@@ -51,19 +49,14 @@ public class ReflectUtils
      * 调用Setter方法, 仅匹配方法名。
      * 支持多级，如：对象名.对象名.方法
      */
-    public static <E> void invokeSetter(Object obj, String propertyName, E value)
+    public static <E> void invokeSetter(Object obj, String propertyName, E value) {
-    {
         Object object = obj;
         String[] names = StringUtils.split(propertyName, ".");
-        for (int i = 0; i < names.length; i++)
+        for (int i = 0; i < names.length; i++) {
-        {
+            if (i < names.length - 1) {
-            if (i < names.length - 1)
-            {
                 String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(names[i]);
                 object = invokeMethod(object, getterMethodName, new Class[]{}, new Object[]{});
-            }
+            } else {
-            else
-            {
                 String setterMethodName = SETTER_PREFIX + StringUtils.capitalize(names[i]);
                 invokeMethodByName(object, setterMethodName, new Object[]{value});
             }
@@ -74,21 +67,16 @@ public class ReflectUtils
      * 直接读取对象属性值, 无视private/protected修饰符, 不经过getter函数.
      */
     @SuppressWarnings("unchecked")
-    public static <E> E getFieldValue(final Object obj, final String fieldName)
+    public static <E> E getFieldValue(final Object obj, final String fieldName) {
-    {
         Field field = getAccessibleField(obj, fieldName);
-        if (field == null)
+        if (field == null) {
-        {
             logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 ");
             return null;
         }
         E result = null;
-        try
+        try {
-        {
             result = (E) field.get(obj);
-        }
+        } catch (IllegalAccessException e) {
-        catch (IllegalAccessException e)
-        {
             logger.error("不可能抛出的异常{}", e.getMessage());
         }
         return result;
@@ -97,21 +85,16 @@ public class ReflectUtils
     /**
      * 直接设置对象属性值, 无视private/protected修饰符, 不经过setter函数.
      */
-    public static <E> void setFieldValue(final Object obj, final String fieldName, final E value)
+    public static <E> void setFieldValue(final Object obj, final String fieldName, final E value) {
-    {
         Field field = getAccessibleField(obj, fieldName);
-        if (field == null)
+        if (field == null) {
-        {
             // throw new IllegalArgumentException("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 ");
             logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 ");
             return;
         }
-        try
+        try {
-        {
             field.set(obj, value);
-        }
+        } catch (IllegalAccessException e) {
-        catch (IllegalAccessException e)
-        {
             logger.error("不可能抛出的异常: {}", e.getMessage());
         }
     }
@@ -123,24 +106,18 @@ public class ReflectUtils
      */
     @SuppressWarnings("unchecked")
     public static <E> E invokeMethod(final Object obj, final String methodName, final Class<?>[] parameterTypes,
-            final Object[] args)
+                                     final Object[] args) {
-    {
+        if (obj == null || methodName == null) {
-        if (obj == null || methodName == null)
-        {
             return null;
         }
         Method method = getAccessibleMethod(obj, methodName, parameterTypes);
-        if (method == null)
+        if (method == null) {
-        {
             logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + methodName + "] 方法 ");
             return null;
         }
-        try
+        try {
-        {
             return (E) method.invoke(obj, args);
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             String msg = "method: " + method + ", obj: " + obj + ", args: " + args + "";
             throw convertReflectionExceptionToUnchecked(msg, e);
         }
@@ -152,64 +129,42 @@ public class ReflectUtils
      * 只匹配函数名，如果有多个同名函数调用第一个。
      */
     @SuppressWarnings("unchecked")
-    public static <E> E invokeMethodByName(final Object obj, final String methodName, final Object[] args)
+    public static <E> E invokeMethodByName(final Object obj, final String methodName, final Object[] args) {
-    {
         Method method = getAccessibleMethodByName(obj, methodName, args.length);
-        if (method == null)
+        if (method == null) {
-        {
             // 如果为空不报错，直接返回空。
             logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + methodName + "] 方法 ");
             return null;
         }
-        try
+        try {
-        {
             // 类型转换（将参数数据类型转换为目标方法参数类型）
             Class<?>[] cs = method.getParameterTypes();
-            for (int i = 0; i < cs.length; i++)
+            for (int i = 0; i < cs.length; i++) {
-            {
+                if (args[i] != null && !args[i].getClass().equals(cs[i])) {
-                if (args[i] != null && !args[i].getClass().equals(cs[i]))
+                    if (cs[i] == String.class) {
-                {
-                    if (cs[i] == String.class)
-                    {
                         args[i] = Convert.toStr(args[i]);
-                        if (StringUtils.endsWith((String) args[i], ".0"))
+                        if (StringUtils.endsWith((String) args[i], ".0")) {
-                        {
                             args[i] = StringUtils.substringBefore((String) args[i], ".0");
                         }
-                    }
+                    } else if (cs[i] == Integer.class) {
-                    else if (cs[i] == Integer.class)
-                    {
                         args[i] = Convert.toInt(args[i]);
-                    }
+                    } else if (cs[i] == Long.class) {
-                    else if (cs[i] == Long.class)
-                    {
                         args[i] = Convert.toLong(args[i]);
-                    }
+                    } else if (cs[i] == Double.class) {
-                    else if (cs[i] == Double.class)
-                    {
                         args[i] = Convert.toDouble(args[i]);
-                    }
+                    } else if (cs[i] == Float.class) {
-                    else if (cs[i] == Float.class)
-                    {
                         args[i] = Convert.toFloat(args[i]);
-                    }
+                    } else if (cs[i] == Date.class) {
-                    else if (cs[i] == Date.class)
+                        if (args[i] instanceof String) {
-                    {
-                        if (args[i] instanceof String)
-                        {
                             args[i] = DateUtils.parseDate(args[i]);
-                        }
+                        } else {
-                        else
-                        {
                             args[i] = DateUtil.getJavaDate((Double) args[i]);
                         }
                     }
                 }
             }
             return (E) method.invoke(obj, args);
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             String msg = "method: " + method + ", obj: " + obj + ", args: " + args + "";
             throw convertReflectionExceptionToUnchecked(msg, e);
         }
@@ -219,24 +174,18 @@ public class ReflectUtils
      * 循环向上转型, 获取对象的DeclaredField, 并强制设置为可访问.
      * 如向上转型到Object仍无法找到, 返回null.
      */
-    public static Field getAccessibleField(final Object obj, final String fieldName)
+    public static Field getAccessibleField(final Object obj, final String fieldName) {
-    {
         // 为空不报错。直接返回 null
-        if (obj == null)
+        if (obj == null) {
-        {
             return null;
         }
         Validate.notBlank(fieldName, "fieldName can't be blank");
-        for (Class<?> superClass = obj.getClass(); superClass != Object.class; superClass = superClass.getSuperclass())
+        for (Class<?> superClass = obj.getClass(); superClass != Object.class; superClass = superClass.getSuperclass()) {
-        {
+            try {
-            try
-            {
                 Field field = superClass.getDeclaredField(fieldName);
                 makeAccessible(field);
                 return field;
-            }
+            } catch (NoSuchFieldException e) {
-            catch (NoSuchFieldException e)
-            {
                 continue;
             }
         }
@@ -250,24 +199,18 @@ public class ReflectUtils
      * 用于方法需要被多次调用的情况. 先使用本函数先取得Method,然后调用Method.invoke(Object obj, Object... args)
      */
     public static Method getAccessibleMethod(final Object obj, final String methodName,
-            final Class<?>... parameterTypes)
+                                             final Class<?>... parameterTypes) {
-    {
         // 为空不报错。直接返回 null
-        if (obj == null)
+        if (obj == null) {
-        {
             return null;
         }
         Validate.notBlank(methodName, "methodName can't be blank");
-        for (Class<?> searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass())
+        for (Class<?> searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass()) {
-        {
+            try {
-            try
-            {
                 Method method = searchType.getDeclaredMethod(methodName, parameterTypes);
                 makeAccessible(method);
                 return method;
-            }
+            } catch (NoSuchMethodException e) {
-            catch (NoSuchMethodException e)
-            {
                 continue;
             }
         }
@@ -280,21 +223,16 @@ public class ReflectUtils
      * 只匹配函数名。
      * 用于方法需要被多次调用的情况. 先使用本函数先取得Method,然后调用Method.invoke(Object obj, Object... args)
      */
-    public static Method getAccessibleMethodByName(final Object obj, final String methodName, int argsNum)
+    public static Method getAccessibleMethodByName(final Object obj, final String methodName, int argsNum) {
-    {
         // 为空不报错。直接返回 null
-        if (obj == null)
+        if (obj == null) {
-        {
             return null;
         }
         Validate.notBlank(methodName, "methodName can't be blank");
-        for (Class<?> searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass())
+        for (Class<?> searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass()) {
-        {
             Method[] methods = searchType.getDeclaredMethods();
-            for (Method method : methods)
+            for (Method method : methods) {
-            {
+                if (method.getName().equals(methodName) && method.getParameterTypes().length == argsNum) {
-                if (method.getName().equals(methodName) && method.getParameterTypes().length == argsNum)
-                {
                     makeAccessible(method);
                     return method;
                 }
@@ -306,11 +244,9 @@ public class ReflectUtils
     /**
      * 改变private/protected的方法为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。
      */
-    public static void makeAccessible(Method method)
+    public static void makeAccessible(Method method) {
-    {
         if ((!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers()))
-                && !method.isAccessible())
+                && !method.isAccessible()) {
-        {
             method.setAccessible(true);
         }
     }
@@ -318,11 +254,9 @@ public class ReflectUtils
     /**
      * 改变private/protected的成员变量为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。
      */
-    public static void makeAccessible(Field field)
+    public static void makeAccessible(Field field) {
-    {
         if ((!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers())
-                || Modifier.isFinal(field.getModifiers())) && !field.isAccessible())
+                || Modifier.isFinal(field.getModifiers())) && !field.isAccessible()) {
-        {
             field.setAccessible(true);
         }
     }
@@ -332,8 +266,7 @@ public class ReflectUtils
      * 如无法找到, 返回Object.class.
      */
     @SuppressWarnings("unchecked")
-    public static <T> Class<T> getClassGenricType(final Class clazz)
+    public static <T> Class<T> getClassGenricType(final Class clazz) {
-    {
         return getClassGenricType(clazz, 0);
     }
 
@@ -341,26 +274,22 @@ public class ReflectUtils
      * 通过反射, 获得Class定义中声明的父类的泛型参数的类型.
      * 如无法找到, 返回Object.class.
      */
-    public static Class getClassGenricType(final Class clazz, final int index)
+    public static Class getClassGenricType(final Class clazz, final int index) {
-    {
         Type genType = clazz.getGenericSuperclass();
 
-        if (!(genType instanceof ParameterizedType))
+        if (!(genType instanceof ParameterizedType)) {
-        {
             logger.debug(clazz.getSimpleName() + "'s superclass not ParameterizedType");
             return Object.class;
         }
 
         Type[] params = ((ParameterizedType) genType).getActualTypeArguments();
 
-        if (index >= params.length || index < 0)
+        if (index >= params.length || index < 0) {
-        {
             logger.debug("Index: " + index + ", Size of " + clazz.getSimpleName() + "'s Parameterized Type: "
                     + params.length);
             return Object.class;
         }
-        if (!(params[index] instanceof Class))
+        if (!(params[index] instanceof Class)) {
-        {
             logger.debug(clazz.getSimpleName() + " not set the actual class on superclass generic parameter");
             return Object.class;
         }
@@ -368,18 +297,14 @@ public class ReflectUtils
         return (Class) params[index];
     }
 
-    public static Class<?> getUserClass(Object instance)
+    public static Class<?> getUserClass(Object instance) {
-    {
+        if (instance == null) {
-        if (instance == null)
-        {
             throw new RuntimeException("Instance must not be null");
         }
         Class clazz = instance.getClass();
-        if (clazz != null && clazz.getName().contains(CGLIB_CLASS_SEPARATOR))
+        if (clazz != null && clazz.getName().contains(CGLIB_CLASS_SEPARATOR)) {
-        {
             Class<?> superClass = clazz.getSuperclass();
-            if (superClass != null && !Object.class.equals(superClass))
+            if (superClass != null && !Object.class.equals(superClass)) {
-            {
                 return superClass;
             }
         }
@@ -390,15 +315,11 @@ public class ReflectUtils
     /**
      * 将反射时的checked exception转换为unchecked exception.
      */
-    public static RuntimeException convertReflectionExceptionToUnchecked(String msg, Exception e)
+    public static RuntimeException convertReflectionExceptionToUnchecked(String msg, Exception e) {
-    {
         if (e instanceof IllegalAccessException || e instanceof IllegalArgumentException
-                || e instanceof NoSuchMethodException)
+                || e instanceof NoSuchMethodException) {
-        {
             return new IllegalArgumentException(msg, e);
-        }
+        } else if (e instanceof InvocationTargetException) {
-        else if (e instanceof InvocationTargetException)
-        {
             return new RuntimeException(msg, ((InvocationTargetException) e).getTargetException());
         }
         return new RuntimeException(msg, e);

hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/sign/Base64.java

@@ -5,8 +5,7 @@ package com.hchyun.common.utils.sign;
  *
  * @author hchyun
  */
-public final class Base64
+public final class Base64 {
-{
     static private final int BASELENGTH = 128;
     static private final int LOOKUPLENGTH = 64;
     static private final int TWENTYFOURBITGROUP = 24;
@@ -18,59 +17,48 @@ public final class Base64
     static final private byte[] base64Alphabet = new byte[BASELENGTH];
     static final private char[] lookUpBase64Alphabet = new char[LOOKUPLENGTH];
 
-    static
+    static {
-    {
+        for (int i = 0; i < BASELENGTH; ++i) {
-        for (int i = 0; i < BASELENGTH; ++i)
-        {
             base64Alphabet[i] = -1;
         }
-        for (int i = 'Z'; i >= 'A'; i--)
+        for (int i = 'Z'; i >= 'A'; i--) {
-        {
             base64Alphabet[i] = (byte) (i - 'A');
         }
-        for (int i = 'z'; i >= 'a'; i--)
+        for (int i = 'z'; i >= 'a'; i--) {
-        {
             base64Alphabet[i] = (byte) (i - 'a' + 26);
         }
 
-        for (int i = '9'; i >= '0'; i--)
+        for (int i = '9'; i >= '0'; i--) {
-        {
             base64Alphabet[i] = (byte) (i - '0' + 52);
         }
 
         base64Alphabet['+'] = 62;
         base64Alphabet['/'] = 63;
 
-        for (int i = 0; i <= 25; i++)
+        for (int i = 0; i <= 25; i++) {
-        {
             lookUpBase64Alphabet[i] = (char) ('A' + i);
         }
 
-        for (int i = 26, j = 0; i <= 51; i++, j++)
+        for (int i = 26, j = 0; i <= 51; i++, j++) {
-        {
             lookUpBase64Alphabet[i] = (char) ('a' + j);
         }
 
-        for (int i = 52, j = 0; i <= 61; i++, j++)
+        for (int i = 52, j = 0; i <= 61; i++, j++) {
-        {
             lookUpBase64Alphabet[i] = (char) ('0' + j);
         }
         lookUpBase64Alphabet[62] = (char) '+';
         lookUpBase64Alphabet[63] = (char) '/';
     }
 
-    private static boolean isWhiteSpace(char octect)
+    private static boolean isWhiteSpace(char octect) {
-    {
         return (octect == 0x20 || octect == 0xd || octect == 0xa || octect == 0x9);
     }
 
-    private static boolean isPad(char octect)
+    private static boolean isPad(char octect) {
-    {
         return (octect == PAD);
     }
 
-    private static boolean isData(char octect)
+    private static boolean isData(char octect) {
-    {
         return (octect < BASELENGTH && base64Alphabet[octect] != -1);
     }
 
@@ -80,16 +68,13 @@ public final class Base64
      * @param binaryData Array containing binaryData
      * @return Encoded Base64 array
      */
-    public static String encode(byte[] binaryData)
+    public static String encode(byte[] binaryData) {
-    {
+        if (binaryData == null) {
-        if (binaryData == null)
-        {
             return null;
         }
 
         int lengthDataBits = binaryData.length * EIGHTBIT;
-        if (lengthDataBits == 0)
+        if (lengthDataBits == 0) {
-        {
             return "";
         }
 
@@ -105,8 +90,7 @@ public final class Base64
         int encodedIndex = 0;
         int dataIndex = 0;
 
-        for (int i = 0; i < numberTriplets; i++)
+        for (int i = 0; i < numberTriplets; i++) {
-        {
             b1 = binaryData[dataIndex++];
             b2 = binaryData[dataIndex++];
             b3 = binaryData[dataIndex++];
@@ -125,8 +109,7 @@ public final class Base64
         }
 
         // form integral number of 6-bit groups
-        if (fewerThan24bits == EIGHTBIT)
+        if (fewerThan24bits == EIGHTBIT) {
-        {
             b1 = binaryData[dataIndex];
             k = (byte) (b1 & 0x03);
             byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
@@ -134,9 +117,7 @@ public final class Base64
             encodedData[encodedIndex++] = lookUpBase64Alphabet[k << 4];
             encodedData[encodedIndex++] = PAD;
             encodedData[encodedIndex++] = PAD;
-        }
+        } else if (fewerThan24bits == SIXTEENBIT) {
-        else if (fewerThan24bits == SIXTEENBIT)
-        {
             b1 = binaryData[dataIndex];
             b2 = binaryData[dataIndex + 1];
             l = (byte) (b2 & 0x0f);
@@ -159,10 +140,8 @@ public final class Base64
      * @param encoded string containing Base64 data
      * @return Array containind decoded data.
      */
-    public static byte[] decode(String encoded)
+    public static byte[] decode(String encoded) {
-    {
+        if (encoded == null) {
-        if (encoded == null)
-        {
             return null;
         }
 
@@ -170,15 +149,13 @@ public final class Base64
         // remove white spaces
         int len = removeWhiteSpace(base64Data);
 
-        if (len % FOURBYTE != 0)
+        if (len % FOURBYTE != 0) {
-        {
             return null;// should be divisible by four
         }
 
         int numberQuadruple = (len / FOURBYTE);
 
-        if (numberQuadruple == 0)
+        if (numberQuadruple == 0) {
-        {
             return new byte[0];
         }
 
@@ -191,12 +168,10 @@ public final class Base64
         int dataIndex = 0;
         decodedData = new byte[(numberQuadruple) * 3];
 
-        for (; i < numberQuadruple - 1; i++)
+        for (; i < numberQuadruple - 1; i++) {
-        {
 
             if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++]))
-                    || !isData((d3 = base64Data[dataIndex++])) || !isData((d4 = base64Data[dataIndex++])))
+                    || !isData((d3 = base64Data[dataIndex++])) || !isData((d4 = base64Data[dataIndex++]))) {
-            {
                 return null;
             } // if found "no data" just return null
 
@@ -210,8 +185,7 @@ public final class Base64
             decodedData[encodedIndex++] = (byte) (b3 << 6 | b4);
         }
 
-        if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++])))
+        if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++]))) {
-        {
             return null;// if found "no data" just return null
         }
 
@@ -220,10 +194,8 @@ public final class Base64
 
         d3 = base64Data[dataIndex++];
         d4 = base64Data[dataIndex++];
-        if (!isData((d3)) || !isData((d4)))
+        if (!isData((d3)) || !isData((d4))) {// Check if they are PAD characters
-        {// Check if they are PAD characters
+            if (isPad(d3) && isPad(d4)) {
-            if (isPad(d3) && isPad(d4))
-            {
                 if ((b2 & 0xf) != 0)// last 4 bits should be zero
                 {
                     return null;
@@ -232,9 +204,7 @@ public final class Base64
                 System.arraycopy(decodedData, 0, tmp, 0, i * 3);
                 tmp[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
                 return tmp;
-            }
+            } else if (!isPad(d3) && isPad(d4)) {
-            else if (!isPad(d3) && isPad(d4))
-            {
                 b3 = base64Alphabet[d3];
                 if ((b3 & 0x3) != 0)// last 2 bits should be zero
                 {
@@ -245,14 +215,10 @@ public final class Base64
                 tmp[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
                 tmp[encodedIndex] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
                 return tmp;
-            }
+            } else {
-            else
-            {
                 return null;
             }
-        }
+        } else { // No PAD e.g 3cQl
-        else
-        { // No PAD e.g 3cQl
             b3 = base64Alphabet[d3];
             b4 = base64Alphabet[d4];
             decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
@@ -269,20 +235,16 @@ public final class Base64
      * @param data the byte array of base64 data (with WS)
      * @return the new length
      */
-    private static int removeWhiteSpace(char[] data)
+    private static int removeWhiteSpace(char[] data) {
-    {
+        if (data == null) {
-        if (data == null)
-        {
             return 0;
         }
 
         // count characters that's not whitespace
         int newSize = 0;
         int len = data.length;
-        for (int i = 0; i < len; i++)
+        for (int i = 0; i < len; i++) {
-        {
+            if (!isWhiteSpace(data[i])) {
-            if (!isWhiteSpace(data[i]))
-            {
                 data[newSize++] = data[i];
             }
         }

hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/sign/Md5Utils.java

@@ -1,6 +1,7 @@
 package com.hchyun.common.utils.sign;
 
 import java.security.MessageDigest;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -9,41 +10,32 @@ import org.slf4j.LoggerFactory;
  *
  * @author hchyun
  */
-public class Md5Utils
+public class Md5Utils {
-{
     private static final Logger log = LoggerFactory.getLogger(Md5Utils.class);
 
-    private static byte[] md5(String s)
+    private static byte[] md5(String s) {
-    {
         MessageDigest algorithm;
-        try
+        try {
-        {
             algorithm = MessageDigest.getInstance("MD5");
             algorithm.reset();
             algorithm.update(s.getBytes("UTF-8"));
             byte[] messageDigest = algorithm.digest();
             return messageDigest;
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             log.error("MD5 Error...", e);
         }
         return null;
     }
 
-    private static final String toHex(byte hash[])
+    private static final String toHex(byte hash[]) {
-    {
+        if (hash == null) {
-        if (hash == null)
-        {
             return null;
         }
         StringBuffer buf = new StringBuffer(hash.length * 2);
         int i;
 
-        for (i = 0; i < hash.length; i++)
+        for (i = 0; i < hash.length; i++) {
-        {
+            if ((hash[i] & 0xff) < 0x10) {
-            if ((hash[i] & 0xff) < 0x10)
-            {
                 buf.append("0");
             }
             buf.append(Long.toString(hash[i] & 0xff, 16));
@@ -51,14 +43,10 @@ public class Md5Utils
         return buf.toString();
     }
 
-    public static String hash(String s)
+    public static String hash(String s) {
-    {
+        try {
-        try
-        {
             return new String(toHex(md5(s)).getBytes("UTF-8"), "UTF-8");
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             log.error("not supported charset...{}", e);
             return s;
         }

hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/spring/SpringUtils.java

@@ -16,22 +16,21 @@ import com.hchyun.common.utils.StringUtils;
  * @author hchyun
  */
 @Component
-public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationContextAware 
+public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationContextAware {
-{
+    /**
-    /** Spring应用上下文环境 */
+     * Spring应用上下文环境
+     */
     private static ConfigurableListableBeanFactory beanFactory;
 
     private static ApplicationContext applicationContext;
 
     @Override
-    public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException 
+    public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
-    {
         SpringUtils.beanFactory = beanFactory;
     }
 
     @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException 
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-    {
         SpringUtils.applicationContext = applicationContext;
     }
 
@@ -41,11 +40,9 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
      * @param name
      * @return Object 一个以所给名字注册的bean的实例
      * @throws org.springframework.beans.BeansException
-     *
      */
     @SuppressWarnings("unchecked")
-    public static <T> T getBean(String name) throws BeansException
+    public static <T> T getBean(String name) throws BeansException {
-    {
         return (T) beanFactory.getBean(name);
     }
 
@@ -55,10 +52,8 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
      * @param clz
      * @return
      * @throws org.springframework.beans.BeansException
-     *
      */
-    public static <T> T getBean(Class<T> clz) throws BeansException
+    public static <T> T getBean(Class<T> clz) throws BeansException {
-    {
         T result = (T) beanFactory.getBean(clz);
         return result;
     }
@@ -69,8 +64,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
      * @param name
      * @return boolean
      */
-    public static boolean containsBean(String name)
+    public static boolean containsBean(String name) {
-    {
         return beanFactory.containsBean(name);
     }
 
@@ -80,10 +74,8 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
      * @param name
      * @return boolean
      * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
-     *
      */
-    public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException
+    public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException {
-    {
         return beanFactory.isSingleton(name);
     }
 
@@ -91,10 +83,8 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
      * @param name
      * @return Class 注册对象的类型
      * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
-     *
      */
-    public static Class<?> getType(String name) throws NoSuchBeanDefinitionException
+    public static Class<?> getType(String name) throws NoSuchBeanDefinitionException {
-    {
         return beanFactory.getType(name);
     }
 
@@ -104,10 +94,8 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
      * @param name
      * @return
      * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
-     *
      */
-    public static String[] getAliases(String name) throws NoSuchBeanDefinitionException
+    public static String[] getAliases(String name) throws NoSuchBeanDefinitionException {
-    {
         return beanFactory.getAliases(name);
     }
 
@@ -118,8 +106,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
      * @return
      */
     @SuppressWarnings("unchecked")
-    public static <T> T getAopProxy(T invoker)
+    public static <T> T getAopProxy(T invoker) {
-    {
         return (T) AopContext.currentProxy();
     }
 
@@ -128,8 +115,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
      *
      * @return 当前的环境配置
      */
-    public static String[] getActiveProfiles()
+    public static String[] getActiveProfiles() {
-    {
         return applicationContext.getEnvironment().getActiveProfiles();
     }
 
@@ -138,8 +124,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
      *
      * @return 当前的环境配置
      */
-    public static String getActiveProfile()
+    public static String getActiveProfile() {
-    {
         final String[] activeProfiles = getActiveProfiles();
         return StringUtils.isNotEmpty(activeProfiles) ? activeProfiles[0] : null;
     }

hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/sql/SqlUtil.java

@@ -8,8 +8,7 @@ import com.hchyun.common.utils.StringUtils;
  *
  * @author hchyun
  */
-public class SqlUtil
+public class SqlUtil {
-{
     /**
      * 仅支持字母、数字、下划线、空格、逗号、小数点（支持多个字段排序）
      */
@@ -18,10 +17,8 @@ public class SqlUtil
     /**
      * 检查字符，防止注入绕过
      */
-    public static String escapeOrderBySql(String value)
+    public static String escapeOrderBySql(String value) {
-    {
+        if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value)) {
-        if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value))
-        {
             throw new BaseException("参数不符合规范，不能进行查询");
         }
         return value;
@@ -30,8 +27,7 @@ public class SqlUtil
     /**
      * 验证 order by 语法是否符合规范
      */
-    public static boolean isValidOrderBySql(String value)
+    public static boolean isValidOrderBySql(String value) {
-    {
         return value.matches(SQL_PATTERN);
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/uuid/IdUtils.java

@@ -5,15 +5,13 @@ package com.hchyun.common.utils.uuid;
  *
  * @author hchyun
  */
-public class IdUtils
+public class IdUtils {
-{
     /**
      * 获取随机UUID
      *
      * @return 随机UUID
      */
-    public static String randomUUID()
+    public static String randomUUID() {
-    {
         return UUID.randomUUID().toString();
     }
 
@@ -22,8 +20,7 @@ public class IdUtils
      *
      * @return 简化的UUID，去掉了横线
      */
-    public static String simpleUUID()
+    public static String simpleUUID() {
-    {
         return UUID.randomUUID().toString(true);
     }
 
@@ -32,8 +29,7 @@ public class IdUtils
      *
      * @return 随机UUID
      */
-    public static String fastUUID()
+    public static String fastUUID() {
-    {
         return UUID.fastUUID().toString();
     }
 
@@ -42,8 +38,7 @@ public class IdUtils
      *
      * @return 简化的UUID，去掉了横线
      */
-    public static String fastSimpleUUID()
+    public static String fastSimpleUUID() {
-    {
         return UUID.fastUUID().toString(true);
     }
 }

hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/uuid/UUID.java

@@ -5,6 +5,7 @@ import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;
+
 import com.hchyun.common.exception.UtilException;
 
 /**
@@ -12,23 +13,24 @@ import com.hchyun.common.exception.UtilException;
  *
  * @author hchyun
  */
-public final class UUID implements java.io.Serializable, Comparable<UUID>
+public final class UUID implements java.io.Serializable, Comparable<UUID> {
-{
     private static final long serialVersionUID = -1185015143654744140L;
 
     /**
      * SecureRandom 的单例
-     *
      */
-    private static class Holder
+    private static class Holder {
-    {
         static final SecureRandom numberGenerator = getSecureRandom();
     }
 
-    /** 此UUID的最高64有效位 */
+    /**
+     * 此UUID的最高64有效位
+     */
     private final long mostSigBits;
 
-    /** 此UUID的最低64有效位 */
+    /**
+     * 此UUID的最低64有效位
+     */
     private final long leastSigBits;
 
     /**
@@ -36,17 +38,14 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
      *
      * @param data 数据
      */
-    private UUID(byte[] 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++)
+        for (int i = 0; i < 8; i++) {
-        {
             msb = (msb << 8) | (data[i] & 0xff);
         }
-        for (int i = 8; i < 16; i++)
+        for (int i = 8; i < 16; i++) {
-        {
             lsb = (lsb << 8) | (data[i] & 0xff);
         }
         this.mostSigBits = msb;
@@ -59,8 +58,7 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
      * @param mostSigBits  用于 {@code UUID} 的最高有效 64 位
      * @param leastSigBits 用于 {@code UUID} 的最低有效 64 位
      */
-    public UUID(long mostSigBits, long leastSigBits)
+    public UUID(long mostSigBits, long leastSigBits) {
-    {
         this.mostSigBits = mostSigBits;
         this.leastSigBits = leastSigBits;
     }
@@ -70,8 +68,7 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
      *
      * @return 随机生成的 {@code UUID}
      */
-    public static UUID fastUUID()
+    public static UUID fastUUID() {
-    {
         return randomUUID(false);
     }
 
@@ -80,8 +77,7 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
      *
      * @return 随机生成的 {@code UUID}
      */
-    public static UUID randomUUID()
+    public static UUID randomUUID() {
-    {
         return randomUUID(true);
     }
 
@@ -91,8 +87,7 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
      * @param isSecure 是否使用{@link SecureRandom}如果是可以获得更安全的随机码，否则可以得到更好的性能
      * @return 随机生成的 {@code UUID}
      */
-    public static UUID randomUUID(boolean isSecure)
+    public static UUID randomUUID(boolean isSecure) {
-    {
         final Random ng = isSecure ? Holder.numberGenerator : getRandom();
 
         byte[] randomBytes = new byte[16];
@@ -108,18 +103,13 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
      * 根据指定的字节数组获取类型 3（基于名称的）UUID 的静态工厂。
      *
      * @param name 用于构造 UUID 的字节数组。
-     *
      * @return 根据指定数组生成的 {@code UUID}
      */
-    public static UUID nameUUIDFromBytes(byte[] name)
+    public static UUID nameUUIDFromBytes(byte[] name) {
-    {
         MessageDigest md;
-        try
+        try {
-        {
             md = MessageDigest.getInstance("MD5");
-        }
+        } catch (NoSuchAlgorithmException nsae) {
-        catch (NoSuchAlgorithmException nsae)
-        {
             throw new InternalError("MD5 not supported");
         }
         byte[] md5Bytes = md.digest(name);
@@ -136,17 +126,13 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
      * @param name 指定 {@code UUID} 字符串
      * @return 具有指定值的 {@code UUID}
      * @throws IllegalArgumentException 如果 name 与 {@link #toString} 中描述的字符串表示形式不符抛出此异常
-     *
      */
-    public static UUID fromString(String name)
+    public static UUID fromString(String name) {
-    {
         String[] components = name.split("-");
-        if (components.length != 5)
+        if (components.length != 5) {
-        {
             throw new IllegalArgumentException("Invalid UUID string: " + name);
         }
-        for (int i = 0; i < 5; i++)
+        for (int i = 0; i < 5; i++) {
-        {
             components[i] = "0x" + components[i];
         }
 
@@ -168,8 +154,7 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
      *
      * @return 此 UUID 的 128 位值中的最低有效 64 位。
      */
-    public long getLeastSignificantBits()
+    public long getLeastSignificantBits() {
-    {
         return leastSigBits;
     }
 
@@ -178,8 +163,7 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
      *
      * @return 此 UUID 的 128 位值中最高有效 64 位。
      */
-    public long getMostSignificantBits()
+    public long getMostSignificantBits() {
-    {
         return mostSigBits;
     }
 
@@ -196,8 +180,7 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
      *
      * @return 此 {@code UUID} 的版本号
      */
-    public int version()
+    public int version() {
-    {
         // Version is bits masked by 0x000000000000F000 in MS long
         return (int) ((mostSigBits >> 12) & 0x0f);
     }
@@ -215,8 +198,7 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
      *
      * @return 此 {@code UUID} 相关联的变体号
      */
-    public int variant()
+    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)
@@ -238,8 +220,7 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
      *
      * @throws UnsupportedOperationException 如果此 {@code UUID} 不是 version 为 1 的 UUID。
      */
-    public long timestamp() throws UnsupportedOperationException
+    public long timestamp() throws UnsupportedOperationException {
-    {
         checkTimeBase();
         return (mostSigBits & 0x0FFFL) << 48//
                 | ((mostSigBits >> 16) & 0x0FFFFL) << 32//
@@ -256,11 +237,9 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
      * UnsupportedOperationException。
      *
      * @return 此 {@code UUID} 的时钟序列
-     *
      * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1
      */
-    public int clockSequence() throws UnsupportedOperationException
+    public int clockSequence() throws UnsupportedOperationException {
-    {
         checkTimeBase();
         return (int) ((leastSigBits & 0x3FFF000000000000L) >>> 48);
     }
@@ -275,11 +254,9 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
      * 如果此 UUID 不是基于时间的 UUID，则此方法抛出 UnsupportedOperationException。
      *
      * @return 此 {@code UUID} 的节点值
-     *
      * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1
      */
-    public long node() throws UnsupportedOperationException
+    public long node() throws UnsupportedOperationException {
-    {
         checkTimeBase();
         return leastSigBits & 0x0000FFFFFFFFFFFFL;
     }
@@ -309,8 +286,7 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
      * @see #toString(boolean)
      */
     @Override
-    public String toString()
+    public String toString() {
-    {
         return toString(false);
     }
 
@@ -338,31 +314,26 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
      * @param isSimple 是否简单模式，简单模式为不带'-'的UUID字符串
      * @return 此{@code UUID} 的字符串表现形式
      */
-    public String toString(boolean isSimple)
+    public String toString(boolean isSimple) {
-    {
         final StringBuilder builder = new StringBuilder(isSimple ? 32 : 36);
         // time_low
         builder.append(digits(mostSigBits >> 32, 8));
-        if (false == isSimple)
+        if (false == isSimple) {
-        {
             builder.append('-');
         }
         // time_mid
         builder.append(digits(mostSigBits >> 16, 4));
-        if (false == isSimple)
+        if (false == isSimple) {
-        {
             builder.append('-');
         }
         // time_high_and_version
         builder.append(digits(mostSigBits, 4));
-        if (false == isSimple)
+        if (false == isSimple) {
-        {
             builder.append('-');
         }
         // variant_and_sequence
         builder.append(digits(leastSigBits >> 48, 4));
-        if (false == isSimple)
+        if (false == isSimple) {
-        {
             builder.append('-');
         }
         // node
@@ -377,8 +348,7 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
      * @return UUID 的哈希码值。
      */
     @Override
-    public int hashCode()
+    public int hashCode() {
-    {
         long hilo = mostSigBits ^ leastSigBits;
         return ((int) (hilo >> 32)) ^ (int) hilo;
     }
@@ -389,14 +359,11 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
      * 当且仅当参数不为 {@code null}、而是一个 UUID 对象、具有与此 UUID 相同的 varriant、包含相同的值（每一位均相同）时，结果才为 {@code true}。
      *
      * @param obj 要与之比较的对象
-     *
      * @return 如果对象相同，则返回 {@code true}；否则返回 {@code false}
      */
     @Override
-    public boolean equals(Object obj)
+    public boolean equals(Object obj) {
-    {
+        if ((null == obj) || (obj.getClass() != UUID.class)) {
-        if ((null == obj) || (obj.getClass() != UUID.class))
-        {
             return false;
         }
         UUID id = (UUID) obj;
@@ -412,13 +379,10 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
      * 如果两个 UUID 不同，且第一个 UUID 的最高有效字段大于第二个 UUID 的对应字段，则第一个 UUID 大于第二个 UUID。
      *
      * @param val 与此 UUID 比较的 UUID
-     *
      * @return 在此 UUID 小于、等于或大于 val 时，分别返回 -1、0 或 1。
-     *
      */
     @Override
-    public int compareTo(UUID val)
+    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 : //
@@ -430,6 +394,7 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
 
     // -------------------------------------------------------------------------------------------------------------------
     // Private method start
+
     /**
      * 返回指定数字对应的hex值
      *
@@ -437,8 +402,7 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
      * @param digits 位
      * @return 值
      */
-    private static String digits(long val, int digits)
+    private static String digits(long val, int digits) {
-    {
         long hi = 1L << (digits * 4);
         return Long.toHexString(hi | (val & (hi - 1))).substring(1);
     }
@@ -446,10 +410,8 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
     /**
      * 检查是否为time-based版本UUID
      */
-    private void checkTimeBase()
+    private void checkTimeBase() {
-    {
+        if (version() != 1) {
-        if (version() != 1)
-        {
             throw new UnsupportedOperationException("Not a time-based UUID");
         }
     }
@@ -459,14 +421,10 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
      *
      * @return {@link SecureRandom}
      */
-    public static SecureRandom getSecureRandom()
+    public static SecureRandom getSecureRandom() {
-    {
+        try {
-        try
-        {
             return SecureRandom.getInstance("SHA1PRNG");
-        }
+        } catch (NoSuchAlgorithmException e) {
-        catch (NoSuchAlgorithmException e)
-        {
             throw new UtilException(e);
         }
     }
@@ -477,8 +435,7 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
      *
      * @return {@link ThreadLocalRandom}
      */
-    public static ThreadLocalRandom getRandom()
+    public static ThreadLocalRandom getRandom() {
-    {
         return ThreadLocalRandom.current();
     }
 }

hchyun/hchyun-framework/src/main/java/com/hchyun/framework/aspectj/DataScopeAspect.java

@@ -1,6 +1,7 @@
 package com.hchyun.framework.aspectj;
 
 import java.lang.reflect.Method;
+
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.Signature;
 import org.aspectj.lang.annotation.Aspect;
@@ -25,8 +26,7 @@ import com.hchyun.framework.web.service.TokenService;
  */
 @Aspect
 @Component
-public class DataScopeAspect
+public class DataScopeAspect {
-{
     /**
      * 全部数据权限
      */
@@ -59,32 +59,26 @@ public class DataScopeAspect
 
     // 配置织入点
     @Pointcut("@annotation(com.hchyun.common.annotation.DataScope)")
-    public void dataScopePointCut()
+    public void dataScopePointCut() {
-    {
     }
 
     @Before("dataScopePointCut()")
-    public void doBefore(JoinPoint point) throws Throwable
+    public void doBefore(JoinPoint point) throws Throwable {
-    {
         handleDataScope(point);
     }
 
-    protected void handleDataScope(final JoinPoint joinPoint)
+    protected void handleDataScope(final JoinPoint joinPoint) {
-    {
         // 获得注解
         DataScope controllerDataScope = getAnnotationLog(joinPoint);
-        if (controllerDataScope == null)
+        if (controllerDataScope == null) {
-        {
             return;
         }
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        if (StringUtils.isNotNull(loginUser))
+        if (StringUtils.isNotNull(loginUser)) {
-        {
             SysUser currentUser = loginUser.getUser();
             // 如果是超级管理员，则不过滤数据
-            if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
+            if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin()) {
-            {
                 dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
                         controllerDataScope.userAlias());
             }
@@ -98,53 +92,37 @@ public class DataScopeAspect
      * @param user      用户
      * @param userAlias 别名
      */
-    public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias)
+    public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias) {
-    {
         StringBuilder sqlString = new StringBuilder();
 
-        for (SysRole role : user.getRoles())
+        for (SysRole role : user.getRoles()) {
-        {
             String dataScope = role.getDataScope();
-            if (DATA_SCOPE_ALL.equals(dataScope))
+            if (DATA_SCOPE_ALL.equals(dataScope)) {
-            {
                 sqlString = new StringBuilder();
                 break;
-            }
+            } else if (DATA_SCOPE_CUSTOM.equals(dataScope)) {
-            else if (DATA_SCOPE_CUSTOM.equals(dataScope))
-            {
                 sqlString.append(StringUtils.format(
                         " OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias,
                         role.getRoleId()));
-            }
+            } else if (DATA_SCOPE_DEPT.equals(dataScope)) {
-            else if (DATA_SCOPE_DEPT.equals(dataScope))
-            {
                 sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
-            }
+            } else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope)) {
-            else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
-            {
                 sqlString.append(StringUtils.format(
                         " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
                         deptAlias, user.getDeptId(), user.getDeptId()));
-            }
+            } else if (DATA_SCOPE_SELF.equals(dataScope)) {
-            else if (DATA_SCOPE_SELF.equals(dataScope))
+                if (StringUtils.isNotBlank(userAlias)) {
-            {
-                if (StringUtils.isNotBlank(userAlias))
-                {
                     sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
-                }
+                } else {
-                else
-                {
                     // 数据权限为仅本人且没有userAlias别名不查询任何数据
                     sqlString.append(" OR 1=0 ");
                 }
             }
         }
 
-        if (StringUtils.isNotBlank(sqlString.toString()))
+        if (StringUtils.isNotBlank(sqlString.toString())) {
-        {
             Object params = joinPoint.getArgs()[0];
-            if (StringUtils.isNotNull(params) && params instanceof BaseEntity)
+            if (StringUtils.isNotNull(params) && params instanceof BaseEntity) {
-            {
                 BaseEntity baseEntity = (BaseEntity) params;
                 baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
             }
@@ -154,14 +132,12 @@ public class DataScopeAspect
     /**
      * 是否存在注解，如果存在就获取
      */
-    private DataScope getAnnotationLog(JoinPoint joinPoint)
+    private DataScope getAnnotationLog(JoinPoint joinPoint) {
-    {
         Signature signature = joinPoint.getSignature();
         MethodSignature methodSignature = (MethodSignature) signature;
         Method method = methodSignature.getMethod();
 
-        if (method != null)
+        if (method != null) {
-        {
             return method.getAnnotation(DataScope.class);
         }
         return null;

hchyun/hchyun-framework/src/main/java/com/hchyun/framework/aspectj/DataSourceAspect.java

@@ -1,6 +1,7 @@
 package com.hchyun.framework.aspectj;
 
 import java.util.Objects;
+
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -23,33 +24,26 @@ import com.hchyun.framework.datasource.DynamicDataSourceContextHolder;
 @Aspect
 @Order(1)
 @Component
-public class DataSourceAspect
+public class DataSourceAspect {
-{
     protected Logger logger = LoggerFactory.getLogger(getClass());
 
     @Pointcut("@annotation(com.hchyun.common.annotation.DataSource)"
             + "|| @within(com.hchyun.common.annotation.DataSource)")
-    public void dsPointCut()
+    public void dsPointCut() {
-    {
 
     }
 
     @Around("dsPointCut()")
-    public Object around(ProceedingJoinPoint point) throws Throwable
+    public Object around(ProceedingJoinPoint point) throws Throwable {
-    {
         DataSource dataSource = getDataSource(point);
 
-        if (StringUtils.isNotNull(dataSource))
+        if (StringUtils.isNotNull(dataSource)) {
-        {
             DynamicDataSourceContextHolder.setDataSourceType(dataSource.value().name());
         }
 
-        try
+        try {
-        {
             return point.proceed();
-        }
+        } finally {
-        finally
-        {
             // 销毁数据源 在执行方法之后
             DynamicDataSourceContextHolder.clearDataSourceType();
         }
@@ -58,12 +52,10 @@ public class DataSourceAspect
     /**
      * 获取需要切换的数据源
      */
-    public DataSource getDataSource(ProceedingJoinPoint point)
+    public DataSource getDataSource(ProceedingJoinPoint point) {
-    {
         MethodSignature signature = (MethodSignature) point.getSignature();
         DataSource dataSource = AnnotationUtils.findAnnotation(signature.getMethod(), DataSource.class);
-        if (Objects.nonNull(dataSource))
+        if (Objects.nonNull(dataSource)) {
-        {
             return dataSource;
         }
 

hchyun/hchyun-framework/src/main/java/com/hchyun/framework/aspectj/LogAspect.java

@@ -4,6 +4,7 @@ import java.lang.reflect.Method;
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.Signature;
 import org.aspectj.lang.annotation.AfterReturning;
@@ -37,14 +38,12 @@ import com.hchyun.system.entity.SysOperLog;
  */
 @Aspect
 @Component
-public class LogAspect
+public class LogAspect {
-{
     private static final Logger log = LoggerFactory.getLogger(LogAspect.class);
 
     // 配置织入点
     @Pointcut("@annotation(com.hchyun.common.annotation.Log)")
-    public void logPointCut()
+    public void logPointCut() {
-    {
     }
 
     /**
@@ -53,8 +52,7 @@ public class LogAspect
      * @param joinPoint 切点
      */
     @AfterReturning(pointcut = "logPointCut()", returning = "jsonResult")
-    public void doAfterReturning(JoinPoint joinPoint, Object jsonResult)
+    public void doAfterReturning(JoinPoint joinPoint, Object jsonResult) {
-    {
         handleLog(joinPoint, null, jsonResult);
     }
 
@@ -65,19 +63,15 @@ public class LogAspect
      * @param e         异常
      */
     @AfterThrowing(value = "logPointCut()", throwing = "e")
-    public void doAfterThrowing(JoinPoint joinPoint, Exception e)
+    public void doAfterThrowing(JoinPoint joinPoint, Exception e) {
-    {
         handleLog(joinPoint, e, null);
     }
 
-    protected void handleLog(final JoinPoint joinPoint, final Exception e, Object jsonResult)
+    protected void handleLog(final JoinPoint joinPoint, final Exception e, Object jsonResult) {
-    {
+        try {
-        try
-        {
             // 获得注解
             Log controllerLog = getAnnotationLog(joinPoint);
-            if (controllerLog == null)
+            if (controllerLog == null) {
-            {
                 return;
             }
 
@@ -94,13 +88,11 @@ public class LogAspect
             operLog.setJsonResult(JSON.toJSONString(jsonResult));
 
             operLog.setOperUrl(ServletUtils.getRequest().getRequestURI());
-            if (loginUser != null)
+            if (loginUser != null) {
-            {
                 operLog.setOperName(loginUser.getUsername());
             }
 
-            if (e != null)
+            if (e != null) {
-            {
                 operLog.setStatus(BusinessStatus.FAIL.ordinal());
                 operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000));
             }
@@ -114,9 +106,7 @@ public class LogAspect
             getControllerMethodDescription(joinPoint, controllerLog, operLog);
             // 保存数据库
             AsyncDao.me().execute(AsyncFactory.recordOper(operLog));
-        }
+        } catch (Exception exp) {
-        catch (Exception exp)
-        {
             // 记录本地异常日志
             log.error("==前置通知异常==");
             log.error("异常信息:{}", exp.getMessage());
@@ -131,8 +121,7 @@ public class LogAspect
      * @param operLog 操作日志
      * @throws Exception
      */
-    public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperLog operLog) throws Exception
+    public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperLog operLog) throws Exception {
-    {
         // 设置action动作
         operLog.setBusinessType(log.businessType().ordinal());
         // 设置标题
@@ -140,8 +129,7 @@ public class LogAspect
         // 设置操作人类别
         operLog.setOperatorType(log.operatorType().ordinal());
         // 是否需要保存request，参数和值
-        if (log.isSaveRequestData())
+        if (log.isSaveRequestData()) {
-        {
             // 获取参数的信息，传入到数据库中。
             setRequestValue(joinPoint, operLog);
         }
@@ -153,16 +141,12 @@ public class LogAspect
      * @param operLog 操作日志
      * @throws Exception 异常
      */
-    private void setRequestValue(JoinPoint joinPoint, SysOperLog operLog) throws Exception
+    private void setRequestValue(JoinPoint joinPoint, SysOperLog operLog) throws Exception {
-    {
         String requestMethod = operLog.getRequestMethod();
-        if (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod))
+        if (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod)) {
-        {
             String params = argsArrayToString(joinPoint.getArgs());
             operLog.setOperParam(StringUtils.substring(params, 0, 2000));
-        }
+        } else {
-        else
-        {
             Map<?, ?> paramsMap = (Map<?, ?>) ServletUtils.getRequest().getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
             operLog.setOperParam(StringUtils.substring(paramsMap.toString(), 0, 2000));
         }
@@ -171,14 +155,12 @@ public class LogAspect
     /**
      * 是否存在注解，如果存在就获取
      */
-    private Log getAnnotationLog(JoinPoint joinPoint) throws Exception
+    private Log getAnnotationLog(JoinPoint joinPoint) throws Exception {
-    {
         Signature signature = joinPoint.getSignature();
         MethodSignature methodSignature = (MethodSignature) signature;
         Method method = methodSignature.getMethod();
 
-        if (method != null)
+        if (method != null) {
-        {
             return method.getAnnotation(Log.class);
         }
         return null;
@@ -187,15 +169,11 @@ public class LogAspect
     /**
      * 参数拼装
      */
-    private String argsArrayToString(Object[] paramsArray)
+    private String argsArrayToString(Object[] paramsArray) {
-    {
         String params = "";
-        if (paramsArray != null && paramsArray.length > 0)
+        if (paramsArray != null && paramsArray.length > 0) {
-        {
+            for (int i = 0; i < paramsArray.length; i++) {
-            for (int i = 0; i < paramsArray.length; i++)
+                if (!isFilterObject(paramsArray[i])) {
-            {
-                if (!isFilterObject(paramsArray[i]))
-                {
                     Object jsonObj = JSON.toJSON(paramsArray[i]);
                     params += jsonObj.toString() + " ";
                 }
@@ -210,8 +188,7 @@ public class LogAspect
      * @param o 对象信息。
      * @return 如果是需要过滤的对象，则返回true；否则返回false。
      */
-    public boolean isFilterObject(final Object o)
+    public boolean isFilterObject(final Object o) {
-    {
         return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse;
     }
 }

hchyun/hchyun-framework/src/main/java/com/hchyun/framework/config/ApplicationConfig.java

@@ -1,6 +1,7 @@
 package com.hchyun.framework.config;
 
 import java.util.TimeZone;
+
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
 import org.springframework.context.annotation.Bean;
@@ -17,14 +18,12 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
 @EnableAspectJAutoProxy(exposeProxy = true)
 // 指定要扫描的dao类的包的路径
 @MapperScan("com.hchyun.**.dao")
-public class ApplicationConfig
+public class ApplicationConfig {
-{
     /**
      * 时区配置
      */
     @Bean
-    public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization()
+    public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization() {
-    {
         return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(TimeZone.getDefault());
     }
 }

hchyun/hchyun-framework/src/main/java/com/hchyun/framework/config/CaptchaConfig.java

@@ -1,10 +1,12 @@
 package com.hchyun.framework.config;
 
 import java.util.Properties;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import com.google.code.kaptcha.impl.DefaultKaptcha;
 import com.google.code.kaptcha.util.Config;
+
 import static com.google.code.kaptcha.Constants.*;
 
 /**
@@ -13,11 +15,9 @@ import static com.google.code.kaptcha.Constants.*;
  * @author hchyun
  */
 @Configuration
-public class CaptchaConfig
+public class CaptchaConfig {
-{
     @Bean(name = "captchaProducer")
-    public DefaultKaptcha getKaptchaBean()
+    public DefaultKaptcha getKaptchaBean() {
-    {
         DefaultKaptcha defaultKaptcha = new DefaultKaptcha();
         Properties properties = new Properties();
         // 是否有边框 默认为true 我们可以自己设置yes，no
@@ -44,8 +44,7 @@ public class CaptchaConfig
     }
 
     @Bean(name = "captchaProducerMath")
-    public DefaultKaptcha getKaptchaBeanMath()
+    public DefaultKaptcha getKaptchaBeanMath() {
-    {
         DefaultKaptcha defaultKaptcha = new DefaultKaptcha();
         Properties properties = new Properties();
         // 是否有边框 默认为true 我们可以自己设置yes，no

hchyun/hchyun-framework/src/main/java/com/hchyun/framework/config/DruidConfig.java

@@ -9,6 +9,7 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.sql.DataSource;
+
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
@@ -30,12 +31,10 @@ import com.hchyun.framework.datasource.DynamicDataSource;
  * @author hchyun
  */
 @Configuration
-public class DruidConfig
+public class DruidConfig {
-{
     @Bean
     @ConfigurationProperties("spring.datasource.druid.master")
-    public DataSource masterDataSource(DruidProperties druidProperties)
+    public DataSource masterDataSource(DruidProperties druidProperties) {
-    {
         DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
         return druidProperties.dataSource(dataSource);
     }
@@ -43,16 +42,14 @@ public class DruidConfig
     @Bean
     @ConfigurationProperties("spring.datasource.druid.slave")
     @ConditionalOnProperty(prefix = "spring.datasource.druid.slave", name = "enabled", havingValue = "true")
-    public DataSource slaveDataSource(DruidProperties druidProperties)
+    public DataSource slaveDataSource(DruidProperties druidProperties) {
-    {
         DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
         return druidProperties.dataSource(dataSource);
     }
 
     @Bean(name = "dynamicDataSource")
     @Primary
-    public DynamicDataSource dataSource(DataSource masterDataSource)
+    public DynamicDataSource dataSource(DataSource masterDataSource) {
-    {
         Map<Object, Object> targetDataSources = new HashMap<>();
         targetDataSources.put(DataSourceType.MASTER.name(), masterDataSource);
         setDataSource(targetDataSources, DataSourceType.SLAVE.name(), "slaveDataSource");
@@ -66,15 +63,11 @@ public class DruidConfig
      * @param sourceName        数据源名称
      * @param beanName          bean名称
      */
-    public void setDataSource(Map<Object, Object> targetDataSources, String sourceName, String beanName)
+    public void setDataSource(Map<Object, Object> targetDataSources, String sourceName, String beanName) {
-    {
+        try {
-        try
-        {
             DataSource dataSource = SpringUtils.getBean(beanName);
             targetDataSources.put(sourceName, dataSource);
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
         }
     }
 
@@ -84,8 +77,7 @@ public class DruidConfig
     @SuppressWarnings({"rawtypes", "unchecked"})
     @Bean
     @ConditionalOnProperty(name = "spring.datasource.druid.statViewServlet.enabled", havingValue = "true")
-    public FilterRegistrationBean removeDruidFilterRegistrationBean(DruidStatProperties properties)
+    public FilterRegistrationBean removeDruidFilterRegistrationBean(DruidStatProperties properties) {
-    {
         // 获取web监控页面的参数
         DruidStatProperties.StatViewServlet config = properties.getStatViewServlet();
         // 提取common.js的配置路径
@@ -93,16 +85,14 @@ public class DruidConfig
         String commonJsPattern = pattern.replaceAll("\\*", "js/common.js");
         final String filePath = "support/http/resources/js/common.js";
         // 创建filter进行过滤
-        Filter filter = new Filter()
+        Filter filter = new Filter() {
-        {
             @Override
-            public void init(javax.servlet.FilterConfig filterConfig) throws ServletException
+            public void init(javax.servlet.FilterConfig filterConfig) throws ServletException {
-            {
             }
+
             @Override
             public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-                    throws IOException, ServletException
+                    throws IOException, ServletException {
-            {
                 chain.doFilter(request, response);
                 // 重置缓冲区，响应头不会被重置
                 response.resetBuffer();
@@ -113,9 +103,9 @@ public class DruidConfig
                 text = text.replaceAll("powered.*?shrek.wang</a>", "");
                 response.getWriter().write(text);
             }
+
             @Override
-            public void destroy()
+            public void destroy() {
-            {
             }
         };
         FilterRegistrationBean registrationBean = new FilterRegistrationBean();

hchyun/hchyun-framework/src/main/java/com/hchyun/framework/config/FastJson2JsonRedisSerializer.java

@@ -9,6 +9,7 @@ import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.data.redis.serializer.SerializationException;
 import com.alibaba.fastjson.parser.ParserConfig;
 import org.springframework.util.Assert;
+
 import java.nio.charset.Charset;
 
 /**
@@ -16,8 +17,7 @@ import java.nio.charset.Charset;
  *
  * @author hchyun
  */
-public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
+public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T> {
-{
     @SuppressWarnings("unused")
     private ObjectMapper objectMapper = new ObjectMapper();
 
@@ -25,32 +25,26 @@ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
 
     private Class<T> clazz;
 
-    static
+    static {
-    {
         ParserConfig.getGlobalInstance().setAutoTypeSupport(true);
     }
 
-    public FastJson2JsonRedisSerializer(Class<T> clazz)
+    public FastJson2JsonRedisSerializer(Class<T> clazz) {
-    {
         super();
         this.clazz = clazz;
     }
 
     @Override
-    public byte[] serialize(T t) throws SerializationException
+    public byte[] serialize(T t) throws SerializationException {
-    {
+        if (t == null) {
-        if (t == null)
-        {
             return new byte[0];
         }
         return JSON.toJSONString(t, SerializerFeature.WriteClassName).getBytes(DEFAULT_CHARSET);
     }
 
     @Override
-    public T deserialize(byte[] bytes) throws SerializationException
+    public T deserialize(byte[] bytes) throws SerializationException {
-    {
+        if (bytes == null || bytes.length <= 0) {
-        if (bytes == null || bytes.length <= 0)
-        {
             return null;
         }
         String str = new String(bytes, DEFAULT_CHARSET);
@@ -58,14 +52,12 @@ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
         return JSON.parseObject(str, clazz);
     }
 
-    public void setObjectMapper(ObjectMapper objectMapper)
+    public void setObjectMapper(ObjectMapper objectMapper) {
-    {
         Assert.notNull(objectMapper, "'objectMapper' must not be null");
         this.objectMapper = objectMapper;
     }
 
-    protected JavaType getJavaType(Class<?> clazz)
+    protected JavaType getJavaType(Class<?> clazz) {
-    {
         return TypeFactory.defaultInstance().constructType(clazz);
     }
 }

hchyun/hchyun-framework/src/main/java/com/hchyun/framework/config/FilterConfig.java

@@ -3,6 +3,7 @@ package com.hchyun.framework.config;
 import java.util.HashMap;
 import java.util.Map;
 import javax.servlet.DispatcherType;
+
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
@@ -17,8 +18,7 @@ import com.hchyun.common.utils.StringUtils;
  * @author hchyun
  */
 @Configuration
-public class FilterConfig
+public class FilterConfig {
-{
     @Value("${xss.enabled}")
     private String enabled;
 
@@ -30,8 +30,7 @@ public class FilterConfig
 
     @SuppressWarnings({"rawtypes", "unchecked"})
     @Bean
-    public FilterRegistrationBean xssFilterRegistration()
+    public FilterRegistrationBean xssFilterRegistration() {
-    {
         FilterRegistrationBean registration = new FilterRegistrationBean();
         registration.setDispatcherTypes(DispatcherType.REQUEST);
         registration.setFilter(new XssFilter());
@@ -47,8 +46,7 @@ public class FilterConfig
 
     @SuppressWarnings({"rawtypes", "unchecked"})
     @Bean
-    public FilterRegistrationBean someFilterRegistration()
+    public FilterRegistrationBean someFilterRegistration() {
-    {
         FilterRegistrationBean registration = new FilterRegistrationBean();
         registration.setFilter(new RepeatableFilter());
         registration.addUrlPatterns("/*");

hchyun/hchyun-framework/src/main/java/com/hchyun/framework/config/KaptchaTextCreator.java

@@ -1,6 +1,7 @@
 package com.hchyun.framework.config;
 
 import java.util.Random;
+
 import com.google.code.kaptcha.text.impl.DefaultTextCreator;
 
 /**
@@ -8,62 +9,47 @@ import com.google.code.kaptcha.text.impl.DefaultTextCreator;
  *
  * @author hchyun
  */
-public class KaptchaTextCreator extends DefaultTextCreator
+public class KaptchaTextCreator extends DefaultTextCreator {
-{
     private static final String[] CNUMBERS = "0,1,2,3,4,5,6,7,8,9,10".split(",");
 
     @Override
-    public String getText()
+    public String getText() {
-    {
         Integer result = 0;
         Random random = new Random();
         int x = random.nextInt(10);
         int y = random.nextInt(10);
         StringBuilder suChinese = new StringBuilder();
         int randomoperands = (int) Math.round(Math.random() * 2);
-        if (randomoperands == 0)
+        if (randomoperands == 0) {
-        {
             result = x * y;
             suChinese.append(CNUMBERS[x]);
             suChinese.append("*");
             suChinese.append(CNUMBERS[y]);
-        }
+        } else if (randomoperands == 1) {
-        else if (randomoperands == 1)
+            if (!(x == 0) && y % x == 0) {
-        {
-            if (!(x == 0) && y % x == 0)
-            {
                 result = y / x;
                 suChinese.append(CNUMBERS[y]);
                 suChinese.append("/");
                 suChinese.append(CNUMBERS[x]);
-            }
+            } else {
-            else
-            {
                 result = x + y;
                 suChinese.append(CNUMBERS[x]);
                 suChinese.append("+");
                 suChinese.append(CNUMBERS[y]);
             }
-        }
+        } else if (randomoperands == 2) {
-        else if (randomoperands == 2)
+            if (x >= y) {
-        {
-            if (x >= y)
-            {
                 result = x - y;
                 suChinese.append(CNUMBERS[x]);
                 suChinese.append("-");
                 suChinese.append(CNUMBERS[y]);
-            }
+            } else {
-            else
-            {
                 result = y - x;
                 suChinese.append(CNUMBERS[y]);
                 suChinese.append("-");
                 suChinese.append(CNUMBERS[x]);
             }
-        }
+        } else {
-        else
-        {
             result = x + y;
             suChinese.append(CNUMBERS[x]);
             suChinese.append("+");

hchyun/hchyun-framework/src/main/java/com/hchyun/framework/config/MyBatisConfig.java

@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import javax.sql.DataSource;
+
 import org.apache.ibatis.io.VFS;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
@@ -28,70 +29,53 @@ import org.springframework.util.ClassUtils;
  * @author hchyun
  */
 @Configuration
-public class MyBatisConfig
+public class MyBatisConfig {
-{
     @Autowired
     private Environment env;
 
     static final String DEFAULT_RESOURCE_PATTERN = "**/*.class";
 
-    public static String setTypeAliasesPackage(String typeAliasesPackage)
+    public static String setTypeAliasesPackage(String typeAliasesPackage) {
-    {
         ResourcePatternResolver resolver = (ResourcePatternResolver) new PathMatchingResourcePatternResolver();
         MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver);
         List<String> allResult = new ArrayList<String>();
-        try
+        try {
-        {
+            for (String aliasesPackage : typeAliasesPackage.split(",")) {
-            for (String aliasesPackage : typeAliasesPackage.split(","))
-            {
                 List<String> result = new ArrayList<String>();
                 aliasesPackage = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX
                         + ClassUtils.convertClassNameToResourcePath(aliasesPackage.trim()) + "/" + DEFAULT_RESOURCE_PATTERN;
                 Resource[] resources = resolver.getResources(aliasesPackage);
-                if (resources != null && resources.length > 0)
+                if (resources != null && resources.length > 0) {
-                {
                     MetadataReader metadataReader = null;
-                    for (Resource resource : resources)
+                    for (Resource resource : resources) {
-                    {
+                        if (resource.isReadable()) {
-                        if (resource.isReadable())
-                        {
                             metadataReader = metadataReaderFactory.getMetadataReader(resource);
-                            try
+                            try {
-                            {
                                 result.add(Class.forName(metadataReader.getClassMetadata().getClassName()).getPackage().getName());
-                            }
+                            } catch (ClassNotFoundException e) {
-                            catch (ClassNotFoundException e)
-                            {
                                 e.printStackTrace();
                             }
                         }
                     }
                 }
-                if (result.size() > 0)
+                if (result.size() > 0) {
-                {
                     HashSet<String> hashResult = new HashSet<String>(result);
                     allResult.addAll(hashResult);
                 }
             }
-            if (allResult.size() > 0)
+            if (allResult.size() > 0) {
-            {
                 typeAliasesPackage = String.join(",", (String[]) allResult.toArray(new String[0]));
-            }
+            } else {
-            else
-            {
                 throw new RuntimeException("mybatis typeAliasesPackage 路径扫描错误,参数typeAliasesPackage:" + typeAliasesPackage + "未找到任何包");
             }
-        }
+        } catch (IOException e) {
-        catch (IOException e)
-        {
             e.printStackTrace();
         }
         return typeAliasesPackage;
     }
 
     @Bean
-    public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception
+    public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception {
-    {
         String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage");
         String mapperLocations = env.getProperty("mybatis.mapperLocations");
         String configLocation = env.getProperty("mybatis.configLocation");

hchyun/hchyun-framework/src/main/java/com/hchyun/framework/config/RedisConfig.java

@@ -18,12 +18,10 @@ import com.fasterxml.jackson.databind.ObjectMapper;
  */
 @Configuration
 @EnableCaching
-public class RedisConfig extends CachingConfigurerSupport
+public class RedisConfig extends CachingConfigurerSupport {
-{
     @Bean
     @SuppressWarnings(value = {"unchecked", "rawtypes"})
-    public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory connectionFactory)
+    public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory connectionFactory) {
-    {
         RedisTemplate<Object, Object> template = new RedisTemplate<>();
         template.setConnectionFactory(connectionFactory);
 

hchyun/hchyun-framework/src/main/java/com/hchyun/framework/config/ServerConfig.java

@@ -1,6 +1,7 @@
 package com.hchyun.framework.config;
 
 import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.stereotype.Component;
 import com.hchyun.common.utils.ServletUtils;
 
@@ -10,21 +11,18 @@ import com.hchyun.common.utils.ServletUtils;
  * @author hchyun
  */
 @Component
-public class ServerConfig
+public class ServerConfig {
-{
     /**
      * 获取完整的请求路径，包括：域名，端口，上下文访问路径
      *
      * @return 服务地址
      */
-    public String getUrl()
+    public String getUrl() {
-    {
         HttpServletRequest request = ServletUtils.getRequest();
         return getDomain(request);
     }
 
-    public static String getDomain(HttpServletRequest request)
+    public static String getDomain(HttpServletRequest request) {
-    {
         StringBuffer url = request.getRequestURL();
         String contextPath = request.getServletContext().getContextPath();
         return url.delete(url.length() - request.getRequestURI().length(), url.length()).append(contextPath).toString();

hchyun/hchyun-framework/src/main/java/com/hchyun/framework/config/ThreadPoolConfig.java

@@ -3,6 +3,7 @@ package com.hchyun.framework.config;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.ThreadPoolExecutor;
+
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -15,8 +16,7 @@ import com.hchyun.common.utils.Threads;
  * @author hchyun
  **/
 @Configuration
-public class ThreadPoolConfig
+public class ThreadPoolConfig {
-{
     // 核心线程池大小
     private int corePoolSize = 50;
 
@@ -30,8 +30,7 @@ public class ThreadPoolConfig
     private int keepAliveSeconds = 300;
 
     @Bean(name = "threadPoolTaskExecutor")
-    public ThreadPoolTaskExecutor threadPoolTaskExecutor()
+    public ThreadPoolTaskExecutor threadPoolTaskExecutor() {
-    {
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
         executor.setMaxPoolSize(maxPoolSize);
         executor.setCorePoolSize(corePoolSize);
@@ -46,14 +45,11 @@ public class ThreadPoolConfig
      * 执行周期性或定时任务
      */
     @Bean(name = "scheduledExecutorService")
-    protected ScheduledExecutorService scheduledExecutorService()
+    protected ScheduledExecutorService scheduledExecutorService() {
-    {
         return new ScheduledThreadPoolExecutor(corePoolSize,
-                new BasicThreadFactory.Builder().namingPattern("schedule-pool-%d").daemon(true).build())
+                new BasicThreadFactory.Builder().namingPattern("schedule-pool-%d").daemon(true).build()) {
-        {
             @Override
-            protected void afterExecute(Runnable r, Throwable t)
+            protected void afterExecute(Runnable r, Throwable t) {
-            {
                 super.afterExecute(r, t);
                 Threads.printException(r, t);
             }

hchyun/hchyun-framework/src/main/java/com/hchyun/framework/config/properties/DruidProperties.java

@@ -10,8 +10,7 @@ import com.alibaba.druid.pool.DruidDataSource;
  * @author hchyun
  */
 @Configuration
-public class DruidProperties
+public class DruidProperties {
-{
     @Value("${spring.datasource.druid.initialSize}")
     private int initialSize;
 
@@ -45,8 +44,7 @@ public class DruidProperties
     @Value("${spring.datasource.druid.testOnReturn}")
     private boolean testOnReturn;
 
-    public DruidDataSource dataSource(DruidDataSource datasource)
+    public DruidDataSource dataSource(DruidDataSource datasource) {
-    {
         /** 配置初始化大小、最小、最大 */
         datasource.setInitialSize(initialSize);
         datasource.setMaxActive(maxActive);

hchyun/hchyun-framework/src/main/java/com/hchyun/framework/dao/AsyncDao.java

@@ -3,6 +3,7 @@ package com.hchyun.framework.dao;
 import java.util.TimerTask;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+
 import com.hchyun.common.utils.Threads;
 import com.hchyun.common.utils.spring.SpringUtils;
 
@@ -11,8 +12,7 @@ import com.hchyun.common.utils.spring.SpringUtils;
  *
  * @author hchyun
  */
-public class AsyncDao
+public class AsyncDao {
-{
     /**
      * 操作延迟10毫秒
      */
@@ -26,12 +26,12 @@ public class AsyncDao
     /**
      * 单例模式
      */
-    private AsyncDao(){}
+    private AsyncDao() {
+    }
 
     private static AsyncDao me = new AsyncDao();
 
-    public static AsyncDao me()
+    public static AsyncDao me() {
-    {
         return me;
     }
 
@@ -40,16 +40,14 @@ public class AsyncDao
      *
      * @param task 任务
      */
-    public void execute(TimerTask task)
+    public void execute(TimerTask task) {
-    {
         executor.schedule(task, OPERATE_DELAY_TIME, TimeUnit.MILLISECONDS);
     }
 
     /**
      * 停止任务线程池
      */
-    public void shutdown()
+    public void shutdown() {
-    {
         Threads.shutdownAndAwaitTermination(executor);
     }
 }

hchyun/hchyun-framework/src/main/java/com/hchyun/framework/dao/factory/AsyncFactory.java

@@ -1,6 +1,7 @@
 package com.hchyun.framework.dao.factory;
 
 import java.util.TimerTask;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.hchyun.common.constant.Constants;
@@ -20,8 +21,7 @@ import eu.bitwalker.useragentutils.UserAgent;
  *
  * @author hchyun
  */
-public class AsyncFactory
+public class AsyncFactory {
-{
     private static final Logger sys_user_logger = LoggerFactory.getLogger("sys-user");
 
     /**
@@ -34,15 +34,12 @@ public class AsyncFactory
      * @return 任务task
      */
     public static TimerTask recordLogininfor(final String username, final String status, final String message,
-            final Object... args)
+                                             final Object... args) {
-    {
         final UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent"));
         final String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
-        return new TimerTask()
+        return new TimerTask() {
-        {
             @Override
-            public void run()
+            public void run() {
-            {
                 String address = AddressUtils.getRealAddressByIP(ip);
                 StringBuilder s = new StringBuilder();
                 s.append(LogUtils.getBlock(ip));
@@ -65,12 +62,9 @@ public class AsyncFactory
                 logininfor.setOs(os);
                 logininfor.setMsg(message);
                 // 日志状态
-                if (Constants.LOGIN_SUCCESS.equals(status) || Constants.LOGOUT.equals(status))
+                if (Constants.LOGIN_SUCCESS.equals(status) || Constants.LOGOUT.equals(status)) {
-                {
                     logininfor.setStatus(Constants.SUCCESS);
-                }
+                } else if (Constants.LOGIN_FAIL.equals(status)) {
-                else if (Constants.LOGIN_FAIL.equals(status))
-                {
                     logininfor.setStatus(Constants.FAIL);
                 }
                 // 插入数据
@@ -85,13 +79,10 @@ public class AsyncFactory
      * @param operLog 操作日志信息
      * @return 任务task
      */
-    public static TimerTask recordOper(final SysOperLog operLog)
+    public static TimerTask recordOper(final SysOperLog operLog) {
-    {
+        return new TimerTask() {
-        return new TimerTask()
-        {
             @Override
-            public void run()
+            public void run() {
-            {
                 // 远程查询操作地点
                 operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp()));
                 SpringUtils.getBean(ISysOperLogService.class).insertOperlog(operLog);

hchyun/hchyun-framework/src/main/java/com/hchyun/framework/datasource/DynamicDataSource.java

@@ -2,6 +2,7 @@ package com.hchyun.framework.datasource;
 
 import java.util.Map;
 import javax.sql.DataSource;
+
 import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
 
 /**
@@ -9,18 +10,15 @@ import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
  *
  * @author hchyun
  */
-public class DynamicDataSource extends AbstractRoutingDataSource
+public class DynamicDataSource extends AbstractRoutingDataSource {
-{
+    public DynamicDataSource(DataSource defaultTargetDataSource, Map<Object, Object> targetDataSources) {
-    public DynamicDataSource(DataSource defaultTargetDataSource, Map<Object, Object> targetDataSources)
-    {
         super.setDefaultTargetDataSource(defaultTargetDataSource);
         super.setTargetDataSources(targetDataSources);
         super.afterPropertiesSet();
     }
 
     @Override
-    protected Object determineCurrentLookupKey()
+    protected Object determineCurrentLookupKey() {
-    {
         return DynamicDataSourceContextHolder.getDataSourceType();
     }
 }

hchyun/hchyun-framework/src/main/java/com/hchyun/framework/datasource/DynamicDataSourceContextHolder.java

@@ -8,8 +8,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author hchyun
  */
-public class DynamicDataSourceContextHolder
+public class DynamicDataSourceContextHolder {
-{
     public static final Logger log = LoggerFactory.getLogger(DynamicDataSourceContextHolder.class);
 
     /**
@@ -21,8 +20,7 @@ public class DynamicDataSourceContextHolder
     /**
      * 设置数据源的变量
      */
-    public static void setDataSourceType(String dsType)
+    public static void setDataSourceType(String dsType) {
-    {
         log.info("切换到{}数据源", dsType);
         CONTEXT_HOLDER.set(dsType);
     }
@@ -30,16 +28,14 @@ public class DynamicDataSourceContextHolder
     /**
      * 获得数据源的变量
      */
-    public static String getDataSourceType()
+    public static String getDataSourceType() {
-    {
         return CONTEXT_HOLDER.get();
     }
 
     /**
      * 清空数据源变量
      */
-    public static void clearDataSourceType()
+    public static void clearDataSourceType() {
-    {
         CONTEXT_HOLDER.remove();
     }
 }

hchyun/hchyun-framework/src/main/java/com/hchyun/framework/interceptor/RepeatSubmitInterceptor.java

@@ -3,6 +3,7 @@ package com.hchyun.framework.interceptor;
 import java.lang.reflect.Method;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.stereotype.Component;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
@@ -17,29 +18,22 @@ import com.hchyun.common.utils.ServletUtils;
  * @author hchyun
  */
 @Component
-public abstract class RepeatSubmitInterceptor extends HandlerInterceptorAdapter
+public abstract class RepeatSubmitInterceptor extends HandlerInterceptorAdapter {
-{
     @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-    {
+        if (handler instanceof HandlerMethod) {
-        if (handler instanceof HandlerMethod)
-        {
             HandlerMethod handlerMethod = (HandlerMethod) handler;
             Method method = handlerMethod.getMethod();
             RepeatSubmit annotation = method.getAnnotation(RepeatSubmit.class);
-            if (annotation != null)
+            if (annotation != null) {
-            {
+                if (this.isRepeatSubmit(request)) {
-                if (this.isRepeatSubmit(request))
-                {
                     AjaxResult ajaxResult = AjaxResult.error("不允许重复提交，请稍后再试");
                     ServletUtils.renderString(response, JSONObject.toJSONString(ajaxResult));
                     return false;
                 }
             }
             return true;
-        }
+        } else {
-        else
-        {
             return super.preHandle(request, response, handler);
         }
     }

hchyun/hchyun-framework/src/main/java/com/hchyun/framework/security/filter/JwtAuthenticationTokenFilter.java

@@ -5,6 +5,7 @@ import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -23,18 +24,15 @@ import com.hchyun.framework.web.service.TokenService;
  * @author hchyun
  */
 @Component
-public class JwtAuthenticationTokenFilter extends OncePerRequestFilter
+public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
-{
     @Autowired
     private TokenService tokenService;
 
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
-            throws ServletException, IOException
+            throws ServletException, IOException {
-    {
         LoginUser loginUser = tokenService.getLoginUser(request);
-        if (StringUtils.isNotNull(loginUser) && StringUtils.isNull(SecurityUtils.getAuthentication()))
+        if (StringUtils.isNotNull(loginUser) && StringUtils.isNull(SecurityUtils.getAuthentication())) {
-        {
             tokenService.verifyToken(loginUser);
             UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginUser, null, loginUser.getAuthorities());
             authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));

hchyun/hchyun-framework/src/main/java/com/hchyun/framework/security/handle/AuthenticationEntryPointImpl.java

@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.io.Serializable;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.stereotype.Component;
@@ -19,14 +20,12 @@ import com.hchyun.common.utils.StringUtils;
  * @author hchyun
  */
 @Component
-public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, Serializable
+public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, Serializable {
-{
     private static final long serialVersionUID = -8970718410437077606L;
 
     @Override
     public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e)
-            throws IOException
+            throws IOException {
-    {
         int code = HttpStatus.UNAUTHORIZED;
         String msg = StringUtils.format("请求访问：{}，认证失败，无法访问系统资源", request.getRequestURI());
         ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(code, msg)));

hchyun/hchyun-framework/src/main/java/com/hchyun/framework/security/handle/LogoutSuccessHandlerImpl.java

@@ -4,6 +4,7 @@ import java.io.IOException;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.core.Authentication;
@@ -25,8 +26,7 @@ import com.hchyun.framework.web.service.TokenService;
  * @author hchyun
  */
 @Configuration
-public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler
+public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler {
-{
     @Autowired
     private TokenService tokenService;
 
@@ -37,11 +37,9 @@ public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler
      */
     @Override
     public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication)
-            throws IOException, ServletException
+            throws IOException, ServletException {
-    {
         LoginUser loginUser = tokenService.getLoginUser(request);
-        if (StringUtils.isNotNull(loginUser))
+        if (StringUtils.isNotNull(loginUser)) {
-        {
             String userName = loginUser.getUsername();
             // 删除用户缓存记录
             tokenService.delLoginUser(loginUser.getToken());

hchyun/hchyun-framework/src/main/java/com/hchyun/framework/web/domain/Server.java

@@ -4,6 +4,7 @@ import java.net.UnknownHostException;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Properties;
+
 import com.hchyun.common.utils.Arith;
 import com.hchyun.common.utils.ip.IpUtils;
 import com.hchyun.framework.web.domain.server.Cpu;
@@ -26,8 +27,7 @@ import oshi.util.Util;
  *
  * @author hchyun
  */
-public class Server
+public class Server {
-{
     private static final int OSHI_WAIT_SECOND = 1000;
 
     /**
@@ -55,58 +55,47 @@ public class Server
      */
     private List<SysFile> sysFiles = new LinkedList<SysFile>();
 
-    public Cpu getCpu()
+    public Cpu getCpu() {
-    {
         return cpu;
     }
 
-    public void setCpu(Cpu cpu)
+    public void setCpu(Cpu cpu) {
-    {
         this.cpu = cpu;
     }
 
-    public Mem getMem()
+    public Mem getMem() {
-    {
         return mem;
     }
 
-    public void setMem(Mem mem)
+    public void setMem(Mem mem) {
-    {
         this.mem = mem;
     }
 
-    public Jvm getJvm()
+    public Jvm getJvm() {
-    {
         return jvm;
     }
 
-    public void setJvm(Jvm jvm)
+    public void setJvm(Jvm jvm) {
-    {
         this.jvm = jvm;
     }
 
-    public Sys getSys()
+    public Sys getSys() {
-    {
         return sys;
     }
 
-    public void setSys(Sys sys)
+    public void setSys(Sys sys) {
-    {
         this.sys = sys;
     }
 
-    public List<SysFile> getSysFiles()
+    public List<SysFile> getSysFiles() {
-    {
         return sysFiles;
     }
 
-    public void setSysFiles(List<SysFile> sysFiles)
+    public void setSysFiles(List<SysFile> sysFiles) {
-    {
         this.sysFiles = sysFiles;
     }
 
-    public void copyTo() throws Exception
+    public void copyTo() throws Exception {
-    {
         SystemInfo si = new SystemInfo();
         HardwareAbstractionLayer hal = si.getHardware();
 
@@ -124,8 +113,7 @@ public class Server
     /**
      * 设置CPU信息
      */
-    private void setCpuInfo(CentralProcessor processor)
+    private void setCpuInfo(CentralProcessor processor) {
-    {
         // CPU信息
         long[] prevTicks = processor.getSystemCpuLoadTicks();
         Util.sleep(OSHI_WAIT_SECOND);
@@ -150,8 +138,7 @@ public class Server
     /**
      * 设置内存信息
      */
-    private void setMemInfo(GlobalMemory memory)
+    private void setMemInfo(GlobalMemory memory) {
-    {
         mem.setTotal(memory.getTotal());
         mem.setUsed(memory.getTotal() - memory.getAvailable());
         mem.setFree(memory.getAvailable());
@@ -160,8 +147,7 @@ public class Server
     /**
      * 设置服务器信息
      */
-    private void setSysInfo()
+    private void setSysInfo() {
-    {
         Properties props = System.getProperties();
         sys.setComputerName(IpUtils.getHostName());
         sys.setComputerIp(IpUtils.getHostIp());
@@ -173,8 +159,7 @@ public class Server
     /**
      * 设置Java虚拟机
      */
-    private void setJvmInfo() throws UnknownHostException
+    private void setJvmInfo() throws UnknownHostException {
-    {
         Properties props = System.getProperties();
         jvm.setTotal(Runtime.getRuntime().totalMemory());
         jvm.setMax(Runtime.getRuntime().maxMemory());
@@ -186,12 +171,10 @@ public class Server
     /**
      * 设置磁盘信息
      */
-    private void setSysFiles(OperatingSystem os)
+    private void setSysFiles(OperatingSystem os) {
-    {
         FileSystem fileSystem = os.getFileSystem();
         List<OSFileStore> fsArray = fileSystem.getFileStores();
-        for (OSFileStore fs : fsArray)
+        for (OSFileStore fs : fsArray) {
-        {
             long free = fs.getUsableSpace();
             long total = fs.getTotalSpace();
             long used = total - free;
@@ -213,27 +196,19 @@ public class Server
      * @param size 字节大小
      * @return 转换后值
      */
-    public String convertFileSize(long size)
+    public String convertFileSize(long size) {
-    {
         long kb = 1024;
         long mb = kb * 1024;
         long gb = mb * 1024;
-        if (size >= gb)
+        if (size >= gb) {
-        {
             return String.format("%.1f GB", (float) size / gb);
-        }
+        } else if (size >= mb) {
-        else if (size >= mb)
-        {
             float f = (float) size / mb;
             return String.format(f > 100 ? "%.0f MB" : "%.1f MB", f);
-        }
+        } else if (size >= kb) {
-        else if (size >= kb)
-        {
             float f = (float) size / kb;
             return String.format(f > 100 ? "%.0f KB" : "%.1f KB", f);
-        }
+        } else {
-        else
-        {
             return String.format("%d B", size);
         }
     }

hchyun/hchyun-framework/src/main/java/com/hchyun/framework/web/domain/server/Cpu.java

@@ -7,8 +7,7 @@ import com.hchyun.common.utils.Arith;
  *
  * @author hchyun
  */
-public class Cpu
+public class Cpu {
-{
     /**
      * 核心数
      */
@@ -39,63 +38,51 @@ public class Cpu
      */
     private double free;
 
-    public int getCpuNum()
+    public int getCpuNum() {
-    {
         return cpuNum;
     }
 
-    public void setCpuNum(int cpuNum)
+    public void setCpuNum(int cpuNum) {
-    {
         this.cpuNum = cpuNum;
     }
 
-    public double getTotal()
+    public double getTotal() {
-    {
         return Arith.round(Arith.mul(total, 100), 2);
     }
 
-    public void setTotal(double total)
+    public void setTotal(double total) {
-    {
         this.total = total;
     }
 
-    public double getSys()
+    public double getSys() {
-    {
         return Arith.round(Arith.mul(sys / total, 100), 2);
     }
 
-    public void setSys(double sys)
+    public void setSys(double sys) {
-    {
         this.sys = sys;
     }
 
-    public double getUsed()
+    public double getUsed() {
-    {
         return Arith.round(Arith.mul(used / total, 100), 2);
     }
 
-    public void setUsed(double used)
+    public void setUsed(double used) {
-    {
         this.used = used;
     }
 
-    public double getWait()
+    public double getWait() {
-    {
         return Arith.round(Arith.mul(wait / total, 100), 2);
     }
 
-    public void setWait(double wait)
+    public void setWait(double wait) {
-    {
         this.wait = wait;
     }
 
-    public double getFree()
+    public double getFree() {
-    {
         return Arith.round(Arith.mul(free / total, 100), 2);
     }
 
-    public void setFree(double free)
+    public void setFree(double free) {
-    {
         this.free = free;
     }
 }