Merge pull request #5 from kingschan1204/develop

0.1
kingschan1204 · Jun 26, 2018 · beb421c · beb421c
2 parents 4090797 + c7c8797
commit beb421c
Show file tree

Hide file tree

Showing 40 changed files with 1,293 additions and 334 deletions.
diff --git a/pom-war.xml b/pom-war.xml
@@ -0,0 +1,148 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>io.github.kingschan1204</groupId>
+    <artifactId>istock</artifactId>
+    <packaging>war</packaging>
+    <version>1.5.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>
+    </parent>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+        <spring-cloud.version>Edgware.SR2</spring-cloud.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+             <exclusions>
+                 <exclusion>
+                     <groupId>org.springframework.boot</groupId>
+                     <artifactId>spring-boot-starter-tomcat</artifactId>
+                 </exclusion>
+             </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!--加入freemarker-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-freemarker</artifactId>
+        </dependency>
+        <!--加入日志-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-logging</artifactId>
+        </dependency>
+        <!-- html解析 -->
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>1.11.2</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+        <!--json 工具-->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.44</version>
+        </dependency>
+        <!-- commons-io -->
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.6</version>
+        </dependency>
+
+        <!-- poi excel 2003 -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>3.17</version>
+        </dependency>
+
+        <!-- poi excel 2007 -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>3.17</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-mongodb</artifactId>
+        </dependency>
+
+    </dependencies>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <build>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+        <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>2.3.2</version>
+                    <configuration>
+                        <source>1.8</source>
+                        <target>1.8</target>
+                    </configuration>
+                </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <warSourceExcludes>src/main/resources/**</warSourceExcludes>
+                    <warName>${project.artifactId}-${project.version}</warName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/pom.xml b/pom.xml
@@ -4,10 +4,9 @@
     <groupId>io.github.kingschan1204</groupId>
     <artifactId>istock</artifactId>
     <packaging>jar</packaging>
-    <version>1.4</version>
+    <version>1.5.7</version>
     <name>pritice Maven Webapp</name>
     <url>http://maven.apache.org</url>
-
     <!-- 继承父包 -->
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -19,18 +18,35 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
+        <spring-cloud.version>Edgware.SR2</spring-cloud.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <!-- <exclusions>
+             <exclusions>
                  <exclusion>
                      <groupId>org.springframework.boot</groupId>
                      <artifactId>spring-boot-starter-tomcat</artifactId>
                  </exclusion>
-             </exclusions>-->
+             </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-config</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -47,28 +63,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-logging</artifactId>
         </dependency>
-        <!--jpa-->
-      <!--  <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-        </dependency>-->
-
-        <!-- MySQL的java驱动
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid</artifactId>
-            <version>1.0.26</version>
-        </dependency>-->
         <!-- html解析 -->
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
-            <version>1.9.2</version>
+            <version>1.11.2</version>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
@@ -78,7 +77,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.0.1</version>
+            <version>3.1.0</version>
         </dependency>
         <!--json 工具-->
         <dependency>
@@ -113,6 +112,17 @@
         </dependency>
 
     </dependencies>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <build>
         <finalName>${project.artifactId}-${project.version}</finalName>
         <plugins>

diff --git a/readme.md b/readme.md
@@ -35,3 +35,31 @@
 
 ## 国内指数
 `http://hq.sinajs.cn/list=sz399001,sh000001,sz399006,sh000300`
+
+# 数据结构
+```
+	"_id" : "000783",
+	"type" : "sz",
+	"name" : "长江证券",
+	"price" : 6.62,
+	"yesterdayPrice" : 6.69,
+	"fluctuate" : -1.05,
+	"todayMax" : 6.72,
+	"todayMin" : 6.62,
+	"priceDate" : ISODate("2018-05-29T06:58:01.117Z"),
+	"industry" : "证券",
+	"mainBusiness" : "证券代理买卖、证券自营、证券承销、受托资产管理等证券类业务。",
+	"totalValue" : 369,
+	"pb" : 1.38,
+	"roe" : 1.21,
+	"bvps" : 4.85,
+	"pes" : 23.94,
+	"ped" : 28.704,
+	"dividendDate" : "-", 
+	"dividend" : 2.2,
+	"dy" : 2.24,
+	"dyDate" : 20180529,
+	"infoDate" : 20180529,
+	"dividendUpdateDay" : 20180524 
+
+```
diff --git a/src/main/java/io.github.kingschan1204.istock/Application.java b/src/main/java/io.github.kingschan1204.istock/Application.java
@@ -2,14 +2,10 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-/*@Configuration
-//@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class})
-@EnableAutoConfiguration
-@ComponentScan({"io.github.kingschan1204.istock"})*/
+
 @Controller
 @SpringBootApplication
 public class Application {

diff --git a/src/main/java/io.github.kingschan1204.istock/WarApplication.java b/src/main/java/io.github.kingschan1204.istock/WarApplication.java
@@ -0,0 +1,17 @@
+package io.github.kingschan1204.istock;
+
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.support.SpringBootServletInitializer;
+
+/**
+ * war 的部署方式启动
+ * @author chenguoxiang
+ * @create 2018-04-19 19:34
+ **/
+public class WarApplication extends SpringBootServletInitializer {
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+        // 注意这里要指向原先用main方法执行的Application启动类
+        return builder.sources(Application.class);
+    }
+}
diff --git a/src/main/java/io.github.kingschan1204.istock/common/conf/ActuatorSecurityConfig.java b/src/main/java/io.github.kingschan1204.istock/common/conf/ActuatorSecurityConfig.java
@@ -0,0 +1,32 @@
+package io.github.kingschan1204.istock.common.conf;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.util.StringUtils;
+
+/**
+ * 定制Actuator SpringSecurity
+ * @author chenguoxiang
+ * @create 2018-04-12 16:38
+ **/
+@Configuration
+@EnableWebSecurity
+public class ActuatorSecurityConfig extends WebSecurityConfigurerAdapter {
+    @Autowired
+    Environment env;
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        String contextPath = env.getProperty("management.context-path");
+        if(StringUtils.isEmpty(contextPath)) {
+            contextPath = "";
+        }http.csrf().disable();
+        http.authorizeRequests()
+                .antMatchers("/**"+contextPath+"/**").authenticated()
+                .anyRequest().permitAll()
+                .and().httpBasic();
+    }
+}
diff --git a/src/main/java/io.github.kingschan1204.istock/common/util/file/ExcelOperactionTool.java b/src/main/java/io.github.kingschan1204.istock/common/util/file/ExcelOperactionTool.java
@@ -37,6 +37,9 @@ public static List<Object[]> readExcelData(String url)throws Exception{
                 workBook = new XSSFWorkbook(fis);
             } catch (IOException e) {
                 e.printStackTrace();
+            }finally {
+                fis.close();
+                workBook.close();
             }
         }
         // 读取2003版，以   .xls 结尾
@@ -45,6 +48,9 @@ else if(url.toLowerCase().endsWith("xls")){
                 workBook = new HSSFWorkbook(fis);
             } catch (IOException e) {
                 e.printStackTrace();
+            }finally {
+                fis.close();
+                workBook.close();
             }
         }
         //Get the number of sheets in the xlsx file

diff --git a/src/main/java/io.github.kingschan1204.istock/common/util/file/FileCommonOperactionTool.java b/src/main/java/io.github.kingschan1204.istock/common/util/file/FileCommonOperactionTool.java
@@ -37,9 +37,16 @@ public static String downloadFile(String url, String dir, String filename) throw
         }
         // output here
         String path = dir + (null == filename ? defaultFileName : filename);
-        FileOutputStream out = (new FileOutputStream(new java.io.File(path)));
-        out.write(resultResponse.bodyAsBytes());
-        out.close();
+        FileOutputStream out=null;
+       try{
+            out = (new FileOutputStream(new java.io.File(path)));
+           out.write(resultResponse.bodyAsBytes());
+       }catch (Exception ex){
+           log.error("{}",ex);
+           ex.printStackTrace();
+       }finally {
+           out.close();
+       }
         return path;
     }
 }