Explorar o código

1维瓦斯结果获取

huangxingxing hai 8 meses
pai
achega
5ce71d7843

+ 31 - 44
pom.xml

@@ -34,31 +34,26 @@
 
         <!-- nacos 依赖 -->
         <!-- https://mvnrepository.com/artifact/com.alibaba.cloud/spring-cloud-starter-alibaba-nacos-discovery -->
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>-->
+<!--            <version>2.2.7.RELEASE</version>-->
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.springframework.cloud</groupId>-->
+<!--                    <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
+<!--        </dependency>-->
         <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-            <version>2.2.7.RELEASE</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.cloud</groupId>
-                    <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>com.taobao</groupId>
-            <artifactId>taobao-sdk-java-auto</artifactId>
-            <version>1.0.0</version>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>21.0</version>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-loadbalancer</artifactId>
         </dependency>
-
-
-
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
@@ -68,13 +63,10 @@
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-httpclient</artifactId>
         </dependency>
-
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure</artifactId>
@@ -85,7 +77,6 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
@@ -168,9 +159,6 @@
             <version>2.1.0</version>
         </dependency>
 
-
-
-
         <!-- https://mvnrepository.com/artifact/com.aliyun/aliyun-java-sdk-core -->
         <dependency>
             <groupId>com.aliyun</groupId>
@@ -221,14 +209,18 @@
         <!--            <systemPath>${project.basedir}/lib/ibatis-2.9.1.jar</systemPath>-->
         <!--        </dependency>-->
 
-        <!--        <dependency>-->
-        <!--            <groupId>com.taobao</groupId>-->
-        <!--            <artifactId>taobao-sdk-java-auto</artifactId>-->
-        <!--            <version>1.0.0</version>-->
-        <!--            <scope>system</scope>-->
-        <!--            <systemPath>${project.basedir}/lib/taobao-sdk-java-auto.jar</systemPath>-->
-        <!--        </dependency>-->
-
+        <dependency>
+            <groupId>com.taobao</groupId>
+            <artifactId>taobao-sdk-java-auto</artifactId>
+            <version>1.0.0</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/taobao-sdk-java-auto.jar</systemPath>
+        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.taobao</groupId>-->
+<!--            <artifactId>taobao-sdk-java-auto</artifactId>-->
+<!--            <version>1.0.0</version>-->
+<!--        </dependency>-->
 
 
         <!--全局排除spring-boot-starter-logging内的所有依赖-->
@@ -264,11 +256,11 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>dysmsapi20170525</artifactId>
-            <version>2.0.9</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.aliyun</groupId>-->
+<!--            <artifactId>dysmsapi20170525</artifactId>-->
+<!--            <version>2.0.9</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>adi</groupId>
             <artifactId>vtk</artifactId>
@@ -327,12 +319,7 @@
                 <version>3.2.13</version>
 
             </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>21.0</version>
 
-        </dependency>
 
     </dependencies>
 

+ 16 - 17
profiles/dev/application-dev.properties

@@ -8,25 +8,24 @@ spring.servlet.multipart.max-file-size=600MB
 spring.servlet.multipart.max-request-size=600MB
 
 #=======================Spring nacos\u914D\u7F6E================================
-spring.cloud.nacos.config.server-addr=192.168.0.130:8848
-spring.cloud.nacos.discovery.server-addr=192.168.0.130:8848
-spring.cloud.nacos.discovery.namespace=dev
-
-spring.cloud.nacos.discovery.service=gzl.${spring.application.name}
-spring.cloud.nacos.discovery.metadata.uniqueid=${mf.minicore.uniqueid}
-
+#spring.cloud.nacos.config.server-addr=192.168.0.130:8848
+#spring.cloud.nacos.discovery.server-addr=192.168.0.130:8848
+#spring.cloud.nacos.discovery.namespace=dev
+#spring.cloud.nacos.discovery.service=gzl.${spring.application.name}
+#spring.cloud.nacos.discovery.metadata.uniqueid=${mf.minicore.uniqueid}
+#
 
 #=======================Spring eureka\u914D\u7F6E(\u672A\u4F7F\u7528)================================
-eureka.client.register-with-eureka=true
-eureka.client.fetchRegistry=true
-eureka.client.service-url.defaultZone=http://localhost:8761/eureka/
-
-eureka.instance.instance-id=${spring.application.name}-${server.port}
-eureka.instance.prefer-ip-address=true
-eureka.instance.ip-address=192.168.0.213
-
-eureka.instance.status-page-url-path=/monitor/info
-eureka.instance.health-check-url-path=/monitor/health
+#eureka.client.register-with-eureka=true
+#eureka.client.fetchRegistry=true
+#eureka.client.service-url.defaultZone=http://localhost:8761/eureka/
+#
+#eureka.instance.instance-id=${spring.application.name}-${server.port}
+#eureka.instance.prefer-ip-address=true
+#eureka.instance.ip-address=192.168.0.213
+#
+#eureka.instance.status-page-url-path=/monitor/info
+#eureka.instance.health-check-url-path=/monitor/health
 
 
 #=======================datasource\u914D\u7F6E================================

+ 6 - 8
src/main/java/com/miniframe/controller/XIController.java

@@ -1,6 +1,5 @@
 package com.miniframe.controller;
 
-import com.alibaba.druid.stat.DruidStatManagerFacade;
 import com.miniframe.config.XISystemInfo;
 import com.miniframe.core.exception.BusinessException;
 import com.miniframe.spring.annotation.MFCheckLogin;
@@ -18,7 +17,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashMap;
@@ -57,12 +55,12 @@ public class XIController {
         return MFHttpServerUtils.getDefController().uploadFile(request, response);
     }
 
-    @RequestMapping(value = "/monitor/druid/datasource")
-    @MFCheckLogin
-    public Object druidDataSourceStatDataList(){
-        // DruidStatManagerFacade#getDataSourceStatDataList 该方法可以获取所有数据源的监控数据,除此之外 DruidStatManagerFacade 还提供了一些其他方法,你可以按需选择使用。
-        return DruidStatManagerFacade.getInstance().getDataSourceStatDataList();
-    }
+//    @RequestMapping(value = "/monitor/druid/datasource")
+//    @MFCheckLogin
+//    public Object druidDataSourceStatDataList(){
+//        // DruidStatManagerFacade#getDataSourceStatDataList 该方法可以获取所有数据源的监控数据,除此之外 DruidStatManagerFacade 还提供了一些其他方法,你可以按需选择使用。
+//        return DruidStatManagerFacade.getInstance().getDataSourceStatDataList();
+//    }
 
     @RequestMapping(value = "/file/**")
     private Map file(HttpServletRequest request, HttpServletResponse response) throws Exception {

+ 0 - 3
src/main/java/com/miniframe/tools/XIFileUtils.java

@@ -2,17 +2,14 @@ package com.miniframe.tools;
 
 import com.google.common.io.Resources;
 import com.miniframe.constant.MFConstant;
-import com.miniframe.core.IniFileReader;
 import com.miniframe.core.exception.BusinessException;
 import com.miniframe.core.ext.UtilTools;
 import com.miniframe.generate.appcode.FileType;
 import com.miniframe.model.system.SysFile;
 import com.miniframe.model.system.dao.SysFileMapper;
 import com.miniframe.spring.properties.MFMiniCoreProperties;
-import com.miniframe.utils.MFMimeTypeUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.http.entity.ContentType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

+ 0 - 6
src/test/java/com/miniframe/PtDj.java

@@ -1,20 +1,14 @@
 package com.miniframe;
 
 
-
-import com.alibaba.nacos.shaded.com.google.gson.JsonArray;
 import com.miniframe.ptdj.PtDjCgq;
 import com.miniframe.ptdj.PtdjServer;
 import com.miniframe.tools.XiJsonUtil;
-import com.miniframe.tools.baidu.HttpUtil;
 import org.json.JSONArray;
-import org.json.JSONException;
 
 import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;