From 73a2f4d84ce3b3538f400131ac2ec86275f215b0 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 10 Apr 2021 01:39:27 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E7=BC=96=E5=86=99=E7=9F=AD=E4=BF=A1?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=9A=84=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/.env.demo1024                        |  7 ++
 ruoyi-ui/package.json                         |  1 +
 ruoyi-ui/src/api/system/sms/smsChannel.js     |  8 ++
 ruoyi-ui/src/views/system/sms/smsChannel.vue  |  5 +-
 ruoyi-ui/src/views/system/sms/smsTemplate.vue | 81 ++++++++++++-------
 .../dashboard/common/pojo/CommonResult.java   |  2 +-
 .../enums/SmsFrameworkErrorCodeConstants.java | 20 ++---
 .../dict/SysDictDataController.java           |  2 +-
 ...leVO.java => SysDictDataSimpleRespVO.java} |  4 +-
 .../sms/SysSmsChannelController.java          | 16 +++-
 .../sms/SysSmsTemplateController.http         | 12 +++
 .../sms/SysSmsTemplateController.java         |  7 ++
 .../vo/channel/SysSmsChannelSimpleRespVO.java | 24 ++++++
 .../vo/template/SysSmsTemplateSendReqVO.java  | 21 +++++
 .../convert/dict/SysDictDataConvert.java      |  2 +-
 .../convert/sms/SysSmsChannelConvert.java     |  3 +
 .../system/enums/SysErrorCodeConstants.java   |  4 +-
 .../service/sms/SysSmsChannelService.java     |  7 ++
 .../sms/impl/SysSmsChannelServiceImpl.java    |  5 ++
 .../sms/impl/SysSmsTemplateServiceImpl.java   |  4 +-
 .../resources/codegen/vue/views/index.vue.vm  |  4 +-
 21 files changed, 181 insertions(+), 58 deletions(-)
 create mode 100644 ruoyi-ui/.env.demo1024
 rename src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/{SysDictDataSimpleVO.java => SysDictDataSimpleRespVO.java} (86%)
 create mode 100644 src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsTemplateController.http
 create mode 100644 src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelSimpleRespVO.java
 create mode 100644 src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateSendReqVO.java

diff --git a/ruoyi-ui/.env.demo1024 b/ruoyi-ui/.env.demo1024
new file mode 100644
index 000000000..ffeadbf8c
--- /dev/null
+++ b/ruoyi-ui/.env.demo1024
@@ -0,0 +1,7 @@
+NODE_ENV = production
+
+# 测试环境配置
+ENV = 'staging'
+
+# 芋道管理系统/测试环境
+VUE_APP_BASE_API = 'http://127.0.0.1:48080'
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 46718e1b0..1249d16b3 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -8,6 +8,7 @@
     "dev": "vue-cli-service serve",
     "build:prod": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
+    "build:demo1024": "vue-cli-service build --mode demo1024",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src"
   },
diff --git a/ruoyi-ui/src/api/system/sms/smsChannel.js b/ruoyi-ui/src/api/system/sms/smsChannel.js
index 0b4b8c338..4e38de05f 100644
--- a/ruoyi-ui/src/api/system/sms/smsChannel.js
+++ b/ruoyi-ui/src/api/system/sms/smsChannel.js
@@ -42,3 +42,11 @@ export function getSmsChannelPage(query) {
     params: query
   })
 }
+
+// 获得短信渠道精简列表
+export function getSimpleSmsChannels() {
+  return request({
+    url: '/system/sms-channel/list-all-simple',
+    method: 'get',
+  })
+}
diff --git a/ruoyi-ui/src/views/system/sms/smsChannel.vue b/ruoyi-ui/src/views/system/sms/smsChannel.vue
index 5b19f6a8d..ae4b9d7f2 100644
--- a/ruoyi-ui/src/views/system/sms/smsChannel.vue
+++ b/ruoyi-ui/src/views/system/sms/smsChannel.vue
@@ -108,7 +108,8 @@
 </template>
 
 <script>
-import { createSmsChannel, updateSmsChannel, deleteSmsChannel, getSmsChannel, getSmsChannelPage } from "@/api/system/sms/smsChannel";
+import { createSmsChannel, updateSmsChannel, deleteSmsChannel, getSmsChannel, getSmsChannelPage,
+  getSimpleSmsChannels } from "@/api/system/sms/smsChannel";
 
 export default {
   name: "SmsChannel",
@@ -144,7 +145,7 @@ export default {
         code: [{ required: true, message: "渠道编码不能为空", trigger: "blur" }],
         status: [{ required: true, message: "启用状态不能为空", trigger: "blur" }],
         apiKey: [{ required: true, message: "短信 API 的账号不能为空", trigger: "blur" }],
-      }
+      },
     };
   },
   created() {
diff --git a/ruoyi-ui/src/views/system/sms/smsTemplate.vue b/ruoyi-ui/src/views/system/sms/smsTemplate.vue
index b8a3a7b17..1e58fa38a 100644
--- a/ruoyi-ui/src/views/system/sms/smsTemplate.vue
+++ b/ruoyi-ui/src/views/system/sms/smsTemplate.vue
@@ -4,7 +4,7 @@
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="150px">
       <el-form-item label="短信类型" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择短信签名" clearable size="small">
+        <el-select v-model="queryParams.type" placeholder="请选择短信类型" clearable size="small">
           <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYS_SMS_TEMPLATE_TYPE)"
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
@@ -23,7 +23,9 @@
       </el-form-item>
       <el-form-item label="短信渠道编号" prop="channelId">
         <el-select v-model="queryParams.channelId" placeholder="请选择短信渠道编号" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
+          <el-option v-for="channel in channelOptions"
+                     :key="channel.id" :value="channel.id"
+                     :label="channel.signature + '【' + getDictDataLabel(DICT_TYPE.SYS_SMS_CHANNEL_CODE, channel.code) + '】'" />
         </el-select>
       </el-form-item>
       <el-form-item label="创建时间">
@@ -66,9 +68,10 @@
       </el-table-column>>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="短信 API 的模板编号" align="center" prop="apiTemplateId" width="180" />
-      <el-table-column label="短信签名" align="center">
+      <el-table-column label="短信渠道" align="center">
         <template slot-scope="scope">
-          <span>{{ getDictDataLabel(DICT_TYPE.SYS_SMS_CHANNEL_CODE, scope.row.channelCode) }}</span>
+          <div>{{ formatChannelSignature(scope.row.channelId) }}</div>
+          <div>【{{ getDictDataLabel(DICT_TYPE.SYS_SMS_CHANNEL_CODE, scope.row.channelCode) }}】</div>
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
@@ -76,8 +79,10 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
         <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-share" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['system:sms-template:update']">测试</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-hasPermi="['system:sms-template:update']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -91,39 +96,41 @@
 
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="短信签名" prop="type">
-          <el-select v-model="form.type" placeholder="请选择短信签名">
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+        <el-form-item label="短信渠道编号" prop="channelId">
+          <el-select v-model="form.channelId" placeholder="请选择短信渠道编号">
+            <el-option v-for="channel in channelOptions"
+                       :key="channel.id" :value="channel.id"
+                       :label="channel.signature + '【' + getDictDataLabel(DICT_TYPE.SYS_SMS_CHANNEL_CODE, channel.code) + '】'" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="短信类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择短信类型">
             <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYS_SMS_TEMPLATE_TYPE)"
                        :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
           </el-select>
         </el-form-item>
-        <el-form-item label="开启状态">
+        <el-form-item label="模板编号" prop="code">
+          <el-input v-model="form.code" placeholder="请输入模板编号" />
+        </el-form-item>
+        <el-form-item label="模板名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入模板名称" />
+        </el-form-item>
+        <el-form-item label="模板内容" prop="content">
+          <el-input type="textarea" v-model="form.content" placeholder="请输入模板内容" />
+        </el-form-item>
+        <el-form-item label="开启状态" prop="status">
           <el-radio-group v-model="form.status">
             <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.SYS_COMMON_STATUS)"
                       :key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="模板编码" prop="code">
-          <el-input v-model="form.code" placeholder="请输入模板编码" />
-        </el-form-item>
-        <el-form-item label="模板名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入模板名称" />
-        </el-form-item>
-        <el-form-item label="模板内容">
-          <el-input type="textarea" v-model="form.content" placeholder="请输入模板内容" />
+        <el-form-item label="短信 API 模板编号" prop="apiTemplateId">
+          <el-input v-model="form.apiTemplateId" placeholder="请输入短信 API 的模板编号" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
-        <el-form-item label="短信 API 的模板编号" prop="apiTemplateId">
-          <el-input v-model="form.apiTemplateId" placeholder="请输入短信 API 的模板编号" />
-        </el-form-item>
-        <el-form-item label="短信渠道编号" prop="channelId">
-          <el-select v-model="form.channelId" placeholder="请选择短信渠道编号">
-            <el-option label="请选择字典生成" value="" />
-          </el-select>
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -135,13 +142,10 @@
 
 <script>
 import { createSmsTemplate, updateSmsTemplate, deleteSmsTemplate, getSmsTemplate, getSmsTemplatePage, exportSmsTemplateExcel } from "@/api/system/sms/smsTemplate";
-import Editor from '@/components/Editor';
+import {  getSimpleSmsChannels } from "@/api/system/sms/smsChannel";
 
 export default {
   name: "SmsTemplate",
-  components: {
-    Editor,
-  },
   data() {
     return {
       // 遮罩层
@@ -172,18 +176,24 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        type: [{ required: true, message: "短信签名不能为空", trigger: "change" }],
+        type: [{ required: true, message: "短信类型不能为空", trigger: "change" }],
         status: [{ required: true, message: "开启状态不能为空", trigger: "blur" }],
         code: [{ required: true, message: "模板编码不能为空", trigger: "blur" }],
         name: [{ required: true, message: "模板名称不能为空", trigger: "blur" }],
         content: [{ required: true, message: "模板内容不能为空", trigger: "blur" }],
         apiTemplateId: [{ required: true, message: "短信 API 的模板编号不能为空", trigger: "blur" }],
         channelId: [{ required: true, message: "短信渠道编号不能为空", trigger: "change" }],
-      }
+      },
+      // 短信渠道
+      channelOptions: [],
     };
   },
   created() {
     this.getList();
+    // 获得短信渠道
+    getSimpleSmsChannels().then(response => {
+      this.channelOptions = response.data;
+    })
   },
   methods: {
     /** 查询列表 */
@@ -300,6 +310,15 @@ export default {
       }).then(response => {
         this.downloadExcel(response, '短信模板.xls');
       })
+    },
+    /** 格式化短信渠道 */
+    formatChannelSignature(channelId) {
+      for (const channel of this.channelOptions) {
+        if (channel.id === channelId) {
+          return channel.signature;
+        }
+      }
+      return '找不到签名：' + channelId;
     }
   }
 };
diff --git a/src/main/java/cn/iocoder/dashboard/common/pojo/CommonResult.java b/src/main/java/cn/iocoder/dashboard/common/pojo/CommonResult.java
index 0a56d334a..bb7fbc345 100644
--- a/src/main/java/cn/iocoder/dashboard/common/pojo/CommonResult.java
+++ b/src/main/java/cn/iocoder/dashboard/common/pojo/CommonResult.java
@@ -74,7 +74,7 @@ public class CommonResult<T> implements Serializable {
 
     @JsonIgnore // 避免 jackson 序列化
     public boolean isSuccess() {
-        return isSuccess(GlobalErrorCodeConstants.SUCCESS.getCode());
+        return isSuccess(code);
     }
 
     @JsonIgnore // 避免 jackson 序列化
diff --git a/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java b/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java
index 741410944..c0285afd3 100644
--- a/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java
+++ b/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java
@@ -15,17 +15,17 @@ public interface SmsFrameworkErrorCodeConstants {
     ErrorCode SMS_CHANNEL_API_KEY_MISSING = new ErrorCode(2001000101, "API Key 不存在");
     ErrorCode SMS_CHANNEL_PERMISSION_DENY = new ErrorCode(2001000102, "没有发送短信的权限");
 
-    // ========== 模板相关(200 开头) ==========
-    ErrorCode SMS_TEMPLATE_NOT_EXISTS = new ErrorCode(200, "短信模板不存在");
-    ErrorCode SMS_TEMPLATE_DISABLE = new ErrorCode(201, "短信模板被禁用"); // 例如说，我们在管理后台禁用了
-    ErrorCode SMS_TEMPLATE_INVALID = new ErrorCode(202, "短信模板不可用"); // 例如说，短信模板正在审核中
-    ErrorCode SMS_TEMPLATE_PARAM_ERROR = new ErrorCode(203, "模板参数不正确");
+    // ========== 模板相关(2001000200 开头) ==========
+    ErrorCode SMS_TEMPLATE_NOT_EXISTS = new ErrorCode(2001000200, "短信模板不存在");
+    ErrorCode SMS_TEMPLATE_DISABLE = new ErrorCode(2001000201, "短信模板被禁用"); // 例如说，我们在管理后台禁用了
+    ErrorCode SMS_TEMPLATE_INVALID = new ErrorCode(2001000202, "短信模板不可用"); // 例如说，短信模板正在审核中
+    ErrorCode SMS_TEMPLATE_PARAM_ERROR = new ErrorCode(2001000203, "模板参数不正确");
 
-    // ========== 其它相关(900 开头) ==========
-    ErrorCode SMS_API_PARAM_ERROR = new ErrorCode(900, "请求参数缺失");
+    // ========== 其它相关(2001000900 开头) ==========
+    ErrorCode SMS_API_PARAM_ERROR = new ErrorCode(2001000900, "请求参数缺失");
 
-    ErrorCode SMS_SEND_LIMIT_CONTROL = new ErrorCode(997, "业务限流"); // 将短信发送频率限制在正常的业务限流范围内。默认短信验证码：使用同一签名，对同一个手机号验证码，支持 1 条 / 分钟，5 条 / 小时，累计 10 条 / 天。
-    ErrorCode EXCEPTION = new ErrorCode(998, "调用异常");
-    ErrorCode SMS_UNKNOWN = new ErrorCode(999, "未知错误，需要解析");
+    ErrorCode SMS_SEND_LIMIT_CONTROL = new ErrorCode(2001000997, "业务限流"); // 将短信发送频率限制在正常的业务限流范围内。默认短信验证码：使用同一签名，对同一个手机号验证码，支持 1 条 / 分钟，5 条 / 小时，累计 10 条 / 天。
+    ErrorCode EXCEPTION = new ErrorCode(2001000998, "调用异常");
+    ErrorCode SMS_UNKNOWN = new ErrorCode(2001000999, "未知错误，需要解析");
 
 }
diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictDataController.java b/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictDataController.java
index cca874d7e..6eda1162d 100644
--- a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictDataController.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictDataController.java
@@ -61,7 +61,7 @@ public class SysDictDataController {
     @GetMapping("/list-all-simple")
     @ApiOperation(value = "获得全部字典数据列表", notes = "一般用于管理后台缓存字典数据在本地")
     // 无需添加权限认证，因为前端全局都需要
-    public CommonResult<List<SysDictDataSimpleVO>> getSimpleDictDatas() {
+    public CommonResult<List<SysDictDataSimpleRespVO>> getSimpleDictDatas() {
         List<SysDictDataDO> list = dictDataService.getDictDatas();
         return success(SysDictDataConvert.INSTANCE.convertList(list));
     }
diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataSimpleVO.java b/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataSimpleRespVO.java
similarity index 86%
rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataSimpleVO.java
rename to src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataSimpleRespVO.java
index afddd5fa9..a9e5aae8a 100644
--- a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataSimpleVO.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataSimpleRespVO.java
@@ -4,9 +4,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-@ApiModel("数据字典精简 VO")
+@ApiModel("数据字典精简 Response VO")
 @Data
-public class SysDictDataSimpleVO {
+public class SysDictDataSimpleRespVO {
 
     @ApiModelProperty(value = "字典类型", required = true, example = "gender")
     private String dictType;
diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsChannelController.java b/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsChannelController.java
index cc7b496aa..1e1a916c1 100644
--- a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsChannelController.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsChannelController.java
@@ -2,10 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.sms;
 
 import cn.iocoder.dashboard.common.pojo.CommonResult;
 import cn.iocoder.dashboard.common.pojo.PageResult;
-import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelCreateReqVO;
-import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelPageReqVO;
-import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelRespVO;
-import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelUpdateReqVO;
+import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.*;
 import cn.iocoder.dashboard.modules.system.convert.sms.SysSmsChannelConvert;
 import cn.iocoder.dashboard.modules.system.dal.dataobject.sms.SysSmsChannelDO;
 import cn.iocoder.dashboard.modules.system.service.sms.SysSmsChannelService;
@@ -17,6 +14,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.util.Comparator;
+import java.util.List;
 
 import static cn.iocoder.dashboard.common.pojo.CommonResult.success;
 
@@ -69,4 +68,13 @@ public class SysSmsChannelController {
         return success(SysSmsChannelConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @GetMapping("/list-all-simple")
+    @ApiOperation(value = "获得短信渠道精简列表", notes = "包含被禁用的短信渠道")
+    public CommonResult<List<SysSmsChannelSimpleRespVO>> getSimpleSmsChannels() {
+        List<SysSmsChannelDO> list = smsChannelService.getSmsChannelList();
+        // 排序后，返回给前端
+        list.sort(Comparator.comparing(SysSmsChannelDO::getId));
+        return success(SysSmsChannelConvert.INSTANCE.convertList03(list));
+    }
+
 }
diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsTemplateController.http b/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsTemplateController.http
new file mode 100644
index 000000000..d5441d057
--- /dev/null
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsTemplateController.http
@@ -0,0 +1,12 @@
+### 请求 /menu/list 接口 => 成功
+POST {{baseUrl}}/system/sms-template/send-sms
+Authorization: Bearer {{token}}
+Content-Type: application/json
+
+{
+  "code": "test_01",
+  "params": {
+    "key01": "value01",
+    "key02": "value02"
+  }
+}
diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsTemplateController.java b/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsTemplateController.java
index c70cbc9f8..061ea7632 100644
--- a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsTemplateController.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsTemplateController.java
@@ -84,4 +84,11 @@ public class SysSmsTemplateController {
         ExcelUtils.write(response, "短信模板.xls", "数据", SysSmsTemplateExcelVO.class, datas);
     }
 
+    @PostMapping("/send-sms")
+    @ApiOperation("导出短信模板 Excel")
+    @PreAuthorize("@ss.hasPermission('system:sms-template:send-sms')")
+    public CommonResult<Boolean> sendSms(@Valid @RequestBody SysSmsTemplateSendReqVO sendReqVO) {
+        return success(true);
+    }
+
 }
diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelSimpleRespVO.java b/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelSimpleRespVO.java
new file mode 100644
index 000000000..b7d84165c
--- /dev/null
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelSimpleRespVO.java
@@ -0,0 +1,24 @@
+package cn.iocoder.dashboard.modules.system.controller.sms.vo.channel;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@ApiModel("短信渠道精简 Response VO")
+@Data
+public class SysSmsChannelSimpleRespVO {
+
+    @ApiModelProperty(value = "编号", required = true, example = "1024")
+    @NotNull(message = "编号不能为空")
+    private Long id;
+
+    @ApiModelProperty(value = "短信签名", required = true, example = "芋道源码")
+    @NotNull(message = "短信签名不能为空")
+    private String signature;
+
+    @ApiModelProperty(value = "渠道编码", required = true, example = "YUN_PIAN", notes = "参见 SmsChannelEnum 枚举类")
+    private String code;
+
+}
diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateSendReqVO.java b/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateSendReqVO.java
new file mode 100644
index 000000000..7515deadb
--- /dev/null
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateSendReqVO.java
@@ -0,0 +1,21 @@
+package cn.iocoder.dashboard.modules.system.controller.sms.vo.template;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.Map;
+
+@ApiModel("短信模板的发送 Request VO")
+@Data
+public class SysSmsTemplateSendReqVO {
+
+    @ApiModelProperty(value = "模板编码", required = true, example = "test_01")
+    @NotNull(message = "模板编码不能为空")
+    private String code;
+
+    @ApiModelProperty(value = "模板参数")
+    private Map<String, Object> params;
+
+}
diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictDataConvert.java b/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictDataConvert.java
index 9c73a8c11..af8fda25e 100644
--- a/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictDataConvert.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictDataConvert.java
@@ -13,7 +13,7 @@ public interface SysDictDataConvert {
 
     SysDictDataConvert INSTANCE = Mappers.getMapper(SysDictDataConvert.class);
 
-    List<SysDictDataSimpleVO> convertList(List<SysDictDataDO> list);
+    List<SysDictDataSimpleRespVO> convertList(List<SysDictDataDO> list);
 
     SysDictDataRespVO convert(SysDictDataDO bean);
 
diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsChannelConvert.java b/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsChannelConvert.java
index 11b036a86..f8a0e71e2 100644
--- a/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsChannelConvert.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsChannelConvert.java
@@ -4,6 +4,7 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties;
 import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelCreateReqVO;
 import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelRespVO;
+import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelSimpleRespVO;
 import cn.iocoder.dashboard.modules.system.controller.sms.vo.channel.SysSmsChannelUpdateReqVO;
 import cn.iocoder.dashboard.modules.system.dal.dataobject.sms.SysSmsChannelDO;
 import org.mapstruct.Mapper;
@@ -33,4 +34,6 @@ public interface SysSmsChannelConvert {
 
     List<SmsChannelProperties> convertList02(List<SysSmsChannelDO> list);
 
+    List<SysSmsChannelSimpleRespVO> convertList03(List<SysSmsChannelDO> list);
+
 }
diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/enums/SysErrorCodeConstants.java b/src/main/java/cn/iocoder/dashboard/modules/system/enums/SysErrorCodeConstants.java
index e9eb648ac..77046bb96 100644
--- a/src/main/java/cn/iocoder/dashboard/modules/system/enums/SysErrorCodeConstants.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/enums/SysErrorCodeConstants.java
@@ -31,7 +31,7 @@ public interface SysErrorCodeConstants {
     // ========== 角色模块 1002003000 ==========
     ErrorCode ROLE_NOT_EXISTS = new ErrorCode(1002003000, "角色不存在");
     ErrorCode ROLE_NAME_DUPLICATE = new ErrorCode(1002003001, "已经存在名为【{}}】的角色");
-    ErrorCode ROLE_CODE_DUPLICATE = new ErrorCode(1002003002, "已经存在编码为【{}}】的角色");
+    ErrorCode ROLE_CODE_DUPLICATE = new ErrorCode(1002003002, "已经存在编码为【{}】的角色");
     ErrorCode ROLE_CAN_NOT_UPDATE_SYSTEM_TYPE_ROLE = new ErrorCode(1002003004, "不能操作类型为系统内置的角色");
 
     // ========== 用户模块 1002004000 ==========
@@ -84,7 +84,7 @@ public interface SysErrorCodeConstants {
 
     // ========== 短信模板 1002011000 ==========
     ErrorCode SMS_TEMPLATE_NOT_EXISTS = new ErrorCode(1002011000, "短信模板不存在");
-    ErrorCode SMS_TEMPLATE_CODE_DUPLICATE = new ErrorCode(1002011001, "已经存在编码为【{}}】的短信模板");
+    ErrorCode SMS_TEMPLATE_CODE_DUPLICATE = new ErrorCode(1002011001, "已经存在编码为【{}】的短信模板");
 
     // ========== 短信发送 1002012000 ==========
     ErrorCode SMS_SEND_MOBILE_NOT_EXISTS = new ErrorCode(1002012000, "手机号不存在");
diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelService.java b/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelService.java
index 6864bf6f6..c53d85e05 100644
--- a/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelService.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelService.java
@@ -61,6 +61,13 @@ public interface SysSmsChannelService {
      */
     List<SysSmsChannelDO> getSmsChannelList(Collection<Long> ids);
 
+    /**
+     * 获得所有短信渠道列表
+     *
+     * @return 短信渠道列表
+     */
+    List<SysSmsChannelDO> getSmsChannelList();
+
     /**
      * 获得短信渠道分页
      *
diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsChannelServiceImpl.java b/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsChannelServiceImpl.java
index 70c176c76..859a0dea8 100644
--- a/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsChannelServiceImpl.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsChannelServiceImpl.java
@@ -90,6 +90,11 @@ public class SysSmsChannelServiceImpl implements SysSmsChannelService {
         return smsChannelMapper.selectBatchIds(ids);
     }
 
+    @Override
+    public List<SysSmsChannelDO> getSmsChannelList() {
+        return smsChannelMapper.selectList();
+    }
+
     @Override
     public PageResult<SysSmsChannelDO> getSmsChannelPage(SysSmsChannelPageReqVO pageReqVO) {
         return smsChannelMapper.selectPage(pageReqVO);
diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsTemplateServiceImpl.java b/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsTemplateServiceImpl.java
index fc1c0dc5f..0d3b00b4b 100644
--- a/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsTemplateServiceImpl.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsTemplateServiceImpl.java
@@ -162,10 +162,10 @@ public class SysSmsTemplateServiceImpl implements SysSmsTemplateService {
         }
         // 如果 id 为空，说明不用比较是否为相同 id 的字典类型
         if (id == null) {
-            throw exception(SMS_TEMPLATE_CODE_DUPLICATE);
+            throw exception(SMS_TEMPLATE_CODE_DUPLICATE, code);
         }
         if (!template.getId().equals(id)) {
-            throw exception(SMS_TEMPLATE_CODE_DUPLICATE);
+            throw exception(SMS_TEMPLATE_CODE_DUPLICATE, code);
         }
     }
 
diff --git a/src/main/resources/codegen/vue/views/index.vue.vm b/src/main/resources/codegen/vue/views/index.vue.vm
index 73115fd77..2146076d3 100644
--- a/src/main/resources/codegen/vue/views/index.vue.vm
+++ b/src/main/resources/codegen/vue/views/index.vue.vm
@@ -137,7 +137,7 @@
           </el-select>
         </el-form-item>
 #elseif($column.htmlType == "checkbox")## 多选框
-        <el-form-item label="${comment}">
+        <el-form-item label="${comment}" prop="${javaField}">
           <el-checkbox-group v-model="form.${javaField}">
     #if ("" != $dictType)## 有数据字典
             <el-checkbox v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"
@@ -148,7 +148,7 @@
           </el-checkbox-group>
         </el-form-item>
 #elseif($column.htmlType == "radio")## 单选框
-        <el-form-item label="${comment}">
+        <el-form-item label="${comment}" prop="${javaField}">
           <el-radio-group v-model="form.${javaField}">
     #if ("" != $dictType)## 有数据字典
             <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.$dictType.toUpperCase())"