diff --git a/04.系统编码/Backend/src/main/resources/application.yml b/04.系统编码/Backend/src/main/resources/application.yml index f3213b7..197a887 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 diff --git a/04.系统编码/Frontend/src/model/constant.ts b/04.系统编码/Frontend/src/model/constant.ts index 90184dd..3f9b68c 100644 --- a/04.系统编码/Frontend/src/model/constant.ts +++ b/04.系统编码/Frontend/src/model/constant.ts @@ -2,6 +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://10.124.102.10:9998'; + 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 115f322..6662a4e 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"; }