From e325a3152237df73d13929c442cd5e93c3084a4a Mon Sep 17 00:00:00 2001
From: chenbo <623659388@qq.com>
Date: Wed, 29 Apr 2020 14:53:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=92=8C=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin-ui/config/dev.env.js                       | 2 +-
 dts-admin-api/pom.xml                            | 2 ++
 dts-admin-api/src/main/resources/application.yml | 2 +-
 dts-core/src/main/resources/application-dev.yml  | 8 ++++----
 dts-wx-api/pom.xml                               | 2 ++
 dts-wx-api/src/main/resources/application.yml    | 2 +-
 pom.xml                                          | 2 +-
 7 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/admin-ui/config/dev.env.js b/admin-ui/config/dev.env.js
index b3ee203..4188132 100644
--- a/admin-ui/config/dev.env.js
+++ b/admin-ui/config/dev.env.js
@@ -1,5 +1,5 @@
 module.exports = {
 	NODE_ENV: '"development"',
     ENV_CONFIG: '"dev"',
-    BASE_API: '"http://localhost:8083/manager"'
+    BASE_API: '"http://localhost:8083/dev/admin"'
 }
diff --git a/dts-admin-api/pom.xml b/dts-admin-api/pom.xml
index 172fb7c..d4a685f 100644
--- a/dts-admin-api/pom.xml
+++ b/dts-admin-api/pom.xml
@@ -46,6 +46,8 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
                     <executable>true</executable>
+                    <!--增加jvm参数-->
+                    <jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/dts-admin-api/src/main/resources/application.yml b/dts-admin-api/src/main/resources/application.yml
index 7bdffe0..f353586 100644
--- a/dts-admin-api/src/main/resources/application.yml
+++ b/dts-admin-api/src/main/resources/application.yml
@@ -11,7 +11,7 @@ spring:
 
       
 server:
-  port: 8073
+  port: 8083
   servlet:
     context-path: /demo
     
diff --git a/dts-core/src/main/resources/application-dev.yml b/dts-core/src/main/resources/application-dev.yml
index b0962a4..05c6e8e 100644
--- a/dts-core/src/main/resources/application-dev.yml
+++ b/dts-core/src/main/resources/application-dev.yml
@@ -25,8 +25,8 @@ dts:
     # 短信息用于通知客户，例如发货短信通知，注意配置格式；template-name，template-templateId 请参考 NotifyType 枚举值
     sms:
       enable: true
-      appid: xxx
-      appkey: xxx
+      appid: 1400286323
+      appkey: 223123sade14c129c4ce9a30b5f90ad2c
       template:
       - name: paySucceed
         templateId: 112233
@@ -128,10 +128,10 @@ pagehelper:
 spring:
   datasource:
     druid:
-      url:  jdbc:mysql://localhost:3306/demo?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
+      url:  jdbc:mysql://localhost:3306/dts-demo?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
       driver-class-name:  com.mysql.jdbc.Driver
       username:  root
-      password:  123456
+      password:  Ab888888
       initial-size:  10
       max-active:  50
       min-idle:  10
diff --git a/dts-wx-api/pom.xml b/dts-wx-api/pom.xml
index 1dc3584..83145b7 100644
--- a/dts-wx-api/pom.xml
+++ b/dts-wx-api/pom.xml
@@ -63,6 +63,8 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
                     <executable>true</executable>
+                    <!--增加jvm参数-->
+                    <jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/dts-wx-api/src/main/resources/application.yml b/dts-wx-api/src/main/resources/application.yml
index eaff3d3..1d334bf 100644
--- a/dts-wx-api/src/main/resources/application.yml
+++ b/dts-wx-api/src/main/resources/application.yml
@@ -10,7 +10,7 @@ spring:
       location: /tmp/tomcat_upload
       
 server:
-  port: 8070
+  port: 8080
   servlet:
     context-path: /demo
 
diff --git a/pom.xml b/pom.xml
index 51024e5..9d89122 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,7 +167,7 @@
 	    	<!-- test-online 环境 -->
 	    	<id>test-online</id>
 	    	<properties>
-	    	    <profile.active>test-online</profile.active>
+	    	    <profile.active>demo</profile.active>
 	    	    <logback.dir>./logs</logback.dir>
 	    	</properties>
     	</profile>