diff --git a/pom.xml b/pom.xml
index 083c4434..9fe28ac2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,14 +4,14 @@
io.github.kingschan1204
istock
jar
- 1.6.5
+ 1.6.7
pritice Maven Webapp
http://maven.apache.org
org.springframework.boot
spring-boot-starter-parent
- 1.5.6.RELEASE
+ 1.5.10.RELEASE
diff --git a/src/main/java/io.github.kingschan1204.istock/common/util/stock/impl/TushareSpider.java b/src/main/java/io.github.kingschan1204.istock/common/util/stock/impl/TushareSpider.java
index c048ebe5..5bc8e0eb 100644
--- a/src/main/java/io.github.kingschan1204.istock/common/util/stock/impl/TushareSpider.java
+++ b/src/main/java/io.github.kingschan1204.istock/common/util/stock/impl/TushareSpider.java
@@ -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";
/**
@@ -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) {
diff --git a/src/main/resources/static/plugs.echar/dark.js b/src/main/resources/static/plugs.echar/dark.js
new file mode 100644
index 00000000..79ff8c10
--- /dev/null
+++ b/src/main/resources/static/plugs.echar/dark.js
@@ -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);
+}));
\ No newline at end of file