wap部分配置
This commit is contained in:
lyf
parent
c513d14203
commit
b5ddf6eb9d
|
|
@ -4,20 +4,12 @@
|
|||
<option name="autoReloadType" value="SELECTIVE" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="a8a68d09-bb62-4c54-a8c8-4495b550f9ca" name="默认变更列表" comment="更改部分配置（百度文字识别）">
|
||||
<list default="true" id="a8a68d09-bb62-4c54-a8c8-4495b550f9ca" name="默认变更列表" comment="wap部分配置">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-common-bundle/src/main/resources/config/application-common.yml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-common-bundle/src/main/resources/config/application-common.yml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-common-bundle/target/classes/config/application-common.yml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-common-bundle/target/classes/config/application-common.yml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/BankCardConverterImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/BankCardConverterImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ConverterImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ConverterImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ImgConverterImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ImgConverterImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantBaseInfoConverterImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantBaseInfoConverterImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantCashPlaceConverterImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantCashPlaceConverterImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantStaffConverterImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantStaffConverterImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/UserAppConverterImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/UserAppConverterImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-service-bundle/target/classes/cn/pluss/platform/ys/impl/v20210929/YsAuditServiceImpl$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-service-bundle/target/classes/cn/pluss/platform/ys/impl/v20210929/YsAuditServiceImpl$1.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-service-bundle/target/classes/cn/pluss/platform/ysExtension/v20220615/YsAuditServiceImpl$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-service-bundle/target/classes/cn/pluss/platform/ysExtension/v20220615/YsAuditServiceImpl$1.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-wap-page/pluss-wap-page.iml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-wap-page/pluss-wap-page.iml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-wap-page/src/main/resources/application-test.yml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-wap-page/src/main/resources/application-test.yml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-service-bundle/src/main/java/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-service-bundle/src/main/java/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-service-bundle/target/classes/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-service-bundle/target/classes/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.class" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
|
@ -85,15 +77,13 @@
|
|||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true">
|
||||
<configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
|
||||
<option name="arquillianRunConfiguration">
|
||||
<value>
|
||||
<option name="containerStateName" value="" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="TEST_OBJECT" value="CLASS" />
|
||||
<properties />
|
||||
<listeners />
|
||||
<option name="TEST_OBJECT" value="class" />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
|
|
@ -159,7 +149,8 @@
|
|||
<workItem from="1674867825532" duration="12546000" />
|
||||
<workItem from="1674889612655" duration="4695000" />
|
||||
<workItem from="1674894362598" duration="8405000" />
|
||||
<workItem from="1674954816004" duration="4649000" />
|
||||
<workItem from="1674954816004" duration="25774000" />
|
||||
<workItem from="1675040599799" duration="1553000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="更改配置">
|
||||
<created>1674892648184</created>
|
||||
|
|
@ -182,7 +173,14 @@
|
|||
<option name="project" value="LOCAL" />
|
||||
<updated>1674956689324</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="4" />
|
||||
<task id="LOCAL-00004" summary="wap部分配置">
|
||||
<created>1674959790671</created>
|
||||
<option name="number" value="00004" />
|
||||
<option name="presentableId" value="LOCAL-00004" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1674959790671</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="5" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
|
|
@ -216,7 +214,8 @@
|
|||
<MESSAGE value="更改配置" />
|
||||
<MESSAGE value="更改发送短信，" />
|
||||
<MESSAGE value="更改部分配置（百度文字识别）" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="更改部分配置（百度文字识别）" />
|
||||
<MESSAGE value="wap部分配置" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="wap部分配置" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
|
|
@ -226,16 +225,16 @@
|
|||
<line>336</line>
|
||||
<option name="timeStamp" value="4" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="java-line">
|
||||
<url>file://$PROJECT_DIR$/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserInfoController.java</url>
|
||||
<line>95</line>
|
||||
<option name="timeStamp" value="15" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="java-line">
|
||||
<url>file://$PROJECT_DIR$/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java</url>
|
||||
<line>2565</line>
|
||||
<option name="timeStamp" value="17" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="java-line">
|
||||
<url>file://$PROJECT_DIR$/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java</url>
|
||||
<line>1478</line>
|
||||
<option name="timeStamp" value="19" />
|
||||
</line-breakpoint>
|
||||
</breakpoints>
|
||||
</breakpoint-manager>
|
||||
<pin-to-top-manager>
|
||||
|
|
|
|||
|
|
@ -88,6 +88,7 @@ spring:
|
|||
port: 5672
|
||||
|
||||
parameter:
|
||||
# 124.114.74.203本机ip
|
||||
domain: http://60.205.224.68
|
||||
ALI_APP_AUTH_TOKEN: ${parameter.domain}/wap/aliPay/index
|
||||
ALI_APP_ID: 支付宝原生接入的APPID
|
||||
|
|
@ -118,9 +119,9 @@ parameter:
|
|||
bankCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/bankcard
|
||||
blCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/business_license
|
||||
# 百度人脸识别应用的AK
|
||||
baiduAK2:
|
||||
baiduAK2: ASgPr1OxpI32E3G96rxWObuZ
|
||||
# 百度人脸识别应用的SK
|
||||
baiduSK2:
|
||||
baiduSK2: 80aOspiFxTgGmcWZoTinwlOOjRT6IRPE
|
||||
fans_profit: 4.0E-4
|
||||
idCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/idcard
|
||||
leshuaCallBackKey:
|
||||
|
|
|
|||
|
|
@ -88,6 +88,7 @@ spring:
|
|||
port: 5672
|
||||
|
||||
parameter:
|
||||
# 124.114.74.203本机ip
|
||||
domain: http://60.205.224.68
|
||||
ALI_APP_AUTH_TOKEN: ${parameter.domain}/wap/aliPay/index
|
||||
ALI_APP_ID: 支付宝原生接入的APPID
|
||||
|
|
@ -118,9 +119,9 @@ parameter:
|
|||
bankCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/bankcard
|
||||
blCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/business_license
|
||||
# 百度人脸识别应用的AK
|
||||
baiduAK2:
|
||||
baiduAK2: ASgPr1OxpI32E3G96rxWObuZ
|
||||
# 百度人脸识别应用的SK
|
||||
baiduSK2:
|
||||
baiduSK2: 80aOspiFxTgGmcWZoTinwlOOjRT6IRPE
|
||||
fans_profit: 4.0E-4
|
||||
idCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/idcard
|
||||
leshuaCallBackKey:
|
||||
|
|
|
|||
|
|
@ -142,11 +142,12 @@ public class BaiduFaceDetectServiceImpl implements BaiduFaceDetectService {
|
|||
ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
|
||||
|
||||
ByteArrayOutputStream baos = new ByteArrayOutputStream();
|
||||
try {
|
||||
Thumbnails.of(bais).size(1920, 1080).toOutputStream(baos);
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
//TODO 图片压缩 暂时注释
|
||||
// try {
|
||||
// Thumbnails.of(bais).size(1920, 1080).toOutputStream(baos);
|
||||
// } catch (IOException e) {
|
||||
// throw new RuntimeException(e);
|
||||
// }
|
||||
|
||||
dist = DatatypeConverter.printBase64Binary(baos.toByteArray());
|
||||
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Reference in New Issue