'代码合并'
This commit is contained in:
fengtianyangyang
@@ -24,6 +24,7 @@ spring:
|
||||
boot:
|
||||
admin:
|
||||
client:
|
||||
<<<<<<< HEAD
|
||||
url: http://127.0.0.1:8000
|
||||
# mongodb
|
||||
data:
|
||||
@@ -33,15 +34,31 @@ spring:
|
||||
database: rx-shop
|
||||
username: goboo
|
||||
password: Gb84505016
|
||||
=======
|
||||
url: http://192.168.0.116:8000
|
||||
# mongodb
|
||||
data:
|
||||
mongodb:
|
||||
uri: 192.168.0.116:27017
|
||||
database: lilishop
|
||||
username: root
|
||||
password: lilishop
|
||||
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
|
||||
authentication-database: admin
|
||||
# replica-set-name: mongoreplset
|
||||
cache:
|
||||
type: redis
|
||||
# Redis
|
||||
redis:
|
||||
<<<<<<< HEAD
|
||||
host: 120.71.145.134
|
||||
port: 6379
|
||||
password: ekLhvPGraSj8DGO0
|
||||
=======
|
||||
host: 192.168.0.116
|
||||
port: 6379
|
||||
password: lilishop
|
||||
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
|
||||
lettuce:
|
||||
pool:
|
||||
# 连接池最大连接数（使用负值表示没有限制） 默认 8
|
||||
@@ -70,9 +87,15 @@ spring:
|
||||
default-datasource:
|
||||
type: com.alibaba.druid.pool.DruidDataSource
|
||||
driverClassName: com.mysql.cj.jdbc.Driver
|
||||
<<<<<<< HEAD
|
||||
url: jdbc:mysql://120.71.183.195:3306/zyt_shop?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
|
||||
username: zyt_shop
|
||||
password: Gb84505016@zytshop
|
||||
=======
|
||||
url: jdbc:mysql://192.168.0.116:3306/shengxing?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
|
||||
username: root
|
||||
password: lilishop
|
||||
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
|
||||
maxActive: 50
|
||||
initialSize: 20
|
||||
maxWait: 60000
|
||||
@@ -167,6 +190,7 @@ ignored:
|
||||
|
||||
# Swagger界面内容配置
|
||||
swagger:
|
||||
<<<<<<< HEAD
|
||||
title: API接口文档
|
||||
description: Api Documentation
|
||||
version: 1.0.0
|
||||
@@ -175,6 +199,16 @@ swagger:
|
||||
name: rx
|
||||
url:
|
||||
email:
|
||||
=======
|
||||
title: lilishop API接口文档
|
||||
description: lilishop Api Documentation
|
||||
version: 4.2.2
|
||||
termsOfServiceUrl: https://pickmall.cn
|
||||
contact:
|
||||
name: lili
|
||||
url: https://pickmall.cn
|
||||
email: admin@pickmall.com
|
||||
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
|
||||
|
||||
# Mybatis-plus
|
||||
mybatis-plus:
|
||||
@@ -214,7 +248,11 @@ lili:
|
||||
#图形验证码有效时间 秒 包含滑块验证码有效时间， 以及验证通过之后，缓存中存储的验证结果有效时间
|
||||
effectiveTime: 300
|
||||
#水印
|
||||
<<<<<<< HEAD
|
||||
watermark:
|
||||
=======
|
||||
watermark: LILI-SHOP
|
||||
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
|
||||
#干扰项数量 最大2 默认0
|
||||
interfereNum: 1
|
||||
#允许误差像素
|
||||
@@ -222,6 +260,7 @@ lili:
|
||||
#短信模版配置
|
||||
sms:
|
||||
#登录
|
||||
<<<<<<< HEAD
|
||||
LOGIN: SMS_185821482
|
||||
#注册
|
||||
REGISTER: SMS_185821482
|
||||
@@ -234,6 +273,20 @@ lili:
|
||||
system:
|
||||
isDemoSite: false
|
||||
isTestModel: false
|
||||
=======
|
||||
LOGIN: SMS_205755300
|
||||
#注册
|
||||
REGISTER: SMS_205755298
|
||||
#找回密码
|
||||
FIND_USER: SMS_205755301
|
||||
#设置密码
|
||||
UPDATE_PASSWORD: SMS_205755297
|
||||
#支付密码
|
||||
WALLET_PASSWORD: SMS_205755301
|
||||
system:
|
||||
isDemoSite: false
|
||||
isTestModel: true
|
||||
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
|
||||
# 脱敏级别：
|
||||
# 0：不做脱敏处理
|
||||
# 1：管理端用户手机号等信息脱敏
|
||||
@@ -251,6 +304,7 @@ lili:
|
||||
sk: zhNKVrJK6UPOhqIjn8AQvG37b9sz6
|
||||
#域名
|
||||
domain:
|
||||
<<<<<<< HEAD
|
||||
pc: http://106.124.130.167:8885
|
||||
wap: http://106.124.130.167:8885
|
||||
seller: http://106.124.130.167:8885
|
||||
@@ -261,6 +315,18 @@ lili:
|
||||
base: http://106.124.130.167:8885
|
||||
manager: http://106.124.130.167:8885
|
||||
seller: http://106.124.130.167:8885
|
||||
=======
|
||||
pc: http://192.168.0.116:8888
|
||||
wap: http://192.168.0.116:8888
|
||||
seller: http://192.168.0.116:8888
|
||||
admin: http://192.168.0.116:8888
|
||||
#api地址
|
||||
api:
|
||||
buyer: https://z171l91606.51mypc.cn
|
||||
base: http://192.168.0.116:8888
|
||||
manager: http://192.168.0.116:8888
|
||||
seller: http://192.168.0.116:8888
|
||||
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
|
||||
|
||||
# jwt 细节设定
|
||||
jwt-setting:
|
||||
@@ -279,7 +345,11 @@ lili:
|
||||
data:
|
||||
elasticsearch:
|
||||
cluster-name: elasticsearch
|
||||
<<<<<<< HEAD
|
||||
cluster-nodes: 106.124.130.167:9200
|
||||
=======
|
||||
cluster-nodes: 192.168.0.116:9200
|
||||
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
|
||||
index:
|
||||
number-of-replicas: 0
|
||||
number-of-shards: 3
|
||||
@@ -290,7 +360,11 @@ lili:
|
||||
# password: LiLiShopES
|
||||
|
||||
logstash:
|
||||
<<<<<<< HEAD
|
||||
server: 106.124.130.167:4560
|
||||
=======
|
||||
server: 192.168.0.116:4560
|
||||
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
|
||||
rocketmq:
|
||||
promotion-topic: lili_promotion_topic
|
||||
promotion-group: lili_promotion_group
|
||||
@@ -311,7 +385,11 @@ lili:
|
||||
after-sale-topic: lili_after_sale_topic
|
||||
after-sale-group: lili_after_sale_group
|
||||
rocketmq:
|
||||
<<<<<<< HEAD
|
||||
name-server: 106.124.130.167:9876
|
||||
=======
|
||||
name-server: 192.168.0.116:9876
|
||||
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
|
||||
isVIPChannel: false
|
||||
producer:
|
||||
group: lili_group
|
||||
@@ -320,7 +398,11 @@ rocketmq:
|
||||
xxl:
|
||||
job:
|
||||
admin:
|
||||
<<<<<<< HEAD
|
||||
addresses: http://127.0.0.1:9001/xxl-job-admin
|
||||
=======
|
||||
addresses: http://192.168.0.116:9001/xxl-job-admin
|
||||
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
|
||||
executor:
|
||||
appname: xxl-job-executor-lilishop
|
||||
address:
|
||||
|
||||
Reference in New Issue
Block a user