更新

shangren · Feb 17, 2022 · 2f3e2a5 · 2f3e2a5
1 parent f280ab8
commit 2f3e2a5
Show file tree

Hide file tree

Showing 7 changed files with 90 additions and 95 deletions.
diff --git a/admin/src/main/resources/application.properties b/admin/src/main/resources/application.properties
@@ -1,7 +1,8 @@
 # 应用程序名称
 spring.application.name=SpringBootAdmin
 # 应用程序端口
-server.port=8000
+#server.port=8000
+server.port=30000
 management.endpoints.web.exposure.include=*
 management.endpoint.health.show-details=always
 #账号密码
@@ -16,5 +17,6 @@ [email protected]
 spring.mail.password=abcdefg123456!@#$%^
 # 日志文件路径
 logging.file.path=lili-logs/admin
+lili.data.logstash.server=192.168.2.122:4560
 # 文件格式
 logging.pattern.file=%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(${PID}){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wEx
diff --git a/buyer-api/src/main/resources/application.yml b/buyer-api/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 server:
-  port: 8885
-
+#  port: 8885
+  port: 30001
   servlet:
     context-path: /
 #
@@ -35,7 +35,7 @@ spring:
   boot:
     admin:
       client:
-        url: http://127.0.0.1:8000
+        url: http://127.0.0.1:30000
   # 文件大小上传配置
   servlet:
     multipart:

diff --git a/buyer-api/src/test/resources/application.yml b/buyer-api/src/test/resources/application.yml
@@ -24,7 +24,7 @@ spring:
   boot:
     admin:
       client:
-        url: http://192.168.2.122:8000
+        url: http://127.0.0.1:30000
   # mongodb
   data:
     mongodb:

diff --git a/common-api/src/main/resources/application.yml b/common-api/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 server:
-  port: 8890
-
+#  port: 8890
+  port: 30002
   servlet:
     context-path: /
 
@@ -28,7 +28,7 @@ spring:
   boot:
     admin:
       client:
-        url: http://127.0.0.1:8000
+        url: http://127.0.0.1:30000
   cache:
     type: redis
   # Redis

diff --git a/consumer/src/main/resources/application.yml b/consumer/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 server:
-  port: 8886
-
+#  port: 8886
+  port: 30005
   servlet:
     context-path: /
 
@@ -25,26 +25,18 @@ management:
       exposure:
         include: '*'
 spring:
+  application:
+    name: consumer
   # 要在其中注册的Spring Boot Admin Server的URL。
   boot:
     admin:
       client:
-        url: http://127.0.0.1:8000
-  # mongodb
-  data:
-    mongodb:
-      host: 192.168.2.126
-      port: 27017
-      database: rx-shop
-      username: goboo
-      password: Gb84505016
-      authentication-database: admin
-  #      replica-set-name: mongoreplset
+        url: http://127.0.0.1:30000
   cache:
     type: redis
   # Redis
   redis:
-    host: 192.168.2.126
+    host: 192.168.2.122
     port: 6379
     password: Gb84505016
     lettuce:
@@ -119,7 +111,7 @@ spring:
     props:
       #是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭
       sql:
-        show: true
+        show: false
 
 # 忽略鉴权url
 ignored:
@@ -146,8 +138,8 @@ ignored:
     - /buyer/memberEvaluation/**/goodsEvaluation
     - /buyer/memberEvaluation/**/evaluationNumber
     - /store/login/**
-    - /manager/user/login
-    - /manager/user/refresh/**
+    - /manager/passport/user/login
+    - /manager/passport/user/refresh/**
     - /druid/**
     - /swagger-ui.html
     - /doc.html
@@ -167,11 +159,11 @@ swagger:
   title: API接口文档
   description: Api Documentation
   version: 1.0.0
-  termsOfServiceUrl:
+  termsOfServiceUrl: https://pickmall.cn
   contact:
-    name: rx
-    url:
-    email:
+    name: lili
+    url: https://pickmall.cn
+    email: [email protected]
 
 # Mybatis-plus
 mybatis-plus:
@@ -184,27 +176,29 @@ mybatis-plus:
 
 # 日志
 logging:
+  config: classpath:logback-spring.xml
   # 输出级别
   level:
-    cn.lili: info
+    root: info
   #    org.hibernate: debug
   #    org.springframework: debug
-  #    org.springframework.data.mongodb.core: debug
   file:
     # 指定路径
     path: lili-logs
-    # 最大保存天数
-    max-history: 7
-    # 每个文件最大大小
-    max-size: 5MB
+  logback:
+    rollingpolicy:
+      # 最大保存天数
+      max-history: 7
+      # 每个文件最大大小
+      max-file-size: 5MB
 #加密参数
 jasypt:
   encryptor:
     password: lili
 
 lili:
   system:
-    isDemoSite: false
+    isDemoSite: true
   statistics:
     # 在线人数统计 X 小时。这里设置48，即统计过去48小时每小时在线人数
     onlineMember: 48
@@ -244,7 +238,7 @@ lili:
   data:
     elasticsearch:
       cluster-name: elasticsearch
-      cluster-nodes: 192.168.2.126:9200
+      cluster-nodes: 192.168.2.122:9200
       index:
         number-of-replicas: 0
         number-of-shards: 3
@@ -253,7 +247,8 @@ lili:
     #      account:
     #        username: elastic
     #        password: LiLiShopES
-
+    logstash:
+      server: 192.168.2.122:4560
     rocketmq:
       promotion-topic: lili_promotion_topic
       promotion-group: lili_promotion_group
@@ -274,15 +269,15 @@ lili:
       after-sale-topic: lili_after_sale_topic
       after-sale-group: lili_after_sale_group
 rocketmq:
-  name-server: 192.168.2.126:9876
+  name-server: 192.168.2.122:9876
   producer:
     group: lili_group
     send-message-timeout: 30000
 
 xxl:
   job:
     admin:
-      addresses: http://192.168.2.126:9001/xxl-job-admin
+      addresses: http://192.168.2.122:9001/xxl-job-admin
     executor:
       appname: xxl-job-executor-lilishop
       address:

diff --git a/manager-api/src/main/resources/application.yml b/manager-api/src/main/resources/application.yml
@@ -1,5 +1,6 @@
 server:
-  port: 8887
+#  port: 8887
+  port: 30003
 
   servlet:
     context-path: /
@@ -22,26 +23,18 @@ management:
       exposure:
         include: '*'
 spring:
+  application:
+    name: manager-api
   # 要在其中注册的Spring Boot Admin Server的URL。
   boot:
     admin:
       client:
-        url: http://127.0.0.1:8000
-  # mongodb
-  data:
-    mongodb:
-      host: 192.168.2.126
-      port: 27017
-      database: rx-shop
-      username: goboo
-      password: Gb84505016
-      authentication-database: admin
-  #      replica-set-name: mongoreplset
+        url: http://127.0.0.1:30000
   cache:
     type: redis
   # Redis
   redis:
-    host: 192.168.2.126
+    host: 192.168.2.122
     port: 6379
     password: Gb84505016
     lettuce:
@@ -127,9 +120,10 @@ ignored:
     - /MP_verify_qSyvBPhDsPdxvOhC.txt
     - /weixin/**
     - /source/**
-    - /manager/user/login
-    - /manager/user/refresh/**
-    - /manager/elasticsearch
+    - /manager/passport/user/login
+    - /manager/passport/user/refresh/**
+    - /manager/other/elasticsearch
+    - /manager/other/customWords
     - /druid/**
     - /swagger-ui.html
     - /doc.html
@@ -149,11 +143,11 @@ swagger:
   title: API接口文档
   description: Api Documentation
   version: 1.0.0
-  termsOfServiceUrl:
+  termsOfServiceUrl: https://pickmall.cn
   contact:
-    name: rx
-    url:
-    email:
+    name: lili
+    url: https://pickmall.cn
+    email: [email protected]
 
 # Mybatis-plus
 mybatis-plus:
@@ -166,27 +160,34 @@ mybatis-plus:
 
 # 日志
 logging:
+  config: classpath:logback-spring.xml
   # 输出级别
   level:
     cn.lili: info
   #    org.hibernate: debug
   #    org.springframework: debug
-  #    org.springframework.data.mongodb.core: debug
   file:
     # 指定路径
     path: lili-logs
-    # 最大保存天数
-    max-history: 7
-    # 每个文件最大大小
-    max-size: 5MB
+  logback:
+    rollingpolicy:
+      # 最大保存天数
+      max-history: 7
+      # 每个文件最大大小
+      max-file-size: 5MB
 #加密参数
 jasypt:
   encryptor:
     password: lili
 
 lili:
   system:
-    isDemoSite: false
+    isDemoSite: true
+    #     脱敏级别：
+    #     0：不做脱敏处理
+    #     1：管理端用户手机号等信息脱敏
+    #     2：商家端信息脱敏（为2时，表示管理端，商家端同时脱敏）
+    sensitiveLevel: 1
   statistics:
     # 在线人数统计 X 小时。这里设置48，即统计过去48小时每小时在线人数
     onlineMember: 48
@@ -226,7 +227,7 @@ lili:
   data:
     elasticsearch:
       cluster-name: elasticsearch
-      cluster-nodes: 192.168.2.126:9200
+      cluster-nodes: 192.168.2.122:9200
       index:
         number-of-replicas: 0
         number-of-shards: 3
@@ -235,7 +236,8 @@ lili:
     #      account:
     #        username: elastic
     #        password: LiLiShopES
-
+    logstash:
+      server: 192.168.2.122:4560
     rocketmq:
       promotion-topic: lili_promotion_topic
       promotion-group: lili_promotion_group
@@ -256,15 +258,15 @@ lili:
       after-sale-topic: lili_after_sale_topic
       after-sale-group: lili_after_sale_group
 rocketmq:
-  name-server: 192.168.2.126:9876
+  name-server: 192.168.2.122:9876
   producer:
     group: lili_group
     send-message-timeout: 30000
 
 xxl:
   job:
     admin:
-      addresses: http://192.168.2.126:9001/xxl-job-admin
+      addresses: http://192.168.2.122:9001/xxl-job-admin
     executor:
       appname: xxl-job-executor-lilishop
       address: