From 1236c1e76c1dc07963285c72ea4faabef9cb7d93 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 12 七月 2024 14:54:43 +0800
Subject: [PATCH] 上海省平台接口字段优化
---
src/main/java/com/fzzy/api/entity/Api1103.java | 4 ++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1103.java | 3 +
src/main/resources/application-pro2.yml | 20 +++++-----
src/main/resources/application-pro.yml | 25 +++++++-----
src/main/java/com/fzzy/api/view/Api1103.view.xml | 25 ++++++++++++
5 files changed, 57 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1103.java b/src/main/java/com/fzzy/api/entity/Api1103.java
index 538e29b..c1879be 100644
--- a/src/main/java/com/fzzy/api/entity/Api1103.java
+++ b/src/main/java/com/fzzy/api/entity/Api1103.java
@@ -260,6 +260,10 @@
@Column(name = "ajs")
private Integer ajs;
+ @PropertyDef(label = "浠撴埧鎵垮偍鐘舵��" )
+ @Column(name = "cfcczt", length = 1)
+ private String cfcczt;
+
@PropertyDef(label = "鏍囪浣�")
@Column(name = "bjw", length = 40)
private String bjw;
diff --git a/src/main/java/com/fzzy/api/view/Api1103.view.xml b/src/main/java/com/fzzy/api/view/Api1103.view.xml
index e9b5987..b861ac6 100644
--- a/src/main/java/com/fzzy/api/view/Api1103.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1103.view.xml
@@ -379,6 +379,26 @@
<PropertyDef name="bjw">
<Property name="label">鏍囪浣�</Property>
</PropertyDef>
+ <PropertyDef name="cfcczt">
+ <Property></Property>
+ <Property name="label">浠撴埧鎵垮偍鐘舵��</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">姝ｅ父</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">閫�鍑哄偍澶囩伯鎵垮偍</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
</DataType>
</Model>
<View layout="regionPadding:10">
@@ -892,6 +912,11 @@
<Property name="property">bjw</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cfcczt</Property>
+ <Property name="property">cfcczt</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
</Children>
</GroupBox>
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1103.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1103.java
index d86be87..7583546 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1103.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1103.java
@@ -196,4 +196,7 @@
@PropertyDef(label = "鏍囪浣�")
private String bjw;
+ @PropertyDef(label = "浠撴埧鎵垮偍鐘舵��")
+ private String cfcczt;
+
}
\ No newline at end of file
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index 62a316d..eb88f33 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -1,4 +1,4 @@
-########################## 闄曡タ鏌炴按鍘� ##########################
+########################## 涓婃捣鍢夊畾 -C鐩� pro ##########################
server:
port: 8090
jetty:
@@ -9,16 +9,16 @@
datasource:
#涓绘暟鎹簮
primary:
- url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ url: jdbc:mysql://192.168.200.3:3306/igds_api?useUnicode=true&characterEncoding=utf-8&useSSL=false
driver-class-name: com.mysql.jdbc.Driver
username: root
- password: Fzzy@#$%5432..K
+ password: Abc123..
#娆℃暟鎹簮
secondary:
- url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ url: jdbc:mysql://192.168.200.3:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false
driver-class-name: com.mysql.jdbc.Driver
username: root
- password: Fzzy@#$%5432..K
+ password: Abc123..
jpa:
#涓籮pa閰嶇疆
primary:
@@ -39,9 +39,9 @@
# Redis鐩稿叧閰嶇疆
redis:
database: 1
- host: 127.0.0.1
+ host: 192.168.200.3
port: 6379
- password: Redispwd..
+ password: Abc123..
# 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
pool:
max-active: 200
@@ -51,6 +51,11 @@
timeout: 6000
igds:
default:
- companyId: 5348
- file-path: D:/IGDS-API/FILE/
- img-path: D:/IGDS/FILE/
\ No newline at end of file
+ companyId: 5303
+ file-path: C:/IGDS-API/FILE/
+ img-path: C:/IGDS/FILE/
+ # 鐪佸钩鍙癛SA瀵嗛挜瀵逛俊鎭�
+ #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsoiS5Q5CKAT9w5EbZXCxJO/5J2iV3i2HrTW/YcGs2EGeQsQc97EWPdFE1SPXGH5p9TO8nCFRJScj4WeeKUVcuRpzR7czQQ+c6kf6cR9LLQrAiGEMQSk13j/5UsJho23IQDGKWoH18f5aPdX8tJn/o4aR6mMxUY9jdaSKEBck1TQIDAQAB
+ # 鍖虹骇骞冲彴RSA瀵嗛挜瀵逛俊鎭�
+ #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRsamMiP5Op2JJtp3+IIJADFYhL256ZW0KsOkMHruJ3hVwgvoimPHKuUWRI/CS365v4BwUzzfBRdbECMFsLA1e1FHPPA0uSsAIuSVwRzHXG4drX7ZCDa9GFZ+qyIFAU25j2e2PC9olvKbGLBfZ8cL1FLXGxSVyDCX4t/UMZdDULwIDAQAB
+ #绉侀挜锛歁IICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJGxqYyI/k6nYkm2nf4ggkAMViEvbnplbQqw6Qweu4neFXCC+iKY8cq5RZEj8JLfrm/gHBTPN8FF1sQIwWwsDV7UUc88DS5KwAi5JXBHMdcbh2tftkINr0YVn6rIgUBTbmPZ7Y8L2iW8psYsF9nxwvUUtcbFJXIMJfi39Qxl0NQvAgMBAAECgYBKWLHfoCy9sFbMrN7UxnwQ+PqetpiW5tkNApf58ljbErQ4FO5V51xDieXBGejy2igmuOM7jz6xZtUgdiNV8uji/RtiNRqsBekVBPMeYAnPwA4GQ0HNwyHJ3ebJNQqT9bwrk8QpRUuCnrx/U1l7P1QNR5o52H1HpEKPlS0ga0fuQQJBAMdiSFYKt8/PwsYclvU/GqXrPy4cxMBhtE/ZssH9KourxnJcyfRz7EPgfSZykxlGHn8j/r8C2XxtAIYW6mRckqECQQC7EIZCZ3eV8abSIB33oKmw2jZlPQrHXMt8DWz8FYbNIA/9bvk9e9O42iQwMUtHfOMcNMWbcvKR/J+83bcE08TPAkA1ErdYl+/H1HDvVUrlq0+HnPArcSL6ZsedfcB0nNRHa4kehg6IEJdylf4aTuNTFfQmOcmkxLhpw4YhK1ZnMrEhAkEAuiMLNXA3MmCumk+TAiBAOdYoYjyHSTEw2VOSqpPQ+rN4tbmDEIbyefG2KK4kNhIy+pIYP0H11QYG/KuxvX/rSQJBALs0TqUgcGOp9+IkOq4jCXiVkP5/r7JWinQ4d6bYhJ4wspQYloYFCHljKKXtst1m8I3PC+vJY8R6va/3xtQKT8U=
diff --git a/src/main/resources/application-pro2.yml b/src/main/resources/application-pro2.yml
index 77520d5..a9641e5 100644
--- a/src/main/resources/application-pro2.yml
+++ b/src/main/resources/application-pro2.yml
@@ -1,4 +1,4 @@
-########################## 涓婃捣鍢夊畾-绾 ##########################
+########################## 瀹佸鐭冲槾灞辩孩鏋滃瓙绮簱 ##########################
server:
port: 8091
jetty:
@@ -9,16 +9,16 @@
datasource:
#涓绘暟鎹簮
primary:
- url: jdbc:mysql://127.0.0.1:3306/igds_api_jw?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ url: jdbc:mysql://127.0.0.1:3306/igds_api_gb?useUnicode=true&characterEncoding=utf-8
driver-class-name: com.mysql.jdbc.Driver
username: root
- password: root
+ password: Abc123..
#娆℃暟鎹簮
secondary:
- url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
driver-class-name: com.mysql.jdbc.Driver
username: root
- password: root
+ password: Abc123..
jpa:
#涓籮pa閰嶇疆
primary:
@@ -38,7 +38,7 @@
dialect: org.hibernate.dialect.MySQL5InnoDBDialect
# Redis鐩稿叧閰嶇疆
redis:
- database: 10
+ database: 3
host: 127.0.0.1
port: 6379
password: Abc123..
@@ -51,11 +51,11 @@
timeout: 6000
igds:
default:
- companyId: 5303
- file-path: D:/IGDS-API-jw/FILE/
+ companyId: 5306
+ file-path: D:/IGDS-API/FILE-GB/
img-path: D:/IGDS/FILE/
# 鐪佸钩鍙癛SA瀵嗛挜瀵逛俊鎭�
#鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsoiS5Q5CKAT9w5EbZXCxJO/5J2iV3i2HrTW/YcGs2EGeQsQc97EWPdFE1SPXGH5p9TO8nCFRJScj4WeeKUVcuRpzR7czQQ+c6kf6cR9LLQrAiGEMQSk13j/5UsJho23IQDGKWoH18f5aPdX8tJn/o4aR6mMxUY9jdaSKEBck1TQIDAQAB
# 鍖虹骇骞冲彴RSA瀵嗛挜瀵逛俊鎭�
- #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRsamMiP5Op2JJtp3+IIJADFYhL256ZW0KsOkMHruJ3hVwgvoimPHKuUWRI/CS365v4BwUzzfBRdbECMFsLA1e1FHPPA0uSsAIuSVwRzHXG4drX7ZCDa9GFZ+qyIFAU25j2e2PC9olvKbGLBfZ8cL1FLXGxSVyDCX4t/UMZdDULwIDAQAB
- #绉侀挜锛歁IICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJGxqYyI/k6nYkm2nf4ggkAMViEvbnplbQqw6Qweu4neFXCC+iKY8cq5RZEj8JLfrm/gHBTPN8FF1sQIwWwsDV7UUc88DS5KwAi5JXBHMdcbh2tftkINr0YVn6rIgUBTbmPZ7Y8L2iW8psYsF9nxwvUUtcbFJXIMJfi39Qxl0NQvAgMBAAECgYBKWLHfoCy9sFbMrN7UxnwQ+PqetpiW5tkNApf58ljbErQ4FO5V51xDieXBGejy2igmuOM7jz6xZtUgdiNV8uji/RtiNRqsBekVBPMeYAnPwA4GQ0HNwyHJ3ebJNQqT9bwrk8QpRUuCnrx/U1l7P1QNR5o52H1HpEKPlS0ga0fuQQJBAMdiSFYKt8/PwsYclvU/GqXrPy4cxMBhtE/ZssH9KourxnJcyfRz7EPgfSZykxlGHn8j/r8C2XxtAIYW6mRckqECQQC7EIZCZ3eV8abSIB33oKmw2jZlPQrHXMt8DWz8FYbNIA/9bvk9e9O42iQwMUtHfOMcNMWbcvKR/J+83bcE08TPAkA1ErdYl+/H1HDvVUrlq0+HnPArcSL6ZsedfcB0nNRHa4kehg6IEJdylf4aTuNTFfQmOcmkxLhpw4YhK1ZnMrEhAkEAuiMLNXA3MmCumk+TAiBAOdYoYjyHSTEw2VOSqpPQ+rN4tbmDEIbyefG2KK4kNhIy+pIYP0H11QYG/KuxvX/rSQJBALs0TqUgcGOp9+IkOq4jCXiVkP5/r7JWinQ4d6bYhJ4wspQYloYFCHljKKXtst1m8I3PC+vJY8R6va/3xtQKT8U=
+ #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCMsCJyl6EkjUEfB9Otl0bNmFD0Gr3g/v8DYnoq66EIviDNKT+bo5Aj6BRFngns1aCy1uyWgC5/+PIQ3sxs25nWXxFBYXy7cTiGwCCPfnmmI3rkXRGqRo6uh9K3BsucSE0kyhB8Eq76bQ6BPa5XpMyyq8V2oN2i0LLYpDhV97j3BwIDAQAB
+ #绉侀挜锛歁IICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIywInKXoSSNQR8H062XRs2YUPQaveD+/wNieirroQi+IM0pP5ujkCPoFEWeCezVoLLW7JaALn/48hDezGzbmdZfEUFhfLtxOIbAII9+eaYjeuRdEapGjq6H0rcGy5xITSTKEHwSrvptDoE9rlekzLKrxXag3aLQstikOFX3uPcHAgMBAAECgYAOZvWPz4/ygvdYqt9zlNntsBsRci9f+hq3CPzCqg55K6WF+yQE1dCqrFZu7gfME+54gGIF4idgeGanbXd16WEtFslEJlFKGk3cF62gaX5Y/nZ4zS65CLTjQ650j6SJ7OC2QYjIejTWhJD0k1tSazXdzV70nP+X3DbGyyO3Rm+juQJBANMCi+9RnzcGvltN/AdWD0DgshRBNrqrHtDkmzRFSkFwIqVSL5J7qRvntjhSstQIBB5KCosCmwRYKxGWQ9Ou420CQQCqrz2byBz3w2pkEfPY3rv7T4zE/2CHC74XtW9sEUTieYaxqIKlnwJacactzx4ZOAg21dGCoqOG9Y9RIpH2mMfDAkEAlAucXIt61qOfmPXtFsSVrSI5LybWHEAFPfC2yAS5ZZIkbLNt9ytV6eM3oOq81zDMmue93+wzEOg/R3aTHgj9PQJALNGxUsu8V473y+ku596s6/PamgwZE70QoHcjF/R86x9QMCx4ifb0Dj3T0WKWm7ar6YJB7pS4bgLjLEHwpBlAMwJAUUG2NhfGXFxfyFOC+5BzFTEr7EdSeHPXJl7dIWmRHncHsv8Nl2yvWsIOfDOYKS3ynptMgeSZaJPnXhvFdX0TnQ==
--
Gitblit v1.9.3