From c70b92da60c0d00625da5fc2369b475e69e0b88e Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 22 八月 2024 11:36:41 +0800 Subject: [PATCH] 1、完善代码和application.yml配置文件,去掉不用的引入文件; 2、init-config.xml配置中增加属性 enable,相应解析类也增加了解析与判断; 3、凡是有Server的应用,加载资源方式改为用springboot的工具类加载; 4、通信协议相关的扫描注解功能实现改为采用reflections-0.10.2,以实现可以在jar包情况下能够扫描类(.class)注解。 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java index 437a9f8..f2373d2 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoUserInfo.java @@ -18,13 +18,28 @@ @Data @Schema(title = "鐢ㄦ埛淇℃伅瑙嗗浘瀵硅薄") public class VoUserInfo implements BaseEntity { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 202401241704002L; @Schema(title = "鐢ㄦ埛ID") - private String userId; + private String id; @Schema(title = "鐢ㄦ埛濮撳悕") private String userName; + + @Schema(title = "鎵嬫満鍙�") + private String phone; + + @Schema(title = "鐗囧尯ID") + private String blockId; + + @Schema(title = "鐗囧尯鍚嶇О") + private String blockName; + + @Schema(title = "鐘舵�佺紪鍙�") + private Integer stateId; + + @Schema(title = "鐘舵�佸悕绉�") + private String stateName; @Schema(title = "瑙掕壊缂栧彿鍒楄〃") private List<Map<String, Object>> roleIds; @@ -33,7 +48,6 @@ private List<Map<String, Object>> roleNames; @Schema(title = "鏉冮檺鍒楄〃") - //private List<Map<String, Object>> permissions; private JSONArray permissions; } \ No newline at end of file -- Gitblit v1.8.0