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

Commit 58a46d74 authored by jiangxiulong's avatar jiangxiulong

log e

parent e08fd2eb
...@@ -23,19 +23,30 @@ public class JxlDataController { ...@@ -23,19 +23,30 @@ public class JxlDataController {
* @return * @return
*/ */
@PostMapping("basicServices/versions") @PostMapping("basicServices/versions")
@ApiOperation("basicServices版本控制数据迁移") @ApiOperation("basicServices版本控制数据迁移-可以通过后台编辑")
public ResponseDto<Boolean> basicServicesVersions() { public ResponseDto<Boolean> basicServicesVersions() {
Boolean result = jxlData.basicServicesVersions(); Boolean result = jxlData.basicServicesVersions();
return ResponseDto.success(result); return ResponseDto.success(result);
} }
@PostMapping("basicServices/upush") @PostMapping("basicServices/upush")
@ApiOperation("basicServices推送数据迁移-可不迁暂时无数据") @ApiOperation("basicServices推送数据迁移")
public ResponseDto<Boolean> basicServicesUpush() { public ResponseDto<Boolean> basicServicesUpush() {
Boolean result = jxlData.basicServicesUpush(); Boolean result = jxlData.basicServicesUpush();
return ResponseDto.success(result); return ResponseDto.success(result);
} }
/**
* kylin
* @return
*/
@PostMapping("kylin/banner")
@ApiOperation("kylin-banner数据迁移-可以通过后台编辑")
public ResponseDto<Boolean> kylinBanner() {
Boolean result = jxlData.kylinBanner();
return ResponseDto.success(result);
}
/** /**
* sweet * sweet
* @return * @return
...@@ -75,17 +86,6 @@ public class JxlDataController { ...@@ -75,17 +86,6 @@ public class JxlDataController {
return ResponseDto.success(result); return ResponseDto.success(result);
} }
/**
* kylin
* @return
*/
@PostMapping("kylin/banner")
@ApiOperation("kylin-banner数据迁移")
public ResponseDto<Boolean> kylinBanner() {
Boolean result = jxlData.kylinBanner();
return ResponseDto.success(result);
}
/*kylin:order:ExpressStatus:id:138291855523471362201224 // 无数据暂时 一条是测试 /*kylin:order:ExpressStatus:id:138291855523471362201224 // 无数据暂时 一条是测试
// 下面会自动降级mongo // 下面会自动降级mongo
kylin:order:refund:orderId:1000651 kylin:order:refund:orderId:1000651
......
...@@ -38,7 +38,7 @@ public class JxlDataImpl { ...@@ -38,7 +38,7 @@ public class JxlDataImpl {
// r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com test // r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com test
// 39.106.122.201 dev // 39.106.122.201 dev
// zhengzai.redis.rds.aliyuncs.com 线上 // zhengzai.redis.rds.aliyuncs.com 线上
jedisPool = new JedisPool("r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com", 6380); jedisPool = new JedisPool("zhengzai.redis.rds.aliyuncs.com", 6380);
toObjMapper = new ObjectMapper(); toObjMapper = new ObjectMapper();
toObjMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); toObjMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
...@@ -49,7 +49,8 @@ public class JxlDataImpl { ...@@ -49,7 +49,8 @@ public class JxlDataImpl {
private Jedis getRedis() { private Jedis getRedis() {
Jedis resource = jedisPool.getResource(); Jedis resource = jedisPool.getResource();
resource.auth("NBs$%6hW"); resource.auth("NBs$%6hW"); // 线上
// resource.auth("PO@B!Iud32"); // test
resource.select(15); resource.select(15);
return resource; return resource;
} }
...@@ -75,7 +76,7 @@ public class JxlDataImpl { ...@@ -75,7 +76,7 @@ public class JxlDataImpl {
return true; return true;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); log.error("basicServicesVersionsError", e);
return false; return false;
} }
} }
...@@ -99,7 +100,7 @@ public class JxlDataImpl { ...@@ -99,7 +100,7 @@ public class JxlDataImpl {
return true; return true;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); log.error("basicServicesUpushError", e);
return false; return false;
} }
} }
...@@ -125,7 +126,7 @@ public class JxlDataImpl { ...@@ -125,7 +126,7 @@ public class JxlDataImpl {
return true; return true;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); log.error("sweetAnswerError", e);
return false; return false;
} }
} }
...@@ -145,7 +146,7 @@ public class JxlDataImpl { ...@@ -145,7 +146,7 @@ public class JxlDataImpl {
return true; return true;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); log.error("sweetOpenIdError", e);
return false; return false;
} }
} }
...@@ -169,7 +170,7 @@ public class JxlDataImpl { ...@@ -169,7 +170,7 @@ public class JxlDataImpl {
return true; return true;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); log.error("sweetUnionIdError", e);
return false; return false;
} }
} }
...@@ -189,7 +190,7 @@ public class JxlDataImpl { ...@@ -189,7 +190,7 @@ public class JxlDataImpl {
return true; return true;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); log.error("sweetUnionIdStrError", e);
return false; return false;
} }
} }
...@@ -208,7 +209,7 @@ public class JxlDataImpl { ...@@ -208,7 +209,7 @@ public class JxlDataImpl {
return true; return true;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); log.error("kylinBannerError", e);
return false; return false;
} }
} }
......
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