BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

master：系统调优；

pull/1121/head
liujiang 2025-11-11 22:16:12 +08:00
parent a5f3fe5460
commit e68c8cd2ad
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
View File

@ -255,6 +255,7 @@ public class CommonController {
@GetMapping("/html/content/{title}") @GetMapping("/html/content/{title}")
public String getHtmlContent(@PathVariable("title") String title, HttpServletResponse response) { public String getHtmlContent(@PathVariable("title") String title, HttpServletResponse response) {
response.setHeader("X-Frame-Options", "ALLOWALL"); response.setHeader("X-Frame-Options", "ALLOWALL");
response.setHeader("Content-Security-Policy", "frame-ancestors *");
return htmlService.getHtmlContent(title); return htmlService.getHtmlContent(title);
} }

4
xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java
View File

@ -377,14 +377,14 @@ public class StoreProductServiceImpl implements IStoreProductService {
if (exitProdColorIdList.contains(updateProdColorId)) { if (exitProdColorIdList.contains(updateProdColorId)) {
StoreProductColor existColor = existColorMap.get(updateProdColorNameList.get(i)); StoreProductColor existColor = existColorMap.get(updateProdColorNameList.get(i));
if (ObjectUtils.isNotEmpty(existColor)) { if (ObjectUtils.isNotEmpty(existColor)) {
String shoeUpperLiningMaterial = updateColorLineMaterialMap.get(updateProdColorNameList.get(i));
// 修改颜色的内里属性 // 修改颜色的内里属性
existColor.setShoeUpperLiningMaterial(shoeUpperLiningMaterial); existColor.setShoeUpperLiningMaterial(updateColorLineMaterialMap.get(updateProdColorNameList.get(i)));
} }
continue; continue;
} }
// 新增的商品颜色 // 新增的商品颜色
dbProdColorList.add(new StoreProductColor().setStoreColorId(updateProdColorId).setStoreProdId(storeProdId).setStoreId(storeId) dbProdColorList.add(new StoreProductColor().setStoreColorId(updateProdColorId).setStoreProdId(storeProdId).setStoreId(storeId)
.setShoeUpperLiningMaterial(updateColorLineMaterialMap.get(updateProdColorNameList.get(i)))
.setColorName(updateProdColorNameList.get(i)).setOrderNum(i + 1).setProdStatus(EProductStatus.ON_SALE.getValue())); .setColorName(updateProdColorNameList.get(i)).setOrderNum(i + 1).setProdStatus(EProductStatus.ON_SALE.getValue()));
} }
// 更新商品颜色或新增商品颜色 // 更新商品颜色或新增商品颜色