add env

Dockerfile

-####### 开发环境的dockerfile配置##########
-#FROM gmaslowski/jre:8
-#ENV TZ='Asia/Shanghai'
-#WORKDIR /home/server/
-#ADD target/*.jar /home/server/app.jar
-#VOLUME /home/server
-#ENV JAVA_OPTS="-XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=128m -Xms1024m -Xmx1024m -Xmn256m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC"
-#ENV profile="-Dspring.profiles.active=qa"
-#ENV LANG en_US.UTF-8
-#ENV LANGUAGE en_US:en
-#ENV LC_ALL en_US.UTF-8
-##ENV debug="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9528"
-#EXPOSE 3409
-#RUN echo $TZ > /etc/timezone
-##ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar $debug $profile /home/server/app.jar " ]
-#ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar $profile /home/server/app.jar " ]
+#基础镜像
+FROM swr.zhydc-nyyjy-1.r410.cnooc/cnooc-cggl/openjdk:8u32-jre-redis-a
+MAINTAINER zhaoxy15 ex_zhaoxy15@cnooc.com.cn
 
-######### 测试环境的dockerfile文件配置###########
-FROM java:8-jre-alpine
+# 挂载
+WORKDIR /app/
+
+# 复制目标文件
+COPY target/*.jar /app/expert-manage-miniapp.jar
+
+#设置Docker里面的时区
 ENV TZ='Asia/Shanghai'
-WORKDIR /home/server/
-ADD target/*.jar /home/server/app.jar
-VOLUME /home/server
-ENV JAVA_OPTS=""
-EXPOSE 9001
 
-ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /home/server/app.jar" ]
+EXPOSE 8080
\ No newline at end of file

src/main/java/com/cnooc/expert/external/expert/model/request/ApproveNodeGetApiReq.java

 package com.cnooc.expert.external.expert.model.request;
 
-import lombok.Builder;
 import lombok.Data;
 
 @Data
-@Builder
 public class ApproveNodeGetApiReq {
 
     private String subjectId;

src/main/java/com/cnooc/expert/external/workflow/model/request/ApprovePathSettingByConditionGetApiReq.java

 package com.cnooc.expert.external.workflow.model.request;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotNull;
 
 @Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class ApprovePathSettingByConditionGetApiReq {
 
     // 业务类型编码

src/main/java/com/cnooc/expert/external/workflow/model/request/ApprovePathSettingSaveOrUpdateApiReq.java

 package com.cnooc.expert.external.workflow.model.request;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 @Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class ApprovePathSettingSaveOrUpdateApiReq {
 
     // 业务类型编码

src/main/java/com/cnooc/expert/external/workflow/model/request/InstCalculateApiReq.java

 package com.cnooc.expert.external.workflow.model.request;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
+import lombok.NoArgsConstructor;
 
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class InstCalculateApiReq {
 
     // 业务id 不能为空

src/main/java/com/cnooc/expert/external/workflow/model/request/InstRevokeApiReq.java

 package com.cnooc.expert.external.workflow.model.request;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class InstRevokeApiReq {
 
     // 业务id

src/main/java/com/cnooc/expert/external/workflow/model/request/InstStartApiReq.java

 package com.cnooc.expert.external.workflow.model.request;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.springframework.lang.Nullable;
 
 import javax.validation.Valid;
@@ -11,7 +14,9 @@ import javax.validation.constraints.Pattern;
 import java.util.List;
 import java.util.Map;
 
-@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class InstStartApiReq {
 
     // 企业id，按照当前的阶段传入对应的企业id，不传默认取当前登陆人企业id，平台审批的时候传入 0;

src/main/java/com/cnooc/expert/external/workflow/model/response/ApprovePathSettingByConditionGetApiResp.java

 package com.cnooc.expert.external.workflow.model.response;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 
 @Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class ApprovePathSettingByConditionGetApiResp {
 
     // 模板id
@@ -33,7 +39,6 @@ public class ApprovePathSettingByConditionGetApiResp {
     private List<JingDongProcDefPathVO> templatePaths;
 
     // 审批备注下的附件id
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private String fileId;
 
     // 申请备注
@@ -67,6 +72,9 @@ public class ApprovePathSettingByConditionGetApiResp {
     private ProcDefInfoVO procDefInfoVO;
 
     @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
     public static class JingDongProcDefPathVO {
 
         // 节点id
@@ -90,6 +98,9 @@ public class ApprovePathSettingByConditionGetApiResp {
     }
 
     @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
     public static class AccountSubjectNameEmailVO {
 
         // 账号
@@ -106,6 +117,9 @@ public class ApprovePathSettingByConditionGetApiResp {
     }
 
     @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
     public static class ProcDefInfoVO {
 
         // 业务类型名称
@@ -162,6 +176,9 @@ public class ApprovePathSettingByConditionGetApiResp {
     }
 
     @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
     public static class SimpleDeployInfoVO {
 
         // 简单方式条件的配置信息
@@ -170,6 +187,9 @@ public class ApprovePathSettingByConditionGetApiResp {
     }
 
     @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
     public static class SimpleNodeDTO {
 
         // id信息
@@ -180,6 +200,9 @@ public class ApprovePathSettingByConditionGetApiResp {
     }
 
     @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
     public static class NodeConfigDTO {
 
         // 任务节点唯一标识
@@ -236,6 +259,9 @@ public class ApprovePathSettingByConditionGetApiResp {
     }
 
     @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
     public static class ParticipantDTO {
 
         // id
@@ -246,6 +272,9 @@ public class ApprovePathSettingByConditionGetApiResp {
     }
 
     @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
     public static class ParticipantGroupDTO {
 
         // 参与者类型：person-人员、orgHead-部门负责人、role-角色、trendsOrgHead-动态部门负责人、personVariable-人员变量
@@ -266,6 +295,9 @@ public class ApprovePathSettingByConditionGetApiResp {
     }
 
     @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
     public static class ParticipantApproveDTO {
 
         /**
@@ -279,6 +311,9 @@ public class ApprovePathSettingByConditionGetApiResp {
     }
 
     @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
     public static class TreeDeployInfoVO {
 
         // 树节点
@@ -286,6 +321,9 @@ public class ApprovePathSettingByConditionGetApiResp {
     }
 
     @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
     public static class TreeNodeDTO {
 
         // 任务节点唯一标识
@@ -309,6 +347,9 @@ public class ApprovePathSettingByConditionGetApiResp {
     }
 
     @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
     public static class TreeNodeParticipantDTO {
         /**
          * 或签：单任务
@@ -359,6 +400,9 @@ public class ApprovePathSettingByConditionGetApiResp {
     }
 
     @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
     public static class TreeConditionDTO {
 
         // 是否默认路径
@@ -369,6 +413,9 @@ public class ApprovePathSettingByConditionGetApiResp {
     }
 
     @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
     public static class FlowConditionGroupDTO {
 
         // 条件连接类型
@@ -381,8 +428,10 @@ public class ApprovePathSettingByConditionGetApiResp {
         private List<FlowConditionDTO> flowConditions;
     }
 
-
     @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
     public static class BpmnDeployInfoVO {
 
         // 前端绘制的bpmn的xml信息
@@ -393,6 +442,9 @@ public class ApprovePathSettingByConditionGetApiResp {
     }
 
     @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
     public static class ConditionDTO {
 
         // 连线的id
@@ -409,6 +461,9 @@ public class ApprovePathSettingByConditionGetApiResp {
     }
 
     @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
     public static class FlowConditionDTO {
 
         // 变量key值

src/main/java/com/cnooc/expert/service/ExpertMockService.java

@@ -733,7 +733,8 @@ public class ExpertMockService {
                         .createTime(1745393470744L)
                         .creatorGuid("1171528722513702912")
                         .creatorName("物装中心十八")
-                        .downloadUrl("https://purb.m-bid.cnooc.com.cn/bid-mimic-cggl/892422091105296385/2/2025/4/23/1364617976113278976/%E4%BF%9D%E8%AF%81%E9%87%91%E3%80%81%E6%9C%8D%E5%8A%A1%E8%B4%B91.0.7.20250415.pdf?response-content-disposition=attachment%3Bfilename%3D%25E4%25BF%259D%25E8%25AF%2581%25E9%2587%2591%25E3%2580%2581%25E6%259C%258D%25E5%258A%25A1%25E8%25B4%25B91.0.7.20250415.pdf&AWSAccessKeyId=5T0WWU7JAUDUXJ2EG1FB&Expires=1745393679&Signature=N26QXpJBR7EFBi95KCnj6A1gg2w%3D")
+                        // .downloadUrl("https://purb.m-bid.cnooc.com.cn/bid-mimic-cggl/892422091105296385/2/2025/4/23/1364617976113278976/%E4%BF%9D%E8%AF%81%E9%87%91%E3%80%81%E6%9C%8D%E5%8A%A1%E8%B4%B91.0.7.20250415.pdf?response-content-disposition=attachment%3Bfilename%3D%25E4%25BF%259D%25E8%25AF%2581%25E9%2587%2591%25E3%2580%2581%25E6%259C%258D%25E5%258A%25A1%25E8%25B4%25B91.0.7.20250415.pdf&AWSAccessKeyId=5T0WWU7JAUDUXJ2EG1FB&Expires=1745393679&Signature=N26QXpJBR7EFBi95KCnj6A1gg2w%3D")
+                        .downloadUrl("https://static.risensafe.com/wsc/image/6c3fccb944af4984863c774514f4e142.JPG")
                         .feiQiRenGuid("")
                         .feiQiRenName("")
                         .feiQiTime(null)

src/main/resources/application-dev.yml

 spring:
+  profiles: dev
 
   redis:
     host: 39.105.210.213
@@ -23,7 +24,6 @@ spring:
       indent-output: true
     deserialization:
       fail-on-unknown-properties: false
-    # default-property-inclusion: non_null
 
   kafka:
     # Kafka服务器地址
@@ -37,6 +37,7 @@ spring:
         batch-size: 16384
         linger-ms: 1
         buffer-memory: 33554432
+
 sms:
   config:
     # 短信发送配置
@@ -44,6 +45,7 @@ sms:
     app_code: 3F2504E04F8911D39A0C0305E82C3301
     loginTemplate: 登录验证码模版名称
     changePwdTemplate: 修改密码验证码模版名称
+
 app:
   info:
     appId: 10000

src/main/resources/application-k8s.yml

+spring:
+
+  redis:
+    host: ${REDIS_HOST}
+    port: ${REDIS_PORT}
+#    password: ${REDIS_PASSWORD}
+    database: 0
+    lettuce:
+      cluster:
+        refresh:
+          adaptive: true
+          period: 30000
+      pool:
+        max-wait: 10000
+        max-idle: 10
+        min-idle: 10
+        max-active: 20
+
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+    serialization:
+      indent-output: true
+    deserialization:
+      fail-on-unknown-properties: false
+
+  kafka:
+    # Kafka服务器地址
+    bootstrap-servers: ${KAFKA_SERVERS}
+    producer:
+      key-serializer: org.apache.kafka.common.serialization.StringSerializer
+      value-serializer: org.springframework.kafka.support.serializer.JsonSerializer
+      properties:
+        acks: all
+        retries: 3
+        batch-size: 16384
+        linger-ms: 1
+        buffer-memory: 33554432
+
+sms:
+  config:
+    # 短信发送配置
+    api_url: ${SMS_CONFIG_URL}
+    app_code: ${SMS_CONFIG_CODE}
+    loginTemplate: ${SMS_CONFIG_TEMPLATE_LOGIN}
+    changePwdTemplate: ${SMS_CONFIG_TEMPLATE_CHANGE_PWD}
+
+app:
+  info:
+    appId: 10000
+    appName: 海油小程序
+
+server:
+  port: 9090

src/main/resources/application.yml

@@ -25,7 +25,6 @@ spring:
       indent-output: true
     deserialization:
       fail-on-unknown-properties: false
-    # default-property-inclusion: non_null
 
   kafka:
     # Kafka服务器地址