From 34e43d4dc8af8124b03472328e646cfd5979755b Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Thu, 11 Jun 2026 13:41:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?aes=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.yml                   | 6 ++++++
 .../pjcloud-upms-biz/src/main/resources/application.yml  | 9 ++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/application.yml b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/application.yml
index df4c03b1c..0f500689e 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/application.yml
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/application.yml
@@ -23,3 +23,9 @@ spring:
 #      username: root
 #      password: root
 #      url: jdbc:mysql://pjcloud-mysql:3306/pjcloudx_canteen?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true
+security:
+  api:
+    encrypt:
+      enable: true                    # 开启请求加解密
+      default-encrypt-type: AES        # 可选：AES、SM4，默认 AES
+      aes-key: pigxpigxpigxpigx       # AES 密钥必须为 16 位
\ No newline at end of file
diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/application.yml b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/application.yml
index c390d0b78..ea0bfaf4d 100644
--- a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/application.yml
+++ b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/application.yml
@@ -33,4 +33,11 @@ pjcloud:
     map-session: true                 # 是否启用 Session 映射 (默认: true)
     message-distributor: redis        # 消息分发器类型: local | redis (默认: local)
     send-time-limit: 10000            # 发送时间限制,单位毫秒 (默认: 10000)
-    send-buffer-size-limit: 64000     # 发送缓冲区大小限制 (默认: 64000)
\ No newline at end of file
+    send-buffer-size-limit: 64000     # 发送缓冲区大小限制 (默认: 64000)
+
+security:
+  api:
+    encrypt:
+      enable: true                    # 开启请求加解密
+      default-encrypt-type: AES        # 可选：AES、SM4，默认 AES
+      aes-key: pigxpigxpigxpigx       # AES 密钥必须为 16 位
\ No newline at end of file

From db6249ff85bce0ef195eccdd131d00d0b9e19bfe Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Thu, 11 Jun 2026 13:44:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?aes=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/erp/CanteenMaterialNutritionTagDTO.java   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/erp/CanteenMaterialNutritionTagDTO.java

diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/erp/CanteenMaterialNutritionTagDTO.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/erp/CanteenMaterialNutritionTagDTO.java
new file mode 100644
index 000000000..6a165fcf2
--- /dev/null
+++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/erp/CanteenMaterialNutritionTagDTO.java
@@ -0,0 +1,15 @@
+package com.bsd.pjcloud.canteen.dto.erp;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(description = "食材营养元素标签")
+public class CanteenMaterialNutritionTagDTO {
+
+    @Schema(description = "营养元素名称，如：铁")
+    private String name;
+
+    @Schema(description = "对应效果，如：提高免疫力")
+    private String effect;
+}