From bbb5bed7da24311b07e2c012246384e5f8fd195e Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 22 Apr 2022 22:47:45 +0800
Subject: [PATCH 1/4] =?UTF-8?q?1.=20=E6=96=B0=E5=A2=9E=E3=80=8A=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=96=87=E6=A1=A3=E3=80=8B=E3=80=8A=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E3=80=8B=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin/src/views/infra/swagger/index.vue | 5 ++++-
 yudao-ui-admin/src/views/system/menu/index.vue   | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/yudao-ui-admin/src/views/infra/swagger/index.vue b/yudao-ui-admin/src/views/infra/swagger/index.vue
index e33bf251c..70c1deb3f 100644
--- a/yudao-ui-admin/src/views/infra/swagger/index.vue
+++ b/yudao-ui-admin/src/views/infra/swagger/index.vue
@@ -1,5 +1,8 @@
 <template>
-  <i-frame :src="url" />
+  <div>
+    <doc-alert title="接口文档" url="https://doc.iocoder.cn/api-doc/" />
+    <i-frame :src="url" />
+  </div>
 </template>
 <script>
 import iFrame from "@/components/iFrame/index";
diff --git a/yudao-ui-admin/src/views/system/menu/index.vue b/yudao-ui-admin/src/views/system/menu/index.vue
index 9e53108b7..117b4b40c 100644
--- a/yudao-ui-admin/src/views/system/menu/index.vue
+++ b/yudao-ui-admin/src/views/system/menu/index.vue
@@ -1,6 +1,8 @@
 <template>
   <div class="app-container">
     <doc-alert title="功能权限" url="https://doc.iocoder.cn/resource-permission" />
+    <doc-alert title="菜单路由" url="https://doc.iocoder.cn/vue2/route/" />
+    <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="菜单名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入菜单名称" clearable @keyup.enter.native="handleQuery"/>

From 6e404697353ccc4c2c7e797e4da7d41098d59c96 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 23 Apr 2022 01:30:15 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8=E5=A4=96?=
 =?UTF-8?q?=E9=93=BE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin/src/views/system/menu/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/yudao-ui-admin/src/views/system/menu/index.vue b/yudao-ui-admin/src/views/system/menu/index.vue
index 117b4b40c..6467698ed 100644
--- a/yudao-ui-admin/src/views/system/menu/index.vue
+++ b/yudao-ui-admin/src/views/system/menu/index.vue
@@ -189,6 +189,7 @@ import IconSelect from "@/components/IconSelect";
 
 import { SystemMenuTypeEnum, CommonStatusEnum } from '@/utils/constants'
 import { getDictDatas, DICT_TYPE } from '@/utils/dict'
+import {isExternal} from "@/utils/validate";
 
 export default {
   name: "Menu",
@@ -346,7 +347,7 @@ export default {
             || this.form.type === SystemMenuTypeEnum.MENU) {
             // 如果是外链，则不进行校验
             const path = this.form.path
-            if (path.indexOf('http://') === -1 || path.indexOf('https://') === -1) {
+            if (!isExternal(path)) {
               // 父权限为根节点，path 必须以 / 开头
               if (this.form.parentId === 0 && path.charAt(0) !== '/') {
                 this.$modal.msgSuccess('前端必须以 / 开头')

From 76d310610ba4de3327c63ff62b11bd7524763c80 Mon Sep 17 00:00:00 2001
From: jeromesoar <jeromesoar@gmail.com>
Date: Sun, 24 Apr 2022 22:32:59 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix(=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

导出 Excel 文件的文件名, 代码生成解析异常.
---
 .../src/main/resources/codegen/vue/views/index.vue.vm           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
index aac0c27b6..1f25fb233 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
@@ -390,7 +390,7 @@ export default {
           this.exportLoading = true;
           return export${simpleClassName}Excel(params);
         }).then(response => {
-          this.$download.excel(response, '${table.classComment}.xls');
+          this.$download.excel(response, "${table.classComment}.xls");
           this.exportLoading = false;
         }).catch(() => {});
     }

From 8391898b266b2cc02bbe9d9c94b36bddb9d3b73e Mon Sep 17 00:00:00 2001
From: jeromesoar <jeromesoar@gmail.com>
Date: Sun, 24 Apr 2022 22:43:26 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix(=E5=89=8D=E7=AB=AF=20ImageUpload=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 前端 ImageUpload 组件, 上传路径以及地址拼接
- 基础设施-文件上传, 新增简单上传接口
---
 .../controller/admin/file/FileController.java  | 18 ++++++++++++++++++
 .../admin/file/vo/file/SimpleUploadRespVO.java | 16 ++++++++++++++++
 .../src/components/ImageUpload/index.vue       | 13 +++++++------
 3 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/SimpleUploadRespVO.java

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
index e3d810dec..071c89f43 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
@@ -1,11 +1,14 @@
 package cn.iocoder.yudao.module.infra.controller.admin.file;
 
+import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
 import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.FilePageReqVO;
 import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.FileRespVO;
+import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.SimpleUploadRespVO;
 import cn.iocoder.yudao.module.infra.convert.file.FileConvert;
 import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
@@ -47,6 +50,21 @@ public class FileController {
         return success(fileService.createFile(path, IoUtil.readBytes(file.getInputStream())));
     }
 
+    @PostMapping("/simple-upload")
+    @ApiOperation("简单上传文件")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "文件附件", required = true, dataTypeClass = MultipartFile.class),
+    })
+    public CommonResult<SimpleUploadRespVO> uploadFile(@RequestParam("file") MultipartFile file) throws Exception {
+        SimpleUploadRespVO simpleUploadRespVO = new SimpleUploadRespVO();
+        simpleUploadRespVO.setFileName(file.getOriginalFilename());
+        // TODO 日期路径, 随机文件名
+        String path = IdUtil.fastSimpleUUID() + "." + FileUtil.extName(file.getOriginalFilename());
+        String fileUrl = fileService.createFile(path, IoUtil.readBytes(file.getInputStream()));
+        simpleUploadRespVO.setFileUrl(fileUrl);
+        return success(simpleUploadRespVO);
+    }
+
     @DeleteMapping("/delete")
     @ApiOperation("删除文件")
     @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class)
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/SimpleUploadRespVO.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/SimpleUploadRespVO.java
new file mode 100644
index 000000000..369d9f578
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/SimpleUploadRespVO.java
@@ -0,0 +1,16 @@
+package cn.iocoder.yudao.module.infra.controller.admin.file.vo.file;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "管理后台 - 简单上传文件 VO", description = "简单上传文件, 不需要 path")
+public class SimpleUploadRespVO {
+
+    @ApiModelProperty(value = "文件名", required = true, example = "yudao.jpg")
+    private String fileName;
+
+    @ApiModelProperty(value = "文件 URL", required = true, example = "https://www.iocoder.cn/yudao.jpg")
+    private String fileUrl;
+}
diff --git a/yudao-ui-admin/src/components/ImageUpload/index.vue b/yudao-ui-admin/src/components/ImageUpload/index.vue
index 170c1bd08..0abe65a6b 100644
--- a/yudao-ui-admin/src/components/ImageUpload/index.vue
+++ b/yudao-ui-admin/src/components/ImageUpload/index.vue
@@ -43,7 +43,7 @@
 </template>
 
 <script>
-import { getToken } from "@/utils/auth";
+import {getToken} from "@/utils/auth";
 
 export default {
   props: {
@@ -77,7 +77,7 @@ export default {
       dialogVisible: false,
       hideUpload: false,
       baseUrl: process.env.VUE_APP_BASE_API,
-      uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
+      uploadImgUrl: process.env.VUE_APP_BASE_API + "/admin-api/infra/file/simple-upload", // 上传的图片服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),
       },
@@ -93,10 +93,11 @@ export default {
           // 然后将数组转为对象数组
           this.fileList = list.map(item => {
             if (typeof item === "string") {
-              if (item.indexOf(this.baseUrl) === -1) {
-                item = { name: this.baseUrl + item, url: this.baseUrl + item };
+              // 不带有 http 的路径, 才拼接 baseUrl.
+              if (item.indexOf("http") === -1) {
+                item = {name: this.baseUrl + item, url: this.baseUrl + item};
               } else {
-                item = { name: item, url: item };
+                item = {name: item, url: item};
               }
             }
             return item;
@@ -127,7 +128,7 @@ export default {
     },
     // 上传成功回调
     handleUploadSuccess(res) {
-      this.uploadList.push({ name: res.fileName, url: res.fileName });
+      this.uploadList.push({name: res.data.fileName, url: res.data.fileUrl});
       if (this.uploadList.length === this.number) {
         this.fileList = this.fileList.concat(this.uploadList);
         this.uploadList = [];