ccjgmwz 3 years ago
parent
commit
b211467962

+ 3 - 3
pom.xml

@@ -190,6 +190,9 @@
             <properties>
             <properties>
                 <env>dev</env>
                 <env>dev</env>
             </properties>
             </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
         </profile>
         </profile>
         <profile>
         <profile>
             <id>test</id>
             <id>test</id>
@@ -202,9 +205,6 @@
             <properties>
             <properties>
                 <env>prod</env>
                 <env>prod</env>
             </properties>
             </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
 
 
         </profile>
         </profile>
     </profiles>
     </profiles>

+ 20 - 37
winsea-haixin-platform-backend/src/main/resources/application-dev.yml

@@ -3,21 +3,15 @@ server:
 
 
 spring:
 spring:
   application:
   application:
-    name: winsea-haixin-project
+    name: winsea-changchang-project
   datasource:
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
     driver-class-name: com.mysql.jdbc.Driver
-#    password:
-#    url: jdbc:mysql://127.0.0.1:3306/winsea_haixin?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
-#    username: root
-# password: yinghai.2019
-#    url: jdbc:mysql://192.168.26.6:3306/winsea_haixin?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
-#    username: root
-  password: Ccj841968545
+    password: Ccj841968545
     url: jdbc:mysql://47.100.3.209:3306/yiliangyiyun_test?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
     url: jdbc:mysql://47.100.3.209:3306/yiliangyiyun_test?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
     username: root
     username: root
   redis:
   redis:
     database: 0
     database: 0
-    host: 192.168.26.10
+    host: 127.0.0.1
     password: ''
     password: ''
     pool:
     pool:
       max-active: 8
       max-active: 8
@@ -25,10 +19,10 @@ spring:
       max-wait: -1
       max-wait: -1
       min-idle: 0
       min-idle: 0
     port: 6379
     port: 6379
-    timeout: 5000
+    timeout: 200
   servlet:
   servlet:
     multipart:
     multipart:
-      max-file-size: 15MB
+      max-file-size: 50MB
       max-request-size: 120MB
       max-request-size: 120MB
 
 
 auth:
 auth:
@@ -40,26 +34,28 @@ client:
   sync:
   sync:
     address: http://114.115.215.70:85/webservice/ClientUpdateService?wsdl
     address: http://114.115.215.70:85/webservice/ClientUpdateService?wsdl
 file:
 file:
-  path: E://haixin-data//winsea//file//
-file-root-path: /winsea/static/
+  path: E://alpha//winsea//file//
+file-root-path: E://file//crew/
 front-origin: 192.168.1.162:9527
 front-origin: 192.168.1.162:9527
 jasypt:
 jasypt:
   encryptor:
   encryptor:
-    password: yinghaikeji
+    #    password: yinghaikeji
+    password: yilaingyiyun
 logging:
 logging:
   level:
   level:
     root: INFO
     root: INFO
-  path: E:/environmentae-science/haixin-files/uat/logs
+  path: E:/winsea_platform6.0/logs
 oss:
 oss:
   access:
   access:
     key:
     key:
-      id: Y8IZ2bDqwsFDLqM0
-      secret: GX34icMi6crTpF3IW31hv2CMTnpEO4
+      id: LTAI4G9c14PgKvM23WZ9zrpc
+      secret: FpClTp4OVrRRtHEfi3lBOWUoLxKieW
   bucket:
   bucket:
-    name: winsea-saas-test
+    name: taohaoliang
   endpoint:
   endpoint:
-    default: oss-cn-shanghai.aliyuncs.com
-    internal: http://oss-cn-shanghai.aliyuncs.com
+    default: oss-cn-beijing.aliyuncs.com
+    internal: https://taohaoliang.oss-cn-beijing.aliyuncs.com/
+
 po:
 po:
   password: CA1XB-MF7Y-12ST-PSBP2
   password: CA1XB-MF7Y-12ST-PSBP2
   syspath: E://officeTest//
   syspath: E://officeTest//
@@ -73,28 +69,15 @@ servicer:
       address: http://114.115.215.70:8018/webservice/QuoteServerService?wsdl
       address: http://114.115.215.70:8018/webservice/QuoteServerService?wsdl
 
 
 system:
 system:
-  temp-file-path: E://haixin-data//
-  prod-temp-file-path: /environmentae-science/haixin-files/uat/tpl/
+  temp-file-path: E://file//
+  prod-temp-file-path: /opt/winsea/temp/platform/
   department-deck: efc79c703d6c4a8dafb88b5e60192e82
   department-deck: efc79c703d6c4a8dafb88b5e60192e82
 
 
-#sp:
-#  enquiry:
-#    path:  http://vms-test.winseacity.com/layer/v1/winsea/gateway/enquiry/apply/sp
-#  purchase:
-#    path:  http://vms-test.winseacity.com/layer/v1/winsea/ddPurchaseInfo/purchase/sp
-#  again:
-#    path:  http://vms-test.winseacity.com/layer/v1/winsea/gateway/enquiry/apply/editXjQuotesInfo
-#  enquirydate:
-#    path:  http://vms-test.winseacity.com/layer/v1/winsea/gateway/enquiry/apply/batchEditEnquiryDate
-#ma:
-#  enquiry:
-#    path:  http://vms-test.winseacity.com/layer/v1/winsea/gateway/enquiry/apply/ma
-#  purchase:
-#    path:  http://vms-test.winseacity.com/layer/v1/winsea/ddPurchaseInfo/purchase/ma
+
 
 
 
 
 gexinpush:
 gexinpush:
-  host: http://yilaingyiyun.com/
+  host:
   appId: 1001
   appId: 1001
   appkey: 2001
   appkey: 2001
   appSecret: 3001
   appSecret: 3001

+ 1 - 1
winsea-haixin-platform-backend/src/main/resources/application.yml

@@ -12,7 +12,7 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
     time-zone: GMT+8
   profiles:
   profiles:
-    active: @env@
+    active: dev
   resources:
   resources:
     static-locations: file:///winsea/static/
     static-locations: file:///winsea/static/
   thymeleaf:
   thymeleaf: