Merge remote-tracking branch 'origin/master'

pluss-api-page/pluss-api-page.iml

@@ -35,6 +35,8 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
@@ -124,8 +126,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" />
@@ -214,6 +214,15 @@
     <orderEntry type="library" name="Maven: io.opentracing:opentracing-util:0.33.0" level="project" />
     <orderEntry type="library" name="Maven: io.opentracing:opentracing-noop:0.33.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:cloudauth20200618:2.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:oss-client:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:openplatform20191219:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:tea-rpc-util:0.1.2" 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:tea-rpc:0.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:oss-util:1.0.0" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:tea-fileform:0.0.3" level="project" />
     <orderEntry type="library" name="Maven: com.github.tencentyun:tls-sig-api:1.2" level="project" />
     <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.59" level="project" />
     <orderEntry type="library" name="Maven: org.json:json:20180130" level="project" />

pluss-api-page/target/classes/application-dev.yml

@@ -1,16 +0,0 @@
-spring:
-  datasource:
-      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
-parameter:
-  ### 这个根据自己的情况配置
-  domain:
-
-swagger:
-  ### 生产环境不允许访问swagger
-  production: false
-
-logging:
-  config: classpath:log4j2-dev.xml

pluss-api-page/target/classes/application-prod.yml

@@ -1,16 +0,0 @@
-spring:
-  datasource:
-    url:
-    username:
-    password:
-    driver-class-name: com.mysql.jdbc.Driver
-
-rabbitmq:
-  enabled: true
-
-swagger:
-  ### 生产环境不允许访问swagger
-  production: true
-
-logging:
-  config: classpath:log4j2-prod.xml

pluss-api-page/target/classes/application-test.yml

@@ -1,14 +0,0 @@
-# 测试服务器上的数据库连接
-spring:
-  datasource:
-    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
-
-parameter:
-  domain:
-
-swagger:
-  ### 生产环境不允许访问swagger
-  production: true

pluss-api-page/target/classes/application.yml

@@ -1,27 +0,0 @@
-spring:
-  output:
-    ansi:
-      enabled: always
-  profiles:
-    ###  将一些固定的配置放到下级文件夹下的yml文件中
-    include: common, ryx, ys
-    active: dev
-  mvc:
-    view:
-      prefix: /WEB-INF/jsp/
-      suffix: .jsp
-  resources:
-    static-locations: classpath:/static
-  datasource:
-    druid:
-      break-after-acquire-failure: true
-      connection-error-retry-attempts: 1
-  task:
-    execution:
-      pool:
-        max-size: 20
-
-server:
-  servlet:
-    context-path: /api
-  port: 7004