From 025be43257d6a1816cc707541c8f2336d8464ab6 Mon Sep 17 00:00:00 2001 From: GoCo Date: Sat, 9 Aug 2025 01:36:44 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8E=A5=E5=8F=A3&=E7=A4=BA=E4=BE=8B?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CourseBizController.java} | 37 ++++-- .../modules/biz/service/CourseBizService.java | 24 ++++ .../service/impl/CourseBizServiceImpl.java | 116 ++++++++++++++++++ .../test/controller/TestTableController.java | 22 ++-- .../{learn => gen}/test/entity/TestTable.java | 4 +- .../test/mapper/TestTableMapper.java | 6 +- .../test/mapper/xml/TestTableMapper.xml | 2 +- .../test/service/ITestTableService.java | 6 +- .../service/impl/TestTableServiceImpl.java | 10 +- .../resources/jeecg/jeecg_config.properties | 2 +- .../src/views/{ => gen}/test/TestTable.api.ts | 14 +-- .../views/{ => gen}/test/TestTable.data.ts | 0 .../views/{ => gen}/test/TestTableList.vue | 14 +-- .../test/components/TestTableForm.vue | 2 +- .../test/components/TestTableModal.vue | 0 .../V20250808_1__menu_insert_TestTable.sql | 26 ---- 16 files changed, 210 insertions(+), 75 deletions(-) rename jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/{learn/business/controller/CourseBusinessController.java => biz/controller/CourseBizController.java} (52%) create mode 100644 jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/biz/service/CourseBizService.java create mode 100644 jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/biz/service/impl/CourseBizServiceImpl.java rename jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/{learn => gen}/test/controller/TestTableController.java (90%) rename jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/{learn => gen}/test/entity/TestTable.java (96%) rename jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/{learn => gen}/test/mapper/TestTableMapper.java (68%) rename jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/{learn => gen}/test/mapper/xml/TestTableMapper.xml (68%) rename jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/{learn => gen}/test/service/ITestTableService.java (62%) rename jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/{learn => gen}/test/service/impl/TestTableServiceImpl.java (55%) rename jeecgboot-vue3/src/views/{ => gen}/test/TestTable.api.ts (80%) rename jeecgboot-vue3/src/views/{ => gen}/test/TestTable.data.ts (100%) rename jeecgboot-vue3/src/views/{ => gen}/test/TestTableList.vue (88%) rename jeecgboot-vue3/src/views/{ => gen}/test/components/TestTableForm.vue (97%) rename jeecgboot-vue3/src/views/{ => gen}/test/components/TestTableModal.vue (100%) delete mode 100644 jeecgboot-vue3/src/views/test/V20250808_1__menu_insert_TestTable.sql diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/business/controller/CourseBusinessController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/biz/controller/CourseBizController.java similarity index 52% rename from jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/business/controller/CourseBusinessController.java rename to jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/biz/controller/CourseBizController.java index af3b9a7a..60ec168b 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/business/controller/CourseBusinessController.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/biz/controller/CourseBizController.java @@ -1,32 +1,35 @@ -package org.jeecg.modules.learn.business.controller; +package org.jeecg.modules.biz.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; -import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.system.vo.LoginUser; -import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.shiro.IgnoreAuth; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + import org.jeecg.common.system.api.ISysBaseAPI; +import org.jeecg.modules.biz.service.CourseBizService; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -@Tag(name="课程") +@Tag(name = "课程") @RestController -@RequestMapping("/business/course") +@RequestMapping("/biz/course") @Slf4j -public class CourseBusinessController { +public class CourseBizController { @GetMapping("/test") - @Operation(summary="测试") + @Operation(summary = "测试") @IgnoreAuth public Result test() { return Result.OK("test"); @@ -34,9 +37,11 @@ public class CourseBusinessController { @Autowired private ISysBaseAPI sysBaseApi; + @Autowired + private CourseBizService courseBusinessService; @GetMapping("/test2") - @Operation(summary="测试2") + @Operation(summary = "测试2") public Result test2(HttpServletRequest request, HttpServletResponse response) { String token = request.getHeader(CommonConstant.X_ACCESS_TOKEN); String username = JwtUtil.getUsername(token); @@ -44,4 +49,20 @@ public class CourseBusinessController { return Result.OK(sysUser.toString()); } + @GetMapping("/test3") + @Operation(summary = "测试3") + @IgnoreAuth + public Result test3() { + long count = courseBusinessService.count(); + return Result.OK(count); + } + + @PostMapping("/upload") + @Operation(summary = "课程视频文件上传", description = "课程视频文件上传，返回m3u8文件地址") + @IgnoreAuth + public Result upload(@RequestParam("file") MultipartFile file, HttpServletRequest request) throws Exception { + if (file == null || file.isEmpty()) return Result.error("没有找到上传的文件"); + String url = courseBusinessService.uploadHls(file, request); + return Result.OK(url); + } } diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/biz/service/CourseBizService.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/biz/service/CourseBizService.java new file mode 100644 index 00000000..84ee7ac9 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/biz/service/CourseBizService.java @@ -0,0 +1,24 @@ +package org.jeecg.modules.biz.service; + +import javax.servlet.http.HttpServletRequest; + +import org.jeecg.modules.gen.test.entity.TestTable; +import org.springframework.web.multipart.MultipartFile; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 课程业务 + */ +public interface CourseBizService extends IService { + + /** + * 上传视频并切片为 HLS（m3u8+ts），按配置(local|minio|alioss)上传，返回 m3u8 的路径/URL + * @param file 上传的视频文件 + * @param request 用于读取 header 或环境配置 + * @return m3u8 路径/URL + * @throws Exception 处理异常 + */ + String uploadHls(MultipartFile file, HttpServletRequest request) throws Exception; +} + + diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/biz/service/impl/CourseBizServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/biz/service/impl/CourseBizServiceImpl.java new file mode 100644 index 00000000..422711d7 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/biz/service/impl/CourseBizServiceImpl.java @@ -0,0 +1,116 @@ +package org.jeecg.modules.biz.service.impl; + +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.util.CommonUtils; +import org.jeecg.common.util.MinioUtil; +import org.jeecg.common.util.SpringContextUtils; +import org.jeecg.common.util.oss.OssBootUtil; +import org.jeecg.modules.biz.service.CourseBizService; +import org.jeecg.modules.gen.test.mapper.TestTableMapper; +import org.jeecg.modules.gen.test.entity.TestTable; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardCopyOption; +import java.util.*; +import java.util.concurrent.TimeUnit; +import java.util.stream.Stream; + +@Slf4j +@Service +public class CourseBizServiceImpl extends ServiceImpl implements CourseBizService { + + @Override + public String uploadHls(MultipartFile file, HttpServletRequest request) throws Exception { + // 读取上传类型（header 优先） + String headerUploadType = request.getHeader("uploadType"); + String configUploadType = SpringContextUtils.getApplicationContext().getEnvironment().getProperty("jeecg.uploadType", "minio"); + String uploadType = (headerUploadType != null && headerUploadType.trim().length() > 0) ? headerUploadType : configUploadType; + + // 1) 保存临时原始视频 + String uuid = UUID.randomUUID().toString(); + String tmpRoot = System.getProperty("java.io.tmpdir"); + Path tmpVideoDir = Path.of(tmpRoot, "jeecg", "video", uuid); + Path hlsDir = Path.of(tmpRoot, "jeecg", "hls", uuid); + Files.createDirectories(tmpVideoDir); + Files.createDirectories(hlsDir); + + String original = CommonUtils.getFileName(Objects.requireNonNull(file.getOriginalFilename())); + Path tmpVideoFile = tmpVideoDir.resolve(original); + Files.copy(file.getInputStream(), tmpVideoFile, StandardCopyOption.REPLACE_EXISTING); + + // 2) ffmpeg 切片 + Path m3u8Path = hlsDir.resolve(uuid + ".m3u8"); + List cmd = Arrays.asList( + "ffmpeg", "-i", tmpVideoFile.toString(), + "-c:v", "libx264", "-c:a", "aac", + "-hls_time", "10", "-hls_playlist_type", "vod", + m3u8Path.toString()); + Process p = new ProcessBuilder(cmd).redirectErrorStream(true).start(); + boolean ok = p.waitFor(10, TimeUnit.MINUTES) && p.exitValue() == 0; + if (!ok) { + deleteQuietly(hlsDir.toFile()); + deleteQuietly(tmpVideoDir.toFile()); + throw new RuntimeException("ffmpeg切片超时"); + } + + // 3) 上传切片 + String m3u8Url = ""; + String base = "video/hls/" + uuid; + try (Stream paths = Files.list(hlsDir)) { + for (Path f : (Iterable) paths::iterator) { + if (!Files.isRegularFile(f)) continue; + String rel = base + "/" + f.getFileName().toString(); + try (InputStream in = Files.newInputStream(f)) { + if ("minio".equals(uploadType)) { + String tmpUrl = MinioUtil.upload(in, rel); + if (f.getFileName().toString().endsWith(".m3u8")) { + m3u8Url = tmpUrl; + } + } else if ("alioss".equals(uploadType)) { + OssBootUtil.upload(in, rel); + if (f.getFileName().toString().endsWith(".m3u8")) { + m3u8Url = rel; // 可在网关拼域名 + } + } else { + String uploadpath = SpringContextUtils.getApplicationContext().getEnvironment().getProperty("jeecg.path.upload"); + Path target = Path.of(uploadpath, rel); + Files.createDirectories(target.getParent()); + Files.copy(f, target, StandardCopyOption.REPLACE_EXISTING); + if (f.getFileName().toString().endsWith(".m3u8")) { + m3u8Url = rel; // local 返回相对路径 + } + } + } + } + } finally { + deleteQuietly(hlsDir.toFile()); + deleteQuietly(tmpVideoDir.toFile()); + } + + return m3u8Url; + } + + /** 删除临时目录文件 */ + private static void deleteQuietly(File file) { + try { + if (file == null || !file.exists()) return; + if (file.isDirectory()) { + File[] children = file.listFiles(); + if (children != null) { + for (File c : children) deleteQuietly(c); + } + } + file.delete(); + } catch (Exception ignored) {} + } +} + + diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/test/controller/TestTableController.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/test/controller/TestTableController.java similarity index 90% rename from jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/test/controller/TestTableController.java rename to jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/test/controller/TestTableController.java index c399bbf9..6140e302 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/test/controller/TestTableController.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/test/controller/TestTableController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.learn.test.controller; +package org.jeecg.modules.gen.test.controller; import java.util.Arrays; import java.util.HashMap; @@ -14,8 +14,8 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.learn.test.entity.TestTable; -import org.jeecg.modules.learn.test.service.ITestTableService; +import org.jeecg.modules.gen.test.entity.TestTable; +import org.jeecg.modules.gen.test.service.ITestTableService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -41,12 +41,12 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; /** * @Description: 测试表 * @Author: jeecg-boot - * @Date: 2025-08-08 + * @Date: 2025-08-09 * @Version: V1.0 */ @Tag(name="测试表") @RestController -@RequestMapping("/test/testTable") +@RequestMapping("/gen/test/testTable") @Slf4j public class TestTableController extends JeecgController { @Autowired @@ -84,7 +84,7 @@ public class TestTableController extends JeecgController add(@RequestBody TestTable testTable) { testTableService.save(testTable); @@ -100,7 +100,7 @@ public class TestTableController extends JeecgController edit(@RequestBody TestTable testTable) { testTableService.updateById(testTable); @@ -115,7 +115,7 @@ public class TestTableController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { testTableService.removeById(id); @@ -130,7 +130,7 @@ public class TestTableController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.testTableService.removeByIds(Arrays.asList(ids.split(","))); @@ -160,7 +160,7 @@ public class TestTableController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, TestTable.class); diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/test/entity/TestTable.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/test/entity/TestTable.java similarity index 96% rename from jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/test/entity/TestTable.java rename to jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/test/entity/TestTable.java index d6755ba4..be9a4f99 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/test/entity/TestTable.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/test/entity/TestTable.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.learn.test.entity; +package org.jeecg.modules.gen.test.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; @@ -22,7 +22,7 @@ import lombok.experimental.Accessors; /** * @Description: 测试表 * @Author: jeecg-boot - * @Date: 2025-08-08 + * @Date: 2025-08-09 * @Version: V1.0 */ @Data diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/test/mapper/TestTableMapper.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/test/mapper/TestTableMapper.java similarity index 68% rename from jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/test/mapper/TestTableMapper.java rename to jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/test/mapper/TestTableMapper.java index b6cb58ec..05a7c167 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/test/mapper/TestTableMapper.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/test/mapper/TestTableMapper.java @@ -1,15 +1,15 @@ -package org.jeecg.modules.learn.test.mapper; +package org.jeecg.modules.gen.test.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.learn.test.entity.TestTable; +import org.jeecg.modules.gen.test.entity.TestTable; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 测试表 * @Author: jeecg-boot - * @Date: 2025-08-08 + * @Date: 2025-08-09 * @Version: V1.0 */ public interface TestTableMapper extends BaseMapper { diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/test/mapper/xml/TestTableMapper.xml b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/test/mapper/xml/TestTableMapper.xml similarity index 68% rename from jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/test/mapper/xml/TestTableMapper.xml rename to jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/test/mapper/xml/TestTableMapper.xml index a0cf64ab..cf045dee 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/test/mapper/xml/TestTableMapper.xml +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/test/mapper/xml/TestTableMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/test/service/ITestTableService.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/test/service/ITestTableService.java similarity index 62% rename from jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/test/service/ITestTableService.java rename to jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/test/service/ITestTableService.java index 7a84d653..332cf9f3 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/test/service/ITestTableService.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/test/service/ITestTableService.java @@ -1,12 +1,12 @@ -package org.jeecg.modules.learn.test.service; +package org.jeecg.modules.gen.test.service; -import org.jeecg.modules.learn.test.entity.TestTable; +import org.jeecg.modules.gen.test.entity.TestTable; import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 测试表 * @Author: jeecg-boot - * @Date: 2025-08-08 + * @Date: 2025-08-09 * @Version: V1.0 */ public interface ITestTableService extends IService { diff --git a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/test/service/impl/TestTableServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/test/service/impl/TestTableServiceImpl.java similarity index 55% rename from jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/test/service/impl/TestTableServiceImpl.java rename to jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/test/service/impl/TestTableServiceImpl.java index 948e8cd1..530e96b0 100644 --- a/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/learn/test/service/impl/TestTableServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module/jeecg-module-learn/src/main/java/org/jeecg/modules/gen/test/service/impl/TestTableServiceImpl.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.learn.test.service.impl; +package org.jeecg.modules.gen.test.service.impl; -import org.jeecg.modules.learn.test.entity.TestTable; -import org.jeecg.modules.learn.test.mapper.TestTableMapper; -import org.jeecg.modules.learn.test.service.ITestTableService; +import org.jeecg.modules.gen.test.entity.TestTable; +import org.jeecg.modules.gen.test.mapper.TestTableMapper; +import org.jeecg.modules.gen.test.service.ITestTableService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 测试表 * @Author: jeecg-boot - * @Date: 2025-08-08 + * @Date: 2025-08-09 * @Version: V1.0 */ @Service diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_config.properties b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_config.properties index 7dfee0a2..5e820469 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_config.properties +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_config.properties @@ -1,7 +1,7 @@ #code_generate_project_path project_path=E:\\workspace\\jeecg-boot #bussi_package[User defined] -bussi_package=org.jeecg.modules.learn +bussi_package=org.jeecg.modules #default code path diff --git a/jeecgboot-vue3/src/views/test/TestTable.api.ts b/jeecgboot-vue3/src/views/gen/test/TestTable.api.ts similarity index 80% rename from jeecgboot-vue3/src/views/test/TestTable.api.ts rename to jeecgboot-vue3/src/views/gen/test/TestTable.api.ts index dc4e4e65..11cc6fad 100644 --- a/jeecgboot-vue3/src/views/test/TestTable.api.ts +++ b/jeecgboot-vue3/src/views/gen/test/TestTable.api.ts @@ -4,13 +4,13 @@ import { useMessage } from "/@/hooks/web/useMessage"; const { createConfirm } = useMessage(); enum Api { - list = '/test/testTable/list', - save='/test/testTable/add', - edit='/test/testTable/edit', - deleteOne = '/test/testTable/delete', - deleteBatch = '/test/testTable/deleteBatch', - importExcel = '/test/testTable/importExcel', - exportXls = '/test/testTable/exportXls', + list = '/gen/test/testTable/list', + save='/gen/test/testTable/add', + edit='/gen/test/testTable/edit', + deleteOne = '/gen/test/testTable/delete', + deleteBatch = '/gen/test/testTable/deleteBatch', + importExcel = '/gen/test/testTable/importExcel', + exportXls = '/gen/test/testTable/exportXls', } /** * 导出api diff --git a/jeecgboot-vue3/src/views/test/TestTable.data.ts b/jeecgboot-vue3/src/views/gen/test/TestTable.data.ts similarity index 100% rename from jeecgboot-vue3/src/views/test/TestTable.data.ts rename to jeecgboot-vue3/src/views/gen/test/TestTable.data.ts diff --git a/jeecgboot-vue3/src/views/test/TestTableList.vue b/jeecgboot-vue3/src/views/gen/test/TestTableList.vue similarity index 88% rename from jeecgboot-vue3/src/views/test/TestTableList.vue rename to jeecgboot-vue3/src/views/gen/test/TestTableList.vue index acf8f4b7..f6450f4c 100644 --- a/jeecgboot-vue3/src/views/test/TestTableList.vue +++ b/jeecgboot-vue3/src/views/gen/test/TestTableList.vue @@ -4,9 +4,9 @@ -