From 269b98a9cf0e4a1d6900d758b48a7a47f9e697c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E8=B6=85?= <1162714483@qq.com> Date: Sat, 3 Apr 2021 10:42:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=90=9C=E7=B4=A2=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qiwenshare/file/config/es/FileSearch.java | 5 +---- .../file/controller/FileController.java | 1 - .../file/controller/UserController.java | 21 ++++++++++--------- .../com/qiwenshare/file/domain/UserBean.java | 4 +--- .../qiwenshare/file/service/UserService.java | 7 ++++++- .../resources/config/application.properties | 12 ++++------- 6 files changed, 23 insertions(+), 27 deletions(-) diff --git a/file-web/src/main/java/com/qiwenshare/file/config/es/FileSearch.java b/file-web/src/main/java/com/qiwenshare/file/config/es/FileSearch.java index a2eb8c7..931ec59 100644 --- a/file-web/src/main/java/com/qiwenshare/file/config/es/FileSearch.java +++ b/file-web/src/main/java/com/qiwenshare/file/config/es/FileSearch.java @@ -9,9 +9,8 @@ import org.springframework.data.elasticsearch.annotations.FieldType; @Data @Document(indexName = "filesearch", shards = 1, replicas = 0) public class FileSearch { - @Id - private long fileSearchId; + private Long userFileId; @Field(type = FieldType.Long) private Long fileId; @Field(type = FieldType.Text, analyzer = "ik_max_word") @@ -32,8 +31,6 @@ public class FileSearch { @Field(type = FieldType.Keyword) private String identifier; @Field(type = FieldType.Long) - private Long userFileId; - @Field(type = FieldType.Long) private Long userId; @Field(type = FieldType.Keyword) private String filePath; diff --git a/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java b/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java index c77e7c2..67851d5 100644 --- a/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java +++ b/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java @@ -594,5 +594,4 @@ public class FileController { return isExistPath; } - } diff --git a/file-web/src/main/java/com/qiwenshare/file/controller/UserController.java b/file-web/src/main/java/com/qiwenshare/file/controller/UserController.java index 9674e66..58ebcfd 100644 --- a/file-web/src/main/java/com/qiwenshare/file/controller/UserController.java +++ b/file-web/src/main/java/com/qiwenshare/file/controller/UserController.java @@ -15,6 +15,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.crypto.hash.SimpleHash; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -74,6 +75,9 @@ public class UserController { RestResult restResult = new RestResult(); UserBean saveUserBean = userService.findUserInfoByTelephone(username); + if (saveUserBean == null) { + return RestResult.fail().message("用户名或手机号不存在！"); + } String jwt = ""; try { jwt = JjwtUtil.createJWT("qiwenshare", "qiwen", JSON.toJSONString(saveUserBean)); @@ -104,25 +108,22 @@ public class UserController { @GetMapping("/checkuserlogininfo") @ResponseBody public RestResult checkUserLoginInfo(@RequestHeader("token") String token) { - RestResult restResult = new RestResult(); + if ("undefined".equals(token) || StringUtils.isEmpty(token)) { + return RestResult.fail().message("用户暂未登录"); + } UserBean sessionUserBean = userService.getUserBeanByToken(token); if (sessionUserBean != null) { - restResult.setData(sessionUserBean); - restResult.setSuccess(true); AliyunOSS oss = qiwenFileConfig.getAliyun().getOss(); String domain = oss.getDomain(); - restResult.getData().setViewDomain(domain); - String bucketName = oss.getBucketName(); - String endPoint = oss.getEndpoint(); - restResult.getData().setDownloadDomain(bucketName + "." + endPoint); + sessionUserBean.setViewDomain(domain); + return RestResult.success().data(sessionUserBean); + } else { - restResult.setSuccess(false); - restResult.setMessage("用户暂未登录"); + return RestResult.fail().message("用户暂未登录"); } - return restResult; } } diff --git a/file-web/src/main/java/com/qiwenshare/file/domain/UserBean.java b/file-web/src/main/java/com/qiwenshare/file/domain/UserBean.java index d809a2f..8039959 100644 --- a/file-web/src/main/java/com/qiwenshare/file/domain/UserBean.java +++ b/file-web/src/main/java/com/qiwenshare/file/domain/UserBean.java @@ -105,9 +105,7 @@ public class UserBean { @Transient @TableField(exist = false) private String token; - @Transient - @TableField(exist = false) - private String downloadDomain; + @Transient @TableField(exist = false) private String viewDomain; diff --git a/file-web/src/main/java/com/qiwenshare/file/service/UserService.java b/file-web/src/main/java/com/qiwenshare/file/service/UserService.java index 5ff2b79..36077dc 100644 --- a/file-web/src/main/java/com/qiwenshare/file/service/UserService.java +++ b/file-web/src/main/java/com/qiwenshare/file/service/UserService.java @@ -36,7 +36,6 @@ public class UserService extends ServiceImpl implements IU c = JjwtUtil.parseJWT(token); } catch (Exception e) { log.error("解码异常"); - e.printStackTrace(); return null; } if (c == null) { @@ -52,10 +51,16 @@ public class UserService extends ServiceImpl implements IU String savePassword = ""; if (StringUtils.isNotEmpty(tokenUserBean.getPassword())) { saveUserBean = findUserInfoByTelephone(tokenUserBean.getTelephone()); + if (saveUserBean == null) { + return null; + } tokenPassword = tokenUserBean.getPassword(); savePassword = saveUserBean.getPassword(); } else if (StringUtils.isNotEmpty(tokenUserBean.getQqPassword())) { saveUserBean = selectUserByopenid(tokenUserBean.getOpenId()); + if (saveUserBean == null) { + return null; + } tokenPassword = tokenUserBean.getQqPassword(); savePassword = saveUserBean.getQqPassword(); } diff --git a/file-web/src/main/resources/config/application.properties b/file-web/src/main/resources/config/application.properties index ef622c4..db543ad 100644 --- a/file-web/src/main/resources/config/application.properties +++ b/file-web/src/main/resources/config/application.properties @@ -21,11 +21,7 @@ mybatis.type-aliases-package=com.qiwenshare.file.domain mybatis.config-locations=classpath:mybatis/mybatis-config.xml mybatis.mapper-locations=classpath:mybatis/mapper/*.xml #mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl -#jdbc连接 -spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://localhost:3306/file?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true -spring.datasource.username=root -spring.datasource.password=ma123456 + #数据库初始化 spring.datasource.data=classpath:database/data.sql @@ -68,18 +64,18 @@ qiwen-file.aliyun.oss.bucket-name= #阿里云oss绑定域名 qiwen-file.aliyun.oss.domain= - +#FastDFS配置 fdfs.so-timeout=1501 fdfs.connect-timeout=601 fdfs.thumb-image.width=150 fdfs.thumb-image.height=150 -fdfs.tracker-list=121.89.222.103:22122 +fdfs.tracker-list=127.0.0.1:22122 # Redis数据库索引（默认为0） spring.redis.database=0 # Redis服务器地址 -spring.redis.host=123.56.9.174 +spring.redis.host=127.0.0.1 # Redis服务器连接端口 spring.redis.port=6379 # Redis服务器连接密码（默认为空）