Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
kingschan1204 committed Nov 13, 2018
1 parent 81f2a97 commit 91eb92e
Show file tree
Hide file tree
Showing 3 changed files with 154 additions and 6 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
<groupId>io.github.kingschan1204</groupId>
<artifactId>istock</artifactId>
<packaging>jar</packaging>
<version>1.6.5</version>
<version>1.6.7</version>
<name>pritice Maven Webapp</name>
<url>http://maven.apache.org</url>
<!-- 继承父包 -->
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.6.RELEASE</version>
<version>1.5.10.RELEASE</version>
</parent>

<properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
public class TushareSpider {

@Value("${tushare.token}")
private String tuToken="66cdab7a757dcb728f8833f732a928791d67b6f38e1cd8d94bb79a0d";
private String tuToken;
@Autowired
private RestTemplate restTemplate=new RestTemplate();
private RestTemplate restTemplate;
final String api="http://api.tushare.pro";

/**
Expand Down Expand Up @@ -136,10 +136,11 @@ public static void main(String[] args) {
//{"date":"2018-11-01 18:06:25","code":200,"address":"湖南省长沙市 电信","ip":"113.246.64.67"}
System.setProperty("https.maxRedirects", "50");
System.getProperties().setProperty("https.proxySet", "true");
System.getProperties().setProperty("https.proxyHost", "114.116.10.21");
System.getProperties().setProperty("https.proxyHost", "203.86.26.9");
System.getProperties().setProperty("https.proxyPort", "3128");
StockSpider.enableSSLSocket();
String json =Jsoup.connect("https://api.ttt.sh/ip/qqwry/").get().text();
String url ="https://api.ttt.sh/ip/qqwry/";
String json =Jsoup.connect(url).get().text();
JSONObject j = JSON.parseObject(json);
System.out.println(j);
} catch (IOException e) {
Expand Down
147 changes: 147 additions & 0 deletions src/main/resources/static/plugs.echar/dark.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
(function (root, factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(['exports', 'echarts'], factory);
} else if (typeof exports === 'object' && typeof exports.nodeName !== 'string') {
// CommonJS
factory(exports, require('echarts'));
} else {
// Browser globals
factory({}, root.echarts);
}
}(this, function (exports, echarts) {
var log = function (msg) {
if (typeof console !== 'undefined') {
console && console.error && console.error(msg);
}
};
if (!echarts) {
log('ECharts is not Loaded');
return;
}
var contrastColor = '#eee';
var axisCommon = function () {
return {
axisLine: {
lineStyle: {
color: contrastColor
}
},
axisTick: {
lineStyle: {
color: contrastColor
}
},
axisLabel: {
textStyle: {
color: contrastColor
}
},
splitLine: {
lineStyle: {
type: 'dashed',
color: '#aaa'
}
},
splitArea: {
areaStyle: {
color: contrastColor
}
}
};
};

var colorPalette = ['#dd6b66','#759aa0','#e69d87','#8dc1a9','#ea7e53','#eedd78','#73a373','#73b9bc','#7289ab', '#91ca8c','#f49f42'];
var theme = {
color: colorPalette,
backgroundColor: '#333',
tooltip: {
axisPointer: {
lineStyle: {
color: contrastColor
},
crossStyle: {
color: contrastColor
}
}
},
legend: {
textStyle: {
color: contrastColor
}
},
textStyle: {
color: contrastColor
},
title: {
textStyle: {
color: contrastColor
}
},
toolbox: {
iconStyle: {
normal: {
borderColor: contrastColor
}
}
},
dataZoom: {
textStyle: {
color: contrastColor
}
},
timeline: {
lineStyle: {
color: contrastColor
},
itemStyle: {
normal: {
color: colorPalette[1]
}
},
label: {
normal: {
textStyle: {
color: contrastColor
}
}
},
controlStyle: {
normal: {
color: contrastColor,
borderColor: contrastColor
}
}
},
timeAxis: axisCommon(),
logAxis: axisCommon(),
valueAxis: axisCommon(),
categoryAxis: axisCommon(),

line: {
symbol: 'circle'
},
graph: {
color: colorPalette
},
gauge: {
title: {
textStyle: {
color: contrastColor
}
}
},
candlestick: {
itemStyle: {
normal: {
color: '#FD1050',
color0: '#0CF49B',
borderColor: '#FD1050',
borderColor0: '#0CF49B'
}
}
}
};
theme.categoryAxis.splitLine.show = false;
echarts.registerTheme('dark', theme);
}));

0 comments on commit 91eb92e

Please sign in to comment.