Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/XianNingChuXing
# Conflicts:
# UserOKTravel/guns-admin/src/main/resources/application.yml
# UserOKTravel/guns-admin/src/main/resources/redis.properties
| | |
|---|
| | | #正式环境 |
|---|
| | | callbackPath: https://xn95128.cn/user |
|---|
| | | #测试环境 |
|---|
| | | #callbackPath: https://v7ro848ar5jx.ngrok.xiaomiqiu123.top/user |
|---|
| | | #callbackPath: http://139.9.249.67:80/user |
|---|
| | | |
|---|
| | | |
|---|
| | | --- |
|---|
| | |
|---|
| | | spring.redis.port=6379 |
|---|
| | | # Redis·þÎñÆ÷Á¬½ÓÃÜÂ루ĬÈÏΪ¿Õ£© |
|---|
| | | spring.redis.password=XianNing@2024! |
|---|
| | | #spring.redis.password=123456 |
|---|
| | | |
|---|
| | | #spring.redis.password= |
|---|
| | | # Á¬½Ó³Ø×î´óÁ¬½ÓÊý£¨Ê¹ÓøºÖµ±íʾûÓÐÏÞÖÆ£© |
|---|
| | | spring.redis.jedis.pool.max-active=1024 |
|---|
| | | # Á¬½Ó³Ø×î´ó×èÈûµÈ´ýʱ¼ä£¨Ê¹ÓøºÖµ±íʾûÓÐÏÞÖÆ£© |
|---|
