Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3-bpm

Author: YunaiV

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yudao-ui-admin",
-  "version": "1.6.6-snapshot",
+  "version": "1.7.0-snapshot",
   "description": "芋道管理系统",
   "author": "芋道",
   "license": "MIT",
@@ -49,7 +49,7 @@
     "core-js": "^3.26.0",
     "crypto-js": "^4.0.0",
     "echarts": "5.4.0",
-    "element-ui": "2.15.10",
+    "element-ui": "2.15.12",
     "file-saver": "2.0.5",
     "fuse.js": "6.6.2",
     "highlight.js": "9.18.5",

src/api/system/mail/account.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 创建邮箱账号
+export function createMailAccount(data) {
+  return request({
+    url: '/system/mail-account/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新邮箱账号
+export function updateMailAccount(data) {
+  return request({
+    url: '/system/mail-account/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除邮箱账号
+export function deleteMailAccount(id) {
+  return request({
+    url: '/system/mail-account/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得邮箱账号
+export function getMailAccount(id) {
+  return request({
+    url: '/system/mail-account/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得邮箱账号分页
+export function getMailAccountPage(query) {
+  return request({
+    url: '/system/mail-account/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取邮箱账号的精简信息列表
+export function getSimpleMailAccountList() {
+  return request({
+    url: '/system/mail-account/list-all-simple',
+    method: 'get',
+  })
+}

src/api/system/mail/log.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 获得邮件日志
+export function getMailLog(id) {
+  return request({
+    url: '/system/mail-log/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得邮件日志分页
+export function getMailLogPage(query) {
+  return request({
+    url: '/system/mail-log/page',
+    method: 'get',
+    params: query
+  })
+}

src/api/system/mail/template.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 创建邮件模版
+export function createMailTemplate(data) {
+  return request({
+    url: '/system/mail-template/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新邮件模版
+export function updateMailTemplate(data) {
+  return request({
+    url: '/system/mail-template/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除邮件模版
+export function deleteMailTemplate(id) {
+  return request({
+    url: '/system/mail-template/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得邮件模版
+export function getMailTemplate(id) {
+  return request({
+    url: '/system/mail-template/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得邮件模版分页
+export function getMailTemplatePage(query) {
+  return request({
+    url: '/system/mail-template/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 发送测试邮件
+export function sendMail(data) {
+  return request({
+    url: '/system/mail-template/send-mail',
+    method: 'post',
+    data: data
+  })
+}

src/api/system/notify/message.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 获得我的站内信分页
+export function getNotifyMessagePage(query) {
+  return request({
+    url: '/system/notify-message/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得我的站内信分页
+export function getMyNotifyMessagePage(query) {
+  return request({
+    url: '/system/notify-message/my-page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 批量标记已读
+export function updateNotifyMessageRead(ids) {
+  return request({
+    url: '/system/notify-message/update-read?' + qs.stringify({ids: ids}, { indices: false }),
+    method: 'put'
+  })
+}
+
+// 标记所有站内信为已读
+export function updateAllNotifyMessageRead() {
+  return request({
+    url: '/system/notify-message/update-all-read',
+    method: 'put'
+  })
+}
+
+// 获取当前用户的最新站内信列表
+export function getUnreadNotifyMessageList() {
+  return request({
+    url: '/system/notify-message/get-unread-list',
+    method: 'get'
+  })
+}
+
+// 获得当前用户的未读站内信数量
+export function getUnreadNotifyMessageCount() {
+  return request({
+    url: '/system/notify-message/get-unread-count',
+    method: 'get'
+  })
+}

src/api/system/notify/template.js

@@ -0,0 +1,64 @@
+import request from '@/utils/request'
+
+// 创建站内信模板
+export function createNotifyTemplate(data) {
+  return request({
+    url: '/system/notify-template/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新站内信模板
+export function updateNotifyTemplate(data) {
+  return request({
+    url: '/system/notify-template/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除站内信模板
+export function deleteNotifyTemplate(id) {
+  return request({
+    url: '/system/notify-template/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得站内信模板
+export function getNotifyTemplate(id) {
+  return request({
+    url: '/system/notify-template/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得站内信模板分页
+export function getNotifyTemplatePage(query) {
+  return request({
+    url: '/system/notify-template/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 创建站内信模板
+export function sendNotify(data) {
+  return request({
+    url: '/system/notify-template/send-notify',
+    method: 'post',
+    data: data
+  })
+}
+
+// 导出站内信模板 Excel
+export function exportNotifyTemplateExcel(query) {
+  return request({
+    url: '/system/notify-template/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+

src/api/system/sms/smsTemplate.js

@@ -43,7 +43,7 @@ export function getSmsTemplatePage(query) {
   })
 }
 
-// 创建短信模板
+// 发送测试短信
 export function sendSms(data) {
   return request({
     url: '/system/sms-template/send-sms',

src/components/DocAlert/index.vue

@@ -1,5 +1,9 @@
 <template>
-  <el-alert v-if="enable()" :title="'【' + title + '】文档地址：' + url" type="success" show-icon />
+  <el-alert v-if="enable()" type="success" show-icon>
+    <template slot="title">
+      <div @click="goToUrl">{{ '【' + title + '】文档地址：' + url }}</div>
+    </template>
+  </el-alert>
 </template>
 
 <script>
@@ -14,6 +18,9 @@ export default {
   methods: {
     enable: function () {
       return getDocEnable();
+    },
+    goToUrl: function() {
+      window.open(this.url);
     }
   }
 };

src/components/RuoYi/Doc/index.vue

@@ -9,7 +9,7 @@ export default {
   name: 'YudaoDoc',
   data() {
     return {
-      url: 'http://www.iocoder.cn/Yudao/build-debugger-environment/?yudao'
+      url: 'https://doc.iocoder.cn/'
     }
   },
   methods: {

src/components/TopNav/index.vue

@@ -133,7 +133,9 @@ export default {
       } else {
         // 显示左侧联动菜单
         this.activeRoutes(key);
-        this.$store.dispatch('app/toggleSideBarHide', false);
+        if (!this.$route.meta.link) {
+          this.$store.dispatch('app/toggleSideBarHide', false);
+        }
       }
     },
     // 当前激活的路由
@@ -149,7 +151,7 @@ export default {
       if(routes.length > 0) {
         this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
       } else {
-        this.$store.dispatch("app/toggleSideBarHide", true);
+        this.$store.dispatch('app/toggleSideBarHide', true);
       }
     },
     ishttp(url) {