[新增功能](el-admin v2.5): v2.5 beta

详情 https://www.ydyno.com/archives/1225.html

eladmin-system/src/main/java/me/zhengjie/modules/system/service/RoleService.java

+/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package me.zhengjie.modules.system.service;
 
 import me.zhengjie.modules.system.domain.Role;

eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java

+/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package me.zhengjie.modules.system.service;
 
 import me.zhengjie.modules.system.domain.User;

eladmin-system/src/main/java/me/zhengjie/modules/system/service/VerifyService.java

+/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package me.zhengjie.modules.system.service;
+
+import me.zhengjie.domain.vo.EmailVo;
+
+/**
+ * @author Zheng Jie
+ * @date 2018-12-26
+ */
+public interface VerifyService {
+
+    /**
+     * 发送验证码
+     * @param email /
+     * @param key /
+     * @return /
+     */
+    EmailVo sendEmail(String email, String key);
+
+
+    /**
+     * 验证
+     * @param code /
+     * @param key /
+     */
+    void validated(String key, String code);
+}

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptDto.java

+/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package me.zhengjie.modules.system.service.dto;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
-import javax.validation.constraints.NotNull;
+import me.zhengjie.base.BaseDTO;
 import java.io.Serializable;
-import java.sql.Timestamp;
 import java.util.List;
 
 /**
 * @author Zheng Jie
 * @date 2019-03-25
 */
-@Data
-public class DeptDto implements Serializable {
+@Getter
+@Setter
+public class DeptDto extends BaseDTO implements Serializable {
 
     private Long id;
 
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<DeptDto> children;
+
     private String name;
 
-    @NotNull
     private Boolean enabled;
 
     private Long pid;
 
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<DeptDto> children;
-
-    private Timestamp createTime;
-
     public String getLabel() {
         return name;
     }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptQueryCriteria.java

+/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package me.zhengjie.modules.system.service.dto;
 
 import lombok.Data;

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptSmallDto.java

+/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package me.zhengjie.modules.system.service.dto;
 
 import lombok.Data;

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailDto.java

+/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package me.zhengjie.modules.system.service.dto;
 
 import lombok.Getter;
 import lombok.Setter;
-
+import me.zhengjie.base.BaseDTO;
 import java.io.Serializable;
 import java.sql.Timestamp;
 
@@ -12,17 +27,15 @@ import java.sql.Timestamp;
 */
 @Getter
 @Setter
-public class DictDetailDto implements Serializable {
+public class DictDetailDto extends BaseDTO implements Serializable {
 
     private Long id;
 
+    private DictSmallDto dict;
+
     private String label;
 
     private String value;
 
-    private Integer sort;
-
-    private DictSmallDto dict;
-
-    private Timestamp createTime;
+    private Integer dictSort;
 }
\ No newline at end of file

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailQueryCriteria.java

+/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package me.zhengjie.modules.system.service.dto;
 
 import lombok.Data;

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDto.java

+/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package me.zhengjie.modules.system.service.dto;
 
 import lombok.Getter;
 import lombok.Setter;
-
+import me.zhengjie.base.BaseDTO;
 import java.io.Serializable;
-import java.sql.Timestamp;
 import java.util.List;
 
 /**
@@ -13,15 +27,13 @@ import java.util.List;
 */
 @Getter
 @Setter
-public class DictDto implements Serializable {
+public class DictDto extends BaseDTO implements Serializable {
 
     private Long id;
 
-    private String name;
-
-    private String remark;
-
     private List<DictDetailDto> dictDetails;
 
-    private Timestamp createTime;
+    private String name;
+
+    private String description;
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictQueryCriteria.java

+/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package me.zhengjie.modules.system.service.dto;
 
 import lombok.Data;

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictSmallDto.java

+/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package me.zhengjie.modules.system.service.dto;
 
 import lombok.Getter;

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobDto.java

+/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package me.zhengjie.modules.system.service.dto;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import me.zhengjie.base.BaseDTO;
 
 import java.io.Serializable;
 import java.sql.Timestamp;
@@ -14,22 +30,16 @@ import java.sql.Timestamp;
 @Getter
 @Setter
 @NoArgsConstructor
-public class JobDto implements Serializable {
+public class JobDto extends BaseDTO implements Serializable {
 
     private Long id;
 
-    private Long sort;
+    private Integer jobSort;
 
     private String name;
 
     private Boolean enabled;
 
-    private DeptDto dept;
-
-    private String deptSuperiorName;
-
-    private Timestamp createTime;
-
     public JobDto(String name, Boolean enabled) {
         this.name = name;
         this.enabled = enabled;

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobQueryCriteria.java

+/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package me.zhengjie.modules.system.service.dto;
 
 import lombok.Data;
@@ -5,7 +20,6 @@ import lombok.NoArgsConstructor;
 import me.zhengjie.annotation.Query;
 import java.sql.Timestamp;
 import java.util.List;
-import java.util.Set;
 
 /**
 * @author Zheng Jie
@@ -21,12 +35,6 @@ public class JobQueryCriteria {
     @Query
     private Boolean enabled;
 
-    @Query(propName = "id", joinName = "dept")
-    private Long deptId;
-
-    @Query(propName = "id", joinName = "dept", type = Query.Type.IN)
-    private Set<Long> deptIds;
-
     @Query(type = Query.Type.BETWEEN)
     private List<Timestamp> createTime;
 }
\ No newline at end of file

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobSmallDto.java

+/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package me.zhengjie.modules.system.service.dto;
 
 import lombok.Data;

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuDto.java

+/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package me.zhengjie.modules.system.service.dto;
 
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import me.zhengjie.base.BaseDTO;
 import java.io.Serializable;
-import java.sql.Timestamp;
 import java.util.List;
 
 /**
  * @author Zheng Jie
  * @date 2018-12-17
  */
-@Data
-public class MenuDto implements Serializable {
+@Getter
+@Setter
+public class MenuDto extends BaseDTO implements Serializable {
 
     private Long id;
 
+    private List<MenuDto> children;
+
     private Integer type;
 
     private String permission;
 
-    private String name;
+    private String title;
 
-    private Long sort;
+    private Integer menuSort;
 
     private String path;
 
@@ -37,8 +56,4 @@ public class MenuDto implements Serializable {
     private String componentName;
 
     private String icon;
-
-    private List<MenuDto> children;
-
-    private Timestamp createTime;
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuQueryCriteria.java

+/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package me.zhengjie.modules.system.service.dto;
 
 import lombok.Data;
 import me.zhengjie.annotation.Query;
-
 import java.sql.Timestamp;
 import java.util.List;
 
@@ -13,7 +27,7 @@ import java.util.List;
 @Data
 public class MenuQueryCriteria {
 
-    @Query(blurry = "name,path,component")
+    @Query(blurry = "title,path,component")
     private String blurry;
 
     @Query(type = Query.Type.BETWEEN)

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleDto.java

+/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package me.zhengjie.modules.system.service.dto;
 
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import me.zhengjie.base.BaseDTO;
 import java.io.Serializable;
-import java.sql.Timestamp;
 import java.util.Set;
 
 /**
  * @author Zheng Jie
  * @date 2018-11-23
  */
-@Data
-public class RoleDto implements Serializable {
+@Getter
+@Setter
+public class RoleDto extends BaseDTO implements Serializable {
 
     private Long id;
 
+    private Set<MenuDto> menus;
+
+    private Set<DeptDto> depts;
+
     private String name;
 
     private String dataScope;
 
     private Integer level;
 
-    private String remark;
-
-    private String permission;
-
-    private Set<MenuDto> menus;
-
-    private Set<DeptDto> depts;
-
-    private Timestamp createTime;
+    private String description;
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleQueryCriteria.java

+/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package me.zhengjie.modules.system.service.dto;
 
 import lombok.Data;

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleSmallDto.java

+/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package me.zhengjie.modules.system.service.dto;
 
 import lombok.Data;

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDto.java

+/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package me.zhengjie.modules.system.service.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.security.core.GrantedAuthority;
-
+import lombok.Getter;
+import lombok.Setter;
+import me.zhengjie.base.BaseDTO;
 import java.io.Serializable;
-import java.sql.Timestamp;
 import java.util.Date;
-import java.util.List;
 import java.util.Set;
 
 /**
  * @author Zheng Jie
  * @date 2018-11-23
  */
-@Data
-public class UserDto implements Serializable {
+@Getter
+@Setter
+public class UserDto extends BaseDTO implements Serializable {
 
-    @ApiModelProperty(hidden = true)
     private Long id;
 
-    private String username;
+    private Set<RoleSmallDto> roles;
 
-    private String nickName;
+    private Set<JobSmallDto> jobs;
 
-    private String sex;
+    private DeptSmallDto dept;
 
-    private String avatar;
+    private Long deptId;
+
+    private String username;
+
+    private String nickName;
 
     private String email;
 
     private String phone;
 
-    private Boolean enabled;
-
-    @JsonIgnore
-    private String password;
+    private String gender;
 
-    private Date lastPasswordResetTime;
+    private String avatarName;
 
-    @ApiModelProperty(hidden = true)
-    private Set<RoleSmallDto> roles;
+    private String avatarPath;
 
-    @ApiModelProperty(hidden = true)
-    private JobSmallDto job;
+    @JsonIgnore
+    private String password;
 
-    private DeptSmallDto dept;
+    private Boolean enabled;
 
-    private Long deptId;
+    @JsonIgnore
+    private Boolean isAdmin = false;
 
-    private Timestamp createTime;
+    private Date pwdResetTime;
 }