diff --git a/Spring-ZY-crud/src/main/java/com/ycjy/common/JwtUtil.java b/Spring-ZY-crud/src/main/java/com/ycjy/common/JwtUtil.java index 12bb965..911678a 100644 --- a/Spring-ZY-crud/src/main/java/com/ycjy/common/JwtUtil.java +++ b/Spring-ZY-crud/src/main/java/com/ycjy/common/JwtUtil.java @@ -36,5 +36,4 @@ public class JwtUtil { return null; } } - } diff --git a/Spring-ZY-crud/src/main/java/com/ycjy/common/UploadConstants.java b/Spring-ZY-crud/src/main/java/com/ycjy/common/UploadConstants.java new file mode 100644 index 0000000..7f3df67 --- /dev/null +++ b/Spring-ZY-crud/src/main/java/com/ycjy/common/UploadConstants.java @@ -0,0 +1,9 @@ +package com.ycjy.common; + + +public final class UploadConstants { + public static final String UPLOAD_DIR = "Z:/Edg浏览器默认下载位/sctplu"; + + private UploadConstants() { + } +} diff --git a/Spring-ZY-crud/src/main/java/com/ycjy/config/AuthInterceptor.java b/Spring-ZY-crud/src/main/java/com/ycjy/config/AuthInterceptor.java index 2980904..f80e66b 100644 --- a/Spring-ZY-crud/src/main/java/com/ycjy/config/AuthInterceptor.java +++ b/Spring-ZY-crud/src/main/java/com/ycjy/config/AuthInterceptor.java @@ -16,11 +16,12 @@ public class AuthInterceptor implements HandlerInterceptor { @Autowired private ProductService productService; + // 拦截器,检查请求是否合法 @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { - String method = request.getMethod(); - String uri = request.getRequestURI(); - String auth = request.getHeader("Authorization"); + String method = request.getMethod();// 请求方法 + String uri = request.getRequestURI();// 请求 URI + String auth = request.getHeader("Authorization");// 请求头 Authorization // 已登录就把 username 放进 request,供 Controller 取用 Claims claims = parse(auth); diff --git a/Spring-ZY-crud/src/main/java/com/ycjy/config/WebAppConfig.java b/Spring-ZY-crud/src/main/java/com/ycjy/config/WebAppConfig.java index 7f3016a..d5d0b2d 100644 --- a/Spring-ZY-crud/src/main/java/com/ycjy/config/WebAppConfig.java +++ b/Spring-ZY-crud/src/main/java/com/ycjy/config/WebAppConfig.java @@ -19,7 +19,9 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.multipart.support.StandardServletMultipartResolver; import javax.sql.DataSource; -import java.io.File; +import java.nio.file.Path; + +import com.ycjy.common.UploadConstants; @Configuration @EnableWebMvc @@ -84,7 +86,10 @@ public class WebAppConfig implements WebMvcConfigurer { public void addResourceHandlers(ResourceHandlerRegistry registry) { registry.addResourceHandler("/**") .addResourceLocations("classpath:/static/"); + // 固定目录:图片放在部署目录之外,重新编译/部署也不会丢;用 toUri 编码中文路径 + String uploadLocation = Path.of(UploadConstants.UPLOAD_DIR).toUri().toString(); + if (!uploadLocation.endsWith("/")) uploadLocation += "/"; registry.addResourceHandler("/upload/**") - .addResourceLocations("file:Z:/Spring-study/Spring-ZY-crud/upload/"); + .addResourceLocations(uploadLocation); } } diff --git a/Spring-ZY-crud/src/main/java/com/ycjy/controller/ProductController.java b/Spring-ZY-crud/src/main/java/com/ycjy/controller/ProductController.java index 4727a52..b2ab792 100644 --- a/Spring-ZY-crud/src/main/java/com/ycjy/controller/ProductController.java +++ b/Spring-ZY-crud/src/main/java/com/ycjy/controller/ProductController.java @@ -1,6 +1,7 @@ package com.ycjy.controller; import com.ycjy.common.Result; +import com.ycjy.common.UploadConstants; import com.ycjy.dao.DeleteLog; import com.ycjy.dao.Product; import com.ycjy.service.ProductService; @@ -34,6 +35,13 @@ public class ProductController { return Result.success(); } + // 修改商品 + @PostMapping("/update/product") + public Result update(@RequestBody Product product) { + productService.update(product); + return Result.success(); + } + // 删除商品 @DeleteMapping("/product/{id}") public Result delete(@PathVariable("id") Integer id, HttpServletRequest request) { @@ -56,18 +64,18 @@ public class ProductController { Product product = productService.getById(id); if (product == null || product.getImage() == null) return ResponseEntity.notFound().build(); - // 获取文件名 - String fileName = product.getImage().replaceFirst("^/", ""); + String imagePath = product.getImage().replaceFirst("^/", ""); + String fileName = imagePath.substring(imagePath.lastIndexOf('/') + 1); byte[] bytes; try { - java.io.File diskFile = new java.io.File("Z:/Spring-study/Spring-ZY-crud", fileName); + java.io.File diskFile = new java.io.File(UploadConstants.UPLOAD_DIR, fileName); if (!diskFile.exists()) return ResponseEntity.notFound().build(); bytes = java.nio.file.Files.readAllBytes(diskFile.toPath()); } catch (Exception e) { return ResponseEntity.status(500).build(); } - String downloadName = URLEncoder.encode(fileName.substring(fileName.lastIndexOf('/') + 1), StandardCharsets.UTF_8); + String downloadName = URLEncoder.encode(fileName, StandardCharsets.UTF_8); HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_OCTET_STREAM); headers.setContentDispositionFormData("attachment", downloadName); diff --git a/Spring-ZY-crud/src/main/java/com/ycjy/controller/UploadController.java b/Spring-ZY-crud/src/main/java/com/ycjy/controller/UploadController.java index 2037517..c042d41 100644 --- a/Spring-ZY-crud/src/main/java/com/ycjy/controller/UploadController.java +++ b/Spring-ZY-crud/src/main/java/com/ycjy/controller/UploadController.java @@ -1,6 +1,7 @@ package com.ycjy.controller; import com.ycjy.common.Result; +import com.ycjy.common.UploadConstants; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -19,7 +20,8 @@ public class UploadController { String ext = originalFilename.substring(originalFilename.lastIndexOf(".")); String fileName = UUID.randomUUID().toString().replace("-", "") + ext; - File dir = new File("Z:/Spring-study/Spring-ZY-crud/upload"); + // 固定目录:放在部署目录之外,重新编译/部署也不会丢失图片 + File dir = new File(UploadConstants.UPLOAD_DIR); if (!dir.exists()) dir.mkdirs(); file.transferTo(new File(dir, fileName)); diff --git a/Spring-ZY-crud/src/main/java/com/ycjy/mapper/ProductMapper.java b/Spring-ZY-crud/src/main/java/com/ycjy/mapper/ProductMapper.java index 6b12b37..8eb68b0 100644 --- a/Spring-ZY-crud/src/main/java/com/ycjy/mapper/ProductMapper.java +++ b/Spring-ZY-crud/src/main/java/com/ycjy/mapper/ProductMapper.java @@ -10,4 +10,5 @@ public interface ProductMapper { Product getById(@Param("id") Integer id); int deleteById(@Param("id") Integer id); int insert(Product product); + int update(@Param("id") Integer id, @Param("name") String name, @Param("p_desc") String p_desc, @Param("price") Double price, @Param("image") String image); } \ No newline at end of file diff --git a/Spring-ZY-crud/src/main/java/com/ycjy/service/ProductService.java b/Spring-ZY-crud/src/main/java/com/ycjy/service/ProductService.java index 523c642..5afe65b 100644 --- a/Spring-ZY-crud/src/main/java/com/ycjy/service/ProductService.java +++ b/Spring-ZY-crud/src/main/java/com/ycjy/service/ProductService.java @@ -24,6 +24,7 @@ public class ProductService { return productMapper.insert(product) > 0; } + // 删除 public boolean delete(Integer id, String username) { if (productMapper.getById(id) == null) return false; productMapper.deleteById(id); @@ -35,7 +36,13 @@ public class ProductService { return productMapper.getById(id); } + // 获取日志 public List getLogs() { return logMapper.getAll(); } + + // 修改 + public boolean update(Product product) { + return productMapper.update(product.getId(),product.getName(),product.getP_desc(),product.getPrice(),product.getImage()) > 0; + } } diff --git a/Spring-ZY-crud/src/main/java/sql/sql.sql b/Spring-ZY-crud/src/main/java/sql/sql.sql index 2d3389b..4cf6b08 100644 --- a/Spring-ZY-crud/src/main/java/sql/sql.sql +++ b/Spring-ZY-crud/src/main/java/sql/sql.sql @@ -47,3 +47,7 @@ create table demo_log pid varchar(20), delete_date datetime default now() ) + + +update demo_product set name = '755', p_desc = '766', price = 5555, image = '/upload/64d8c676487c494ea7e3941dcc870bb3.jpg' where id = 22; +select * from demo_product \ No newline at end of file diff --git a/Spring-ZY-crud/src/main/resources/mappers/ProductMapper.xml b/Spring-ZY-crud/src/main/resources/mappers/ProductMapper.xml index 7b2f7c9..d1d1865 100644 --- a/Spring-ZY-crud/src/main/resources/mappers/ProductMapper.xml +++ b/Spring-ZY-crud/src/main/resources/mappers/ProductMapper.xml @@ -14,8 +14,12 @@ DELETE FROM demo_product WHERE id = #{id} - + INSERT INTO demo_product (name, p_desc, price, image) VALUES (#{name}, #{p_desc}, #{price}, #{image}) + + UPDATE demo_product SET name = #{name}, p_desc = #{p_desc}, price = #{price}, image = #{image} + WHERE id = #{id}; + \ No newline at end of file diff --git a/Spring-ZY-crud/src/main/resources/static/a.png b/Spring-ZY-crud/src/main/resources/static/a.png deleted file mode 100644 index 57ed56c..0000000 Binary files a/Spring-ZY-crud/src/main/resources/static/a.png and /dev/null differ diff --git a/Spring-ZY-crud/upload/8aa23dad93454c36aa0d0b43871e7bbb.jpeg b/Spring-ZY-crud/upload/8aa23dad93454c36aa0d0b43871e7bbb.jpeg deleted file mode 100644 index e463648..0000000 Binary files a/Spring-ZY-crud/upload/8aa23dad93454c36aa0d0b43871e7bbb.jpeg and /dev/null differ diff --git a/Spring-ZY-crud/upload/a.png b/Spring-ZY-crud/upload/a.png deleted file mode 100644 index 57ed56c..0000000 Binary files a/Spring-ZY-crud/upload/a.png and /dev/null differ diff --git a/qianduan/index.html b/qianduan/index.html index 994c55c..3a5674c 100644 --- a/qianduan/index.html +++ b/qianduan/index.html @@ -61,6 +61,8 @@ tbody tr:hover { background: var(--color-paper-2); } .btn-danger:hover { background: color-mix(in oklab, var(--color-error) 10%, transparent); } .btn-ghost { color: var(--color-ink-2); border-color: var(--color-rule); } .btn-ghost:hover { background: var(--color-paper-2); } +.btn-edit { color: var(--color-accent-ink); border-color: color-mix(in oklab, var(--color-accent-2) 55%, transparent); background: color-mix(in oklab, var(--color-accent) 10%, transparent); } +.btn-edit:hover { background: color-mix(in oklab, var(--color-accent) 22%, transparent); } .login-status { display: inline-block; padding: var(--space-2xs) var(--space-sm); border-radius: var(--radius-pill); font-size: var(--text-xs); color: var(--color-ink-2); background: var(--color-paper-2); border: 1px solid var(--color-rule); } .login-status.logged-in { color: var(--color-accent-ink); background: color-mix(in oklab, var(--color-accent) 16%, var(--color-paper)); border-color: color-mix(in oklab, var(--color-accent) 35%, transparent); } @@ -165,6 +167,24 @@ tbody tr:hover { background: var(--color-paper-2); } + +