Merge branch 'refs/heads/zt-test' into test

# Conflicts:
#	pom.xml
#	zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java
#	zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java

deployment.yaml

@@ -23,18 +23,21 @@ spec:
       containers:
         - name: qms-server
           image: 172.16.46.66:10043/yudao/qms-server:VERSION_PLACEHOLDER
+          env:
+            - name: TZ
+              value: Asia/Shanghai
           readinessProbe:
             httpGet:
               path: /actuator/health
               port: 48104
-            initialDelaySeconds: 10
+            initialDelaySeconds: 50
             periodSeconds: 5
             failureThreshold: 3
           livenessProbe:
             httpGet:
               path: /actuator/health
               port: 48104
-            initialDelaySeconds: 30
+            initialDelaySeconds: 50
             periodSeconds: 10
             failureThreshold: 5
           resources:
@@ -61,11 +64,13 @@ spec:
   selector:
     app: qms-server
   ports:
-    - protocol: TCP
+    - name: http-health
+      protocol: TCP
       port: 48104
       targetPort: 48104
       nodePort: 30100
-    - protocol: TCP
+    - name: tcp-9999
+      protocol: TCP
       port: 9999
       targetPort: 9999
-      nodePort: 30200
+      nodePort: 30194

pom.xml

@@ -17,7 +17,7 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>3.0.42</revision>
+        <revision>3.0.43</revision>
         <!-- Maven 相关 -->
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -145,8 +145,13 @@
             <name>中铜 ZStack 私服</name>
             <url>http://172.16.46.63:30708/repository/test/</url>
             <releases>
-                <enabled>false</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>warn</checksumPolicy>
             </releases>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </snapshots>
         </repository>
     </repositories>
 

qms-server/Dockerfile

@@ -1,4 +1,5 @@
-FROM 172.16.46.66:10043/base-service/report-base:x86_64-ubuntu_22-jre21-2.0.0
+ARG BASE_IMAGE=172.16.46.66:10043/base-service/skywalking-agent-jre:9.7.0
+FROM ${BASE_IMAGE}
 RUN mkdir -p /appdata/server
 WORKDIR /appdata/server
 ## 将后端项目的 Jar 文件，复制到镜像中
@@ -6,9 +7,14 @@ COPY ./target/qms-server.jar app.jar
 
 ## 设置 TZ 时区
 ENV TZ=Asia/Shanghai
+ENV JAVA_OPTS="-Xms512m -Xmx512m"
+ENV SW_AGENT_HOME=/opt/skywalking/agent
+ENV SW_AGENT_NAME=qms-server
+ENV SW_AGENT_COLLECTOR_BACKEND_SERVICES=172.16.46.63:30201
+ENV AGENT_JAVA_OPTS="-javaagent:${SW_AGENT_HOME}/skywalking-agent.jar -Dskywalking.agent.service_name=${SW_AGENT_NAME} -Dskywalking.collector.backend_service=${SW_AGENT_COLLECTOR_BACKEND_SERVICES}"
 
 # 暴露端口
 EXPOSE 48205
 
 ## 启动后端项目
-ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
+CMD java ${AGENT_JAVA_OPTS} ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar app.jar

zt-module-qms/zt-module-qms-server/src/main/resources/logback-spring.xml

@@ -1,8 +1,8 @@
 <configuration>
     <!-- 引用 Spring Boot 的 logback 基础配置 -->
     <include resource="org/springframework/boot/logging/logback/defaults.xml" />
-    <!-- 变量 cloud.info.base-package，基础业务包 -->
-    <springProperty scope="context" name="cloud.info.base-package" source="cloud.info.base-package"/>
+    <!-- 变量 zt.info.base-package，基础业务包 -->
+    <springProperty scope="context" name="zt.info.base-package" source="zt.info.base-package"/>
     <!-- 格式化输出：%d 表示日期，%X{tid} SkWalking 链路追踪编号，%thread 表示线程名，%-5level：级别从左显示 5 个字符宽度，%msg：日志消息，%n是换行符 -->
     <property name="PATTERN_DEFAULT" value="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} | %highlight(${LOG_LEVEL_PATTERN:-%5p} ${PID:- }) | %boldYellow(%thread [%tid]) %boldGreen(%-40.40logger{39}) | %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/>