Browse Source

数字工具类

523096025 2 years ago
parent
commit
8642e45906

+ 1 - 1
huimv-admin/src/main/java/com/huimv/admin/controller/AuthorizeController.java

@@ -1,5 +1,6 @@
 package com.huimv.admin.controller;
 
+import com.huimv.admin.common.token.TokenSign;
 import com.huimv.admin.entity.Menu;
 import com.huimv.admin.service.IAuthorizeService;
 import com.huimv.admin.service.IMenuService;
@@ -73,7 +74,6 @@ public class AuthorizeController {
          */
         String userId = map.get("userId");
         String farmId = map.get("farmId");
-
         List<Menu> myMenu = iAuthorizeService.getMyMenuAll(userId,farmId);
 
         List<Map> list = iMenuService.optimizeListUtil(0,myMenu);

+ 0 - 4
huimv-admin/src/main/java/com/huimv/admin/controller/CameraBrandController.java

@@ -29,12 +29,8 @@ import java.util.Map;
 @RestController
 @RequestMapping("/cameraBrand")
 public class CameraBrandController {
-
-
-
     @Autowired
     private ICameraBrandService cameraBrandService;
-
     @Autowired
     private ICameraBaseService cameraService;
 

+ 2 - 2
huimv-admin/src/main/java/com/huimv/admin/timer/ShenChanTimer.java

@@ -43,14 +43,14 @@ public class ShenChanTimer {
     //生产数据
     @Autowired
     private RestTemplate restTemplate;
-    //环控数据
+    //
     String username = "test";
     String password = "123456";
     String passwordMD5 = "e10adc3949ba59abbe56e057f20f883e";
     private static final String BASE_URL ="test.htpig.cn";
 
 
-    @Scheduled(cron = "0 0/11 * * * ? ")
+//    @Scheduled(cron = "0 0/11 * * * ? ")
     private void getShenChan() throws Exception {
         //自己生成
 //        if (false){

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

@@ -0,0 +1,40 @@
+server:
+  port: 8011
+
+spring:
+  application:
+    name: huimv-admin
+
+  datasource:
+    url: jdbc:mysql://115.238.57.190:3306/huimv-huatong?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: hm123456
+    driver-class-name: com.mysql.cj.jdbc.Driver
+
+  #配置rabbitMq 服务器
+#  rabbitmq:
+#    host: 10.0.0.4
+#    port: 5672
+#    username: huimv
+#    password: hm123456
+#    #虚拟host 可以不设置,使用server默认host
+#    virtual-host: /
+
+  #redis
+  redis:
+    host: 122.112.224.199
+    port: 6379
+    password: hm123456
+#  Nacos 配置
+#  cloud:
+#    nacos:
+#      discovery:
+#        server-addr: 192.168.1.68:8848 #配置nacos地址
+
+
+
+
+mybatis-plus:
+  configuration:
+#    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

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

@@ -1,4 +1,5 @@
-spring.profiles.active=dev
+#spring.profiles.active=dev
+spring.profiles.active=prod
 
 #¿ªÆô½¡¿µ¼à¿Ø
 management.endpoints.web.exposure.include=*