diff --git a/04.系统编码/Backend/src/main/resources/application.yml b/04.系统编码/Backend/src/main/resources/application.yml index 4ba9876..6739d95 100644 --- a/04.系统编码/Backend/src/main/resources/application.yml +++ b/04.系统编码/Backend/src/main/resources/application.yml @@ -3,12 +3,12 @@ server: # port: 8082 spring: 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 @@ -19,7 +19,7 @@ custom: gifPath: ${custom.image.path}/gif # path: D:/Deployments/LamanRadar/product # parent-url: http://112.124.40.88 -# path: /home/project/NJEnvironmentPlatform/html/product -# parent-url: http://10.124.102.10 - path: /home/develop/product - parent-url: http://rdp.nagr.com.cn + 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.系统编码/Backend/部署.md b/04.系统编码/Backend/部署.md index 01da178..9ba5837 100644 --- a/04.系统编码/Backend/部署.md +++ b/04.系统编码/Backend/部署.md @@ -7,3 +7,10 @@ nohup /usr/local/java/jdk-15/bin/java -jar UserInformation-0.0.1-SNAPSHOT.jar & nohup /home/develop/jdk-15/bin/java -jar UserInformation-0.0.1-SNAPSHOT.jar & ``` +关闭 + +``` +ps -ef | grep UserInformation-0.0.1-SNAPSHOT.jar +kill -9 id +``` + diff --git a/04.系统编码/Frontend/src/components/RamanLidar.vue b/04.系统编码/Frontend/src/components/RamanLidar.vue index 028d0b1..dbf1821 100644 --- a/04.系统编码/Frontend/src/components/RamanLidar.vue +++ b/04.系统编码/Frontend/src/components/RamanLidar.vue @@ -378,7 +378,7 @@ const onSaveClick = () => { let pictures = document.getElementById('pictures'); - options.urls = [options.signalPBLHImgUrl, options.signalPBLHImgUrl, options.imgUrl]; + options.urls = [options.signalPBLHImgUrl, options.imgUrl]; for (let i = 0; i < options.urls.length; i++) { let img = new Image(); diff --git a/04.系统编码/Frontend/src/uilts/Config.ts b/04.系统编码/Frontend/src/uilts/Config.ts index e85472d..a15db44 100644 --- a/04.系统编码/Frontend/src/uilts/Config.ts +++ b/04.系统编码/Frontend/src/uilts/Config.ts @@ -2,8 +2,8 @@ import { Moment } from "moment"; import { format } from "./String"; export class Config { - public static parentUrl: string = "http://112.124.40.88:8002/product/picture"; - // public static parentUrl: string = "http://10.124.102.10:8002/product/picture"; + // public static parentUrl: string = "http://112.124.40.88:8002/product/picture"; + public static parentUrl: string = "http://10.124.102.10:8002/product/picture"; // public static parentUrl: string = "http://rdp.nagr.com.cn:8082/product/picture"; } diff --git a/04.系统编码/Frontend/src/uilts/axios.ts b/04.系统编码/Frontend/src/uilts/axios.ts index f3c7cbe..9f9c9a1 100644 --- a/04.系统编码/Frontend/src/uilts/axios.ts +++ b/04.系统编码/Frontend/src/uilts/axios.ts @@ -6,8 +6,8 @@ import { ElLoading } from 'element-plus' let loading = null; const service = axios.create({ // baseURL:"http://112.124.40.88:8002", - // baseURL: '', - baseURL: 'http://localhost:8002', + baseURL: '', + // baseURL: 'http://localhost:8002', timeout: 500000 })