diff --git a/start/src/main/resources/application.yml b/start/src/main/resources/application.yml
deleted file mode 100644
index 94c9a75..0000000
--- a/start/src/main/resources/application.yml
+++ /dev/null
@@ -1 +0,0 @@
-# Application-level overrides are defined in dahua.yml.
diff --git a/start/src/main/resources/bootstrap.yml b/start/src/main/resources/bootstrap.yml
index d274967..c3be317 100644
--- a/start/src/main/resources/bootstrap.yml
+++ b/start/src/main/resources/bootstrap.yml
@@ -2,8 +2,9 @@ spring:
config:
import:
# - classpath:nacos.yml
- - classpath:prodnacos.yml
- - classpath:sdk.yml
+# - classpath:sdk.yml
- classpath:dahua.yml
- classpath:swagger.yml
+ - classpath:prodnacos.yml
+ - classpath:prod-sdk.yml
# - classpath:ds.yml
diff --git a/start/src/main/resources/prod-sdk.yml b/start/src/main/resources/prod-sdk.yml
new file mode 100644
index 0000000..62b5d4c
--- /dev/null
+++ b/start/src/main/resources/prod-sdk.yml
@@ -0,0 +1,84 @@
+sdk:
+ server:
+ app-key: c7fbb137c1a0484c8b0cca8ac9937c55
+ #港务局线上appKey c7fbb137c1a0484c8b0cca8ac9937c55
+ client:
+ gateway:
+ url: ${common.gateway.network.http.external}
+ route:
+ - client:
+ system-code: ${application.name}
+ name: ${application.cn-name}-后端
+ group-code: public_api
+ service:
+ system-code: ${application.name}
+ name: ${application.cn-name}-后端
+ group-code: public_api
+ strip-prefix: 0
+ uri: http://${application.name}
+ path: /${application.gateway}/**
+ - client:
+ system-code: ${application.name}-container
+ name: ${application.cn-name}-前端
+ group-code: public_api
+ service:
+ system-code: ${application.name}-container
+ name: ${application.cn-name}-前端
+ group-code: public_api
+ strip-prefix: 0
+ uri: http://jjb-saas-base
+ path: /${application.gateway}/container/**
+ order: -2
+ - client:
+ system-code: ${application.name}-h5
+ name: ${application.cn-name}-h5-前端
+ group-code: public_api
+ service:
+ system-code: ${application.name}-h5
+ name: ${application.cn-name}-h5-前端
+ group-code: public_api
+ strip-prefix: 0
+ uri: http://${application.name}
+ path: /${application.gateway}-h5/**
+ order: -3
+openapi:
+ appId: 1871106785124999168
+ appKey: 7314ecfc11ff4d5fad1ac19284ed2ac3
+ appSecret: 7565ab15-a2ae-4830-9b4d-fb382cd5fb30
+ appPublicKey: 3059301306072a8648ce3d020106082a811ccf5501822d03420004f339671110a06681fcfd968ad9247bd3cd0d2ec6b2159d1d4b775e7ed5566b3297d82cf14b626ef11fdd6bc7ecb6bcfb3ea94ccd1f381f4116f43367be4b360f
+ appPrivateKey: 308193020100301306072a8648ce3d020106082a811ccf5501822d0479307702010104206b6abc8e717b7d042f1e8531190a7c18113e4a701417f2770d2150d33ba97779a00a06082a811ccf5501822da14403420004f339671110a06681fcfd968ad9247bd3cd0d2ec6b2159d1d4b775e7ed5566b3297d82cf14b626ef11fdd6bc7ecb6bcfb3ea94ccd1f381f4116f43367be4b360f
+ encryptType: SM2
+ platform:
+ - name: default
+ openPublicKey: 3059301306072a8648ce3d020106082a811ccf5501822d034200045b5d8fcad91e113910406db4caf0f5c6688048e0f46742d55f872a25855316803ddb177cc9bb5906ff0b2ad4d6b1f1378a49109104613e79b5b5512e3710e88f
+ url: ${common.gateway.network.http.intranet}
+ protocol: HTTP
+ defaultPlatform: true
+ ##ciphertext plaintext
+ type: plaintext
+ apiPlatform:
+ - name: default
+ #多个可以逗号隔开
+ apiCode: test:01
+ #多个可以逗号隔开,可以为空
+ tenantIds: 1838408702262321152
+archives:
+ async:
+ pool:
+ maxPoolSize: 2
+ corePoolSize: 1
+ queueCapacity: 60
+ namePrefix: async-task-
+ keepAliveSeconds: 60
+message:
+ template:
+ firstLevelApplyReceiveAudit: MS000152
+ closedAreaApplyReceiveAudit: MS000153
+ firstLevelApplyReceiveCarAudit: MS000154
+ firstLevelApplyReceiveCarAuditReject: MS000155
+ firstLevelPersonReceiveAudit: MS000156
+ firstLevelPersonReceiveAuditReject: MS000157
+ closedAreaApplyReceiveCarAudit: MS000158
+ closedAreaApplyReceiveCarAuditReject: MS000159
+ closedAreaPersonReceiveAudit: MS000160
+ closedAreaPersonReceiveAuditReject: MS000161
diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateScreenPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateScreenPageQry.java
index e7fb6f9..ab2b614 100644
--- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateScreenPageQry.java
+++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateScreenPageQry.java
@@ -11,4 +11,7 @@ public class MkmjGateScreenPageQry extends PageQuery {
@ApiModelProperty(value = "企业id")
private Long corpinfoId;
+
+ @ApiModelProperty(value = "口门级别,1-一级口门,2-二级口门", required = true)
+ private Integer mkmjLevel;
}
diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjScreenPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjScreenPageQry.java
index 9ee48f4..aaefd94 100644
--- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjScreenPageQry.java
+++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjScreenPageQry.java
@@ -8,4 +8,7 @@ import lombok.Data;
public class MkmjScreenPageQry extends PageQuery {
@ApiModelProperty(value = "企业id", name = "corpId")
private Long corpId;
+
+ @ApiModelProperty(value = "口门级别,1-一级口门,2-二级口门", required = true)
+ private Integer mkmjLevel;
}
diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VideoScreenPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/VideoScreenPageQry.java
index 7e6d221..32853c5 100644
--- a/web-client/src/main/java/com/zcloud/primeport/dto/VideoScreenPageQry.java
+++ b/web-client/src/main/java/com/zcloud/primeport/dto/VideoScreenPageQry.java
@@ -8,4 +8,7 @@ import lombok.Data;
public class VideoScreenPageQry extends PageQuery {
@ApiModelProperty(value = "企业id")
private Long corpinfoId;
+
+ @ApiModelProperty(value = "口门级别,1-一级口门,2-二级口门", required = true)
+ private Integer mkmjLevel;
}
diff --git a/web-infrastructure/src/main/resources/mapper/ClosedAreaCarApplyMapper.xml b/web-infrastructure/src/main/resources/mapper/ClosedAreaCarApplyMapper.xml
index 0235594..455600b 100644
--- a/web-infrastructure/src/main/resources/mapper/ClosedAreaCarApplyMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/ClosedAreaCarApplyMapper.xml
@@ -51,11 +51,11 @@
order by c.id desc