Merge pull request edp963#1992 from xxxllluuu/dev-0.3

Fix: Refactor share module code compatible issue bug
xxxllluuu · Oct 28, 2020 · d0a080b · d0a080b
2 parents 2105e6a + 4272405
commit d0a080b
Show file tree

Hide file tree

Showing 46 changed files with 672 additions and 422 deletions.
diff --git a/config/application.yml.example b/config/application.yml.example
@@ -23,7 +23,7 @@ server:
   servlet:
     context-path: /
 
-  # Userd for mail and download services, can be empty, careful configuration
+  # Used for mail and download services, can be empty, careful configuration
   # By default, 'server.address' and 'server.port' is used as the string value.
   # access:
   #  address:
@@ -145,7 +145,7 @@ spring:
     username:
     password:
     base:
-    domainName:    # domainName 指 企业邮箱后缀，如企业邮箱为：xxx@example.com, 这里值为 '@example.com'
+    domainName:    # domainName 指 企业邮箱后缀，如企业邮箱为：xxx@example.com，这里值为 '@example.com'
 
   security:
     oauth2:

diff --git a/config/datasource_driver.yml.example b/config/datasource_driver.yml.example
@@ -40,7 +40,7 @@
 ##     2. add the corresponding dependency file (jar) in lib package,
 ##     3. restart your Davinci server
 ##  In theory, all databases with jdbc drivers are supported,
-##  if you have problems during useing, please with contact us.
+##  if you have problems during using, please with contact us.
 
 ## Configuration is as follows:
 

diff --git a/server/src/main/java/edp/core/utils/DateUtils.java b/server/src/main/java/edp/core/utils/DateUtils.java
@@ -102,42 +102,42 @@ private static String prepare(String timeString) {
         }
     }
 
-    public static Date currentData() {
+    public static Date currentDate() {
         return new Date();
     }
 
     public static long getNowMilliSecondTime() {
-        return currentData().getTime();
+        return currentDate().getTime();
     }
 
 
     public static String getNowDateYYYYMM() {
         SimpleDateFormat formatter = new SimpleDateFormat("yyyyMM");
 
-        return formatter.format(currentData());
+        return formatter.format(currentDate());
     }
 
     public static String getNowDateYYYYMMDD() {
         SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
 
-        return formatter.format(currentData());
+        return formatter.format(currentDate());
     }
 
-    public static String getTheDayBeforNowDateYYYYMMDD() {
+    public static String getTheDayBeforeNowDateYYYYMMDD() {
         SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
 
         Calendar calendar = Calendar.getInstance();
-        calendar.setTime(currentData());
+        calendar.setTime(currentDate());
         calendar.add(Calendar.DAY_OF_MONTH, -1);
 
         return formatter.format(calendar.getTime());
     }
 
-    public static String getTheDayBeforAWeekYYYYMMDD() {
+    public static String getTheDayBeforeAWeekYYYYMMDD() {
         SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
 
         Calendar calendar = Calendar.getInstance();
-        calendar.setTime(currentData());
+        calendar.setTime(currentDate());
         calendar.add(Calendar.DAY_OF_MONTH, -7);
 
         return formatter.format(calendar.getTime());
@@ -146,12 +146,12 @@ public static String getTheDayBeforAWeekYYYYMMDD() {
     public static String getNowDateFormatCustom(String format) {
         SimpleDateFormat formatter = new SimpleDateFormat(format);
 
-        return formatter.format(currentData());
+        return formatter.format(currentDate());
     }
 
     public static long getNowDaySecondTime0() {
         Calendar c = Calendar.getInstance();
-        Date d = currentData();
+        Date d = currentDate();
         c.setTime(d);
         c.set(c.get(Calendar.YEAR), c.get(Calendar.MONTH), c.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
 
@@ -340,4 +340,17 @@ public static String dateFormat(Date date, String dateFormat) {
         return "";
     }
 
+    public static Date add(Date date, int field, int amount) {
+
+        if (date == null) {
+            date = new Date();
+        }
+
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.add(field, amount);
+
+        return cal.getTime();
+    }
+
 }
diff --git a/server/src/main/java/edp/davinci/controller/DashboardController.java b/server/src/main/java/edp/davinci/controller/DashboardController.java
@@ -500,10 +500,16 @@ public ResponseEntity deleteMemDashboardWidget(@PathVariable Long relationId,
     @ApiOperation(value = "share dashboard", consumes = MediaType.APPLICATION_JSON_VALUE)
     @PostMapping(value = "/dashboards/{dashboardId}/share", consumes = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity shareDashboard(@PathVariable Long dashboardId,
-                                         @RequestBody ShareEntity shareEntity,
+                                         @Valid @RequestBody ShareEntity shareEntity,
+                                         @ApiIgnore BindingResult bindingResult,
                                          @ApiIgnore @CurrentUser User user,
                                          HttpServletRequest request) {
 
+        if (bindingResult.hasErrors()) {
+            ResultMap resultMap = new ResultMap(tokenUtils).failAndRefreshToken(request).message(bindingResult.getFieldErrors().get(0).getDefaultMessage());
+            return ResponseEntity.status(resultMap.getCode()).body(resultMap);
+        }
+
         if (invalidId(dashboardId)) {
             ResultMap resultMap = new ResultMap(tokenUtils).failAndRefreshToken(request).message("Invalid  id");
             return ResponseEntity.status(resultMap.getCode()).body(resultMap);

diff --git a/server/src/main/java/edp/davinci/controller/DisplayController.java b/server/src/main/java/edp/davinci/controller/DisplayController.java
@@ -611,9 +611,16 @@ public ResponseEntity uploadSlideSubWidgetBGImage(@PathVariable Long relationId,
     @ApiOperation(value = "share display", consumes = MediaType.APPLICATION_JSON_VALUE)
     @PostMapping(value = "/{id}/share", consumes = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity shareDisplay(@PathVariable Long id,
-                                       @RequestBody ShareEntity shareEntity,
+                                       @Valid @RequestBody ShareEntity shareEntity,
+                                       @ApiIgnore BindingResult bindingResult,
                                        @ApiIgnore @CurrentUser User user,
                                        HttpServletRequest request) {
+
+        if (bindingResult.hasErrors()) {
+            ResultMap resultMap = new ResultMap(tokenUtils).failAndRefreshToken(request).message(bindingResult.getFieldErrors().get(0).getDefaultMessage());
+            return ResponseEntity.status(resultMap.getCode()).body(resultMap);
+        }
+
         if (invalidId(id)) {
             ResultMap resultMap = new ResultMap(tokenUtils).failAndRefreshToken(request).message("Invalid id");
             return ResponseEntity.status(resultMap.getCode()).body(resultMap);

diff --git a/server/src/main/java/edp/davinci/controller/HomeController.java b/server/src/main/java/edp/davinci/controller/HomeController.java
@@ -21,18 +21,22 @@
 
 import edp.core.annotation.AuthIgnore;
 import edp.davinci.core.common.Constants;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @ApiIgnore
 @Controller
 public class HomeController {
 
-    @Value("${davinci.version:}")
-    private String version;
+    @Autowired
+    private Environment environment;
 
     @RequestMapping("swagger")
     public String swagger() {
@@ -49,10 +53,23 @@ public String shareIndex() {
         return "share";
     }
 
-    @RequestMapping(Constants.BASE_API_PATH + "/version")
+    @RequestMapping(Constants.BASE_API_PATH + "/configurations")
     @AuthIgnore
     @ResponseBody
-    public String version() {
-        return version;
+    public Map<String, Object> configurations() {
+        Map<String, Object> configs = new HashMap<>();
+        configs.put("version", environment.getProperty("davinci.version"));
+        configs.put("jwtToken", new HashMap<String, Object>() {{
+            put("timeout", environment.getProperty("jwtToken.timeout"));
+        }});
+        configs.put("security", new HashMap<String, Object>() {{
+            put("oauth2", new HashMap<String, Object>() {{
+                put("enable", Boolean.valueOf(environment.getProperty("security.oauth2.enable")));
+            }});
+        }});
+
+        return new HashMap<String, Object>() {{
+            put("payload", configs);
+        }};
     }
 }
diff --git a/server/src/main/java/edp/davinci/controller/LoginController.java b/server/src/main/java/edp/davinci/controller/LoginController.java
@@ -48,7 +48,6 @@
 import javax.validation.Valid;
 import java.security.Principal;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 
@@ -106,7 +105,7 @@ public ResponseEntity login(@Valid @RequestBody UserLogin userLogin, @ApiIgnore
         return ResponseEntity.ok(new ResultMap().success(tokenUtils.generateToken(user)).payload(userLoginResult));
     }
 
-    @ApiOperation(value = "get oauth2 clents")
+    @ApiOperation(value = "get oauth2 clients")
     @GetMapping(value = "getOauth2Clients", consumes = MediaType.ALL_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     @AuthIgnore
     public ResponseEntity getOauth2Clients(HttpServletRequest request) {

diff --git a/server/src/main/java/edp/davinci/controller/ShareController.java b/server/src/main/java/edp/davinci/controller/ShareController.java
@@ -27,6 +27,7 @@
 import edp.davinci.core.common.ResultMap;
 import edp.davinci.dto.shareDto.ShareDashboard;
 import edp.davinci.dto.shareDto.ShareDisplay;
+import edp.davinci.dto.shareDto.ShareWidget;
 import edp.davinci.dto.userDto.UserLogin;
 import edp.davinci.dto.userDto.UserLoginResult;
 import edp.davinci.dto.viewDto.DistinctParam;
@@ -35,7 +36,6 @@
 import edp.davinci.service.ShareService;
 import edp.davinci.service.share.ShareOperation;
 import edp.davinci.service.share.ShareType;
-import edp.davinci.service.share.ShareWidget;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -79,7 +79,6 @@ public ResponseEntity preFlight(@PathVariable String token) {
     @GetMapping(value = "/permissions/{token}")
     public ResponseEntity permission(@PathVariable(name = "token") String token,
                                      @RequestParam(required = false) String password,
-                                     @RequestParam String type,
                                      @ApiIgnore @CurrentUser User user,
                                      HttpServletRequest request) {
 
@@ -215,28 +214,25 @@ public ResponseEntity getShareData(@PathVariable String token,
 
 
     /**
-     * share 获取唯一值
+     * share获取控制器的值
      *
      * @param token
-     * @param viewId
      * @param param
      * @param bindingResult
      * @param user
      * @param request
      * @return
      */
     @ApiOperation(value = "get share data")
-    @AuthShare(type = ShareType.DATA, operation = ShareOperation.LOAD_DATA)
-    @PostMapping(value = "/data/{token}/distinctvalue/{viewId}", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @AuthShare(type = ShareType.DATA, operation = ShareOperation.LOAD_DISTINCT_DATA)
+    @PostMapping(value = "/data/{token}/distinctvalue", consumes = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity getDistinctValue(@PathVariable("token") String token,
-                                           @RequestParam(required = false) String password,
-                                           @PathVariable("viewId") Long viewId,
                                            @Valid @RequestBody DistinctParam param,
                                            @ApiIgnore BindingResult bindingResult,
                                            @ApiIgnore @CurrentUser User user,
                                            HttpServletRequest request) {
 
-        List<Map<String, Object>> resultList = shareService.getDistinctValue(viewId, param, user);
+        List<Map<String, Object>> resultList = shareService.getDistinctValue(param, user);
         if (null == user || user.getId() == null) {
             return ResponseEntity.ok(new ResultMap().success().payloads(resultList));
         } else {

diff --git a/server/src/main/java/edp/davinci/controller/WidgetController.java b/server/src/main/java/edp/davinci/controller/WidgetController.java
@@ -228,9 +228,16 @@ public ResponseEntity downloadWidget(@PathVariable("id") Long id,
     @ApiOperation(value = "share widget", consumes = MediaType.APPLICATION_JSON_VALUE)
     @PostMapping(value = "/{id}/share", consumes = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity shareWidget(@PathVariable Long id,
-                                      @RequestBody ShareEntity shareEntity,
+                                      @Valid @RequestBody ShareEntity shareEntity,
+                                      @ApiIgnore BindingResult bindingResult,
                                       @ApiIgnore @CurrentUser User user,
                                       HttpServletRequest request) {
+
+        if (bindingResult.hasErrors()) {
+            ResultMap resultMap = new ResultMap(tokenUtils).failAndRefreshToken(request).message(bindingResult.getFieldErrors().get(0).getDefaultMessage());
+            return ResponseEntity.status(resultMap.getCode()).body(resultMap);
+        }
+
         if (invalidId(id)) {
             ResultMap resultMap = new ResultMap(tokenUtils).failAndRefreshToken(request).message("Invalid id");
             return ResponseEntity.status(resultMap.getCode()).body(resultMap);

diff --git a/server/src/main/java/edp/davinci/core/common/ErrorMsg.java b/server/src/main/java/edp/davinci/core/common/ErrorMsg.java
@@ -21,7 +21,7 @@
 public final class ErrorMsg {
     public static final String ERR_MSG_AUTHENTICATION = "The resource requires authentication, which was not supplied with the request";
 
-    public static final String ERR_MSG_PERMISSION = "ERROR Permission denied";
+    public static final String ERR_MSG_PERMISSION = "Error Permission denied";
 
     public static final String ERR_INVALID_TOKEN = "Invalid share token";
 

diff --git a/server/src/main/java/edp/davinci/core/config/RestExceptionHandler.java b/server/src/main/java/edp/davinci/core/config/RestExceptionHandler.java
@@ -45,49 +45,47 @@ public class RestExceptionHandler {
     @ResponseBody
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     private ResultMap commonExceptionHandler(HttpServletRequest request, Exception e) {
-        e.printStackTrace();
-        log.error(e.getMessage());
+        log.error(e.toString(), e);
         return new ResultMap(tokenUtils).failAndRefreshToken(request).message(HttpStatus.INTERNAL_SERVER_ERROR.getReasonPhrase());
     }
 
     @ExceptionHandler(value = ServerException.class)
     @ResponseBody
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     private ResultMap serverExceptionHandler(HttpServletRequest request, Exception e) {
-        e.printStackTrace();
-        log.error(e.getMessage());
+        log.error(e.toString(), e);
         return new ResultMap(tokenUtils).failAndRefreshToken(request).message(e.getMessage());
     }
 
     @ExceptionHandler(value = ForbiddenException.class)
     @ResponseBody
     @ResponseStatus(HttpStatus.FORBIDDEN)
     private ResultMap forbiddenExceptionHandler(HttpServletRequest request, Exception e) {
-        log.error(e.getMessage());
+        log.error(e.toString(), e);
         return new ResultMap(tokenUtils).failAndRefreshToken(request, HttpCodeEnum.FORBIDDEN).message(e.getMessage());
     }
 
     @ExceptionHandler(value = UnAuthorizedException.class)
     @ResponseBody
     @ResponseStatus(HttpStatus.UNAUTHORIZED)
     private ResultMap unAuthorizedExceptionHandler(HttpServletRequest request, Exception e) {
-        log.error(e.getMessage());
+        log.error(e.toString(), e);
         return new ResultMap(tokenUtils).failAndRefreshToken(request, HttpCodeEnum.UNAUTHORIZED).message(e.getMessage());
     }
 
     @ExceptionHandler(value = NotFoundException.class)
     @ResponseBody
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     private ResultMap notFoundExceptionHandler(HttpServletRequest request, Exception e) {
-        log.error(e.getMessage());
+        log.error(e.toString(), e);
         return new ResultMap(tokenUtils).failAndRefreshToken(request, HttpCodeEnum.NOT_FOUND).message(e.getMessage());
     }
 
     @ExceptionHandler(value = MethodArgumentNotValidException.class)
     @ResponseBody
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     private ResultMap methodArgumentNotValidExceptionHandler(HttpServletRequest request, Exception e) {
-        log.error(e.getMessage());
+        log.error(e.toString(), e);
         return new ResultMap(tokenUtils).failAndRefreshToken(request, HttpCodeEnum.FAIL).message(e.getMessage());
     }
 

diff --git a/server/src/main/java/edp/davinci/core/inteceptor/AuthenticationInterceptor.java b/server/src/main/java/edp/davinci/core/inteceptor/AuthenticationInterceptor.java
@@ -70,8 +70,8 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
 
         String token = request.getHeader(Constants.TOKEN_HEADER_STRING);
 
-        AuthShare authShareMethoed = method.getAnnotation(AuthShare.class);
-        if (null != authShareMethoed) {
+        AuthShare authShareMethod = method.getAnnotation(AuthShare.class);
+        if (null != authShareMethod) {
             if (!StringUtils.isEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX)) {
                 String username = tokenUtils.getUsername(token);
                 User user = userService.getByUsername(username);

diff --git a/server/src/main/java/edp/davinci/core/inteceptor/PlatformAuthInterceptor.java b/server/src/main/java/edp/davinci/core/inteceptor/PlatformAuthInterceptor.java
@@ -118,8 +118,8 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
 
         User user = null;
 
-        AuthShare authShareMethoed = method.getAnnotation(AuthShare.class);
-        if (null != authShareMethoed) {
+        AuthShare authShareMethod = method.getAnnotation(AuthShare.class);
+        if (null != authShareMethod) {
             String token = request.getHeader(Constants.TOKEN_HEADER_STRING);
             if (!StringUtils.isEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX)) {
                 String username = tokenUtils.getUsername(token);

diff --git a/server/src/main/java/edp/davinci/dao/CronJobMapper.java b/server/src/main/java/edp/davinci/dao/CronJobMapper.java
@@ -42,7 +42,7 @@ public interface CronJobMapper {
 
 
     @Select({"select * from cron_job where  job_status in ('stopped','failed') and update_time > (NOW() - INTERVAL 3 MINUTE)"})
-    List<CronJob> getStopedJob();
+    List<CronJob> getStoppedJob();
 
     @Update({
             "update cron_job",