Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax

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;
+}

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 位

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)
+    send-buffer-size-limit: 64000     # 发送缓冲区大小限制 (默认: 64000)
+
+security:
+  api:
+    encrypt:
+      enable: true                    # 开启请求加解密
+      default-encrypt-type: AES        # 可选：AES、SM4，默认 AES
+      aes-key: pigxpigxpigxpigx       # AES 密钥必须为 16 位