wap部分配置

2023-01-29 10:36:30 +08:00 · 2023-01-29 10:36:30 +08:00 · c513d14203
parent ba478602c4
commit c513d14203
15 changed files with 44 additions and 30 deletions
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@ -4,12 +4,20 @@
    <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="更改部分配置（百度文字识别）">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pluss-api-page/src/main/java/cn/pluss/platform/controller/common/ImageUploadController.java" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-api-page/src/main/java/cn/pluss/platform/controller/common/ImageUploadController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/PhoneValidateCodeController.class" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/PhoneValidateCodeController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/common/ImageUploadController.class" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/common/ImageUploadController.class" 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" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -63,7 +71,7 @@
      </set>
    </option>
  </component>
-  <component name="RunManager" selected="Spring Boot.ApiApplication">
+  <component name="RunManager" selected="Spring Boot.WapApplication">
    <configuration name="Base64Util" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
      <option name="MAIN_CLASS_NAME" value="cn.pluss.platform.util.Base64Util" />
      <module name="pluss-common-bundle" />
@ -151,7 +159,7 @@
      <workItem from="1674867825532" duration="12546000" />
      <workItem from="1674889612655" duration="4695000" />
      <workItem from="1674894362598" duration="8405000" />
-      <workItem from="1674954816004" duration="1666000" />
+      <workItem from="1674954816004" duration="4649000" />
    </task>
    <task id="LOCAL-00001" summary="更改配置">
      <created>1674892648184</created>
@ -167,7 +175,14 @@
      <option name="project" value="LOCAL" />
      <updated>1674897664824</updated>
    </task>
-    <option name="localTasksCounter" value="3" />
+    <task id="LOCAL-00003" summary="更改部分配置（百度文字识别）">
+      <created>1674956689324</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1674956689324</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
    <servers />
  </component>
  <component name="TypeScriptGeneratedFilesManager">
@ -200,7 +215,8 @@
  <component name="VcsManagerConfiguration">
    <MESSAGE value="更改配置" />
    <MESSAGE value="更改发送短信，" />
-    <option name="LAST_COMMIT_MESSAGE" value="更改发送短信，" />
+    <MESSAGE value="更改部分配置（百度文字识别）" />
+    <option name="LAST_COMMIT_MESSAGE" value="更改部分配置（百度文字识别）" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
--- 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
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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
--- 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
--- a/pluss-wap-page/pluss-wap-page.iml
+++ b/pluss-wap-page/pluss-wap-page.iml
@ -139,8 +139,6 @@
    <orderEntry type="library" name="Maven: com.aliyun:tea:1.2.0" level="project" />
    <orderEntry type="library" name="Maven: com.aliyun:tea-openapi:0.2.6" level="project" />
    <orderEntry type="library" name="Maven: com.aliyun:credentials-java:0.2.4" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
    <orderEntry type="library" name="Maven: com.aliyun:alibabacloud-gateway-spi:0.0.1" level="project" />
    <orderEntry type="library" name="Maven: com.aliyun:tea-xml:0.1.5" level="project" />
    <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.0.3" level="project" />
--- 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
--- 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:
--- 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