正在显示
6 个修改的文件
包含
49 行增加
和
135 行删除
@@ -35,7 +35,7 @@ public class UserController { | @@ -35,7 +35,7 @@ public class UserController { | ||
35 | @ApiImplicitParam(name = "pageSize", value = "分页-每页显示多少条", required = false, dataType = "int",defaultValue = "5")}) | 35 | @ApiImplicitParam(name = "pageSize", value = "分页-每页显示多少条", required = false, dataType = "int",defaultValue = "5")}) |
36 | @RequestRequire | 36 | @RequestRequire |
37 | @GetMapping("/list") | 37 | @GetMapping("/list") |
38 | - public PageInfo<USERS> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1") | 38 | + public ResultJson<PageInfo> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1") |
39 | int pageNum, | 39 | int pageNum, |
40 | @RequestParam(value = "pageSize",required = false,defaultValue = "5") | 40 | @RequestParam(value = "pageSize",required = false,defaultValue = "5") |
41 | int pageSize, | 41 | int pageSize, |
@@ -45,7 +45,8 @@ public class UserController { | @@ -45,7 +45,8 @@ public class UserController { | ||
45 | USERS user = new USERS(); | 45 | USERS user = new USERS(); |
46 | user.setUsername(username); | 46 | user.setUsername(username); |
47 | user.setRealname(realname); | 47 | user.setRealname(realname); |
48 | - return userService.selectAllUser(pageNum,pageSize,user); | 48 | + PageInfo<USERS> usersPageInfo = userService.selectAllUser(pageNum,pageSize,user); |
49 | + return new ResultJson("200","success",usersPageInfo); | ||
49 | } | 50 | } |
50 | 51 | ||
51 | public String getCurrentUser(){ | 52 | public String getCurrentUser(){ |
@@ -5,15 +5,17 @@ import lombok.Data; | @@ -5,15 +5,17 @@ import lombok.Data; | ||
5 | import java.io.Serializable; | 5 | import java.io.Serializable; |
6 | 6 | ||
7 | @Data | 7 | @Data |
8 | -public class ResultJson implements Serializable{ | 8 | +public class ResultJson<T> implements Serializable{ |
9 | private static final long serialVersionUID = 1L; | 9 | private static final long serialVersionUID = 1L; |
10 | 10 | ||
11 | - // 状态码 正确为0 | ||
12 | - private String code = "0"; | ||
13 | - // 错误描述 | 11 | + // 状态码 正确为200 |
12 | + private String code = "200"; | ||
13 | + // 描述 | ||
14 | private String msg = ""; | 14 | private String msg = ""; |
15 | + | ||
16 | + private String error; | ||
15 | // 返回对象 | 17 | // 返回对象 |
16 | - private Object data = ""; | 18 | + private T data; |
17 | //返回的JWT | 19 | //返回的JWT |
18 | private String jwtToken; | 20 | private String jwtToken; |
19 | 21 | ||
@@ -29,11 +31,11 @@ public class ResultJson implements Serializable{ | @@ -29,11 +31,11 @@ public class ResultJson implements Serializable{ | ||
29 | this.msg = msg; | 31 | this.msg = msg; |
30 | } | 32 | } |
31 | 33 | ||
32 | - public ResultJson(Object data) { | 34 | + public ResultJson(T data) { |
33 | this.data = data; | 35 | this.data = data; |
34 | } | 36 | } |
35 | 37 | ||
36 | - public ResultJson(String code, String msg, Object data) { | 38 | + public ResultJson(String code, String msg, T data) { |
37 | this.code = code; | 39 | this.code = code; |
38 | this.msg = msg; | 40 | this.msg = msg; |
39 | this.data = data; | 41 | this.data = data; |
1 | - | ||
2 | -#服务端口 | ||
3 | -server.port=7003 | ||
4 | -server.servlet.context-path=${SERVER_CONTEXTPATH:} | ||
5 | - | ||
6 | -#静态资源,设置上传文件的访问,上传文件的路径,要带斜杠 | ||
7 | -web.upload-path=upload/ | ||
8 | -#表示所有的访问经过静态资源路径 | ||
9 | -springboot.mvc.static-path-pattern=/** | ||
10 | -spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/static,classpath:/resources/,file:${web.upload-path} | ||
11 | - | ||
12 | - | ||
13 | - | ||
14 | -#服务名 | ||
15 | -spring.application.name=tianbo.base.dev.devkit | ||
16 | -spring.jackson.serialization.fail-on-empty-beans=false | ||
17 | -spring.profiles.active=dev | ||
18 | - | ||
19 | -#springboot2.0之后会把Date类型字段自动给转成UTC字符串 如:1990-11-26T16:00:00.000+0000,如果想转成时间戳在application.properties配置文件增加以下配置 | ||
20 | -#jackson相关配置 | ||
21 | -spring.jackson.date-format = yyyy-MM-dd HH:mm:ss | ||
22 | -spring.jackson.serialization.write-dates-as-timestamps=false | ||
23 | -#时区必须要设置 | ||
24 | -spring.jackson.time-zone=GMT+8 | ||
25 | -#ALWAYS的意思是即时属性为null,仍然也会输出这个key | ||
26 | -spring.jackson.default-property-inclusion=always | ||
27 | - | ||
28 | -#springcloud 基本配置 | ||
29 | - | ||
30 | -#eureka主机名,会在控制页面中显示 | ||
31 | -#DEV环境关闭注册。 | ||
32 | -spring.cloud.features.enabled=false | ||
33 | -spring.cloud.discovery.enabled=false | ||
34 | -spring.cloud.service-registry.auto-registration.enabled=false | ||
35 | -#eureka.instance.hostname=${spring.cloud.client.ip-address} | ||
36 | -#eureka服务器页面中status的请求路径 | ||
37 | -#eureka.instance.status-page-url=http://${eureka.instance.hostname}:${server.port}/index | ||
38 | -#eureka注册中心服务器地址 | ||
39 | -#eureka.client.service-url.defaultZone=http://10.50.3.82:19527/eureka/ | ||
40 | -#eureka.instance.prefer-ip-address=true | ||
41 | -#eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port} | ||
42 | -#eureka.client.registry-fetch-interval-seconds=30 | ||
43 | -#eureka.instance.lease-renewal-interval-in-seconds=15 | ||
44 | -#eureka.instance.lease-expiration-duration-in-seconds=45 | ||
45 | - | ||
46 | -#spring.datasource oracle | ||
47 | -spring.datasource.type=com.alibaba.druid.pool.DruidDataSource | ||
48 | -#spring.datasource.driver-class-name=oracle.jdbc.OracleDriver | ||
49 | -#spring.datasource.url=jdbc:oracle:thin:@10.50.3.68:1521:CGODW | ||
50 | -#spring.datasource.username=CGOETL | ||
51 | -#spring.datasource.password=1q2w3e4r | ||
52 | - | ||
53 | -#spring datasource mysql,注意编码配置,缺少数据库编码配置容易引起中文入库乱码 | ||
54 | -spring.datasource.url=jdbc:mysql://127.0.0.1:3307/statistics?useUnicode=true&characterEncoding=utf8 | ||
55 | -spring.datasource.username=root | ||
56 | -spring.datasource.password= | ||
57 | -spring.datasource.driver-class-name=com.mysql.jdbc.Driver | ||
58 | -spring.datasource.max-idle=10 | ||
59 | -spring.datasource.max-wait=10000 | ||
60 | -spring.datasource.min-idle=5 | ||
61 | -spring.datasource.initial-size=5 | ||
62 | - | ||
63 | -#配置初始化大小/最小/最大 | ||
64 | -spring.datasource.druid.initial-size=1 | ||
65 | -spring.datasource.druid.min-idle=1 | ||
66 | -spring.datasource.druid.max-active=20 | ||
67 | -#获取连接等待超时时间 | ||
68 | -spring.datasource.druid.max-wait=60000 | ||
69 | -#一个连接在池中最小生存的时间 | ||
70 | -spring.datasource.druid.min-evictable-idle-time-millis=300000 | ||
71 | -#间隔多久进行一次检测,检测需要关闭的空闲连接 | ||
72 | -spring.datasource.druid.time-between-eviction-runs-millis=60000 | ||
73 | -#oracle | ||
74 | -#spring.datasource.druid.validation-query=SELECT 'x' FROM DUAL | ||
75 | -#mysql | ||
76 | -spring.datasource.druid.validation-query=SELECT 1 FROM DUAL | ||
77 | -spring.datasource.druid.test-while-idle=true | ||
78 | -spring.datasource.druid.test-on-borrow=false | ||
79 | -spring.datasource.druid.test-on-return=false | ||
80 | -spring.datasource.druid.default-auto-commit=true | ||
81 | - | ||
82 | - | ||
83 | - | ||
84 | -mybatis.mapper-locations=classpath:mapping/*.xml | ||
85 | -mybatis.type-aliases-package=com.tianbo.warehouse.model | ||
86 | - | ||
87 | - | ||
88 | - | ||
89 | -pagehelper.helper-dialect=mysql | ||
90 | -#pagehelper.auto-dialect=true | ||
91 | -#pagehelper.auto-runtime-dialect=true | ||
92 | -pagehelper.reasonable=true | ||
93 | -pagehelper.support-methods-arguments=true | ||
94 | -pagehelper.params=count=countSql | ||
95 | - | ||
96 | -#debug配置 | ||
97 | -trace=false | ||
98 | -debug=false | ||
99 | -logging.level.org.apache.tomcat=info | ||
100 | -logging.level.com.tianbo.warehouse.dao=DEBUG | ||
101 | -logging.level.org.springframework.security =info | ||
102 | - |
@@ -40,29 +40,29 @@ | @@ -40,29 +40,29 @@ | ||
40 | </select> | 40 | </select> |
41 | <select id="getAllMenus" resultMap="BaseResultMap" > | 41 | <select id="getAllMenus" resultMap="BaseResultMap" > |
42 | SELECT | 42 | SELECT |
43 | - P .* | 43 | + P.* |
44 | FROM | 44 | FROM |
45 | permission P | 45 | permission P |
46 | WHERE | 46 | WHERE |
47 | - P .PERMISSION_ID IN ( | 47 | + P.permission_id IN ( |
48 | SELECT | 48 | SELECT |
49 | RP.permission_id | 49 | RP.permission_id |
50 | FROM | 50 | FROM |
51 | - ROLE_PERMISSION RP | 51 | + role_permission RP |
52 | WHERE | 52 | WHERE |
53 | RP.role_id IN ( | 53 | RP.role_id IN ( |
54 | SELECT | 54 | SELECT |
55 | - R.ROLE_ID | 55 | + R.role_id |
56 | FROM | 56 | FROM |
57 | role R | 57 | role R |
58 | WHERE | 58 | WHERE |
59 | - R.ROLE_ID IN ( | 59 | + R.role_id IN ( |
60 | SELECT | 60 | SELECT |
61 | - UR.ROLE_ID | 61 | + UR.role_id |
62 | FROM | 62 | FROM |
63 | - USER_ROLE UR | 63 | + user_role UR |
64 | WHERE | 64 | WHERE |
65 | - UR.USER_ID = #{userId,jdbcType=INTEGER} AND P.ismenu is TRUE | 65 | + UR.user_id = #{userId,jdbcType=INTEGER} AND P.ismenu is TRUE |
66 | ) | 66 | ) |
67 | ) | 67 | ) |
68 | ) ORDER BY P.permission_order | 68 | ) ORDER BY P.permission_order |
@@ -76,34 +76,34 @@ | @@ -76,34 +76,34 @@ | ||
76 | FROM | 76 | FROM |
77 | permission P | 77 | permission P |
78 | LEFT JOIN role_permission RP ON P.permission_id = RP.permission_id | 78 | LEFT JOIN role_permission RP ON P.permission_id = RP.permission_id |
79 | - LEFT JOIN ROLE R ON R.ROLE_ID= RP.ROLE_ID | 79 | + LEFT JOIN role R ON R.role_id= RP.role_id |
80 | where P.url = #{permissionUrl,jdbcType=VARCHAR} ORDER BY permission_order | 80 | where P.url = #{permissionUrl,jdbcType=VARCHAR} ORDER BY permission_order |
81 | </select> | 81 | </select> |
82 | <select id="findByUserId" parameterType="java.lang.Integer" resultMap="BaseResultMap"> | 82 | <select id="findByUserId" parameterType="java.lang.Integer" resultMap="BaseResultMap"> |
83 | SELECT | 83 | SELECT |
84 | - P .* | 84 | + P.* |
85 | FROM | 85 | FROM |
86 | permission P | 86 | permission P |
87 | WHERE | 87 | WHERE |
88 | - P .PERMISSION_ID IN ( | 88 | + P.permission_id IN ( |
89 | SELECT | 89 | SELECT |
90 | RP.permission_id | 90 | RP.permission_id |
91 | FROM | 91 | FROM |
92 | - ROLE_PERMISSION RP | 92 | + role_permission RP |
93 | WHERE | 93 | WHERE |
94 | RP.role_id IN ( | 94 | RP.role_id IN ( |
95 | SELECT | 95 | SELECT |
96 | - R.ROLE_ID | 96 | + R.role_id |
97 | FROM | 97 | FROM |
98 | role R | 98 | role R |
99 | WHERE | 99 | WHERE |
100 | - R.ROLE_ID IN ( | 100 | + R.role_id IN ( |
101 | SELECT | 101 | SELECT |
102 | - UR.ROLE_ID | 102 | + UR.role_id |
103 | FROM | 103 | FROM |
104 | - USER_ROLE UR | 104 | + user_role UR |
105 | WHERE | 105 | WHERE |
106 | - UR.USER_ID = #{userId,jdbcType=INTEGER} | 106 | + UR.user_id = #{userId,jdbcType=INTEGER} |
107 | ) | 107 | ) |
108 | ) | 108 | ) |
109 | ) ORDER BY permission_order | 109 | ) ORDER BY permission_order |
@@ -26,10 +26,10 @@ | @@ -26,10 +26,10 @@ | ||
26 | SELECT | 26 | SELECT |
27 | R.* | 27 | R.* |
28 | FROM | 28 | FROM |
29 | - USERS U | ||
30 | - LEFT JOIN USER_ROLE UR ON U .USER_ID = UR.USER_ID | ||
31 | - LEFT JOIN ROLE R ON R.ROLE_ID= UR.ROLE_ID | ||
32 | - where U.USER_ID = #{userId,jdbcType=INTEGER} | 29 | + users U |
30 | + LEFT JOIN user_role UR ON U.user_id = UR.user_id | ||
31 | + LEFT JOIN role R ON R.role_id= UR.role_id | ||
32 | + where U.user_id = #{userId,jdbcType=INTEGER} | ||
33 | </select> | 33 | </select> |
34 | <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> | 34 | <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> |
35 | delete from role | 35 | delete from role |
@@ -17,6 +17,19 @@ | @@ -17,6 +17,19 @@ | ||
17 | <result column="email" property="email" jdbcType="VARCHAR" /> | 17 | <result column="email" property="email" jdbcType="VARCHAR" /> |
18 | <result column="age" property="age" jdbcType="INTEGER" /> | 18 | <result column="age" property="age" jdbcType="INTEGER" /> |
19 | </resultMap> | 19 | </resultMap> |
20 | + <resultMap id="SecurityResult" type="com.tianbo.warehouse.model.USERS"> | ||
21 | + <id column="user_id" property="userId" jdbcType="INTEGER" /> | ||
22 | + <result column="username" property="username" jdbcType="VARCHAR" /> | ||
23 | + <result column="birthday" property="birthday" jdbcType="TIMESTAMP" /> | ||
24 | + <result column="sex" property="sex" jdbcType="CHAR" /> | ||
25 | + <result column="address" property="address" jdbcType="VARCHAR" /> | ||
26 | + <result column="state" property="state" jdbcType="BIT" /> | ||
27 | + <result column="mobilePhone" property="mobilephone" jdbcType="VARCHAR" /> | ||
28 | + <result column="userFace" property="userface" jdbcType="VARCHAR" /> | ||
29 | + <result column="realName" property="realname" jdbcType="VARCHAR" /> | ||
30 | + <result column="email" property="email" jdbcType="VARCHAR" /> | ||
31 | + <result column="age" property="age" jdbcType="INTEGER" /> | ||
32 | + </resultMap> | ||
20 | <sql id="Base_Column_List" > | 33 | <sql id="Base_Column_List" > |
21 | user_id, username, password, birthday, sex, address, state, mobilePhone, creatTime, | 34 | user_id, username, password, birthday, sex, address, state, mobilePhone, creatTime, |
22 | updateTime, userFace, realName, email, age | 35 | updateTime, userFace, realName, email, age |
@@ -33,10 +46,10 @@ | @@ -33,10 +46,10 @@ | ||
33 | <select id="selectByUsername" resultMap="BaseResultMap" parameterType="java.lang.String" > | 46 | <select id="selectByUsername" resultMap="BaseResultMap" parameterType="java.lang.String" > |
34 | select | 47 | select |
35 | <include refid="Base_Column_List" /> | 48 | <include refid="Base_Column_List" /> |
36 | - from USERS | ||
37 | - where USERNAME = #{username,jdbcType=VARCHAR} | 49 | + from users |
50 | + where username = #{username,jdbcType=VARCHAR} | ||
38 | </select> | 51 | </select> |
39 | - <select id="selectAllUser" resultMap="BaseResultMap" parameterType="com.tianbo.warehouse.model.USERS" > | 52 | + <select id="selectAllUser" resultMap="SecurityResult" parameterType="com.tianbo.warehouse.model.USERS" > |
40 | select | 53 | select |
41 | <include refid="user_List" /> | 54 | <include refid="user_List" /> |
42 | from USERS | 55 | from USERS |
-
请 注册 或 登录 后发表评论