Quellcode durchsuchen

https 服务地址:122.112.219.87
前端地址:139.9.167.178/opt/page/guowei/
img.ifarmcloud.com/guowei/
接口访问地址: https://img.ifarmcloud.com/guoweiApi/

523096025 vor 1 Jahr
Ursprung
Commit
5ac23f8f63
19 geänderte Dateien mit 81 neuen und 26 gelöschten Zeilen
  1. 34 0
      huimv-admin/src/main/java/com/huimv/guowei/admin/AdminApplication.java
  2. 0 8
      huimv-admin/src/main/java/com/huimv/guowei/admin/common/utils/ConstUtil.java
  3. 1 8
      huimv-admin/src/main/java/com/huimv/guowei/admin/common/utils/ResultUtil.java
  4. 2 1
      huimv-admin/src/main/java/com/huimv/guowei/admin/config/ApiPrefixAutoConfiguration.java
  5. 7 1
      huimv-admin/src/main/java/com/huimv/guowei/admin/config/InterceptorConfig.java
  6. 1 6
      huimv-admin/src/main/java/com/huimv/guowei/admin/entity/vo/TreeBaseBuilding.java
  7. BIN
      huimv-admin/src/main/resources/10365885_guowei.ifarmcloud.com.jks
  8. 4 0
      huimv-admin/src/main/resources/application-dev.yml
  9. 30 0
      huimv-admin/src/main/resources/application-prod.yml
  10. 2 2
      huimv-admin/src/main/resources/application.properties
  11. 0 0
      huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnergyElectricityMapper.xml
  12. 0 0
      huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnergyWarningInfoMapper.xml
  13. 0 0
      huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnergyWarningThresholdMapper.xml
  14. 0 0
      huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnergyWaterMapper.xml
  15. 0 0
      huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvDataMapper.xml
  16. 0 0
      huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvDeviceChipMapper.xml
  17. 0 0
      huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvDeviceEquipmentMapper.xml
  18. 0 0
      huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvWarningInfoMapper.xml
  19. 0 0
      huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvWarningThresholdMapper.xml

+ 34 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/AdminApplication.java

@@ -1,8 +1,14 @@
 package com.huimv.guowei.admin;
 
+import org.apache.catalina.Context;
+import org.apache.catalina.connector.Connector;
+import org.apache.tomcat.util.descriptor.web.SecurityCollection;
+import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
+import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
@@ -14,4 +20,32 @@ public class AdminApplication {
         SpringApplication.run(AdminApplication.class, args);
     }
 
+    @Bean
+    public TomcatServletWebServerFactory servletContainer() {
+        TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory() {
+            @Override
+            protected void postProcessContext(Context context) {
+                SecurityConstraint constraint = new SecurityConstraint();
+                constraint.setUserConstraint("CONFIDENTIAL");
+                SecurityCollection collection = new SecurityCollection();
+                collection.addPattern("/*");
+                constraint.addCollection(collection);
+                context.addConstraint(constraint);
+            }
+        };
+        tomcat.addAdditionalTomcatConnectors(httpConnector());
+        return tomcat;
+    }
+
+    @Bean
+    public Connector httpConnector() {
+        Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
+        connector.setScheme("http");
+        //Connector监听的http的默认端口号
+        connector.setPort(10002);
+        connector.setSecure(false);
+        //监听到http的端口号后转向到的https的端口号,也就是项目配置的port
+        connector.setRedirectPort(8030);
+        return connector;
+    }
 }

+ 0 - 8
huimv-admin/src/main/java/com/huimv/guowei/admin/common/utils/ConstUtil.java

@@ -1,13 +1,5 @@
 package com.huimv.guowei.admin.common.utils;
 
-/**
- * @Project : huimv-breed
- * @Package : IntelliJ IDEA
- * @Description : TODO
- * @Version : 1.0
- * @Author : ZhuoNing
- * @Create : 2022/9/27
- **/
 public class ConstUtil {
    public static final String SECRET_KEY = "huimvkeji";
    public final static Integer ERR_NOFOUND_CODE = 10004;

+ 1 - 8
huimv-admin/src/main/java/com/huimv/guowei/admin/common/utils/ResultUtil.java

@@ -6,14 +6,7 @@ import org.springframework.stereotype.Component;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @Project : huimv-breed
- * @Package : IntelliJ IDEA
- * @Description : TODO
- * @Version : 1.0
- * @Author : ZhuoNing
- * @Create : 2022/9/27
- **/
+
 @Component
 public class ResultUtil {
 

+ 2 - 1
huimv-admin/src/main/java/com/huimv/guowei/admin/config/ApiPrefixAutoConfiguration.java

@@ -1,3 +1,4 @@
+/*
 package com.huimv.guowei.admin.config;
 
 import org.springframework.context.annotation.Configuration;
@@ -13,4 +14,4 @@ public class ApiPrefixAutoConfiguration implements WebMvcConfigurer {
         configurer.addPathPrefix("/guoweiApi",  c -> c.isAnnotationPresent(RestController.class));
     }
 
-}
+}*/

+ 7 - 1
huimv-admin/src/main/java/com/huimv/guowei/admin/config/InterceptorConfig.java

@@ -18,10 +18,16 @@ public class InterceptorConfig implements WebMvcConfigurer {
         return new JWTInterceptor();
     }
 
-    @Override
+  /*  @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(jwtInterceptor()).
                 excludePathPatterns("/guoweiApi/admin/my/*")
                 .excludePathPatterns("/guoweiApi/receive/feed","/guoweiApi/base-duck-info/printDuck","/guoweiApi/env-regular-call-egg/printEgg");
+    }*/
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(jwtInterceptor()).
+                excludePathPatterns("/admin/my/*")
+                .excludePathPatterns("/receive/feed","/base-duck-info/printDuck","/env-regular-call-egg/printEgg");
     }
 }

+ 1 - 6
huimv-admin/src/main/java/com/huimv/guowei/admin/entity/vo/TreeBaseBuilding.java

@@ -7,12 +7,7 @@ import lombok.NoArgsConstructor;
 import java.io.Serializable;
 import java.util.List;
 
-/**
- * @Description: TODO
- * @Author: 静静
- * @CreateTime: 2022-07-25  09:33
- * @Version: 1.0
- */
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

BIN
huimv-admin/src/main/resources/10365885_guowei.ifarmcloud.com.jks


+ 4 - 0
huimv-admin/src/main/resources/application-dev.yml

@@ -1,5 +1,9 @@
 server:
   port: 10002
+  ssl:
+    key-store: classpath:guowei.ifarmcloud.com.jks
+    key-store-type: jks
+    key-store-password: i9f1kqy8
 spring:
   application:
     name: huimv-guowei-admin

+ 30 - 0
huimv-admin/src/main/resources/application-prod.yml

@@ -0,0 +1,30 @@
+server:
+  port: 8030
+  ssl:
+    key-store: classpath:10365885_guowei.ifarmcloud.com.jks
+    key-store-type: jks
+    key-store-password: i9f1kqy8
+spring:
+  application:
+    name: huimv-guowei-admin
+
+  datasource:
+    url: jdbc:mysql://139.9.172.209:3306/huimv-guowei-center?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: eartag
+    password: eartag@2022
+    driver-class-name: com.mysql.cj.jdbc.Driver
+
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  # mapper.xml文件所存放的位置
+#  mapper-locations: classpath*:com/huimv/guowei/admin/mapper/xml/*.xml  # 不加这一行出错:“org.apache.ibatis.binding.BindingException:  Invalid bound statement (not found)”
+#  mapper-locations: classpath:com/huimv/center/mappers/**/*Mapper.xml
+
+img:
+  url: https://img.ifarmcloud.com/images/
+  basePath: /home/huimv/img/
+  ip: 139.9.167.178
+  user:  huimv
+  password: "!hm123@1"
+  port: 22

+ 2 - 2
huimv-admin/src/main/resources/application.properties

@@ -1,7 +1,7 @@
 #开发
-spring.profiles.active=dev
+#spring.profiles.active=dev
 #线上
-#spring.profiles.active=prod
+spring.profiles.active=prod
 #牧场信息化平台
 #spring.profiles.active=info-dev
 

huimv-admin/src/main/resources/mapper/EnergyElectricityMapper.xml → huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnergyElectricityMapper.xml


huimv-admin/src/main/resources/mapper/EnergyWarningInfoMapper.xml → huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnergyWarningInfoMapper.xml


huimv-admin/src/main/resources/mapper/EnergyWarningThresholdMapper.xml → huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnergyWarningThresholdMapper.xml


huimv-admin/src/main/resources/mapper/EnergyWaterMapper.xml → huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnergyWaterMapper.xml


huimv-admin/src/main/resources/mapper/EnvDataMapper.xml → huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvDataMapper.xml


huimv-admin/src/main/resources/mapper/EnvDeviceChipMapper.xml → huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvDeviceChipMapper.xml


huimv-admin/src/main/resources/mapper/EnvDeviceEquipmentMapper.xml → huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvDeviceEquipmentMapper.xml


huimv-admin/src/main/resources/mapper/EnvWarningInfoMapper.xml → huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvWarningInfoMapper.xml


huimv-admin/src/main/resources/mapper/EnvWarningThresholdMapper.xml → huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvWarningThresholdMapper.xml