From 88e645a936e26120dd2400ef48ec7f2c4e3d29f9 Mon Sep 17 00:00:00 2001 From: mengyxu Date: Fri, 7 Jan 2022 15:47:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.页面展示图片路径错误问题 2.默认配置缺失问题 2.图片查询获取用户名失败问题 --- .../xumy/picture/ctrl/MyUserController.java | 10 ++++- .../xumy/picture/ctrl/PictureController.java | 15 +++---- .../xumy/picture/service/PictureService.java | 2 +- .../src/main/resources/application.properties | 41 +++++++++++++++++++ vue/src/components/main/NavHeader.vue | 1 + vue/src/store/mutations.js | 6 ++- vue/src/store/state.js | 3 +- vue/src/views/biz/picture.vue | 4 +- vue/src/views/main/login.vue | 2 +- 9 files changed, 70 insertions(+), 14 deletions(-) create mode 100644 java/src/main/resources/application.properties diff --git a/java/src/main/java/vip/xumy/picture/ctrl/MyUserController.java b/java/src/main/java/vip/xumy/picture/ctrl/MyUserController.java index 53e95df..17e73f6 100644 --- a/java/src/main/java/vip/xumy/picture/ctrl/MyUserController.java +++ b/java/src/main/java/vip/xumy/picture/ctrl/MyUserController.java @@ -38,7 +38,7 @@ public class MyUserController { @GetMapping public PageResponse save(BasePageParam param, HttpServletRequest request) { - User user = (User) request.getSession().getAttribute(PublicController.KEY); + User user = getUser(request); PageResponse rsp = new PageResponse<>(); if (!"1".equals(user.getPermission())) { rsp.setRows(new ArrayList()); @@ -63,5 +63,13 @@ public class MyUserController { userService.delete(user.getUserId()); return AjaxResponse.successed(); } + + public static User getUser(HttpServletRequest request) { + return (User)request.getSession().getAttribute(PublicController.KEY); + } + + public static String getUserId(HttpServletRequest request) { + return getUser(request).getUserId(); + } } diff --git a/java/src/main/java/vip/xumy/picture/ctrl/PictureController.java b/java/src/main/java/vip/xumy/picture/ctrl/PictureController.java index 539c175..985e641 100644 --- a/java/src/main/java/vip/xumy/picture/ctrl/PictureController.java +++ b/java/src/main/java/vip/xumy/picture/ctrl/PictureController.java @@ -18,9 +18,6 @@ import org.springframework.web.multipart.MultipartFile; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; -import vip.xumy.admin.utils.LoginUtil; -import vip.xumy.admin.verify.controller.PublicController; -import vip.xumy.admin.verify.pojo.User; import vip.xumy.core.exception.CoreException; import vip.xumy.core.pojo.com.AjaxResponse; import vip.xumy.core.pojo.com.PageResponse; @@ -42,13 +39,13 @@ public class PictureController { @GetMapping public PageResponse list(Picture example, HttpServletRequest request) { - User user = (User) request.getSession().getAttribute(PublicController.KEY); PageResponse rsp = new PageResponse<>(); - if (!"1".equals(user.getPermission())) { + String userId = MyUserController.getUserId(request); + if (userId == null) { rsp.setRows(new ArrayList()); rsp.setTotal(0L); }else { - example.setUser(user.getUserId()); + example.setUser(userId); Page pages = PageHelper.startPage(example.getPage(), example.getSize()); List list = pictureService.list(example); rsp.setRows(list); @@ -59,7 +56,11 @@ public class PictureController { @PostMapping public AjaxResponse save(MultipartFile file, HttpServletRequest request) throws CoreException { - pictureService.save(file, LoginUtil.getUserId(request)); + String userId = MyUserController.getUserId(request); + if(userId == null) { + return AjaxResponse.failed("请先登录"); + } + pictureService.save(file, userId); return new AjaxResponse(true, "上传成功"); } diff --git a/java/src/main/java/vip/xumy/picture/service/PictureService.java b/java/src/main/java/vip/xumy/picture/service/PictureService.java index 31272d3..d9ae9d1 100644 --- a/java/src/main/java/vip/xumy/picture/service/PictureService.java +++ b/java/src/main/java/vip/xumy/picture/service/PictureService.java @@ -71,7 +71,7 @@ public class PictureService { File file = new File(rootPath + path); File parent = file.getParentFile(); if (!parent.exists()) { - file.mkdirs(); + parent.mkdirs(); } try (FileOutputStream fos = new FileOutputStream(file)) { fos.write(data); diff --git a/java/src/main/resources/application.properties b/java/src/main/resources/application.properties new file mode 100644 index 0000000..ec9510d --- /dev/null +++ b/java/src/main/resources/application.properties @@ -0,0 +1,41 @@ +service.package.type=jar +# 定位模板的目录(配合ResourceHandler使用,控制页面访问) +spring.mvc.view.prefix=/private/ +spring.mvc.view.suffix=.html +logging.config:log4j2.xml + +spring.main.banner-mode=off + +spring.datasource.type=com.alibaba.druid.pool.DruidDataSource +spring.datasource.driver-class-name=com.mysql.jdbc.Driver +spring.datasource.initialSize=3 +spring.datasource.minIdle=3 +spring.datasource.maxActive=20 +spring.datasource.maxWait=60000 +spring.datasource.timeBetweenEvictionRunsMillis=60000 +spring.datasource.minEvictableIdleTimeMillis=300000 +spring.datasource.validationQuery=SELECT 1 FROM DUAL +spring.datasource.keepAlive=true +spring.datasource.testWhileIdle=true +spring.datasource.testOnBorrow=false +spring.datasource.testOnReturn=false +spring.datasource.poolPreparedStatements=false + +mybatis.mapper-locations= classpath*:mapper/**/*.xml +#mybatis.configuration.log-impl= org.apache.ibatis.logging.stdout.StdOutImpl +#开启mybatis驼峰映射 +mybatis.configuration.map-underscore-to-camel-case=true + +pagehelper.helperDialect=mysql +pagehelper.reasonable=true +pagehelper.supportMethodsArguments=true +pagehelper.params=count=countSql +pagehelper.returnPageInfo=check + +server.port=80 +server.servlet.context-path=/ +version.num=1.0.0 + +timeout.login.token=1000000 +spring.servlet.multipart.max-file-size=10MB +spring.servlet.multipart.max-request-size=100MB \ No newline at end of file diff --git a/vue/src/components/main/NavHeader.vue b/vue/src/components/main/NavHeader.vue index 84ba04a..7db6587 100644 --- a/vue/src/components/main/NavHeader.vue +++ b/vue/src/components/main/NavHeader.vue @@ -9,6 +9,7 @@ @click="clickGroup(item)"> {{ item.name }} + v{{ $store.state.version }} diff --git a/vue/src/store/mutations.js b/vue/src/store/mutations.js index d420e1b..7bdb364 100644 --- a/vue/src/store/mutations.js +++ b/vue/src/store/mutations.js @@ -8,7 +8,8 @@ const urls = { info: 'public/info', dict: 'public/get/dict', logout: 'public/logout', - conf: 'public/conf' + conf: 'public/conf', + version: 'public/version' } function stop() { @@ -121,6 +122,9 @@ export default { http.get(urls.conf).then(rsp => { state.conf = rsp; }); + http.get(urls.version).then(rsp => { + state.version = rsp; + }); }, getDictMap(state, codes, callBack) { diff --git a/vue/src/store/state.js b/vue/src/store/state.js index 3ca57e7..f13d027 100644 --- a/vue/src/store/state.js +++ b/vue/src/store/state.js @@ -10,5 +10,6 @@ export default { size: 'small', dict: {}, handlers: {}, - conf: {} + conf: {}, + version: '' } diff --git a/vue/src/views/biz/picture.vue b/vue/src/views/biz/picture.vue index 54309ec..1dcac7c 100644 --- a/vue/src/views/biz/picture.vue +++ b/vue/src/views/biz/picture.vue @@ -13,9 +13,9 @@ + :subTitle="item.time + ' ' + item.space + ' ' + (item.remark ? item.remark : '')">