From 5b1ec9b151e3faa3ce9b6db47d90fbb56fd399b2 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 25 Feb 2021 16:04:04 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F,email?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml                               |  42 +--
 .../base/mapper/ext/ExtUserMapper.java        |   3 +
 .../base/mapper/ext/ExtUserMapper.xml         |  12 +
 .../commons/constants/ParamConstants.java     |   1 +
 .../controller/SystemParameterController.java |  69 +++++
 .../io/dataease/dto/SystemParameterDTO.java   |  28 ++
 .../notice/controller/NoticeController.java   |  36 +++
 .../controller/request/MessageRequest.java    |  11 +
 .../java/io/dataease/notice/domain/Mail.java  |  18 ++
 .../io/dataease/notice/domain/MailInfo.java   |  15 +
 .../dataease/notice/domain/MessageDetail.java |  21 ++
 .../notice/domain/MessageSettingDetail.java   |  13 +
 .../io/dataease/notice/domain/UserDetail.java |   9 +
 .../dataease/notice/message/LinkMessage.java  |  45 +++
 .../io/dataease/notice/message/Message.java   |   5 +
 .../dataease/notice/message/TextMessage.java  |  64 +++++
 .../notice/sender/AbstractNoticeSender.java   | 150 ++++++++++
 .../dataease/notice/sender/NoticeModel.java   |  51 ++++
 .../dataease/notice/sender/NoticeSender.java  |   9 +
 .../notice/sender/impl/DingNoticeSender.java  |  47 +++
 .../notice/sender/impl/MailNoticeSender.java  |  50 ++++
 .../notice/sender/impl/WeComNoticeSender.java |  39 +++
 .../dataease/notice/service/MailService.java  |  79 +++++
 .../notice/service/NoticeSendService.java     |  65 +++++
 .../notice/service/NoticeService.java         | 160 +++++++++++
 .../io/dataease/notice/util/SendResult.java   |  47 +++
 .../dataease/notice/util/WxChatbotClient.java |  50 ++++
 .../dataease/service/BaseDisplayService.java  |  10 +-
 .../java/io/dataease/service/FileService.java |   6 +-
 .../java/io/dataease/service/UserService.java |  10 +
 .../system/SystemParameterService.java        | 269 ++++++++++++++++++
 frontend/src/assets/favicon.ico               | Bin 0 -> 109986 bytes
 .../business/components/settings/router.js    |  10 +-
 .../settings/system/BaseSetting.vue           | 223 ++++++++++-----
 .../system/SystemParameterSetting.vue         |  20 +-
 .../components/settings/system/UiSetting.vue  | 265 +++++++++++++++++
 frontend/src/business/index.html              |   2 +-
 frontend/src/i18n/en-US.js                    |  14 +-
 frontend/src/i18n/zh-CN.js                    |  14 +-
 frontend/src/i18n/zh-TW.js                    |  14 +-
 frontend/src/login/login.html                 |   2 +-
 41 files changed, 1872 insertions(+), 126 deletions(-)
 create mode 100644 backend/src/main/java/io/dataease/controller/SystemParameterController.java
 create mode 100644 backend/src/main/java/io/dataease/dto/SystemParameterDTO.java
 create mode 100644 backend/src/main/java/io/dataease/notice/controller/NoticeController.java
 create mode 100644 backend/src/main/java/io/dataease/notice/controller/request/MessageRequest.java
 create mode 100644 backend/src/main/java/io/dataease/notice/domain/Mail.java
 create mode 100644 backend/src/main/java/io/dataease/notice/domain/MailInfo.java
 create mode 100644 backend/src/main/java/io/dataease/notice/domain/MessageDetail.java
 create mode 100644 backend/src/main/java/io/dataease/notice/domain/MessageSettingDetail.java
 create mode 100644 backend/src/main/java/io/dataease/notice/domain/UserDetail.java
 create mode 100644 backend/src/main/java/io/dataease/notice/message/LinkMessage.java
 create mode 100644 backend/src/main/java/io/dataease/notice/message/Message.java
 create mode 100644 backend/src/main/java/io/dataease/notice/message/TextMessage.java
 create mode 100644 backend/src/main/java/io/dataease/notice/sender/AbstractNoticeSender.java
 create mode 100644 backend/src/main/java/io/dataease/notice/sender/NoticeModel.java
 create mode 100644 backend/src/main/java/io/dataease/notice/sender/NoticeSender.java
 create mode 100644 backend/src/main/java/io/dataease/notice/sender/impl/DingNoticeSender.java
 create mode 100644 backend/src/main/java/io/dataease/notice/sender/impl/MailNoticeSender.java
 create mode 100644 backend/src/main/java/io/dataease/notice/sender/impl/WeComNoticeSender.java
 create mode 100644 backend/src/main/java/io/dataease/notice/service/MailService.java
 create mode 100644 backend/src/main/java/io/dataease/notice/service/NoticeSendService.java
 create mode 100644 backend/src/main/java/io/dataease/notice/service/NoticeService.java
 create mode 100644 backend/src/main/java/io/dataease/notice/util/SendResult.java
 create mode 100644 backend/src/main/java/io/dataease/notice/util/WxChatbotClient.java
 create mode 100644 backend/src/main/java/io/dataease/service/system/SystemParameterService.java
 create mode 100644 frontend/src/assets/favicon.ico
 create mode 100644 frontend/src/business/components/settings/system/UiSetting.vue

diff --git a/backend/pom.xml b/backend/pom.xml
index 3f4ead7d7b..75d4e1b0fe 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -372,27 +372,27 @@
                     <skipTests>true</skipTests>
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-clean-plugin</artifactId>
-                <configuration>
-                    <filesets>
-                        <fileset>
-                            <directory>src/main/resources/static</directory>
-                            <includes>
-                                <include>**</include>
-                            </includes>
-                            <followSymlinks>false</followSymlinks>
-                        </fileset>
-                        <fileset>
-                            <directory>src/main/resources/templates</directory>
-                            <includes>
-                                <include>**</include>
-                            </includes>
-                            <followSymlinks>false</followSymlinks>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>
+<!--            <plugin>-->
+<!--                <artifactId>maven-clean-plugin</artifactId>-->
+<!--                <configuration>-->
+<!--                    <filesets>-->
+<!--                        <fileset>-->
+<!--                            <directory>src/main/resources/static</directory>-->
+<!--                            <includes>-->
+<!--                                <include>**</include>-->
+<!--                            </includes>-->
+<!--                            <followSymlinks>false</followSymlinks>-->
+<!--                        </fileset>-->
+<!--                        <fileset>-->
+<!--                            <directory>src/main/resources/templates</directory>-->
+<!--                            <includes>-->
+<!--                                <include>**</include>-->
+<!--                            </includes>-->
+<!--                            <followSymlinks>false</followSymlinks>-->
+<!--                        </fileset>-->
+<!--                    </filesets>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtUserMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtUserMapper.java
index 65b40968fd..c3dd55176b 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtUserMapper.java
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtUserMapper.java
@@ -2,6 +2,7 @@ package io.dataease.base.mapper.ext;
 
 import io.dataease.base.domain.User;
 import io.dataease.controller.request.UserRequest;
+import io.dataease.notice.domain.UserDetail;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 
@@ -18,6 +19,8 @@ public interface ExtUserMapper {
 
     List<User> searchUser(String condition);
 
+    List<UserDetail> queryTypeByIds(List<String> userIds);
+
     @MapKey("id")
     Map<String, User> queryNameByIds(List<String> userIds);
 }
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtUserMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtUserMapper.xml
index a2672df779..8bc896e0dd 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtUserMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtUserMapper.xml
@@ -16,6 +16,18 @@
         <result column="phone" jdbcType="VARCHAR" property="phone"/>
     </resultMap>
 
+    <select id="queryTypeByIds" parameterType="java.lang.String" resultType="io.dataease.notice.domain.UserDetail">
+        SELECT
+        email,phone
+        from user
+        WHERE id IN
+        <foreach collection="list" item="id" index="index"
+                 open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+
+    </select>
+
     <select id="getUserList" resultMap="BaseResultMap">
         select u.id, u.name, u.email, u.phone, u.language, u.status, u.source,
         u.last_organization_id, u.last_workspace_id, u.language, u.create_time, u.update_time
diff --git a/backend/src/main/java/io/dataease/commons/constants/ParamConstants.java b/backend/src/main/java/io/dataease/commons/constants/ParamConstants.java
index dcac704f1c..f075b5149c 100644
--- a/backend/src/main/java/io/dataease/commons/constants/ParamConstants.java
+++ b/backend/src/main/java/io/dataease/commons/constants/ParamConstants.java
@@ -31,6 +31,7 @@ public interface ParamConstants {
         MAIL("smtp"),
         BASE("base"),
         LDAP("ldap"),
+        UI("ui"),
         REGISTRY("registry");
 
         private String value;
diff --git a/backend/src/main/java/io/dataease/controller/SystemParameterController.java b/backend/src/main/java/io/dataease/controller/SystemParameterController.java
new file mode 100644
index 0000000000..bb599725cc
--- /dev/null
+++ b/backend/src/main/java/io/dataease/controller/SystemParameterController.java
@@ -0,0 +1,69 @@
+package io.dataease.controller;
+
+import io.dataease.base.domain.SystemParameter;
+import io.dataease.commons.constants.ParamConstants;
+import io.dataease.commons.constants.RoleConstants;
+import io.dataease.dto.BaseSystemConfigDTO;
+import io.dataease.dto.SystemParameterDTO;
+import io.dataease.notice.domain.MailInfo;
+import io.dataease.service.system.SystemParameterService;
+import org.apache.shiro.authz.annotation.RequiresRoles;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping(value = "/system")
+public class SystemParameterController {
+    @Resource
+    private SystemParameterService systemParameterService;
+
+    @PostMapping("/edit/email")
+    @RequiresRoles(value = {RoleConstants.ADMIN})
+    public void editMail(@RequestBody List<SystemParameter> systemParameter) {
+        systemParameterService.editMail(systemParameter);
+    }
+
+    @PostMapping("/testConnection")
+    @RequiresRoles(value = {RoleConstants.ADMIN})
+    public void testConnection(@RequestBody HashMap<String, String> hashMap) {
+        systemParameterService.testConnection(hashMap);
+    }
+
+    @GetMapping("/version")
+    public String getVersion() {
+        return systemParameterService.getVersion();
+    }
+
+    @GetMapping("/mail/info")
+    @RequiresRoles(value = {RoleConstants.ADMIN})
+    public MailInfo mailInfo() {
+        return systemParameterService.mailInfo(ParamConstants.Classify.MAIL.getValue());
+    }
+
+
+    @GetMapping("/base/info")
+    @RequiresRoles(value = {RoleConstants.ADMIN})
+    public List<SystemParameterDTO> getBaseInfo () {
+        return systemParameterService.getSystemParameterInfo(ParamConstants.Classify.BASE.getValue());
+    }
+
+    @GetMapping("/ui/info")
+    @RequiresRoles(value = {RoleConstants.ADMIN})
+    public List<SystemParameterDTO> getDisplayInfo () {
+        return systemParameterService.getSystemParameterInfo(ParamConstants.Classify.UI.getValue());
+    }
+
+    @PostMapping(value="/save/ui", consumes = {"multipart/form-data"})
+    @RequiresRoles(value = {RoleConstants.ADMIN})
+    public void saveUIInfo (@RequestPart("request") Map<String,List<SystemParameterDTO>> systemParameterMap,@RequestPart(value = "files") List<MultipartFile> bodyFiles) throws IOException {
+        systemParameterService.saveUIInfo(systemParameterMap,bodyFiles);
+    }
+
+
+}
diff --git a/backend/src/main/java/io/dataease/dto/SystemParameterDTO.java b/backend/src/main/java/io/dataease/dto/SystemParameterDTO.java
new file mode 100644
index 0000000000..9624d046b8
--- /dev/null
+++ b/backend/src/main/java/io/dataease/dto/SystemParameterDTO.java
@@ -0,0 +1,28 @@
+package io.dataease.dto;
+
+import io.dataease.base.domain.SystemParameter;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.web.multipart.MultipartFile;
+
+public class SystemParameterDTO extends SystemParameter {
+    @ApiModelProperty("文件")
+    private MultipartFile file;
+    @ApiModelProperty("文件名称")
+    private String fileName;
+
+    public MultipartFile getFile() {
+        return file;
+    }
+
+    public void setFile(MultipartFile file) {
+        this.file = file;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+}
diff --git a/backend/src/main/java/io/dataease/notice/controller/NoticeController.java b/backend/src/main/java/io/dataease/notice/controller/NoticeController.java
new file mode 100644
index 0000000000..05ab59215c
--- /dev/null
+++ b/backend/src/main/java/io/dataease/notice/controller/NoticeController.java
@@ -0,0 +1,36 @@
+package io.dataease.notice.controller;
+
+import io.dataease.notice.domain.MessageDetail;
+import io.dataease.notice.service.NoticeService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@RequestMapping("notice")
+public class NoticeController {
+    @Resource
+    private NoticeService noticeService;
+
+    @PostMapping("save/message/task")
+    public void saveMessage(@RequestBody MessageDetail messageDetail) {
+        noticeService.saveMessageTask(messageDetail);
+    }
+
+    @GetMapping("/search/message/type/{type}")
+    public List<MessageDetail> searchMessage(@PathVariable String type) {
+        return noticeService.searchMessageByType(type);
+    }
+
+    @GetMapping("/search/message/{testId}")
+    public List<MessageDetail> searchMessageSchedule(@PathVariable String testId) {
+        return noticeService.searchMessageByTestId(testId);
+    }
+
+    @GetMapping("/delete/message/{identification}")
+    public int deleteMessage(@PathVariable String identification) {
+        return noticeService.delMessage(identification);
+    }
+}
+
diff --git a/backend/src/main/java/io/dataease/notice/controller/request/MessageRequest.java b/backend/src/main/java/io/dataease/notice/controller/request/MessageRequest.java
new file mode 100644
index 0000000000..b6642a8657
--- /dev/null
+++ b/backend/src/main/java/io/dataease/notice/controller/request/MessageRequest.java
@@ -0,0 +1,11 @@
+package io.dataease.notice.controller.request;
+
+import io.dataease.notice.domain.MessageDetail;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class MessageRequest {
+    private List<MessageDetail> messageDetail;
+}
diff --git a/backend/src/main/java/io/dataease/notice/domain/Mail.java b/backend/src/main/java/io/dataease/notice/domain/Mail.java
new file mode 100644
index 0000000000..309bbe1368
--- /dev/null
+++ b/backend/src/main/java/io/dataease/notice/domain/Mail.java
@@ -0,0 +1,18 @@
+package io.dataease.notice.domain;
+
+import lombok.Data;
+
+@Data
+public class Mail {
+    // 发送给谁
+    private String to;
+
+    // 发送主题
+    private String subject;
+
+    // 发送内容
+    private String content;
+
+    // 附件地址
+    private String filePath;
+}
diff --git a/backend/src/main/java/io/dataease/notice/domain/MailInfo.java b/backend/src/main/java/io/dataease/notice/domain/MailInfo.java
new file mode 100644
index 0000000000..d2f942a125
--- /dev/null
+++ b/backend/src/main/java/io/dataease/notice/domain/MailInfo.java
@@ -0,0 +1,15 @@
+package io.dataease.notice.domain;
+
+import lombok.Data;
+
+@Data
+public class MailInfo {
+    private String host;
+    private String port;
+    private String account;
+    private String password;
+    private String ssl;
+    private String tls;
+    private String recipient;
+
+}
diff --git a/backend/src/main/java/io/dataease/notice/domain/MessageDetail.java b/backend/src/main/java/io/dataease/notice/domain/MessageDetail.java
new file mode 100644
index 0000000000..96d0a7d572
--- /dev/null
+++ b/backend/src/main/java/io/dataease/notice/domain/MessageDetail.java
@@ -0,0 +1,21 @@
+package io.dataease.notice.domain;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class MessageDetail {
+    private List<String> userIds = new ArrayList<>();
+    private String event;
+    private String taskType;
+    private String webhook;
+    private String type;
+    private String identification;
+    private String organizationId;
+    private Boolean isSet;
+    private String testId;
+    private Long createTime;
+    private String template;
+}
diff --git a/backend/src/main/java/io/dataease/notice/domain/MessageSettingDetail.java b/backend/src/main/java/io/dataease/notice/domain/MessageSettingDetail.java
new file mode 100644
index 0000000000..07ef6ad484
--- /dev/null
+++ b/backend/src/main/java/io/dataease/notice/domain/MessageSettingDetail.java
@@ -0,0 +1,13 @@
+package io.dataease.notice.domain;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class MessageSettingDetail {
+    private List<MessageDetail> jenkinsTask;
+    private List<MessageDetail> testCasePlanTask;
+    private List<MessageDetail> reviewTask;
+    private List<MessageDetail> defectTask;
+}
diff --git a/backend/src/main/java/io/dataease/notice/domain/UserDetail.java b/backend/src/main/java/io/dataease/notice/domain/UserDetail.java
new file mode 100644
index 0000000000..91d080b042
--- /dev/null
+++ b/backend/src/main/java/io/dataease/notice/domain/UserDetail.java
@@ -0,0 +1,9 @@
+package io.dataease.notice.domain;
+
+import lombok.Data;
+
+@Data
+public class UserDetail {
+    private  String  email;
+    private  String  phone;
+}
diff --git a/backend/src/main/java/io/dataease/notice/message/LinkMessage.java b/backend/src/main/java/io/dataease/notice/message/LinkMessage.java
new file mode 100644
index 0000000000..b2712564c8
--- /dev/null
+++ b/backend/src/main/java/io/dataease/notice/message/LinkMessage.java
@@ -0,0 +1,45 @@
+package io.dataease.notice.message;
+
+import com.alibaba.fastjson.JSON;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+public class LinkMessage implements Message {
+
+    private String title;
+    private String text;
+    private String picUrl;
+    private String messageUrl;
+
+    public String toJsonString() {
+        Map<String, Object> items = new HashMap<String, Object>();
+        items.put("msgtype", "link");
+
+        Map<String, String> linkContent = new HashMap<String, String>();
+        if (StringUtils.isBlank(title)) {
+            throw new IllegalArgumentException("title should not be blank");
+        }
+        linkContent.put("title", title);
+
+        if (StringUtils.isBlank(messageUrl)) {
+            throw new IllegalArgumentException("messageUrl should not be blank");
+        }
+        linkContent.put("messageUrl", messageUrl);
+
+        if (StringUtils.isBlank(text)) {
+            throw new IllegalArgumentException("text should not be blank");
+        }
+        linkContent.put("text", text);
+
+        if (StringUtils.isNotBlank(picUrl)) {
+            linkContent.put("picUrl", picUrl);
+        }
+
+        items.put("link", linkContent);
+
+        return JSON.toJSONString(items);
+    }
+}
diff --git a/backend/src/main/java/io/dataease/notice/message/Message.java b/backend/src/main/java/io/dataease/notice/message/Message.java
new file mode 100644
index 0000000000..5dbad90764
--- /dev/null
+++ b/backend/src/main/java/io/dataease/notice/message/Message.java
@@ -0,0 +1,5 @@
+package io.dataease.notice.message;
+
+public interface Message {
+    String toJsonString();
+}
diff --git a/backend/src/main/java/io/dataease/notice/message/TextMessage.java b/backend/src/main/java/io/dataease/notice/message/TextMessage.java
new file mode 100644
index 0000000000..91caa7e4d6
--- /dev/null
+++ b/backend/src/main/java/io/dataease/notice/message/TextMessage.java
@@ -0,0 +1,64 @@
+package io.dataease.notice.message;
+
+import com.alibaba.fastjson.JSON;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+public class TextMessage implements Message {
+    private String text;
+    private List<String> mentionedMobileList;
+    private boolean isAtAll;
+
+    public TextMessage(String text) {
+        this.text = text;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public boolean isAtAll() {
+        return isAtAll;
+    }
+
+    public void setIsAtAll(boolean isAtAll) {
+        this.isAtAll = isAtAll;
+    }
+
+    public List<String> getMentionedMobileList() {
+        return mentionedMobileList;
+    }
+
+    public void setMentionedMobileList(List<String> mentionedMobileList) {
+        this.mentionedMobileList = mentionedMobileList;
+    }
+
+    public String toJsonString() {
+        Map<String, Object> items = new HashMap<String, Object>();
+        items.put("msgtype", "text");
+
+        Map<String, Object> textContent = new HashMap<String, Object>();
+        if (StringUtils.isBlank(text)) {
+            throw new IllegalArgumentException("text should not be blank");
+        }
+        textContent.put("content", text);
+        if (isAtAll) {
+            if (mentionedMobileList == null) mentionedMobileList = new ArrayList<String>();
+            mentionedMobileList.add("@all");
+        }
+        if (mentionedMobileList != null && !mentionedMobileList.isEmpty()) {
+            textContent.put("mentioned_mobile_list", mentionedMobileList);
+        }
+        items.put("text", textContent);
+        return JSON.toJSONString(items);
+    }
+}
diff --git a/backend/src/main/java/io/dataease/notice/sender/AbstractNoticeSender.java b/backend/src/main/java/io/dataease/notice/sender/AbstractNoticeSender.java
new file mode 100644
index 0000000000..099dc84ce4
--- /dev/null
+++ b/backend/src/main/java/io/dataease/notice/sender/AbstractNoticeSender.java
@@ -0,0 +1,150 @@
+package io.dataease.notice.sender;
+
+import io.dataease.commons.constants.NoticeConstants;
+import io.dataease.commons.utils.LogUtil;
+import io.dataease.notice.domain.MessageDetail;
+import io.dataease.notice.domain.UserDetail;
+import io.dataease.service.UserService;
+import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.RegExUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public abstract class AbstractNoticeSender implements NoticeSender {
+    @Resource
+    private UserService userService;
+
+    protected String getContext(MessageDetail messageDetail, NoticeModel noticeModel) {
+        // 如果配置了模版就直接使用模版
+        if (StringUtils.isNotBlank(messageDetail.getTemplate())) {
+            return getContent(messageDetail.getTemplate(), noticeModel.getParamMap());
+        }
+        // 处理 userIds 中包含的特殊值
+        List<String> realUserIds = getRealUserIds(messageDetail.getUserIds(), noticeModel.getRelatedUsers(), messageDetail.getEvent());
+        messageDetail.setUserIds(realUserIds);
+
+        // 处理 WeCom Ding context
+        String context = "";
+        switch (messageDetail.getEvent()) {
+            case NoticeConstants.Event.CREATE:
+            case NoticeConstants.Event.UPDATE:
+            case NoticeConstants.Event.DELETE:
+            case NoticeConstants.Event.COMMENT:
+                context = noticeModel.getContext();
+                break;
+            case NoticeConstants.Event.EXECUTE_FAILED:
+                context = noticeModel.getFailedContext();
+                break;
+            case NoticeConstants.Event.EXECUTE_SUCCESSFUL:
+                context = noticeModel.getSuccessContext();
+                break;
+            default:
+                break;
+        }
+        return context;
+    }
+
+    protected String getHtmlContext(MessageDetail messageDetail, NoticeModel noticeModel) {
+        // 如果配置了模版就直接使用模版
+        if (StringUtils.isNotBlank(messageDetail.getTemplate())) {
+            return getContent(messageDetail.getTemplate(), noticeModel.getParamMap());
+        }
+        // 处理 userIds 中包含的特殊值
+        List<String> realUserIds = getRealUserIds(messageDetail.getUserIds(), noticeModel.getRelatedUsers(), messageDetail.getEvent());
+        messageDetail.setUserIds(realUserIds);
+
+        // 处理 mail context
+        String context = "";
+        try {
+            switch (messageDetail.getEvent()) {
+                case NoticeConstants.Event.CREATE:
+                case NoticeConstants.Event.UPDATE:
+                case NoticeConstants.Event.DELETE:
+                case NoticeConstants.Event.COMMENT:
+                    URL resource = this.getClass().getResource("/mail/" + noticeModel.getMailTemplate() + ".html");
+                    context = IOUtils.toString(resource, StandardCharsets.UTF_8);
+                    break;
+                case NoticeConstants.Event.EXECUTE_FAILED:
+                    URL resource1 = this.getClass().getResource("/mail/" + noticeModel.getFailedMailTemplate() + ".html");
+                    context = IOUtils.toString(resource1, StandardCharsets.UTF_8);
+                    break;
+                case NoticeConstants.Event.EXECUTE_SUCCESSFUL:
+                    URL resource2 = this.getClass().getResource("/mail/" + noticeModel.getSuccessMailTemplate() + ".html");
+                    context = IOUtils.toString(resource2, StandardCharsets.UTF_8);
+                    break;
+                default:
+                    break;
+            }
+        } catch (IOException e) {
+            LogUtil.error(e);
+        }
+        return getContent(context, noticeModel.getParamMap());
+    }
+
+    protected String getContent(String template, Map<String, Object> context) {
+        if (MapUtils.isNotEmpty(context)) {
+            for (String k : context.keySet()) {
+                if (context.get(k) != null) {
+                    template = RegExUtils.replaceAll(template, "\\$\\{" + k + "}", context.get(k).toString());
+                } else {
+                    template = RegExUtils.replaceAll(template, "\\$\\{" + k + "}", "未设置");
+                }
+            }
+        }
+        return template;
+    }
+
+    protected List<String> getUserPhones(List<String> userIds) {
+        List<UserDetail> list = userService.queryTypeByIds(userIds);
+        List<String> phoneList = new ArrayList<>();
+        list.forEach(u -> phoneList.add(u.getPhone()));
+        LogUtil.info("收件人地址: " + phoneList);
+        return phoneList.stream().distinct().collect(Collectors.toList());
+    }
+
+    protected List<String> getUserEmails(List<String> userIds) {
+        List<UserDetail> list = userService.queryTypeByIds(userIds);
+        List<String> phoneList = new ArrayList<>();
+        list.forEach(u -> phoneList.add(u.getEmail()));
+        LogUtil.info("收件人地址: " + phoneList);
+        return phoneList.stream().distinct().collect(Collectors.toList());
+    }
+
+    private List<String> getRealUserIds(List<String> userIds, List<String> relatedUsers, String event) {
+        List<String> toUserIds = new ArrayList<>();
+        for (String userId : userIds) {
+            switch (userId) {
+                case NoticeConstants.RelatedUser.EXECUTOR:
+                    if (StringUtils.equals(NoticeConstants.Event.CREATE, event)) {
+                        toUserIds.addAll(relatedUsers);
+                    }
+                    break;
+                case NoticeConstants.RelatedUser.FOUNDER:
+                    if (StringUtils.equals(NoticeConstants.Event.UPDATE, event)
+                            || StringUtils.equals(NoticeConstants.Event.DELETE, event)) {
+                        toUserIds.addAll(relatedUsers);
+                    }
+                    break;
+                case NoticeConstants.RelatedUser.MAINTAINER:
+                    if (StringUtils.equals(NoticeConstants.Event.COMMENT, event)) {
+                        toUserIds.addAll(relatedUsers);
+                    }
+                    break;
+                default:
+                    toUserIds.add(userId);
+                    break;
+            }
+        }
+
+        return toUserIds;
+    }
+}
diff --git a/backend/src/main/java/io/dataease/notice/sender/NoticeModel.java b/backend/src/main/java/io/dataease/notice/sender/NoticeModel.java
new file mode 100644
index 0000000000..2dc6f7d47a
--- /dev/null
+++ b/backend/src/main/java/io/dataease/notice/sender/NoticeModel.java
@@ -0,0 +1,51 @@
+package io.dataease.notice.sender;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+@Builder
+public class NoticeModel {
+    /**
+     * 保存 测试id
+     */
+    private String testId;
+    /**
+     * 保存状态
+     */
+    private String status;
+    /**
+     * Event
+     */
+    private String event;
+    /**
+     * 消息主题
+     */
+    private String subject;
+    /**
+     * 消息内容
+     */
+    private String context;
+    private String successContext;
+    private String failedContext;
+
+    /**
+     * html 消息模版
+     */
+    private String mailTemplate;
+    private String failedMailTemplate;
+    private String successMailTemplate;
+
+    /**
+     * 保存特殊的用户
+     */
+    private List<String> relatedUsers;
+
+    /**
+     * 模版里的参数信息
+     */
+    private Map<String, Object> paramMap;
+}
diff --git a/backend/src/main/java/io/dataease/notice/sender/NoticeSender.java b/backend/src/main/java/io/dataease/notice/sender/NoticeSender.java
new file mode 100644
index 0000000000..8958d71006
--- /dev/null
+++ b/backend/src/main/java/io/dataease/notice/sender/NoticeSender.java
@@ -0,0 +1,9 @@
+package io.dataease.notice.sender;
+
+import io.dataease.notice.domain.MessageDetail;
+import org.springframework.scheduling.annotation.Async;
+
+public interface NoticeSender {
+    @Async
+    void send(MessageDetail messageDetail, NoticeModel noticeModel);
+}
diff --git a/backend/src/main/java/io/dataease/notice/sender/impl/DingNoticeSender.java b/backend/src/main/java/io/dataease/notice/sender/impl/DingNoticeSender.java
new file mode 100644
index 0000000000..a5a42a4db3
--- /dev/null
+++ b/backend/src/main/java/io/dataease/notice/sender/impl/DingNoticeSender.java
@@ -0,0 +1,47 @@
+package io.dataease.notice.sender.impl;
+
+import com.dingtalk.api.DefaultDingTalkClient;
+import com.dingtalk.api.DingTalkClient;
+import com.dingtalk.api.request.OapiRobotSendRequest;
+import com.taobao.api.ApiException;
+import io.dataease.commons.utils.LogUtil;
+import io.dataease.notice.domain.MessageDetail;
+import io.dataease.notice.sender.AbstractNoticeSender;
+import io.dataease.notice.sender.NoticeModel;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class DingNoticeSender extends AbstractNoticeSender {
+
+    public void sendNailRobot(MessageDetail messageDetail, String context) {
+        List<String> userIds = messageDetail.getUserIds();
+        if (CollectionUtils.isEmpty(userIds)) {
+            return;
+        }
+        DingTalkClient client = new DefaultDingTalkClient(messageDetail.getWebhook());
+        OapiRobotSendRequest request = new OapiRobotSendRequest();
+        request.setMsgtype("text");
+        OapiRobotSendRequest.Text text = new OapiRobotSendRequest.Text();
+        text.setContent(context);
+        request.setText(text);
+        OapiRobotSendRequest.At at = new OapiRobotSendRequest.At();
+        List<String> phoneList = super.getUserPhones(userIds);
+        LogUtil.info("收件人地址: " + phoneList);
+        at.setAtMobiles(phoneList);
+        request.setAt(at);
+        try {
+            client.execute(request);
+        } catch (ApiException e) {
+            LogUtil.error(e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public void send(MessageDetail messageDetail, NoticeModel noticeModel) {
+        String context = super.getContext(messageDetail, noticeModel);
+        sendNailRobot(messageDetail, context);
+    }
+}
diff --git a/backend/src/main/java/io/dataease/notice/sender/impl/MailNoticeSender.java b/backend/src/main/java/io/dataease/notice/sender/impl/MailNoticeSender.java
new file mode 100644
index 0000000000..e82b56c66f
--- /dev/null
+++ b/backend/src/main/java/io/dataease/notice/sender/impl/MailNoticeSender.java
@@ -0,0 +1,50 @@
+package io.dataease.notice.sender.impl;
+
+
+import io.dataease.commons.utils.LogUtil;
+import io.dataease.notice.domain.MessageDetail;
+import io.dataease.notice.sender.AbstractNoticeSender;
+import io.dataease.notice.sender.NoticeModel;
+import io.dataease.notice.service.MailService;
+import org.springframework.mail.javamail.JavaMailSenderImpl;
+import org.springframework.mail.javamail.MimeMessageHelper;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+import java.util.List;
+
+@Component
+public class MailNoticeSender extends AbstractNoticeSender {
+    @Resource
+    private MailService mailService;
+
+    private void sendMail(MessageDetail messageDetail, String context, NoticeModel noticeModel) throws MessagingException {
+        LogUtil.info("发送邮件开始 ");
+        JavaMailSenderImpl javaMailSender = mailService.getMailSender();
+        MimeMessage mimeMessage = javaMailSender.createMimeMessage();
+        MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true);
+        helper.setFrom(javaMailSender.getUsername());
+        LogUtil.info("发件人地址"+javaMailSender.getUsername());
+        LogUtil.info("helper"+helper);
+        helper.setSubject("MeterSphere " + noticeModel.getSubject());
+        List<String> emails = super.getUserEmails(messageDetail.getUserIds());
+        String[] users = emails.toArray(new String[0]);
+        LogUtil.info("收件人地址: " + emails);
+        helper.setText(context, true);
+        helper.setTo(users);
+        javaMailSender.send(mimeMessage);
+    }
+
+    @Override
+    public void send(MessageDetail messageDetail, NoticeModel noticeModel) {
+        String context = super.getHtmlContext(messageDetail, noticeModel);
+        try {
+            sendMail(messageDetail, context, noticeModel);
+            LogUtil.info("发送邮件结束");
+        } catch (Exception e) {
+            LogUtil.error(e);
+        }
+    }
+}
diff --git a/backend/src/main/java/io/dataease/notice/sender/impl/WeComNoticeSender.java b/backend/src/main/java/io/dataease/notice/sender/impl/WeComNoticeSender.java
new file mode 100644
index 0000000000..1bd43b5664
--- /dev/null
+++ b/backend/src/main/java/io/dataease/notice/sender/impl/WeComNoticeSender.java
@@ -0,0 +1,39 @@
+package io.dataease.notice.sender.impl;
+
+import io.dataease.notice.sender.AbstractNoticeSender;
+import io.dataease.commons.utils.LogUtil;
+import io.dataease.notice.domain.MessageDetail;
+import io.dataease.notice.message.TextMessage;
+import io.dataease.notice.sender.NoticeModel;
+import io.dataease.notice.util.WxChatbotClient;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.List;
+
+@Component
+public class WeComNoticeSender extends AbstractNoticeSender {
+
+
+    public void sendWechatRobot(MessageDetail messageDetail, String context) {
+        List<String> userIds = messageDetail.getUserIds();
+        if (CollectionUtils.isEmpty(userIds)) {
+            return;
+        }
+        TextMessage message = new TextMessage(context);
+        List<String> phoneLists = super.getUserPhones(userIds);
+        message.setMentionedMobileList(phoneLists);
+        try {
+            WxChatbotClient.send(messageDetail.getWebhook(), message);
+        } catch (IOException e) {
+            LogUtil.error(e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public void send(MessageDetail messageDetail, NoticeModel noticeModel) {
+        String context = super.getContext(messageDetail, noticeModel);
+        sendWechatRobot(messageDetail, context);
+    }
+}
diff --git a/backend/src/main/java/io/dataease/notice/service/MailService.java b/backend/src/main/java/io/dataease/notice/service/MailService.java
new file mode 100644
index 0000000000..bd33b23f25
--- /dev/null
+++ b/backend/src/main/java/io/dataease/notice/service/MailService.java
@@ -0,0 +1,79 @@
+package io.dataease.notice.service;
+
+import io.dataease.base.domain.SystemParameter;
+import io.dataease.commons.constants.ParamConstants;
+import io.dataease.commons.utils.EncryptUtils;
+import io.dataease.service.system.SystemParameterService;
+import org.apache.commons.lang3.BooleanUtils;
+import org.springframework.mail.javamail.JavaMailSenderImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Properties;
+
+@Service
+@Transactional(propagation = Propagation.NOT_SUPPORTED)
+public class MailService {
+    @Resource
+    private SystemParameterService systemParameterService;
+
+    public JavaMailSenderImpl getMailSender() {
+        Properties props = new Properties();
+        JavaMailSenderImpl javaMailSender = new JavaMailSenderImpl();
+        List<SystemParameter> paramList = systemParameterService.getParamList(ParamConstants.Classify.MAIL.getValue());
+        javaMailSender.setDefaultEncoding("UTF-8");
+        javaMailSender.setProtocol("smtp");
+        props.put("mail.smtp.auth", "true");
+
+        for (SystemParameter p : paramList) {
+            switch (p.getParamKey()) {
+                case "smtp.host":
+                    javaMailSender.setHost(p.getParamValue());
+                    break;
+                case "smtp.port":
+                    javaMailSender.setPort(Integer.parseInt(p.getParamValue()));
+                    break;
+                case "smtp.account":
+                    javaMailSender.setUsername(p.getParamValue());
+                    break;
+                case "smtp.password":
+                    javaMailSender.setPassword(EncryptUtils.aesDecrypt(p.getParamValue()).toString());
+                    break;
+                case "smtp.ssl":
+                    if (BooleanUtils.toBoolean(p.getParamValue())) {
+                        javaMailSender.setProtocol("smtps");
+                        props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
+                    }
+                    break;
+                case "smtp.tls":
+                    String result = BooleanUtils.toString(BooleanUtils.toBoolean(p.getParamValue()), "true", "false");
+                    props.put("mail.smtp.starttls.enable", result);
+                    props.put("mail.smtp.starttls.required", result);
+                    break;
+             /*   case "smtp.anon":
+                    boolean isAnon = BooleanUtils.toBoolean(p.getParamValue());
+                    if (isAnon) {
+                        props.put("mail.smtp.auth", "false");
+                        javaMailSender.setUsername(null);
+                        javaMailSender.setPassword(null);
+                    }
+                    break;*/
+                default:
+                    break;
+            }
+        }
+
+        props.put("mail.smtp.timeout", "30000");
+        props.put("mail.smtp.connectiontimeout", "5000");
+        javaMailSender.setJavaMailProperties(props);
+        return javaMailSender;
+    }
+}
+
+
+
+
+
diff --git a/backend/src/main/java/io/dataease/notice/service/NoticeSendService.java b/backend/src/main/java/io/dataease/notice/service/NoticeSendService.java
new file mode 100644
index 0000000000..68600a01e1
--- /dev/null
+++ b/backend/src/main/java/io/dataease/notice/service/NoticeSendService.java
@@ -0,0 +1,65 @@
+package io.dataease.notice.service;
+
+import com.alibaba.nacos.client.utils.StringUtils;
+import io.dataease.commons.constants.NoticeConstants;
+import io.dataease.notice.domain.MessageDetail;
+import io.dataease.notice.sender.NoticeModel;
+import io.dataease.notice.sender.NoticeSender;
+import io.dataease.notice.sender.impl.DingNoticeSender;
+import io.dataease.notice.sender.impl.MailNoticeSender;
+import io.dataease.notice.sender.impl.WeComNoticeSender;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Component
+public class NoticeSendService {
+    @Resource
+    private MailNoticeSender mailNoticeSender;
+    @Resource
+    private WeComNoticeSender weComNoticeSender;
+    @Resource
+    private DingNoticeSender dingNoticeSender;
+    @Resource
+    private NoticeService noticeService;
+
+    private NoticeSender getNoticeSender(MessageDetail messageDetail) {
+        NoticeSender noticeSender = null;
+        switch (messageDetail.getType()) {
+            case NoticeConstants.Type.EMAIL:
+                noticeSender = mailNoticeSender;
+                break;
+            case NoticeConstants.Type.WECHAT_ROBOT:
+                noticeSender = weComNoticeSender;
+                break;
+            case NoticeConstants.Type.NAIL_ROBOT:
+                noticeSender = dingNoticeSender;
+                break;
+            default:
+                break;
+        }
+
+        return noticeSender;
+    }
+
+    public void send(String taskType, NoticeModel noticeModel) {
+        List<MessageDetail> messageDetails;
+        switch (taskType) {
+            case NoticeConstants.Mode.API:
+                messageDetails = noticeService.searchMessageByType(NoticeConstants.TaskType.JENKINS_TASK);
+                break;
+            case NoticeConstants.Mode.SCHEDULE:
+                messageDetails = noticeService.searchMessageByTestId(noticeModel.getTestId());
+                break;
+            default:
+                messageDetails = noticeService.searchMessageByType(taskType);
+                break;
+        }
+        messageDetails.forEach(messageDetail -> {
+            if (StringUtils.equals(messageDetail.getEvent(), noticeModel.getEvent())) {
+                this.getNoticeSender(messageDetail).send(messageDetail, noticeModel);
+            }
+        });
+    }
+}
diff --git a/backend/src/main/java/io/dataease/notice/service/NoticeService.java b/backend/src/main/java/io/dataease/notice/service/NoticeService.java
new file mode 100644
index 0000000000..e7c2a8d027
--- /dev/null
+++ b/backend/src/main/java/io/dataease/notice/service/NoticeService.java
@@ -0,0 +1,160 @@
+package io.dataease.notice.service;
+
+import io.dataease.base.domain.MessageTask;
+import io.dataease.base.domain.MessageTaskExample;
+import io.dataease.base.mapper.MessageTaskMapper;
+import io.dataease.commons.exception.DEException;
+import io.dataease.commons.user.SessionUser;
+import io.dataease.commons.utils.SessionUtils;
+import io.dataease.i18n.Translator;
+import io.dataease.notice.domain.MessageDetail;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class NoticeService {
+    @Resource
+    private MessageTaskMapper messageTaskMapper;
+
+    public void saveMessageTask(MessageDetail messageDetail) {
+        MessageTaskExample example = new MessageTaskExample();
+        example.createCriteria().andIdentificationEqualTo(messageDetail.getIdentification());
+        List<MessageTask> messageTaskLists = messageTaskMapper.selectByExample(example);
+        if (messageTaskLists.size() > 0) {
+            delMessage(messageDetail.getIdentification());
+        }
+        SessionUser user = SessionUtils.getUser();
+        String orgId = user.getLastOrganizationId();
+        long time = System.currentTimeMillis();
+        String identification = messageDetail.getIdentification();
+        if (StringUtils.isBlank(identification)) {
+            identification = UUID.randomUUID().toString();
+        }
+        for (String userId : messageDetail.getUserIds()) {
+            checkUserIdExist(userId, messageDetail, orgId);
+            MessageTask messageTask = new MessageTask();
+            messageTask.setId(UUID.randomUUID().toString());
+            messageTask.setEvent(messageDetail.getEvent());
+            messageTask.setTaskType(messageDetail.getTaskType());
+            messageTask.setUserId(userId);
+            messageTask.setType(messageDetail.getType());
+            messageTask.setWebhook(messageDetail.getWebhook());
+            messageTask.setIdentification(identification);
+            messageTask.setIsSet(false);
+            messageTask.setOrganizationId(orgId);
+            messageTask.setTestId(messageDetail.getTestId());
+            messageTask.setCreateTime(time);
+            setTemplate(messageDetail, messageTask);
+            messageTaskMapper.insert(messageTask);
+        }
+    }
+
+    private void setTemplate(MessageDetail messageDetail, MessageTask messageTask) {
+        if (StringUtils.isNotBlank(messageDetail.getTemplate())) {
+            messageTask.setTemplate(messageDetail.getTemplate());
+        }
+    }
+
+    private void checkUserIdExist(String userId, MessageDetail list, String orgId) {
+        MessageTaskExample example = new MessageTaskExample();
+        if (StringUtils.isBlank(list.getTestId())) {
+            example.createCriteria()
+                    .andUserIdEqualTo(userId)
+                    .andEventEqualTo(list.getEvent())
+                    .andTypeEqualTo(list.getType())
+                    .andTaskTypeEqualTo(list.getTaskType())
+                    .andWebhookEqualTo(list.getWebhook())
+                    .andOrganizationIdEqualTo(orgId);
+        } else {
+            example.createCriteria()
+                    .andUserIdEqualTo(userId)
+                    .andEventEqualTo(list.getEvent())
+                    .andTypeEqualTo(list.getType())
+                    .andTaskTypeEqualTo(list.getTaskType())
+                    .andWebhookEqualTo(list.getWebhook())
+                    .andTestIdEqualTo(list.getTestId())
+                    .andOrganizationIdEqualTo(orgId);
+        }
+        if (messageTaskMapper.countByExample(example) > 0) {
+            DEException.throwException(Translator.get("message_task_already_exists"));
+        }
+    }
+
+    public List<MessageDetail> searchMessageByTestId(String testId) {
+        MessageTaskExample example = new MessageTaskExample();
+        example.createCriteria().andTestIdEqualTo(testId);
+        List<MessageTask> messageTaskLists = messageTaskMapper.selectByExampleWithBLOBs(example);
+        List<MessageDetail> scheduleMessageTask = new ArrayList<>();
+        Map<String, List<MessageTask>> MessageTaskMap = messageTaskLists.stream().collect(Collectors.groupingBy(MessageTask::getIdentification));
+        MessageTaskMap.forEach((k, v) -> {
+            MessageDetail messageDetail = getMessageDetail(v);
+            scheduleMessageTask.add(messageDetail);
+        });
+        scheduleMessageTask.sort(Comparator.comparing(MessageDetail::getCreateTime, Comparator.nullsLast(Long::compareTo)).reversed());
+        return scheduleMessageTask;
+    }
+
+    public List<MessageDetail> searchMessageByType(String type) {
+        SessionUser user = SessionUtils.getUser();
+        String orgId = user.getLastOrganizationId();
+        List<MessageDetail> messageDetails = new ArrayList<>();
+
+        MessageTaskExample example = new MessageTaskExample();
+        example.createCriteria()
+                .andTaskTypeEqualTo(type)
+                .andOrganizationIdEqualTo(orgId);
+        List<MessageTask> messageTaskLists = messageTaskMapper.selectByExampleWithBLOBs(example);
+
+        Map<String, List<MessageTask>> messageTaskMap = messageTaskLists.stream()
+                .collect(Collectors.groupingBy(NoticeService::fetchGroupKey));
+        messageTaskMap.forEach((k, v) -> {
+            MessageDetail messageDetail = getMessageDetail(v);
+            messageDetails.add(messageDetail);
+        });
+
+        return messageDetails.stream()
+                .sorted(Comparator.comparing(MessageDetail::getCreateTime, Comparator.nullsLast(Long::compareTo)).reversed())
+                .collect(Collectors.toList())
+                .stream()
+                .distinct()
+                .collect(Collectors.toList());
+    }
+
+    private MessageDetail getMessageDetail(List<MessageTask> messageTasks) {
+        Set<String> userIds = new HashSet<>();
+
+        MessageDetail messageDetail = new MessageDetail();
+        for (MessageTask m : messageTasks) {
+            userIds.add(m.getUserId());
+            messageDetail.setEvent(m.getEvent());
+            messageDetail.setTaskType(m.getTaskType());
+            messageDetail.setWebhook(m.getWebhook());
+            messageDetail.setIdentification(m.getIdentification());
+            messageDetail.setType(m.getType());
+            messageDetail.setIsSet(m.getIsSet());
+            messageDetail.setCreateTime(m.getCreateTime());
+            messageDetail.setTemplate(m.getTemplate());
+        }
+        if (CollectionUtils.isNotEmpty(userIds)) {
+            messageDetail.setUserIds(new ArrayList<>(userIds));
+        }
+        return messageDetail;
+    }
+
+    private static String fetchGroupKey(MessageTask messageTask) {
+        return messageTask.getTaskType() + "#" + messageTask.getIdentification();
+    }
+
+    public int delMessage(String identification) {
+        MessageTaskExample example = new MessageTaskExample();
+        example.createCriteria().andIdentificationEqualTo(identification);
+        return messageTaskMapper.deleteByExample(example);
+    }
+}
diff --git a/backend/src/main/java/io/dataease/notice/util/SendResult.java b/backend/src/main/java/io/dataease/notice/util/SendResult.java
new file mode 100644
index 0000000000..6b154bdd3a
--- /dev/null
+++ b/backend/src/main/java/io/dataease/notice/util/SendResult.java
@@ -0,0 +1,47 @@
+package io.dataease.notice.util;
+
+import com.alibaba.fastjson.JSON;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ */
+public class SendResult {
+    private boolean isSuccess;
+    private Integer errorCode;
+    private String errorMsg;
+
+    public boolean isSuccess() {
+        return isSuccess;
+    }
+
+    public void setIsSuccess(boolean isSuccess) {
+        this.isSuccess = isSuccess;
+    }
+
+    public Integer getErrorCode() {
+        return errorCode;
+    }
+
+    public void setErrorCode(Integer errorCode) {
+        this.errorCode = errorCode;
+    }
+
+    public String getErrorMsg() {
+        return errorMsg;
+    }
+
+    public void setErrorMsg(String errorMsg) {
+        this.errorMsg = errorMsg;
+    }
+
+    public String toString() {
+        Map<String, Object> items = new HashMap<String, Object>();
+        items.put("errorCode", errorCode);
+        items.put("errorMsg", errorMsg);
+        items.put("isSuccess", isSuccess);
+        return JSON.toJSONString(items);
+    }
+}
diff --git a/backend/src/main/java/io/dataease/notice/util/WxChatbotClient.java b/backend/src/main/java/io/dataease/notice/util/WxChatbotClient.java
new file mode 100644
index 0000000000..192e9c42e1
--- /dev/null
+++ b/backend/src/main/java/io/dataease/notice/util/WxChatbotClient.java
@@ -0,0 +1,50 @@
+package io.dataease.notice.util;
+
+import com.alibaba.fastjson.JSONObject;
+import io.dataease.notice.message.Message;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+
+import java.io.IOException;
+
+/**
+ *
+ */
+public class WxChatbotClient {
+
+    static HttpClient httpclient = HttpClients.createDefault();
+
+    public static SendResult send(String webhook, Message message) throws IOException {
+
+        if (StringUtils.isBlank(webhook)) {
+            return new SendResult();
+        }
+        HttpPost httppost = new HttpPost(webhook);
+        httppost.addHeader("Content-Type", "application/json; charset=utf-8");
+        StringEntity se = new StringEntity(message.toJsonString(), "utf-8");
+        httppost.setEntity(se);
+
+        SendResult sendResult = new SendResult();
+        HttpResponse response = httpclient.execute(httppost);
+        if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+            String result = EntityUtils.toString(response.getEntity());
+            JSONObject obj = JSONObject.parseObject(result);
+
+            Integer errcode = obj.getInteger("errcode");
+            sendResult.setErrorCode(errcode);
+            sendResult.setErrorMsg(obj.getString("errmsg"));
+            sendResult.setIsSuccess(errcode.equals(0));
+        }
+
+        return sendResult;
+    }
+
+}
+
+
diff --git a/backend/src/main/java/io/dataease/service/BaseDisplayService.java b/backend/src/main/java/io/dataease/service/BaseDisplayService.java
index c1510ab6c7..54d5775ac7 100644
--- a/backend/src/main/java/io/dataease/service/BaseDisplayService.java
+++ b/backend/src/main/java/io/dataease/service/BaseDisplayService.java
@@ -48,15 +48,19 @@ public class BaseDisplayService {
         if (bytes == null) {
             PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(getClass().getClassLoader());
             switch (imageName) {
+                case "favicon":
+                    bytes = IOUtils.toByteArray(resolver.getResources("/static/img/favicon.ico")[0].getInputStream());
+                    contentType = MediaType.valueOf("image/vnd.microsoft.icon");
+                    break;
                 case "logo":
-                    bytes = IOUtils.toByteArray(resolver.getResources("/static/img/logo-light-MeterSphere.*.svg")[0].getInputStream());
+                    bytes = IOUtils.toByteArray(resolver.getResources("/static/img/logo-light-MeterSphere*.svg")[0].getInputStream());
                     contentType = MediaType.valueOf("image/svg+xml");
                     break;
                 case "loginImage":
-                    bytes = IOUtils.toByteArray(resolver.getResources("/static/img/info.*.png")[0].getInputStream());
+                    bytes = IOUtils.toByteArray(resolver.getResources("/static/img/info*.png")[0].getInputStream());
                     break;
                 case "loginLogo":
-                    bytes = IOUtils.toByteArray(resolver.getResources("/static/img/logo-dark-MeterSphere.*.svg")[0].getInputStream());
+                    bytes = IOUtils.toByteArray(resolver.getResources("/static/img/logo-dark-MeterSphere*.svg")[0].getInputStream());
                     contentType = MediaType.valueOf("image/svg+xml");
                     break;
                 default:
diff --git a/backend/src/main/java/io/dataease/service/FileService.java b/backend/src/main/java/io/dataease/service/FileService.java
index da799316cc..f2e8508a9a 100644
--- a/backend/src/main/java/io/dataease/service/FileService.java
+++ b/backend/src/main/java/io/dataease/service/FileService.java
@@ -85,9 +85,13 @@ public class FileService {
     }
 
     public FileMetadata saveFile(MultipartFile file) {
+        return saveFile(file,file.getOriginalFilename());
+    }
+
+    public FileMetadata saveFile(MultipartFile file,String originalFilename) {
         final FileMetadata fileMetadata = new FileMetadata();
         fileMetadata.setId(UUID.randomUUID().toString());
-        fileMetadata.setName(file.getOriginalFilename());
+        fileMetadata.setName(originalFilename);
         fileMetadata.setSize(file.getSize());
         fileMetadata.setCreateTime(System.currentTimeMillis());
         fileMetadata.setUpdateTime(System.currentTimeMillis());
diff --git a/backend/src/main/java/io/dataease/service/UserService.java b/backend/src/main/java/io/dataease/service/UserService.java
index 40cbed9078..133abfa8ec 100644
--- a/backend/src/main/java/io/dataease/service/UserService.java
+++ b/backend/src/main/java/io/dataease/service/UserService.java
@@ -23,6 +23,7 @@ import io.dataease.controller.request.organization.QueryOrgMemberRequest;
 import io.dataease.dto.UserDTO;
 import io.dataease.dto.UserRoleDTO;
 import io.dataease.i18n.Translator;
+import io.dataease.notice.domain.UserDetail;
 import io.dataease.security.MsUserToken;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
@@ -63,6 +64,15 @@ public class UserService {
     @Resource
     private WorkspaceService workspaceService;
 
+    public List<UserDetail> queryTypeByIds(List<String> userIds) {
+        return extUserMapper.queryTypeByIds(userIds);
+    }
+
+    public Map<String, User> queryNameByIds(List<String> userIds) {
+        return extUserMapper.queryNameByIds(userIds);
+    }
+
+
     public UserDTO insert(UserRequest user) {
         checkUserParam(user);
         //
diff --git a/backend/src/main/java/io/dataease/service/system/SystemParameterService.java b/backend/src/main/java/io/dataease/service/system/SystemParameterService.java
new file mode 100644
index 0000000000..4da94a29da
--- /dev/null
+++ b/backend/src/main/java/io/dataease/service/system/SystemParameterService.java
@@ -0,0 +1,269 @@
+package io.dataease.service.system;
+
+import com.alibaba.fastjson.JSON;
+import com.google.gson.JsonObject;
+import io.dataease.base.domain.FileMetadata;
+import io.dataease.base.domain.SystemParameter;
+import io.dataease.base.domain.SystemParameterExample;
+import io.dataease.base.mapper.FileContentMapper;
+import io.dataease.base.mapper.FileMetadataMapper;
+import io.dataease.base.mapper.SystemParameterMapper;
+import io.dataease.base.mapper.ext.ExtSystemParameterMapper;
+import io.dataease.commons.constants.ParamConstants;
+import io.dataease.commons.exception.DEException;
+import io.dataease.commons.utils.BeanUtils;
+import io.dataease.commons.utils.EncryptUtils;
+import io.dataease.commons.utils.LogUtil;
+import io.dataease.dto.BaseSystemConfigDTO;
+import io.dataease.dto.SystemParameterDTO;
+import io.dataease.i18n.Translator;
+import io.dataease.notice.domain.MailInfo;
+import io.dataease.service.FileService;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.json.JSONObject;
+import org.springframework.mail.javamail.JavaMailSenderImpl;
+import org.springframework.mail.javamail.MimeMessageHelper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.imageio.ImageIO;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.FileStore;
+import java.time.Instant;
+import java.util.*;
+
+
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class SystemParameterService {
+
+    @Resource
+    private SystemParameterMapper systemParameterMapper;
+    @Resource
+    private ExtSystemParameterMapper extSystemParameterMapper;
+    @Resource
+    private FileService fileService;
+
+
+    public String searchEmail() {
+        return extSystemParameterMapper.email();
+    }
+
+    public String getSystemLanguage() {
+        String result = StringUtils.EMPTY;
+        SystemParameterExample example = new SystemParameterExample();
+        example.createCriteria().andParamKeyEqualTo(ParamConstants.I18n.LANGUAGE.getValue());
+        List<SystemParameter> list = systemParameterMapper.selectByExample(example);
+        if (CollectionUtils.isNotEmpty(list)) {
+            String value = list.get(0).getParamValue();
+            if (StringUtils.isNotBlank(value)) {
+                result = value;
+            }
+        }
+        return result;
+    }
+
+    public void editMail(List<SystemParameter> parameters) {
+        List<SystemParameter> paramList = this.getParamList(ParamConstants.Classify.MAIL.getValue());
+        boolean empty = paramList.size() <= 0;
+
+        parameters.forEach(parameter -> {
+            SystemParameterExample example = new SystemParameterExample();
+            if (parameter.getParamKey().equals(ParamConstants.MAIL.PASSWORD.getValue())) {
+                if (!StringUtils.isBlank(parameter.getParamValue())) {
+                    String string = EncryptUtils.aesEncrypt(parameter.getParamValue()).toString();
+                    parameter.setParamValue(string);
+                }
+            }
+            example.createCriteria().andParamKeyEqualTo(parameter.getParamKey());
+            if (systemParameterMapper.countByExample(example) > 0) {
+                systemParameterMapper.updateByPrimaryKey(parameter);
+            } else {
+                systemParameterMapper.insert(parameter);
+            }
+            example.clear();
+
+        });
+    }
+
+    public List<SystemParameter> getParamList(String type) {
+        SystemParameterExample example = new SystemParameterExample();
+        example.createCriteria().andParamKeyLike(type + "%");
+        return systemParameterMapper.selectByExample(example);
+    }
+
+    public void testConnection(HashMap<String, String> hashMap) {
+        JavaMailSenderImpl javaMailSender = new JavaMailSenderImpl();
+        javaMailSender.setDefaultEncoding("UTF-8");
+        javaMailSender.setHost(hashMap.get(ParamConstants.MAIL.SERVER.getValue()));
+        javaMailSender.setPort(Integer.valueOf(hashMap.get(ParamConstants.MAIL.PORT.getValue())));
+        javaMailSender.setUsername(hashMap.get(ParamConstants.MAIL.ACCOUNT.getValue()));
+        javaMailSender.setPassword(hashMap.get(ParamConstants.MAIL.PASSWORD.getValue()));
+        Properties props = new Properties();
+        String recipients = hashMap.get(ParamConstants.MAIL.RECIPIENTS.getValue());
+        if (BooleanUtils.toBoolean(hashMap.get(ParamConstants.MAIL.SSL.getValue()))) {
+            props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
+        }
+        if (BooleanUtils.toBoolean(hashMap.get(ParamConstants.MAIL.TLS.getValue()))) {
+            props.put("mail.smtp.starttls.enable", "true");
+        }
+        props.put("mail.smtp.timeout", "30000");
+        props.put("mail.smtp.connectiontimeout", "5000");
+        javaMailSender.setJavaMailProperties(props);
+        try {
+            javaMailSender.testConnection();
+        } catch (MessagingException e) {
+            LogUtil.error(e.getMessage(), e);
+            DEException.throwException(Translator.get("connection_failed"));
+        }
+        if(!StringUtils.isBlank(recipients)){
+            MimeMessage mimeMessage = javaMailSender.createMimeMessage();
+            MimeMessageHelper helper = null;
+            try {
+                helper = new MimeMessageHelper(mimeMessage, true);
+                helper.setFrom(javaMailSender.getUsername());
+                helper.setSubject("MeterSphere测试邮件 " );
+                helper.setText("这是一封测试邮件，邮件发送成功", true);
+                helper.setTo(recipients);
+                javaMailSender.send(mimeMessage);
+            } catch (MessagingException e) {
+                LogUtil.error(e.getMessage(), e);
+                DEException.throwException(Translator.get("connection_failed"));
+            }
+        }
+
+
+    }
+
+    public String getVersion() {
+        return System.getenv("MS_VERSION");
+    }
+
+    public MailInfo mailInfo(String type) {
+        List<SystemParameter> paramList = this.getParamList(type);
+        MailInfo mailInfo=new MailInfo ();
+        if (!CollectionUtils.isEmpty(paramList)) {
+            for (SystemParameter param : paramList) {
+                if (StringUtils.equals(param.getParamKey(),ParamConstants.MAIL.SERVER.getValue() )) {
+                    mailInfo.setHost(param.getParamValue());
+                } else if (StringUtils.equals(param.getParamKey(), ParamConstants.MAIL.PORT.getValue())) {
+                    mailInfo.setPort(param.getParamValue());
+                } else if (StringUtils.equals(param.getParamKey(), ParamConstants.MAIL.ACCOUNT.getValue())) {
+                    mailInfo.setAccount(param.getParamValue());
+                } else if (StringUtils.equals(param.getParamKey(), ParamConstants.MAIL.PASSWORD.getValue())) {
+                    String password = EncryptUtils.aesDecrypt(param.getParamValue()).toString();
+                    mailInfo.setPassword(password);
+                } else if (StringUtils.equals(param.getParamKey(), ParamConstants.MAIL.SSL.getValue())) {
+                    mailInfo.setSsl(param.getParamValue());
+                } else if (StringUtils.equals(param.getParamKey(), ParamConstants.MAIL.TLS.getValue())) {
+                    mailInfo.setTls(param.getParamValue());
+                } else if (StringUtils.equals(param.getParamKey(), ParamConstants.MAIL.RECIPIENTS.getValue())) {
+                    mailInfo.setRecipient(param.getParamValue());
+                }
+            }
+        }
+        return mailInfo;
+    }
+
+    public void saveLdap(List<SystemParameter> parameters) {
+        SystemParameterExample example = new SystemParameterExample();
+        parameters.forEach(param -> {
+            if (param.getParamKey().equals(ParamConstants.LDAP.PASSWORD.getValue())) {
+                String string = EncryptUtils.aesEncrypt(param.getParamValue()).toString();
+                param.setParamValue(string);
+            }
+            example.createCriteria().andParamKeyEqualTo(param.getParamKey());
+            if (systemParameterMapper.countByExample(example) > 0) {
+                systemParameterMapper.updateByPrimaryKey(param);
+            } else {
+                systemParameterMapper.insert(param);
+            }
+            example.clear();
+        });
+    }
+
+    public String getValue(String key) {
+        SystemParameter param = systemParameterMapper.selectByPrimaryKey(key);
+        if (param == null) {
+            return null;
+        }
+        return param.getParamValue();
+    }
+
+
+    public List<SystemParameterDTO> getSystemParameterInfo(String paramConstantsType) {
+        List<SystemParameter> paramList = this.getParamList(paramConstantsType);
+        List<SystemParameterDTO> dtoList = new ArrayList<>();
+        for (SystemParameter systemParameter : paramList) {
+            SystemParameterDTO systemParameterDTO = new SystemParameterDTO();
+            BeanUtils.copyBean(systemParameterDTO, systemParameter);
+            if (systemParameter.getType().equalsIgnoreCase("file")) {
+                FileMetadata fileMetadata = fileService.getFileMetadataById(systemParameter.getParamValue());
+                if (fileMetadata != null) {
+                    systemParameterDTO.setFileName(fileMetadata.getName());
+                }
+            }
+            dtoList.add(systemParameterDTO);
+        }
+        dtoList.sort(Comparator.comparingInt(SystemParameter::getSort));
+        return dtoList;
+    }
+
+
+
+    public void saveUIInfo(Map<String,List<SystemParameterDTO>> request, List<MultipartFile> bodyFiles) throws IOException {
+        List<SystemParameterDTO> parameters = request.get("systemParams");
+        for (MultipartFile multipartFile : bodyFiles) {
+            if (!multipartFile.isEmpty()) {
+                //防止添加非图片文件
+                try (InputStream input = multipartFile.getInputStream()) {
+                    try {
+                        // It's an image (only BMP, GIF, JPG and PNG are recognized).
+                        ImageIO.read(input).toString();
+                    } catch (Exception e) {
+                        DEException.throwException("Uploaded images do not meet the image format requirements");
+                        return;
+                    }
+                }
+                String multipartFileName = multipartFile.getOriginalFilename();
+                String[] split = Objects.requireNonNull(multipartFileName).split(",");
+                parameters.stream().filter(systemParameterDTO -> systemParameterDTO.getParamKey().equalsIgnoreCase(split[1])).forEach(systemParameterDTO -> {
+                    systemParameterDTO.setFileName(split[0]);
+                    systemParameterDTO.setFile(multipartFile);
+                });
+            }
+        }
+        for (SystemParameterDTO systemParameter : parameters) {
+            MultipartFile file = systemParameter.getFile();
+            if (systemParameter.getType().equalsIgnoreCase("file")) {
+                if (StringUtils.isBlank(systemParameter.getFileName())) {
+                    fileService.deleteFileById(systemParameter.getParamValue());
+                }
+                if (file != null) {
+                    fileService.deleteFileById(systemParameter.getParamValue());
+                    FileMetadata fileMetadata = fileService.saveFile(systemParameter.getFile(),systemParameter.getFileName());
+                    systemParameter.setParamValue(fileMetadata.getId());
+                }
+                if (file == null && systemParameter.getFileName() == null) {
+                    systemParameter.setParamValue(null);
+                }
+            }
+            systemParameterMapper.deleteByPrimaryKey(systemParameter.getParamKey());
+            systemParameterMapper.insert(systemParameter);
+        }
+
+    }
+
+    public static void main(String[] args) {
+        String info="[{\"paramKey\":\"base.url\",\"paramValue\":null,\"type\":\"text\",\"sort\":1,\"file\":null,\"fileName\":null},{\"paramKey\":\"base.title\",\"paramValue\":\"DataEase Title\",\"type\":\"text\",\"sort\":3,\"file\":null,\"fileName\":null},{\"paramKey\":\"base.logo\",\"paramValue\":\"DataEase\",\"type\":\"text\",\"sort\":4,\"file\":null,\"fileName\":\"favicon.icon.png\"}]";
+        List<SystemParameterDTO> temp = JSON.parseArray(info,SystemParameterDTO.class);
+        System.out.println("===>");
+    }
+}
diff --git a/frontend/src/assets/favicon.ico b/frontend/src/assets/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..9dc173ff67ac7432dc701a004fbba1d9164e8378
GIT binary patch
literal 109986
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
F@Bi~>yWIc)

literal 0
HcmV?d00001

diff --git a/frontend/src/business/components/settings/router.js b/frontend/src/business/components/settings/router.js
index 38ba994e9a..91231d326d 100644
--- a/frontend/src/business/components/settings/router.js
+++ b/frontend/src/business/components/settings/router.js
@@ -32,11 +32,11 @@ export default {
     //   component: () => import('@/business/components/settings/system/TestResourcePool'),
     //   meta: {system: true, title: 'commons.test_resource_pool'}
     // },
-    // {
-    //   path: 'systemparametersetting',
-    //   component: () => import('@/business/components/settings/system/SystemParameterSetting'),
-    //   meta: {system: true, title: 'commons.system_parameter_setting'}
-    // },
+    {
+      path: 'systemparametersetting',
+      component: () => import('@/business/components/settings/system/SystemParameterSetting'),
+      meta: {system: true, title: 'commons.system_parameter_setting'}
+    },
     ...requireContext.keys().map(key => requireContext(key).system),
     ...requireContext.keys().map(key => requireContext(key).license),
     {
diff --git a/frontend/src/business/components/settings/system/BaseSetting.vue b/frontend/src/business/components/settings/system/BaseSetting.vue
index 822951078a..8bfd993cc0 100644
--- a/frontend/src/business/components/settings/system/BaseSetting.vue
+++ b/frontend/src/business/components/settings/system/BaseSetting.vue
@@ -1,19 +1,45 @@
 <template>
   <div v-loading="result.loading">
-    <el-form :model="formInline" :rules="rules" ref="formInline" class="demo-form-inline"
+    {{systemParams}}
+    <el-form ref="systemParams" class="demo-form-inline"
              :disabled="show" v-loading="loading" size="small">
       <el-row>
-        <el-col>
-          <el-form-item :label="$t('system_config.base.url')" prop="url">
-            <el-input v-model="formInline.url" :placeholder="$t('system_config.base.url_tip')"/>
-            <i>({{$t('commons.examples')}}:https://rdmetersphere.fit2cloud.com)</i>
+        <el-col v-for="(param,index) in systemParams" :key="index">
+          <!--logo upload-->
+          <el-form-item :label="$t('system_config.base.logo')"
+                        v-if="param.paramKey==='base.logo'">
+              <el-upload style="float: left"
+                         v-loading="result.loading"
+                         class="upload-demo"
+                         action=""
+                         accept=".jpeg,.jpg,.png,.gif"
+                         :on-exceed="handleExceed"
+                         :beforeUpload="uploadValidate"
+                         :on-error="handleError"
+                         :show-file-list="false"
+                         :file-list="filesTmp"
+                         :http-request="uploadLogo">
+                <el-button style="display: inline-block" size="mini" type="success" plain>
+                  {{ $t('commons.upload') }}
+                </el-button>
+              </el-upload>
+              <el-button style="float:left;margin-left: 10px;margin-top: 3px" size="mini" type="danger" plain
+                         @click="removeValue('base.logo')">
+                {{ $t('commons.upload') }}
+              </el-button>
+              <el-input :disabled="true" v-model="param.fileName"
+                        :placeholder="$t('system_config.base.logo_size')+'：135px * 30px'"/>
+          </el-form-item>
+          <!--title-->
+          <el-form-item :label="$t('system_config.base.title')" v-if="param.paramKey==='base.title'">
+            <el-input v-model="param.paramValue" placeholder="eg：DateEase"/>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <div>
       <el-button @click="edit" v-if="showEdit" size="small">{{ $t('commons.edit') }}</el-button>
-      <el-button type="success" @click="save('formInline')" v-if="showSave" :disabled="disabledSave" size="small">
+      <el-button type="success" @click="save('systemParams')" v-if="showSave" :disabled="disabledSave" size="small">
         {{ $t('commons.save') }}
       </el-button>
       <el-button @click="cancel" type="info" v-if="showCancel" size="small">{{ $t('commons.cancel') }}</el-button>
@@ -22,84 +48,123 @@
 </template>
 
 <script>
+  import ElUploadList from "element-ui/packages/upload/src/upload-list";
 
-export default {
-  name: "BaseSetting",
-  data() {
-    return {
-      formInline: {},
-      input: '',
-      visible: true,
-      result: {},
-      showEdit: true,
-      showSave: false,
-      showCancel: false,
-      show: true,
-      disabledConnection: false,
-      disabledSave: false,
-      loading: false,
-      rules: {
-        url: [
-          {
-            required: true,
-            message: this.$t('system_par'),
-            trigger: ['change', 'blur']
-          },
-        ],
+  export default {
+    name: "BaseSetting",
+    data() {
+      return {
+        filesTmp: [],
+        suffixes: new Set(['png', 'jpg', 'gif', 'jpeg']),
+        files: [],
+        systemParams: [],
+        systemParamsOld: [],
+        input: '',
+        visible: true,
+        result: {},
+        showEdit: true,
+        showSave: false,
+        showCancel: false,
+        show: true,
+        disabledConnection: false,
+        disabledSave: false,
+        loading: false,
+        rules: {
+          url: [
+            {
+              required: true,
+              message: 'Not Null',
+              trigger: ['change', 'blur']
+            },
+          ],
+        }
       }
-    }
-  },
-
-  created() {
-    this.query()
-  },
-  methods: {
-    query() {
-      this.result = this.$get("/system/base/info", response => {
-        this.formInline = response.data;
-        this.$nextTick(() => {
-          this.$refs.formInline.clearValidate();
+    },
+    created() {
+      this.query()
+    },
+    methods: {
+      query() {
+        this.result = this.$get("/system/base/info", response => {
+          debugger;
+          this.systemParams = response.data;
         })
-      })
-    },
-    edit() {
-      this.showEdit = false;
-      this.showSave = true;
-      this.showCancel = true;
-      this.show = false;
-    },
-    save(formInline) {
-      this.showEdit = true;
-      this.showCancel = false;
-      this.showSave = false;
-      this.show = true;
-      let param = [
-        {paramKey: "base.url", paramValue: this.formInline.url, type: "text", sort: 1},
-      ];
+      },
+      edit() {
+        this.showEdit = false;
+        this.showSave = true;
+        this.showCancel = true;
+        this.show = false;
+      },
+      save() {
+        this.showEdit = true;
+        this.showCancel = false;
+        this.showSave = false;
+        this.show = true;
+        this.systemParams.forEach((param) => {
+          if (param.file !== null) {
+            let file = param.file;
+            let name = file.name + "," + param.paramKey;
+            let newfile = new File([file], name, {type: file.type});
+            this.files.push(newfile);
+            param.file = null;
+          }
+        });
 
-      this.$refs[formInline].validate(valid => {
-        if (valid) {
-          this.result = this.$post("/system/save/base", param, response => {
-            if (response.success) {
-              this.$success(this.$t('commons.save_success'));
-            } else {
-              this.$message.error(this.$t('commons.save_failed'));
-            }
-          });
-        } else {
+        this.result = this.$fileUpload("/system/save/base", null, this.files, {"systemParams": this.systemParams}, response => {
+          if (response.success) {
+            this.query();//刷新数据
+            this.$success(this.$t('commons.save_success'));
+          } else {
+            this.$message.error(this.$t('commons.save_failed'));
+          }
+        });
+      },
+      cancel() {
+        this.showEdit = true;
+        this.showCancel = false;
+        this.showSave = false;
+        this.show = true;
+        this.query();
+      },
+      handleExceed(files, fileList) {
+        this.$warning(this.$t('test_track.case.import.upload_limit_count'));
+      },
+      handleError() {
+        this.$warning(this.$t('test_track.case.import.upload_limit_count'));
+      },
+      uploadValidate(file) {
+        let suffix = file.name.substring(file.name.lastIndexOf('.') + 1);
+        if (!this.suffixes.has(suffix)) {
+          this.$warning(this.$t('test_track.case.import.upload_limit_format'));
           return false;
         }
-      })
-    },
-    cancel() {
-      this.showEdit = true;
-      this.showCancel = false;
-      this.showSave = false;
-      this.show = true;
-      this.query();
+
+        if (file.size / 1024 / 1024 > 5) {
+          this.$warning(this.$t('test_track.case.import.upload_limit_size'));
+          return false;
+        }
+        this.errList = [];
+        return true;
+      },
+      uploadLogo(file) {
+        this.systemParams.forEach((param) => {
+          if (param.paramKey === "base.logo") {
+            param.fileName = file.file.name;
+            param.file = file.file;
+          }
+        })
+      },
+      removeValue(paramKey) {
+        this.systemParams.forEach((param) => {
+          if (param.paramKey === paramKey) {
+            param.fileName = null;
+            param.file = null;
+          }
+        });
+      }
     }
   }
-}
 </script>
 
 <style scoped>
@@ -108,4 +173,10 @@ export default {
     min-height: 300px;
   }
 
+  .inline-block {
+    display: inline-block;
+    position: absolute;
+    left: 105px;
+  }
+
 </style>
diff --git a/frontend/src/business/components/settings/system/SystemParameterSetting.vue b/frontend/src/business/components/settings/system/SystemParameterSetting.vue
index 40decd2c3a..337600dfdb 100644
--- a/frontend/src/business/components/settings/system/SystemParameterSetting.vue
+++ b/frontend/src/business/components/settings/system/SystemParameterSetting.vue
@@ -2,21 +2,15 @@
   <el-card>
     <el-tabs class="system-setting" v-model="activeName">
 
-      <el-tab-pane :label="$t('system_config.base_config')" name="base">
-        <base-setting/>
+<!--      <el-tab-pane :label="$t('system_config.base_config')" name="base">-->
+<!--        <base-setting/>-->
+<!--      </el-tab-pane>-->
+      <el-tab-pane :label="$t('display.title')" name="ui">
+        <ui-setting/>
       </el-tab-pane>
       <el-tab-pane :label="$t('system_parameter_setting.mailbox_service_settings')" name="email">
         <email-setting/>
       </el-tab-pane>
-      <el-tab-pane :label="$t('system_parameter_setting.ldap_setting')" name="ldap">
-        <ldap-setting/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasLicense()" :label="$t('display.title')" name="display">
-        <ms-display/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasLicense()" :label="$t('auth_source.title')" name="auth">
-        <ms-auth/>
-      </el-tab-pane>
     </el-tabs>
   </el-card>
 </template>
@@ -24,6 +18,7 @@
 <script>
 import EmailSetting from "./EmailSetting";
 import LdapSetting from "./LdapSetting";
+import UiSetting from "./UiSetting";
 import BaseSetting from "./BaseSetting";
 import {hasLicense} from '@/common/js/utils';
 
@@ -35,6 +30,7 @@ export default {
   name: "SystemParameterSetting",
   components: {
     BaseSetting,
+    UiSetting,
     EmailSetting,
     LdapSetting,
     "MsDisplay": display.default,
@@ -42,7 +38,7 @@ export default {
   },
   data() {
     return {
-      activeName: 'base',
+      activeName: 'ui',
     }
   },
   methods: {
diff --git a/frontend/src/business/components/settings/system/UiSetting.vue b/frontend/src/business/components/settings/system/UiSetting.vue
new file mode 100644
index 0000000000..816268fb2c
--- /dev/null
+++ b/frontend/src/business/components/settings/system/UiSetting.vue
@@ -0,0 +1,265 @@
+<template>
+  <div v-loading="result.loading">
+    <el-form ref="systemParams" class="demo-form-inline"
+             :disabled="show" v-loading="loading" size="small">
+      <el-row>
+        <el-col v-for="(param,index) in systemParams" :key="index">
+          <!--logo upload-->
+          <el-form-item :label="$t('display.logo')"
+                        v-if="param.paramKey==='ui.logo'">
+              <el-upload style="float: right;margin-left: 10px"
+                         v-loading="result.loading"
+                         class="upload-demo"
+                         action=""
+                         accept=".jpeg,.jpg,.png,.gif"
+                         :on-exceed="handleExceed"
+                         :beforeUpload="uploadValidate"
+                         :on-error="handleError"
+                         :show-file-list="false"
+                         :file-list="filesTmp"
+                         :http-request="uploadLogo">
+                <el-button style="display: inline-block" size="mini" type="success" plain>
+                  {{ $t('commons.upload') }}
+                </el-button>
+              </el-upload>
+              <el-button style="float:right;margin-top: 3px" size="mini" type="danger" plain
+                         @click="removeValue('ui.logo')">
+                {{ $t('commons.clear') }}
+              </el-button>
+              <el-input :disabled="true" v-model="param.fileName"
+                        :placeholder="$t('display.advice_size')+'：135px * 30px'"/>
+          </el-form-item>
+          <!--logo upload-->
+          <el-form-item :label="$t('display.loginImage')"
+                        v-if="param.paramKey==='ui.loginImage'">
+            <el-upload style="float: right;margin-left: 10px"
+                       v-loading="result.loading"
+                       class="upload-demo"
+                       action=""
+                       accept=".jpeg,.jpg,.png,.gif"
+                       :on-exceed="handleExceed"
+                       :beforeUpload="uploadValidate"
+                       :on-error="handleError"
+                       :show-file-list="false"
+                       :file-list="filesTmp"
+                       :http-request="uploadLoginImage">
+              <el-button style="display: inline-block" size="mini" type="success" plain>
+                {{ $t('commons.upload') }}
+              </el-button>
+            </el-upload>
+            <el-button style="float:right;margin-top: 3px" size="mini" type="danger" plain
+                       @click="removeValue('ui.loginImage')">
+              {{ $t('commons.clear') }}
+            </el-button>
+            <el-input :disabled="true" v-model="param.fileName"
+                      :placeholder="$t('display.advice_size')+'：500px * 450px'"/>
+          </el-form-item>
+          <!--favicon upload-->
+          <el-form-item :label="$t('display.loginLogo')"
+                        v-if="param.paramKey==='ui.loginLogo'">
+            <el-upload style="float: right;margin-left: 10px"
+                       v-loading="result.loading"
+                       class="upload-demo"
+                       action=""
+                       accept=".jpeg,.jpg,.png,.gif"
+                       :on-exceed="handleExceed"
+                       :beforeUpload="uploadValidate"
+                       :on-error="handleError"
+                       :show-file-list="false"
+                       :file-list="filesTmp"
+                       :http-request="uploadLoginLogo">
+              <el-button style="display: inline-block" size="mini" type="success" plain>
+                {{ $t('commons.upload') }}
+              </el-button>
+            </el-upload>
+            <el-button style="float:right;margin-top: 3px" size="mini" type="danger" plain
+                       @click="removeValue('ui.loginLogo')">
+              {{ $t('commons.clear') }}
+            </el-button>
+            <el-input :disabled="true" v-model="param.fileName"
+                      :placeholder="$t('display.advice_size')+'：135px * 30px'"/>
+          </el-form-item>
+          <!--favicon upload-->
+          <el-form-item :label="$t('display.favicon')"
+                        v-if="param.paramKey==='ui.favicon'">
+            <el-upload style="float: right;margin-left: 10px"
+                       v-loading="result.loading"
+                       class="upload-demo"
+                       action=""
+                       accept=".jpeg,.jpg,.png,.gif"
+                       :on-exceed="handleExceed"
+                       :beforeUpload="uploadValidate"
+                       :on-error="handleError"
+                       :show-file-list="false"
+                       :file-list="filesTmp"
+                       :http-request="uploadFavicon">
+              <el-button style="display: inline-block" size="mini" type="success" plain>
+                {{ $t('commons.upload') }}
+              </el-button>
+            </el-upload>
+            <el-button style="float:right;margin-top: 3px" size="mini" type="danger" plain
+                       @click="removeValue('ui.favicon')">
+              {{ $t('commons.clear') }}
+            </el-button>
+            <el-input :disabled="true" v-model="param.fileName"
+                      :placeholder="$t('display.advice_size')+'：16px * 16px'"/>
+          </el-form-item>
+          <!--ui.loginTitle-->
+          <el-form-item :label="$t('display.loginTitle')" v-if="param.paramKey==='ui.loginTitle'">
+            <el-input v-model="param.paramValue" placeholder="eg：DateEase"/>
+          </el-form-item>
+          <!--ui.title-->
+          <el-form-item :label="$t('display.title')" v-if="param.paramKey==='ui.title'">
+            <el-input v-model="param.paramValue" placeholder="eg：DateEase"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div>
+      <el-button @click="edit" v-if="showEdit" size="small">{{ $t('commons.edit') }}</el-button>
+      <el-button type="success" @click="save" v-if="showSave" :disabled="disabledSave" size="small">
+        {{ $t('commons.save') }}
+      </el-button>
+      <el-button @click="cancel" type="info" v-if="showCancel" size="small">{{ $t('commons.cancel') }}</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+  import ElUploadList from "element-ui/packages/upload/src/upload-list";
+
+  export default {
+    name: "UiSetting",
+    data() {
+      return {
+        filesTmp: [],
+        suffixes: new Set(['png', 'jpg', 'gif', 'jpeg']),
+        files: [],
+        systemParams: [],
+        systemParamsOld: [],
+        input: '',
+        visible: true,
+        result: {},
+        showEdit: true,
+        showSave: false,
+        showCancel: false,
+        show: true,
+        disabledConnection: false,
+        disabledSave: false,
+        loading: false,
+        rules: {
+          url: [
+            {
+              required: true,
+              message: 'Not Null',
+              trigger: ['change', 'blur']
+            },
+          ],
+        }
+      }
+    },
+    created() {
+      this.query()
+    },
+    methods: {
+      query() {
+        this.result = this.$get("/system/ui/info", response => {
+          debugger;
+          this.systemParams = response.data;
+        })
+      },
+      edit() {
+        this.showEdit = false;
+        this.showSave = true;
+        this.showCancel = true;
+        this.show = false;
+      },
+      save() {
+        this.showEdit = true;
+        this.showCancel = false;
+        this.showSave = false;
+        this.show = true;
+        this.systemParams.forEach((systemParam) => {
+          if (systemParam.file !== null) {
+            let file = systemParam.file;
+            let name = file.name + "," + systemParam.paramKey;
+            let newfile = new File([file], name, {type: file.type});
+            this.files.push(newfile);
+            systemParam.file = null;
+          }
+        });
+
+        this.result = this.$fileUpload("/system/save/ui", null, this.files, {"systemParams": this.systemParams}, response => {
+          if (response.success) {
+            this.query();//刷新数据
+            this.$success(this.$t('commons.save_success'));
+          } else {
+            this.$message.error(this.$t('commons.save_failed'));
+          }
+        });
+      },
+      cancel() {
+        this.showEdit = true;
+        this.showCancel = false;
+        this.showSave = false;
+        this.show = true;
+        this.query();
+      },
+      handleExceed(files, fileList) {
+        this.$warning(this.$t('test_track.case.import.upload_limit_count'));
+      },
+      handleError() {
+        this.$warning(this.$t('test_track.case.import.upload_limit_count'));
+      },
+      uploadValidate(file) {
+        let suffix = file.name.substring(file.name.lastIndexOf('.') + 1);
+        if (!this.suffixes.has(suffix)) {
+          this.$warning(this.$t('test_track.case.import.upload_limit_format'));
+          return false;
+        }
+
+        if (file.size / 1024 / 1024 > 5) {
+          this.$warning(this.$t('test_track.case.import.upload_limit_size'));
+          return false;
+        }
+        this.errList = [];
+        return true;
+      },
+      uploadLogo(file) {
+        this.upload(file,'ui.logo')
+      },
+      uploadFavicon(file) {
+        this.upload(file,'ui.favicon')
+      },
+      uploadLoginImage(file) {
+        this.upload(file,'ui.loginImage')
+      },
+      uploadLoginLogo(file) {
+        this.upload(file,'ui.loginLogo')
+      },
+      upload(file,paramKey) {
+        this.systemParams.forEach((systemParam) => {
+          if (systemParam.paramKey === paramKey) {
+            systemParam.fileName = file.file.name;
+            systemParam.file = file.file;
+          }
+        })
+      },
+      removeValue(paramKey) {
+        this.systemParams.forEach((systemParam) => {
+          if (systemParam.paramKey === paramKey) {
+            systemParam.fileName = null;
+            systemParam.file = null;
+          }
+        });
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .el-form {
+    min-height: 300px;
+  }
+
+</style>
diff --git a/frontend/src/business/index.html b/frontend/src/business/index.html
index ed0d1452c7..d7b5ac50ff 100644
--- a/frontend/src/business/index.html
+++ b/frontend/src/business/index.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <link rel="shortcut icon" href="<%= BASE_URL %>favicon.ico">
+  <link rel="shortcut icon" href="<%= BASE_URL %>test-favicon.ico">
   <title>DataEase</title>
 </head>
 <body>
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 08bddcee23..decf67202e 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1,5 +1,6 @@
 export default {
   commons: {
+    upload:'Upload',
     cover: 'Cover',
     not_cover: 'Not Cover',
     import_mode: 'Import mode',
@@ -34,7 +35,7 @@ export default {
     operating: 'Operating',
     input_limit: 'Within {0} and {1} characters',
     login: 'Sign In',
-    welcome: 'One-stop open source continuous testing platform',
+    welcome: 'One-stop open source data analysis platform',
     username: 'Username',
     password: 'Password',
     input_username: 'Please enter username',
@@ -216,12 +217,21 @@ export default {
     loginImage: 'Picture on the right side of the login page',
     loginTitle: 'Login page prompt information',
     pageTitle: 'Page Title',
+    advice_size:"The recommended image size is ",
+    favicon:"Favicon",
   },
   system_config: {
     base_config: 'Base Config',
     base: {
       url: 'Website URL',
-      url_tip: 'example：http://localhost:8081'
+      url_tip: 'example：http://localhost:8081',
+      logo: "System LOGO (displayed in the LOGO in the upper left corner of the system homepage)",
+      advice_size:"The recommended image size is ",
+      title:"Title (text displayed on browser tab page)",
+      favicon:"Favicon",
+      system_name:"System name (displayed in the system name in the upper left corner of the system home page)",
+      login_image: "Login page image (the image shown on the login page)",
+      login_name:"System name displayed on login page"
     }
   },
   workspace: {
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index a03eb0e502..73eb90acb6 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1,5 +1,6 @@
 export default {
   commons: {
+    upload:'上传',
     cover: '覆盖',
     not_cover: '不覆盖',
     import_mode: '导入模式',
@@ -35,7 +36,7 @@ export default {
     operating: '操作',
     input_limit: '长度在 {0} 到 {1} 个字符',
     login: '登录',
-    welcome: '一站式开源持续测试平台',
+    welcome: '一站式开源数据分析平台',
     username: '姓名',
     password: '密码',
     input_username: '请输入用户姓名',
@@ -218,12 +219,21 @@ export default {
     loginImage: '登陆页面右侧图片',
     loginTitle: '登陆页面提示信息',
     pageTitle: '页面 Title',
+    favicon:"Favicon（浏览器Tab页上的小图标）",
+    advice_size:"建议图片大小",
   },
   system_config: {
     base_config: '基本配置',
     base: {
       url: '当前站点URL',
-      url_tip: '例如：http://localhost:8081'
+      url_tip: '例如：http://localhost:8081',
+      logo: "系统LOGO（显示在系统主页左上角的LOGO）",
+      advice_size:"建议图片大小",
+      title:"Title（浏览器Tab页上的显示的文字）",
+      favicon:"Favicon（浏览器Tab页上的小图标）",
+      system_name:"系统名称（显示在系统主页左上角的系统名称）",
+      login_image: "登录页图片（登录页中显示的图片）",
+      login_name:"登录页显示的系统名称"
     }
   },
   workspace: {
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 22f979aaf9..ca12cd3c06 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1,5 +1,6 @@
 export default {
   commons: {
+    upload:'上传',
     cover: '覆蓋',
     not_cover: '不覆蓋',
     import_mode: '導入模式',
@@ -35,7 +36,7 @@ export default {
     operating: '操作',
     input_limit: '長度在 {0} 到 {1} 個字符',
     login: '登錄',
-    welcome: '壹站式開源持續測試平臺',
+    welcome: '壹站式開源数据分析平臺',
     username: '姓名',
     password: '密碼',
     input_username: '請輸入用戶姓名',
@@ -217,12 +218,21 @@ export default {
     loginImage: '登陸頁面右側圖片',
     loginTitle: '登陸頁面提示信息',
     pageTitle: '頁面 Title',
+    favicon:"Favicon（瀏覽器Tab頁上的小圖標）",
+    advice_size:"建議圖片大小",
   },
   system_config: {
     base_config: '基本配置',
     base: {
       url: '當前站點URL',
-      url_tip: '例如：http://localhost:8081'
+      url_tip: '例如：http://localhost:8081',
+      logo: "系統LOGO（顯示在系統主頁左上角的LOGO）",
+      advice_size:"建議圖片大小",
+      title:"Title（瀏覽器Tab頁上的顯示的文字）",
+      favicon:"Favicon（瀏覽器Tab頁上的小圖標）",
+      system_name:"系統名稱（顯示在系統主頁左上角的系統名稱）",
+      login_image: "登錄頁圖片（登錄頁中顯示的圖片）",
+      login_name:"登錄頁顯示的系統名稱"
     }
   },
   workspace: {
diff --git a/frontend/src/login/login.html b/frontend/src/login/login.html
index 191b04d115..5b6f73bb32 100644
--- a/frontend/src/login/login.html
+++ b/frontend/src/login/login.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <link rel="shortcut icon" href="<%= BASE_URL %>favicon.ico">
+  <link rel="shortcut icon" href="<%= BASE_URL %>display/file/favicon">
   <title>DataEase</title>
 </head>
 <body>