记得上下班打卡 | git大法好,push需谨慎

Commit 6ef49ca5 authored by anjiabin's avatar anjiabin

Merge branch 'dev' into test

parents 2a397957 98b92755
...@@ -23,13 +23,9 @@ liquidnet: ...@@ -23,13 +23,9 @@ liquidnet:
knife4j: knife4j:
disable: false disable: false
redis: redis:
host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com host: r-2ze7002ckw5u75fguk.redis.rds.aliyuncs.com
# host: r-2zefzyjbij5vbez65y.redis.rds.aliyuncs.com
port: 6380 port: 6380
password: PO@B!Iud32 password: PO@B!Iud32
# host: r-2ze7002ckw5u75fguk.redis.rds.aliyuncs.com
# port: 6380
# password: PO@B!Iud32
mongodb: mongodb:
host: s-2zef656730e5a1d4-pub.mongodb.rds.aliyuncs.com:3717,s-2ze49872ed6aeb14-pub.mongodb.rds.aliyuncs.com:3717 host: s-2zef656730e5a1d4-pub.mongodb.rds.aliyuncs.com:3717,s-2ze49872ed6aeb14-pub.mongodb.rds.aliyuncs.com:3717
port: 3717 port: 3717
......
...@@ -57,7 +57,7 @@ info: ...@@ -57,7 +57,7 @@ info:
version: '@project.version@' version: '@project.version@'
# ----------------------------------------------------------- # -----------------------------------------------------------
mybatis-plus: mybatis-plus:
mapper-locations: classpath:com.liquidnet.service.*.mapper/*Mapper.xml mapper-locations: classpath:com.liquidnet.service.*.mapper/*Mapper.xml,classpath:com.liquidnet.service.kylin.mapper/*Mapper.xml
# ----------------------------------------------------------- # -----------------------------------------------------------
spring: spring:
application: application:
......
...@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
* @since 2021-06-29 * @since 2021-06-29
*/ */
@Api(tags = "前端-shunfengBack") @Api(tags = "前端-shunfengCallBack")
@RestController @RestController
@RequestMapping("performancesExpress") @RequestMapping("performancesExpress")
public class PerformancesExpressCallbackController { public class PerformancesExpressCallbackController {
......
...@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
* @author jiangxiulong * @author jiangxiulong
* @since 2021-06-11 6:10 下午 * @since 2021-06-11 6:10 下午
*/ */
@Api(tags = "前端-退款回调") @Api(tags = "前端-refundCallBack")
@RestController @RestController
@RequestMapping("refund") @RequestMapping("refund")
public class OrderRefundCallbackController { public class OrderRefundCallbackController {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment