Browse Source

用户权限相关的service

yufeng0528 4 years ago
parent
commit
7d40c57cb7
32 changed files with 827 additions and 15 deletions
  1. 37 6
      spring5-admin/pom.xml
  2. 4 2
      spring5-admin/src/main/java/com/yaozhitech/spring5/Application.java
  3. 3 5
      spring5-admin/src/main/java/com/yaozhitech/spring5/config/RoleResourceConfiguration.java
  4. 20 0
      spring5-admin/src/main/java/com/yaozhitech/spring5/controller/OrganizationController.java
  5. 20 0
      spring5-admin/src/main/java/com/yaozhitech/spring5/controller/ResourceController.java
  6. 20 0
      spring5-admin/src/main/java/com/yaozhitech/spring5/controller/RoleController.java
  7. 33 0
      spring5-admin/src/main/java/com/yaozhitech/spring5/controller/UserController.java
  8. 16 0
      spring5-admin/src/main/java/com/yaozhitech/spring5/mapper/OrganizationMapper.java
  9. 16 0
      spring5-admin/src/main/java/com/yaozhitech/spring5/mapper/ResourceMapper.java
  10. 16 0
      spring5-admin/src/main/java/com/yaozhitech/spring5/mapper/RoleMapper.java
  11. 16 0
      spring5-admin/src/main/java/com/yaozhitech/spring5/mapper/RoleRelResourceMapper.java
  12. 16 0
      spring5-admin/src/main/java/com/yaozhitech/spring5/mapper/UserMapper.java
  13. 16 0
      spring5-admin/src/main/java/com/yaozhitech/spring5/mapper/UserRelOrganizationMapper.java
  14. 16 0
      spring5-admin/src/main/java/com/yaozhitech/spring5/mapper/UserRelRoleMapper.java
  15. 30 0
      spring5-admin/src/main/java/com/yaozhitech/spring5/model/BaseModel.java
  16. 60 0
      spring5-admin/src/main/java/com/yaozhitech/spring5/model/OrganizationDomain.java
  17. 65 0
      spring5-admin/src/main/java/com/yaozhitech/spring5/model/ResourceDomain.java
  18. 54 0
      spring5-admin/src/main/java/com/yaozhitech/spring5/model/RoleDomain.java
  19. 47 0
      spring5-admin/src/main/java/com/yaozhitech/spring5/model/RoleRelResourceDomain.java
  20. 71 0
      spring5-admin/src/main/java/com/yaozhitech/spring5/model/UserDomain.java
  21. 49 0
      spring5-admin/src/main/java/com/yaozhitech/spring5/model/UserRelOrganizationDomain.java
  22. 49 0
      spring5-admin/src/main/java/com/yaozhitech/spring5/model/UserRelRoleDomain.java
  23. 16 0
      spring5-admin/src/main/java/com/yaozhitech/spring5/service/OrganizationService.java
  24. 16 0
      spring5-admin/src/main/java/com/yaozhitech/spring5/service/ResourceService.java
  25. 16 0
      spring5-admin/src/main/java/com/yaozhitech/spring5/service/RoleService.java
  26. 16 0
      spring5-admin/src/main/java/com/yaozhitech/spring5/service/UserService.java
  27. 21 0
      spring5-admin/src/main/java/com/yaozhitech/spring5/service/impl/OrganizationServiceImpl.java
  28. 21 0
      spring5-admin/src/main/java/com/yaozhitech/spring5/service/impl/ResourceServiceImpl.java
  29. 21 0
      spring5-admin/src/main/java/com/yaozhitech/spring5/service/impl/RoleServiceImpl.java
  30. 21 0
      spring5-admin/src/main/java/com/yaozhitech/spring5/service/impl/UserServiceImpl.java
  31. 5 0
      spring5-admin/src/main/resources/application.yml
  32. 0 2
      spring5-order/src/main/java/com/yaozhitech/spring5/provider/AdminProvider.java

+ 37 - 6
spring5-admin/pom.xml

@@ -22,6 +22,18 @@
22 22
 			<artifactId>spring-boot-starter-data-redis</artifactId>
23 23
 		</dependency>
24 24
 		
25
+		<!--mybatis plus依赖包-->
26
+        <dependency>
27
+            <groupId>com.baomidou</groupId>
28
+            <artifactId>mybatis-plus-boot-starter</artifactId>
29
+            <version>3.1.0</version>
30
+        </dependency>
31
+        <dependency>
32
+            <groupId>org.mybatis</groupId>
33
+            <artifactId>mybatis-spring</artifactId>
34
+            <version>2.0.0</version>
35
+        </dependency>
36
+		
25 37
 <!-- 		<dependency> -->
26 38
 <!--             <groupId>com.alicp.jetcache</groupId> -->
27 39
 <!--             <artifactId>jetcache-starter-redis</artifactId> -->
@@ -33,7 +45,26 @@
33 45
 <!-- 			<artifactId>jetcache-redis-lettuce</artifactId> -->
34 46
 <!-- 			<version>2.6.0.M3</version> -->
35 47
 <!-- 		</dependency> -->
36
-			
48
+		
49
+		
50
+	    <!--swagger文档-->
51
+        <dependency>
52
+            <groupId>io.springfox</groupId>
53
+            <artifactId>springfox-swagger-ui</artifactId>
54
+            <version>2.9.2</version>
55
+        </dependency>
56
+        <dependency>
57
+            <groupId>io.springfox</groupId>
58
+            <artifactId>springfox-swagger2</artifactId>
59
+            <version>2.9.2</version>
60
+        </dependency>
61
+        
62
+        <!--数据库-->
63
+        <dependency>
64
+            <groupId>mysql</groupId>
65
+            <artifactId>mysql-connector-java</artifactId>
66
+        </dependency>
67
+        
37 68
 		<!-- Spring test 依赖 -->
38 69
         <dependency>
39 70
             <groupId>org.springframework.boot</groupId>
@@ -75,11 +106,11 @@
75 106
 			<scope>test</scope>
76 107
 		</dependency>
77 108
 		
78
-		<dependency>
79
-            <groupId>com.yaozhitech</groupId>
80
-            <artifactId>spring5-auth-client</artifactId>
81
-            <version>0.1.0</version>
82
-        </dependency>
109
+<!-- 		<dependency> -->
110
+<!--             <groupId>com.yaozhitech</groupId> -->
111
+<!--             <artifactId>spring5-auth-client</artifactId> -->
112
+<!--             <version>0.1.0</version> -->
113
+<!--         </dependency> -->
83 114
 
84 115
 	</dependencies>
85 116
 </project>

+ 4 - 2
spring5-admin/src/main/java/com/yaozhitech/spring5/Application.java

@@ -1,13 +1,15 @@
1 1
 package com.yaozhitech.spring5;
2 2
 
3
+import org.mybatis.spring.annotation.MapperScan;
3 4
 import org.springframework.boot.SpringApplication;
4 5
 import org.springframework.boot.autoconfigure.SpringBootApplication;
5 6
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
6 7
 
7 8
 @EnableDiscoveryClient
8 9
 @SpringBootApplication
9
-public class Application {
10
+@MapperScan("com.yaozhitech.spring5.mapper")
11
+public class AdminApplication {
10 12
     public static void main(String[] args) {
11
-        SpringApplication.run(Application.class, args);
13
+        SpringApplication.run(AdminApplication.class, args);
12 14
     }
13 15
 }

+ 3 - 5
spring5-admin/src/main/java/com/yaozhitech/spring5/config/RoleResourceConfiguration.java

@@ -1,13 +1,11 @@
1 1
 package com.yaozhitech.spring5.config;
2 2
 
3
-import org.apache.shiro.spring.web.config.DefaultShiroFilterChainDefinition;
4
-import org.apache.shiro.spring.web.config.ShiroFilterChainDefinition;
5 3
 import org.springframework.context.annotation.Configuration;
6 4
 
7 5
 @Configuration
8
-public class RoleResourceConfiguration extends ShiroConfiguration{
6
+public class RoleResourceConfiguration /*extends ShiroConfiguration*/{
9 7
 	
10
-	@Override
8
+	/*@Override
11 9
 	public ShiroFilterChainDefinition shiroFilterChainDefinition() {
12 10
 		
13 11
 		
@@ -21,5 +19,5 @@ public class RoleResourceConfiguration extends ShiroConfiguration{
21 19
 //		chainDefinition.addPathDefinition("/**", "noSessionCreation,authc"); // 默认进行用户鉴权
22 20
 		
23 21
 		return chainDefinition;
24
-	}
22
+	}*/
25 23
 }

+ 20 - 0
spring5-admin/src/main/java/com/yaozhitech/spring5/controller/OrganizationController.java

@@ -0,0 +1,20 @@
1
+package com.yaozhitech.spring5.controller;
2
+
3
+
4
+import org.springframework.web.bind.annotation.RequestMapping;
5
+
6
+import org.springframework.web.bind.annotation.RestController;
7
+
8
+/**
9
+ * <p>
10
+ * 企业微信部门 前端控制器
11
+ * </p>
12
+ *
13
+ * @author zeda
14
+ * @since 2019-12-15
15
+ */
16
+@RestController
17
+@RequestMapping("/organization-domain")
18
+public class OrganizationController {
19
+
20
+}

+ 20 - 0
spring5-admin/src/main/java/com/yaozhitech/spring5/controller/ResourceController.java

@@ -0,0 +1,20 @@
1
+package com.yaozhitech.spring5.controller;
2
+
3
+
4
+import org.springframework.web.bind.annotation.RequestMapping;
5
+
6
+import org.springframework.web.bind.annotation.RestController;
7
+
8
+/**
9
+ * <p>
10
+ * 权限 前端控制器
11
+ * </p>
12
+ *
13
+ * @author zeda
14
+ * @since 2019-12-15
15
+ */
16
+@RestController
17
+@RequestMapping("/resource-domain")
18
+public class ResourceController {
19
+
20
+}

+ 20 - 0
spring5-admin/src/main/java/com/yaozhitech/spring5/controller/RoleController.java

@@ -0,0 +1,20 @@
1
+package com.yaozhitech.spring5.controller;
2
+
3
+
4
+import org.springframework.web.bind.annotation.RequestMapping;
5
+
6
+import org.springframework.web.bind.annotation.RestController;
7
+
8
+/**
9
+ * <p>
10
+ * 用户角色 前端控制器
11
+ * </p>
12
+ *
13
+ * @author zeda
14
+ * @since 2019-12-15
15
+ */
16
+@RestController
17
+@RequestMapping("/role-domain")
18
+public class RoleController {
19
+
20
+}

+ 33 - 0
spring5-admin/src/main/java/com/yaozhitech/spring5/controller/UserController.java

@@ -0,0 +1,33 @@
1
+package com.yaozhitech.spring5.controller;
2
+
3
+
4
+import org.springframework.web.bind.annotation.PathVariable;
5
+import org.springframework.web.bind.annotation.RequestMapping;
6
+
7
+import org.springframework.web.bind.annotation.RestController;
8
+
9
+import com.yaozhitech.spring5.model.UserDomain;
10
+import com.yaozhitech.spring5.service.UserService;
11
+
12
+import lombok.AllArgsConstructor;
13
+
14
+/**
15
+ * <p>
16
+ * 系统用户 前端控制器
17
+ * </p>
18
+ *
19
+ * @author zeda
20
+ * @since 2019-12-15
21
+ */
22
+@RestController
23
+@RequestMapping("/user")
24
+@AllArgsConstructor
25
+public class UserController {
26
+
27
+	private final UserService userService;
28
+	
29
+	@RequestMapping(value="/{id}")
30
+	public UserDomain getById(@PathVariable Integer id) {
31
+		return userService.getById(id);
32
+	}
33
+}

+ 16 - 0
spring5-admin/src/main/java/com/yaozhitech/spring5/mapper/OrganizationMapper.java

@@ -0,0 +1,16 @@
1
+package com.yaozhitech.spring5.mapper;
2
+
3
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import com.yaozhitech.spring5.model.OrganizationDomain;
5
+
6
+/**
7
+ * <p>
8
+ * 企业微信部门 Mapper 接口
9
+ * </p>
10
+ *
11
+ * @author zeda
12
+ * @since 2019-12-15
13
+ */
14
+public interface OrganizationMapper extends BaseMapper<OrganizationDomain> {
15
+
16
+}

+ 16 - 0
spring5-admin/src/main/java/com/yaozhitech/spring5/mapper/ResourceMapper.java

@@ -0,0 +1,16 @@
1
+package com.yaozhitech.spring5.mapper;
2
+
3
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import com.yaozhitech.spring5.model.ResourceDomain;
5
+
6
+/**
7
+ * <p>
8
+ * 权限 Mapper 接口
9
+ * </p>
10
+ *
11
+ * @author zeda
12
+ * @since 2019-12-15
13
+ */
14
+public interface ResourceMapper extends BaseMapper<ResourceDomain> {
15
+
16
+}

+ 16 - 0
spring5-admin/src/main/java/com/yaozhitech/spring5/mapper/RoleMapper.java

@@ -0,0 +1,16 @@
1
+package com.yaozhitech.spring5.mapper;
2
+
3
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import com.yaozhitech.spring5.model.RoleDomain;
5
+
6
+/**
7
+ * <p>
8
+ * 用户角色 Mapper 接口
9
+ * </p>
10
+ *
11
+ * @author zeda
12
+ * @since 2019-12-15
13
+ */
14
+public interface RoleMapper extends BaseMapper<RoleDomain> {
15
+
16
+}

+ 16 - 0
spring5-admin/src/main/java/com/yaozhitech/spring5/mapper/RoleRelResourceMapper.java

@@ -0,0 +1,16 @@
1
+package com.yaozhitech.spring5.mapper;
2
+
3
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import com.yaozhitech.spring5.model.RoleRelResourceDomain;
5
+
6
+/**
7
+ * <p>
8
+ * 角色权限关系表 Mapper 接口
9
+ * </p>
10
+ *
11
+ * @author zeda
12
+ * @since 2019-12-15
13
+ */
14
+public interface RoleRelResourceMapper extends BaseMapper<RoleRelResourceDomain> {
15
+
16
+}

+ 16 - 0
spring5-admin/src/main/java/com/yaozhitech/spring5/mapper/UserMapper.java

@@ -0,0 +1,16 @@
1
+package com.yaozhitech.spring5.mapper;
2
+
3
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import com.yaozhitech.spring5.model.UserDomain;
5
+
6
+/**
7
+ * <p>
8
+ * 系统用户 Mapper 接口
9
+ * </p>
10
+ *
11
+ * @author zeda
12
+ * @since 2019-12-15
13
+ */
14
+public interface UserMapper extends BaseMapper<UserDomain> {
15
+
16
+}

+ 16 - 0
spring5-admin/src/main/java/com/yaozhitech/spring5/mapper/UserRelOrganizationMapper.java

@@ -0,0 +1,16 @@
1
+package com.yaozhitech.spring5.mapper;
2
+
3
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import com.yaozhitech.spring5.model.UserRelOrganizationDomain;
5
+
6
+/**
7
+ * <p>
8
+ * 用户部门关系表 Mapper 接口
9
+ * </p>
10
+ *
11
+ * @author zeda
12
+ * @since 2019-12-15
13
+ */
14
+public interface UserRelOrganizationMapper extends BaseMapper<UserRelOrganizationDomain> {
15
+
16
+}

+ 16 - 0
spring5-admin/src/main/java/com/yaozhitech/spring5/mapper/UserRelRoleMapper.java

@@ -0,0 +1,16 @@
1
+package com.yaozhitech.spring5.mapper;
2
+
3
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import com.yaozhitech.spring5.model.UserRelRoleDomain;
5
+
6
+/**
7
+ * <p>
8
+ * 用户角色关系表 Mapper 接口
9
+ * </p>
10
+ *
11
+ * @author zeda
12
+ * @since 2019-12-15
13
+ */
14
+public interface UserRelRoleMapper extends BaseMapper<UserRelRoleDomain> {
15
+
16
+}

+ 30 - 0
spring5-admin/src/main/java/com/yaozhitech/spring5/model/BaseModel.java

@@ -0,0 +1,30 @@
1
+package com.yaozhitech.spring5.model;
2
+
3
+import java.time.LocalDateTime;
4
+
5
+import com.baomidou.mybatisplus.annotation.FieldFill;
6
+import com.baomidou.mybatisplus.annotation.IdType;
7
+import com.baomidou.mybatisplus.annotation.TableField;
8
+import com.baomidou.mybatisplus.annotation.TableId;
9
+
10
+import lombok.Data;
11
+
12
+@Data
13
+public class BaseModel {
14
+
15
+	public final static String DEFAULT_USERNAME = "system";
16
+    @TableId(type = IdType.AUTO)
17
+    private String id;
18
+
19
+    @TableField(fill = FieldFill.INSERT)
20
+    private String creator;
21
+
22
+    @TableField(fill = FieldFill.INSERT)
23
+    private LocalDateTime ctime;
24
+
25
+    @TableField(fill = FieldFill.INSERT_UPDATE)
26
+    private String updator;
27
+
28
+    @TableField(fill = FieldFill.INSERT_UPDATE)
29
+    private LocalDateTime utime;
30
+}

+ 60 - 0
spring5-admin/src/main/java/com/yaozhitech/spring5/model/OrganizationDomain.java

@@ -0,0 +1,60 @@
1
+package com.yaozhitech.spring5.model;
2
+
3
+import com.baomidou.mybatisplus.annotation.TableName;
4
+import com.baomidou.mybatisplus.annotation.IdType;
5
+import com.baomidou.mybatisplus.annotation.TableId;
6
+import java.time.LocalDateTime;
7
+import java.io.Serializable;
8
+import io.swagger.annotations.ApiModel;
9
+import io.swagger.annotations.ApiModelProperty;
10
+import lombok.Data;
11
+import lombok.EqualsAndHashCode;
12
+import lombok.experimental.Accessors;
13
+
14
+/**
15
+ * <p>
16
+ * 企业微信部门
17
+ * </p>
18
+ *
19
+ * @author zeda
20
+ * @since 2019-12-15
21
+ */
22
+@Data
23
+@EqualsAndHashCode(callSuper = false)
24
+@Accessors(chain = true)
25
+@TableName("sys_organization")
26
+@ApiModel(value="OrganizationDomain对象", description="企业微信部门")
27
+public class OrganizationDomain implements Serializable {
28
+
29
+    private static final long serialVersionUID = 1L;
30
+
31
+    @TableId(value = "id", type = IdType.AUTO)
32
+    private Integer id;
33
+
34
+    private String organizationUuid;
35
+
36
+    @ApiModelProperty(value = "企业微信的主键id")
37
+    private Integer wxId;
38
+
39
+    @ApiModelProperty(value = "部门名称")
40
+    private String name;
41
+
42
+    @ApiModelProperty(value = "部门英文名称")
43
+    private String nameEn;
44
+
45
+    @ApiModelProperty(value = "对应的是wx_id")
46
+    private Integer parentid;
47
+
48
+    @ApiModelProperty(value = "排序,越大越前")
49
+    private Long order;
50
+
51
+    @ApiModelProperty(value = "创建时间:默认值现在时间")
52
+    private LocalDateTime ctime;
53
+
54
+    @ApiModelProperty(value = "更新时间")
55
+    private LocalDateTime utime;
56
+
57
+    private Integer isactive;
58
+
59
+
60
+}

+ 65 - 0
spring5-admin/src/main/java/com/yaozhitech/spring5/model/ResourceDomain.java

@@ -0,0 +1,65 @@
1
+package com.yaozhitech.spring5.model;
2
+
3
+import com.baomidou.mybatisplus.annotation.TableName;
4
+import com.baomidou.mybatisplus.annotation.IdType;
5
+import com.baomidou.mybatisplus.annotation.TableId;
6
+import java.time.LocalDateTime;
7
+import java.io.Serializable;
8
+import io.swagger.annotations.ApiModel;
9
+import io.swagger.annotations.ApiModelProperty;
10
+import lombok.Data;
11
+import lombok.EqualsAndHashCode;
12
+import lombok.experimental.Accessors;
13
+
14
+/**
15
+ * <p>
16
+ * 权限
17
+ * </p>
18
+ *
19
+ * @author zeda
20
+ * @since 2019-12-15
21
+ */
22
+@Data
23
+@EqualsAndHashCode(callSuper = false)
24
+@Accessors(chain = true)
25
+@TableName("sys_resource")
26
+@ApiModel(value="ResourceDomain对象", description="权限")
27
+public class ResourceDomain implements Serializable {
28
+
29
+    private static final long serialVersionUID = 1L;
30
+
31
+    @TableId(value = "id", type = IdType.AUTO)
32
+    private Integer id;
33
+
34
+    private String resourceUuid;
35
+
36
+    private Integer type;
37
+
38
+    @ApiModelProperty(value = "父类")
39
+    private Integer pid;
40
+
41
+    @ApiModelProperty(value = "资源名")
42
+    private String name;
43
+
44
+    private String code;
45
+
46
+    private String url;
47
+
48
+    @ApiModelProperty(value = "排序")
49
+    private Integer rank;
50
+
51
+    @ApiModelProperty(value = "图标")
52
+    private String logo;
53
+
54
+    private LocalDateTime ctime;
55
+
56
+    private LocalDateTime utime;
57
+
58
+    private String creator;
59
+
60
+    private String updator;
61
+
62
+    private Integer isactive;
63
+
64
+
65
+}

+ 54 - 0
spring5-admin/src/main/java/com/yaozhitech/spring5/model/RoleDomain.java

@@ -0,0 +1,54 @@
1
+package com.yaozhitech.spring5.model;
2
+
3
+import java.io.Serializable;
4
+import java.time.LocalDateTime;
5
+
6
+import com.baomidou.mybatisplus.annotation.IdType;
7
+import com.baomidou.mybatisplus.annotation.TableId;
8
+import com.baomidou.mybatisplus.annotation.TableName;
9
+
10
+import io.swagger.annotations.ApiModel;
11
+import lombok.Data;
12
+import lombok.EqualsAndHashCode;
13
+import lombok.experimental.Accessors;
14
+
15
+/**
16
+ * <p>
17
+ * 用户角色
18
+ * </p>
19
+ *
20
+ * @author zeda
21
+ * @since 2019-12-15
22
+ */
23
+@Data
24
+@EqualsAndHashCode(callSuper = false)
25
+@Accessors(chain = true)
26
+@TableName("sys_role")
27
+@ApiModel(value="RoleDomain对象", description="用户角色")
28
+public class RoleDomain implements Serializable {
29
+
30
+    private static final long serialVersionUID = 1L;
31
+
32
+    @TableId(value = "id", type = IdType.AUTO)
33
+    private Integer id;
34
+
35
+    private String roleUuid;
36
+
37
+    private String name;
38
+
39
+    private String code;
40
+
41
+    private String info;
42
+
43
+    private LocalDateTime ctime;
44
+
45
+    private LocalDateTime utime;
46
+
47
+    private String creator;
48
+
49
+    private String updator;
50
+
51
+    private Integer isactive;
52
+
53
+
54
+}

+ 47 - 0
spring5-admin/src/main/java/com/yaozhitech/spring5/model/RoleRelResourceDomain.java

@@ -0,0 +1,47 @@
1
+package com.yaozhitech.spring5.model;
2
+
3
+import com.baomidou.mybatisplus.annotation.TableName;
4
+import com.baomidou.mybatisplus.annotation.IdType;
5
+import com.baomidou.mybatisplus.annotation.TableId;
6
+import java.time.LocalDateTime;
7
+import java.io.Serializable;
8
+import io.swagger.annotations.ApiModel;
9
+import io.swagger.annotations.ApiModelProperty;
10
+import lombok.Data;
11
+import lombok.EqualsAndHashCode;
12
+import lombok.experimental.Accessors;
13
+
14
+/**
15
+ * <p>
16
+ * 角色权限关系表
17
+ * </p>
18
+ *
19
+ * @author zeda
20
+ * @since 2019-12-15
21
+ */
22
+@Data
23
+@EqualsAndHashCode(callSuper = false)
24
+@Accessors(chain = true)
25
+@TableName("sys_role_rel_resource")
26
+@ApiModel(value="RoleRelResourceDomain对象", description="角色权限关系表")
27
+public class RoleRelResourceDomain implements Serializable {
28
+
29
+    private static final long serialVersionUID = 1L;
30
+
31
+    @TableId(value = "id", type = IdType.AUTO)
32
+    private Integer id;
33
+
34
+    private String resourceUuid;
35
+
36
+    private String roleUuid;
37
+
38
+    private LocalDateTime ctime;
39
+
40
+    private LocalDateTime utime;
41
+
42
+    private String creator;
43
+
44
+    private String updator;
45
+
46
+
47
+}

+ 71 - 0
spring5-admin/src/main/java/com/yaozhitech/spring5/model/UserDomain.java

@@ -0,0 +1,71 @@
1
+package com.yaozhitech.spring5.model;
2
+
3
+import java.io.Serializable;
4
+import java.time.LocalDateTime;
5
+
6
+import com.baomidou.mybatisplus.annotation.IdType;
7
+import com.baomidou.mybatisplus.annotation.TableId;
8
+import com.baomidou.mybatisplus.annotation.TableName;
9
+
10
+import io.swagger.annotations.ApiModel;
11
+import io.swagger.annotations.ApiModelProperty;
12
+import lombok.Data;
13
+import lombok.EqualsAndHashCode;
14
+import lombok.experimental.Accessors;
15
+
16
+/**
17
+ * <p>
18
+ * 系统用户
19
+ * </p>
20
+ *
21
+ * @author zeda
22
+ * @since 2019-12-15
23
+ */
24
+@Data
25
+@EqualsAndHashCode(callSuper = false)
26
+@Accessors(chain = true)
27
+@TableName("sys_user")
28
+@ApiModel(value="UserDomain对象", description="系统用户")
29
+public class UserDomain implements Serializable {
30
+
31
+    private static final long serialVersionUID = 1L;
32
+
33
+    @TableId(value = "id", type = IdType.AUTO)
34
+    private Integer id;
35
+
36
+    private String userUuid;
37
+
38
+    private String loginName;
39
+
40
+    private String password;
41
+
42
+    @ApiModelProperty(value = "昵称")
43
+    private String nickname;
44
+
45
+    @ApiModelProperty(value = "备注")
46
+    private String remark;
47
+
48
+    @ApiModelProperty(value = "性别 0女1男")
49
+    private Integer gender;
50
+
51
+    @ApiModelProperty(value = "头像")
52
+    private String avatar;
53
+
54
+    private String wxUserId;
55
+
56
+    @ApiModelProperty(value = "部门名称")
57
+    private String organizationName;
58
+
59
+    @ApiModelProperty(value = "1-正常,0-删除")
60
+    private Integer isactive;
61
+
62
+    private LocalDateTime ctime;
63
+
64
+    private LocalDateTime utime;
65
+
66
+    private String creator;
67
+
68
+    private String updator;
69
+
70
+
71
+}

+ 49 - 0
spring5-admin/src/main/java/com/yaozhitech/spring5/model/UserRelOrganizationDomain.java

@@ -0,0 +1,49 @@
1
+package com.yaozhitech.spring5.model;
2
+
3
+import com.baomidou.mybatisplus.annotation.TableName;
4
+import com.baomidou.mybatisplus.annotation.IdType;
5
+import com.baomidou.mybatisplus.annotation.TableId;
6
+import java.time.LocalDateTime;
7
+import java.io.Serializable;
8
+import io.swagger.annotations.ApiModel;
9
+import io.swagger.annotations.ApiModelProperty;
10
+import lombok.Data;
11
+import lombok.EqualsAndHashCode;
12
+import lombok.experimental.Accessors;
13
+
14
+/**
15
+ * <p>
16
+ * 用户部门关系表
17
+ * </p>
18
+ *
19
+ * @author zeda
20
+ * @since 2019-12-15
21
+ */
22
+@Data
23
+@EqualsAndHashCode(callSuper = false)
24
+@Accessors(chain = true)
25
+@TableName("sys_user_rel_organization")
26
+@ApiModel(value="UserRelOrganizationDomain对象", description="用户部门关系表")
27
+public class UserRelOrganizationDomain implements Serializable {
28
+
29
+    private static final long serialVersionUID = 1L;
30
+
31
+    @TableId(value = "id", type = IdType.AUTO)
32
+    private Integer id;
33
+
34
+    private String userUuid;
35
+
36
+    private String organizationUuid;
37
+
38
+    private LocalDateTime ctime;
39
+
40
+    private LocalDateTime utime;
41
+
42
+    private String creator;
43
+
44
+    private String updator;
45
+
46
+    private Integer isactive;
47
+
48
+
49
+}

+ 49 - 0
spring5-admin/src/main/java/com/yaozhitech/spring5/model/UserRelRoleDomain.java

@@ -0,0 +1,49 @@
1
+package com.yaozhitech.spring5.model;
2
+
3
+import com.baomidou.mybatisplus.annotation.TableName;
4
+import com.baomidou.mybatisplus.annotation.IdType;
5
+import com.baomidou.mybatisplus.annotation.TableId;
6
+import java.time.LocalDateTime;
7
+import java.io.Serializable;
8
+import io.swagger.annotations.ApiModel;
9
+import io.swagger.annotations.ApiModelProperty;
10
+import lombok.Data;
11
+import lombok.EqualsAndHashCode;
12
+import lombok.experimental.Accessors;
13
+
14
+/**
15
+ * <p>
16
+ * 用户角色关系表
17
+ * </p>
18
+ *
19
+ * @author zeda
20
+ * @since 2019-12-15
21
+ */
22
+@Data
23
+@EqualsAndHashCode(callSuper = false)
24
+@Accessors(chain = true)
25
+@TableName("sys_user_rel_role")
26
+@ApiModel(value="UserRelRoleDomain对象", description="用户角色关系表")
27
+public class UserRelRoleDomain implements Serializable {
28
+
29
+    private static final long serialVersionUID = 1L;
30
+
31
+    @TableId(value = "id", type = IdType.AUTO)
32
+    private Integer id;
33
+
34
+    private String userUuid;
35
+
36
+    private String roleUuid;
37
+
38
+    private LocalDateTime ctime;
39
+
40
+    private LocalDateTime utime;
41
+
42
+    private String creator;
43
+
44
+    private String updator;
45
+
46
+    private Integer isactive;
47
+
48
+
49
+}

+ 16 - 0
spring5-admin/src/main/java/com/yaozhitech/spring5/service/OrganizationService.java

@@ -0,0 +1,16 @@
1
+package com.yaozhitech.spring5.service;
2
+
3
+import com.baomidou.mybatisplus.extension.service.IService;
4
+import com.yaozhitech.spring5.model.OrganizationDomain;
5
+
6
+/**
7
+ * <p>
8
+ * 企业微信部门 服务类
9
+ * </p>
10
+ *
11
+ * @author zeda
12
+ * @since 2019-12-15
13
+ */
14
+public interface OrganizationService extends IService<OrganizationDomain> {
15
+
16
+}

+ 16 - 0
spring5-admin/src/main/java/com/yaozhitech/spring5/service/ResourceService.java

@@ -0,0 +1,16 @@
1
+package com.yaozhitech.spring5.service;
2
+
3
+import com.baomidou.mybatisplus.extension.service.IService;
4
+import com.yaozhitech.spring5.model.ResourceDomain;
5
+
6
+/**
7
+ * <p>
8
+ * 权限 服务类
9
+ * </p>
10
+ *
11
+ * @author zeda
12
+ * @since 2019-12-15
13
+ */
14
+public interface ResourceService extends IService<ResourceDomain> {
15
+
16
+}

+ 16 - 0
spring5-admin/src/main/java/com/yaozhitech/spring5/service/RoleService.java

@@ -0,0 +1,16 @@
1
+package com.yaozhitech.spring5.service;
2
+
3
+import com.baomidou.mybatisplus.extension.service.IService;
4
+import com.yaozhitech.spring5.model.RoleDomain;
5
+
6
+/**
7
+ * <p>
8
+ * 用户角色 服务类
9
+ * </p>
10
+ *
11
+ * @author zeda
12
+ * @since 2019-12-15
13
+ */
14
+public interface RoleService extends IService<RoleDomain> {
15
+
16
+}

+ 16 - 0
spring5-admin/src/main/java/com/yaozhitech/spring5/service/UserService.java

@@ -0,0 +1,16 @@
1
+package com.yaozhitech.spring5.service;
2
+
3
+import com.baomidou.mybatisplus.extension.service.IService;
4
+import com.yaozhitech.spring5.model.UserDomain;
5
+
6
+/**
7
+ * <p>
8
+ * 系统用户 服务类
9
+ * </p>
10
+ *
11
+ * @author zeda
12
+ * @since 2019-12-15
13
+ */
14
+public interface UserService extends IService<UserDomain> {
15
+
16
+}

+ 21 - 0
spring5-admin/src/main/java/com/yaozhitech/spring5/service/impl/OrganizationServiceImpl.java

@@ -0,0 +1,21 @@
1
+package com.yaozhitech.spring5.service.impl;
2
+
3
+import org.springframework.stereotype.Service;
4
+
5
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6
+import com.yaozhitech.spring5.mapper.OrganizationMapper;
7
+import com.yaozhitech.spring5.model.OrganizationDomain;
8
+import com.yaozhitech.spring5.service.OrganizationService;
9
+
10
+/**
11
+ * <p>
12
+ * 企业微信部门 服务实现类
13
+ * </p>
14
+ *
15
+ * @author zeda
16
+ * @since 2019-12-15
17
+ */
18
+@Service
19
+public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, OrganizationDomain> implements OrganizationService {
20
+
21
+}

+ 21 - 0
spring5-admin/src/main/java/com/yaozhitech/spring5/service/impl/ResourceServiceImpl.java

@@ -0,0 +1,21 @@
1
+package com.yaozhitech.spring5.service.impl;
2
+
3
+import org.springframework.stereotype.Service;
4
+
5
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6
+import com.yaozhitech.spring5.mapper.ResourceMapper;
7
+import com.yaozhitech.spring5.model.ResourceDomain;
8
+import com.yaozhitech.spring5.service.ResourceService;
9
+
10
+/**
11
+ * <p>
12
+ * 权限 服务实现类
13
+ * </p>
14
+ *
15
+ * @author zeda
16
+ * @since 2019-12-15
17
+ */
18
+@Service
19
+public class ResourceServiceImpl extends ServiceImpl<ResourceMapper, ResourceDomain> implements ResourceService {
20
+
21
+}

+ 21 - 0
spring5-admin/src/main/java/com/yaozhitech/spring5/service/impl/RoleServiceImpl.java

@@ -0,0 +1,21 @@
1
+package com.yaozhitech.spring5.service.impl;
2
+
3
+import org.springframework.stereotype.Service;
4
+
5
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6
+import com.yaozhitech.spring5.mapper.RoleMapper;
7
+import com.yaozhitech.spring5.model.RoleDomain;
8
+import com.yaozhitech.spring5.service.RoleService;
9
+
10
+/**
11
+ * <p>
12
+ * 用户角色 服务实现类
13
+ * </p>
14
+ *
15
+ * @author zeda
16
+ * @since 2019-12-15
17
+ */
18
+@Service
19
+public class RoleServiceImpl extends ServiceImpl<RoleMapper, RoleDomain> implements RoleService {
20
+
21
+}

+ 21 - 0
spring5-admin/src/main/java/com/yaozhitech/spring5/service/impl/UserServiceImpl.java

@@ -0,0 +1,21 @@
1
+package com.yaozhitech.spring5.service.impl;
2
+
3
+import org.springframework.stereotype.Service;
4
+
5
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6
+import com.yaozhitech.spring5.mapper.UserMapper;
7
+import com.yaozhitech.spring5.model.UserDomain;
8
+import com.yaozhitech.spring5.service.UserService;
9
+
10
+/**
11
+ * <p>
12
+ * 系统用户 服务实现类
13
+ * </p>
14
+ *
15
+ * @author zeda
16
+ * @since 2019-12-15
17
+ */
18
+@Service
19
+public class UserServiceImpl extends ServiceImpl<UserMapper, UserDomain> implements UserService {
20
+
21
+}

+ 5 - 0
spring5-admin/src/main/resources/application.yml

@@ -13,6 +13,11 @@ spring:
13 13
     port: 6280
14 14
     password: bbztx123456
15 15
     timeout: 5000
16
+  datasource:
17
+    driver-class-name: com.mysql.jdbc.Driver
18
+    url: jdbc:${DATASOURCE_DBTYPE:mysql}://121.41.17.212:${DATASOURCE_PORT:3306}/ceshi?characterEncoding=UTF-8&useUnicode=true&useSSL=false
19
+    username: ${DATASOURCE_USERNAME:root}
20
+    password: huojutech!23
16 21
   
17 22
 password:
18 23
   salt: k12829WhsvnEV$#03b2n          

+ 0 - 2
spring5-order/src/main/java/com/yaozhitech/spring5/provider/AdminProvider.java

@@ -1,7 +1,5 @@
1 1
 package com.yaozhitech.spring5.provider;
2 2
 
3
-import javax.websocket.server.PathParam;
4
-
5 3
 import org.springframework.cloud.openfeign.FeignClient;
6 4
 import org.springframework.web.bind.annotation.GetMapping;
7 5
 import org.springframework.web.bind.annotation.PathVariable;