From eb2cc8050d53cb6acd85c89bb8a78faf2da9c012 Mon Sep 17 00:00:00 2001
From: limqhz <lmq540344226@163.com>
Date: Sun, 24 May 2020 22:09:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E5=B9=B6=E4=B8=94=E4=BF=AE=E6=94=B9=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/config/application-dev.yml | 16 +++++++++++++++
 .../resources/config/application-prod.yml     | 17 ++++++++++++++++
 .../src/main/resources/config/application.yml | 20 +++++--------------
 oms/src/main/resources/logback.xml            |  2 +-
 4 files changed, 39 insertions(+), 16 deletions(-)
 create mode 100644 netty-pad/src/main/resources/config/application-dev.yml
 create mode 100644 netty-pad/src/main/resources/config/application-prod.yml

diff --git a/netty-pad/src/main/resources/config/application-dev.yml b/netty-pad/src/main/resources/config/application-dev.yml
new file mode 100644
index 0000000..b28576f
--- /dev/null
+++ b/netty-pad/src/main/resources/config/application-dev.yml
@@ -0,0 +1,16 @@
+spring:
+  datasource:
+    url: jdbc:mysql://127.0.01:3306/smart_venue?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&useAffectedRows=true&useSSL=false
+    username: root
+    password: 123456
+
+  jpa:
+    show-sql: true
+
+oss:
+  accessKeyId: LTAIlbtS4W2Xe4OV
+  accessKeySecret: qWMYkSfmXFtRoIv9q9OCbszcF9U7dX
+  protocol: http
+  name: smartvenue
+  endPoint: http://oss-cn-beijing.aliyuncs.com
+  url: https://smartvenue.oss-cn-beijing.aliyuncs.com/
\ No newline at end of file
diff --git a/netty-pad/src/main/resources/config/application-prod.yml b/netty-pad/src/main/resources/config/application-prod.yml
new file mode 100644
index 0000000..bdd9b4a
--- /dev/null
+++ b/netty-pad/src/main/resources/config/application-prod.yml
@@ -0,0 +1,17 @@
+spring:
+  datasource:
+    url: jdbc:mysql://127.0.0.1:3306/smart_venue?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&useAffectedRows=true
+    username: root
+    password: hyty1234
+    driver-class-name: com.mysql.cj.jdbc.Driver
+
+  jpa:
+    show-sql: true
+
+oss:
+  accessKeyId: LTAIlbtS4W2Xe4OV
+  accessKeySecret: qWMYkSfmXFtRoIv9q9OCbszcF9U7dX
+  protocol: http
+  name: smartvenue
+  endPoint: http://oss-cn-beijing.aliyuncs.com
+  url: https://smartvenue.oss-cn-beijing.aliyuncs.com/
\ No newline at end of file
diff --git a/netty-pad/src/main/resources/config/application.yml b/netty-pad/src/main/resources/config/application.yml
index f7812b9..c56fd2c 100644
--- a/netty-pad/src/main/resources/config/application.yml
+++ b/netty-pad/src/main/resources/config/application.yml
@@ -8,12 +8,11 @@ server:
 
 spring:
   profiles:
+    include:
+      -dev
+      -prod
     active: dev
-  datasource:
-    url: jdbc:mysql://127.0.0.1:3306/smart_venue?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&useAffectedRows=true
-    username: root
-    password: hyty1234
-    driver-class-name: com.mysql.cj.jdbc.Driver
+
 
     # 数据库连接池配置
     druid:
@@ -67,15 +66,6 @@ spring:
       min-idle: 8
     timeout: 60000
 
-
-oss:
-  accessKeyId: LTAIlbtS4W2Xe4OV
-  accessKeySecret: qWMYkSfmXFtRoIv9q9OCbszcF9U7dX
-  protocol: http
-  name: smartvenue
-  endPoint: http://oss-cn-beijing.aliyuncs.com
-  url: https://smartvenue.oss-cn-beijing.aliyuncs.com/
-
 # MyBatis Configuration
 mybatis:
   type-aliases-package: com.ydd.oms.entity
@@ -103,7 +93,7 @@ worker:
     count: 2
 so:
   keepalive: true
-  backlog: 100
+  backlog: 128
   reuseaddr: true
 tcp_nodelay: true
 
diff --git a/oms/src/main/resources/logback.xml b/oms/src/main/resources/logback.xml
index 5c413e1..c1c5dd9 100644
--- a/oms/src/main/resources/logback.xml
+++ b/oms/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF8"?>
 <configuration>
     <jmxConfigurator />
-    <property name="LOG_HOME" value="/home/log/svoms"/>
+    <property name="LOG_HOME" value="~/home/log/svoms"/>
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">