瀏覽代碼

Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

魏熙美 5 年之前
父節點
當前提交
74a62b9646
共有 23 個文件被更改,包括 273 次插入105 次删除
  1. 3
    3
      src/main/java/com/huiju/estateagents/center/sysUser/controller/SysTokenController.java
  2. 74
    9
      src/main/java/com/huiju/estateagents/center/sysUser/controller/SysUserController.java
  3. 3
    1
      src/main/java/com/huiju/estateagents/center/sysUser/entity/SysToken.java
  4. 4
    1
      src/main/java/com/huiju/estateagents/center/sysUser/entity/SysUser.java
  5. 2
    2
      src/main/java/com/huiju/estateagents/center/sysUser/mapper/SysTokenMapper.java
  6. 2
    2
      src/main/java/com/huiju/estateagents/center/sysUser/mapper/SysUserMapper.java
  7. 2
    2
      src/main/java/com/huiju/estateagents/center/sysUser/service/ISysTokenService.java
  8. 2
    2
      src/main/java/com/huiju/estateagents/center/sysUser/service/ISysUserService.java
  9. 5
    4
      src/main/java/com/huiju/estateagents/center/sysUser/service/impl/SysTokenServiceImpl.java
  10. 5
    4
      src/main/java/com/huiju/estateagents/center/sysUser/service/impl/SysUserServiceImpl.java
  11. 10
    10
      src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java
  12. 1
    3
      src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java
  13. 23
    0
      src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserMapper.java
  14. 20
    0
      src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserService.java
  15. 34
    0
      src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java
  16. 35
    3
      src/main/java/com/huiju/estateagents/common/JWTUtils.java
  17. 20
    2
      src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java
  18. 0
    18
      src/main/java/com/huiju/estateagents/mapper/TaUserMapper.java
  19. 0
    16
      src/main/java/com/huiju/estateagents/service/ITaUserService.java
  20. 0
    20
      src/main/java/com/huiju/estateagents/service/impl/TaUserServiceImpl.java
  21. 1
    1
      src/main/resources/mapper/SysTokenMapper.xml
  22. 1
    1
      src/main/resources/mapper/SysUserMapper.xml
  23. 26
    1
      src/main/resources/mapper/TaUserMapper.xml

src/main/java/com/huiju/estateagents/controller/SysTokenController.java → src/main/java/com/huiju/estateagents/center/sysUser/controller/SysTokenController.java 查看文件

@@ -1,12 +1,12 @@
1
-package com.huiju.estateagents.controller;
1
+package com.huiju.estateagents.center.sysUser.controller;
2 2
 
3 3
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4 4
 import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6
 import com.huiju.estateagents.base.BaseController;
7 7
 import com.huiju.estateagents.base.ResponseBean;
8
-import com.huiju.estateagents.entity.SysToken;
9
-import com.huiju.estateagents.service.ISysTokenService;
8
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
9
+import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
10 10
 import org.slf4j.Logger;
11 11
 import org.slf4j.LoggerFactory;
12 12
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/huiju/estateagents/controller/SysUserController.java → src/main/java/com/huiju/estateagents/center/sysUser/controller/SysUserController.java 查看文件

@@ -1,17 +1,28 @@
1
-package com.huiju.estateagents.controller;
1
+package com.huiju.estateagents.center.sysUser.controller;
2 2
 
3
+import com.alibaba.fastjson.JSONObject;
3 4
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4 5
 import com.baomidou.mybatisplus.core.metadata.IPage;
5 6
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 7
 import com.huiju.estateagents.base.BaseController;
7 8
 import com.huiju.estateagents.base.ResponseBean;
8
-import com.huiju.estateagents.entity.SysUser;
9
-import com.huiju.estateagents.service.ISysUserService;
9
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
10
+import com.huiju.estateagents.center.sysUser.entity.SysUser;
11
+import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
12
+import com.huiju.estateagents.center.sysUser.service.ISysUserService;
13
+import com.huiju.estateagents.common.CommConstant;
14
+import com.huiju.estateagents.common.JWTUtils;
15
+import com.huiju.estateagents.common.MD5Utils;
10 16
 import org.slf4j.Logger;
11 17
 import org.slf4j.LoggerFactory;
12 18
 import org.springframework.beans.factory.annotation.Autowired;
13 19
 import org.springframework.web.bind.annotation.*;
14 20
 
21
+import javax.servlet.http.HttpServletRequest;
22
+import java.time.LocalDateTime;
23
+import java.util.HashMap;
24
+import java.util.Map;
25
+
15 26
 /**
16 27
  * <p>
17 28
     * 系统用户 系统中心账户 前端控制器
@@ -21,14 +32,16 @@ import org.springframework.web.bind.annotation.*;
21 32
  * @since 2019-09-11
22 33
  */
23 34
 @RestController
24
-@RequestMapping("/")
35
+@RequestMapping("/api")
25 36
 public class SysUserController extends BaseController {
26 37
 
27 38
     private final Logger logger = LoggerFactory.getLogger(SysUserController.class);
28 39
 
29 40
     @Autowired
30 41
     public ISysUserService iSysUserService;
31
-
42
+    
43
+    @Autowired
44
+    private ISysTokenService sysTokenService;
32 45
 
33 46
     /**
34 47
      * 分页查询列表
@@ -102,15 +115,16 @@ public class SysUserController extends BaseController {
102 115
 
103 116
     /**
104 117
      * 修改对象
105
-     * @param id  实体ID
106 118
      * @param sysUser 实体对象
107 119
      * @return
108 120
      */
109
-    @RequestMapping(value="/sysUser/{id}",method= RequestMethod.PUT)
110
-    public ResponseBean sysUserUpdate(@PathVariable Integer id,
111
-                                        @RequestBody SysUser sysUser){
121
+    @RequestMapping(value="/center/sysUser",method= RequestMethod.PUT)
122
+    public ResponseBean sysUserUpdate(@RequestBody SysUser sysUser,HttpServletRequest request){
112 123
         ResponseBean responseBean = new ResponseBean();
113 124
         try {
125
+            String userName = JWTUtils.getSubject(request);
126
+            sysUser.setPassword(MD5Utils.md5(sysUser.getPassword()));
127
+            sysUser.setUserName(userName);
114 128
             if (iSysUserService.updateById(sysUser)){
115 129
                 responseBean.addSuccess(sysUser);
116 130
             }else {
@@ -140,4 +154,55 @@ public class SysUserController extends BaseController {
140 154
         }
141 155
         return responseBean;
142 156
     }
157
+    
158
+    @PostMapping("/center/signin")
159
+    public ResponseBean signin(@RequestBody String paramStr) {
160
+        JSONObject params = JSONObject.parseObject(paramStr);
161
+        if (params == null) {
162
+            return ResponseBean.error("非法参数", ResponseBean.ERROR_MISSING_PARAMS);
163
+        }
164
+        
165
+        String userName = params.getString("userName");
166
+        String userPassword = params.getString("password");
167
+        
168
+        //验证用户名密码是否正确
169
+        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
170
+        sysUserQueryWrapper.eq("user_name",userName);
171
+        sysUserQueryWrapper.eq("password", MD5Utils.md5(userPassword));
172
+        SysUser sysUser = iSysUserService.getOne(sysUserQueryWrapper);
173
+        if (sysUser == null) {
174
+            return ResponseBean.error("用户名或密码错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
175
+        }
176
+        
177
+        if (sysUser.getStatus() != CommConstant.STATUS_NORMAL) {
178
+            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
179
+        }
180
+        
181
+        String token = JWTUtils.newToken(sysUser.getUserName());
182
+    
183
+        //保存token
184
+        saveToken(token);
185
+        
186
+        Map<String, Object> result = new HashMap<>();
187
+        result.put("token", token);
188
+        result.put("user", sysUser);
189
+        
190
+        return ResponseBean.success(result);
191
+    }
192
+    
193
+    @PostMapping("/center/signout")
194
+    public ResponseBean signout(HttpServletRequest request) {
195
+        String token = JWTUtils.getToken(request);
196
+        QueryWrapper<SysToken> sysTokenQueryWrapper = new QueryWrapper<>();
197
+        sysTokenQueryWrapper.eq("token",token);
198
+        sysTokenService.remove(sysTokenQueryWrapper);
199
+        return ResponseBean.success("成功退出");
200
+    }
201
+    
202
+    private void saveToken(String token) {
203
+        SysToken sysToken = new SysToken();
204
+        sysToken.setToken(token);
205
+        sysToken.setExpDate(LocalDateTime.now());
206
+        sysTokenService.save(sysToken);
207
+    }
143 208
 }

src/main/java/com/huiju/estateagents/entity/SysToken.java → src/main/java/com/huiju/estateagents/center/sysUser/entity/SysToken.java 查看文件

@@ -1,5 +1,6 @@
1
-package com.huiju.estateagents.entity;
1
+package com.huiju.estateagents.center.sysUser.entity;
2 2
 
3
+import com.baomidou.mybatisplus.annotation.TableId;
3 4
 import lombok.Data;
4 5
 import lombok.EqualsAndHashCode;
5 6
 import lombok.experimental.Accessors;
@@ -25,6 +26,7 @@ public class SysToken implements Serializable {
25 26
     /**
26 27
      * token
27 28
      */
29
+    @TableId(value = "token")
28 30
     private String token;
29 31
 
30 32
     /**

src/main/java/com/huiju/estateagents/entity/SysUser.java → src/main/java/com/huiju/estateagents/center/sysUser/entity/SysUser.java 查看文件

@@ -1,5 +1,7 @@
1
-package com.huiju.estateagents.entity;
1
+package com.huiju.estateagents.center.sysUser.entity;
2 2
 
3
+import com.baomidou.mybatisplus.annotation.IdType;
4
+import com.baomidou.mybatisplus.annotation.TableId;
3 5
 import lombok.Data;
4 6
 import lombok.EqualsAndHashCode;
5 7
 import lombok.experimental.Accessors;
@@ -24,6 +26,7 @@ public class SysUser implements Serializable {
24 26
     /**
25 27
      * 账户登录
26 28
      */
29
+    @TableId(value = "user_name")
27 30
     private String userName;
28 31
 
29 32
     /**

src/main/java/com/huiju/estateagents/mapper/SysTokenMapper.java → src/main/java/com/huiju/estateagents/center/sysUser/mapper/SysTokenMapper.java 查看文件

@@ -1,7 +1,7 @@
1
-package com.huiju.estateagents.mapper;
1
+package com.huiju.estateagents.center.sysUser.mapper;
2 2
 
3 3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
-import com.huiju.estateagents.entity.SysToken;
4
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
5 5
 import org.apache.ibatis.annotations.Mapper;
6 6
 
7 7
 /**

src/main/java/com/huiju/estateagents/mapper/SysUserMapper.java → src/main/java/com/huiju/estateagents/center/sysUser/mapper/SysUserMapper.java 查看文件

@@ -1,7 +1,7 @@
1
-package com.huiju.estateagents.mapper;
1
+package com.huiju.estateagents.center.sysUser.mapper;
2 2
 
3 3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
-import com.huiju.estateagents.entity.SysUser;
4
+import com.huiju.estateagents.center.sysUser.entity.SysUser;
5 5
 import org.apache.ibatis.annotations.Mapper;
6 6
 
7 7
 /**

src/main/java/com/huiju/estateagents/service/ISysTokenService.java → src/main/java/com/huiju/estateagents/center/sysUser/service/ISysTokenService.java 查看文件

@@ -1,7 +1,7 @@
1
-package com.huiju.estateagents.service;
1
+package com.huiju.estateagents.center.sysUser.service;
2 2
 
3 3
 import com.baomidou.mybatisplus.extension.service.IService;
4
-import com.huiju.estateagents.entity.SysToken;
4
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
5 5
 
6 6
 /**
7 7
  * <p>

src/main/java/com/huiju/estateagents/service/ISysUserService.java → src/main/java/com/huiju/estateagents/center/sysUser/service/ISysUserService.java 查看文件

@@ -1,7 +1,7 @@
1
-package com.huiju.estateagents.service;
1
+package com.huiju.estateagents.center.sysUser.service;
2 2
 
3 3
 import com.baomidou.mybatisplus.extension.service.IService;
4
-import com.huiju.estateagents.entity.SysUser;
4
+import com.huiju.estateagents.center.sysUser.entity.SysUser;
5 5
 
6 6
 /**
7 7
  * <p>

src/main/java/com/huiju/estateagents/service/impl/SysTokenServiceImpl.java → src/main/java/com/huiju/estateagents/center/sysUser/service/impl/SysTokenServiceImpl.java 查看文件

@@ -1,9 +1,10 @@
1
-package com.huiju.estateagents.service.impl;
1
+package com.huiju.estateagents.center.sysUser.service.impl;
2 2
 
3
+import com.baomidou.mybatisplus.extension.service.IService;
3 4
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
4
-import com.huiju.estateagents.entity.SysToken;
5
-import com.huiju.estateagents.mapper.SysTokenMapper;
6
-import com.huiju.estateagents.service.ISysTokenService;
5
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
6
+import com.huiju.estateagents.center.sysUser.mapper.SysTokenMapper;
7
+import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
7 8
 import org.springframework.stereotype.Service;
8 9
 
9 10
 /**

src/main/java/com/huiju/estateagents/service/impl/SysUserServiceImpl.java → src/main/java/com/huiju/estateagents/center/sysUser/service/impl/SysUserServiceImpl.java 查看文件

@@ -1,9 +1,10 @@
1
-package com.huiju.estateagents.service.impl;
1
+package com.huiju.estateagents.center.sysUser.service.impl;
2 2
 
3
+import com.baomidou.mybatisplus.extension.service.IService;
3 4
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
4
-import com.huiju.estateagents.entity.SysUser;
5
-import com.huiju.estateagents.mapper.SysUserMapper;
6
-import com.huiju.estateagents.service.ISysUserService;
5
+import com.huiju.estateagents.center.sysUser.entity.SysUser;
6
+import com.huiju.estateagents.center.sysUser.mapper.SysUserMapper;
7
+import com.huiju.estateagents.center.sysUser.service.ISysUserService;
7 8
 import org.springframework.stereotype.Service;
8 9
 
9 10
 /**

src/main/java/com/huiju/estateagents/controller/TaUserController.java → src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java 查看文件

@@ -1,17 +1,20 @@
1
-package com.huiju.estateagents.controller;
1
+package com.huiju.estateagents.center.taUser.controller;
2 2
 
3 3
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4 4
 import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6
 import com.huiju.estateagents.base.BaseController;
7 7
 import com.huiju.estateagents.base.ResponseBean;
8
-import com.huiju.estateagents.entity.TaUser;
9
-import com.huiju.estateagents.service.ITaUserService;
8
+import com.huiju.estateagents.center.taUser.entity.TaUser;
9
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
10
+import com.huiju.estateagents.common.CommConstant;
10 11
 import org.slf4j.Logger;
11 12
 import org.slf4j.LoggerFactory;
12 13
 import org.springframework.beans.factory.annotation.Autowired;
13 14
 import org.springframework.web.bind.annotation.*;
14 15
 
16
+import java.util.Map;
17
+
15 18
 /**
16 19
  * <p>
17 20
     * 用户表  前端控制器
@@ -21,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
21 24
  * @since 2019-09-11
22 25
  */
23 26
 @RestController
24
-@RequestMapping("/")
27
+@RequestMapping("/api")
25 28
 public class TaUserController extends BaseController {
26 29
 
27 30
     private final Logger logger = LoggerFactory.getLogger(TaUserController.class);
@@ -36,17 +39,14 @@ public class TaUserController extends BaseController {
36 39
      * @param pageSize
37 40
      * @return
38 41
      */
39
-    @RequestMapping(value="/taUser",method= RequestMethod.GET)
42
+    @RequestMapping(value="/center/taUser",method= RequestMethod.GET)
40 43
     public ResponseBean taUserList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
41 44
 									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
42 45
         ResponseBean responseBean = new ResponseBean();
43 46
         try {
44 47
             //使用分页插件
45
-		    IPage<TaUser> pg = new Page<>(pageNum, pageSize);
46
-            QueryWrapper<TaUser> queryWrapper = new QueryWrapper<>();
47
-            queryWrapper.orderByDesc("create_date");
48
-
49
-            IPage<TaUser> result = iTaUserService.page(pg, queryWrapper);
48
+		    IPage pg = new Page<>(pageNum, pageSize);
49
+            IPage<Map<String,Object>> result = iTaUserService.getPageList(pg);
50 50
             responseBean.addSuccess(result);
51 51
         }catch (Exception e){
52 52
             e.printStackTrace();

src/main/java/com/huiju/estateagents/entity/TaUser.java → src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java 查看文件

@@ -1,4 +1,4 @@
1
-package com.huiju.estateagents.entity;
1
+package com.huiju.estateagents.center.taUser.entity;
2 2
 
3 3
 import com.baomidou.mybatisplus.annotation.IdType;
4 4
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -79,6 +79,4 @@ public class TaUser implements Serializable {
79 79
      * 是否管理员
80 80
      */
81 81
     private Boolean isAdmin;
82
-
83
-
84 82
 }

+ 23
- 0
src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserMapper.java 查看文件

@@ -0,0 +1,23 @@
1
+package com.huiju.estateagents.center.taUser.mapper;
2
+
3
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import com.baomidou.mybatisplus.core.metadata.IPage;
5
+import com.huiju.estateagents.center.taUser.entity.TaUser;
6
+import org.apache.ibatis.annotations.Mapper;
7
+
8
+import java.util.List;
9
+import java.util.Map;
10
+
11
+/**
12
+ * <p>
13
+ * 用户表  Mapper 接口
14
+ * </p>
15
+ *
16
+ * @author jobob
17
+ * @since 2019-09-11
18
+ */
19
+@Mapper
20
+public interface TaUserMapper extends BaseMapper<TaUser> {
21
+	
22
+	List<Map<String,Object>> getPageList(IPage<TaUser> pg);
23
+}

+ 20
- 0
src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserService.java 查看文件

@@ -0,0 +1,20 @@
1
+package com.huiju.estateagents.center.taUser.service;
2
+
3
+import com.baomidou.mybatisplus.core.metadata.IPage;
4
+import com.baomidou.mybatisplus.extension.service.IService;
5
+import com.huiju.estateagents.center.taUser.entity.TaUser;
6
+
7
+import java.util.Map;
8
+
9
+/**
10
+ * <p>
11
+ * 用户表  服务类
12
+ * </p>
13
+ *
14
+ * @author jobob
15
+ * @since 2019-09-11
16
+ */
17
+public interface ITaUserService extends IService<TaUser> {
18
+	
19
+	IPage<Map<String,Object>> getPageList(IPage<TaUser> pg);
20
+}

+ 34
- 0
src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java 查看文件

@@ -0,0 +1,34 @@
1
+package com.huiju.estateagents.center.taUser.service.impl;
2
+
3
+import com.baomidou.mybatisplus.core.metadata.IPage;
4
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5
+import com.huiju.estateagents.center.taUser.entity.TaUser;
6
+import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
7
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
8
+import org.springframework.beans.factory.annotation.Autowired;
9
+import org.springframework.stereotype.Service;
10
+
11
+import java.util.List;
12
+import java.util.Map;
13
+
14
+/**
15
+ * <p>
16
+ * 用户表  服务实现类
17
+ * </p>
18
+ *
19
+ * @author jobob
20
+ * @since 2019-09-11
21
+ */
22
+@Service
23
+public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> implements ITaUserService {
24
+	
25
+	@Autowired
26
+	private TaUserMapper taUserMapper;
27
+	
28
+	@Override
29
+	public IPage<Map<String,Object>> getPageList(IPage pg) {
30
+		List<Map<String,Object>> taUserList = taUserMapper.getPageList(pg);
31
+		pg.setRecords(taUserList);
32
+		return pg;
33
+	}
34
+}

+ 35
- 3
src/main/java/com/huiju/estateagents/common/JWTUtils.java 查看文件

@@ -1,13 +1,13 @@
1 1
 package com.huiju.estateagents.common;
2 2
 
3 3
 import io.jsonwebtoken.Jwts;
4
-import io.jsonwebtoken.SignatureAlgorithm;
5 4
 import io.jsonwebtoken.security.Keys;
6 5
 
7 6
 import javax.servlet.http.HttpServletRequest;
8 7
 import java.security.Key;
9 8
 import java.util.Calendar;
10 9
 import java.util.Date;
10
+import java.util.Map;
11 11
 
12 12
 /**
13 13
  * JWTUtils
@@ -17,7 +17,7 @@ import java.util.Date;
17 17
 public class JWTUtils {
18 18
     // 直接定义常量是不安全的
19 19
     public final static Key key = Keys.hmacShaKeyFor("yansenisahero,2019-5-17 16:18:14".getBytes());
20
-
20
+    
21 21
     /**
22 22
      * getSubject 获取 jwt subject
23 23
      * @param request
@@ -38,6 +38,26 @@ public class JWTUtils {
38 38
 
39 39
         return null;
40 40
     }
41
+    
42
+    /**
43
+     * getSubject 获取 jwt subject
44
+     * @param request
45
+     * @return
46
+     */
47
+    public static String getToken(HttpServletRequest request) {
48
+        String jwtHeader = request.getHeader("authorization");
49
+        if (null == jwtHeader || "".equals(jwtHeader.trim())) {
50
+            return null;
51
+        }
52
+        
53
+        String[] jwtAuths = jwtHeader.split("Bearer ");
54
+        if (null == jwtAuths || jwtAuths.length < 2) {
55
+            return null;
56
+        }
57
+        
58
+        
59
+        return jwtAuths[1];
60
+    }
41 61
 
42 62
     /**
43 63
      * newToken 生成新的 token
@@ -49,7 +69,19 @@ public class JWTUtils {
49 69
         Calendar calendar = Calendar.getInstance();
50 70
         calendar.setTime(new Date());
51 71
         calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)+7);
52
-
53 72
         return Jwts.builder().setSubject(subject).setExpiration(calendar.getTime()).signWith(key).compact();
54 73
     }
74
+    
75
+    /**
76
+     * newToken 生成新的 token
77
+     * @param subject
78
+     * @return
79
+     */
80
+    public static String newTokenByMap(Map subject) {
81
+        // 有效期 7 天
82
+        Calendar calendar = Calendar.getInstance();
83
+        calendar.setTime(new Date());
84
+        calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)+7);
85
+        return Jwts.builder().setClaims(subject).setExpiration(calendar.getTime()).signWith(key).compact();
86
+    }
55 87
 }

+ 20
- 2
src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java 查看文件

@@ -2,8 +2,11 @@ package com.huiju.estateagents.interceptor;
2 2
 
3 3
 import com.alibaba.fastjson.JSONObject;
4 4
 import com.huiju.estateagents.base.ResponseBean;
5
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
6
+import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
5 7
 import com.huiju.estateagents.common.JWTUtils;
6 8
 import io.jsonwebtoken.*;
9
+import org.springframework.beans.factory.annotation.Autowired;
7 10
 import org.springframework.stereotype.Component;
8 11
 import org.springframework.web.servlet.HandlerInterceptor;
9 12
 import org.springframework.web.servlet.ModelAndView;
@@ -13,12 +16,17 @@ import javax.servlet.http.HttpServletResponse;
13 16
 
14 17
 @Component
15 18
 public class AccessInterceptor implements HandlerInterceptor {
19
+    
20
+    @Autowired
21
+    private ISysTokenService sysTokenService;
22
+    
16 23
     private String[] whiteList = {
17 24
             "/wx/chat", // 聊天暂时不鉴权
18 25
             "/api/wx/login",
19 26
             "/api/admin/signin",
20 27
             "/api/taCheckin/activity",
21
-            "/api/wx/qrcode/scene"
28
+            "/api/wx/qrcode/scene",
29
+		    "/api/center/signin",
22 30
     };
23 31
 
24 32
     /*
@@ -91,7 +99,17 @@ public class AccessInterceptor implements HandlerInterceptor {
91 99
             response.getOutputStream().write(JSONObject.toJSONBytes(resp));
92 100
             return false;
93 101
         }
94
-
102
+        
103
+        //添加如果执行了登出操作提示先进行登录
104
+        SysToken sysToken = sysTokenService.getById(jwtAuths[1]);
105
+        if (null == sysToken){
106
+            ResponseBean resp = ResponseBean.error("请先进行系统登录操作", ResponseBean.ERROR_AUTH_FAIL);
107
+    
108
+            response.addHeader("Content-type", "application/json");
109
+            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
110
+            return false;
111
+        }
112
+        
95 113
         return true;
96 114
     }
97 115
 

+ 0
- 18
src/main/java/com/huiju/estateagents/mapper/TaUserMapper.java 查看文件

@@ -1,18 +0,0 @@
1
-package com.huiju.estateagents.mapper;
2
-
3
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
-import com.huiju.estateagents.entity.TaUser;
5
-import org.apache.ibatis.annotations.Mapper;
6
-
7
-/**
8
- * <p>
9
- * 用户表  Mapper 接口
10
- * </p>
11
- *
12
- * @author jobob
13
- * @since 2019-09-11
14
- */
15
-@Mapper
16
-public interface TaUserMapper extends BaseMapper<TaUser> {
17
-
18
-}

+ 0
- 16
src/main/java/com/huiju/estateagents/service/ITaUserService.java 查看文件

@@ -1,16 +0,0 @@
1
-package com.huiju.estateagents.service;
2
-
3
-import com.baomidou.mybatisplus.extension.service.IService;
4
-import com.huiju.estateagents.entity.TaUser;
5
-
6
-/**
7
- * <p>
8
- * 用户表  服务类
9
- * </p>
10
- *
11
- * @author jobob
12
- * @since 2019-09-11
13
- */
14
-public interface ITaUserService extends IService<TaUser> {
15
-
16
-}

+ 0
- 20
src/main/java/com/huiju/estateagents/service/impl/TaUserServiceImpl.java 查看文件

@@ -1,20 +0,0 @@
1
-package com.huiju.estateagents.service.impl;
2
-
3
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
4
-import com.huiju.estateagents.entity.TaUser;
5
-import com.huiju.estateagents.mapper.TaUserMapper;
6
-import com.huiju.estateagents.service.ITaUserService;
7
-import org.springframework.stereotype.Service;
8
-
9
-/**
10
- * <p>
11
- * 用户表  服务实现类
12
- * </p>
13
- *
14
- * @author jobob
15
- * @since 2019-09-11
16
- */
17
-@Service
18
-public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> implements ITaUserService {
19
-
20
-}

+ 1
- 1
src/main/resources/mapper/SysTokenMapper.xml 查看文件

@@ -1,5 +1,5 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3
-<mapper namespace="com.huiju.estateagents.mapper.SysTokenMapper">
3
+<mapper namespace="com.huiju.estateagents.center.sysUser.mapper.SysTokenMapper">
4 4
 
5 5
 </mapper>

+ 1
- 1
src/main/resources/mapper/SysUserMapper.xml 查看文件

@@ -1,5 +1,5 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3
-<mapper namespace="com.huiju.estateagents.mapper.SysUserMapper">
3
+<mapper namespace="com.huiju.estateagents.center.sysUser.mapper.SysUserMapper">
4 4
 
5 5
 </mapper>

+ 26
- 1
src/main/resources/mapper/TaUserMapper.xml 查看文件

@@ -1,5 +1,30 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3
-<mapper namespace="com.huiju.estateagents.mapper.TaUserMapper">
3
+<mapper namespace="com.huiju.estateagents.center.taUser.mapper.TaUserMapper">
4 4
 
5
+    <select id="getPageList" resultType="map">
6
+        SELECT
7
+            t.user_id AS userId,
8
+            t.org_id AS orgId,
9
+            t.user_name AS userName,
10
+            t.login_name AS loginName,
11
+            t.phone,
12
+            t.avatar,
13
+            t.create_date AS createDate,
14
+            o.NAME AS orgName,
15
+            o.address,
16
+            o.logo,
17
+            o.remark,
18
+            m.miniapp_id AS miniappId,
19
+            m.secret,
20
+            m.token,
21
+            m.NAME AS miniaooName,
22
+            m.qr_code AS qrCode
23
+        FROM
24
+            ta_user t
25
+            LEFT JOIN ta_org o ON t.org_id = o.org_id
26
+            LEFT JOIN ta_miniapp m ON o.org_id = m.org_id
27
+        WHERE
28
+            t.is_admin =1
29
+    </select>
5 30
 </mapper>