diff --git a/.gitignore b/.gitignore index ddf0af7..35d82db 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ ktor/.kotlin/ sentinel/build/ iot/Sentinel/build/ *.engine +vue2/ce_vue_latest.tar diff --git a/f10/build.gradle.kts b/f10/build.gradle.kts index ae374ab..33ac1f5 100644 --- a/f10/build.gradle.kts +++ b/f10/build.gradle.kts @@ -1,3 +1,5 @@ +import sun.jvmstat.monitor.MonitoredVmUtil.mainClass + val kotlin_version: String by project val logback_version: String by project @@ -8,7 +10,7 @@ plugins { } group = "com.bbitcn" -version = "0.0.5" +version = "0.0.6" application { mainClass = "io.ktor.server.netty.EngineMain" diff --git a/f10/src/main/resources/application.yaml b/f10/src/main/resources/application.yaml index 16ca0de..163ed8c 100644 --- a/f10/src/main/resources/application.yaml +++ b/f10/src/main/resources/application.yaml @@ -7,5 +7,6 @@ ktor: traceability: # 访问主服务的地址 - core-base-url: "http://127.0.0.1:8089" # 开发 -# core-base-url: "https://ai.ronsunny.cn:8090/api" # 生产 +# core-base-url: "http://127.0.0.1:8089" # 开发 + core-base-url: "https://171.212.101.200:8090/api" # 生产 用IP +# core-base-url: "https://ai.ronsunny.cn:8090/api" # 生产 用域名 diff --git a/iot/EdgeAgent/.gitignore b/iot/EdgeAgent/.gitignore new file mode 100644 index 0000000..90b7cf3 --- /dev/null +++ b/iot/EdgeAgent/.gitignore @@ -0,0 +1,4 @@ +.idea/ +build/ +logs/ +*.exe diff --git a/iot/EdgeAgent/.idea/vcs.xml b/iot/EdgeAgent/.idea/vcs.xml deleted file mode 100644 index 64713b8..0000000 --- a/iot/EdgeAgent/.idea/vcs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/iot/Sentinel/.gitignore b/iot/Sentinel/.gitignore new file mode 100644 index 0000000..9f11b75 --- /dev/null +++ b/iot/Sentinel/.gitignore @@ -0,0 +1 @@ +.idea/ diff --git a/vue2/apps/web-antd/.env.production b/vue2/apps/web-antd/.env.production index cc86dcb..9a0bd31 100644 --- a/vue2/apps/web-antd/.env.production +++ b/vue2/apps/web-antd/.env.production @@ -1,8 +1,10 @@ VITE_BASE=/ # 接口地址 -VITE_GLOB_API_URL=https://ai.ronsunny.cn:8090/api -VITE_GLOB_API_URL_PY=https://ai.ronsunny.cn:8090/ai +#VITE_GLOB_API_URL=https://ai.ronsunny.cn:8090/api +#VITE_GLOB_API_URL_PY=https://ai.ronsunny.cn:8090/ai +VITE_GLOB_API_URL=https://171.212.101.200:8090/api +VITE_GLOB_API_URL_PY=https://171.212.101.200:8090/ai # 是否开启压缩,可以设置为 none, brotli, gzip VITE_COMPRESS=none diff --git a/vue2/scripts/push_docker.ps1 b/vue2/scripts/push_docker.ps1 index 844db7b..a8df6aa 100644 --- a/vue2/scripts/push_docker.ps1 +++ b/vue2/scripts/push_docker.ps1 @@ -1,7 +1,7 @@ # push_docker.ps1 # Set version -$env:VERSION = "1.5.5" +$env:VERSION = "1.5.5.1" # Docker registry/repository $registry = "ai.ronsunny.cn:13011/bbit_ai/ce_vue"