Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
zksyService
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
jianjin
zksyService
Commits
3920b9e0
Commit
3920b9e0
authored
Apr 28, 2021
by
wangjinjing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
建金项目配置
parent
f280f3f4
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
27 additions
and
27 deletions
+27
-27
im/hzjt.properties
im/hzjt.properties
+3
-3
pom.xml
pom.xml
+1
-1
src/main/java/im/zhaojun/system/controller/LoginController.java
...in/java/im/zhaojun/system/controller/LoginController.java
+1
-1
src/main/resources/application.properties
src/main/resources/application.properties
+12
-12
src/main/resources/static/js/jkgl/jkgl - 副本.js
src/main/resources/static/js/jkgl/jkgl - 副本.js
+3
-3
src/main/resources/static/js/jkgl/jkgl.js
src/main/resources/static/js/jkgl/jkgl.js
+3
-3
src/main/resources/static/js/manualscreen/sjcx.js
src/main/resources/static/js/manualscreen/sjcx.js
+1
-1
src/main/resources/static/js/sjcx/gcjl.js
src/main/resources/static/js/sjcx/gcjl.js
+1
-1
src/main/resources/static/js/sjcx/sjcx.js
src/main/resources/static/js/sjcx/sjcx.js
+1
-1
src/main/resources/static/js/sjfx/sjfx.js
src/main/resources/static/js/sjfx/sjfx.js
+1
-1
No files found.
im/hzjt.properties
View file @
3920b9e0
...
...
@@ -14,7 +14,7 @@ datasource.druid.validationQuery=SELECT 'x' FROM DUAL
# 格式为:ip地址:端口:用户名:密码
# 端口号一定要写,例如:192.168.2.100:21:reader:reader
ftp.host
=
33.65.2
50.179
:21:hzjt:1qaz2wsx
ftp.host
=
33.65.2
19.103
:21:hzjt:1qaz2wsx
alarm.subscribe.data.key
=
gs:traff:alarmlist
...
...
@@ -39,6 +39,6 @@ gs.traff.cloud.department.fileagent.url=http://33.50.1.22:8888/agent/fileAgent?f
alarmrecord.check.push.recordtype
=
1
eventsend.url
=
http://33.65.2
50.179
:8089/sendEvents
devicesend.url
=
http://33.65.2
50.179
:8089/traffdevicewriteresult/sendDevices
eventsend.url
=
http://33.65.2
19.103
:8089/sendEvents
devicesend.url
=
http://33.65.2
19.103
:8089/traffdevicewriteresult/sendDevices
devicesend.timeout
=
1000
\ No newline at end of file
pom.xml
View file @
3920b9e0
...
...
@@ -97,13 +97,13 @@
<artifactId>
mybatis-spring-boot-starter
</artifactId>
<version>
${mybatis.starter.version}
</version>
</dependency>
<!-- shiro 相关 -->
<dependency>
<groupId>
org.apache.shiro
</groupId>
<artifactId>
shiro-spring
</artifactId>
<version>
${shiro.verison}
</version>
</dependency>
<dependency>
<groupId>
com.github.theborakompanioni
</groupId>
<artifactId>
thymeleaf-extras-shiro
</artifactId>
...
...
src/main/java/im/zhaojun/system/controller/LoginController.java
View file @
3920b9e0
...
...
@@ -210,7 +210,7 @@ public class LoginController {
HttpHeaders
headers
=
new
HttpHeaders
();
headers
.
setContentType
(
MediaType
.
APPLICATION_JSON_UTF8
);
HttpEntity
<
String
>
requestEntity
=
new
HttpEntity
<>(
message
,
headers
);
return
restTemplate
.
postForObject
(
"http://33.65.2
50.179
:"
+
8089
+
"/alarmevent"
,
requestEntity
,
ResultObj
.
class
);
return
restTemplate
.
postForObject
(
"http://33.65.2
19.103
:"
+
8089
+
"/alarmevent"
,
requestEntity
,
ResultObj
.
class
);
}
...
...
src/main/resources/application.properties
View file @
3920b9e0
...
...
@@ -2,12 +2,12 @@ spring.profiles.active=dev
server.port
=
8082
#
spring.datasource.username=hzjt
#
spring.datasource.password=hzjt
#spring.datasource.url=jdbc:oracle:thin:@33.65.250.179
:1521:helowin
spring.datasource.username
=
test
spring.datasource.password
=
test
spring.datasource.url
=
jdbc:oracle:thin:@192.168.168.212:1523
:helowin
spring.datasource.username
=
hzjt
spring.datasource.password
=
hzjt
spring.datasource.url
=
jdbc:oracle:thin:@33.65.219.103
:1521:helowin
#
spring.datasource.username=test
#
spring.datasource.password=test
#spring.datasource.url=jdbc:oracle:thin:@192.168.168.212:3306
:helowin
spring.datasource.driver-class-name
=
oracle.jdbc.OracleDriver
# ��ʼ����С����С�����
...
...
@@ -29,8 +29,8 @@ spring.datasource.useGlobalDataSourceStat=true
spring.jackson.date-format
=
yyyy-MM-dd HH:mm:ss
spring.jackson.time-zone
=
GMT+8
#
spring.redis.host
=
localhost
#spring.redis.host=33.65.250.179
#
spring.redis.host=localhost
spring.redis.host
=
33.65.219.103
spring.redis.port
=
6379
spring.cache.type
=
redis
spring.cache.redis.time-to-live
=
600000
...
...
@@ -67,9 +67,9 @@ spring.devtools.restart.exclude=static/**,public/**
managername
=
admin
devicesend.url
=
http://33.65.2
50.179
:8089/traffdevicewriteresult/sendDevices
devicesend.url
=
http://33.65.2
19.103
:8089/traffdevicewriteresult/sendDevices
devicesend.timeout
=
1000
flvurl
=
http://33.65.2
50.179
:8089/getflv
flvurl
=
http://33.65.2
19.103
:8089/getflv
json.resisurl
=
http://33.50.1.21:57081/record/ecvs
qingzhi.devicewrite.url
=
http://33.50.1.213:38080/api/jtldpt/impld/deviceWrite
...
...
@@ -78,8 +78,8 @@ qingzhi.devicewrite.timeout=5000
qingzhi.eventwrite.url
=
http://33.50.1.213:38080/api/jtldpt/impld/trafficEventWrite
qingzhi.eventwrite.timeout
=
5000
eventsend.url
=
http://33.65.2
50.179
:8089/sendEvents
pushrecordurl
=
33.65.2
50.179
:8089/sendtouser
eventsend.url
=
http://33.65.2
19.103
:8089/sendEvents
pushrecordurl
=
33.65.2
19.103
:8089/sendtouser
ipstrs
=
33.55.1.85,33.55.1.86,33.55.1.87,33.55.1.88,33.55.1.89,33.55.1.90,33.55.1.91,33.55.1.92,33.55.1.93,33.55.1.94,33.55.1.95,33.55.1.96,33.51.6.97,33.60.1.7,33.54.3.240,33.53.1.171,33.52.1.222,33.61.1.23,33.57.1.22
ipurl
=
:8001/api/traffic-incident/restartAutoRule
\ No newline at end of file
src/main/resources/static/js/jkgl/jkgl - 副本.js
View file @
3920b9e0
...
...
@@ -1249,7 +1249,7 @@ let arr_right_s = [];
//websocket连接
let
d
=
new
Date
().
getTime
();
let
web_ip
=
"
ws:/33.65.2
50.179
:8089/websocket/
"
+
d
;
let
web_ip
=
"
ws:/33.65.2
19.103
:8089/websocket/
"
+
d
;
let
wss
=
new
WebSocket
(
web_ip
);
wss
.
onopen
=
function
()
{
console
.
log
(
"
连接成功
"
);
...
...
@@ -1532,7 +1532,7 @@ $('[name="status"]').bootstrapSwitch({
//推送近5分钟数据
function
websocket_s
(
ds
)
{
let
web_ips
=
"
ws:/33.65.2
50.179
:8089/websocket/
"
+
ds
;
let
web_ips
=
"
ws:/33.65.2
19.103
:8089/websocket/
"
+
ds
;
ws_j5fz
=
new
WebSocket
(
web_ips
);
ws_j5fz
.
onopen
=
function
()
{
console
.
log
(
"
连接成功
"
);
...
...
@@ -1582,7 +1582,7 @@ function websocket_s(ds) {
//推送自动规则
function
websocket_gzdj
(
video_id
,
items
,
indexs_1
)
{
let
web_ips
=
"
ws:/33.65.2
50.179
:8089/websocket/
"
+
video_id
;
let
web_ips
=
"
ws:/33.65.2
19.103
:8089/websocket/
"
+
video_id
;
let
ws_gzdj
=
new
WebSocket
(
web_ips
);
ws_gzdj
.
onopen
=
function
()
{
console
.
log
(
"
连接成功
"
);
...
...
src/main/resources/static/js/jkgl/jkgl.js
View file @
3920b9e0
...
...
@@ -1249,7 +1249,7 @@ let arr_right_s = [];
//websocket连接
let
d
=
new
Date
().
getTime
();
let
web_ip
=
"
ws:/33.65.2
50.179
:8089/websocket/
"
+
d
;
let
web_ip
=
"
ws:/33.65.2
19.103
:8089/websocket/
"
+
d
;
let
wss
=
new
WebSocket
(
web_ip
);
wss
.
onopen
=
function
()
{
console
.
log
(
"
连接成功
"
);
...
...
@@ -1520,7 +1520,7 @@ $('[name="status"]').bootstrapSwitch({
//推送近5分钟数据
function
websocket_s
(
ds
)
{
let
web_ips
=
"
ws:/33.65.2
50.179
:8089/websocket/
"
+
ds
;
let
web_ips
=
"
ws:/33.65.2
19.103
:8089/websocket/
"
+
ds
;
ws_j5fz
=
new
WebSocket
(
web_ips
);
ws_j5fz
.
onopen
=
function
()
{
console
.
log
(
"
连接成功
"
);
...
...
@@ -1570,7 +1570,7 @@ function websocket_s(ds) {
//推送自动规则
function
websocket_gzdj
(
video_id
,
items
,
indexs_1
)
{
let
web_ips
=
"
ws:/33.65.2
50.179
:8089/websocket/
"
+
video_id
;
let
web_ips
=
"
ws:/33.65.2
19.103
:8089/websocket/
"
+
video_id
;
let
ws_gzdj
=
new
WebSocket
(
web_ips
);
ws_gzdj
.
onopen
=
function
()
{
console
.
log
(
"
连接成功
"
);
...
...
src/main/resources/static/js/manualscreen/sjcx.js
View file @
3920b9e0
...
...
@@ -617,7 +617,7 @@ $('[data-gallery=manual]').click(function (e) {
new
PhotoViewer
(
items
,
options
);
});
let
d
=
new
Date
().
getTime
();
let
web_ip
=
"
ws:/33.65.2
50.179
:8089/websocket/
"
+
d
;
let
web_ip
=
"
ws:/33.65.2
19.103
:8089/websocket/
"
+
d
;
let
wss
=
new
WebSocket
(
web_ip
);
wss
.
onopen
=
function
()
{
console
.
log
(
"
连接成功
"
);
...
...
src/main/resources/static/js/sjcx/gcjl.js
View file @
3920b9e0
...
...
@@ -673,7 +673,7 @@ $('[data-gallery=manual]').click(function (e) {
let
d
=
new
Date
().
getTime
();
let
web_ip
=
"
ws:/33.65.2
50.179
:8089/websocket/
"
+
d
;
let
web_ip
=
"
ws:/33.65.2
19.103
:8089/websocket/
"
+
d
;
let
wss
=
new
WebSocket
(
web_ip
);
wss
.
onopen
=
function
()
{
console
.
log
(
"
连接成功
"
);
...
...
src/main/resources/static/js/sjcx/sjcx.js
View file @
3920b9e0
...
...
@@ -685,7 +685,7 @@ $('[data-gallery=manual]').click(function (e) {
new
PhotoViewer
(
items
,
options
);
});
let
d
=
new
Date
().
getTime
();
let
web_ip
=
"
ws:/33.65.2
50.179
:8089/websocket/
"
+
d
;
let
web_ip
=
"
ws:/33.65.2
19.103
:8089/websocket/
"
+
d
;
let
wss
=
new
WebSocket
(
web_ip
);
wss
.
onopen
=
function
()
{
console
.
log
(
"
连接成功
"
);
...
...
src/main/resources/static/js/sjfx/sjfx.js
View file @
3920b9e0
...
...
@@ -705,7 +705,7 @@ laydate.render({
}
});
function
websocket_s
(
d
)
{
let
web_ip
=
"
ws:/33.65.2
50.179
:8089/websocket/
"
+
d
;
let
web_ip
=
"
ws:/33.65.2
19.103
:8089/websocket/
"
+
d
;
wss
=
new
WebSocket
(
web_ip
);
wss
.
onopen
=
function
()
{
console
.
log
(
"
连接成功
"
);
...
...
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