Merge remote-tracking branch 'upstream/main' into himarket_202601

Author: learnerjohn

himarket-bootstrap/Dockerfile

@@ -8,4 +8,4 @@ EXPOSE 8080
 # Support reflection in java 17
 ENV JAVA_OPTS="--add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED"
 
-ENTRYPOINT ["sh", "-c", "java $JAVA_OPTS -jar app.jar --logging.file.name=/app/logs/himarket-server.log"]
+ENTRYPOINT ["sh", "-c", "java $JAVA_OPTS -jar app.jar --spring.profiles.active=prod"]

himarket-bootstrap/src/main/resources/logback-spring.xml

@@ -1,21 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <!-- 控制台输出 -->
+    <!-- Console appender: enabled for all environments -->
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %magenta([%thread]) %highlight(%-5level) %cyan(%logger{50}) - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %magenta([%thread]) %highlight(%-5level) %cyan(%logger{50}) - %msg%n
+            </pattern>
             <charset>UTF-8</charset>
         </encoder>
     </appender>
 
-    <root level="INFO">
-        <appender-ref ref="CONSOLE"/>
-    </root>
+    <!-- File appender: enabled only in prod profile -->
+    <springProfile name="prod">
+        <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+            <file>/app/logs/himarket-server.log</file>
 
-    <!-- 项目日志级别 -->
+            <encoder>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+                <charset>UTF-8</charset>
+            </encoder>
+
+            <!-- Rolling policy: by date and size -->
+            <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+                <fileNamePattern>/app/logs/archived/himarket-server-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+                <maxFileSize>100MB</maxFileSize>      <!-- Max size per file -->
+                <maxHistory>30</maxHistory>           <!-- Keep 30 days -->
+                <totalSizeCap>3GB</totalSizeCap>      <!-- Max total size of archived logs -->
+            </rollingPolicy>
+        </appender>
+    </springProfile>
+
+    <!-- Default: console only (local environment) -->
+    <springProfile name="!prod">
+        <root level="INFO">
+            <appender-ref ref="CONSOLE"/>
+        </root>
+    </springProfile>
+
+    <!-- Prod profile: console + file -->
+    <springProfile name="prod">
+        <root level="INFO">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="FILE"/>
+        </root>
+    </springProfile>
+
+    <!-- Application log levels -->
     <logger name="com.alibaba.himarket" level="INFO"/>
-    
-    <!-- 框架日志级别调整 -->
+
+    <!-- Framework log levels -->
     <logger name="org.springframework" level="INFO"/>
     <logger name="org.hibernate" level="INFO"/>
     <logger name="org.hibernate.SQL" level="INFO"/>

himarket-dal/src/main/java/com/alibaba/himarket/entity/Administrator.java

@@ -20,15 +20,8 @@
 package com.alibaba.himarket.entity;
 
 import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
 @Entity
 @Table(
         name = "administrator",
@@ -40,6 +33,11 @@
                     columnNames = {"username"},
                     name = "uk_username")
         })
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class Administrator extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

himarket-dal/src/main/java/com/alibaba/himarket/entity/Chat.java

@@ -26,8 +26,7 @@
 import com.alibaba.himarket.support.enums.ChatStatus;
 import jakarta.persistence.*;
 import java.util.List;
-import lombok.Data;
-import lombok.experimental.Accessors;
+import lombok.*;
 
 @Entity
 @Table(
@@ -38,7 +37,10 @@
                     name = "uk_chat_id")
         })
 @Data
-@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class Chat extends BaseEntity {
 
     @Id

himarket-dal/src/main/java/com/alibaba/himarket/entity/ChatAttachment.java

@@ -21,8 +21,7 @@
 
 import com.alibaba.himarket.support.enums.ChatAttachmentType;
 import jakarta.persistence.*;
-import lombok.Data;
-import lombok.experimental.Accessors;
+import lombok.*;
 import org.hibernate.annotations.ColumnDefault;
 
 @Entity
@@ -34,7 +33,10 @@
                     name = "uk_attachment_id")
         })
 @Data
-@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class ChatAttachment extends BaseEntity {
 
     @Id

himarket-dal/src/main/java/com/alibaba/himarket/entity/ChatSession.java

@@ -22,8 +22,7 @@
 import com.alibaba.himarket.converter.ListJsonConverter;
 import jakarta.persistence.*;
 import java.util.List;
-import lombok.Data;
-import lombok.experimental.Accessors;
+import lombok.*;
 
 @Entity
 @Table(
@@ -34,7 +33,10 @@
                     name = "uk_session_id")
         })
 @Data
-@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class ChatSession extends BaseEntity {
 
     @Id

himarket-dal/src/main/java/com/alibaba/himarket/entity/Consumer.java

@@ -20,8 +20,7 @@
 package com.alibaba.himarket.entity;
 
 import jakarta.persistence.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 
 @Entity
 @Table(
@@ -36,6 +35,9 @@
         })
 @Data
 @EqualsAndHashCode(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class Consumer extends BaseEntity {
 
     @Id

himarket-dal/src/main/java/com/alibaba/himarket/entity/ConsumerCredential.java

@@ -26,7 +26,7 @@
 import com.alibaba.himarket.support.consumer.HmacConfig;
 import com.alibaba.himarket.support.consumer.JwtConfig;
 import jakarta.persistence.*;
-import lombok.Data;
+import lombok.*;
 
 @Entity
 @Table(
@@ -37,6 +37,10 @@
                     name = "uk_consumer_id")
         })
 @Data
+@EqualsAndHashCode(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class ConsumerCredential extends BaseEntity {
 
     @Id

himarket-dal/src/main/java/com/alibaba/himarket/entity/ConsumerRef.java

@@ -28,10 +28,10 @@
 @Entity
 @Table(name = "consumer_ref")
 @Data
+@EqualsAndHashCode(callSuper = true)
 @Builder
-@AllArgsConstructor
 @NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
+@AllArgsConstructor
 public class ConsumerRef extends BaseEntity {
 
     @Id

himarket-dal/src/main/java/com/alibaba/himarket/entity/Developer.java

@@ -22,15 +22,8 @@
 import com.alibaba.himarket.support.enums.DeveloperAuthType;
 import com.alibaba.himarket.support.enums.DeveloperStatus;
 import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
 @Entity
 @Table(
         name = "developer",
@@ -42,6 +35,11 @@
                     columnNames = {"portalId", "username"},
                     name = "uk_portal_username")
         })
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class Developer extends BaseEntity {
 
     @Id