changes

liuhaonan

2022-09-13 c3745f4fd52756f573287fa3d7dc6b536166799e

changes

 ximon-admin/src/main/java/com/sandu/ximon/admin/config/VnnoxConstant.java

@@ -1,8 +1,12 @@
package com.sandu.ximon.admin.config;

import com.google.gson.Gson;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;

public class VnnoxConstant {
@Component
public class VnnoxConstant implements InitializingBean {

    //  VNNOX MINIO save bucket  suffix(companyId)
    public static final String MINIO_PREFIX = "vnnox.";
@@ -18,13 +22,38 @@
    public static final Long SCREEN_SHOT_TIMEOUT = 30 * 60L;
    public static final Long STATUS_TIME = 3 * 60 * 60L;

    public static final String NOTIFY_URL = "http://112.74.63.130:20017/serv/vnnox/progress";
    public static final String SCREEN_SHOT_NOTIFY_URL = "http://112.74.63.130:20017/serv/vnnox/screenshot"; // TODO   è¦æ”¹
    public static final String STATUS_NOTIFY_URL = "http://112.74.63.130:20017/serv/vnnox/asyncStatus"; // TODO   è¦æ”¹
    @Value("${nova-conf.notify-url}")
    private String notifyUrl;
    @Value("${nova-conf.screen-shot-notify-url}")
    private String screenShotNotifyUrl;
    @Value("${nova-conf.status-notify-url}")
    private String statusNotifyUrl;


    public static String NOTIFY_URL;
    public static String SCREEN_SHOT_NOTIFY_URL;
    public static String STATUS_NOTIFY_URL;
    public static String STATUS_NOTIFY_URL1;

    public static final String username = "zhxm";
    public static final String password = "xm2512209.";

    public static final Gson GSON = new Gson();


    @Override
    public void afterPropertiesSet() throws Exception {
        NOTIFY_URL = notifyUrl;

        SCREEN_SHOT_NOTIFY_URL = screenShotNotifyUrl;

        STATUS_NOTIFY_URL = statusNotifyUrl;
        System.out.println(STATUS_NOTIFY_URL);


    }

    public static void main(String[] args) {
        System.out.println(VnnoxConstant.SCREEN_SHOT_NOTIFY_URL);
    }
}

 ximon-admin/src/main/resources/application-dev.yml

@@ -48,3 +48,23 @@
  secretKey: zhxm2512209
  secure: false

nova-conf:   #诺瓦回调
  notify-url: http://112.74.63.130:20017/serv/vnnox/progress
  screen-shot-notify-url: http://112.74.63.130:20017/serv/vnnox/screenshot
  status-notify-url: http://112.74.63.130:20017/serv/vnnox/asyncStatus



# led屏幕服务器地址（更改需要同时更改）
realtime-server:
  #  command: http://101.132.131.91:8081/payload/
  #  url: http://101.132.131.91:8081/
  command: http://112.74.63.130:20018/command/
  url: http://112.74.63.130:20018/


server-conf:
  ip: 47.106.172.9 # 47.106.172.9/101.132.131.91




 ximon-admin/src/main/resources/application-local.yml

@@ -39,7 +39,7 @@
    enable: true

listenter:
  isOpen: true
  isOpen: false

minio:
  endpoint: 47.106.172.9
@@ -48,3 +48,21 @@
  secretKey: zhxm2512209
  secure: false


# led屏幕服务器地址（更改需要同时更改）
realtime-server:
  #  command: http://101.132.131.91:8081/payload/
  #  url: http://101.132.131.91:8081/
  command: http://112.74.63.130:20018/command/
  url: http://112.74.63.130:20018/


server-conf:
  ip: 47.106.172.9 # 47.106.172.9/101.132.131.91



nova-conf:   #诺瓦回调
  notify-url: http://112.74.63.130:20017/serv/vnnox/progress
  screen-shot-notify-url: http://112.74.63.130:20017/serv/vnnox/screenshot
  status-notify-url: http://112.74.63.130:20017/serv/vnnox/asyncStatus

 ximon-admin/src/main/resources/application-prod.yml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,63 @@
# ç”Ÿäº§é…ç½®æ–‡ä»¶ ä¸»æœº  39.103.154.108
server:
    port: 20018
spring:
    datasource:
        password: Zhxm2512209
        url: jdbc:mysql://127.0.0.1:3306/ximon_light?useUnicode=true&autoReconnect=true&useSSL=false&characterEncoding=utf8&serverTimezone=Asia/Shanghai
        username: ximon
        type: com.alibaba.druid.pool.DruidDataSource
        druid:
            driver-class-name: com.mysql.cj.jdbc.Driver
    servlet:
        multipart:
            location: /www/wwwroot/xm/upload_tmp
    redis:
        host: 127.0.0.1
        password: zhxm2512209
        port: 6379
        database: 0
minio:
    accessKey: minioadmin
    endpoint: 47.106.172.9
    port: 9000
    secretKey: zhxm2512209
    secure: false
realtime-server:
    command: http://39.103.154.108:20019/command/
    url: http://39.103.154.108:20019/


sandu:
    jwt:
        header: Authorization
        # ä»¤ç‰Œå‰ç¼€
        token-start-with: Bearer
        # å¿…须使用最少88位的Base64对该令牌进行编码
        base64-secret: U1GZNSKOH43V19GNIVE8HUYM9H86K657V1D66EAVSL9Q023J4JNWE44BNHCS6V9E66BPKF0KXUI5R1ZOYK2OWZZYALPD07JHOYUROL930UGJQUJDNAEYNTMUS27BHKTJEF9011DGGQ4QT9BN6CM2P9SY2VV2MZKJPCOW9YIGN0VJ
        # ä»¤ç‰Œè¿‡æœŸæ—¶é—´ æ­¤å¤„单位/毫秒 ï¼Œå¯åœ¨æ­¤ç½‘站生成 https://www.convertworld.com/zh-hans/time/milliseconds.html 1个月
        token-validity-in-seconds: 2629800000
        # åœ¨çº¿ç”¨æˆ·key
        online-key: online-token
        # æ˜¯å¦å¯åŠ¨redis缓存用户信息
        cache-online: false
    common:
        urlPrefix: http://112.74.63.130/file/
    upload:
        upload-root-path: /www/wwwroot/xm/file/
    quartz:
        enable: true

listenter:  #监听开关
    isOpen: true

server-conf:
    ip: 39.103.154.108 # 47.106.172.9/101.132.131.91

nova-config:
    ip: #需在 VnnoxConstant ç±»ä¸­æ›´æ”¹

nova-conf:   #诺瓦回调
    notify-url: http://39.103.154.108:20018/serv/vnnox/progress
    screen-shot-notify-url: http://39.103.154.108:20018/serv/vnnox/screenshot
    status-notify-url: http://39.103.154.108:20018/serv/vnnox/asyncStatus