From 76c42651345f4b824c02df3075d46dafd2462e24 Mon Sep 17 00:00:00 2001
From: lyf <1357764963@qq>
Date: Sat, 28 Jan 2023 17:21:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=8F=91=E9=80=81=E7=9F=AD?=
=?UTF-8?q?=E4=BF=A1=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pluss_manage_page_war_exploded.xml | 12 +
..._aliyun_alibabacloud_gateway_spi_0_0_1.xml | 13 +
...ven__com_aliyun_credentials_java_0_2_4.xml | 13 +
...en__com_aliyun_dysmsapi20170525_2_0_21.xml | 13 +
.../Maven__com_aliyun_endpoint_util_0_0_7.xml | 13 +
.../Maven__com_aliyun_openapiutil_0_1_14.xml | 13 +
.../libraries/Maven__com_aliyun_tea_1_2_0.xml | 13 +
.../Maven__com_aliyun_tea_openapi_0_2_6.xml | 13 +
.../Maven__com_aliyun_tea_util_0_2_14.xml | 13 +
.../Maven__com_aliyun_tea_xml_0_1_5.xml | 13 +
...aven__com_sun_xml_bind_jaxb_core_2_3_0.xml | 13 +
...aven__com_sun_xml_bind_jaxb_impl_2_3_0.xml | 13 +
.../Maven__org_dom4j_dom4j_2_0_3.xml | 13 +
..._jacoco_org_jacoco_agent_runtime_0_8_4.xml | 13 +
.idea/workspace.xml | 1867 +----------------
code-generator/code-generator.iml | 14 +
pluss-api-page/pluss-api-page.iml | 12 +
pluss-api-page/pom.xml | 1 -
.../PhoneValidateCodeController.java | 2 +-
.../controller/UserInfoController.java | 4 +-
.../controller/UserInfoController.class | Bin 16734 -> 16738 bytes
pluss-common-bundle/pluss-common-bundle.iml | 14 +
pluss-common-bundle/pom.xml | 6 +
.../pluss/platform/util/ValidateCodeUtil.java | 90 +
.../platform/util/ValidateCodeUtil.class | Bin 7404 -> 9766 bytes
pluss-dao-bundle/pluss-dao-bundle.iml | 14 +
pluss-manage-page/pluss-manage-page.iml | 12 +
pluss-model-bundle/pluss-model-bundle.iml | 18 +-
.../converter/BankCardConverterImpl.java | 2 +-
.../platform/converter/ConverterImpl.java | 2 +-
.../platform/converter/ImgConverterImpl.java | 2 +-
.../MerchantBaseInfoConverterImpl.java | 2 +-
.../MerchantCashPlaceConverterImpl.java | 2 +-
.../converter/MerchantStaffConverterImpl.java | 2 +-
.../converter/UserAppConverterImpl.java | 2 +-
pluss-service-bundle/pluss-service-bundle.iml | 12 +
pluss-wap-page/pluss-wap-page.iml | 12 +
.../phonecode/PhoneCodeController.java | 4 +-
38 files changed, 446 insertions(+), 1831 deletions(-)
create mode 100644 .idea/libraries/Maven__com_aliyun_alibabacloud_gateway_spi_0_0_1.xml
create mode 100644 .idea/libraries/Maven__com_aliyun_credentials_java_0_2_4.xml
create mode 100644 .idea/libraries/Maven__com_aliyun_dysmsapi20170525_2_0_21.xml
create mode 100644 .idea/libraries/Maven__com_aliyun_endpoint_util_0_0_7.xml
create mode 100644 .idea/libraries/Maven__com_aliyun_openapiutil_0_1_14.xml
create mode 100644 .idea/libraries/Maven__com_aliyun_tea_1_2_0.xml
create mode 100644 .idea/libraries/Maven__com_aliyun_tea_openapi_0_2_6.xml
create mode 100644 .idea/libraries/Maven__com_aliyun_tea_util_0_2_14.xml
create mode 100644 .idea/libraries/Maven__com_aliyun_tea_xml_0_1_5.xml
create mode 100644 .idea/libraries/Maven__com_sun_xml_bind_jaxb_core_2_3_0.xml
create mode 100644 .idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_3_0.xml
create mode 100644 .idea/libraries/Maven__org_dom4j_dom4j_2_0_3.xml
create mode 100644 .idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_4.xml
diff --git a/.idea/artifacts/pluss_manage_page_war_exploded.xml b/.idea/artifacts/pluss_manage_page_war_exploded.xml
index 4c27820..1465475 100644
--- a/.idea/artifacts/pluss_manage_page_war_exploded.xml
+++ b/.idea/artifacts/pluss_manage_page_war_exploded.xml
@@ -95,6 +95,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.idea/libraries/Maven__com_aliyun_alibabacloud_gateway_spi_0_0_1.xml b/.idea/libraries/Maven__com_aliyun_alibabacloud_gateway_spi_0_0_1.xml
new file mode 100644
index 0000000..8ad7462
--- /dev/null
+++ b/.idea/libraries/Maven__com_aliyun_alibabacloud_gateway_spi_0_0_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_aliyun_credentials_java_0_2_4.xml b/.idea/libraries/Maven__com_aliyun_credentials_java_0_2_4.xml
new file mode 100644
index 0000000..8dd3c72
--- /dev/null
+++ b/.idea/libraries/Maven__com_aliyun_credentials_java_0_2_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_aliyun_dysmsapi20170525_2_0_21.xml b/.idea/libraries/Maven__com_aliyun_dysmsapi20170525_2_0_21.xml
new file mode 100644
index 0000000..5c99771
--- /dev/null
+++ b/.idea/libraries/Maven__com_aliyun_dysmsapi20170525_2_0_21.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_aliyun_endpoint_util_0_0_7.xml b/.idea/libraries/Maven__com_aliyun_endpoint_util_0_0_7.xml
new file mode 100644
index 0000000..f40c482
--- /dev/null
+++ b/.idea/libraries/Maven__com_aliyun_endpoint_util_0_0_7.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_aliyun_openapiutil_0_1_14.xml b/.idea/libraries/Maven__com_aliyun_openapiutil_0_1_14.xml
new file mode 100644
index 0000000..28885c4
--- /dev/null
+++ b/.idea/libraries/Maven__com_aliyun_openapiutil_0_1_14.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_aliyun_tea_1_2_0.xml b/.idea/libraries/Maven__com_aliyun_tea_1_2_0.xml
new file mode 100644
index 0000000..81e304f
--- /dev/null
+++ b/.idea/libraries/Maven__com_aliyun_tea_1_2_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_aliyun_tea_openapi_0_2_6.xml b/.idea/libraries/Maven__com_aliyun_tea_openapi_0_2_6.xml
new file mode 100644
index 0000000..99c5545
--- /dev/null
+++ b/.idea/libraries/Maven__com_aliyun_tea_openapi_0_2_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_aliyun_tea_util_0_2_14.xml b/.idea/libraries/Maven__com_aliyun_tea_util_0_2_14.xml
new file mode 100644
index 0000000..d84f188
--- /dev/null
+++ b/.idea/libraries/Maven__com_aliyun_tea_util_0_2_14.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_aliyun_tea_xml_0_1_5.xml b/.idea/libraries/Maven__com_aliyun_tea_xml_0_1_5.xml
new file mode 100644
index 0000000..c636291
--- /dev/null
+++ b/.idea/libraries/Maven__com_aliyun_tea_xml_0_1_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_sun_xml_bind_jaxb_core_2_3_0.xml b/.idea/libraries/Maven__com_sun_xml_bind_jaxb_core_2_3_0.xml
new file mode 100644
index 0000000..0fb3357
--- /dev/null
+++ b/.idea/libraries/Maven__com_sun_xml_bind_jaxb_core_2_3_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_3_0.xml b/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_3_0.xml
new file mode 100644
index 0000000..2be1137
--- /dev/null
+++ b/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_3_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_dom4j_dom4j_2_0_3.xml b/.idea/libraries/Maven__org_dom4j_dom4j_2_0_3.xml
new file mode 100644
index 0000000..265db53
--- /dev/null
+++ b/.idea/libraries/Maven__org_dom4j_dom4j_2_0_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_4.xml b/.idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_4.xml
new file mode 100644
index 0000000..6bf92e2
--- /dev/null
+++ b/.idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 509e8ca..d0eec19 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,1816 +4,43 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1854,6 +81,7 @@
+
@@ -1880,15 +108,13 @@
-
+
-
-
-
+
@@ -1952,8 +178,17 @@
-
+
+
+
+ 1674892648184
+
+
+
+ 1674892648184
+
+
@@ -1983,6 +218,10 @@
+
+
+
+
diff --git a/code-generator/code-generator.iml b/code-generator/code-generator.iml
index de7a64b..5850703 100644
--- a/code-generator/code-generator.iml
+++ b/code-generator/code-generator.iml
@@ -116,6 +116,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pluss-api-page/pluss-api-page.iml b/pluss-api-page/pluss-api-page.iml
index ffdd66f..158f25f 100644
--- a/pluss-api-page/pluss-api-page.iml
+++ b/pluss-api-page/pluss-api-page.iml
@@ -118,6 +118,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pluss-api-page/pom.xml b/pluss-api-page/pom.xml
index 41a443a..53e9929 100644
--- a/pluss-api-page/pom.xml
+++ b/pluss-api-page/pom.xml
@@ -101,7 +101,6 @@
swagger-bootstrap-ui
1.9.6
-
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/PhoneValidateCodeController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/PhoneValidateCodeController.java
index cf584c6..e84930f 100644
--- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/PhoneValidateCodeController.java
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/PhoneValidateCodeController.java
@@ -101,7 +101,7 @@ public class PhoneValidateCodeController {
String checkCode = StringUtil.random(4);
phoneValidateCode.setCode(checkCode);
try {
- Result