Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
device-new-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
device-new-platform
Commits
9c9796f0
Commit
9c9796f0
authored
Nov 08, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更改上传文件大小限制
parent
2e4b8070
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8745 additions
and
8965 deletions
+8745
-8965
device-manager-ui/admin/package.json
device-manager-ui/admin/package.json
+1
-0
device-manager-ui/admin/src/views/login/login.vue
device-manager-ui/admin/src/views/login/login.vue
+3
-0
device-manager-ui/admin/yarn.lock
device-manager-ui/admin/yarn.lock
+8734
-8962
device-manager/src/main/bin/deploy.sh
device-manager/src/main/bin/deploy.sh
+3
-3
device-manager/src/main/java/com/mortals/xhx/busiz/rsp/ServerInfo.java
...r/src/main/java/com/mortals/xhx/busiz/rsp/ServerInfo.java
+4
-0
No files found.
device-manager-ui/admin/package.json
View file @
9c9796f0
...
...
@@ -4,6 +4,7 @@
"private"
:
true
,
"scripts"
:
{
"dev"
:
"vue-cli-service serve"
,
"dev1"
:
"vue-cli-service serve --mode test"
,
"build"
:
"vue-cli-service build"
,
"test"
:
"vue-cli-service build --mode test"
,
"build:prod"
:
"vue-cli-service build --model prod"
...
...
device-manager-ui/admin/src/views/login/login.vue
View file @
9c9796f0
...
...
@@ -30,6 +30,9 @@ import { createSocket } from "@/assets/utils/websocket";
export
default
{
name
:
"
login
"
,
created
()
{
console
.
log
(
"
url:
"
+
process
.
env
.
VUE_APP_PORTAL_URL
)
// let obj = {};
// obj.lng = 104.21;
// obj.lat = 30.56;
...
...
device-manager-ui/admin/yarn.lock
View file @
9c9796f0
This diff is collapsed.
Click to expand it.
device-manager/src/main/bin/deploy.sh
View file @
9c9796f0
...
...
@@ -138,12 +138,12 @@ start_service_and_nginx() {
writelog
"
${
PROJECT_NAME
}
服务启动..."
systemctl
enable
${
PROJECT_NAME
}
systemctl daemon-reload
systemctl stop
${
PROJECT_NAME
}
systemctl start
${
PROJECT_NAME
}
systemctl stop
${
PROJECT_NAME
}
&&
systemctl start
${
PROJECT_NAME
}
project_status
=
$(
systemctl status
"
${
PROJECT_NAME
}
"
|grep Active |awk
'{print $2}'
)
nginx
-t
nginx
-s
reload
jcpid
=
$(
ps
-ef
|
grep
-v
"grep"
|
grep
"
${
PROJECT_NAME
}
"
|
awk
'{print $2}'
)
writelog
"
${
PROJECT_NAME
}
服务启动,PID is
${
jcpid
}
"
writelog
"
${
PROJECT_NAME
}
服务启动,PID is
${
jcpid
}
,status:
${
project_status
}
"
}
#部署后台服务
project_deploy
()
{
...
...
device-manager/src/main/java/com/mortals/xhx/busiz/rsp/ServerInfo.java
View file @
9c9796f0
...
...
@@ -33,6 +33,10 @@ public class ServerInfo implements Serializable {
* 前端对接平台接口地址
*/
private
String
serverUrl
;
/**
* 事件服务器地址
*/
private
String
eventUrl
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment