Merge remote-tracking branch 'origin/release' into release

dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java

@@ -93,6 +93,7 @@ public class EmailMaintainController extends AbstractController  {
         }
         String loginname = getUserInfo().getLoginname();
         emailMaintain.setCreateUser(loginname);
+
         DynamicContextHolder.push(DbConstant.BASICS_READ);
         EmailMaintainVo vo = new EmailMaintainVo();
         vo.setEmailAddress(emailMaintain.getEmailAddress());
@@ -115,8 +116,11 @@ public class EmailMaintainController extends AbstractController  {
      */
     @PostMapping("/edit")
     public ResponseEntity<R> edit(@RequestBody  EmailMaintainVo emailMaintain) {
-        if(StringUtils.isBlank(emailMaintain.getEmailPassword())){
+        if(StringUtils.isBlank(emailMaintain.getEmailPassword()) || StringUtils.isBlank(emailMaintain.getEmailAddress()) ){
-            return ResponseEntity.ok(R.error("邮箱地址不能为空！"));
+            return ResponseEntity.ok(R.error("邮箱地址/密码不能为空！"));
+        }else {
+            String encode = Base64Encoding.encode(emailMaintain.getEmailPassword());
+            emailMaintain.setEmailPassword(encode);
         }
         DynamicContextHolder.push(DbConstant.BASICS_READ);
         EmailMaintainVo vo = new EmailMaintainVo();
@@ -132,6 +136,22 @@ public class EmailMaintainController extends AbstractController  {
         return ResponseEntity.ok(R.error());
     }
 
+    /**
+     * 编辑数据
+     *
+     * @param id id
+     * @return 删除结果
+     */
+    @PostMapping("/delete")
+    public ResponseEntity<R> delete(@RequestParam String id) {
+        DynamicContextHolder.push(DbConstant.BASICS_READ);
+        boolean b = emailMaintainService.deleteById(id);
+        if(b){
+            return ResponseEntity.ok(R.ok());
+        }
+        return ResponseEntity.ok(R.error());
+    }
+
 
     /**
      * 编辑数据