Merge branch 'dev'

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   #  profiles:
-#    active: dev
+  #    active: pord
   thymeleaf:
     prefix: classpath:/templates/
     suffix: .html
@@ -12,7 +12,7 @@ spring:
   redis:
     host: 127.0.0.1
     port: 6379
-    password: d9d2j9w2
+    password: # redis 密码
     database: 1
     timeout: 3000
     jedis:
@@ -22,86 +22,31 @@ spring:
         max-idle: 500
         min-idle: 0
   datasource:
-    url: jdbc:mysql://101.132.182.12:3306/vertical?characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+    url: jdbc:mysql://localhost:3306/vertical?characterEncoding=UTF-8&autoReconnect=true&useSSL=false
     username: root
-    password: d9d2j9w2.RYMCU
+    password: # 数据库密码
     driver-class-name: com.mysql.cj.jdbc.Driver
-    max-wait: 60000
-    min-idle: 20
-    initial-size: 10
-    max-active: 50
-    # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-    time-between-eviction-runs-millis: 60000
-    # 配置一个连接在池中最小生存的时间，单位是毫秒
-    min-evictable-idle-time-millis: 30000
-    validation-query: SELECT 1 FROM DUAL
-    test-while-idle: true
-    test-on-borrow: false
-    test-on-return: false
-    log-slow-sql: true
-    filters: config,stat,wall,log4j
-    max-pool-prepared-statement-per-connection-size: 100
-    stat-view-servlet:
-      enabled: true
-    pool-prepared-statements: true
     resources:
       add-mappings: true
   mail:
-    host: smtp.ym.163.com
+    host: smtp.163.com
     port: 465
-    username: service@rymcu.com
-    password: Aa12345678
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 20MB
-wx:
-  open:
-    componentAppId: wx9c4a7dfb3238d5f6
-    componentSecret: e32a6f75ab6b746ec3ae38a39a79ba22
-    componentToken: rymcu
-    componentAesKey: NWIwMDQyZjU0YWI2NGFlZThkOWZhZTg3NTg4NzQwN2E
-  mp:
-    configs:
-      - appId: wxf085386aa07c0857
-        secret: aabd075d2851764714fd14a0d0b1b8b4
-        token: rymcu
-        aesKey: NWIwMDQyZjU0YWI2NGFlZThkOWZhZTg3NTg4NzQwN2E
-      - appId: wxa49093339a5a822b
-        secret: 29e9390e6d58d57a2b2a2350dbee8754
-        token: qwert
-        aesKey:
-  miniapp:
-    configs:
-      - appid: wxf57df4f171606a26
-        secret: 574ff86cb48a42f3980b221e942c53b1
-        token: #微信小程序消息服务器配置的token
-        aesKey: #微信小程序消息服务器配置的EncodingAESKey
-        msgDataFormat: JSON
-env: pord
+    username: # 邮箱
+    password: # 密码
+env: dev
 logging:
   file:
     path: /logs/vertical
-  level:
-    com:
-      rymcu:
-        vertical:
-          wx: debug
-          web: debug
 server:
   port: 8099
   servlet:
     context-path: /vertical
-  compression:
-    enabled: true
-    mime-types: application/json,application/xml,text/html,text/xml,text/plain
-    min-response-size: 1024
-  max-http-header-size: 1024
 version: 1.0
 resource:
-  domain: https://rymcu.com
-  file-path: https://rymcu.com/vertical
+  file-path: https://abc.com/vertical
 baidu:
   data:
-    site: https://www.rymcu.com
-    token: 9cdKR6bVCJzxDEJS
+    site: https://abc.com # 百度搜索资源配置网址
+    token: xxxx # 百度搜索资源token
+reserved-words: \u7cfb\u7edf\u516c\u544a\u002c\u516c\u544a
+