From 430263f4f653dc02b3d65720e218d68b4a32b33b Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 17 八月 2023 19:01:29 +0800
Subject: [PATCH] 调整上海市2023接口架构
---
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1209.java | 2
src/main/java/com/fzzy/api/data/PushProtocol.java | 3
src/main/java/com/fzzy/otherview/sh2023/package-info.java | 4
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java | 2
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1303.java | 2
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1107.java | 7
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1207.java | 5
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1101.java | 4
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1207PR.java | 8
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1104.view.xml | 2
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1107.view.xml | 2
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1111PR.java | 6
src/main/resources/templates/home/home.html | 51 +-
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1214.view.xml | 2
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1112.java | 2
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1208.java | 2
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1104.java | 2
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1204.java | 2
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1304.java | 2
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1108.java | 2
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1111.view.xml | 2
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1102.view.xml | 2
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1105.view.xml | 2
src/main/java/com/fzzy/api/view/Api1114-1.view.xml | 0
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1214.java | 5
src/main/java/com/fzzy/push/whhpjl/WhjlPushService12.java | 9
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1207.java | 2
src/main/java/com/fzzy/otherview/whhpjl/repository/ApiListWhjlRep.java | 2
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1210.java | 2
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 152 +++++++
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1105.java | 4
src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java | 39 +
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1102.java | 4
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1107PR.java | 6
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1214PR.java | 7
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1207.view.xml | 4
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1101.view.xml | 2
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1106.view.xml | 2
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1103.java | 2
src/main/java/com/fzzy/api/data/ApiParam.java | 3
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1106.java | 2
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1111.java | 2
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java | 2
src/main/java/com/fzzy/otherview/whhpjl/pr/ApiListWhjlPR.java | 6
src/main/java/com/fzzy/otherview/whhpjl/repository/package-info.java | 4
src/main/java/com/fzzy/push/sh2023/SH2023Constant.java | 206 ++++++++++
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1101PR.java | 6
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1102PR.java | 6
src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java | 2
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlQDItem.java | 2
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1103PR.java | 7
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1104PR.java | 5
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1105PR.java | 7
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1106PR.java | 7
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1103.view.xml | 2
src/main/java/com/fzzy/api/view/Api1114-2.view.xml | 0
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1204.java | 4
src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java | 8
src/main/resources/templates/home/home-whjl.html | 60 +-
src/main/java/com/fzzy/otherview/gd2022/package-info.java | 4
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1107.java | 2
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1101.java | 2
src/main/java/com/fzzy/otherview/whhpjl/package-info.java | 4
src/main/java/com/fzzy/push/sh2023/dto/SH2023RespDto.java | 30 +
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1113.java | 2
src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java | 6
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1103.java | 5
src/main/java/com/fzzy/otherview/gd2022/xzba1023.view.xml | 11
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1111.java | 4
src/main/java/com/fzzy/otherview/whhpjl/ApiListWhjl.view.xml | 0
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1105.java | 2
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlCheckItm.java | 2
src/main/java/com/fzzy/otherview/whhpjl/pr/package-info.java | 4
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1106.java | 4
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1110.java | 2
src/main/java/com/fzzy/push/sh2023/dto/SH2023ReqDto.java | 48 ++
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1102.java | 2
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1302.java | 2
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1204PR.java | 7
/dev/null | 4
src/main/java/com/fzzy/api/utils/RSAUtils.java | 242 ++++++++++++
src/main/java/com/fzzy/push/sh2023/package-info.java | 8
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1204.view.xml | 2
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1214.java | 2
src/main/java/com/fzzy/push/sh2023/SH2023HttpClientUtil.java | 89 ++++
src/main/java/com/fzzy/api/view/Api1114-3.view.xml | 0
src/main/java/com/fzzy/conf/JpaConfigPrimary.java | 2
87 files changed, 1,011 insertions(+), 182 deletions(-)
diff --git a/src/main/java/com/fzzy/api/data/ApiParam.java b/src/main/java/com/fzzy/api/data/ApiParam.java
index cd6a6b1..cc31437 100644
--- a/src/main/java/com/fzzy/api/data/ApiParam.java
+++ b/src/main/java/com/fzzy/api/data/ApiParam.java
@@ -36,6 +36,9 @@
private String bizId;
+ //鎸囦护ID锛岀敤浜庝笂绾у钩鍙板彂閫佹寚浠よ幏鍙栨暟鎹殑鎯呭喌
+ private String orderid;
+
public ApiParam() {
super();
diff --git a/src/main/java/com/fzzy/api/data/PushProtocol.java b/src/main/java/com/fzzy/api/data/PushProtocol.java
index 5b01ea0..5deaff2 100644
--- a/src/main/java/com/fzzy/api/data/PushProtocol.java
+++ b/src/main/java/com/fzzy/api/data/PushProtocol.java
@@ -17,7 +17,8 @@
SB_HN_2022("SB_HN_2022", "娌冲崡鐪佸钩鍙�2022鐗�"),
SB_WHJL_2023("SB_WHJL_2023", "姝︽眽鍐涚伯骞冲彴2023鐗�"),
HB_FZZY_JG_2022("HB_FZZY_JG_2022", "椋庢鑷磋繙鐩戠2022鐗堟湰"),
- SB_SHJdJW_2023("SB_SHJdJW_2023", "涓婃捣鍢夊畾绾鐩戠骞冲彴2023鐗�");
+ SB_SHJdJW_2023("SB_SHJdJW_2023", "涓婃捣鍢夊畾绾鐩戠骞冲彴2023鐗�"),
+ SB_SH_2023("SB_SH_2023", "涓婃捣甯傚钩鍙�2023鐗�");
private String code;
diff --git a/src/main/java/com/fzzy/api/utils/RSAUtils.java b/src/main/java/com/fzzy/api/utils/RSAUtils.java
new file mode 100644
index 0000000..c36f1cd
--- /dev/null
+++ b/src/main/java/com/fzzy/api/utils/RSAUtils.java
@@ -0,0 +1,242 @@
+package com.fzzy.api.utils;
+
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.ArrayUtils;
+
+import javax.crypto.Cipher;
+import java.io.ByteArrayOutputStream;
+import java.nio.charset.StandardCharsets;
+import java.security.*;
+import java.security.interfaces.RSAPrivateKey;
+import java.security.interfaces.RSAPublicKey;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+public class RSAUtils {
+ public static final String KEY_ALGORITHM = "RSA";
+
+ private static final String PUBLIC_KEY = "RSAPublicKey";
+
+ private static final String PRIVATE_KEY = "RSAPrivateKey";
+
+ private static final String CHARSET = "utf-8";
+
+ private static final int KEYSIZE = 2048;// 瀵嗛挜浣嶆暟
+ private static final int RESERVE_BYTES = 11;
+ private static final String ECB_PADDING = "RSA/ECB/PKCS1Padding";
+
+ // 2048 bits 鐨� RSA 瀵嗛挜瀵癸紝鏈�澶цВ瀵嗗瘑鏂囧ぇ灏�
+ private static final int MAX_DECRYPT_BLOCK = KEYSIZE / 8;
+
+ // 2048 bits 鐨� RSA 瀵嗛挜瀵癸紝鏈�澶у姞瀵嗘槑鏂囧ぇ灏�
+ private static final int MAX_ENCRYPT_BLOCK = MAX_DECRYPT_BLOCK - RESERVE_BYTES;
+
+ // 鐢熸垚瀵嗛挜瀵�
+ public static Map<String, Object> initKey(int keysize) throws Exception {
+ KeyPairGenerator keyPairGen = KeyPairGenerator.getInstance(KEY_ALGORITHM);
+ // 璁剧疆瀵嗛挜瀵圭殑 bit 鏁帮紝瓒婂ぇ瓒婂畨鍏�
+ keyPairGen.initialize(keysize);
+ KeyPair keyPair = keyPairGen.generateKeyPair();
+
+ // 鑾峰彇鍏挜
+ RSAPublicKey publicKey = (RSAPublicKey) keyPair.getPublic();
+ // 鑾峰彇绉侀挜
+ RSAPrivateKey privateKey = (RSAPrivateKey) keyPair.getPrivate();
+ Map<String, Object> keyMap = new HashMap<>(2);
+ keyMap.put(PUBLIC_KEY, publicKey);
+ keyMap.put(PRIVATE_KEY, privateKey);
+ return keyMap;
+ }
+
+ // 鑾峰彇鍏挜瀛楃涓�
+ public static String getPublicKeyStr(Map<String, Object> keyMap) {
+ // 鑾峰緱 map 涓殑鍏挜瀵硅薄锛岃浆涓� key 瀵硅薄
+ Key key = (Key) keyMap.get(PUBLIC_KEY);
+ // 缂栫爜杩斿洖瀛楃涓�
+ return encryptBASE64(key.getEncoded());
+ }
+
+ // 鑾峰彇绉侀挜瀛楃涓�
+ public static String getPrivateKeyStr(Map<String, Object> keyMap) {
+ // 鑾峰緱 map 涓殑绉侀挜瀵硅薄锛岃浆涓� key 瀵硅薄
+ Key key = (Key) keyMap.get(PRIVATE_KEY);
+ // 缂栫爜杩斿洖瀛楃涓�
+ return encryptBASE64(key.getEncoded());
+ }
+
+ // 鑾峰彇鍏挜
+ public static PublicKey getPublicKey(String publicKeyString) throws Exception {
+ byte[] publicKeyByte = Base64.getDecoder().decode(publicKeyString);
+ X509EncodedKeySpec keySpec = new X509EncodedKeySpec(publicKeyByte);
+ KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM);
+ return keyFactory.generatePublic(keySpec);
+ }
+
+ // 鑾峰彇绉侀挜
+ public static PrivateKey getPrivateKey(String privateKeyString) throws Exception {
+ byte[] privateKeyByte = Base64.getDecoder().decode(privateKeyString);
+ PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(privateKeyByte);
+ KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM);
+ return keyFactory.generatePrivate(keySpec);
+ }
+
+ /**
+ * BASE64 缂栫爜杩斿洖鍔犲瘑瀛楃涓�
+ *
+ * @param key 闇�瑕佺紪鐮佺殑瀛楄妭鏁扮粍
+ * @return 缂栫爜鍚庣殑瀛楃涓�
+ */
+ public static String encryptBASE64(byte[] key) {
+ return new String(Base64.getEncoder().encode(key));
+ }
+
+ /**
+ * BASE64 瑙ｇ爜锛岃繑鍥炲瓧鑺傛暟缁�
+ *
+ * @param key 寰呰В鐮佺殑瀛楃涓�
+ * @return 瑙ｇ爜鍚庣殑瀛楄妭鏁扮粍
+ */
+ public static byte[] decryptBASE64(String key) {
+ return Base64.getDecoder().decode(key);
+ }
+
+ /**
+ * 鍏挜鍔犲瘑
+ *
+ * @param text 寰呭姞瀵嗙殑鏄庢枃瀛楃涓�
+ * @param publicKeyStr 鍏挜
+ * @return 鍔犲瘑鍚庣殑瀵嗘枃
+ */
+ public static String encrypt(String text, String publicKeyStr) {
+ try {
+ log.info("鏄庢枃瀛楃涓蹭负:[{}]", text);
+ Cipher cipher = Cipher.getInstance(KEY_ALGORITHM);
+ cipher.init(Cipher.ENCRYPT_MODE, getPublicKey(publicKeyStr));
+
+ // URLEncoder缂栫爜瑙ｅ喅涓枃涔辩爜闂
+ byte[] data = text.getBytes(StandardCharsets.UTF_8);
+ // 鍔犲瘑鏃惰秴杩�117瀛楄妭灏辨姤閿欍�備负姝ら噰鐢ㄥ垎娈靛姞瀵嗙殑鍔炴硶鏉ュ姞瀵�
+ byte[] enBytes = null;
+ for (int i = 0; i < data.length; i += MAX_ENCRYPT_BLOCK) {
+ // 娉ㄦ剰瑕佷娇鐢�2鐨勫�嶆暟锛屽惁鍒欎細鍑虹幇鍔犲瘑鍚庣殑鍐呭鍐嶈В瀵嗘椂涓轰贡鐮�
+ byte[] doFinal = cipher.doFinal(ArrayUtils.subarray(data, i, i + MAX_ENCRYPT_BLOCK));
+ enBytes = ArrayUtils.addAll(enBytes, doFinal);
+ }
+ return Base64.getEncoder().encodeToString(enBytes);
+ } catch (Exception e) {
+ throw new RuntimeException("鍔犲瘑瀛楃涓瞇" + text + "]鏃堕亣鍒板紓甯�", e);
+ }
+ }
+
+ /**
+ * 绉侀挜瑙ｅ瘑
+ *
+ * @param secretText 寰呰В瀵嗙殑瀵嗘枃瀛楃涓�
+ * @param privateKeyStr 绉侀挜
+ * @return 瑙ｅ瘑鍚庣殑鏄庢枃
+ */
+ public static String decrypt(String secretText, String privateKeyStr) {
+ try {
+ // 鐢熸垚绉侀挜
+ Cipher cipher = Cipher.getInstance(KEY_ALGORITHM);
+ cipher.init(Cipher.DECRYPT_MODE, getPrivateKey(privateKeyStr));
+ // 瀵嗘枃瑙ｇ爜
+ byte[] data = Base64.getDecoder().decode(secretText);
+
+ // 杩斿洖UTF-8缂栫爜鐨勮В瀵嗕俊鎭�
+ int inputLen = data.length;
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ int offSet = 0;
+ byte[] cache;
+ int i = 0;
+ // 瀵规暟鎹垎娈佃В瀵�
+ while (inputLen - offSet > 0) {
+ if (inputLen - offSet > MAX_DECRYPT_BLOCK) {
+ cache = cipher.doFinal(data, offSet, MAX_DECRYPT_BLOCK);
+ } else {
+ cache = cipher.doFinal(data, offSet, inputLen - offSet);
+ }
+ out.write(cache, 0, cache.length);
+ i++;
+ offSet = i * MAX_DECRYPT_BLOCK;
+ }
+ out.close();
+ return out.toString(CHARSET);
+ } catch (Exception e) {
+ throw new RuntimeException("瑙ｅ瘑瀛楃涓瞇" + secretText + "]鏃堕亣鍒板紓甯�", e);
+ }
+ }
+
+ /**
+ * 绉侀挜鍔犲瘑
+ *
+ * @param text
+ * @param privateInfoStr
+ * @return
+ */
+ public static String encryptData(String text, String privateInfoStr) {
+ try {
+ log.info("鏄庢枃瀛楃涓蹭负:[{}]", text);
+ Cipher cipher = Cipher.getInstance(ECB_PADDING);
+ cipher.init(Cipher.ENCRYPT_MODE, getPrivateKey(privateInfoStr));
+
+ // URLEncoder缂栫爜瑙ｅ喅涓枃涔辩爜闂
+ byte[] data = text.getBytes(StandardCharsets.UTF_8);
+ byte[] enBytes = null;
+ for (int i = 0; i < data.length; i += MAX_ENCRYPT_BLOCK) {
+ // 娉ㄦ剰瑕佷娇鐢�2鐨勫�嶆暟锛屽惁鍒欎細鍑虹幇鍔犲瘑鍚庣殑鍐呭鍐嶈В瀵嗘椂涓轰贡鐮�
+ byte[] doFinal = cipher.doFinal(ArrayUtils.subarray(data, i, i + MAX_ENCRYPT_BLOCK));
+ enBytes = ArrayUtils.addAll(enBytes, doFinal);
+ }
+ return Base64.getEncoder().encodeToString(enBytes);
+ } catch (Exception e) {
+ throw new RuntimeException("鍔犲瘑瀛楃涓瞇" + text + "]鏃堕亣鍒板紓甯�", e);
+ }
+ }
+
+ /**
+ * 鍏挜瑙ｅ瘑
+ *
+ * @param secretText
+ * @param publicInfoStr
+ * @return
+ */
+ public static String decryptData(String secretText, String publicInfoStr) {
+ try {
+ //瑙ｅ瘑
+ Cipher cipher = Cipher.getInstance(ECB_PADDING);
+ cipher.init(Cipher.DECRYPT_MODE, getPublicKey(publicInfoStr));
+
+ // 瀵嗘枃瑙ｇ爜
+ byte[] data = Base64.getDecoder().decode(secretText);
+
+ // 杩斿洖UTF-8缂栫爜鐨勮В瀵嗕俊鎭�
+ int inputLen = data.length;
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ int offSet = 0;
+ byte[] cache;
+ int i = 0;
+ // 瀵规暟鎹垎娈佃В瀵�
+ while (inputLen - offSet > 0) {
+ if (inputLen - offSet > MAX_DECRYPT_BLOCK) {
+ cache = cipher.doFinal(data, offSet, MAX_DECRYPT_BLOCK);
+ } else {
+ cache = cipher.doFinal(data, offSet, inputLen - offSet);
+ }
+ out.write(cache, 0, cache.length);
+ i++;
+ offSet = i * MAX_DECRYPT_BLOCK;
+ }
+ out.close();
+ return out.toString(CHARSET);
+ } catch (Exception e) {
+ throw new RuntimeException("瑙ｅ瘑瀛楃涓瞇" + secretText + "]鏃堕亣鍒板紓甯�", e);
+ }
+ }
+
+}
diff --git a/src/main/java/com/fzzy/api/view/Api1501.view.xml b/src/main/java/com/fzzy/api/view/Api1114-1.view.xml
similarity index 100%
rename from src/main/java/com/fzzy/api/view/Api1501.view.xml
rename to src/main/java/com/fzzy/api/view/Api1114-1.view.xml
diff --git a/src/main/java/com/fzzy/api/view/Api1502.view.xml b/src/main/java/com/fzzy/api/view/Api1114-2.view.xml
similarity index 100%
rename from src/main/java/com/fzzy/api/view/Api1502.view.xml
rename to src/main/java/com/fzzy/api/view/Api1114-2.view.xml
diff --git a/src/main/java/com/fzzy/api/view/Api1503.view.xml b/src/main/java/com/fzzy/api/view/Api1114-3.view.xml
similarity index 100%
rename from src/main/java/com/fzzy/api/view/Api1503.view.xml
rename to src/main/java/com/fzzy/api/view/Api1114-3.view.xml
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1101.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1101.java
index 0a4d30e..08cf93b 100644
--- a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1101.java
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1101.java
@@ -9,8 +9,8 @@
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDept;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1101Rep;
-import com.fzzy.whjl.WhjlConstant;
-import com.fzzy.whjl.dto.WhjlApi1101;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1101;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1102.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1102.java
index 2bde8f5..e1f7c72 100644
--- a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1102.java
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1102.java
@@ -9,8 +9,8 @@
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDept;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1101Rep;
-import com.fzzy.whjl.WhjlConstant;
-import com.fzzy.whjl.dto.WhjlApi1102;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1102;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1103.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1103.java
index c6d52a8..1f75843 100644
--- a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1103.java
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1103.java
@@ -7,11 +7,10 @@
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDept;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultUser;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1103Rep;
-import com.fzzy.whjl.WhjlConstant;
-import com.fzzy.whjl.dto.WhjlApi1103;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1103;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1105.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1105.java
index e9d7fad..c1e5351 100644
--- a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1105.java
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1105.java
@@ -9,8 +9,8 @@
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultBuild;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1105Rep;
-import com.fzzy.whjl.WhjlConstant;
-import com.fzzy.whjl.dto.WhjlApi1105;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1105;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1106.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1106.java
index 6a21ff3..8f796e0 100644
--- a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1106.java
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1106.java
@@ -9,8 +9,8 @@
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultGranary;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1106Rep;
-import com.fzzy.whjl.WhjlConstant;
-import com.fzzy.whjl.dto.WhjlApi1106;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1106;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1107.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1107.java
index 9750726..75422ff 100644
--- a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1107.java
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1107.java
@@ -8,12 +8,9 @@
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDepot;
-import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultGranary;
-import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1106Rep;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1107Rep;
-import com.fzzy.whjl.WhjlConstant;
-import com.fzzy.whjl.dto.WhjlApi1106;
-import com.fzzy.whjl.dto.WhjlApi1107;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1107;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1111.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1111.java
index f47267a..d46ac44 100644
--- a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1111.java
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1111.java
@@ -9,8 +9,8 @@
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDevice;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1111Rep;
-import com.fzzy.whjl.WhjlConstant;
-import com.fzzy.whjl.dto.WhjlApi1111;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1111;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1204.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1204.java
index 340cd8e..b105fec 100644
--- a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1204.java
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1204.java
@@ -9,8 +9,8 @@
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultCustomer;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1204Rep;
-import com.fzzy.whjl.WhjlConstant;
-import com.fzzy.whjl.dto.WhjlApi1204;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1204;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1207.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1207.java
index 5ff6516..fedacbe 100644
--- a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1207.java
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1207.java
@@ -8,10 +8,9 @@
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultContract;
-import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultCustomer;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1207Rep;
-import com.fzzy.whjl.WhjlConstant;
-import com.fzzy.whjl.dto.WhjlApi1207;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1207;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1214.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1214.java
index c93b1b1..f6801be 100644
--- a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1214.java
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1214.java
@@ -7,11 +7,10 @@
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultContract;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultInoutRecord;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1214Rep;
-import com.fzzy.whjl.WhjlConstant;
-import com.fzzy.whjl.dto.WhjlApi1214;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1214;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/fzzy/conf/JpaConfigPrimary.java b/src/main/java/com/fzzy/conf/JpaConfigPrimary.java
index 7c37cbd..d1fbdfe 100644
--- a/src/main/java/com/fzzy/conf/JpaConfigPrimary.java
+++ b/src/main/java/com/fzzy/conf/JpaConfigPrimary.java
@@ -20,7 +20,7 @@
@Configuration
@EnableTransactionManagement
@EnableJpaRepositories(
- basePackages = {"com.fzzy.api.*.repository", "com.fzzy.sys.repository", "com.fzzy.whjl.*.repository"},
+ basePackages = {"com.fzzy.api.*.repository", "com.fzzy.sys.repository", "com.fzzy.otherview.*.repository"},
entityManagerFactoryRef = "primaryEntityManagerFactory",
transactionManagerRef = "primaryTransactionManager"
)
diff --git a/src/main/java/com/fzzy/otherview/gd2022/package-info.java b/src/main/java/com/fzzy/otherview/gd2022/package-info.java
new file mode 100644
index 0000000..ece2f01
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/gd2022/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * 骞夸笢鐪佸钩鍙�2022鐗�-鐙湁鎺ュ彛
+ */
+package com.fzzy.otherview.gd2022;
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/otherview/gd2022/xzba1023.view.xml b/src/main/java/com/fzzy/otherview/gd2022/xzba1023.view.xml
new file mode 100644
index 0000000..360037f
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/gd2022/xzba1023.view.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model>
+
+ </Model>
+ <View layout="regionPadding:10">
+
+ </View>
+</ViewConfig>
diff --git a/src/main/java/com/fzzy/otherview/sh2023/package-info.java b/src/main/java/com/fzzy/otherview/sh2023/package-info.java
new file mode 100644
index 0000000..8ac24bc
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/sh2023/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * 涓婃捣甯傚钩鍙�2022鐗�-鐙湁鎺ュ彛
+ */
+package com.fzzy.otherview.sh2023;
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/view/ApiListWhjl.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/ApiListWhjl.view.xml
similarity index 100%
rename from src/main/java/com/fzzy/whjl/view/ApiListWhjl.view.xml
rename to src/main/java/com/fzzy/otherview/whhpjl/ApiListWhjl.view.xml
diff --git a/src/main/java/com/fzzy/whjl/view/WhjlApi1101.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1101.view.xml
similarity index 99%
rename from src/main/java/com/fzzy/whjl/view/WhjlApi1101.view.xml
rename to src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1101.view.xml
index fdaf621..0cd6ed3 100644
--- a/src/main/java/com/fzzy/whjl/view/WhjlApi1101.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1101.view.xml
@@ -4,7 +4,7 @@
<Context/>
<Model>
<DataType name="dtMain">
- <Property name="creationType">com.fzzy.whjl.dto.WhjlApi1101</Property>
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1101</Property>
<PropertyDef name="jlqybh">
<Property></Property>
<Property name="label">鍐涚伯浼佷笟缂栧彿</Property>
diff --git a/src/main/java/com/fzzy/whjl/view/WhjlApi1102.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1102.view.xml
similarity index 99%
rename from src/main/java/com/fzzy/whjl/view/WhjlApi1102.view.xml
rename to src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1102.view.xml
index d9cde7a..5cab992 100644
--- a/src/main/java/com/fzzy/whjl/view/WhjlApi1102.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1102.view.xml
@@ -4,7 +4,7 @@
<Context/>
<Model>
<DataType name="dtMain">
- <Property name="creationType">com.fzzy.whjl.dto.WhjlApi1102</Property>
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1102</Property>
<PropertyDef name="jgzdbh">
<Property></Property>
<Property name="label">鍐涗緵绔欑偣缂栧彿</Property>
diff --git a/src/main/java/com/fzzy/whjl/view/WhjlApi1103.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1103.view.xml
similarity index 99%
rename from src/main/java/com/fzzy/whjl/view/WhjlApi1103.view.xml
rename to src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1103.view.xml
index a6d0897..6118cc3 100644
--- a/src/main/java/com/fzzy/whjl/view/WhjlApi1103.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1103.view.xml
@@ -4,7 +4,7 @@
<Context/>
<Model>
<DataType name="dtMain">
- <Property name="creationType">com.fzzy.whjl.dto.WhjlApi1103</Property>
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1103</Property>
<PropertyDef name="rybh">
<Property></Property>
<Property name="label">浜哄憳缂栧彿</Property>
diff --git a/src/main/java/com/fzzy/whjl/view/WhjlApi1104.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1104.view.xml
similarity index 99%
rename from src/main/java/com/fzzy/whjl/view/WhjlApi1104.view.xml
rename to src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1104.view.xml
index 07d6a7b..6784fc4 100644
--- a/src/main/java/com/fzzy/whjl/view/WhjlApi1104.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1104.view.xml
@@ -4,7 +4,7 @@
<Context/>
<Model>
<DataType name="dtMain">
- <Property name="creationType">com.fzzy.whjl.dto.WhjlApi1104</Property>
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1104</Property>
<PropertyDef name="lydbh">
<Property></Property>
<Property name="label">绮补搴楃紪鍙�</Property>
diff --git a/src/main/java/com/fzzy/whjl/view/WhjlApi1105.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1105.view.xml
similarity index 99%
rename from src/main/java/com/fzzy/whjl/view/WhjlApi1105.view.xml
rename to src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1105.view.xml
index eccd8d8..04773e2 100644
--- a/src/main/java/com/fzzy/whjl/view/WhjlApi1105.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1105.view.xml
@@ -4,7 +4,7 @@
<Context/>
<Model>
<DataType name="dtMain">
- <Property name="creationType">com.fzzy.whjl.dto.WhjlApi1105</Property>
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1105</Property>
<PropertyDef name="cfbh">
<Property></Property>
<Property name="label">浠撴埧缂栧彿</Property>
diff --git a/src/main/java/com/fzzy/whjl/view/WhjlApi1106.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1106.view.xml
similarity index 99%
rename from src/main/java/com/fzzy/whjl/view/WhjlApi1106.view.xml
rename to src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1106.view.xml
index d0bd14d..6d96f15 100644
--- a/src/main/java/com/fzzy/whjl/view/WhjlApi1106.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1106.view.xml
@@ -4,7 +4,7 @@
<Context/>
<Model>
<DataType name="dtMain">
- <Property name="creationType">com.fzzy.whjl.dto.WhjlApi1106</Property>
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1106</Property>
<PropertyDef name="ajbh">
<Property></Property>
<Property name="label">寤掗棿缂栧彿</Property>
diff --git a/src/main/java/com/fzzy/whjl/view/WhjlApi1107.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1107.view.xml
similarity index 99%
rename from src/main/java/com/fzzy/whjl/view/WhjlApi1107.view.xml
rename to src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1107.view.xml
index 3a7b67e..e7f933a 100644
--- a/src/main/java/com/fzzy/whjl/view/WhjlApi1107.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1107.view.xml
@@ -4,7 +4,7 @@
<Context/>
<Model>
<DataType name="dtMain">
- <Property name="creationType">com.fzzy.whjl.dto.WhjlApi1107</Property>
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1107</Property>
<PropertyDef name="hwbh">
<Property></Property>
<Property name="label">璐т綅缂栧彿</Property>
diff --git a/src/main/java/com/fzzy/whjl/view/WhjlApi1111.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1111.view.xml
similarity index 99%
rename from src/main/java/com/fzzy/whjl/view/WhjlApi1111.view.xml
rename to src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1111.view.xml
index 72da493..395928f 100644
--- a/src/main/java/com/fzzy/whjl/view/WhjlApi1111.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1111.view.xml
@@ -4,7 +4,7 @@
<Context/>
<Model>
<DataType name="dtMain">
- <Property name="creationType">com.fzzy.whjl.dto.WhjlApi1111</Property>
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1111</Property>
<PropertyDef name="sbbh">
<Property></Property>
<Property name="label">璁惧缂栧彿</Property>
diff --git a/src/main/java/com/fzzy/whjl/view/WhjlApi1204.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1204.view.xml
similarity index 99%
rename from src/main/java/com/fzzy/whjl/view/WhjlApi1204.view.xml
rename to src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1204.view.xml
index 7310762..9d2d5ad 100644
--- a/src/main/java/com/fzzy/whjl/view/WhjlApi1204.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1204.view.xml
@@ -4,7 +4,7 @@
<Context/>
<Model>
<DataType name="dtMain">
- <Property name="creationType">com.fzzy.whjl.dto.WhjlApi1204</Property>
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1204</Property>
<PropertyDef name="khbh">
<Property></Property>
<Property name="label">瀹㈡埛缂栧彿</Property>
diff --git a/src/main/java/com/fzzy/whjl/view/WhjlApi1207.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1207.view.xml
similarity index 99%
rename from src/main/java/com/fzzy/whjl/view/WhjlApi1207.view.xml
rename to src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1207.view.xml
index 2385a82..2c91f58 100644
--- a/src/main/java/com/fzzy/whjl/view/WhjlApi1207.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1207.view.xml
@@ -4,7 +4,7 @@
<Context/>
<Model>
<DataType name="dtMain">
- <Property name="creationType">com.fzzy.whjl.dto.WhjlApi1207</Property>
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1207</Property>
<PropertyDef name="htid">
<Property></Property>
<Property name="label">鍚堝悓ID</Property>
@@ -177,7 +177,7 @@
</Reference>
</DataType>
<DataType name="dtItem">
- <Property name="creationType">com.fzzy.whjl.dto.WhjlQDItem</Property>
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlQDItem</Property>
<PropertyDef name="htspid">
<Property></Property>
<Property name="label">鍚堝悓鍟嗗搧ID</Property>
diff --git a/src/main/java/com/fzzy/whjl/view/WhjlApi1214.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1214.view.xml
similarity index 99%
rename from src/main/java/com/fzzy/whjl/view/WhjlApi1214.view.xml
rename to src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1214.view.xml
index d19aa35..76c1084 100644
--- a/src/main/java/com/fzzy/whjl/view/WhjlApi1214.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1214.view.xml
@@ -4,7 +4,7 @@
<Context/>
<Model>
<DataType name="dtMain">
- <Property name="creationType">com.fzzy.whjl.dto.WhjlApi1214</Property>
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1214</Property>
<PropertyDef name="crkid">
<Property/>
<Property name="label">鍑哄叆搴撹褰旾D</Property>
diff --git a/src/main/java/com/fzzy/whjl/WhjlConstant.java b/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java
similarity index 99%
rename from src/main/java/com/fzzy/whjl/WhjlConstant.java
rename to src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java
index f64aafa..2df1fe8 100644
--- a/src/main/java/com/fzzy/whjl/WhjlConstant.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl;
+package com.fzzy.otherview.whhpjl;
/**
* 姝︽眽鍐涚伯鐪佸钩鍙�--鍏ㄥ眬闈欐�佺被
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1101.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1101.java
similarity index 97%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1101.java
rename to src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1101.java
index d9abf92..73854f2 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1101.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1101.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.dto;
+package com.fzzy.otherview.whhpjl.dto;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1102.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1102.java
similarity index 97%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1102.java
rename to src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1102.java
index 84f52ae..2c7de23 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1102.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1102.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.dto;
+package com.fzzy.otherview.whhpjl.dto;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1103.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1103.java
similarity index 96%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1103.java
rename to src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1103.java
index e00624f..378f062 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1103.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1103.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.dto;
+package com.fzzy.otherview.whhpjl.dto;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1104.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1104.java
similarity index 96%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1104.java
rename to src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1104.java
index 46c0803..1b8b805 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1104.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1104.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.dto;
+package com.fzzy.otherview.whhpjl.dto;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1105.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1105.java
similarity index 97%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1105.java
rename to src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1105.java
index 92db109..6fe02e0 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1105.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1105.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.dto;
+package com.fzzy.otherview.whhpjl.dto;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1106.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1106.java
similarity index 97%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1106.java
rename to src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1106.java
index 5a3ee84..1cd41d3 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1106.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1106.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.dto;
+package com.fzzy.otherview.whhpjl.dto;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1107.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1107.java
similarity index 97%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1107.java
rename to src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1107.java
index 72e6f06..bbfd2fb 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1107.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1107.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.dto;
+package com.fzzy.otherview.whhpjl.dto;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1108.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1108.java
similarity index 95%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1108.java
rename to src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1108.java
index f050d77..355cf85 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1108.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1108.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.dto;
+package com.fzzy.otherview.whhpjl.dto;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1109.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java
similarity index 96%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1109.java
rename to src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java
index 548c793..118ebee 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1109.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.dto;
+package com.fzzy.otherview.whhpjl.dto;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1110.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1110.java
similarity index 95%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1110.java
rename to src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1110.java
index 71a0cb4..0286f0c 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1110.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1110.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.dto;
+package com.fzzy.otherview.whhpjl.dto;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1111.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1111.java
similarity index 97%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1111.java
rename to src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1111.java
index 42159fa..9b52fbb 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1111.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1111.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.dto;
+package com.fzzy.otherview.whhpjl.dto;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1112.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1112.java
similarity index 96%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1112.java
rename to src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1112.java
index f5410c2..7997c48 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1112.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1112.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.dto;
+package com.fzzy.otherview.whhpjl.dto;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1113.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1113.java
similarity index 97%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1113.java
rename to src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1113.java
index db77b5b..5391131 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1113.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1113.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.dto;
+package com.fzzy.otherview.whhpjl.dto;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1114.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java
similarity index 95%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1114.java
rename to src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java
index b9daa40..ddbf85d 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1114.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.dto;
+package com.fzzy.otherview.whhpjl.dto;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1204.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1204.java
similarity index 97%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1204.java
rename to src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1204.java
index 09ad5f0..7d25f8a 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1204.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1204.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.dto;
+package com.fzzy.otherview.whhpjl.dto;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1207.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1207.java
similarity index 98%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1207.java
rename to src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1207.java
index ed3e97b..a5aa22c 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1207.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1207.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.dto;
+package com.fzzy.otherview.whhpjl.dto;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1208.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1208.java
similarity index 97%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1208.java
rename to src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1208.java
index 1e9dac3..ae3d6ff 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1208.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1208.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.dto;
+package com.fzzy.otherview.whhpjl.dto;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1209.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1209.java
similarity index 97%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1209.java
rename to src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1209.java
index 0651e98..29963d7 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1209.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1209.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.dto;
+package com.fzzy.otherview.whhpjl.dto;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1210.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1210.java
similarity index 96%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1210.java
rename to src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1210.java
index 13763be..b859283 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1210.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1210.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.dto;
+package com.fzzy.otherview.whhpjl.dto;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1214.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1214.java
similarity index 98%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1214.java
rename to src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1214.java
index 99abe96..65a23f0 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1214.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1214.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.dto;
+package com.fzzy.otherview.whhpjl.dto;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1302.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1302.java
similarity index 98%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1302.java
rename to src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1302.java
index 9d3a906..dd78de6 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1302.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1302.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.dto;
+package com.fzzy.otherview.whhpjl.dto;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1303.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1303.java
similarity index 97%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1303.java
rename to src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1303.java
index f138074..30aa4b3 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1303.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1303.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.dto;
+package com.fzzy.otherview.whhpjl.dto;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1304.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1304.java
similarity index 95%
rename from src/main/java/com/fzzy/whjl/dto/WhjlApi1304.java
rename to src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1304.java
index 42b4cc7..0d9935c 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1304.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1304.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.dto;
+package com.fzzy.otherview.whhpjl.dto;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlCheckItm.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlCheckItm.java
similarity index 94%
rename from src/main/java/com/fzzy/whjl/dto/WhjlCheckItm.java
rename to src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlCheckItm.java
index fd3fce1..8b9cff2 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlCheckItm.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlCheckItm.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.dto;
+package com.fzzy.otherview.whhpjl.dto;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlQDItem.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlQDItem.java
similarity index 95%
rename from src/main/java/com/fzzy/whjl/dto/WhjlQDItem.java
rename to src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlQDItem.java
index 280d880..d964ce2 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlQDItem.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlQDItem.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.dto;
+package com.fzzy.otherview.whhpjl.dto;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/package-info.java b/src/main/java/com/fzzy/otherview/whhpjl/package-info.java
new file mode 100644
index 0000000..765bd3a
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * 姝︽眽鍐涚伯鐪佸钩鍙�
+ */
+package com.fzzy.otherview.whhpjl;
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/view/pr/ApiListWhjlPR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/ApiListWhjlPR.java
similarity index 92%
rename from src/main/java/com/fzzy/whjl/view/pr/ApiListWhjlPR.java
rename to src/main/java/com/fzzy/otherview/whhpjl/pr/ApiListWhjlPR.java
index 83b8f66..f80dda7 100644
--- a/src/main/java/com/fzzy/whjl/view/pr/ApiListWhjlPR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/ApiListWhjlPR.java
@@ -1,12 +1,12 @@
-package com.fzzy.whjl.view.pr;
+package com.fzzy.otherview.whhpjl.pr;
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.entity.ApiList;
import com.fzzy.api.entity.ApiTrigger;
-import com.fzzy.whjl.WhjlConstant;
-import com.fzzy.whjl.view.repository.ApiListWhjlRep;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.repository.ApiListWhjlRep;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1101PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1101PR.java
similarity index 96%
rename from src/main/java/com/fzzy/whjl/view/pr/WhjlApi1101PR.java
rename to src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1101PR.java
index 7dcef4c..31dff23 100644
--- a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1101PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1101PR.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.view.pr;
+package com.fzzy.otherview.whhpjl.pr;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -14,8 +14,8 @@
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
-import com.fzzy.whjl.WhjlConstant;
-import com.fzzy.whjl.dto.WhjlApi1101;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1101;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
diff --git a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1102PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1102PR.java
similarity index 96%
rename from src/main/java/com/fzzy/whjl/view/pr/WhjlApi1102PR.java
rename to src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1102PR.java
index a84fddc..1f25f5b 100644
--- a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1102PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1102PR.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.view.pr;
+package com.fzzy.otherview.whhpjl.pr;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -14,8 +14,8 @@
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
-import com.fzzy.whjl.WhjlConstant;
-import com.fzzy.whjl.dto.WhjlApi1102;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1102;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1103PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1103PR.java
similarity index 96%
rename from src/main/java/com/fzzy/whjl/view/pr/WhjlApi1103PR.java
rename to src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1103PR.java
index 6a02038..ac5c2ee 100644
--- a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1103PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1103PR.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.view.pr;
+package com.fzzy.otherview.whhpjl.pr;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -14,9 +14,8 @@
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
-import com.fzzy.whjl.WhjlConstant;
-import com.fzzy.whjl.dto.WhjlApi1103;
-import org.springframework.beans.BeanUtils;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1103;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1104PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1104PR.java
similarity index 90%
rename from src/main/java/com/fzzy/whjl/view/pr/WhjlApi1104PR.java
rename to src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1104PR.java
index 9fc5440..a9f9c00 100644
--- a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1104PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1104PR.java
@@ -1,10 +1,9 @@
-package com.fzzy.whjl.view.pr;
+package com.fzzy.otherview.whhpjl.pr;
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
-import com.fzzy.whjl.dto.WhjlApi1103;
-import com.fzzy.whjl.dto.WhjlApi1104;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1104;
import org.springframework.stereotype.Component;
import java.util.List;
diff --git a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1105PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1105PR.java
similarity index 96%
rename from src/main/java/com/fzzy/whjl/view/pr/WhjlApi1105PR.java
rename to src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1105PR.java
index a234861..6fdab11 100644
--- a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1105PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1105PR.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.view.pr;
+package com.fzzy.otherview.whhpjl.pr;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -14,9 +14,8 @@
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
-import com.fzzy.whjl.WhjlConstant;
-import com.fzzy.whjl.dto.WhjlApi1105;
-import org.springframework.beans.BeanUtils;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1105;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1106PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1106PR.java
similarity index 96%
rename from src/main/java/com/fzzy/whjl/view/pr/WhjlApi1106PR.java
rename to src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1106PR.java
index 2acee30..0be93ca 100644
--- a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1106PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1106PR.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.view.pr;
+package com.fzzy.otherview.whhpjl.pr;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -14,9 +14,8 @@
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
-import com.fzzy.whjl.WhjlConstant;
-import com.fzzy.whjl.dto.WhjlApi1106;
-import org.springframework.beans.BeanUtils;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1106;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1107PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1107PR.java
similarity index 96%
rename from src/main/java/com/fzzy/whjl/view/pr/WhjlApi1107PR.java
rename to src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1107PR.java
index 0fa7611..407ba0b 100644
--- a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1107PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1107PR.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.view.pr;
+package com.fzzy.otherview.whhpjl.pr;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -14,8 +14,8 @@
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
-import com.fzzy.whjl.WhjlConstant;
-import com.fzzy.whjl.dto.WhjlApi1107;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1107;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1111PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1111PR.java
similarity index 96%
rename from src/main/java/com/fzzy/whjl/view/pr/WhjlApi1111PR.java
rename to src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1111PR.java
index f693837..da1de1c 100644
--- a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1111PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1111PR.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.view.pr;
+package com.fzzy.otherview.whhpjl.pr;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -14,8 +14,8 @@
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
-import com.fzzy.whjl.WhjlConstant;
-import com.fzzy.whjl.dto.WhjlApi1111;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1111;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1204PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1204PR.java
similarity index 96%
rename from src/main/java/com/fzzy/whjl/view/pr/WhjlApi1204PR.java
rename to src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1204PR.java
index 027d19c..f6273e3 100644
--- a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1204PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1204PR.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.view.pr;
+package com.fzzy.otherview.whhpjl.pr;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -14,9 +14,8 @@
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
-import com.fzzy.whjl.WhjlConstant;
-import com.fzzy.whjl.dto.WhjlApi1111;
-import com.fzzy.whjl.dto.WhjlApi1204;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1204;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1207PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1207PR.java
similarity index 96%
rename from src/main/java/com/fzzy/whjl/view/pr/WhjlApi1207PR.java
rename to src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1207PR.java
index a6d88b6..227122e 100644
--- a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1207PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1207PR.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.view.pr;
+package com.fzzy.otherview.whhpjl.pr;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -14,9 +14,9 @@
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
-import com.fzzy.whjl.WhjlConstant;
-import com.fzzy.whjl.dto.WhjlApi1207;
-import com.fzzy.whjl.dto.WhjlQDItem;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1207;
+import com.fzzy.otherview.whhpjl.dto.WhjlQDItem;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1214PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1214PR.java
similarity index 96%
rename from src/main/java/com/fzzy/whjl/view/pr/WhjlApi1214PR.java
rename to src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1214PR.java
index 5e8859d..04e1fca 100644
--- a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1214PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1214PR.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.view.pr;
+package com.fzzy.otherview.whhpjl.pr;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -14,9 +14,8 @@
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
-import com.fzzy.whjl.WhjlConstant;
-import com.fzzy.whjl.dto.WhjlApi1214;
-import com.fzzy.whjl.dto.WhjlQDItem;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1214;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/package-info.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/package-info.java
new file mode 100644
index 0000000..1689b09
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * 姝︽眽鍐涚伯鐪佸钩鍙�
+ */
+package com.fzzy.otherview.whhpjl.pr;
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/view/repository/ApiListWhjlRep.java b/src/main/java/com/fzzy/otherview/whhpjl/repository/ApiListWhjlRep.java
similarity index 91%
rename from src/main/java/com/fzzy/whjl/view/repository/ApiListWhjlRep.java
rename to src/main/java/com/fzzy/otherview/whhpjl/repository/ApiListWhjlRep.java
index bccf2ae..34ac910 100644
--- a/src/main/java/com/fzzy/whjl/view/repository/ApiListWhjlRep.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/repository/ApiListWhjlRep.java
@@ -1,4 +1,4 @@
-package com.fzzy.whjl.view.repository;
+package com.fzzy.otherview.whhpjl.repository;
import com.fzzy.api.entity.ApiList;
import org.springframework.data.jpa.repository.JpaRepository;
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/repository/package-info.java b/src/main/java/com/fzzy/otherview/whhpjl/repository/package-info.java
new file mode 100644
index 0000000..ccc7b70
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/repository/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * 姝︽眽鍐涚伯鐪佸钩鍙�
+ */
+package com.fzzy.otherview.whhpjl.repository;
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
new file mode 100644
index 0000000..b98350f
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -0,0 +1,152 @@
+package com.fzzy.push.sh2023;
+
+import com.alibaba.fastjson.JSON;
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.Api1102;
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.api.service.ApiTriggerService;
+import com.fzzy.api.utils.*;
+import com.fzzy.api.view.repository.Api1102Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.push.sh2023.dto.SH2023ReqDto;
+import com.fzzy.push.sh2023.dto.SH2023RespDto;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 涓婃捣甯傚钩鍙�2023鐗�-涓婁紶鏁版嵁鏈嶅姟绫�
+ *
+ * @author czt
+ * @date 2023/08/17
+ */
+@Slf4j
+@Data
+@Service
+public class SH2023ApiRemoteService implements ApiRemoteService {
+
+ @Autowired
+ private RedisUtil redisUtil;
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiTriggerService apiTriggerService;
+ @Autowired
+ private ApiLogRep apiLogRep;
+ @Autowired
+ private Api1102Rep api1102Rep;
+
+ @Override
+ public String getProtocol() {
+ return PushProtocol.SB_SH_2023.getCode();
+ }
+
+ @Override
+ public ResponseDto pushData(ApiParam param, Object data) {
+ return pushData(param, null, data);
+ }
+
+ @Override
+ public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) {
+ String inteId = param.getInteId();
+ String kqdm = param.getKqdm();
+
+ try {
+ if (null == conf) {
+ conf = apiCommonService.getConf(kqdm);
+ }
+
+ //娣诲姞鏃ュ織
+ ApiLog apiLog = new ApiLog();
+ apiLog.setId(ContextUtil.getUUID());
+ apiLog.setInteId(inteId);
+ String jsonData = getJsonData(inteId, data);
+ log.info("鎺ュ彛鏁版嵁淇℃伅=" + jsonData);
+
+ if (StringUtils.isEmpty(inteId)) {
+ ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒版帴鍙�");
+ apiLog.setStatus(99);
+ apiLog.setResult("娌℃湁鑾峰彇鍒版帴鍙�");
+ apiLogRep.save(apiLog);
+ return responseDto;
+ }
+ apiLog.setData(jsonData);
+ apiLog.setKqdm(kqdm);
+ apiLog.setUploadTime(new Date());
+
+ if (conf == null) {
+ ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒颁笂浼犻厤缃�");
+ apiLog.setStatus(99);
+ apiLog.setResult("娌℃湁鑾峰彇鍒颁笂浼犻厤缃�");
+ apiLogRep.save(apiLog);
+ return responseDto;
+ }
+
+ //灏佽鎺ㄩ�佹暟鎹�
+ SH2023ReqDto reqData = new SH2023ReqDto();
+ reqData.setId(ContextUtil.getUUID());
+ //鑾峰彇韬唤ID锛屽嵆琛屾斂鍖哄垝鐮�
+ List<Api1102> api1102List = api1102Rep.findPushData(conf.getKqdm());
+ if(null == api1102List || api1102List.isEmpty()){
+ ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒拌韩浠絀D");
+ apiLog.setStatus(99);
+ apiLog.setResult("娌℃湁鑾峰彇鍒拌韩浠絀D");
+ apiLogRep.save(apiLog);
+ return responseDto;
+ }
+ reqData.setUid(api1102List.get(0).getXzqhdm());
+ //鎸囦护id
+ reqData.setOrderid(param.getOrderid());
+ //韬唤绛惧悕锛屽鍦板尯琛屾斂鍖哄垝浠ｇ爜_褰撳ぉ鏃ユ湡杩涜MD5绠楁硶绛惧悕
+ reqData.setAccess_token(RSAUtils.encryptData(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"),conf.getPublicKey()));
+ //鏁版嵁鎬绘潯鏁�
+ List<Object> list = (List<Object>)data;
+ reqData.setDatalength(list.size());
+ //鏁版嵁杩涜SM4鍔犲瘑
+ reqData.setData(jsonData);
+ //鎽樿锛屾暟鎹富浣撶殑MD5鍊�
+ reqData.setDigst(MyMD5Util.encrypt(jsonData));
+
+ SH2023RespDto responseDto = SH2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, reqData, conf);
+ apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
+ apiLog.setResult(responseDto.getResult());
+ apiLogRep.save(apiLog);
+ ResponseDto resd = new ResponseDto();
+ resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
+ resd.setMsg(responseDto.getResult());
+
+ return resd;
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ return new ResponseDto(99, e.getMessage());
+ }
+ }
+
+ /**
+ * 璋冩暣鏁版嵁灏佽锛岃幏鍙杍son鏁版嵁
+ *
+ * @param inteId
+ * @param data
+ * @return
+ * @throws Exception
+ */
+ private String getJsonData(String inteId, Object data) {
+ //鍏蜂綋鏍规嵁鎺ュ彛杩涜灏佽
+ if ("1101".equals(inteId)) {
+ return JSON.toJSONString(data);
+ } else {
+ return JSON.toJSONString(data);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023Constant.java b/src/main/java/com/fzzy/push/sh2023/SH2023Constant.java
new file mode 100644
index 0000000..4aec482
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023Constant.java
@@ -0,0 +1,206 @@
+package com.fzzy.push.sh2023;
+
+/**
+ * 涓婃捣甯傚钩鍙�2023鐗�-鎺ュ彛-甯搁噺
+ */
+public class SH2023Constant {
+
+ /**
+ * 鎺ュ彛缂栫爜-1101 鍗曚綅淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1101 = "1101";
+ /**
+ * 鎺ュ彛缂栫爜-1102 搴撳尯淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1102 = "1102";
+ /**
+ * 鎺ュ彛缂栫爜-1103 浠撴埧淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1103 = "1103";
+ /**
+ * 鎺ュ彛缂栫爜-1104 寤掗棿淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1104 = "1104";
+ /**
+ * 鎺ュ彛缂栫爜-1105 璐т綅淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1105 = "1105";
+ /**
+ * 鎺ュ彛缂栫爜-1106 娌圭綈淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1106 = "1106";
+ /**
+ * 鎺ュ彛缂栫爜-1107 璁惧淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1107 = "1107";
+ /**
+ * 鎺ュ彛缂栫爜-1108 鑽墏淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1108 = "1108";
+ /**
+ * 鎺ュ彛缂栫爜-1109 鏂囦欢淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1109 = "1109";
+ /**
+ * 鎺ュ彛缂栫爜-1110 搴撳尯鍥句粨鎴跨偣浣嶆爣娉ㄦ暟鎹帴鍙�
+ */
+ public static String SH_2023_API_CODE_1110 = "1110";
+ /**
+ * 鎺ュ彛缂栫爜-1111 搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆爣娉ㄦ暟鎹帴鍙�
+ */
+ public static String SH_2023_API_CODE_1111 = "1111";
+ /**
+ * 鎺ュ彛缂栫爜-1112 浜哄憳淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1112 = "1112";
+ /**
+ * 鎺ュ彛缂栫爜-1113 浼佷笟淇＄敤淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1113 = "1113";
+ /**
+ * 鎺ュ彛缂栫爜-1114 璐㈠姟鎶ヨ〃鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1114 = "1114";
+
+ /**
+ * 鎺ュ彛缂栫爜-1201 鍚堝悓淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1201 = "1201";
+ /**
+ * 鎺ュ彛缂栫爜-1202 绮鍏ュ簱淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1202 = "1202";
+ /**
+ * 鎺ュ彛缂栫爜-1203 绮鍏ュ簱妫�楠屼俊鎭暟鎹帴鍙�
+ */
+ public static String SH_2023_API_CODE_1203 = "1203";
+ /**
+ * 鎺ュ彛缂栫爜-1204 绮鍏ュ簱缁撶畻淇℃伅鏁版嵁鍙�
+ */
+ public static String SH_2023_API_CODE_1204 = "1204";
+ /**
+ * 鎺ュ彛缂栫爜-1205 绮鍑哄簱淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1205 = "1205";
+ /**
+ * 鎺ュ彛缂栫爜-1206 绮鍑哄簱缁撶畻淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1206 = "1206";
+ /**
+ * 鎺ュ彛缂栫爜-1207 鍊掍粨鍊掑嚭鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1207 = "1207";
+ /**
+ * 鎺ュ彛缂栫爜-1208 绮搴撳瓨鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1208 = "1208";
+ /**
+ * 鎺ュ彛缂栫爜-1209 鎹熸孩鍗曟暟鎹帴鍙�
+ */
+ public static String SH_2023_API_CODE_1209 = "1209";
+ /**
+ * 鎺ュ彛缂栫爜-1210 绮鎬ц川杞彉鍗曟暟鎹帴鍙�
+ */
+ public static String SH_2023_API_CODE_1210 = "1210";
+ /**
+ * 鎺ュ彛缂栫爜-1211 璐﹂潰搴撳瓨鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1211 = "1211";
+ /**
+ * 鎺ュ彛缂栫爜-1212 瀹㈡埛淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1212 = "1212";
+
+ /**
+ * 鎺ュ彛缂栫爜-1301 瀹夊叏绠＄悊鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1301 = "1301";
+ /**
+ * 鎺ュ彛缂栫爜-1302 娓╂箍搴︽娴嬫暟鎹帴鍙�
+ */
+ public static String SH_2023_API_CODE_1302 = "1302";
+ /**
+ * 鎺ュ彛缂栫爜-1303 瀹宠櫕妫�娴嬫暟鎹帴鍙�
+ */
+ public static String SH_2023_API_CODE_1303 = "1303";
+ /**
+ * 鎺ュ彛缂栫爜-1304 姘斾綋妫�娴嬫暟鎹帴鍙�
+ */
+ public static String SH_2023_API_CODE_1304 = "1304";
+ /**
+ * 鎺ュ彛缂栫爜-1305 閫氶浣滀笟鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1305 = "1305";
+ /**
+ * 鎺ュ彛缂栫爜-1306 鐔忚捀浣滀笟鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1306 = "1306";
+ /**
+ * 鎺ュ彛缂栫爜-1307 浠撳唴瑙嗛鍥惧儚鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1307 = "1307";
+ /**
+ * 鎺ュ彛缂栫爜-1308 瑙嗛鐩戞帶寮傚父浜嬩欢鍛婅鍩烘湰淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1308 = "1308";
+ /**
+ * 鎺ュ彛缂栫爜-1309 杩濊棰勮淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1309 = "1309";
+ /**
+ * 鎺ュ彛缂栫爜-1310 璐ㄦ鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1310 = "1310";
+ /**
+ * 鎺ュ彛缂栫爜-1311 =瑙嗛鐩戞帶鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1311 = "1311";
+
+ /**
+ * 鎺ュ彛缂栫爜-1401 鍌ㄥ瑙勬ā鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1401 = "1401";
+ /**
+ * 鎺ュ彛缂栫爜-1402 鍌ㄥ璁″垝淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1402 = "1402";
+ /**
+ * 鎺ュ彛缂栫爜-1403 杞崲璁″垝淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1403 = "1403";
+ /**
+ * 鎺ュ彛缂栫爜-1404 杞崲璁″垝鏄庣粏淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1404 = "1404";
+ /**
+ * 鎺ュ彛缂栫爜-1405 椤圭洰淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_1405 = "1405";
+
+ /**
+ * 鎺ュ彛缂栫爜-2101 妫�鏂ゅ崟鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_2101 = "2101";
+ /**
+ * 鎺ュ彛缂栫爜-2102 鍊掍粨鍊掑叆鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_2102 = "2102";
+ /**
+ * 鎺ュ彛缂栫爜-2103 绮儏璁惧閰嶇疆鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_2103 = "2103";
+ /**
+ * 鎺ュ彛缂栫爜-2104 甯傚偍椹宠繍鍗曚俊鎭暟鎹帴鍙�
+ */
+ public static String SH_2023_API_CODE_2104 = "2104";
+ /**
+ * 鎺ュ彛缂栫爜-2203 浜ゆ槗涓績鍚堝悓淇″績鏁版嵁鎺ュ彛
+ */
+ public static String SH_2023_API_CODE_2203 = "2203";
+ /**
+ * 鎺ュ彛缂栫爜-2204 瀹氬寲姘存楠�
+ */
+ public static String SH_2023_API_CODE_2204 = "2204";
+
+
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023HttpClientUtil.java b/src/main/java/com/fzzy/push/sh2023/SH2023HttpClientUtil.java
new file mode 100644
index 0000000..0d47166
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023HttpClientUtil.java
@@ -0,0 +1,89 @@
+package com.fzzy.push.sh2023;
+
+import com.alibaba.fastjson.JSON;
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.push.sh2023.dto.SH2023ReqDto;
+import com.fzzy.push.sh2023.dto.SH2023RespDto;
+import lombok.extern.slf4j.Slf4j;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+/**
+ * 涓婃捣甯傚钩鍙�2023鐗�-涓婁紶鏁版嵁鏈嶅姟绫�
+ * @author czt
+ * @date 2023/08/17
+ */
+@Slf4j
+public class SH2023HttpClientUtil {
+
+ /**
+ * post formData
+ * @param url
+ * @return
+ * @throws Exception
+ */
+ @SuppressWarnings("resource")
+ public static SH2023RespDto postPushData(String url, SH2023ReqDto reqData , ApiConfs apiConfs) throws Exception {
+ log.info("---------鎺ュ彛璇锋眰鍦板潃锛�" +url+ "----------鍙傛暟锛�" + reqData.toString() +"---------");
+ BufferedReader in = null;
+ URL urls = new URL(url);
+ HttpURLConnection connection = null;
+ OutputStream outputStream = null;
+ String rs = "";
+ SH2023RespDto responseDto;
+ try {
+
+ connection = (HttpURLConnection) urls.openConnection();
+ connection.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
+ connection.setDoOutput(true);
+ connection.setDoInput(true);
+ connection.setRequestProperty("Accept-Language", "zh-CN,zh;q=0.8");
+ connection.setRequestProperty("Accept", "*/*");
+ connection.setRequestProperty("Range", "bytes=" + "");
+ connection.setConnectTimeout(20000);
+ connection.setReadTimeout(30000);
+ connection.setRequestMethod("POST");
+
+ outputStream = connection.getOutputStream();
+ outputStream.write(reqData.toString().getBytes("UTF-8"));
+ try {
+ connection.connect();
+ if (connection.getResponseCode() == 200) {
+ in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
+ String line = "";
+ while ((line = in.readLine()) != null) {
+ rs += line;
+ }
+ }else{
+ log.error("http鐘舵�侊細" + connection.getResponseCode());
+ log.error("http娑堟伅锛�" + connection.getResponseMessage());
+ }
+
+ } catch (Exception e) {
+ System.out.println("鍙戠敓寮傚父");
+ log.error(e.getMessage(),e);
+ rs = null;
+ return new SH2023RespDto(99,e.getMessage());
+ }
+ log.info("---------鎺ュ彛杩斿洖锛�" + rs +"---------");
+ responseDto = JSON.parseObject(rs,SH2023RespDto.class);
+ if(responseDto == null ) return new SH2023RespDto(99,"鎺ュ彛璇锋眰鍙戠敓鏈煡閿欒");
+ return responseDto;
+ } finally {
+ try {
+ outputStream.close();
+ if (in != null){
+ in.close();
+ }
+ } catch (Exception e) {
+ }
+ outputStream = null;
+ if (connection != null)
+ connection.disconnect();
+ connection = null;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java
new file mode 100644
index 0000000..be16965
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java
@@ -0,0 +1,39 @@
+package com.fzzy.push.sh2023;
+
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.data.PushProtocol;
+import com.fzzy.api.service.PushService11;
+import com.fzzy.push.impl.ComPushService11;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 涓婃捣甯傚钩鍙�2023鐗�-鍩虹鏁版嵁涓婁紶
+ *
+ * @author czt
+ * @date 2023/08/17
+ */
+@Slf4j
+@Component
+public class SH2023PushService11 implements PushService11 {
+
+
+ @Autowired
+ private ComPushService11 pushService;
+
+ @Override
+ public String getProtocol() {
+ return PushProtocol.SB_SH_2023.getCode();
+ }
+
+ @Override
+ public void pushData(ApiParam param) {
+ log.info("------->>>>鍩虹淇℃伅 鎺ュ彛妯″潡涓婃姤寮�濮�");
+
+ //鎺ㄩ�佸崟浣嶄俊鎭�
+
+
+ log.info("------->>>>鍩虹淇℃伅 鎺ュ彛妯″潡涓婃姤缁撴潫");
+ }
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023ReqDto.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023ReqDto.java
new file mode 100644
index 0000000..9682f92
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023ReqDto.java
@@ -0,0 +1,48 @@
+package com.fzzy.push.sh2023.dto;
+
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * 涓婃捣2023鐗堢渷骞冲彴-鎺ㄩ�佹暟鎹皝瑁�
+ * @author czt
+ * @date 2023/08/17
+ */
+@Data
+public class SH2023ReqDto implements Serializable {
+
+ /**
+ * 鎶ユ枃鏍囪瘑id
+ */
+ private String id;
+
+ /**
+ * 韬唤id
+ */
+ private String uid;
+
+ /**
+ * 鎸囦护id
+ */
+ private String orderid;
+
+ /**
+ * 韬唤绛惧悕
+ */
+ private String access_token;
+
+ /**
+ * 鏁版嵁鎬绘潯鏁�
+ */
+ private Integer datalength;
+
+ /**
+ * 涓婁紶鏁版嵁(闆嗗悎褰㈠紡)
+ */
+ private String data;
+
+ /**
+ * 鏁版嵁鎽樿
+ */
+ private String digst;
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023RespDto.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023RespDto.java
new file mode 100644
index 0000000..cc5c7dc
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023RespDto.java
@@ -0,0 +1,30 @@
+package com.fzzy.push.sh2023.dto;
+
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * 涓婃姤鍙嶉
+ * @author czt
+ * @date 2023/08/17
+ */
+@Data
+public class SH2023RespDto<T> implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -6714158228489303453L;
+
+ private int code ;
+
+ private String result;
+
+
+ public SH2023RespDto() {
+ }
+
+ public SH2023RespDto(int code, String result) {
+ this.code = code;
+ this.result = result;
+ }
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/package-info.java b/src/main/java/com/fzzy/push/sh2023/package-info.java
new file mode 100644
index 0000000..c89ca23
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * @Desc: 涓婃捣2023鐗堟帴鍙�
+ *
+ * @author: czt
+ * @update-time: 2023/08/17
+ *
+ */
+package com.fzzy.push.sh2023;
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/shyz/package-info.java b/src/main/java/com/fzzy/push/shyz/package-info.java
deleted file mode 100644
index 048c652..0000000
--- a/src/main/java/com/fzzy/push/shyz/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * @Desc:
- *
- * @author: Andy
- * @update-time: 2022/10/9
- *
- */
-package com.fzzy.push.shyz;
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
index c065fac..157f664 100644
--- a/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
@@ -15,7 +15,7 @@
import com.fzzy.api.view.repository.*;
import com.fzzy.push.whhpjl.dto.WhjlReqDto;
import com.fzzy.push.whhpjl.dto.WhjlRespDto;
-import com.fzzy.whjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -92,8 +92,8 @@
WhjlReqDto reqData = new WhjlReqDto();
reqData.setId(ContextUtil.getUUID());
reqData.setUid(conf.getKqdm());
- //TODO 鎸囦护id寰呯‘璁�
- reqData.setOrderid("");
+ //鎸囦护ID
+ reqData.setOrderid(param.getOrderid());
reqData.setAppcode(conf.getUserName());
reqData.setTimestamp(ContextUtil.getCurTimeMillis());
List<Object> list = (List<Object>)data;
diff --git a/src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java b/src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java
index ecf3f89..1e006da 100644
--- a/src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java
+++ b/src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java
@@ -1,6 +1,5 @@
package com.fzzy.push.whhpjl;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
@@ -10,15 +9,12 @@
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.PushService11;
import com.fzzy.api.view.repository.ApiInfoDataRep;
-import com.fzzy.whjl.WhjlConstant;
-import com.fzzy.whjl.dto.*;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.*;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
/**
diff --git a/src/main/java/com/fzzy/push/whhpjl/WhjlPushService12.java b/src/main/java/com/fzzy/push/whhpjl/WhjlPushService12.java
index 89813d9..9c0d03d 100644
--- a/src/main/java/com/fzzy/push/whhpjl/WhjlPushService12.java
+++ b/src/main/java/com/fzzy/push/whhpjl/WhjlPushService12.java
@@ -9,11 +9,10 @@
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.PushService11;
import com.fzzy.api.view.repository.ApiInfoDataRep;
-import com.fzzy.whjl.WhjlConstant;
-import com.fzzy.whjl.dto.WhjlApi1101;
-import com.fzzy.whjl.dto.WhjlApi1204;
-import com.fzzy.whjl.dto.WhjlApi1207;
-import com.fzzy.whjl.dto.WhjlApi1214;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1204;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1207;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1214;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/fzzy/whjl/package-info.java b/src/main/java/com/fzzy/whjl/package-info.java
deleted file mode 100644
index 0168701..0000000
--- a/src/main/java/com/fzzy/whjl/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * 姝︽眽鍐涚伯鐪佸钩鍙�
- */
-package com.fzzy.whjl;
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/view/pr/package-info.java b/src/main/java/com/fzzy/whjl/view/pr/package-info.java
deleted file mode 100644
index b330fe7..0000000
--- a/src/main/java/com/fzzy/whjl/view/pr/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * 姝︽眽鍐涚伯鐪佸钩鍙�
- */
-package com.fzzy.whjl.view.pr;
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/whjl/view/repository/package-info.java b/src/main/java/com/fzzy/whjl/view/repository/package-info.java
deleted file mode 100644
index ba925ce..0000000
--- a/src/main/java/com/fzzy/whjl/view/repository/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * 姝︽眽鍐涚伯鐪佸钩鍙�
- */
-package com.fzzy.whjl.view.repository;
\ No newline at end of file
diff --git a/src/main/resources/templates/home/home-whjl.html b/src/main/resources/templates/home/home-whjl.html
index f99eaaa..0cd8f78 100644
--- a/src/main/resources/templates/home/home-whjl.html
+++ b/src/main/resources/templates/home/home-whjl.html
@@ -81,7 +81,7 @@
<dl class="layui-nav-child">
<dd class="layui-this">
- <a lay-href="com.fzzy.whjl.view.ApiListWhjl.d">鎺ュ彛鍒楄〃</a>
+ <a lay-href="com.fzzy.otherview.whhpjl.ApiListWhjl.d">鎺ュ彛鍒楄〃</a>
</dd>
<dd>
<a lay-href="com.fzzy.api.view.ApiConfs.d">鎺ュ彛閰嶇疆</a>
@@ -109,46 +109,46 @@
</a>
<dl class="layui-nav-child">
<dd>
- <a lay-href="com.fzzy.whjl.view.WhjlApi1101.d">鍐涚伯浼佷笟淇℃伅</a>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1101.d">鍐涚伯浼佷笟淇℃伅</a>
</dd>
<dd>
- <a lay-href="com.fzzy.whjl.view.WhjlApi1102.d">鍐涗緵绔欑偣淇℃伅</a>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1102.d">鍐涗緵绔欑偣淇℃伅</a>
</dd>
<dd>
- <a lay-href="com.fzzy.whjl.view.WhjlApi1103.d">鍐涚伯浜哄憳淇℃伅</a>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1103.d">鍐涚伯浜哄憳淇℃伅</a>
</dd>
<dd>
- <a lay-href="com.fzzy.whjl.view.WhjlApi1104.d">鏀惧績绮补搴�</a>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1104.d">鏀惧績绮补搴�</a>
</dd>
<dd>
- <a lay-href="com.fzzy.whjl.view.WhjlApi1105.d">浠撴埧淇℃伅</a>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1105.d">浠撴埧淇℃伅</a>
</dd>
<dd>
- <a lay-href="com.fzzy.whjl.view.WhjlApi1106.d">寤掗棿淇℃伅</a>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1106.d">寤掗棿淇℃伅</a>
</dd>
<dd>
- <a lay-href="com.fzzy.whjl.view.WhjlApi1107.d">璐т綅淇℃伅</a>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1107.d">璐т綅淇℃伅</a>
</dd>
<dd>
- <a lay-href="com.fzzy.whjl.view.WhjlApi1108.d">浠撳偍璁炬柦鐢靛瓙妗ｆ</a>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1108.d">浠撳偍璁炬柦鐢靛瓙妗ｆ</a>
</dd>
<dd>
- <a lay-href="com.fzzy.whjl.view.WhjlApi1109.d">浠撳偍璁炬柦缁存姢璁板綍</a>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1109.d">浠撳偍璁炬柦缁存姢璁板綍</a>
</dd>
<dd>
- <a lay-href="com.fzzy.whjl.view.WhjlApi1110.d">浠撳偍璁惧鎶ュ簾璁板綍</a>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1110.d">浠撳偍璁惧鎶ュ簾璁板綍</a>
</dd>
<dd>
- <a lay-href="com.fzzy.whjl.view.WhjlApi1111.d">浠撳偍璁惧淇℃伅</a>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1111.d">浠撳偍璁惧淇℃伅</a>
</dd>
<dd>
- <a lay-href="com.fzzy.whjl.view.WhjlApi1112.d">浠撳偍璁惧缁存姢璁板綍</a>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1112.d">浠撳偍璁惧缁存姢璁板綍</a>
</dd>
<dd>
- <a lay-href="com.fzzy.whjl.view.WhjlApi1113.d">浠撳偍璁惧缁翠慨璁板綍</a>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1113.d">浠撳偍璁惧缁翠慨璁板綍</a>
</dd>
<dd>
- <a lay-href="com.fzzy.whjl.view.WhjlApi1114.d">浠撳偍璁惧鎶ュ簾璁板綍</a>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1114.d">浠撳偍璁惧鎶ュ簾璁板綍</a>
</dd>
</dl>
</li>
@@ -163,22 +163,22 @@
</a>
<dl class="layui-nav-child">
<dd>
- <a lay-href="com.fzzy.whjl.view.WhjlApi1204.d">瀹㈡埛淇℃伅</a>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1204.d">瀹㈡埛淇℃伅</a>
</dd>
<dd>
- <a lay-href="com.fzzy.whjl.view.WhjlApi1207.d">鍚堝悓淇℃伅</a>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1207.d">鍚堝悓淇℃伅</a>
</dd>
<dd>
- <a lay-href="com.fzzy.whjl.view.WhjlApi1208.d">搴撳瓨鍙拌处</a>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1208.d">搴撳瓨鍙拌处</a>
</dd>
<dd>
- <a lay-href="com.fzzy.whjl.view.WhjlApi1209.d">搴撳瓨鍙拌处浜у搧鎵规</a>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1209.d">搴撳瓨鍙拌处浜у搧鎵规</a>
</dd>
<dd>
- <a lay-href="com.fzzy.whjl.view.WhjlApi1210.d">搴撳瓨鍙拌处鍑哄叆璁板綍</a>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1210.d">搴撳瓨鍙拌处鍑哄叆璁板綍</a>
</dd>
<dd>
- <a lay-href="com.fzzy.whjl.view.WhjlApi1214.d">鍑哄叆搴撹褰�</a>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1214.d">鍑哄叆搴撹褰�</a>
</dd>
</dl>
</li>
@@ -193,13 +193,13 @@
</a>
<dl class="layui-nav-child">
<dd>
- <a lay-href="com.fzzy.whjl.view.WhjlApi1302.d">璐ㄦ鎶ュ憡</a>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1302.d">璐ㄦ鎶ュ憡</a>
</dd>
<dd>
- <a lay-href="com.fzzy.whjl.view.WhjlApi1303.d">绮儏妫�娴嬭褰�</a>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1303.d">绮儏妫�娴嬭褰�</a>
</dd>
<dd>
- <a lay-href="com.fzzy.whjl.view.WhjlApi1304.d">鑳借�楄褰�</a>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1304.d">鑳借�楄褰�</a>
</dd>
</dl>
</li>
@@ -216,16 +216,16 @@
</a>
<dl class="layui-nav-child">
<!-- <dd>-->
- <!-- <a lay-href="com.fzzy.whjl.view.WhjlApi1401.d">搴撳瓨鍙拌处</a>-->
+ <!-- <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1401.d">搴撳瓨鍙拌处</a>-->
<!-- </dd>-->
<!-- <dd>-->
- <!-- <a lay-href="com.fzzy.whjl.view.WhjlApi1402.d">搴撳瓨鍙拌处浜у搧鎵规</a>-->
+ <!-- <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1402.d">搴撳瓨鍙拌处浜у搧鎵规</a>-->
<!-- </dd>-->
<!-- <dd>-->
- <!-- <a lay-href="com.fzzy.whjl.view.WhjlApi1403.d">搴撳瓨鍙拌处鍑哄叆璁板綍</a>-->
+ <!-- <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1403.d">搴撳瓨鍙拌处鍑哄叆璁板綍</a>-->
<!-- </dd>-->
<!-- <dd>-->
- <!-- <a lay-href="com.fzzy.whjl.view.WhjlApi1406.d">鍑哄叆搴撹褰�</a>-->
+ <!-- <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1406.d">鍑哄叆搴撹褰�</a>-->
<!-- </dd>-->
</dl>
</li>
@@ -262,7 +262,7 @@
lay-filter="layadmin-layout-tabs">
<ul class="layui-tab-title" id="LAY_app_tabsheader">
<li lay-id="ApiList"
- lay-attr="com.fzzy.whjl.view.ApiListWhjl.d" class="layui-this"><i
+ lay-attr="com.fzzy.otherview.whhpjl.ApiListWhjl.d" class="layui-this"><i
class="layui-icon layui-icon-home"></i></li>
</ul>
</div>
@@ -271,7 +271,7 @@
<!-- 涓讳綋鍐呭 -->
<div class="layui-body" id="LAY_app_body">
<div class="layadmin-tabsbody-item layui-show">
- <iframe src="com.fzzy.whjl.view.ApiListWhjl.d" frameborder="0"
+ <iframe src="com.fzzy.otherview.whhpjl.ApiListWhjl.d" frameborder="0"
class="layadmin-iframe"></iframe>
</div>
</div>
diff --git a/src/main/resources/templates/home/home.html b/src/main/resources/templates/home/home.html
index 17d00fc..0b40053 100644
--- a/src/main/resources/templates/home/home.html
+++ b/src/main/resources/templates/home/home.html
@@ -50,7 +50,7 @@
</dd>
<hr>
<dd>
- <a href="#" target="_self" >閫�鍑�</a>
+ <a href="#" target="_self">閫�鍑�</a>
</dd>
</dl>
</li>
@@ -100,13 +100,13 @@
<li data-name="component" class="layui-nav-item">
<a class="one" href="javascript:;" lay-tips="" lay-direction="2">
- <!-- <i class="layui-icon layui-icon-component"></i>-->
- <div class="g-icon">
- <img th:src="@{/static/lib/layuiadmin/style/images/icon2.png}">
- </div>
- <cite>鍩虹淇℃伅</cite>
- <span class="layui-nav-more"></span>
- </a>
+ <!-- <i class="layui-icon layui-icon-component"></i>-->
+ <div class="g-icon">
+ <img th:src="@{/static/lib/layuiadmin/style/images/icon2.png}">
+ </div>
+ <cite>鍩虹淇℃伅</cite>
+ <span class="layui-nav-more"></span>
+ </a>
<dl class="layui-nav-child">
<dd>
<a lay-href="com.fzzy.api.view.Api1101.d">鍗曚綅淇℃伅</a>
@@ -147,13 +147,21 @@
<dd>
<a lay-href="com.fzzy.api.view.Api1113.d">浼佷笟淇＄敤淇℃伅</a>
</dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1114-1.d">璐㈠姟鎶ヨ〃-璧勪骇璐熷��</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api114-2.d">璐㈠姟鎶ヨ〃-鐜伴噾娴侀噺淇℃伅</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.api.view.Api1114-3.d">璐㈠姟鎶ヨ〃-鍒╂鼎淇℃伅</a>
+ </dd>
</dl>
</li>
<li data-name="template" class="layui-nav-item"><a class="one"
href="javascript:;" lay-tips=""
lay-direction="2">
- <!-- <i class="layui-icon layui-icon-template"></i>-->
<div class="g-icon">
<img th:src="@{/static/lib/layuiadmin/style/images/icon1.png}">
</div>
@@ -202,13 +210,13 @@
<li data-name="template" class="layui-nav-item">
<a class="one" href="javascript:;" lay-tips="" lay-direction="2">
- <!-- <i class="layui-icon layui-icon-template"></i>-->
- <div class="g-icon">
- <img th:src="@{/static/lib/layuiadmin/style/images/icon4.png}">
- </div>
- <cite>绮绠＄悊</cite>
- <span class="layui-nav-more"></span>
- </a>
+ <!-- <i class="layui-icon layui-icon-template"></i>-->
+ <div class="g-icon">
+ <img th:src="@{/static/lib/layuiadmin/style/images/icon4.png}">
+ </div>
+ <cite>绮绠＄悊</cite>
+ <span class="layui-nav-more"></span>
+ </a>
<dl class="layui-nav-child">
<dd>
<a lay-href="com.fzzy.api.view.Api1301.d">瀹夊叏绠＄悊</a>
@@ -275,22 +283,15 @@
<li data-name="template" class="layui-nav-item">
<a class="one" href="javascript:;" lay-tips="" lay-direction="2">
- <!-- <i class="layui-icon layui-icon-template"></i>-->
<div class="g-icon">
<img th:src="@{/static/lib/layuiadmin/style/images/icon3.png}">
</div>
- <cite>璐㈠姟绠＄悊</cite>
+ <cite>鍏朵粬鎺ュ彛</cite>
<span class="layui-nav-more"></span>
</a>
<dl class="layui-nav-child">
<dd>
- <a lay-href="com.fzzy.api.view.Api1501.d">璧勪骇璐熷�轰俊鎭�</a>
- </dd>
- <dd>
- <a lay-href="com.fzzy.api.view.Api1502.d">鐜伴噾娴侀噺淇℃伅</a>
- </dd>
- <dd>
- <a lay-href="com.fzzy.api.view.Api1503.d">鍒╂鼎淇℃伅</a>
+ <a lay-href="com.fzzy.otherview.gd2022.xzba1023.d">骞夸笢-鐔忚捀澶囨</a>
</dd>
</dl>
</li>
--
Gitblit v1.9.3