Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
server
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vanke
server
Commits
92e6b747
Commit
92e6b747
authored
Apr 19, 2021
by
XiaHou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加万科 从微V导入 功能
parent
bc7d6b42
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
40 additions
and
30 deletions
+40
-30
application.yml
mall-admin/src/main/resources/application.yml
+8
-9
admin-dev.yml
mall-config/src/main/resources/config/admin/admin-dev.yml
+5
-2
admin-prod.yml
mall-config/src/main/resources/config/admin/admin-prod.yml
+6
-2
portal-dev.yml
mall-config/src/main/resources/config/portal/portal-dev.yml
+8
-4
portal-prod.yml
mall-config/src/main/resources/config/portal/portal-prod.yml
+5
-4
application.yml
mall-portal/src/main/resources/application.yml
+8
-9
VankeMemberLoginServiceImpl.java
.../mall/service/vanke/impl/VankeMemberLoginServiceImpl.java
+0
-0
No files found.
mall-admin/src/main/resources/application.yml
View file @
92e6b747
...
...
@@ -2,9 +2,12 @@ server:
port
:
8180
spring
:
datasource
:
url
:
jdbc:mysql://1
15.29.198.90
:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
url
:
jdbc:mysql://1
0.27.33.5
:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
username
:
root
password
:
root
password
:
root123!!
#url: jdbc:mysql://47.98.216.76:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
#username: root
#password: 6just@2019
druid
:
initial-size
:
5
#连接池初始化大小
min-idle
:
10
#最小空闲连接数
...
...
@@ -15,10 +18,11 @@ spring:
login-username
:
druid
login-password
:
druid
redis
:
host
:
127.0.0.1
# Redis服务器地址
host
:
10.27.33.5
# Redis服务器地址
#host: 47.98.96.174
database
:
0
# Redis数据库索引(默认为0)
port
:
6379
# Redis服务器连接端口
password
:
# Redis服务器连接密码(默认为空)
password
:
"
root123!!"
# Redis服务器连接密码(默认为空)
jedis
:
pool
:
max-active
:
200
# 连接池最大连接数(使用负值表示没有限制)
...
...
@@ -26,11 +30,6 @@ spring:
max-idle
:
100
# 连接池中的最大空闲连接
min-idle
:
20
# 连接池中的最小空闲连接
timeout
:
3000ms
# 连接超时时间(毫秒)
rabbitmq
:
#rabbitmq相关配置
host
:
129.204.227.14
port
:
5672
username
:
admin
password
:
admin
quartz
:
#相关属性配置
properties
:
...
...
mall-config/src/main/resources/config/admin/admin-dev.yml
View file @
92e6b747
...
...
@@ -12,9 +12,12 @@ aliyun:
prefix
:
mall/images/
# 上传文件夹路径前缀
spring
:
datasource
:
url
:
jdbc:mysql://1
15.29.198.90
:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
url
:
jdbc:mysql://1
0.27.33.5
:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
username
:
root
password
:
root
password
:
root123!!
#url: jdbc:mysql://47.98.216.76:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
#username: root
#password: 6just@2019
logging
:
level
:
root
:
info
#日志配置DEBUG,INFO,WARN,ERROR
...
...
mall-config/src/main/resources/config/admin/admin-prod.yml
View file @
92e6b747
...
...
@@ -12,8 +12,11 @@ aliyun:
prefix
:
mall/images/
# 上传文件夹路径前缀
spring
:
datasource
:
url
:
jdbc:mysql://
db:3306/mall
?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
url
:
jdbc:mysql://
10.27.33.5:3306/vanke
?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
username
:
root
password
:
2017gzMM
password
:
root123!!
#url: jdbc:mysql://47.98.216.76:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
#username: root
#password: 6just@2019
logging
:
path
:
/var/logs
#配置日志生成路径
\ No newline at end of file
mall-config/src/main/resources/config/portal/portal-dev.yml
View file @
92e6b747
spring
:
datasource
:
url
:
jdbc:mysql://1
15.29.198.90
:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
url
:
jdbc:mysql://1
0.27.33.5
:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
username
:
root
password
:
root
password
:
root123!!
#url: jdbc:mysql://47.98.216.76:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
#username: root
#password: 6just@2019
redis
:
host
:
127.0.0.1
# Redis服务器地址
host
:
10.27.33.5
# Redis服务器地址
#host: 47.98.96.174
database
:
0
# Redis数据库索引(默认为0)
port
:
6379
# Redis服务器连接端口
password
:
# Redis服务器连接密码(默认为空)
password
:
"
root123!!"
# Redis服务器连接密码(默认为空)
# 日志配置
logging
:
level
:
...
...
mall-config/src/main/resources/config/portal/portal-prod.yml
View file @
92e6b747
spring
:
datasource
:
url
:
jdbc:mysql://
db:3306/mall
?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
url
:
jdbc:mysql://
10.27.33.5:3306/vanke
?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
username
:
root
password
:
2017gzMM
password
:
root123!!
redis
:
host
:
127.0.0.1
# Redis服务器地址
host
:
10.27.33.5
# Redis服务器地址
#host: 47.98.96.174
database
:
0
# Redis数据库索引(默认为0)
port
:
6379
# Redis服务器连接端口
password
:
#不设置密码
password
:
"
root123!!"
# Redis服务器连接密码(默认为空)
mall-portal/src/main/resources/application.yml
View file @
92e6b747
...
...
@@ -2,9 +2,12 @@ server:
port
:
8085
spring
:
datasource
:
url
:
jdbc:mysql://1
15.29.198.90
:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
url
:
jdbc:mysql://1
0.27.33.5
:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
username
:
root
password
:
root
password
:
root123!!
#url: jdbc:mysql://47.98.216.76:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
#username: root
#password: 6just@2019
druid
:
initial-size
:
5
#连接池初始化大小
min-idle
:
10
#最小空闲连接数
...
...
@@ -15,10 +18,11 @@ spring:
login-username
:
druid
login-password
:
druid
redis
:
host
:
127.0.0.1
# Redis服务器地址
host
:
10.27.33.5
# Redis服务器地址
#host: 47.98.96.174
database
:
0
# Redis数据库索引(默认为0)
port
:
6379
# Redis服务器连接端口
password
:
# Redis服务器连接密码(默认为空)
password
:
"
root123!!"
# Redis服务器连接密码(默认为空)
jedis
:
pool
:
max-active
:
8
# 连接池最大连接数(使用负值表示没有限制)
...
...
@@ -88,11 +92,6 @@ redis:
payOrderId
:
"
portal:payOrderId:"
expire
:
authCode
:
90
# 验证码超期时间
# 自定义消息队列名称
rabbitmq
:
queue
:
name
:
cancelOrder
:
cancelOrderQueue
## 微信开放平台
wechat
:
open
:
...
...
mall-service/src/main/java/com/macro/mall/service/vanke/impl/VankeMemberLoginServiceImpl.java
View file @
92e6b747
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment