修改

fdkanfang-application/src/main/resources/application-test.properties

@@ -0,0 +1,71 @@
+
+#DB
+# \u6570\u636E\u6E90\u914D\u7F6E
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.druid.url=jdbc:mysql://39.108.220.65:3306/fdkanfang?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.druid.username=root
+#spring.datasource.druid.password=4dkk2019%
+spring.datasource.druid.password=4dkk2020test%
+
+
+# \u521D\u59CB\u8FDE\u63A5\u6570
+spring.datasource.druid.initial-size=5
+# \u6700\u5C0F\u8FDE\u63A5\u6C60\u6570\u91CF
+spring.datasource.druid.min-idle=10
+# \u6700\u5927\u8FDE\u63A5\u6C60\u6570\u91CF
+spring.datasource.druid.max-active=20
+# \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4
+spring.datasource.druid.max-wait=60000
+# \u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
+spring.datasource.druid.time-between-eviction-runs-millis=60000
+# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
+spring.datasource.druid.min-evictable-idle-time-millis=30000
+# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5927\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
+spring.datasource.druid.max-evictable-idle-time-millis=90000
+# \u914D\u7F6E\u68C0\u6D4B\u8FDE\u63A5\u662F\u5426\u6709\u6548
+spring.datasource.druid.validation-query=SELECT 1 FROM DUAL
+spring.datasource.druid.test-while-idle=true
+spring.datasource.druid.test-on-borrow=false
+spring.datasource.druid.test-on-return=false
+spring.datasource.druid.web-stat-filter.enabled=true
+spring.datasource.druid.stat-view-servlet.enabled=true
+
+#logging.file=log/xiaoan.log
+
+# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
+spring.redis.database=0
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.password=
+# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4 \u5355\u4F4D ms\uFF08\u6BEB\u79D2\uFF09
+spring.redis.timeout=3000ms
+# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u9ED8\u8BA4\u503C\u4E5F\u662F8\u3002
+spring.redis.jedis.pool.max-idle=8
+#\u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u9ED8\u8BA4\u503C\u4E5F\u662F0\u3002
+spring.redis.jedis.pool.min-idle=0
+# \u5982\u679C\u8D4B\u503C\u4E3A-1\uFF0C\u5219\u8868\u793A\u4E0D\u9650\u5236\uFF1B\u5982\u679Cpool\u5DF2\u7ECF\u5206\u914D\u4E86maxActive\u4E2Ajedis\u5B9E\u4F8B\uFF0C\u5219\u6B64\u65F6pool\u7684\u72B6\u6001\u4E3Aexhausted(\u8017\u5C3D)\u3002
+spring.redis.jedis.pool.max-active=8
+# \u7B49\u5F85\u53EF\u7528\u8FDE\u63A5\u7684\u6700\u5927\u65F6\u95F4\uFF0C\u5355\u4F4D\u6BEB\u79D2\uFF0C\u9ED8\u8BA4\u503C\u4E3A-1\uFF0C\u8868\u793A\u6C38\u4E0D\u8D85\u65F6\u3002\u5982\u679C\u8D85\u8FC7\u7B49\u5F85\u65F6\u95F4\uFF0C\u5219\u76F4\u63A5\u629B\u51FAJedisConnectionException
+spring.redis.jedis.pool.max-wait=-1ms
+
+
+# \u6587\u4EF6\u4FDD\u5B58\u8DEF\u5F84\uFF0C\u7B97\u6CD5\u751F\u6210\u6587\u4EF6\u5730\u5740
+#output.file.path=/data/kanfang/
+output.file.path=/root/data/kanfang/
+
+#\u7F16\u8F91\u9875\u9762
+server.domain=http://39.108.220.65:8084/fdkanfang/spc.html
+
+#log
+logging.path=${output.file.path}fdkanfang_log
+logging.config=classpath:logback-spring.xml
+logging.level.com.fdkanfang=debug
+
+
+
+#ËÄά¿´¿´µÄµÇ¼ÓòÃû
+4dkankan.host=https://4dkankan.com/
+
+#queue
+verticle.queue=verticalQueue

fdkanfang-dao/src/main/java/com/fdkanfang/dao/backend/provider/HouseProvider.java

@@ -65,10 +65,10 @@ public class HouseProvider {
             sql.append( ")");
         }
         if (null != handlerId || null != uploadId) {
-            if(null != handlerId || null == uploadId){
+            if(null != handlerId && null == uploadId){
                 //只有编辑权限
                 sql.append(" and house.handler = ").append(handlerId);
-            }else if(null == handlerId || null != uploadId){
+            }else if(null == handlerId && null != uploadId){
                 //只有上传权限，没有编辑权限
                 sql.append(" and house.user_id = ").append(uploadId);
             }else{
@@ -76,6 +76,7 @@ public class HouseProvider {
                 sql.append(" and (");
                 sql.append(" house.user_id = ").append(uploadId);
                 sql.append(" or house.handler = ").append(handlerId);
+                sql.append( ")");
             }
         }
         sql.append(" ORDER BY house.create_time DESC");

fdkanfang-web/src/main/java/com/fdkanfang/web/backend/IndexController.java

@@ -40,11 +40,10 @@ import java.util.concurrent.TimeUnit;
  * Created by owen on 2020/2/19 0019 15:53
  */
 //@Api(value = "IndexController",tags = "登录/退出")
-@Api(value = "IndexController",tags = "登录管理")
+@Api(value = "IndexController", tags = "登录管理")
 @RestController
 @Log4j2
-public class IndexController extends BaseController{
-
+public class IndexController extends BaseController {
 
 
     @Autowired
@@ -68,7 +67,7 @@ public class IndexController extends BaseController{
     public R login(@RequestBody LoginDto param) throws Exception {
         // 1.获取用户
         UserEntity user = userService2.findByUserName(param.getUserName());
-        if (user == null){
+        if (user == null) {
             log.error("用户不存在： {}", param.getUserName());
             return new R(MsgCode.e_ADMIN_4001, MsgCode.msg_ADMIN_4001);
         }
@@ -116,11 +115,11 @@ public class IndexController extends BaseController{
     @ApiOperation(value = "管理员登录")
     @PostMapping(value = "user/login")
     @ResponseBody
-    public Result userLogin(@RequestBody  @ApiParam(name = "用户登录注册实体", value = "传入json格式", required = true) UserLoginVo adminRegisterVo) {
-        if(null == adminRegisterVo){
+    public Result userLogin(@RequestBody @ApiParam(name = "用户登录注册实体", value = "传入json格式", required = true) UserLoginVo adminRegisterVo) {
+        if (null == adminRegisterVo) {
             throw new CommonBaseException(ResultCodeEnum.D3001);
         }
-        if(!StringUtils.isNoneBlank(adminRegisterVo.getPhoneNum() , adminRegisterVo.getPassword())){
+        if (!StringUtils.isNoneBlank(adminRegisterVo.getPhoneNum(), adminRegisterVo.getPassword())) {
             throw new CommonBaseException(ResultCodeEnum.D3001);
         }
         adminRegisterVo.setRandomcode("1234");
@@ -130,90 +129,97 @@ public class IndexController extends BaseController{
         String kankanResult = HttpClientUtil.doPostJson(url, json);
         //解析返回结果
         JSONObject res = JSONObject.parseObject(kankanResult);
-        log.info("四维看看返回登录数据:{}" , res.toJSONString());
+        log.info("四维看看返回登录数据:{}", res.toJSONString());
 
-        Result result =  parseResult(res , "登录失败" , adminRegisterVo);
-        if(result.getCode() == 0){
+        Result result = parseResult(res, "登录失败", adminRegisterVo);
+        if (result.getCode() == 0) {
             // 1.获取用户
             UserEntity user = userService2.findByPhone(adminRegisterVo.getPhoneNum());
-            if (user == null){
+            if (user == null) {
                 log.error("用户不存在： {}", adminRegisterVo);
                 throw new CommonBaseException(ResultCodeEnum.D3012);
             }
             // 检查账号是否启用
             if (user.getStatus() != 0) {
                 log.error("账户已停用，不能登录： {}", adminRegisterVo.getPhoneNum());
-                throw new CommonBaseException(ResultCodeEnum.D101 , "用户已经停用");
+                throw new CommonBaseException(ResultCodeEnum.D101, "用户已经停用");
             }
         }
         return result;
     }
 
 
-    @Transactional(propagation = Propagation.REQUIRES_NEW,rollbackFor = Exception.class)
-    public Result parseResult(JSONObject res , String defaultFailMsg ,UserLoginVo adminRegisterVo){
-        if(null != res){
+    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    public Result parseResult(JSONObject res, String defaultFailMsg, UserLoginVo adminRegisterVo) {
+        if (null != res) {
             int code = -10;
-            if(res.containsKey("code")){
+            if (res.containsKey("code")) {
                 code = (int) res.get("code");
             }
             String msg = null;
-            if(res.containsKey("msg")){
+            if (res.containsKey("msg")) {
                 msg = (String) res.get("msg");
             }
-            Map<String , Object> resultMap = new HashMap<>();
-            if(0 == code){
-              log.info("用户登录成功");
+            Map<String, Object> resultMap = new HashMap<>();
+            if (0 == code) {
+                log.info("用户登录成功");
                 JSONArray dataObjArray = null;
                 JSONObject dataObject = null;
                 String tokenFromKankan = "";
-                if(res.get("data") instanceof JSONArray){
+                if (res.get("data") instanceof JSONArray) {
                     log.info("四维看看登录返回的data是json数组");
                     dataObjArray = (JSONArray) res.get("data");
-                    return Result.success( msg , dataObjArray);
-                }else if(res.get("data") instanceof JSONObject){
+                    return Result.success(msg, dataObjArray);
+                } else if (res.get("data") instanceof JSONObject) {
                     log.info("四维看看登录返回的data是json object");
                     //登录返回的就是jsonObject
                     dataObject = (JSONObject) res.get("data");
-                    if(null != dataObject){
+                    if (null != dataObject) {
                         JSONObject user = (JSONObject) dataObject.get("user");
                         tokenFromKankan = dataObject.getString("token");
-                        if(StringUtils.isBlank(tokenFromKankan)){
-                            throw new CommonBaseException(ResultCodeEnum.D101 , "四维看看返回的token为空");
+                        if (StringUtils.isBlank(tokenFromKankan)) {
+                            throw new CommonBaseException(ResultCodeEnum.D101, "四维看看返回的token为空");
                         }
-                        resultMap.put("token" , tokenFromKankan);
-                        if(null == user){
+                        resultMap.put("token", tokenFromKankan);
+                        if (null == user) {
                             log.info("解析不出來user");
-                            throw new CommonBaseException(ResultCodeEnum.D101 , "解析看看返回的数据失败");
-                        }else{
+                            throw new CommonBaseException(ResultCodeEnum.D101, "解析看看返回的数据失败");
+                        } else {
                             String nickName = (String) user.get("nickName");
                             String userName = (String) user.get("userName");
                             String password = (String) user.get("password");
-                            if(StringUtils.isBlank(userName)){
-                                throw new CommonBaseException(ResultCodeEnum.D101 , "看看返回用户名为空");
+                            if (StringUtils.isBlank(userName)) {
+                                throw new CommonBaseException(ResultCodeEnum.D101, "看看返回用户名为空");
                             }
                             UserEntity dbUser = userService2.findByUserName(userName);
-                            if(null == dbUser){
-                                userUtils.addNewUserByPhone(userName , password);
+                            if (null == dbUser) {
+                                userUtils.addNewUserByPhone(userName, password);
                                 dbUser = userService2.findByUserName(adminRegisterVo.getPhoneNum());
-                                if(null == dbUser){
-                                    log.error("新插入的用户:{}重新捞取失败" , adminRegisterVo.getPhoneNum());
-                                    throw new CommonBaseException(ResultCodeEnum.D101 , "获取用户失败");
+                                if (null == dbUser) {
+                                    log.error("新插入的用户:{}重新捞取失败", adminRegisterVo.getPhoneNum());
+                                    throw new CommonBaseException(ResultCodeEnum.D101, "获取用户失败");
+                                }
+                                //默认给上传权限
+                                userService2.saveUserRole(dbUser.getId(), 2l);
+                            } else {
+                                if (!StringUtils.equals(dbUser.getRecStatus(), "A")) {
+                                    log.info("用户[{}]不可用", dbUser.getUserName());
+                                    throw new CommonBaseException(ResultCodeEnum.D101, "用户已经不可用");
                                 }
-                            }else{
-                                if(!StringUtils.equals(dbUser.getRecStatus() , "A")){
-                                    log.info("用户[{}]不可用" , dbUser.getUserName());
-                                    throw new CommonBaseException(ResultCodeEnum.D101 , "用户已经不可用");
+                                Set<String> roles = userService2.findRoleByUserId(dbUser.getId());
+                                if (null == roles || !roles.contains("upload")) {
+                                    //默认给上传权限
+                                    userService2.saveUserRole(dbUser.getId(), 2l);
                                 }
                             }
-                            resultMap.put("user" , dbUser);
+                            resultMap.put("user", dbUser);
                         }
                     }
-                    return Result.success( msg , resultMap);
-                }else{
-                    return Result.failure( "四维看看返回数据测试异常");
+                    return Result.success(msg, resultMap);
+                } else {
+                    return Result.failure("四维看看返回数据测试异常");
                 }
-            }else{
+            } else {
                 return Result.failure(msg);
             }
         }
@@ -266,7 +272,7 @@ public class IndexController extends BaseController{
 
         // 3.保存用户
         UserEntity user = userService2.findByPhone(phone);
-         // 注册用户
+        // 注册用户
         if (user == null) {
             user = new UserEntity();
             // 新用户，用户名就是手机号
@@ -304,7 +310,7 @@ public class IndexController extends BaseController{
          * 四维看房：SMS_184616399
          *
          */
-        SmsService.sendSms(phone,"{\"code\":\"" + num + "\"}", "SMS_184616399");
+        SmsService.sendSms(phone, "{\"code\":\"" + num + "\"}", "SMS_184616399");
 
         // 更新到 redis, 有效期5分钟, 旧token无效
         redisTemplate.opsForValue().set(phone, String.valueOf(num), Long.parseLong("360"), TimeUnit.SECONDS);
@@ -313,7 +319,7 @@ public class IndexController extends BaseController{
     }
 
     @GetMapping("test")
-    public String test(){
+    public String test() {
         return LocalDateTime.now().toString();
     }