From ba478602c43004ff7ea749fba6d9cc9ce4cf78f3 Mon Sep 17 00:00:00 2001
From: lyf <1357764963@qq>
Date: Sun, 29 Jan 2023 09:44:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=83=A8=E5=88=86?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=88=E7=99=BE=E5=BA=A6=E6=96=87=E5=AD=97?=
=?UTF-8?q?=E8=AF=86=E5=88=AB=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 64 ++++++------------
.../common/ImageUploadController.java | 3 +-
.../PhoneValidateCodeController.class | Bin 9309 -> 9312 bytes
.../common/ImageUploadController.class | Bin 2441 -> 2592 bytes
.../resources/config/application-common.yml | 6 +-
5 files changed, 27 insertions(+), 46 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d0eec19..79d7503 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,43 +4,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -76,7 +45,7 @@
-
+
@@ -108,13 +77,15 @@
-
+
-
+
+
+
@@ -179,7 +150,8 @@
-
+
+
1674892648184
@@ -188,7 +160,14 @@
1674892648184
-
+
+ 1674897664824
+
+
+
+ 1674897664824
+
+
@@ -220,7 +199,8 @@
-
+
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/common/ImageUploadController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/common/ImageUploadController.java
index 089961a..6e49846 100644
--- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/common/ImageUploadController.java
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/common/ImageUploadController.java
@@ -30,8 +30,9 @@ public class ImageUploadController {
return ResultGenerator.genSuccessResult(url);
}
- @PostMapping("")
+ @PostMapping("/image")
public Result imageUpload(@RequestParam("file") MultipartFile file) {
+ System.out.println("26sa1d521sa561s56");
final String url;
try {
url = OssOperatUtil.upload(file.getInputStream(), UUID.randomUUID().toString().replace("-", ""), "png");
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/PhoneValidateCodeController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/PhoneValidateCodeController.class
index b3a55bfc2964f12613075b4c15a434ebec256e4b..9873da3cee048eeb079043c93975304013826886 100644
GIT binary patch
delta 48
zcmccX@xWt4oTRi^QEFjnYH>+eVoqjCVo9oVeoCsNPbMRSi^gOb8QIAlVj7!wOD^I9
E0K`ubD*ylh
delta 45
zcmaFhao1x*oTP+sQEFjnYH>+eVoqjCVo9oVeo87MgNw#wc^TQs9by`r_en0|0sxPW
B5H$b*
diff --git a/pluss-api-page/target/classes/cn/pluss/platform/controller/common/ImageUploadController.class b/pluss-api-page/target/classes/cn/pluss/platform/controller/common/ImageUploadController.class
index 31ce74fd3cf5f63129cda7a4c9de3f82c808bacb..cb74134d1adbc1d5ea281181e774002bb34808df 100644
GIT binary patch
delta 822
zcmZvYNmCP15XXOSLU`javV`{a)6;ZJ7PB`Q8zVdu6G4$)M_J5n!7glnAY64nPJvujt2@gs6g~K51Cg43b~ZV
zwRyyXX3-|eV@=BD328;$P`v0y7Gpz^q8p1xim|w6$>u2;P1YtyUQxf~uDDJ*?~IL)
zK3_-{O6h#A{HkIk&`4(eXT`jcs`VKeHiLC48ekew9?^g`lygv$F|0cI@l-LprHF@
z7(?zL2c#CDOPB`T9Q3^uhlJNNgDMjCyY-5fH|htuJ=f@aszUZhcK3fas4l-T+gEF+
zLv_hXuDW7B$Y)Z!FD`?M)*8*<^^L9^HHEsQf)eu``HC%^>dcLlPa6
L{J01E+n@LY-cEQA
delta 655
zcmZvYNmCP16otRnO?*w$1Puu>f;a(&5NwAS2UHYiMNvQm6P370IaJCLi!E+l_aAWS
z%95f=(1n&;m;Md^f@OKSpK42`w+)S?spw6*7kTygSQW4RH&XtbK)%E4zk^Yq9MHUZ?>smM@Zmq@bF8!udmv1vunONu_#`jeg#ZOZj;^~7GU
zsz#UsyA?UIDfTGmvR6n)0{6?Ng*l)zP{S-Sm`ocIS1k3tY|L67`Amml1NT!@ZO^TA
zE@aZ{bbTvt;D1yH;_j1bH`$~|a}ZO3qOwDpeo%iYQCUg!xQPx&6hhupB$VYSrmPF@pR5^!Z2|gpQqWE}RPS&pe
E1^b>xlmGw#
diff --git a/pluss-common-bundle/src/main/resources/config/application-common.yml b/pluss-common-bundle/src/main/resources/config/application-common.yml
index efcdc63..84e9af1 100644
--- a/pluss-common-bundle/src/main/resources/config/application-common.yml
+++ b/pluss-common-bundle/src/main/resources/config/application-common.yml
@@ -93,7 +93,7 @@ parameter:
ALI_APP_ID: 支付宝原生接入的APPID
ALI_RATE: 0.006
ALI_RETURN_URL: ${parameter.domain}/wap/aliPay/returnUrl
- APPID: 微信原生接入的APPID
+ APPID: wx7f982bbf66000fd1
APPLETS_APPID: 小程序付款APPID
APPSECRET:
KEY: 微信原生加密用的KEY
@@ -113,8 +113,8 @@ parameter:
ZY_PUB:
agentId: 乐刷代理商编号、未接入可不管
apk_dowload_url: apk下载链接，存储转入OSS之后可不管
- baiduAK: cqmQn4RoZgC0IyH4mbHjKmQQ
- baiduSK: hUhGrZFONMBjIzUQULOtlSXP3uTpompp
+ baiduAK: LUcko8ZP334suBQ929nbrBtV
+ baiduSK: VqPHkWS5oipOEc2yw7dNa5CWr7yGIyiE
bankCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/bankcard
blCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/business_license
# 百度人脸识别应用的AK
From c513d14203988aaac1e92d25ef7309e5a1a6e7aa Mon Sep 17 00:00:00 2001
From: lyf <1357764963@qq>
Date: Sun, 29 Jan 2023 10:36:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?wap=E9=83=A8=E5=88=86=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 34 +++++++++++++-----
.../classes/config/application-common.yml | 6 ++--
.../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 +-
.../impl/v20210929/YsAuditServiceImpl$1.class | Bin 1820 -> 1417 bytes
.../v20220615/YsAuditServiceImpl$1.class | Bin 1879 -> 1476 bytes
pluss-wap-page/pluss-wap-page.iml | 2 --
.../src/main/resources/application-dev.yml | 6 ++--
.../src/main/resources/application-prod.yml | 6 ++--
.../src/main/resources/application-test.yml | 6 ++--
15 files changed, 44 insertions(+), 30 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 79d7503..7a01b96 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,12 +4,20 @@
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -63,7 +71,7 @@
-
+
@@ -151,7 +159,7 @@
-
+
1674892648184
@@ -167,7 +175,14 @@
1674897664824
-
+
+ 1674956689324
+
+
+
+ 1674956689324
+
+
@@ -200,7 +215,8 @@
-
+
+
diff --git a/pluss-common-bundle/target/classes/config/application-common.yml b/pluss-common-bundle/target/classes/config/application-common.yml
index efcdc63..84e9af1 100644
--- a/pluss-common-bundle/target/classes/config/application-common.yml
+++ b/pluss-common-bundle/target/classes/config/application-common.yml
@@ -93,7 +93,7 @@ parameter:
ALI_APP_ID: 支付宝原生接入的APPID
ALI_RATE: 0.006
ALI_RETURN_URL: ${parameter.domain}/wap/aliPay/returnUrl
- APPID: 微信原生接入的APPID
+ APPID: wx7f982bbf66000fd1
APPLETS_APPID: 小程序付款APPID
APPSECRET:
KEY: 微信原生加密用的KEY
@@ -113,8 +113,8 @@ parameter:
ZY_PUB:
agentId: 乐刷代理商编号、未接入可不管
apk_dowload_url: apk下载链接，存储转入OSS之后可不管
- baiduAK: cqmQn4RoZgC0IyH4mbHjKmQQ
- baiduSK: hUhGrZFONMBjIzUQULOtlSXP3uTpompp
+ baiduAK: LUcko8ZP334suBQ929nbrBtV
+ baiduSK: VqPHkWS5oipOEc2yw7dNa5CWr7yGIyiE
bankCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/bankcard
blCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/business_license
# 百度人脸识别应用的AK
diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/BankCardConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/BankCardConverterImpl.java
index 09470ca..e940cd7 100644
--- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/BankCardConverterImpl.java
+++ b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/BankCardConverterImpl.java
@@ -6,7 +6,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
- date = "2023-01-28T16:58:56+0800",
+ date = "2023-01-29T10:16:06+0800",
comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)"
)
public class BankCardConverterImpl implements BankCardConverter {
diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ConverterImpl.java
index 2aac936..ccdeeba 100644
--- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ConverterImpl.java
+++ b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ConverterImpl.java
@@ -48,7 +48,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
- date = "2023-01-28T16:58:56+0800",
+ date = "2023-01-29T10:16:06+0800",
comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)"
)
public class ConverterImpl implements Converter {
diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ImgConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ImgConverterImpl.java
index 739cb09..92d493e 100644
--- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ImgConverterImpl.java
+++ b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ImgConverterImpl.java
@@ -5,7 +5,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
- date = "2023-01-28T16:58:56+0800",
+ date = "2023-01-29T10:16:06+0800",
comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)"
)
public class ImgConverterImpl implements ImgConverter {
diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantBaseInfoConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantBaseInfoConverterImpl.java
index b6a5baf..d024a30 100644
--- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantBaseInfoConverterImpl.java
+++ b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantBaseInfoConverterImpl.java
@@ -11,7 +11,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
- date = "2023-01-28T16:58:56+0800",
+ date = "2023-01-29T10:16:06+0800",
comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)"
)
public class MerchantBaseInfoConverterImpl implements MerchantBaseInfoConverter {
diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantCashPlaceConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantCashPlaceConverterImpl.java
index e7cea94..96538dd 100644
--- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantCashPlaceConverterImpl.java
+++ b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantCashPlaceConverterImpl.java
@@ -6,7 +6,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
- date = "2023-01-28T16:58:56+0800",
+ date = "2023-01-29T10:16:06+0800",
comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)"
)
public class MerchantCashPlaceConverterImpl implements MerchantCashPlaceConverter {
diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantStaffConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantStaffConverterImpl.java
index 3225702..20f9896 100644
--- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantStaffConverterImpl.java
+++ b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantStaffConverterImpl.java
@@ -6,7 +6,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
- date = "2023-01-28T16:58:56+0800",
+ date = "2023-01-29T10:16:06+0800",
comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)"
)
public class MerchantStaffConverterImpl implements MerchantStaffConverter {
diff --git a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/UserAppConverterImpl.java b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/UserAppConverterImpl.java
index 33f4fab..6e15f9b 100644
--- a/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/UserAppConverterImpl.java
+++ b/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/UserAppConverterImpl.java
@@ -9,7 +9,7 @@ import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
- date = "2023-01-28T16:58:56+0800",
+ date = "2023-01-29T10:16:06+0800",
comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)"
)
public class UserAppConverterImpl implements UserAppConverter {
diff --git a/pluss-service-bundle/target/classes/cn/pluss/platform/ys/impl/v20210929/YsAuditServiceImpl$1.class b/pluss-service-bundle/target/classes/cn/pluss/platform/ys/impl/v20210929/YsAuditServiceImpl$1.class
index c5fe23beb1240d37783d713b9a002fdf30424273..ae40f949e18d834f730fd4470fcff6dd261fd0eb 100644
GIT binary patch
delta 154
zcmbQk*U8Ow>ff$?3=9k=3{nuS4@K@O-8WEdj@8;}M905EP5w*UYD
delta 583
zcmZuuTT2^37(J70vg?@IxL#U&V=4)1rS(#)wXxQ_1X_JqQDVR{36r31cEe^;e9N=X
z1^eQE5JB)#s*i>KsN$ETMFkm{?|f&@oWp#x-+I`_|NOnU1Tco>W4>?H7}^twM4-xk
zpjWD{OU*EY(Vrezk6{=i98ruiOwR_zYDsxo6#PKUtoRMFD9b>WlvaW0OIG@XUl7U4
zn`A|lsue9fUyGa)9=Tc=V~Fp_Z*s_$UU6tOx1;jf#CXj@w}qsI&O7Ih4z|6bi4;SW
z0!vaeO!j}iF=z@>*;`c8Gc|CF`lpKFBc?f~@QI=K#v|>zN)@I1|7nYRc~#cizGq^V
zq3fQw`b=V&=a|C+!vjal{O%W7UXwXjLC~a3nrtW@hlLh^Dn~0Z;qOPrRxOJVE#S%E
zZ<`WvW`1IB^Xn-VuSiwTw`u2e
TC)((NXH*S5#|sLh*Wu|kga3O>
diff --git a/pluss-service-bundle/target/classes/cn/pluss/platform/ysExtension/v20220615/YsAuditServiceImpl$1.class b/pluss-service-bundle/target/classes/cn/pluss/platform/ysExtension/v20220615/YsAuditServiceImpl$1.class
index e5c9af516266cfdd6401473f714f18682fd40a86..b390ae799f37c06a2d90cfbddd104fa0d444b272 100644
GIT binary patch
delta 161
zcmXAj%?*M;5QV>8$s$Vvi^hK-lz@pw{h
b!(KWz5(kL|M@`F#QahreR&YFK^uknsgES4-
delta 545
zcmZuu-AWrl7(L@|vdbDZSv6{H%cuz|qR}?C+O*bx3HXC-DMUe;gfT=nyJ0gC@A43N
zg7yu(s#LT$LZKJE?K|`#N)-cF0BNk9T333VA(lua
z0$K3`wOMmrY9<-#nINA`EPa^Ni#&5l!X^p@7UThaFbbx1LKVfKRc-`0z
zb=Nhl5~qQg=pbN`#Kaf$;VYul$D1RFp_4iqCZ-1ry@U-$pbv;z*Iz=ooyc*72mu53
zboc^qbDBNl
-
-
diff --git a/pluss-wap-page/src/main/resources/application-dev.yml b/pluss-wap-page/src/main/resources/application-dev.yml
index a174eb6..57a01be 100644
--- a/pluss-wap-page/src/main/resources/application-dev.yml
+++ b/pluss-wap-page/src/main/resources/application-dev.yml
@@ -1,7 +1,7 @@
spring:
datasource:
druid:
- url:
- username:
- password:
+ url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
+ username: root
+ password: CZGmysqlroot@123
driver-class-name: com.mysql.jdbc.Driver
diff --git a/pluss-wap-page/src/main/resources/application-prod.yml b/pluss-wap-page/src/main/resources/application-prod.yml
index 5a6de5b..81204aa 100644
--- a/pluss-wap-page/src/main/resources/application-prod.yml
+++ b/pluss-wap-page/src/main/resources/application-prod.yml
@@ -1,9 +1,9 @@
spring:
datasource:
druid:
- url:
- username:
- password:
+ url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
+ username: root
+ password: CZGmysqlroot@123
driver-class-name: com.mysql.jdbc.Driver
scheduling:
diff --git a/pluss-wap-page/src/main/resources/application-test.yml b/pluss-wap-page/src/main/resources/application-test.yml
index a174eb6..57a01be 100644
--- a/pluss-wap-page/src/main/resources/application-test.yml
+++ b/pluss-wap-page/src/main/resources/application-test.yml
@@ -1,7 +1,7 @@
spring:
datasource:
druid:
- url:
- username:
- password:
+ url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
+ username: root
+ password: CZGmysqlroot@123
driver-class-name: com.mysql.jdbc.Driver