From 2c8d80750d11b92c908615e4bddb6da4a588f246 Mon Sep 17 00:00:00 2001 From: xiaowuler Date: Fri, 1 Apr 2022 10:09:20 +0800 Subject: [PATCH] modify some codes --- .../Backend/src/main/resources/application.yml | 18 +++++++++--------- .../Frontend/src/components/RamanLidar.vue | 2 +- 04.系统编码/Frontend/src/model/constant.ts | 3 ++- 04.系统编码/Frontend/src/uilts/Config.ts | 8 ++++---- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/04.系统编码/Backend/src/main/resources/application.yml b/04.系统编码/Backend/src/main/resources/application.yml index 73b78c0..d55ca89 100644 --- a/04.系统编码/Backend/src/main/resources/application.yml +++ b/04.系统编码/Backend/src/main/resources/application.yml @@ -6,12 +6,12 @@ spring: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8 datasource: - url: jdbc:mysql://112.124.40.88:33306/user_information?useUnicode=true&characteEncoding=utf-8 - username: root - password: 3cqscbr@only1 -# url: jdbc:mysql://10.124.102.10:3306/user_information?useUnicode=true&characteEncoding=utf-8 +# url: jdbc:mysql://112.124.40.88:33306/user_information?useUnicode=true&characteEncoding=utf-8 # username: root -# password: Njsqxj_sthj@2021 +# password: 3cqscbr@only1 + url: jdbc:mysql://10.124.102.10:3306/user_information?useUnicode=true&characteEncoding=utf-8 + username: root + password: Njsqxj_sthj@2021 # url: jdbc:mysql://192.168.6.6:3306/njsthj?useUnicode=true&characteEncoding=utf-8 # username: njsthj # password: Njsqxj_sthj@2021 @@ -20,9 +20,9 @@ custom: image: url: ${custom.parent-url}:${server.port}/product gifPath: ${custom.image.path}/gif - path: D:/Deployments/LamanRadar/product - parent-url: http://localhost -# path: /home/project/NJEnvironmentPlatform/html/product -# parent-url: http://10.124.102.10 +# path: D:/Deployments/LamanRadar/product +# parent-url: http://localhost + path: /home/project/NJEnvironmentPlatform/html/product + parent-url: http://10.124.102.10 # path: /home/develop/product # parent-url: http://rdp.nagr.com.cn diff --git a/04.系统编码/Frontend/src/components/RamanLidar.vue b/04.系统编码/Frontend/src/components/RamanLidar.vue index b98be69..396fa84 100644 --- a/04.系统编码/Frontend/src/components/RamanLidar.vue +++ b/04.系统编码/Frontend/src/components/RamanLidar.vue @@ -231,7 +231,7 @@ export default { currentRegion: 'jiangning', currentElement: 'PBLH', currentType: '边界层高度', - date: moment('2022-01-02').format('YYYY-MM-DD'), + date: moment().add(-1, 'd').format('YYYY-MM-DD'), times: [], currentTime: null, downloadImgUrl: '/images/default-picture.png', diff --git a/04.系统编码/Frontend/src/model/constant.ts b/04.系统编码/Frontend/src/model/constant.ts index 2c78f3f..a41d6a1 100644 --- a/04.系统编码/Frontend/src/model/constant.ts +++ b/04.系统编码/Frontend/src/model/constant.ts @@ -2,5 +2,6 @@ export class Constant{ public static readonly baseUrl: string = 'http://rdp.nagr.com.cn:18080'; } export class ConstantRamanLidar{ - public static readonly baseUrl: string = 'http://112.124.40.88:5511'; + // public static readonly baseUrl: string = 'http://112.124.40.88:5511'; + public static readonly baseUrl: string = 'http://10.124.102.10:9998'; } \ No newline at end of file diff --git a/04.系统编码/Frontend/src/uilts/Config.ts b/04.系统编码/Frontend/src/uilts/Config.ts index 6662a4e..115f322 100644 --- a/04.系统编码/Frontend/src/uilts/Config.ts +++ b/04.系统编码/Frontend/src/uilts/Config.ts @@ -2,10 +2,10 @@ import { Moment } from "moment"; import { format } from "./String"; export class Config { - // public static url: string = ""; - // public static parentUrl: string = "http://10.124.102.10:8002/product/picture"; - public static url: string = "http://localhost:8002"; - public static parentUrl: string = "http://112.124.40.88:8999/product/picture"; + public static url: string = ""; + public static parentUrl: string = "http://10.124.102.10:8002/product/picture"; + // public static url: string = "http://localhost:8002"; + // public static parentUrl: string = "http://112.124.40.88:8999/product/picture"; // public static parentUrl: string = "http://rdp.nagr.com.cn:8082/product/picture"; }