咳嗽管家

huimv-farm-admin/src/main/java/com/huimv/admin/HuimvAdminApplication.java

@@ -17,7 +17,7 @@ import org.springframework.context.annotation.Import;
  **/
 @SpringBootApplication
 @MapperScan("com.huimv.admin.*.mapper")
-//@Import(InterceptorConfig.class)
+@Import(InterceptorConfig.class)
 public class HuimvAdminApplication {
     public static void main(String[] args) {
         SpringApplication.run(HuimvAdminApplication.class, args);

huimv-farm-admin/src/main/resources/application-prod.yml

@@ -1,14 +1,23 @@
 server:
-  port: 8091
+  port: 8090
 spring:
   application:
     name: pigfarm-local-device
   #------DataSource-----
   datasource:
-    url: jdbc:mysql://47.96.4.54:10052/huimv-farm-center?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    username: root
-    password: hm123456789
-    driver-class-name: com.mysql.cj.jdbc.Driver
+    druid:
+      url: jdbc:mysql://47.96.4.54:10052/huimv-farm-center?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+      username: root
+      password: TqfMrSSucyTyWXoEa2eIp6VfLmu4IGnVPU3LWoe5DEBX+N7NQrH/BW1k/J9e6q9/Q/40xxWmy3gjtAK9dCR21A==
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      filters: config
+      connect-properties:
+        config.decrypt: true
+        config.decrypt.key: ${spring.datasource.druid.publickey}
+    type: com.alibaba.druid.pool.DruidDataSource
+  autoconfigure:
+    exclude:
+      - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
   jpa:
     hibernate:
       ddl-auto: none

huimv-farm-admin/src/main/resources/application.properties

@@ -1,10 +1,10 @@
 #spring.profiles.active=dev
 #spring.profiles.active=prod3
-#spring.profiles.active=prod
+spring.profiles.active=prod
 #spring.profiles.active=dem
 # o
 #spring.profiles.active=yv
-spring.profiles.active=lishui
+#spring.profiles.active=lishui
 
 #ʱ¼ä¸ñʽÅäÖÃ
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

huimv-farm-environ/pom.xml

@@ -41,7 +41,7 @@
         <dependency>
             <groupId>com.huimv</groupId>
             <artifactId>huimv-common</artifactId>
-            <version>0.0.13-SNAPSHOT</version>
+            <version>0.0.6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.dahuatech.icc</groupId>

huimv-farm-environ/src/main/java/com/huimv/environ/HuimvEnvironApplication.java

@@ -20,7 +20,7 @@ import org.springframework.web.client.RestTemplate;
  **/
 @SpringBootApplication
 @MapperScan("com.huimv.environ.*.mapper")
-//@Import(InterceptorConfig.class)
+@Import(InterceptorConfig.class)
 @EnableScheduling
 public class HuimvEnvironApplication {
     public static void main(String[] args) {

huimv-farm-environ/src/main/resources/application-prod.yml

@@ -5,10 +5,19 @@ spring:
     name: huimv-farm-environ
   #------DataSource-----
   datasource:
-    url: jdbc:mysql://47.96.4.54:10052/huimv-farm-center?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    username: root
-    password: hm123456789
-    driver-class-name: com.mysql.cj.jdbc.Driver
+    druid:
+      url: jdbc:mysql://47.96.4.54:10052/huimv-farm-center?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+      username: root
+      password: TqfMrSSucyTyWXoEa2eIp6VfLmu4IGnVPU3LWoe5DEBX+N7NQrH/BW1k/J9e6q9/Q/40xxWmy3gjtAK9dCR21A==
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      filters: config
+      connect-properties:
+        config.decrypt: true
+        config.decrypt.key: ${spring.datasource.druid.publickey}
+    type: com.alibaba.druid.pool.DruidDataSource
+  autoconfigure:
+    exclude:
+      - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
   jpa:
     hibernate:
       ddl-auto: none

huimv-farm-produce/pom.xml

@@ -15,7 +15,7 @@
         <dependency>
             <groupId>com.huimv</groupId>
             <artifactId>huimv-common</artifactId>
-            <version>0.0.13-SNAPSHOT</version>
+            <version>0.0.6-SNAPSHOT</version>
         </dependency>
 <!--        <dependency>-->
 <!--            <groupId>org.springframework.boot</groupId>-->

huimv-farm-produce/src/main/java/com/huimv/produce/HuimvProduceApplication.java

@@ -18,7 +18,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  **/
 @SpringBootApplication
 @MapperScan("com.huimv.produce.*.mapper")
-//@Import(InterceptorConfig.class)
+@Import(InterceptorConfig.class)
 @EnableScheduling
 public class HuimvProduceApplication {
     public static void main(String[] args) {

huimv-farm-produce/src/main/resources/application-prod.yml

@@ -5,10 +5,19 @@ spring:
     name: huimv-farm-produce
   #------DataSource-----
   datasource:
-    url: jdbc:mysql://47.96.4.54:10052/huimv-farm-center?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    username: root
-    password: hm123456789
-    driver-class-name: com.mysql.cj.jdbc.Driver
+    druid:
+      url: jdbc:mysql://47.96.4.54:10052/huimv-farm-center?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+      username: root
+      password: TqfMrSSucyTyWXoEa2eIp6VfLmu4IGnVPU3LWoe5DEBX+N7NQrH/BW1k/J9e6q9/Q/40xxWmy3gjtAK9dCR21A==
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      filters: config
+      connect-properties:
+        config.decrypt: true
+        config.decrypt.key: ${spring.datasource.druid.publickey}
+    type: com.alibaba.druid.pool.DruidDataSource
+  autoconfigure:
+    exclude:
+      - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
   jpa:
     hibernate:
       ddl-auto: update

huimv-farm-produce/src/main/resources/application.properties

@@ -1,8 +1,8 @@
 #spring.profiles.active=dev
 #spring.profiles.active=demo
-#spring.profiles.active=prod
+spring.profiles.active=prod
 #spring.profiles.active=prod2
-spring.profiles.active=lishui
+#spring.profiles.active=lishui
 
 weight.http=http://39.171.45.196:9200
 weight.path=/egg/getWeightDetails

huimv-farm-video/pom.xml

@@ -28,7 +28,6 @@
 			<scope>compile</scope>
 		</dependency>
 
-
 		<dependency>
 			<groupId>com.dahuatech.icc</groupId>
 			<artifactId>java-sdk-oauth</artifactId>
@@ -80,19 +79,19 @@
 		</dependency>
 	</dependencies>
 
-	<build>
-		<!-- 青山项目打包名称 -->
-		<finalName>huimv-env-video-0.0.1-SNAPSHOT</finalName>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<includeSystemScope>true</includeSystemScope>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+<!--	<build>-->
+<!--		&lt;!&ndash; 青山项目打包名称 &ndash;&gt;-->
+<!--		<finalName>huimv-env-video-0.0.1-SNAPSHOT</finalName>-->
+<!--		<plugins>-->
+<!--			<plugin>-->
+<!--				<groupId>org.springframework.boot</groupId>-->
+<!--				<artifactId>spring-boot-maven-plugin</artifactId>-->
+<!--				<configuration>-->
+<!--					<includeSystemScope>true</includeSystemScope>-->
+<!--				</configuration>-->
+<!--			</plugin>-->
+<!--		</plugins>-->
+<!--	</build>-->
 <!--	<build>-->
 <!--		<plugins>-->
 <!--			<plugin>-->

huimv-farm-video/src/main/java/com/huimv/video/HuimvVideoApplication.java

@@ -19,7 +19,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableScheduling
 @SpringBootApplication
 @MapperScan("com.huimv.video.*.mapper")
-//@Import(InterceptorConfig.class)
+@Import(InterceptorConfig.class)
 public class HuimvVideoApplication {
     public static void main(String[] args) {
         SpringApplication.run(HuimvVideoApplication.class, args);

huimv-farm-video/src/main/java/com/huimv/video/dhicc/controller/BaseController/SysTelecomController.java

@@ -60,5 +60,4 @@ public class SysTelecomController {
         return telecomService.listByRoom(map);
     }
 
-
 }

huimv-farm-video/src/main/java/com/huimv/video/dhicc/controller/ScreenController/ScreenAlarmCountByDay.java

@@ -1,5 +1,6 @@
 package com.huimv.video.dhicc.controller.ScreenController;
 
+//import com.alibaba.druid.filter.config.ConfigTools;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dahuatech.icc.exception.ClientException;
 import com.huimv.video.dhicc.entity.SysTelecomEvent;
@@ -75,7 +76,12 @@ public class ScreenAlarmCountByDay {
         //翻转
         Collections.reverse(result);
         return R.ok("请求成功").put("data", result);
-
-
     }
+//    public static void main(String[] args) throws Exception {
+//        // 需要加密的明文密码
+//        String password = "hm123456789";
+//        // 调用 druid 生成私钥、公钥、密文
+//        ConfigTools.main(new String[]{password});
+//    }
+
 }

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/ScreenTestController/ScreenSiZhuTestController.java

@@ -1,13 +1,8 @@
 package com.huimv.video.dhicc.test.ScreenTestController;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.dahuatech.hutool.http.Method;
 import com.dahuatech.icc.exception.ClientException;
-import com.dahuatech.icc.oauth.http.DefaultClient;
-import com.dahuatech.icc.oauth.http.IClient;
-import com.dahuatech.icc.oauth.model.v202010.GeneralRequest;
 import com.dahuatech.icc.oauth.model.v202010.GeneralResponse;
 import com.huimv.video.dhicc.icc.CommonConstant;
 import com.huimv.video.dhicc.result.R;
@@ -16,11 +11,8 @@ import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
 import com.huimv.video.dhicc.test.request.XunZhengRequest.Cn.XunZhengRequestCn;
 import com.huimv.video.dhicc.test.request.XunZhengRequest.Hn.XunZhengRequestHn;
-import com.huimv.video.dhicc.test.request.XunZhengRequest.Sg.XunZhengCountRequestSg;
 import com.huimv.video.dhicc.test.request.XunZhengRequest.Sg.XunZhengRequestSg;
-import com.huimv.video.dhicc.test.token.Token;
 import com.huimv.video.dhicc.util.GetResponse;
-import jdk.nashorn.internal.runtime.regexp.JoniRegExp;
 import net.sf.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

huimv-farm-video/src/main/resources/application-prod.yml

@@ -5,10 +5,19 @@ spring:
     name: pigfarm-local-device
   #------DataSource-----
   datasource:
-    url: jdbc:mysql://47.96.4.54:10052/huimv-farm-center?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    username: root
-    password: hm123456789
-    driver-class-name: com.mysql.cj.jdbc.Driver
+    druid:
+      url: jdbc:mysql://47.96.4.54:10052/huimv-farm-center?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+      username: root
+      password: TqfMrSSucyTyWXoEa2eIp6VfLmu4IGnVPU3LWoe5DEBX+N7NQrH/BW1k/J9e6q9/Q/40xxWmy3gjtAK9dCR21A==
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      filters: config
+      connect-properties:
+        config.decrypt: true
+        config.decrypt.key: ${spring.datasource.druid.publickey}
+    type: com.alibaba.druid.pool.DruidDataSource
+  autoconfigure:
+    exclude:
+      - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
   jpa:
     hibernate:
       ddl-auto: update

huimv-farm-video/src/test/java/com/huimv/video/dhicc/service/ClientAllEventServiceImplTest.java

@@ -1,20 +1,19 @@
+/*
 package com.huimv.video.dhicc.service;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.huimv.video.dhicc.entity.IccChannel;
-import com.huimv.video.dhicc.entity.Vo.IccChannelVo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
-import com.huimv.video.dhicc.test.request.ChannelRequest.ChannelRequestHn;
 
 import com.alibaba.fastjson.JSONArray;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
+*/
 /**
  * @Project : huimv.shiwan
  * @Package : com.huimv.biosafety.uface.controller
@@ -22,7 +21,8 @@ import java.util.List;
  * @Version : 1.0
  * @Author : ZhuoNing
  * @Create : 2020-12-25
- **/
+ **//*
+
 @SpringBootTest
 public class ClientAllEventServiceImplTest {
     @Autowired
@@ -63,3 +63,4 @@ public class ClientAllEventServiceImplTest {
         }
     }
 }
+*/

pom.xml

@@ -38,6 +38,11 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>1.2.8</version>
+        </dependency>
 <!--        <dependency>-->
 <!--            <groupId>com.huimv</groupId>-->
 <!--            <artifactId>huimv-common</artifactId>-->
@@ -58,9 +63,9 @@
             <version>4.5.2</version>
         </dependency>
         <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>5.7.11</version>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>4.1.2</version>
         </dependency>
 
         <dependency>