[新增功能](master): Merge

master
土豆兄弟 4 years ago
parent 5512f69d9c
commit 6e9bb314ef

@ -88,7 +88,7 @@ public class ABClient {
* *
* @return * @return
*/ */
@PostMapping("/api/req/taginfo/tuboshu") @PostMapping("/api/req/taginfo/tbs")
@ResponseBody @ResponseBody
public CommonResponse getDBTagInfoTuboshu(@RequestBody ABClientInterMessageVO vo) { public CommonResponse getDBTagInfoTuboshu(@RequestBody ABClientInterMessageVO vo) {
// 记录日志 // 记录日志
@ -101,7 +101,7 @@ public class ABClient {
CommonResponse.createBySuccess() : CommonResponse.createByErrorMessage("调用失败请重试"); CommonResponse.createBySuccess() : CommonResponse.createByErrorMessage("调用失败请重试");
} }
/** /**-+
* AB - * AB -
* *
* @return * @return

@ -227,13 +227,13 @@ public class ABDownTask {
private String qiJiaUrl; private String qiJiaUrl;
@Value("${ab.tbs.appId}") @Value("${ab.tubs.appId}")
private String tbsAppid; private String tbsAppid;
@Value("${ab.tbs.url}") @Value("${ab.tubs.url}")
private String tbsUrl; private String tbsUrl;
@Value("${ab.tbs.secretKey}") @Value("${ab.tubs.secretKey}")
private String tbsSecret; private String tbsSecret;

@ -1,6 +1,6 @@
spring: spring:
profiles: profiles:
active: prod active: dev
# 序列化忽略null的k-v配置 # 序列化忽略null的k-v配置
jackson: jackson:
default-property-inclusion: non_null default-property-inclusion: non_null
@ -92,7 +92,7 @@ ab:
token_addr: https://tapi.qizuang.com/v1/gettoken token_addr: https://tapi.qizuang.com/v1/gettoken
akey: 4sZIqVrtV2M5GdX6 akey: 4sZIqVrtV2M5GdX6
ckey: ul93ewgrysGNDDyV ckey: ul93ewgrysGNDDyV
tbs: tubs:
appId: 9c32209b14214929bc1ba07b8b4d7b47 appId: 9c32209b14214929bc1ba07b8b4d7b47
url: http://erp.tobosu.cn/channel/pullOrder/pushOrderFromChannel url: http://erp.tobosu.cn/channel/pullOrder/pushOrderFromChannel
secretKey: dd638eedc970b468e5e0002179e59e77 secretKey: dd638eedc970b468e5e0002179e59e77
@ -178,7 +178,7 @@ ab:
appId: TZRamCan appId: TZRamCan
url: http://175.27.191.107:8080//highseas/api/tz url: http://175.27.191.107:8080//highseas/api/tz
secretKey: 77ea829b727913a87f8aa461b392dbb5 secretKey: 77ea829b727913a87f8aa461b392dbb5
tbs: tubs:
appId: 9c32209b14214929bc1ba07b8b4d7b47 appId: 9c32209b14214929bc1ba07b8b4d7b47
url: http://erp.tobosu.cn/channel/pullOrder/pushOrderFromChannel url: http://erp.tobosu.cn/channel/pullOrder/pushOrderFromChannel
secretKey: dd638eedc970b468e5e0002179e59e77 secretKey: dd638eedc970b468e5e0002179e59e77
@ -264,7 +264,7 @@ ab:
appId: TZRamCan appId: TZRamCan
url: http://175.27.191.107:8080//highseas/api/tz url: http://175.27.191.107:8080//highseas/api/tz
secretKey: 77ea829b727913a87f8aa461b392dbb5 secretKey: 77ea829b727913a87f8aa461b392dbb5
tbs: tubs:
appId: 9c32209b14214929bc1ba07b8b4d7b47 appId: 9c32209b14214929bc1ba07b8b4d7b47
url: http://erp.tobosu.cn/channel/pullOrder/pushOrderFromChannel url: http://erp.tobosu.cn/channel/pullOrder/pushOrderFromChannel
secretKey: dd638eedc970b468e5e0002179e59e77 secretKey: dd638eedc970b468e5e0002179e59e77

@ -37,7 +37,7 @@
<root level="INFO"> <root level="INFO">
<!-- TODO prod 环境去掉std --> <!-- TODO prod 环境去掉std -->
<appender-ref ref="stdAppender"/> <!-- <appender-ref ref="stdAppender"/>-->
<!-- <appender-ref ref="fileAppender"/>--> <appender-ref ref="fileAppender"/>
</root> </root>
</configuration> </configuration>
Loading…
Cancel
Save