From dab5db84055a7f6a8fea3b61099d85d34ea7a706 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 10 五月 2024 16:22:25 +0800
Subject: [PATCH] 最新版本
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 2
server/meeting/meeting_admin/src/main/java/com/doumee/api/common/CaptchaController.java | 1
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectsServiceImpl.java | 1
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Projects.java | 7 -
server/meeting/meeting_admin/src/main/resources/bootstrap.yml | 2
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/UserRel.java | 7 -
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MultifileCloudController.java | 14 +-
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomsCloudController.java | 10 +-
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java | 12 +-
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java | 23 +++--
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java | 3
server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java | 16 +++
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Rooms.java | 3
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 13 +-
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Parks.java | 4
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomRecord.java | 3
server/meeting/meeting_admin/src/main/java/com/doumee/api/common/PublicController.java | 1
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java | 6 -
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectRelCloudController.java | 14 +-
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 4
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java | 9 -
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/BookingTime.java | 7 -
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/ProjectRel.java | 7 -
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/UserRelCloudController.java | 4
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomTime.java | 7 -
26 files changed, 92 insertions(+), 92 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/CaptchaController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/CaptchaController.java
index 65f9f3e..209d40f 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/CaptchaController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/CaptchaController.java
@@ -1,5 +1,6 @@
package com.doumee.api.common;
+import com.doumee.api.BaseController;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.service.common.CaptchaService;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/PublicController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/PublicController.java
index 24df14b..a446dbd 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/PublicController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/PublicController.java
@@ -1,6 +1,7 @@
package com.doumee.api.common;
import com.alibaba.fastjson.JSONObject;
+import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.utils.Constants;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java
index 051a4d5..847ee4c 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java
@@ -49,7 +49,7 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
@ApiImplicitParam(paramType = "query", dataType = "String", name = "yearMonth", value = "骞存湀 yyyy-MM", required = true)
})
- public ApiResponse<List<MonthDataResponse>> monthDay(@RequestParam String yearMonth) {
+ public ApiResponse<List<MonthDataResponse>> monthDay(@RequestParam String yearMonth, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
List<String> dataList = DateUtil.getDayByMonth(yearMonth);
List<MonthDataResponse> monthDataResponseList = new ArrayList<>();
@@ -86,7 +86,7 @@
// @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳涓婚敭", required = true),
})
- public ApiResponse<MeetingDetailResponse> meetingDetail(@RequestParam Integer id) {
+ public ApiResponse<MeetingDetailResponse> meetingDetail( @RequestHeader(Constants.HEADER_USER_TOKEN) String token,@RequestParam Integer id) {
return ApiResponse.success("鏌ヨ鎴愬姛", bookingsService.getMeetingDetail(id));
}
@@ -98,7 +98,6 @@
})
public ApiResponse<String> getQrCode(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
LoginUserInfo user = getLoginUser(token);
-// LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
return ApiResponse.success("鏌ヨ鎴愬姛", bookingsService.getQrCode(id,user.getId()));
}
@@ -111,7 +110,6 @@
})
public void getQrCodeImg(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token, HttpServletResponse response) throws Exception {
LoginUserInfo user = getLoginUser(token);
-// LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
response.setHeader("Cache-Control", "no-store, no-cache");
response.setContentType("image/jpeg");
String content =bookingsService.getQrCode(id,user.getId());
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MultifileCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MultifileCloudController.java
index 7c73001..71ed297 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MultifileCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MultifileCloudController.java
@@ -35,14 +35,14 @@
@ApiOperation("鏂板缓")
@PostMapping("/create")
@CloudRequiredPermission("business:multifile:create")
- public ApiResponse create(@RequestBody Multifile multifile) {
+ public ApiResponse create(@RequestBody Multifile multifile, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(multifileService.create(multifile));
}
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:multifile:delete")
- public ApiResponse deleteById(@PathVariable Integer id) {
+ public ApiResponse deleteById(@PathVariable Integer id, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
multifileService.deleteById(id);
return ApiResponse.success(null);
}
@@ -50,7 +50,7 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
@CloudRequiredPermission("business:multifile:delete")
- public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
+ public ApiResponse deleteByIdInBatch(@RequestParam String ids, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
for (String id : idArray) {
@@ -63,7 +63,7 @@
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
@CloudRequiredPermission("business:multifile:update")
- public ApiResponse updateById(@RequestBody Multifile multifile) {
+ public ApiResponse updateById(@RequestBody Multifile multifile, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
multifileService.updateById(multifile);
return ApiResponse.success(null);
}
@@ -71,21 +71,21 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@CloudRequiredPermission("business:multifile:query")
- public ApiResponse<PageData<Multifile>> findPage (@RequestBody PageWrap<Multifile> pageWrap) {
+ public ApiResponse<PageData<Multifile>> findPage (@RequestBody PageWrap<Multifile> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(multifileService.findPage(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:multifile:exportExcel")
- public void exportExcel (@RequestBody PageWrap<Multifile> pageWrap, HttpServletResponse response) {
+ public void exportExcel (@RequestBody PageWrap<Multifile> pageWrap, HttpServletResponse response, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
ExcelExporter.build(Multifile.class).export(multifileService.findPage(pageWrap).getRecords(), "闄勪欢涓婁紶淇℃伅琛�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@CloudRequiredPermission("business:multifile:query")
- public ApiResponse findById(@PathVariable Integer id) {
+ public ApiResponse findById(@PathVariable Integer id, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(multifileService.findById(id));
}
}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectRelCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectRelCloudController.java
index e30fe10..e0bbda8 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectRelCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectRelCloudController.java
@@ -35,14 +35,14 @@
@ApiOperation("鏂板缓")
@PostMapping("/create")
@CloudRequiredPermission("business:projectrel:create")
- public ApiResponse create(@RequestBody ProjectRel projectRel) {
+ public ApiResponse create(@RequestBody ProjectRel projectRel, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(projectRelService.create(projectRel));
}
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:projectrel:delete")
- public ApiResponse deleteById(@PathVariable Integer id) {
+ public ApiResponse deleteById(@PathVariable Integer id, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
projectRelService.deleteById(id);
return ApiResponse.success(null);
}
@@ -50,7 +50,7 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
@CloudRequiredPermission("business:projectrel:delete")
- public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
+ public ApiResponse deleteByIdInBatch(@RequestParam String ids, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
for (String id : idArray) {
@@ -63,7 +63,7 @@
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
@CloudRequiredPermission("business:projectrel:update")
- public ApiResponse updateById(@RequestBody ProjectRel projectRel) {
+ public ApiResponse updateById(@RequestBody ProjectRel projectRel, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
projectRelService.updateById(projectRel);
return ApiResponse.success(null);
}
@@ -71,21 +71,21 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@CloudRequiredPermission("business:projectrel:query")
- public ApiResponse<PageData<ProjectRel>> findPage (@RequestBody PageWrap<ProjectRel> pageWrap) {
+ public ApiResponse<PageData<ProjectRel>> findPage (@RequestBody PageWrap<ProjectRel> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(projectRelService.findPage(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:projectrel:exportExcel")
- public void exportExcel (@RequestBody PageWrap<ProjectRel> pageWrap, HttpServletResponse response) {
+ public void exportExcel (@RequestBody PageWrap<ProjectRel> pageWrap, HttpServletResponse response, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
ExcelExporter.build(ProjectRel.class).export(projectRelService.findPage(pageWrap).getRecords(), "鏈嶅姟椤圭洰鍏宠仈琛�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@CloudRequiredPermission("business:projectrel:query")
- public ApiResponse findById(@PathVariable Integer id) {
+ public ApiResponse findById(@PathVariable Integer id, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(projectRelService.findById(id));
}
}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java
index 4edf42c..ae7b0bf 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java
@@ -45,7 +45,7 @@
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:projects:delete")
- public ApiResponse deleteById(@PathVariable Integer id) {
+ public ApiResponse deleteById(@PathVariable Integer id, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
projectsService.deleteById(id);
return ApiResponse.success(null);
}
@@ -53,7 +53,7 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
@CloudRequiredPermission("business:projects:delete")
- public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
+ public ApiResponse deleteByIdInBatch(@RequestParam String ids, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
for (String id : idArray) {
@@ -75,21 +75,21 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@CloudRequiredPermission("business:projects:query")
- public ApiResponse<PageData<Projects>> findPage (@RequestBody PageWrap<Projects> pageWrap) {
+ public ApiResponse<PageData<Projects>> findPage (@RequestBody PageWrap<Projects> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(projectsService.findPage(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:projects:exportExcel")
- public void exportExcel (@RequestBody PageWrap<Projects> pageWrap, HttpServletResponse response) {
+ public void exportExcel (@RequestBody PageWrap<Projects> pageWrap, HttpServletResponse response, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
ExcelExporter.build(Projects.class).export(projectsService.findPage(pageWrap).getRecords(), "鏈嶅姟椤圭洰淇℃伅琛�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@CloudRequiredPermission("business:projects:query")
- public ApiResponse findById(@PathVariable Integer id) {
+ public ApiResponse findById(@PathVariable Integer id, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(projectsService.findById(id));
}
@@ -98,7 +98,7 @@
@ApiOperation("浼氳鍏宠仈鐨勯」鐩�")
@PostMapping("/findListByObjId")
@CloudRequiredPermission("business:projects:query")
- public ApiResponse<List<ProjectsResponse>> findListByObjId (@RequestParam Integer objId, @RequestParam Integer objType) {
+ public ApiResponse<List<ProjectsResponse>> findListByObjId (@RequestParam Integer objId, @RequestParam Integer objType, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(projectsService.getProjectsList(objId,objType));
}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomsCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomsCloudController.java
index e41b7d2..42eb024 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomsCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomsCloudController.java
@@ -48,14 +48,15 @@
@ApiOperation("鏂板缓")
@PostMapping("/create")
@CloudRequiredPermission("business:rooms:create")
- public ApiResponse create(@RequestBody Rooms rooms) {
+ public ApiResponse create(@RequestBody Rooms rooms,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ rooms.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(roomsService.create(rooms));
}
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:rooms:delete")
- public ApiResponse deleteById(@PathVariable Integer id) {
+ public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
roomsService.deleteById(id);
return ApiResponse.success(null);
}
@@ -63,7 +64,7 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
@CloudRequiredPermission("business:rooms:delete")
- public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
+ public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
for (String id : idArray) {
@@ -76,7 +77,8 @@
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
@CloudRequiredPermission("business:rooms:update")
- public ApiResponse updateById(@RequestBody Rooms rooms) {
+ public ApiResponse updateById(@RequestBody Rooms rooms,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ rooms.setLoginUserInfo(this.getLoginUser(token));
roomsService.updateById(rooms);
return ApiResponse.success(null);
}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/UserRelCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/UserRelCloudController.java
index b400986..3fe1216 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/UserRelCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/UserRelCloudController.java
@@ -78,14 +78,14 @@
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:userrel:exportExcel")
- public void exportExcel (@RequestBody PageWrap<UserRel> pageWrap, HttpServletResponse response, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ public void exportExcel (@RequestBody PageWrap<UserRel> pageWrap, HttpServletResponse response) {
ExcelExporter.build(UserRel.class).export(userRelService.findPage(pageWrap).getRecords(), "浼氳瀹ょ鐞嗗憳鍜屽弬浼氫汉鍛樺叧鑱旇〃", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@CloudRequiredPermission("business:userrel:query")
- public ApiResponse findById(@PathVariable Integer id, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(userRelService.findById(id));
}
}
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap.yml
index 04f1760..d788ad7 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap.yml
@@ -25,7 +25,7 @@
# data-id: com.doumee.meeting.admin
discovery:
server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
- namespace: dev_renkang
+ namespace: dmvisit
username: nacos
password: nacos
# 瀹夊叏閰嶇疆
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/BookingTime.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/BookingTime.java
index 9a7b228..771bb2d 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/BookingTime.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/BookingTime.java
@@ -1,6 +1,7 @@
package com.doumee.dao.business.model;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -18,7 +19,7 @@
@Data
@ApiModel("浼氳瀹ら绾︽椂闂存鍏宠仈琛�")
@TableName("`meeting_book_time`")
-public class BookingTime {
+public class BookingTime extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -31,7 +32,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,8 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date editDate;
+ private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
index bdb8447..7b1a7b2 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.core.model.LoginUserModel;
import com.doumee.dao.system.model.Multifile;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -23,7 +23,7 @@
@Data
@ApiModel("浼氳瀹ら瀹氫俊鎭〃")
@TableName("`meeting_book`")
-public class Bookings {
+public class Bookings extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -162,9 +162,4 @@
@ApiModelProperty(value = "weekday")
@TableField(exist = false)
private String weekday;
-
-
- @ApiModelProperty(value = "鐢ㄦ埛淇℃伅")
- @TableField(exist = false)
- private LoginUserInfo userInfo;
}
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/ProjectRel.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/ProjectRel.java
index 0be3120..6396f09 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/ProjectRel.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/ProjectRel.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -19,7 +20,7 @@
@Data
@ApiModel("鏈嶅姟椤圭洰鍏宠仈琛�")
@TableName("`meeting_project_rel`")
-public class ProjectRel {
+public class ProjectRel extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -32,7 +33,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,8 +41,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date editDate;
+ private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Projects.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Projects.java
index 8db1e41..6327a09 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Projects.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Projects.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -19,7 +20,7 @@
@Data
@ApiModel("鏈嶅姟椤圭洰淇℃伅琛�")
@TableName("`meeting_projects`")
-public class Projects {
+public class Projects extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -32,7 +33,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,8 +41,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date editDate;
+ private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomRecord.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomRecord.java
index fb0da76..113531e 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomRecord.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomRecord.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -20,7 +21,7 @@
@Data
@ApiModel("浼氳瀹ゅ紑闂ㄨ褰曡〃")
@TableName("`meeting_room_record`")
-public class RoomRecord {
+public class RoomRecord extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomTime.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomTime.java
index a2af730..7fdf791 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomTime.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomTime.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -19,7 +20,7 @@
@Data
@ApiModel("浼氳瀹ら绾︽椂闂存淇℃伅琛�")
@TableName("`meeting_room_time`")
-public class RoomTime {
+public class RoomTime extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -32,7 +33,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,8 +41,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date editDate;
+ private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Rooms.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Rooms.java
index 61ea3b0..ef5d593 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Rooms.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Rooms.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
import com.doumee.dao.system.model.SystemUser;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -23,7 +24,7 @@
@Data
@ApiModel("浼氳瀹や俊鎭〃")
@TableName("`meeting_rooms`")
-public class Rooms {
+public class Rooms extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/UserRel.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/UserRel.java
index 924deb6..f4da2de 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/UserRel.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/UserRel.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -20,7 +21,7 @@
@Data
@ApiModel("浼氳瀹ょ鐞嗗憳鍜屽弬浼氫汉鍛樺叧鑱旇〃")
@TableName("`meeting_user_rel`")
-public class UserRel {
+public class UserRel extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -33,7 +34,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -42,8 +42,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date editDate;
+ private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
index 9d2a774..7e56c59 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
@@ -478,7 +478,7 @@
}
queryWrapper.orderByDesc(Bookings::getCreateDate);
- String path = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.FILE_DIR).getCode() + systemDictDataBiz.queryByCode(MeetConstants.OSS, MeetConstants.PROJECTS).getCode();
+ String path = systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm");
SimpleDateFormat format1 = new SimpleDateFormat("HH:mm");
@@ -551,7 +551,7 @@
queryWrapper.orderByDesc(Bookings::getCreateDate);
// String path = systemDictDataBiz.queryByCode(MeetConstants.OSS, MeetConstants.RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(MeetConstants.OSS, MeetConstants.PROJECTS).getCode();
- String path = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.FILE_DIR).getCode() + systemDictDataBiz.queryByCode(MeetConstants.OSS, MeetConstants.PROJECTS).getCode();
+ String path = systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
Bookings result = bookingsJoinMapper.selectOne(queryWrapper.last("limit 1"));
if (result != null) {
@@ -779,10 +779,9 @@
.orderByDesc(!Objects.isNull(pageWrap.getModel().getStatus())&&pageWrap.getModel().getStatus().equals(MeetConstants.TWO),"a.START_TIME")
.orderByAsc(Objects.isNull(pageWrap.getModel().getStatus())||pageWrap.getModel().getStatus().equals(MeetConstants.ONE),"a.START_TIME")
);
- String prefixUrl = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.FILE_DIR).getCode() + systemDictDataBiz.queryByCode(MeetConstants.OSS, MeetConstants.PROJECTS).getCode();
- ;
+ String path = systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
page.getRecords().forEach(i -> {
- i.setPrefixUrl(prefixUrl);
+ i.setPrefixUrl(path);
});
return page;
}
@@ -810,7 +809,7 @@
//鍙備細浜哄憳鍒楄〃
SystemUser param = new SystemUser();
List<SystemUser> userResponseList = systemUserService.findList(param);
- String avatarPath = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.FILE_DIR).getCode() + systemDictDataBiz.queryByCode(MeetConstants.OSS, MeetConstants.PROJECTS).getCode();
+ String avatarPath = systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.MEMBER_IMG).getCode();
userResponseList.forEach(i -> {
if(StringUtils.isNotBlank(i.getAvatar())){
i.setAvatar(avatarPath+i.getAvatar());
@@ -818,7 +817,7 @@
});
meetingDetailResponse.setUserResponseList(userResponseList);
//鏈嶅姟椤�
- String projectsPath = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.FILE_DIR).getCode() + systemDictDataBiz.queryByCode(MeetConstants.OSS, MeetConstants.PROJECTS).getCode();
+ String projectsPath = systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
List<ProjectsResponse> projectsResponseList = projectsService.getProjectsList(id, MeetConstants.ONE);
projectsResponseList.forEach(i -> {
i.setPrefixUrl(projectsPath);
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectsServiceImpl.java
index a9dea96..41d302c 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectsServiceImpl.java
@@ -47,6 +47,7 @@
insert.setImgurl(projects.getImgurl());
insert.setStatus(MeetConstants.ZERO);
insert.setSortnum(projects.getSortnum());
+ insert.setCreateDate(new Date());
projectsMapper.insert(insert);
return projects.getId();
}
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java
index 5ae8143..90bf637 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java
@@ -73,7 +73,9 @@
@Transactional(rollbackFor = {BusinessException.class, Exception.class})
public Integer create(Rooms rooms) {
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-
+ if(user ==null){
+ user = rooms.getLoginUserInfo();
+ }
isCreateParamValid(rooms, user);
Calendar starttime = Calendar.getInstance();
@@ -102,12 +104,11 @@
rooms.setStartTime(DateUtil.formatDate(starttime.getTime(), "yyyy-MM-dd HH:mm:ss"));
rooms.setEndTime(DateUtil.formatDate(endtime.getTime(), "yyyy-MM-dd HH:mm:ss"));
- //TODO 鏇存柊浼氳瀹ゆ椂闂存
+ // 鏇存柊浼氳瀹ゆ椂闂存
updateRoomTimes(rooms, user);
-
- //TODO 娣诲姞绠＄悊浜哄憳
+ // 娣诲姞绠＄悊浜哄憳
updateManager(rooms, user);
- //TODO 娣诲姞绠℃湇鍔￠」鐩�
+ // 娣诲姞绠℃湇鍔￠」鐩�
updateProjectRel(rooms, user);
return rooms.getId();
}
@@ -324,7 +325,9 @@
public void updateById(Rooms rooms) {
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-
+ if(user ==null){
+ user = rooms.getLoginUserInfo();
+ }
isCreateParamValid(rooms, user);
Calendar starttime = Calendar.getInstance();
@@ -450,7 +453,7 @@
queryWrapper.exists("select u.id from user_rel u where u.ISDELETED=0 and u.OBJ_ID =t.id and u.USER_ID in (" + StringUtils.strip(collect.toString(),"[]")+" )");
}
- String path = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode() + systemDictDataBiz.queryByCode(MeetConstants.OSS, MeetConstants.PROJECTS).getCode();
+ String path = systemDictDataBiz.queryByCode(Constants.FTP, Constants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
IPage<Rooms> result = roomsJoinMapper.selectJoinPage(page, Rooms.class, queryWrapper);
result.getRecords().stream().forEach(s ->{
@@ -536,8 +539,8 @@
.exists(" select 1 from user_rel u where u.USER_ID = "+pageWrap.getModel().getUserId()+" and u.ISDELETED = 0 and u.OBJ_ID = rooms.id and u.OBJ_TYPE = 0 ")
.orderByDesc("CREATE_DATE")
);
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
- + systemDictDataBiz.queryByCode(MeetConstants.OSS, MeetConstants.PROJECTS).getCode();
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP, Constants.FTP_RESOURCE_PATH).getCode()
+ + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
page.getRecords().forEach(s->{
s.setPrefixUrl(prefixUrl);
@@ -573,7 +576,7 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌浼氳瀹や俊鎭�");
}
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode() + systemDictDataBiz.queryByCode(MeetConstants.OSS, MeetConstants.PROJECTS).getCode();
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP, Constants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
roomsResponse.setPrefixUrl(prefixUrl);
diff --git a/server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java b/server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java
index b771a0e..0228c3a 100644
--- a/server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java
+++ b/server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java
@@ -14,8 +14,11 @@
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.HandlerInterceptor;
+import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.Enumeration;
public class LoginHandlerInterceptor implements HandlerInterceptor {
@@ -33,9 +36,17 @@
Class<?> beanType = handlerMethod.getBeanType();
if (!beanType.isAnnotationPresent(LoginNoRequired.class) && !handlerMethod.hasMethodAnnotation(LoginNoRequired.class)) {
//鑾峰彇token
+ Cookie[] cookies = request.getCookies();
String token = request.getHeader(Constants.HEADER_USER_TOKEN); // 浠� http 璇锋眰澶翠腑鍙栧嚭 token
+ if(StringUtils.isBlank(token)){
+ for(Cookie c :cookies){
+ if(StringUtils.equals(c.getName(),Constants.HEADER_USER_TOKEN)){
+ token = c.getValue();
+ }
+ }
+ }
if (StringUtils.isNotBlank(token)) {
- LoginUserInfo user = checkLogin(request,response);
+ LoginUserInfo user = checkLogin(token);
if (handlerMethod.hasMethodAnnotation(CloudRequiredPermission.class)) {
CloudRequiredPermission p = handlerMethod.getMethodAnnotation(CloudRequiredPermission.class);
if(p.value()!=null && p.value().length>0){
@@ -64,8 +75,7 @@
return true;
}
- private LoginUserInfo checkLogin(HttpServletRequest request, HttpServletResponse response) {
- String token = request.getHeader(Constants.HEADER_USER_TOKEN);
+ private LoginUserInfo checkLogin(String token) {
if (token == null || token.isEmpty()) {
throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
}
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index d18fe3f..2bdbd58 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -253,7 +253,7 @@
public static final String ACCESS_KEY = "ACCESS_KEY";
public static final String ENDPOINT = "ENDPOINT";
- public static final String RESOURCE_PATH = "RESOURCE_PATH";
+ public static final String RESOURCE_PATH = "FTP_RESOURCE_PATH";
//鍙戦�佷細璁紑濮� 瀹氭椂鎻愬墠澶氬皯鍒嗛挓鍙戦��
public static final String SYSTEM ="SYSTEM";
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
index 7de820b..ed6ed39 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -33,7 +33,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -42,8 +41,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date editDate;
+ private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Parks.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Parks.java
index ad8e9b2..bcab11a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Parks.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Parks.java
@@ -32,7 +32,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@@ -41,8 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date editDate;
+ private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
index 549fc8c..64b8655 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
@@ -31,7 +31,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,8 +39,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date editDate;
+ private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
index 9068475..ec899e7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
@@ -44,8 +44,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date editDate;
+ private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
--
Gitblit v1.9.3