From 00a741117bb6f9376fd811454b1a28dce74f492b Mon Sep 17 00:00:00 2001 From: mhuang Date: Mon, 23 Dec 2019 13:55:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inter-boot-sso/src/main/resources/application-dev.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/inter-boot-sso/src/main/resources/application-dev.properties b/inter-boot-sso/src/main/resources/application-dev.properties index b83ad4b..2396ba3 100644 --- a/inter-boot-sso/src/main/resources/application-dev.properties +++ b/inter-boot-sso/src/main/resources/application-dev.properties @@ -32,6 +32,7 @@ mhuang.interchan.rest.single.enable=true #auth mhuang.interchan.auth.enable=true mhuang.interchan.auth.filter-include-url=/sy/*,/sso/sy/* +mhuang.interchan.auth.filter-def-auth-type=zhangsan #jwt mhuang.jwt.enable=true mhuang.jwt.bean-map.zhangsan.enable=true -- Gitee From b02de318821524997b63ba90edf60f4de9adb37f Mon Sep 17 00:00:00 2001 From: mhuang Date: Mon, 23 Dec 2019 15:01:02 +0800 Subject: [PATCH 2/4] =?UTF-8?q?1.4.2=E7=89=88=E6=9C=AC=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inter-boot-protocol/pom.xml | 2 +- .../interchan/protocol/sso/UserDTO.java | 25 ++-- .../interchan/protocol/sso/UserHead.java | 11 +- .../protocol/sso/sysfun/SysFunAddDTO.java | 10 +- .../protocol/sso/sysfun/SysFunDTO.java | 14 +-- .../protocol/sso/sysfun/SysFunModDTO.java | 8 +- .../protocol/sso/sysfun/SysFunPageDTO.java | 4 +- .../sso/sysfun/SysFunPageQueryDTO.java | 8 +- .../protocol/sso/sysfun/SysFunQueryDTO.java | 8 +- .../sso/sysfun/SysFunTreeQueryDTO.java | 6 +- .../protocol/sso/sysfun/SysFunVO.java | 24 ++-- .../sso/sysfunrole/SysRoleFunAddDTO.java | 6 +- .../sso/sysfunrole/SysRoleFunBatchDTO.java | 7 +- .../sso/sysfunrole/SysRoleFunDTO.java | 10 +- .../sso/sysfunrole/SysRoleFunTreeDTO.java | 28 ++--- .../sso/sysfunrole/SysRoleFunTreeVO.java | 26 ++-- .../protocol/sso/sysfunrole/SysRoleFunVO.java | 10 +- .../SyChanmgfunExcludeUrlDTO.java | 2 +- .../SyChanmgfunExcludeUrlVO.java | 2 +- .../SyChanmgfunVistUrlmAddDTO.java | 2 +- .../SyChanmgfunVistUrlmQryDTO.java | 2 +- .../SyChanmgfunVistUrlmQryVO.java | 2 +- .../protocol/sso/sysrole/SysRoleAddDTO.java | 2 +- .../protocol/sso/sysrole/SysRoleModDTO.java | 4 +- .../sso/sysrole/SysRolePageOrderQueryDTO.java | 15 ++- .../sso/sysrole/SysRolePageQueryDTO.java | 4 +- .../protocol/sso/sysrole/SysRoleQueryDTO.java | 4 +- .../protocol/sso/sysrole/SysRoleVO.java | 2 +- .../sysrole/request/SysRolePageQueryQVO.java | 12 +- .../sso/sysrole/response/SysRoleRVO.java | 2 +- .../protocol/sso/sysuser/LoginSysUserDTO.java | 40 +++--- .../protocol/sso/sysuser/LoginSysUserVO.java | 82 ++++++------- .../protocol/sso/sysuser/SysUserAddDTO.java | 101 ++++++++-------- .../protocol/sso/sysuser/SysUserDTO.java | 21 ++-- .../sso/sysuser/SysUserUpdateDTO.java | 114 +++++++++--------- .../protocol/sso/sysuser/SysUserVO.java | 32 ++--- .../sso/sysuser/dto/SysUserPageDTO.java | 17 ++- .../sso/sysuser/dto/SysUserPageQryDTO.java | 19 ++- .../protocol/sso/sysuser/pwd/ResetPwdDTO.java | 34 +++--- .../sso/sysuser/pwd/UpdateCenterPwdDTO.java | 41 +++---- .../sso/sysuser/pwd/UpdatePwdDTO.java | 25 ++-- .../sysuser/request/SysUserPageQryQVO.java | 21 ++-- .../sysuser/response/SysUserPageQryRVO.java | 39 +++--- .../sso/sysuser/response/SysUserRVO.java | 39 +++--- .../sso/sysuserrole/SysUserFunDTO.java | 6 +- .../sso/sysuserrole/SysUserFunVO.java | 6 +- .../sso/sysuserrole/SysUserRoleAddDTO.java | 6 +- .../sso/sysuserrole/SysUserRoleBatchDTO.java | 10 +- .../sso/sysuserrole/SysUserRoleCheckDTO.java | 4 +- .../sso/sysuserrole/SysUserRoleCheckVO.java | 4 +- .../sso/sysuserrole/SysUserRoleDTO.java | 2 +- .../sso/sysuserrole/SysUserRoleVO.java | 2 +- inter-boot-sso/pom.xml | 24 ++-- .../sysfun/controller/SysFunController.java | 17 +-- .../sso/sysfun/service/ISysFunService.java | 7 +- .../service/impl/SysFunServiceImpl.java | 8 +- .../impl/SyChanmgfunVistUrlService.java | 3 +- .../sysrole/controller/SysRoleController.java | 22 +--- .../sso/sysrole/service/ISysRoleService.java | 6 +- .../service/impl/SysRoleServiceImpl.java | 6 +- .../controller/SysRoleFunController.java | 19 +-- .../sysuser/controller/SysUserController.java | 16 +-- .../sso/sysuser/service/ISysUserService.java | 6 +- .../service/impl/SysUserServiceImpl.java | 6 +- .../controller/SysUserRoleController.java | 15 +-- .../service/impl/SysUserRoleServiceImpl.java | 6 +- .../tech/mhuang/interchan/sso/util/AES.java | 8 +- .../main/resources/application-dev.properties | 44 +++---- .../src/main/resources/application.properties | 1 + inter-boot-web/pom.xml | 2 +- .../src/main/resources/public/index.html | 16 +-- .../static/common/bootstrap-table.js | 6 +- .../main/resources/static/common/hmtool.js | 5 +- .../datapicker/bootstrap-datepicker.js | 2 +- .../static/js/plugins/flot/jquery.flot.js | 6 +- .../static/js/plugins/markdown/markdown.js | 2 +- .../resources/static/js/plugins/plyr/plyr.js | 4 +- .../third-party/highcharts/highcharts.src.js | 4 +- .../ueditor/third-party/jquery-1.10.2.js | 2 +- inter-logger-common/pom.xml | 2 +- .../logger/LoggerAutoConfiguration.java | 3 +- .../interchan/logger/LoggerProperties.java | 1 - .../interchan/logger/WebLoggerAspect.java | 6 +- .../interchan/logger/annoation/ESLogger.java | 2 +- .../interchan/logger/consts/LoggerConsts.java | 3 - .../logger/consumer/LoggerConsumer.java | 8 +- .../logger/entity/ESAsyncLoggerOpType.java | 1 - .../interchan/logger/util/LoggerUtil.java | 1 + pom.xml | 10 +- 89 files changed, 557 insertions(+), 670 deletions(-) diff --git a/inter-boot-protocol/pom.xml b/inter-boot-protocol/pom.xml index cf0e4be..3cefb1f 100644 --- a/inter-boot-protocol/pom.xml +++ b/inter-boot-protocol/pom.xml @@ -6,7 +6,7 @@ tech.mhuang.interchan inter-boot-demo - 1.4.1 + 1.4.2 inter-boot-protocol inter-boot-protocol diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/UserDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/UserDTO.java index 4506cc0..545b927 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/UserDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/UserDTO.java @@ -6,7 +6,6 @@ import lombok.EqualsAndHashCode; import lombok.Getter; /** - * * 用户 * * @author mhuang @@ -16,16 +15,16 @@ import lombok.Getter; @EqualsAndHashCode(callSuper = false) public class UserDTO { - /** - * 用户id - */ - @Getter(onMethod_={@ApiModelProperty(value = "用户id", required = true)}) - private String userid; - - /** - * 操作的用户id - */ - @Getter(onMethod_={@ApiModelProperty(value = "操作用户id", hidden = true)}) - private String operateUser; - + /** + * 用户id + */ + @Getter(onMethod_ = {@ApiModelProperty(value = "用户id", required = true)}) + private String userid; + + /** + * 操作的用户id + */ + @Getter(onMethod_ = {@ApiModelProperty(value = "操作用户id", hidden = true)}) + private String operateUser; + } diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/UserHead.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/UserHead.java index 6b26cb3..f35fc5e 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/UserHead.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/UserHead.java @@ -6,7 +6,6 @@ import lombok.EqualsAndHashCode; import lombok.Getter; /** - * * 用户头像 * * @author mhuang @@ -16,9 +15,9 @@ import lombok.Getter; @EqualsAndHashCode(callSuper = false) public class UserHead { - @Getter(onMethod_={@ApiModelProperty(hidden = true)}) - private String userId; - - @Getter(onMethod_={@ApiModelProperty(value = "用户头像Id",required = true)}) - private String attachId; + @Getter(onMethod_ = {@ApiModelProperty(hidden = true)}) + private String userId; + + @Getter(onMethod_ = {@ApiModelProperty(value = "用户头像Id", required = true)}) + private String attachId; } diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunAddDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunAddDTO.java index 085a0f2..190610b 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunAddDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunAddDTO.java @@ -7,7 +7,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) -public class SysFunAddDTO implements Serializable { +public class SysFunAddDTO implements Serializable { /** * 功能代号 */ @@ -47,15 +47,15 @@ public class SysFunAddDTO implements Serializable { * 是否展示【0：否/1：是】 */ private String displayfun = "0"; - + /** * 是否在使用[0=否/1=是(default)})] */ private String useflag = "0"; - - /** + + /** * 可访问权限路径 - */ + */ private String powerPaths; private static final long serialVersionUID = 1L; diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunDTO.java index 44f051f..21eab04 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunDTO.java @@ -7,7 +7,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) -public class SysFunDTO implements Serializable { +public class SysFunDTO implements Serializable { /** * 功能代号 */ @@ -52,21 +52,21 @@ public class SysFunDTO implements Serializable { * 是否展示【0：否/1：是】 */ private String displayfun; - + /** * 父功能代号 */ private String parentName; - + private boolean hasChild; - + private boolean hasMenuChild; - + private String attachid; - + private int childSize; - + private int childMenuSize; /** diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunModDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunModDTO.java index dbbaebf..2dc8459 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunModDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunModDTO.java @@ -7,7 +7,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) -public class SysFunModDTO implements Serializable { +public class SysFunModDTO implements Serializable { /** * 功能代号 */ @@ -47,10 +47,10 @@ public class SysFunModDTO implements Serializable { * 是否展示【0：否/1：是】 */ private String displayfun = "0"; - - /** + + /** * 可访问权限路径 - */ + */ private String powerPaths; /** * sy_chanmgfunm diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunPageDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunPageDTO.java index b87d9ac..4981bfb 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunPageDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunPageDTO.java @@ -7,7 +7,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) -public class SysFunPageDTO implements Serializable { +public class SysFunPageDTO implements Serializable { /** * 功能代号 */ @@ -52,7 +52,7 @@ public class SysFunPageDTO implements Serializable { * 是否展示【0：否/1：是】 */ private String displayfun; - + /** * 父功能代号 */ diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunPageQueryDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunPageQueryDTO.java index 27e160d..a8db10c 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunPageQueryDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunPageQueryDTO.java @@ -1,19 +1,19 @@ package tech.mhuang.interchan.protocol.sso.sysfun; -import tech.mhuang.ext.interchan.protocol.data.PageDTO; import lombok.Data; import lombok.EqualsAndHashCode; +import tech.mhuang.ext.interchan.protocol.data.PageDTO; import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) -public class SysFunPageQueryDTO extends PageDTO implements Serializable { +public class SysFunPageQueryDTO extends PageDTO implements Serializable { /** * 功能代号 */ private String funid; - + /** * 功能名称 @@ -43,7 +43,7 @@ public class SysFunPageQueryDTO extends PageDTO implements Serializable { * 是否是管理员 0 是 1不是 */ private String manager; - + /** * sy_chanmgfunm */ diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunQueryDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunQueryDTO.java index c8fb942..6cf52c6 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunQueryDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunQueryDTO.java @@ -7,8 +7,8 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) -public class SysFunQueryDTO implements Serializable { - /** +public class SysFunQueryDTO implements Serializable { + /** * 功能代号 */ private String funid; @@ -52,7 +52,7 @@ public class SysFunQueryDTO implements Serializable { * 是否展示【0：否/1：是】 */ private String displayfun; - + /** * 父功能代号 @@ -63,7 +63,7 @@ public class SysFunQueryDTO implements Serializable { * 是否是管理员 0 是 1不是 */ private String manager; - + /** * sy_chanmgfunm */ diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunTreeQueryDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunTreeQueryDTO.java index 584a2cd..e094623 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunTreeQueryDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunTreeQueryDTO.java @@ -7,12 +7,12 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) -public class SysFunTreeQueryDTO implements Serializable { +public class SysFunTreeQueryDTO implements Serializable { /** * 功能代号 */ private String funid; - + private String nodeid; /** @@ -49,7 +49,7 @@ public class SysFunTreeQueryDTO implements Serializable { * 是否是管理员 0 是 1不是 */ private String manager; - + /** * sy_chanmgfunm diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunVO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunVO.java index ef9901b..6871070 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunVO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfun/SysFunVO.java @@ -7,7 +7,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) -public class SysFunVO implements Serializable { +public class SysFunVO implements Serializable { /** * 功能代号 */ @@ -52,33 +52,33 @@ public class SysFunVO implements Serializable { * 是否展示【0：否/1：是】 */ private String displayfun; - + /** * 父功能代号 */ private String parentName; - + private boolean hasChild; - + private boolean expand; - + private boolean leaf; - - private boolean hasMenuChild; - + + private boolean hasMenuChild; + private String attachid; - + private int childMenuSize; - + private int childSize; /** * 是否是管理员 0 是 1不是 */ private String manager; - - + + /** * sy_chanmgfunm */ diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunrole/SysRoleFunAddDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunrole/SysRoleFunAddDTO.java index 90f8c43..75d5232 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunrole/SysRoleFunAddDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunrole/SysRoleFunAddDTO.java @@ -7,17 +7,17 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) -public class SysRoleFunAddDTO implements Serializable { +public class SysRoleFunAddDTO implements Serializable { /** * 功能代号 */ private String funid; /** - * 角色代码 + * 角色代码 */ private String roleid; - + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunrole/SysRoleFunBatchDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunrole/SysRoleFunBatchDTO.java index 8b82dcb..e0b98ab 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunrole/SysRoleFunBatchDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunrole/SysRoleFunBatchDTO.java @@ -9,18 +9,17 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = false) -public class SysRoleFunBatchDTO implements Serializable { +public class SysRoleFunBatchDTO implements Serializable { /** * 功能代号 */ private List funids; /** - * 角色代码 + * 角色代码 */ private String roleid; - /** * 操作时间 @@ -32,6 +31,6 @@ public class SysRoleFunBatchDTO implements Serializable { */ private String operateUser; - + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunrole/SysRoleFunDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunrole/SysRoleFunDTO.java index d7d7212..49ec3a7 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunrole/SysRoleFunDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunrole/SysRoleFunDTO.java @@ -7,17 +7,17 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) -public class SysRoleFunDTO implements Serializable { +public class SysRoleFunDTO implements Serializable { /** * 功能代号 */ private String funid; - + /** * 功能名称 */ private String fundesc; - + /** * 父代码 */ @@ -27,9 +27,9 @@ public class SysRoleFunDTO implements Serializable { * 父功能名称 */ private String parentName; - + private int orderval; - + /** * sy_chanmgfunm */ diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunrole/SysRoleFunTreeDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunrole/SysRoleFunTreeDTO.java index d11842f..639cbc6 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunrole/SysRoleFunTreeDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunrole/SysRoleFunTreeDTO.java @@ -7,50 +7,50 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) -public class SysRoleFunTreeDTO implements Serializable { +public class SysRoleFunTreeDTO implements Serializable { /** * 功能代号 */ private String funid; - + /** * 功能描述 */ private String fundesc; - + /** * 父节点id */ private String parentid; - + /** * 父节点名称 */ private String parentName; - + /** * 是否使用 */ private String useflag; - + /** * 是否底层权限 */ private String botflag; - - + + /** * 是否展示菜单权限 */ private String displayfun; - - - /** + + + /** * 是否选择 - */ + */ private boolean checked; - + private int orderval; - + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunrole/SysRoleFunTreeVO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunrole/SysRoleFunTreeVO.java index 9d10920..0f436f4 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunrole/SysRoleFunTreeVO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunrole/SysRoleFunTreeVO.java @@ -8,33 +8,33 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = false) -public class SysRoleFunTreeVO implements Serializable { +public class SysRoleFunTreeVO implements Serializable { /** * 功能代号 */ private String funid; - + /** * 功能描述 */ private String fundesc; - + /** * 父节点id */ private String parentid; - + /** * 父节点名称 */ private String parentName; - - - /** + + + /** * 是否选择 - */ + */ private boolean checked; - + private int orderval; /** @@ -54,11 +54,11 @@ public class SysRoleFunTreeVO implements Serializable { private String displayfun; - /** + /** * 子节点组合 - */ + */ private List children; - - + + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunrole/SysRoleFunVO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunrole/SysRoleFunVO.java index 17cfb79..d47134b 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunrole/SysRoleFunVO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunrole/SysRoleFunVO.java @@ -7,17 +7,17 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) -public class SysRoleFunVO implements Serializable { +public class SysRoleFunVO implements Serializable { /** * 功能代号 */ private String funid; - + /** * 功能名称 */ private String fundesc; - + /** * 父代码 */ @@ -27,8 +27,8 @@ public class SysRoleFunVO implements Serializable { * 父功能名称 */ private String parentName; - + private int orderval; - + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunvisturl/SyChanmgfunExcludeUrlDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunvisturl/SyChanmgfunExcludeUrlDTO.java index 6cf52ff..1dc235a 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunvisturl/SyChanmgfunExcludeUrlDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunvisturl/SyChanmgfunExcludeUrlDTO.java @@ -7,7 +7,7 @@ import java.io.Serializable; import java.util.Date; /** - * @author + * @author */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunvisturl/SyChanmgfunExcludeUrlVO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunvisturl/SyChanmgfunExcludeUrlVO.java index 39ad758..08f26c9 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunvisturl/SyChanmgfunExcludeUrlVO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunvisturl/SyChanmgfunExcludeUrlVO.java @@ -7,7 +7,7 @@ import java.io.Serializable; import java.util.Date; /** - * @author + * @author */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunvisturl/SyChanmgfunVistUrlmAddDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunvisturl/SyChanmgfunVistUrlmAddDTO.java index 538b614..8670b72 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunvisturl/SyChanmgfunVistUrlmAddDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunvisturl/SyChanmgfunVistUrlmAddDTO.java @@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode; import java.io.Serializable; /** - * @author + * @author */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunvisturl/SyChanmgfunVistUrlmQryDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunvisturl/SyChanmgfunVistUrlmQryDTO.java index 46a1784..0266414 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunvisturl/SyChanmgfunVistUrlmQryDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunvisturl/SyChanmgfunVistUrlmQryDTO.java @@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode; import java.io.Serializable; /** - * @author + * @author */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunvisturl/SyChanmgfunVistUrlmQryVO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunvisturl/SyChanmgfunVistUrlmQryVO.java index 1e0d9bd..ba68a70 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunvisturl/SyChanmgfunVistUrlmQryVO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysfunvisturl/SyChanmgfunVistUrlmQryVO.java @@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode; import java.io.Serializable; /** - * @author + * @author */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/SysRoleAddDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/SysRoleAddDTO.java index 3730cba..83e9db7 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/SysRoleAddDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/SysRoleAddDTO.java @@ -7,7 +7,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) -public class SysRoleAddDTO implements Serializable { +public class SysRoleAddDTO implements Serializable { /** * 角色代号 */ diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/SysRoleModDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/SysRoleModDTO.java index b4853bb..57591c9 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/SysRoleModDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/SysRoleModDTO.java @@ -7,7 +7,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) -public class SysRoleModDTO implements Serializable { +public class SysRoleModDTO implements Serializable { /** * 角色代号 */ @@ -17,7 +17,7 @@ public class SysRoleModDTO implements Serializable { * 角色名称 */ private String roledesc; - + /** * 审核标示 */ diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/SysRolePageOrderQueryDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/SysRolePageOrderQueryDTO.java index 4ca7100..a70ac3f 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/SysRolePageOrderQueryDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/SysRolePageOrderQueryDTO.java @@ -1,22 +1,21 @@ package tech.mhuang.interchan.protocol.sso.sysrole; -import tech.mhuang.ext.interchan.protocol.data.PageDTO; import lombok.Data; import lombok.EqualsAndHashCode; +import tech.mhuang.ext.interchan.protocol.data.PageDTO; -/** - * - * @ClassName: SysRolePageOrderQueryDTO +/** + * @ClassName: SysRolePageOrderQueryDTO * @author: admin - * @date: 2018年3月26日 下午1:46:58 + * @date: 2018年3月26日 下午1:46:58 */ @Data @EqualsAndHashCode(callSuper = false) -public class SysRolePageOrderQueryDTO extends PageDTO{ +public class SysRolePageOrderQueryDTO extends PageDTO { - /** + /** * 角色id */ private String roleid; @@ -30,7 +29,7 @@ public class SysRolePageOrderQueryDTO extends PageDTO{ * 审核标示 */ private String markflag; - + private String orderRoleIds; } diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/SysRolePageQueryDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/SysRolePageQueryDTO.java index d04af80..4887ca0 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/SysRolePageQueryDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/SysRolePageQueryDTO.java @@ -1,8 +1,8 @@ package tech.mhuang.interchan.protocol.sso.sysrole; -import tech.mhuang.ext.interchan.protocol.data.PageDTO; import lombok.Data; import lombok.EqualsAndHashCode; +import tech.mhuang.ext.interchan.protocol.data.PageDTO; import java.io.Serializable; @@ -23,7 +23,7 @@ public class SysRolePageQueryDTO extends PageDTO implements Serializable { * 审核标示 */ private String markflag; - + /** * sy_chanmgrolem */ diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/SysRoleQueryDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/SysRoleQueryDTO.java index 6df6e99..b088580 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/SysRoleQueryDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/SysRoleQueryDTO.java @@ -7,7 +7,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) -public class SysRoleQueryDTO implements Serializable { +public class SysRoleQueryDTO implements Serializable { /** * 角色代号 */ @@ -22,7 +22,7 @@ public class SysRoleQueryDTO implements Serializable { * 审核标示 */ private String markflag; - + /** * sy_chanmgrolem */ diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/SysRoleVO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/SysRoleVO.java index 00f2df9..f049380 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/SysRoleVO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/SysRoleVO.java @@ -7,7 +7,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) -public class SysRoleVO implements Serializable { +public class SysRoleVO implements Serializable { /** * 角色代号 */ diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/request/SysRolePageQueryQVO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/request/SysRolePageQueryQVO.java index c1c995d..e73f853 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/request/SysRolePageQueryQVO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/request/SysRolePageQueryQVO.java @@ -1,21 +1,21 @@ package tech.mhuang.interchan.protocol.sso.sysrole.request; -import tech.mhuang.ext.interchan.protocol.data.PageDTO; import lombok.Data; import lombok.EqualsAndHashCode; +import tech.mhuang.ext.interchan.protocol.data.PageDTO; import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) -public class SysRolePageQueryQVO extends PageDTO implements Serializable { +public class SysRolePageQueryQVO extends PageDTO implements Serializable { - /** + /** * 角色id */ private String roleid; - + /** * 角色名称 */ @@ -25,10 +25,10 @@ public class SysRolePageQueryQVO extends PageDTO implements Serializable { * 审核标示 */ private String markflag; - + private String orderRoleIds; - + /** * sy_chanmgrolem */ diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/response/SysRoleRVO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/response/SysRoleRVO.java index 16354d9..41664ea 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/response/SysRoleRVO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysrole/response/SysRoleRVO.java @@ -7,7 +7,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) -public class SysRoleRVO implements Serializable { +public class SysRoleRVO implements Serializable { /** * 角色代号 */ diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/LoginSysUserDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/LoginSysUserDTO.java index 38a407c..78e2946 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/LoginSysUserDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/LoginSysUserDTO.java @@ -7,33 +7,33 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = false) public class LoginSysUserDTO { - /** + /** * 用户名称 */ private String username; - - /** + + /** * 用户ID */ private String userid; - + /** * 密码 */ - private String password; - + private String password; + /** * Email */ private String email; - + /** * 电话 */ private String tel; - + /** * 移动电话 */ @@ -43,17 +43,17 @@ public class LoginSysUserDTO { * 地址 */ private String address; - - - /** - * 用户登陆时是否要求修改密码 - */ - private String chgpwdflag; - - /** - * 用户账号是否有效[1=有效(default)})/0=无效] - */ - private String available; + + + /** + * 用户登陆时是否要求修改密码 + */ + private String chgpwdflag; + + /** + * 用户账号是否有效[1=有效(default)})/0=无效] + */ + private String available; /** * 是否是管理员 0 是 1 不是 @@ -65,5 +65,5 @@ public class LoginSysUserDTO { private String companyId; private String companyName; - + } diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/LoginSysUserVO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/LoginSysUserVO.java index 72c0c0b..adc6a1c 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/LoginSysUserVO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/LoginSysUserVO.java @@ -9,77 +9,77 @@ import lombok.Getter; @EqualsAndHashCode(callSuper = false) public class LoginSysUserVO { - /** + /** * 用户名称 */ - @Getter(onMethod_={@ApiModelProperty(value = "用户名")}) + @Getter(onMethod_ = {@ApiModelProperty(value = "用户名")}) private String username; - /** + /** * 用户ID */ - @Getter(onMethod_={@ApiModelProperty(value = "用户ID")}) + @Getter(onMethod_ = {@ApiModelProperty(value = "用户ID")}) private String userid; - - + + /** * 密码 */ - @Getter(onMethod_={@ApiModelProperty(value = "密码")}) - private String password; - + @Getter(onMethod_ = {@ApiModelProperty(value = "密码")}) + private String password; + /** * Email */ - @Getter(onMethod_={@ApiModelProperty(value = "邮箱")}) + @Getter(onMethod_ = {@ApiModelProperty(value = "邮箱")}) private String email; - + /** * 电话 */ - @Getter(onMethod_={@ApiModelProperty(value = "电话")}) + @Getter(onMethod_ = {@ApiModelProperty(value = "电话")}) private String tel; - + /** * 移动电话 */ - @Getter(onMethod_={@ApiModelProperty(value = "移动电话")}) + @Getter(onMethod_ = {@ApiModelProperty(value = "移动电话")}) private String mobilephone; /** * 地址 */ - @Getter(onMethod_={@ApiModelProperty(value = "地址")}) + @Getter(onMethod_ = {@ApiModelProperty(value = "地址")}) private String address; - - - /** + + + /** * 令牌 */ - @Getter(onMethod_={@ApiModelProperty(value = "令牌")}) + @Getter(onMethod_ = {@ApiModelProperty(value = "令牌")}) private String token; - /** - * 临时 - */ - private String authType; - - /** - * 用户登陆时是否要求修改密码 - */ - @Getter(onMethod_={@ApiModelProperty(value = "用户登陆时是否要求修改密码")}) - private String chgpwdflag; - - /** - * 是否是管理员 0 是 1 不是 - */ - private String manager; - /** - * 关联的公司id - */ - private String companyId; - - private String companyName; - + /** + * 临时 + */ + private String authType; + + /** + * 用户登陆时是否要求修改密码 + */ + @Getter(onMethod_ = {@ApiModelProperty(value = "用户登陆时是否要求修改密码")}) + private String chgpwdflag; + + /** + * 是否是管理员 0 是 1 不是 + */ + private String manager; + /** + * 关联的公司id + */ + private String companyId; + + private String companyName; + } diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/SysUserAddDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/SysUserAddDTO.java index 0f7b810..691b906 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/SysUserAddDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/SysUserAddDTO.java @@ -6,7 +6,6 @@ import lombok.EqualsAndHashCode; import lombok.Getter; /** - * * 添加系统用户实体 * * @author mhuang @@ -16,58 +15,58 @@ import lombok.Getter; @EqualsAndHashCode(callSuper = false) public class SysUserAddDTO { - /** - * 用户名 - */ - @Getter(onMethod_={@ApiModelProperty(value = "用户名", required = true)}) - private String username; - - /** - * 密码 - */ - @Getter(onMethod_={@ApiModelProperty(value = "密码", required = true)}) - private String password; - - /** - * 邮件 - */ - @Getter(onMethod_={@ApiModelProperty(value = "邮箱")}) - private String email; - - /** - * 电话 - */ - @Getter(onMethod_={@ApiModelProperty(value = "电话")}) - private String tel; - - /** - * 移动电话 - */ - @Getter(onMethod_={@ApiModelProperty(value = "移动电话", required = true)}) - private String mobilephone; - - /** - * 地址 - */ - @Getter(onMethod_={@ApiModelProperty(value = "地址")}) - private String address; - - /** + /** + * 用户名 + */ + @Getter(onMethod_ = {@ApiModelProperty(value = "用户名", required = true)}) + private String username; + + /** + * 密码 + */ + @Getter(onMethod_ = {@ApiModelProperty(value = "密码", required = true)}) + private String password; + + /** + * 邮件 + */ + @Getter(onMethod_ = {@ApiModelProperty(value = "邮箱")}) + private String email; + + /** + * 电话 + */ + @Getter(onMethod_ = {@ApiModelProperty(value = "电话")}) + private String tel; + + /** + * 移动电话 + */ + @Getter(onMethod_ = {@ApiModelProperty(value = "移动电话", required = true)}) + private String mobilephone; + + /** + * 地址 + */ + @Getter(onMethod_ = {@ApiModelProperty(value = "地址")}) + private String address; + + /** * 操作者 */ - @Getter(onMethod_={@ApiModelProperty(hidden = true)}) + @Getter(onMethod_ = {@ApiModelProperty(hidden = true)}) private String operateUser; - /** - * 账号 - */ - private String account; - /** - * 是否是管理员 0 是 1 不是 - */ - private String manager; - /** - * 关联的公司id - */ - private String companyId; + /** + * 账号 + */ + private String account; + /** + * 是否是管理员 0 是 1 不是 + */ + private String manager; + /** + * 关联的公司id + */ + private String companyId; } diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/SysUserDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/SysUserDTO.java index 9df1d4e..c1c7a61 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/SysUserDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/SysUserDTO.java @@ -1,25 +1,24 @@ package tech.mhuang.interchan.protocol.sso.sysuser; -import tech.mhuang.ext.interchan.protocol.data.PageDTO; import lombok.Data; import lombok.EqualsAndHashCode; +import tech.mhuang.ext.interchan.protocol.data.PageDTO; import java.io.Serializable; /** - * - * @ClassName: SysUserDTO - * @Description:系统用户DTO + * @ClassName: SysUserDTO + * @Description:系统用户DTO * @author: mhuang - * @date: 2017年7月17日 下午4:42:30 + * @date: 2017年7月17日 下午4:42:30 */ @Data -@EqualsAndHashCode(callSuper=false) -public class SysUserDTO extends PageDTO implements Serializable{ +@EqualsAndHashCode(callSuper = false) +public class SysUserDTO extends PageDTO implements Serializable { + + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 1L; + private String username;//用户名称 - private String username;//用户名称 - - private String mobilephone;//手机 + private String mobilephone;//手机 } diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/SysUserUpdateDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/SysUserUpdateDTO.java index 28732b4..8e0c3d7 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/SysUserUpdateDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/SysUserUpdateDTO.java @@ -9,65 +9,65 @@ import lombok.Getter; @EqualsAndHashCode(callSuper = false) public class SysUserUpdateDTO { - /** - * 用户名 - */ - @Getter(onMethod_={@ApiModelProperty(value = "用户名")}) - private String username; - - /** - * 密码 - */ - @Getter(onMethod_={@ApiModelProperty(value = "密码")}) - private String password; - - /** - * 邮件 - */ - @Getter(onMethod_={@ApiModelProperty(value = "邮箱")}) - private String email; - - /** - * 电话 - */ - @Getter(onMethod_={@ApiModelProperty(value = "电话")}) - private String tel; - - /** - * 移动电话 - */ - @Getter(onMethod_={@ApiModelProperty(value = "移动电话")}) - private String mobilephone; - - /** - * 地址 - */ - @Getter(onMethod_={@ApiModelProperty(value = "地址")}) - private String address; - - /** - * 用户id - */ - @Getter(onMethod_={@ApiModelProperty(value = "用户id")}) - private String userid; - - /** + /** + * 用户名 + */ + @Getter(onMethod_ = {@ApiModelProperty(value = "用户名")}) + private String username; + + /** + * 密码 + */ + @Getter(onMethod_ = {@ApiModelProperty(value = "密码")}) + private String password; + + /** + * 邮件 + */ + @Getter(onMethod_ = {@ApiModelProperty(value = "邮箱")}) + private String email; + + /** + * 电话 + */ + @Getter(onMethod_ = {@ApiModelProperty(value = "电话")}) + private String tel; + + /** + * 移动电话 + */ + @Getter(onMethod_ = {@ApiModelProperty(value = "移动电话")}) + private String mobilephone; + + /** + * 地址 + */ + @Getter(onMethod_ = {@ApiModelProperty(value = "地址")}) + private String address; + + /** + * 用户id + */ + @Getter(onMethod_ = {@ApiModelProperty(value = "用户id")}) + private String userid; + + /** * 操作者 */ - @Getter(onMethod_={@ApiModelProperty(hidden = true)}) + @Getter(onMethod_ = {@ApiModelProperty(hidden = true)}) private String operateUser; - /** - * 账号 - */ - private String account; - /** - * 是否是管理员 0 是 1 不是 - */ - private String manager; - /** - * 关联的公司id - */ - private String companyId; - + /** + * 账号 + */ + private String account; + /** + * 是否是管理员 0 是 1 不是 + */ + private String manager; + /** + * 关联的公司id + */ + private String companyId; + } diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/SysUserVO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/SysUserVO.java index 15f6af2..d2bc542 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/SysUserVO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/SysUserVO.java @@ -9,47 +9,47 @@ import lombok.Getter; @EqualsAndHashCode(callSuper = false) public class SysUserVO { - @Getter(onMethod_={@ApiModelProperty(value = "userId")}) - private String userid; - /** + @Getter(onMethod_ = {@ApiModelProperty(value = "userId")}) + private String userid; + /** * 用户名称 */ - @Getter(onMethod_={@ApiModelProperty(value = "用户名")}) + @Getter(onMethod_ = {@ApiModelProperty(value = "用户名")}) private String username; /** * 密码 */ - @Getter(onMethod_={@ApiModelProperty(value = "密码")}) - private String password; - + @Getter(onMethod_ = {@ApiModelProperty(value = "密码")}) + private String password; + /** * Email */ - @Getter(onMethod_={@ApiModelProperty(value = "邮箱")}) + @Getter(onMethod_ = {@ApiModelProperty(value = "邮箱")}) private String email; - + /** * 电话 */ - @Getter(onMethod_={@ApiModelProperty(value = "电话")}) + @Getter(onMethod_ = {@ApiModelProperty(value = "电话")}) private String tel; - + /** * 移动电话 */ - @Getter(onMethod_={@ApiModelProperty(value = "移动电话")}) + @Getter(onMethod_ = {@ApiModelProperty(value = "移动电话")}) private String mobilephone; - - /** + + /** * 用户账号是否有效[1=有效(default)})/0=无效] */ - @Getter(onMethod_={@ApiModelProperty(value = "锁定")}) + @Getter(onMethod_ = {@ApiModelProperty(value = "锁定")}) private String available; /** * 地址 */ - @Getter(onMethod_={@ApiModelProperty(value = "地址")}) + @Getter(onMethod_ = {@ApiModelProperty(value = "地址")}) private String address; /** diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/dto/SysUserPageDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/dto/SysUserPageDTO.java index d9b6d38..28864a0 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/dto/SysUserPageDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/dto/SysUserPageDTO.java @@ -5,7 +5,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * * 分页查询DTO * * @author mhuang @@ -14,8 +13,8 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = false) public class SysUserPageDTO { - private String userid; - /** + private String userid; + /** * 用户名称 */ private String username; @@ -23,24 +22,24 @@ public class SysUserPageDTO { /** * 密码 */ - private String password; - + private String password; + /** * Email */ private String email; - + /** * 电话 */ private String tel; - + /** * 移动电话 */ private String mobilephone; - - /** + + /** * 用户账号是否有效[1=有效(default)})/0=无效] */ private String available; diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/dto/SysUserPageQryDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/dto/SysUserPageQryDTO.java index c6bfce4..a4cc5b1 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/dto/SysUserPageQryDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/dto/SysUserPageQryDTO.java @@ -1,12 +1,11 @@ package tech.mhuang.interchan.protocol.sso.sysuser.dto; -import tech.mhuang.ext.interchan.protocol.data.PageDTO; import lombok.Data; import lombok.EqualsAndHashCode; +import tech.mhuang.ext.interchan.protocol.data.PageDTO; /** - * * 用户分页查询DTO * * @author mhuang @@ -14,13 +13,13 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper = false) -public class SysUserPageQryDTO extends PageDTO{ +public class SysUserPageQryDTO extends PageDTO { + + private String username; + + private String mobilephone; + + private String orderUserIds; - private String username; - - private String mobilephone; - - private String orderUserIds; - - private String available; + private String available; } diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/pwd/ResetPwdDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/pwd/ResetPwdDTO.java index 321e03b..ae27718 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/pwd/ResetPwdDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/pwd/ResetPwdDTO.java @@ -9,21 +9,21 @@ import lombok.Getter; @EqualsAndHashCode(callSuper = false) public class ResetPwdDTO { - /** - * 密码 - */ - @Getter(onMethod_={@ApiModelProperty(value = "密码", required = true)}) - private String password; - - /** - * 用户id - */ - @Getter(onMethod_={@ApiModelProperty(value = "用户id", required = true)}) - private String userid; - - /** - * 操作的用户id - */ - @Getter(onMethod_={@ApiModelProperty(value = "操作用户id", hidden = true)}) - private String operateUser; + /** + * 密码 + */ + @Getter(onMethod_ = {@ApiModelProperty(value = "密码", required = true)}) + private String password; + + /** + * 用户id + */ + @Getter(onMethod_ = {@ApiModelProperty(value = "用户id", required = true)}) + private String userid; + + /** + * 操作的用户id + */ + @Getter(onMethod_ = {@ApiModelProperty(value = "操作用户id", hidden = true)}) + private String operateUser; } diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/pwd/UpdateCenterPwdDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/pwd/UpdateCenterPwdDTO.java index 1166f14..a885f6c 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/pwd/UpdateCenterPwdDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/pwd/UpdateCenterPwdDTO.java @@ -6,7 +6,6 @@ import lombok.EqualsAndHashCode; import lombok.Getter; /** - * * 修改个人中心密码 * * @author mhuang @@ -16,24 +15,24 @@ import lombok.Getter; @EqualsAndHashCode(callSuper = false) public class UpdateCenterPwdDTO { - @Getter(onMethod_={@ApiModelProperty(value = "旧密码",required = true)}) - private String oldPassword; - - /** - * 密码 - */ - @Getter(onMethod_={@ApiModelProperty(value = "新密码", required = true)}) - private String password; - - /** - * 用户id - */ - @Getter(onMethod_={@ApiModelProperty(value = "用户id", required = true)}) - private String userid; - - /** - * 操作的用户id - */ - @Getter(onMethod_={@ApiModelProperty(value = "操作用户id", hidden = true)}) - private String operateUser; + @Getter(onMethod_ = {@ApiModelProperty(value = "旧密码", required = true)}) + private String oldPassword; + + /** + * 密码 + */ + @Getter(onMethod_ = {@ApiModelProperty(value = "新密码", required = true)}) + private String password; + + /** + * 用户id + */ + @Getter(onMethod_ = {@ApiModelProperty(value = "用户id", required = true)}) + private String userid; + + /** + * 操作的用户id + */ + @Getter(onMethod_ = {@ApiModelProperty(value = "操作用户id", hidden = true)}) + private String operateUser; } diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/pwd/UpdatePwdDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/pwd/UpdatePwdDTO.java index 617e07c..cbc0bc9 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/pwd/UpdatePwdDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/pwd/UpdatePwdDTO.java @@ -6,7 +6,6 @@ import lombok.EqualsAndHashCode; import lombok.Getter; /** - * * 修改密码 * * @author mhuang @@ -16,16 +15,16 @@ import lombok.Getter; @EqualsAndHashCode(callSuper = false) public class UpdatePwdDTO { - - /** - * 密码 - */ - @Getter(onMethod_={@ApiModelProperty(value = "密码", required = true)}) - private String password; - - /** - * 用户id - */ - @Getter(onMethod_={@ApiModelProperty(value = "用户id", hidden = true)}) - private String userid; + + /** + * 密码 + */ + @Getter(onMethod_ = {@ApiModelProperty(value = "密码", required = true)}) + private String password; + + /** + * 用户id + */ + @Getter(onMethod_ = {@ApiModelProperty(value = "用户id", hidden = true)}) + private String userid; } diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/request/SysUserPageQryQVO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/request/SysUserPageQryQVO.java index ce9eb68..a4054c0 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/request/SysUserPageQryQVO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/request/SysUserPageQryQVO.java @@ -1,25 +1,26 @@ package tech.mhuang.interchan.protocol.sso.sysuser.request; -import tech.mhuang.ext.interchan.protocol.data.PageDTO; import lombok.Data; import lombok.EqualsAndHashCode; +import tech.mhuang.ext.interchan.protocol.data.PageDTO; -/** +/** * TODO(这里用一句话描述这个类的作用)}) - * @ClassName: SysUserPageQryQVO + * + * @ClassName: SysUserPageQryQVO * @author: admin - * @date: 2018年3月23日 上午9:55:35 + * @date: 2018年3月23日 上午9:55:35 */ @Data @EqualsAndHashCode(callSuper = false) public class SysUserPageQryQVO extends PageDTO { - private String username; - - private String mobilephone; - - private String orderUserIds; + private String username; + + private String mobilephone; + + private String orderUserIds; - private String available; + private String available; } diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/response/SysUserPageQryRVO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/response/SysUserPageQryRVO.java index 9e87e86..fb68379 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/response/SysUserPageQryRVO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/response/SysUserPageQryRVO.java @@ -5,54 +5,53 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.Getter; -/** - * - * @ClassName: SysUserPageQryRVO +/** + * @ClassName: SysUserPageQryRVO * @author: admin - * @date: 2018年3月23日 上午10:09:37 + * @date: 2018年3月23日 上午10:09:37 */ @Data public class SysUserPageQryRVO { - @Getter(onMethod_={@ApiModelProperty(value = "userId")}) - private String userid; - /** + @Getter(onMethod_ = {@ApiModelProperty(value = "userId")}) + private String userid; + /** * 用户名称 */ - @Getter(onMethod_={@ApiModelProperty(value = "用户名")}) + @Getter(onMethod_ = {@ApiModelProperty(value = "用户名")}) private String username; /** * 密码 */ - @Getter(onMethod_={@ApiModelProperty(value = "密码")}) - private String password; - + @Getter(onMethod_ = {@ApiModelProperty(value = "密码")}) + private String password; + /** * Email */ - @Getter(onMethod_={@ApiModelProperty(value = "邮箱")}) + @Getter(onMethod_ = {@ApiModelProperty(value = "邮箱")}) private String email; - + /** * 电话 */ - @Getter(onMethod_={@ApiModelProperty(value = "电话")}) + @Getter(onMethod_ = {@ApiModelProperty(value = "电话")}) private String tel; - + /** * 移动电话 */ - @Getter(onMethod_={@ApiModelProperty(value = "移动电话")}) + @Getter(onMethod_ = {@ApiModelProperty(value = "移动电话")}) private String mobilephone; - - /** + + /** * 用户账号是否有效[1=有效(default)})/0=无效] */ - @Getter(onMethod_={@ApiModelProperty(value = "锁定")}) + @Getter(onMethod_ = {@ApiModelProperty(value = "锁定")}) private String available; /** * 地址 */ - @Getter(onMethod_={@ApiModelProperty(value = "地址")}) + @Getter(onMethod_ = {@ApiModelProperty(value = "地址")}) private String address; } diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/response/SysUserRVO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/response/SysUserRVO.java index 43fce8b..d516c99 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/response/SysUserRVO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuser/response/SysUserRVO.java @@ -5,54 +5,53 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.Getter; -/** - * - * @ClassName: SysUserPageQryRVO +/** + * @ClassName: SysUserPageQryRVO * @author: admin - * @date: 2018年3月23日 上午10:09:37 + * @date: 2018年3月23日 上午10:09:37 */ @Data public class SysUserRVO { - @Getter(onMethod_={@ApiModelProperty(value = "userId")}) - private String userid; - /** + @Getter(onMethod_ = {@ApiModelProperty(value = "userId")}) + private String userid; + /** * 用户名称 */ - @Getter(onMethod_={@ApiModelProperty(value = "用户名")}) + @Getter(onMethod_ = {@ApiModelProperty(value = "用户名")}) private String username; /** * 密码 */ - @Getter(onMethod_={@ApiModelProperty(value = "密码")}) - private String password; - + @Getter(onMethod_ = {@ApiModelProperty(value = "密码")}) + private String password; + /** * Email */ - @Getter(onMethod_={@ApiModelProperty(value = "邮箱")}) + @Getter(onMethod_ = {@ApiModelProperty(value = "邮箱")}) private String email; - + /** * 电话 */ - @Getter(onMethod_={@ApiModelProperty(value = "电话")}) + @Getter(onMethod_ = {@ApiModelProperty(value = "电话")}) private String tel; - + /** * 移动电话 */ - @Getter(onMethod_={@ApiModelProperty(value = "移动电话")}) + @Getter(onMethod_ = {@ApiModelProperty(value = "移动电话")}) private String mobilephone; - - /** + + /** * 用户账号是否有效[1=有效(default)})/0=无效] */ - @Getter(onMethod_={@ApiModelProperty(value = "锁定")}) + @Getter(onMethod_ = {@ApiModelProperty(value = "锁定")}) private String available; /** * 地址 */ - @Getter(onMethod_={@ApiModelProperty(value = "地址")}) + @Getter(onMethod_ = {@ApiModelProperty(value = "地址")}) private String address; } diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserFunDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserFunDTO.java index b686bba..904eded 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserFunDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserFunDTO.java @@ -7,8 +7,8 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) -public class SysUserFunDTO implements Serializable { - /** +public class SysUserFunDTO implements Serializable { + /** * 功能代号 */ private String funid; @@ -52,7 +52,7 @@ public class SysUserFunDTO implements Serializable { * 是否展示【0：否/1：是】 */ private String displayfun; - + /** * 父功能代号 diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserFunVO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserFunVO.java index 330101c..e076e4e 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserFunVO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserFunVO.java @@ -7,8 +7,8 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) -public class SysUserFunVO implements Serializable { - /** +public class SysUserFunVO implements Serializable { + /** * 功能代号 */ private String funid; @@ -52,7 +52,7 @@ public class SysUserFunVO implements Serializable { * 是否展示【0：否/1：是】 */ private String displayfun; - + /** * 父功能代号 diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserRoleAddDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserRoleAddDTO.java index 22af34c..01f0e76 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserRoleAddDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserRoleAddDTO.java @@ -7,17 +7,17 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) -public class SysUserRoleAddDTO implements Serializable { +public class SysUserRoleAddDTO implements Serializable { /** * 用户代码 */ private String userid; /** - * 角色代码 + * 角色代码 */ private String roleid; - + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserRoleBatchDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserRoleBatchDTO.java index 34d3a50..323a6f6 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserRoleBatchDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserRoleBatchDTO.java @@ -9,14 +9,13 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = false) -public class SysUserRoleBatchDTO implements Serializable { +public class SysUserRoleBatchDTO implements Serializable { /** * 用户代码 */ private String userid; - /** * 操作时间 */ @@ -26,10 +25,9 @@ public class SysUserRoleBatchDTO implements Serializable { * 操作者 */ private String operateUser; - + private List roleids; - - - + + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserRoleCheckDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserRoleCheckDTO.java index cc9a2e9..bd6fd85 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserRoleCheckDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserRoleCheckDTO.java @@ -7,7 +7,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) -public class SysUserRoleCheckDTO implements Serializable { +public class SysUserRoleCheckDTO implements Serializable { /** * 角色代号 */ @@ -21,7 +21,7 @@ public class SysUserRoleCheckDTO implements Serializable { * 审核标示 */ private String markflag; - + private boolean checked; /** diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserRoleCheckVO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserRoleCheckVO.java index 75bdbcc..fd8de82 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserRoleCheckVO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserRoleCheckVO.java @@ -7,7 +7,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) -public class SysUserRoleCheckVO implements Serializable { +public class SysUserRoleCheckVO implements Serializable { /** * 角色代号 */ @@ -21,7 +21,7 @@ public class SysUserRoleCheckVO implements Serializable { * 审核标示 */ private String markflag; - + private boolean checked; /** diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserRoleDTO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserRoleDTO.java index 82d64a0..0f79c2e 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserRoleDTO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserRoleDTO.java @@ -7,7 +7,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) -public class SysUserRoleDTO implements Serializable { +public class SysUserRoleDTO implements Serializable { /** * 角色代号 */ diff --git a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserRoleVO.java b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserRoleVO.java index 6e68ba3..c8b5263 100644 --- a/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserRoleVO.java +++ b/inter-boot-protocol/src/main/java/tech/mhuang/interchan/protocol/sso/sysuserrole/SysUserRoleVO.java @@ -7,7 +7,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) -public class SysUserRoleVO implements Serializable { +public class SysUserRoleVO implements Serializable { /** * 角色代号 */ diff --git a/inter-boot-sso/pom.xml b/inter-boot-sso/pom.xml index ced4d59..2e17e74 100644 --- a/inter-boot-sso/pom.xml +++ b/inter-boot-sso/pom.xml @@ -6,16 +6,12 @@ tech.mhuang.interchan inter-boot-demo - 1.4.1 + 1.4.2 inter-boot-sso inter-boot-sso http://maven.apache.org - - org.springframework.boot - spring-boot-starter-data-redis - org.springframework.boot spring-boot-starter-web @@ -28,6 +24,10 @@ tech.mhuang interchan-auth-common + + tech.mhuang + interchan-redis-common + tech.mhuang.interchan inter-boot-protocol @@ -57,14 +57,18 @@ org.apache.logging.log4j log4j-to-slf4j + + + + + - commons-codec - commons-codec + com.github.xiaoymin + knife4j-spring-boot-starter - tech.mhuang.interchan - inter-logger-common - ${project.version} + io.lettuce + lettuce-core diff --git a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysfun/controller/SysFunController.java b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysfun/controller/SysFunController.java index 6220d0d..5265f04 100644 --- a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysfun/controller/SysFunController.java +++ b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysfun/controller/SysFunController.java @@ -6,27 +6,14 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import tech.mhuang.core.util.StringUtil; import tech.mhuang.ext.interchan.core.controller.BaseController; import tech.mhuang.ext.interchan.core.local.GlobalHeaderThreadLocal; import tech.mhuang.ext.interchan.protocol.Result; import tech.mhuang.ext.interchan.protocol.data.PageVO; import tech.mhuang.ext.spring.util.DataUtil; -import tech.mhuang.interchan.protocol.sso.sysfun.SysFunAddDTO; -import tech.mhuang.interchan.protocol.sso.sysfun.SysFunModDTO; -import tech.mhuang.interchan.protocol.sso.sysfun.SysFunPageQueryDTO; -import tech.mhuang.interchan.protocol.sso.sysfun.SysFunQueryDTO; -import tech.mhuang.interchan.protocol.sso.sysfun.SysFunTreeQueryDTO; -import tech.mhuang.interchan.protocol.sso.sysfun.SysFunVO; +import tech.mhuang.interchan.protocol.sso.sysfun.*; import tech.mhuang.interchan.sso.sysfun.service.ISysFunService; import java.util.List; diff --git a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysfun/service/ISysFunService.java b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysfun/service/ISysFunService.java index 5aaf777..2549915 100644 --- a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysfun/service/ISysFunService.java +++ b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysfun/service/ISysFunService.java @@ -2,12 +2,7 @@ package tech.mhuang.interchan.sso.sysfun.service; import tech.mhuang.ext.interchan.core.service.BaseService; import tech.mhuang.ext.interchan.protocol.data.PageVO; -import tech.mhuang.interchan.protocol.sso.sysfun.SysFunAddDTO; -import tech.mhuang.interchan.protocol.sso.sysfun.SysFunModDTO; -import tech.mhuang.interchan.protocol.sso.sysfun.SysFunPageQueryDTO; -import tech.mhuang.interchan.protocol.sso.sysfun.SysFunQueryDTO; -import tech.mhuang.interchan.protocol.sso.sysfun.SysFunTreeQueryDTO; -import tech.mhuang.interchan.protocol.sso.sysfun.SysFunVO; +import tech.mhuang.interchan.protocol.sso.sysfun.*; import tech.mhuang.interchan.sso.sysfun.entity.SysFun; import java.util.List; diff --git a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysfun/service/impl/SysFunServiceImpl.java b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysfun/service/impl/SysFunServiceImpl.java index aa61995..2b770ac 100644 --- a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysfun/service/impl/SysFunServiceImpl.java +++ b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysfun/service/impl/SysFunServiceImpl.java @@ -15,13 +15,7 @@ import tech.mhuang.ext.interchan.protocol.Result; import tech.mhuang.ext.interchan.protocol.data.Page; import tech.mhuang.ext.interchan.protocol.data.PageVO; import tech.mhuang.ext.spring.util.DataUtil; -import tech.mhuang.interchan.protocol.sso.sysfun.SysFunAddDTO; -import tech.mhuang.interchan.protocol.sso.sysfun.SysFunDTO; -import tech.mhuang.interchan.protocol.sso.sysfun.SysFunModDTO; -import tech.mhuang.interchan.protocol.sso.sysfun.SysFunPageQueryDTO; -import tech.mhuang.interchan.protocol.sso.sysfun.SysFunQueryDTO; -import tech.mhuang.interchan.protocol.sso.sysfun.SysFunTreeQueryDTO; -import tech.mhuang.interchan.protocol.sso.sysfun.SysFunVO; +import tech.mhuang.interchan.protocol.sso.sysfun.*; import tech.mhuang.interchan.protocol.sso.sysfunvisturl.SyChanmgfunVistUrlmAddDTO; import tech.mhuang.interchan.sso.sysfun.entity.SysFun; import tech.mhuang.interchan.sso.sysfun.mapper.SysFunMapper; diff --git a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysfunvisturl/service/impl/SyChanmgfunVistUrlService.java b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysfunvisturl/service/impl/SyChanmgfunVistUrlService.java index bec64a4..0482ca4 100644 --- a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysfunvisturl/service/impl/SyChanmgfunVistUrlService.java +++ b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysfunvisturl/service/impl/SyChanmgfunVistUrlService.java @@ -10,7 +10,6 @@ import tech.mhuang.core.id.BaseIdeable; import tech.mhuang.core.util.CollectionUtil; import tech.mhuang.core.util.StringUtil; import tech.mhuang.ext.interchan.auth.constant.AuthConstant; -import tech.mhuang.ext.interchan.core.rest.SingleRestTemplate; import tech.mhuang.ext.interchan.core.service.impl.BaseServiceImpl; import tech.mhuang.ext.interchan.protocol.InsertInto; import tech.mhuang.ext.interchan.redis.commands.IRedisExtCommands; @@ -91,7 +90,7 @@ public class SyChanmgfunVistUrlService @Override public void insertPowersUrl(List dtos, String userId, String seqno) { dtos.forEach((value) -> { - SyChanmgfunVistUrlm url = DataUtil.copyTo(value,SyChanmgfunVistUrlm.class); + SyChanmgfunVistUrlm url = DataUtil.copyTo(value, SyChanmgfunVistUrlm.class); url.setOperateTime(new Date()); url.setOperateUser(userId); url.setId(snowflake.generateId()); diff --git a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysrole/controller/SysRoleController.java b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysrole/controller/SysRoleController.java index 19cd82b..72abd8f 100644 --- a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysrole/controller/SysRoleController.java +++ b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysrole/controller/SysRoleController.java @@ -5,18 +5,7 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import springfox.documentation.annotations.ApiIgnore; -import tech.mhuang.ext.interchan.core.constans.Global; +import org.springframework.web.bind.annotation.*; import tech.mhuang.ext.interchan.core.controller.BaseController; import tech.mhuang.ext.interchan.core.local.GlobalHeaderThreadLocal; import tech.mhuang.ext.interchan.protocol.GlobalHeader; @@ -24,11 +13,7 @@ import tech.mhuang.ext.interchan.protocol.Result; import tech.mhuang.ext.interchan.protocol.data.Page; import tech.mhuang.ext.interchan.protocol.data.PageVO; import tech.mhuang.ext.spring.util.DataUtil; -import tech.mhuang.interchan.protocol.sso.sysrole.SysRoleAddDTO; -import tech.mhuang.interchan.protocol.sso.sysrole.SysRoleModDTO; -import tech.mhuang.interchan.protocol.sso.sysrole.SysRolePageQueryDTO; -import tech.mhuang.interchan.protocol.sso.sysrole.SysRoleQueryDTO; -import tech.mhuang.interchan.protocol.sso.sysrole.SysRoleVO; +import tech.mhuang.interchan.protocol.sso.sysrole.*; import tech.mhuang.interchan.protocol.sso.sysrole.request.SysRolePageQueryQVO; import tech.mhuang.interchan.protocol.sso.sysrole.response.SysRoleRVO; import tech.mhuang.interchan.sso.sysrole.entity.SysRole; @@ -56,8 +41,7 @@ public class SysRoleController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "sysRoleAddDTO", value = "角色对象", required = true, paramType = "body", dataType = "SysRoleAddDTO"), }) - public Result saveRole(@RequestBody SysRoleAddDTO sysRoleAddDTO, - @ApiIgnore @RequestHeader(name = Global.GLOBAL_HEADER, required = false) String header) { + public Result saveRole(@RequestBody SysRoleAddDTO sysRoleAddDTO) { GlobalHeader globalHeader = GlobalHeaderThreadLocal.getOrException(); sysRoleService.saveRole(sysRoleAddDTO, globalHeader.getUserId()); return Result.ok(); diff --git a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysrole/service/ISysRoleService.java b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysrole/service/ISysRoleService.java index 5eeb7cf..1de681d 100644 --- a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysrole/service/ISysRoleService.java +++ b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysrole/service/ISysRoleService.java @@ -2,11 +2,7 @@ package tech.mhuang.interchan.sso.sysrole.service; import tech.mhuang.ext.interchan.core.service.BaseService; import tech.mhuang.ext.interchan.protocol.data.PageVO; -import tech.mhuang.interchan.protocol.sso.sysrole.SysRoleAddDTO; -import tech.mhuang.interchan.protocol.sso.sysrole.SysRoleModDTO; -import tech.mhuang.interchan.protocol.sso.sysrole.SysRolePageQueryDTO; -import tech.mhuang.interchan.protocol.sso.sysrole.SysRoleQueryDTO; -import tech.mhuang.interchan.protocol.sso.sysrole.SysRoleVO; +import tech.mhuang.interchan.protocol.sso.sysrole.*; import tech.mhuang.interchan.protocol.sso.sysrole.request.SysRolePageQueryQVO; import tech.mhuang.interchan.sso.sysrole.entity.SysRole; diff --git a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysrole/service/impl/SysRoleServiceImpl.java b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysrole/service/impl/SysRoleServiceImpl.java index 1874608..9cfca3f 100644 --- a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysrole/service/impl/SysRoleServiceImpl.java +++ b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysrole/service/impl/SysRoleServiceImpl.java @@ -13,11 +13,7 @@ import tech.mhuang.ext.interchan.protocol.Result; import tech.mhuang.ext.interchan.protocol.data.Page; import tech.mhuang.ext.interchan.protocol.data.PageVO; import tech.mhuang.ext.spring.util.DataUtil; -import tech.mhuang.interchan.protocol.sso.sysrole.SysRoleAddDTO; -import tech.mhuang.interchan.protocol.sso.sysrole.SysRoleModDTO; -import tech.mhuang.interchan.protocol.sso.sysrole.SysRolePageQueryDTO; -import tech.mhuang.interchan.protocol.sso.sysrole.SysRoleQueryDTO; -import tech.mhuang.interchan.protocol.sso.sysrole.SysRoleVO; +import tech.mhuang.interchan.protocol.sso.sysrole.*; import tech.mhuang.interchan.protocol.sso.sysrole.request.SysRolePageQueryQVO; import tech.mhuang.interchan.sso.sysrole.domain.SysRolePageQueryDO; import tech.mhuang.interchan.sso.sysrole.entity.SysRole; diff --git a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysrolefun/controller/SysRoleFunController.java b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysrolefun/controller/SysRoleFunController.java index f83be29..5cc9ec5 100644 --- a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysrolefun/controller/SysRoleFunController.java +++ b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysrolefun/controller/SysRoleFunController.java @@ -6,26 +6,14 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import springfox.documentation.annotations.ApiIgnore; +import org.springframework.web.bind.annotation.*; import tech.mhuang.core.util.CollectionUtil; -import tech.mhuang.ext.interchan.core.constans.Global; import tech.mhuang.ext.interchan.core.controller.BaseController; import tech.mhuang.ext.interchan.core.local.GlobalHeaderThreadLocal; import tech.mhuang.ext.interchan.protocol.GlobalHeader; import tech.mhuang.ext.interchan.protocol.Result; import tech.mhuang.ext.spring.util.DataUtil; -import tech.mhuang.interchan.protocol.sso.sysfunrole.SysRoleFunAddDTO; -import tech.mhuang.interchan.protocol.sso.sysfunrole.SysRoleFunDTO; -import tech.mhuang.interchan.protocol.sso.sysfunrole.SysRoleFunTreeDTO; -import tech.mhuang.interchan.protocol.sso.sysfunrole.SysRoleFunTreeVO; -import tech.mhuang.interchan.protocol.sso.sysfunrole.SysRoleFunVO; +import tech.mhuang.interchan.protocol.sso.sysfunrole.*; import tech.mhuang.interchan.sso.sysrolefun.service.ISysRoleFunService; import java.util.Comparator; @@ -51,8 +39,7 @@ public class SysRoleFunController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "sysRoleFunAddDTO", value = "角色功能对象,多个funid用逗号隔开", required = true, paramType = "body", dataType = "SysRoleFunAddDTO"), }) - public Result setRoleFun(@RequestBody SysRoleFunAddDTO sysRoleFunAddDTO, - @ApiIgnore @RequestHeader(name = Global.GLOBAL_HEADER, required = false) String header) { + public Result setRoleFun(@RequestBody SysRoleFunAddDTO sysRoleFunAddDTO) { GlobalHeader globalHeader = GlobalHeaderThreadLocal.getOrException(); sysRoleFunService.saveRoleFun(sysRoleFunAddDTO, globalHeader.getUserId()); return Result.ok(); diff --git a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysuser/controller/SysUserController.java b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysuser/controller/SysUserController.java index 3d38600..7e222b0 100644 --- a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysuser/controller/SysUserController.java +++ b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysuser/controller/SysUserController.java @@ -5,14 +5,7 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import tech.mhuang.ext.interchan.core.controller.BaseController; import tech.mhuang.ext.interchan.core.local.GlobalHeaderThreadLocal; import tech.mhuang.ext.interchan.protocol.GlobalHeader; @@ -21,12 +14,7 @@ import tech.mhuang.ext.interchan.protocol.data.PageVO; import tech.mhuang.ext.jwt.admin.JwtFramework; import tech.mhuang.ext.spring.util.DataUtil; import tech.mhuang.interchan.protocol.sso.UserDTO; -import tech.mhuang.interchan.protocol.sso.sysuser.LoginSysUserDTO; -import tech.mhuang.interchan.protocol.sso.sysuser.LoginSysUserVO; -import tech.mhuang.interchan.protocol.sso.sysuser.SysUserAddDTO; -import tech.mhuang.interchan.protocol.sso.sysuser.SysUserDTO; -import tech.mhuang.interchan.protocol.sso.sysuser.SysUserUpdateDTO; -import tech.mhuang.interchan.protocol.sso.sysuser.SysUserVO; +import tech.mhuang.interchan.protocol.sso.sysuser.*; import tech.mhuang.interchan.protocol.sso.sysuser.dto.SysUserPageDTO; import tech.mhuang.interchan.protocol.sso.sysuser.dto.SysUserPageQryDTO; import tech.mhuang.interchan.protocol.sso.sysuser.pwd.ResetPwdDTO; diff --git a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysuser/service/ISysUserService.java b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysuser/service/ISysUserService.java index c9ed752..e090832 100644 --- a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysuser/service/ISysUserService.java +++ b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysuser/service/ISysUserService.java @@ -3,11 +3,7 @@ package tech.mhuang.interchan.sso.sysuser.service; import tech.mhuang.ext.interchan.core.service.BaseService; import tech.mhuang.ext.interchan.protocol.data.PageVO; import tech.mhuang.interchan.protocol.sso.UserDTO; -import tech.mhuang.interchan.protocol.sso.sysuser.LoginSysUserDTO; -import tech.mhuang.interchan.protocol.sso.sysuser.SysUserAddDTO; -import tech.mhuang.interchan.protocol.sso.sysuser.SysUserDTO; -import tech.mhuang.interchan.protocol.sso.sysuser.SysUserUpdateDTO; -import tech.mhuang.interchan.protocol.sso.sysuser.SysUserVO; +import tech.mhuang.interchan.protocol.sso.sysuser.*; import tech.mhuang.interchan.protocol.sso.sysuser.dto.SysUserPageDTO; import tech.mhuang.interchan.protocol.sso.sysuser.dto.SysUserPageQryDTO; import tech.mhuang.interchan.protocol.sso.sysuser.pwd.ResetPwdDTO; diff --git a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysuser/service/impl/SysUserServiceImpl.java b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysuser/service/impl/SysUserServiceImpl.java index 5dcfe9c..9f66287 100644 --- a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysuser/service/impl/SysUserServiceImpl.java +++ b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysuser/service/impl/SysUserServiceImpl.java @@ -18,11 +18,7 @@ import tech.mhuang.ext.interchan.protocol.data.PageVO; import tech.mhuang.ext.interchan.redis.commands.IRedisExtCommands; import tech.mhuang.ext.spring.util.DataUtil; import tech.mhuang.interchan.protocol.sso.UserDTO; -import tech.mhuang.interchan.protocol.sso.sysuser.LoginSysUserDTO; -import tech.mhuang.interchan.protocol.sso.sysuser.SysUserAddDTO; -import tech.mhuang.interchan.protocol.sso.sysuser.SysUserDTO; -import tech.mhuang.interchan.protocol.sso.sysuser.SysUserUpdateDTO; -import tech.mhuang.interchan.protocol.sso.sysuser.SysUserVO; +import tech.mhuang.interchan.protocol.sso.sysuser.*; import tech.mhuang.interchan.protocol.sso.sysuser.dto.SysUserPageDTO; import tech.mhuang.interchan.protocol.sso.sysuser.dto.SysUserPageQryDTO; import tech.mhuang.interchan.protocol.sso.sysuser.pwd.ResetPwdDTO; diff --git a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysuserrole/controller/SysUserRoleController.java b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysuserrole/controller/SysUserRoleController.java index 14583fe..a77129b 100644 --- a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysuserrole/controller/SysUserRoleController.java +++ b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysuserrole/controller/SysUserRoleController.java @@ -5,25 +5,14 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import tech.mhuang.ext.interchan.core.controller.BaseController; import tech.mhuang.ext.interchan.core.local.GlobalHeaderThreadLocal; import tech.mhuang.ext.interchan.protocol.GlobalHeader; import tech.mhuang.ext.interchan.protocol.Result; import tech.mhuang.ext.interchan.protocol.data.PageVO; import tech.mhuang.ext.spring.util.DataUtil; -import tech.mhuang.interchan.protocol.sso.sysuserrole.SysUserFunDTO; -import tech.mhuang.interchan.protocol.sso.sysuserrole.SysUserFunVO; -import tech.mhuang.interchan.protocol.sso.sysuserrole.SysUserRoleAddDTO; -import tech.mhuang.interchan.protocol.sso.sysuserrole.SysUserRoleCheckDTO; -import tech.mhuang.interchan.protocol.sso.sysuserrole.SysUserRoleCheckVO; -import tech.mhuang.interchan.protocol.sso.sysuserrole.SysUserRoleDTO; -import tech.mhuang.interchan.protocol.sso.sysuserrole.SysUserRoleVO; +import tech.mhuang.interchan.protocol.sso.sysuserrole.*; import tech.mhuang.interchan.sso.sysfunvisturl.service.ISyChanmgfunVistUrlService; import tech.mhuang.interchan.sso.sysuserrole.service.ISysUserRoleService; diff --git a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysuserrole/service/impl/SysUserRoleServiceImpl.java b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysuserrole/service/impl/SysUserRoleServiceImpl.java index d0e77c6..c17d808 100644 --- a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysuserrole/service/impl/SysUserRoleServiceImpl.java +++ b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/sysuserrole/service/impl/SysUserRoleServiceImpl.java @@ -10,11 +10,7 @@ import tech.mhuang.ext.interchan.core.service.impl.BaseServiceImpl; import tech.mhuang.ext.interchan.protocol.InsertInto; import tech.mhuang.ext.interchan.redis.commands.IRedisExtCommands; import tech.mhuang.ext.spring.util.DataUtil; -import tech.mhuang.interchan.protocol.sso.sysuserrole.SysUserFunDTO; -import tech.mhuang.interchan.protocol.sso.sysuserrole.SysUserRoleAddDTO; -import tech.mhuang.interchan.protocol.sso.sysuserrole.SysUserRoleBatchDTO; -import tech.mhuang.interchan.protocol.sso.sysuserrole.SysUserRoleCheckDTO; -import tech.mhuang.interchan.protocol.sso.sysuserrole.SysUserRoleDTO; +import tech.mhuang.interchan.protocol.sso.sysuserrole.*; import tech.mhuang.interchan.sso.sysuserrole.entity.SysUserRole; import tech.mhuang.interchan.sso.sysuserrole.mapper.SysUserRoleMapper; import tech.mhuang.interchan.sso.sysuserrole.service.ISysUserRoleService; diff --git a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/util/AES.java b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/util/AES.java index 0778c8d..32f051c 100644 --- a/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/util/AES.java +++ b/inter-boot-sso/src/main/java/tech/mhuang/interchan/sso/util/AES.java @@ -1,11 +1,11 @@ package tech.mhuang.interchan.sso.util; -import org.apache.commons.codec.binary.Base64; import javax.crypto.Cipher; import javax.crypto.spec.SecretKeySpec; import java.security.MessageDigest; import java.security.SecureRandom; +import java.util.Base64; public class AES { // 加密算法 @@ -28,8 +28,7 @@ public class AES { aesCipher.init(Cipher.ENCRYPT_MODE, secKey, random); byte[] byteCipherText = aesCipher.doFinal(byteText); - Base64 base64 = new Base64(); - return new String(base64.encode(byteCipherText), ENC); + return new String(Base64.getEncoder().encode(byteCipherText), ENC); } // 解密 @@ -41,8 +40,7 @@ public class AES { SecureRandom random = SecureRandom.getInstance("SHA1PRNG"); random.setSeed(secret.getBytes()); aesCipher.init(Cipher.DECRYPT_MODE, secKey, random); - Base64 base64 = new Base64(); - byte[] cipherbytes = base64.decode(ciphertext.getBytes()); + byte[] cipherbytes = Base64.getDecoder().decode(ciphertext.getBytes()); byte[] bytePlainText = aesCipher.doFinal(cipherbytes); return new String(bytePlainText, ENC); } diff --git a/inter-boot-sso/src/main/resources/application-dev.properties b/inter-boot-sso/src/main/resources/application-dev.properties index 2396ba3..e125ed4 100644 --- a/inter-boot-sso/src/main/resources/application-dev.properties +++ b/inter-boot-sso/src/main/resources/application-dev.properties @@ -1,32 +1,32 @@ spring.application.name=inter-boot-sso server.port=8084 ###########Redis###################### -spring.redis.host=192.168.1.210 -spring.redis.port=6369 +spring.redis.host=127.0.0.1 +spring.redis.port=6379 ###data\u6570\u636E######### ##################\u6570\u636E\u5E93\u00AE############### -spring.datasource.url=jdbc:mysql://127.0.0.1:3306/micro-inter-demo?useUnicode=true&serverTimezone=Hongkong&characterEncoding=UTF-8&useSSL=false +spring.datasource.url=jdbc:mysql://127.0.0.1:3306/micro-inter-demo?serverTimezone=UTC&useUnicode=true&allowMultiQueries=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true spring.datasource.username=root spring.datasource.password=huangmiao -#es -mhuang.elasticsearch.enable=true -mhuang.elasticsearch.bean-map.zhangsan.enable=true -mhuang.elasticsearch.bean-map.zhangsan.ip=192.168.1.210 -#logger \u8BB0\u5F55 -mhuang.interchan.logger.enable=true -mhuang.interchan.logger.es-key=zhangsan -mhuang.interchan.logger.kafka-key=zhangsan -mhuang.interchan.logger.kafka-topic=logger -#kafka -mhuang.kafka.enable=true -mhuang.kafka.servers=192.168.1.210:9092 -mhuang.kafka.enable-producer=true -mhuang.kafka.producer-map.zhangsan.enable=true -mhuang.kafka.enable-consumer=true -mhuang.kafka.consumer-map.zhangsan.enable=true -mhuang.kafka.consumer-map.zhangsan.topics=logger -mhuang.kafka.consumer-map.zhangsan.invoke-bean-name=loggerConsumer -mhuang.kafka.consumer-map.zhangsan.invoke-method-name=invoke +##es +#mhuang.elasticsearch.enable=true +#mhuang.elasticsearch.bean-map.zhangsan.enable=true +#mhuang.elasticsearch.bean-map.zhangsan.ip=192.168.1.210 +##logger \u8BB0\u5F55 +#mhuang.interchan.logger.enable=true +#mhuang.interchan.logger.es-key=zhangsan +#mhuang.interchan.logger.kafka-key=zhangsan +#mhuang.interchan.logger.kafka-topic=logger +##kafka +#mhuang.kafka.enable=true +#mhuang.kafka.servers=192.168.1.210:9092 +#mhuang.kafka.enable-producer=true +#mhuang.kafka.producer-map.zhangsan.enable=true +#mhuang.kafka.enable-consumer=true +#mhuang.kafka.consumer-map.zhangsan.enable=true +#mhuang.kafka.consumer-map.zhangsan.topics=logger +#mhuang.kafka.consumer-map.zhangsan.invoke-bean-name=loggerConsumer +#mhuang.kafka.consumer-map.zhangsan.invoke-method-name=invoke #open single enable mhuang.interchan.rest.single.enable=true #auth diff --git a/inter-boot-sso/src/main/resources/application.properties b/inter-boot-sso/src/main/resources/application.properties index 4a47307..9e30603 100644 --- a/inter-boot-sso/src/main/resources/application.properties +++ b/inter-boot-sso/src/main/resources/application.properties @@ -1,4 +1,5 @@ spring.profiles.active=@spring.profiles.active@ + spring.main.allow-bean-definition-overriding=true chan_mobile_is_not_exists=\u624B\u673A\u53F7\u4E0D\u5B58\u5728! chan_mobile_or_pwd_error=\u624B\u673A\u53F7\u6216\u8005\u5BC6\u7801\u9519\u8BEF diff --git a/inter-boot-web/pom.xml b/inter-boot-web/pom.xml index 0c3849a..99328d9 100644 --- a/inter-boot-web/pom.xml +++ b/inter-boot-web/pom.xml @@ -6,7 +6,7 @@ tech.mhuang.interchan inter-boot-demo - 1.4.1 + 1.4.2 inter-boot-web inter-boot-web diff --git a/inter-boot-web/src/main/resources/public/index.html b/inter-boot-web/src/main/resources/public/index.html index 46edd58..527c996 100644 --- a/inter-boot-web/src/main/resources/public/index.html +++ b/inter-boot-web/src/main/resources/public/index.html @@ -255,14 +255,14 @@ if (power.botflag == '1' && checkAddMenu(power, powers)) {//是菜单并且有显示权限 html += '
  • '; - if(power.funpath){ - html+=''+power.fundesc+''; - }else{ - html+=' '; - html+=' '+power.fundesc+' '; - html+=' '; - html+=' '; - html+=getMenuHtml(power,powers); + if (power.funpath) { + html += '' + power.fundesc + ''; + } else { + html += ' '; + html += ' ' + power.fundesc + ' '; + html += ' '; + html += ' '; + html += getMenuHtml(power, powers); } html += '
    • '; } diff --git a/inter-boot-web/src/main/resources/static/common/bootstrap-table.js b/inter-boot-web/src/main/resources/static/common/bootstrap-table.js index e37395d..33b1d9d 100644 --- a/inter-boot-web/src/main/resources/static/common/bootstrap-table.js +++ b/inter-boot-web/src/main/resources/static/common/bootstrap-table.js @@ -43,7 +43,7 @@ function initTable(table) { if ((typeof table.useToken) == "undefined" || table.useToken) { bootstrapTableConfig['ajaxOptions'] = {}; bootstrapTableConfig['ajaxOptions']['headers'] = { - 'authType':getSessionData('authType'), + 'authType': getSessionData('authType'), 'Authorization': 'Bearer ' + getSessionData('userToken') } } @@ -81,7 +81,7 @@ function initTableTree(table) { if ((typeof table.useToken) == "undefined" || table.useToken) { ext.ajaxOptions = {}; ext.ajaxOptions.headers = { - 'authType':getSessionData('authType'), + 'authType': getSessionData('authType'), 'Authorization': 'Bearer ' + getSessionData('userToken') // 'Action':'getToken' } @@ -204,7 +204,7 @@ function initJQTreeTable(config) { }; if ((typeof config.useToken) == "undefined" || config.useToken) { defaults.headers = { - 'authType':getSessionData('authType'), + 'authType': getSessionData('authType'), 'Authorization': 'Bearer ' + getSessionData('userToken') // 'Action':'getToken' } diff --git a/inter-boot-web/src/main/resources/static/common/hmtool.js b/inter-boot-web/src/main/resources/static/common/hmtool.js index 70e7b8d..5a740f9 100644 --- a/inter-boot-web/src/main/resources/static/common/hmtool.js +++ b/inter-boot-web/src/main/resources/static/common/hmtool.js @@ -1,5 +1,6 @@ var SUCCESS_CODE = 200, SSO_URL = "@SSO_URL@"; + /** * 获取session用户 * @returns object @@ -132,7 +133,7 @@ function sendSingleFile(fileFiledId, options) { } if ((typeof options.useToken) == "undefined" || options.useToken) { options['headers'] = { - 'authType':getSessionData('authType'), + 'authType': getSessionData('authType'), 'Authorization': 'Bearer ' + getSessionData('userToken') // 'Action':'getToken' } @@ -198,7 +199,7 @@ function ajaxRequest(req) { } else { ajaxConfig['beforeSend'] = function (xhr) { if ((typeof req.useToken) == "undefined" || req.useToken) { - xhr.setRequestHeader('authType',getSessionData('authType')); + xhr.setRequestHeader('authType', getSessionData('authType')); xhr.setRequestHeader('Authorization', 'Bearer ' + getSessionData('userToken')); // xhr.setRequestHeader('Action','getToken'); } diff --git a/inter-boot-web/src/main/resources/static/js/plugins/datapicker/bootstrap-datepicker.js b/inter-boot-web/src/main/resources/static/js/plugins/datapicker/bootstrap-datepicker.js index ea61939..ca224ec 100644 --- a/inter-boot-web/src/main/resources/static/js/plugins/datapicker/bootstrap-datepicker.js +++ b/inter-boot-web/src/main/resources/static/js/plugins/datapicker/bootstrap-datepicker.js @@ -557,7 +557,7 @@ if (this.o.orientation.x === 'right') left -= calendarWidth - width; } - // auto x orientation is best-placement: if it crosses a window + // auto x orientation is best-placement: if it crosses a window // edge, fudge it sideways else { // Default to left diff --git a/inter-boot-web/src/main/resources/static/js/plugins/flot/jquery.flot.js b/inter-boot-web/src/main/resources/static/js/plugins/flot/jquery.flot.js index 2d13c3d..9820b30 100644 --- a/inter-boot-web/src/main/resources/static/js/plugins/flot/jquery.flot.js +++ b/inter-boot-web/src/main/resources/static/js/plugins/flot/jquery.flot.js @@ -1254,8 +1254,8 @@ if (typeof opts.ticks == "number" && opts.ticks > 0) noTicks = opts.ticks; else - // heuristic based on the model a*sqrt(x) fitted to - // some data points that seemed reasonable + // heuristic based on the model a*sqrt(x) fitted to + // some data points that seemed reasonable noTicks = 0.3 * Math.sqrt(axis.direction == "x" ? canvasWidth : canvasHeight); var delta = (axis.max - axis.min) / noTicks, @@ -1519,7 +1519,7 @@ ticks = axis.tickGenerator(axis); else if (oticks) { if ($.isFunction(oticks)) - // generate the ticks + // generate the ticks ticks = oticks({min: axis.min, max: axis.max}); else ticks = oticks; diff --git a/inter-boot-web/src/main/resources/static/js/plugins/markdown/markdown.js b/inter-boot-web/src/main/resources/static/js/plugins/markdown/markdown.js index 75a4300..4c69a05 100644 --- a/inter-boot-web/src/main/resources/static/js/plugins/markdown/markdown.js +++ b/inter-boot-web/src/main/resources/static/js/plugins/markdown/markdown.js @@ -802,7 +802,7 @@ if (text.match(/^\\[\\`\*_{}\[\]()#\+.!\-]/)) return [2, text[1]]; else - // Not an esacpe + // Not an esacpe return [1, "\\"]; }, diff --git a/inter-boot-web/src/main/resources/static/js/plugins/plyr/plyr.js b/inter-boot-web/src/main/resources/static/js/plugins/plyr/plyr.js index fa3ef6d..9830c54 100644 --- a/inter-boot-web/src/main/resources/static/js/plugins/plyr/plyr.js +++ b/inter-boot-web/src/main/resources/static/js/plugins/plyr/plyr.js @@ -1687,8 +1687,8 @@ }); } - // An array of source objects - // Check if a source exists, use that or set the 'src' attribute? + // An array of source objects + // Check if a source exists, use that or set the 'src' attribute? // .source([{ src: 'path/to/video.mp4', type: 'video/mp4' },{ src: 'path/to/video.webm', type: 'video/webm' }]) else if (sources.constructor === Array) { for (var index in sources) { diff --git a/inter-boot-web/src/main/resources/static/js/plugins/ueditor/third-party/highcharts/highcharts.src.js b/inter-boot-web/src/main/resources/static/js/plugins/ueditor/third-party/highcharts/highcharts.src.js index fc30293..9c1ca0e 100644 --- a/inter-boot-web/src/main/resources/static/js/plugins/ueditor/third-party/highcharts/highcharts.src.js +++ b/inter-boot-web/src/main/resources/static/js/plugins/ueditor/third-party/highcharts/highcharts.src.js @@ -6408,8 +6408,8 @@ // Create new label } else { this.label = - this.axis.chart.renderer.text(str, 0, 0, options.useHTML) // dummy positions, actual position updated with setOffset method in columnseries - .css(options.style) // apply style + this.axis.chart.renderer.text(str, 0, 0, options.useHTML) // dummy positions, actual position updated with setOffset method in columnseries + .css(options.style) // apply style .attr({ align: this.textAlign, // fix the text-anchor rotation: options.rotation, // rotation diff --git a/inter-boot-web/src/main/resources/static/js/plugins/ueditor/third-party/jquery-1.10.2.js b/inter-boot-web/src/main/resources/static/js/plugins/ueditor/third-party/jquery-1.10.2.js index 11743f9..33863bf 100644 --- a/inter-boot-web/src/main/resources/static/js/plugins/ueditor/third-party/jquery-1.10.2.js +++ b/inter-boot-web/src/main/resources/static/js/plugins/ueditor/third-party/jquery-1.10.2.js @@ -9322,7 +9322,7 @@ // show any hidden elements after setting opacity to 0 return this.filter(isHidden).css("opacity", 0).show() - // animate to the value specified + // animate to the value specified .end().animate({opacity: to}, speed, easing, callback); }, animate: function (prop, speed, easing, callback) { diff --git a/inter-logger-common/pom.xml b/inter-logger-common/pom.xml index b23f8cd..ec4f4f9 100644 --- a/inter-logger-common/pom.xml +++ b/inter-logger-common/pom.xml @@ -5,7 +5,7 @@ inter-boot-demo tech.mhuang.interchan - 1.4.1 + 1.4.2 4.0.0 inter-logger-common diff --git a/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/LoggerAutoConfiguration.java b/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/LoggerAutoConfiguration.java index 941a5df..9228a25 100644 --- a/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/LoggerAutoConfiguration.java +++ b/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/LoggerAutoConfiguration.java @@ -7,14 +7,13 @@ import org.springframework.context.annotation.Configuration; import tech.mhuang.core.check.CheckAssert; /** - * * 日志 * * @author mhuang * @since 1.0.0 */ @Configuration -@ConditionalOnProperty(prefix = "mhuang.interchan.logger", name = "enable", havingValue = "true") +@ConditionalOnProperty(prefix = "mhuang.interchan.logger", name = "enable", havingValue = "true",matchIfMissing = true) @EnableConfigurationProperties(value = {LoggerProperties.class}) public class LoggerAutoConfiguration { diff --git a/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/LoggerProperties.java b/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/LoggerProperties.java index 21708ad..a1e9184 100644 --- a/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/LoggerProperties.java +++ b/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/LoggerProperties.java @@ -4,7 +4,6 @@ import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; /** - * * 日志需要的属性 * * @author mhuang diff --git a/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/WebLoggerAspect.java b/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/WebLoggerAspect.java index e486c75..279bee1 100644 --- a/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/WebLoggerAspect.java +++ b/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/WebLoggerAspect.java @@ -3,11 +3,7 @@ package tech.mhuang.interchan.logger; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.annotation.AfterReturning; -import org.aspectj.lang.annotation.AfterThrowing; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; -import org.aspectj.lang.annotation.Pointcut; +import org.aspectj.lang.annotation.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.core.annotation.Order; diff --git a/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/annoation/ESLogger.java b/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/annoation/ESLogger.java index bd58631..b0b2eb0 100644 --- a/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/annoation/ESLogger.java +++ b/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/annoation/ESLogger.java @@ -8,7 +8,6 @@ import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; /** - * * 注解记录日志 * * @author mhuang @@ -21,6 +20,7 @@ public @interface ESLogger { /** * 备注 + * * @return 默认空 */ String remark() default ""; diff --git a/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/consts/LoggerConsts.java b/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/consts/LoggerConsts.java index 39b7c35..47f4bf4 100644 --- a/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/consts/LoggerConsts.java +++ b/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/consts/LoggerConsts.java @@ -1,9 +1,6 @@ package tech.mhuang.interchan.logger.consts; -import lombok.Data; - /** - * * 日志常量 * * @author mhuang diff --git a/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/consumer/LoggerConsumer.java b/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/consumer/LoggerConsumer.java index 8b41ec2..a126246 100644 --- a/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/consumer/LoggerConsumer.java +++ b/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/consumer/LoggerConsumer.java @@ -14,7 +14,6 @@ import tech.mhuang.interchan.logger.entity.ESAsyncLoggerOpType; import java.io.IOException; /** - * * 日志消费 * * @author mhuang @@ -28,18 +27,19 @@ public class LoggerConsumer { /** * redis注解是不允许重复执行、此处是aop进行拦截 + * * @param kafkaMsg 接收的消息 * @throws IOException */ @RedisKafka public void invoke(KafkaMsg kafkaMsg) throws IOException { - ESAsyncLogger logger = JSON.parseObject(kafkaMsg.getMsg().toString(),ESAsyncLogger.class); + ESAsyncLogger logger = JSON.parseObject(kafkaMsg.getMsg().toString(), ESAsyncLogger.class); if (ObjectUtil.isNotEmpty(logger)) { IESFactory esFactory = esFramework.getFactory(logger.getName()); if (logger.getOpType().equals(ESAsyncLoggerOpType.INSERT)) { - esFactory.insert(logger.getEsOperatorLogger(), logger.getIndex(), logger.getType()); + esFactory.insert(logger.getEsOperatorLogger(), logger.getIndex()); } else { - esFactory.update(logger.getEsOperatorLogger(), logger.getIndex(), logger.getType(), + esFactory.update(logger.getEsOperatorLogger(), logger.getIndex(), logger.getEsOperatorLogger().getId()); } } diff --git a/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/entity/ESAsyncLoggerOpType.java b/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/entity/ESAsyncLoggerOpType.java index f839c53..b84b127 100644 --- a/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/entity/ESAsyncLoggerOpType.java +++ b/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/entity/ESAsyncLoggerOpType.java @@ -1,7 +1,6 @@ package tech.mhuang.interchan.logger.entity; /** - * * es异步操作类型 * * @author mhuang diff --git a/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/util/LoggerUtil.java b/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/util/LoggerUtil.java index 7c41398..eee1c2b 100644 --- a/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/util/LoggerUtil.java +++ b/inter-logger-common/src/main/java/tech/mhuang/interchan/logger/util/LoggerUtil.java @@ -29,6 +29,7 @@ public class LoggerUtil { /** * 组装EsLogger数据 + * * @param request request * @return EsOperatorLogger EsOperatorLogger */ diff --git a/pom.xml b/pom.xml index 3f80c46..1dc5cea 100644 --- a/pom.xml +++ b/pom.xml @@ -8,17 +8,19 @@ pom inter-boot-demo http://maven.apache.org - 1.4.1 + 1.4.2 1.8 - 1.4.1 - 1.3.0 + 1.4.2 + 1.3.2 UTF-8 + true + true tech.mhuang hmtool-ext-interchan - 1.4.1 + 1.4.2 -- Gitee From f77c8ab3459e29846f16681686c0a498e6b3bf24 Mon Sep 17 00:00:00 2001 From: mhuang Date: Mon, 23 Dec 2019 15:02:03 +0800 Subject: [PATCH 3/4] =?UTF-8?q?BUG=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inter-boot-sso/pom.xml | 10 ++--- .../main/resources/application-dev.properties | 38 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/inter-boot-sso/pom.xml b/inter-boot-sso/pom.xml index 2e17e74..e6448aa 100644 --- a/inter-boot-sso/pom.xml +++ b/inter-boot-sso/pom.xml @@ -57,11 +57,11 @@ org.apache.logging.log4j log4j-to-slf4j - - - - - + + tech.mhuang.interchan + inter-logger-common + ${project.version} + com.github.xiaoymin knife4j-spring-boot-starter diff --git a/inter-boot-sso/src/main/resources/application-dev.properties b/inter-boot-sso/src/main/resources/application-dev.properties index e125ed4..d697b04 100644 --- a/inter-boot-sso/src/main/resources/application-dev.properties +++ b/inter-boot-sso/src/main/resources/application-dev.properties @@ -8,25 +8,25 @@ spring.redis.port=6379 spring.datasource.url=jdbc:mysql://127.0.0.1:3306/micro-inter-demo?serverTimezone=UTC&useUnicode=true&allowMultiQueries=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true spring.datasource.username=root spring.datasource.password=huangmiao -##es -#mhuang.elasticsearch.enable=true -#mhuang.elasticsearch.bean-map.zhangsan.enable=true -#mhuang.elasticsearch.bean-map.zhangsan.ip=192.168.1.210 -##logger \u8BB0\u5F55 -#mhuang.interchan.logger.enable=true -#mhuang.interchan.logger.es-key=zhangsan -#mhuang.interchan.logger.kafka-key=zhangsan -#mhuang.interchan.logger.kafka-topic=logger -##kafka -#mhuang.kafka.enable=true -#mhuang.kafka.servers=192.168.1.210:9092 -#mhuang.kafka.enable-producer=true -#mhuang.kafka.producer-map.zhangsan.enable=true -#mhuang.kafka.enable-consumer=true -#mhuang.kafka.consumer-map.zhangsan.enable=true -#mhuang.kafka.consumer-map.zhangsan.topics=logger -#mhuang.kafka.consumer-map.zhangsan.invoke-bean-name=loggerConsumer -#mhuang.kafka.consumer-map.zhangsan.invoke-method-name=invoke +#es +mhuang.elasticsearch.enable=true +mhuang.elasticsearch.bean-map.zhangsan.enable=true +mhuang.elasticsearch.bean-map.zhangsan.ip=127.0.0.1 +#logger \u8BB0\u5F55 +mhuang.interchan.logger.enable=true +mhuang.interchan.logger.es-key=zhangsan +mhuang.interchan.logger.kafka-key=zhangsan +mhuang.interchan.logger.kafka-topic=logger +#kafka +mhuang.kafka.enable=true +mhuang.kafka.servers=127.0.0.1:9092 +mhuang.kafka.enable-producer=true +mhuang.kafka.producer-map.zhangsan.enable=true +mhuang.kafka.enable-consumer=true +mhuang.kafka.consumer-map.zhangsan.enable=true +mhuang.kafka.consumer-map.zhangsan.topics=logger +mhuang.kafka.consumer-map.zhangsan.invoke-bean-name=loggerConsumer +mhuang.kafka.consumer-map.zhangsan.invoke-method-name=invoke #open single enable mhuang.interchan.rest.single.enable=true #auth -- Gitee From a9588acf821802c3e5257b08256d4bf436064d57 Mon Sep 17 00:00:00 2001 From: mhuang Date: Mon, 23 Dec 2019 15:02:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?BUG=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 94533ee..7d1ad40 100644 --- a/README.md +++ b/README.md @@ -41,4 +41,3 @@ hmtool springboot版demo - 启动SSO - 启动web - 打开浏览器即可 ->>>>>>> master -- Gitee