Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
attendance-performance-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
赵啸非
attendance-performance-platform
Commits
cf270c75
Commit
cf270c75
authored
Mar 12, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改每日考勤记录重复多条情况
parent
cfc25531
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
4 deletions
+10
-4
attendance-performance-manager/pom.xml
attendance-performance-manager/pom.xml
+6
-0
attendance-performance-manager/src/main/bin/shutdown.sh
attendance-performance-manager/src/main/bin/shutdown.sh
+1
-0
attendance-performance-manager/src/main/bin/start.sh
attendance-performance-manager/src/main/bin/start.sh
+2
-1
attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http
...-manager/src/test/java/com/mortals/httpclient/system.http
+1
-3
No files found.
attendance-performance-manager/pom.xml
View file @
cf270c75
...
...
@@ -21,6 +21,7 @@
<properties>
<profiles.active>
develop
</profiles.active>
<profiles.server.port>
17500
</profiles.server.port>
<profiles.server.debug.port>
51750
</profiles.server.debug.port>
<profiles.server.path>
/attendance
</profiles.server.path>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
...
...
@@ -57,6 +58,7 @@
<properties>
<profiles.active>
test
</profiles.active>
<profiles.server.port>
17500
</profiles.server.port>
<profiles.server.debug.port>
51750
</profiles.server.debug.port>
<profiles.server.path>
/attendance
</profiles.server.path>
<profiles.publish.path>
/home/publish
</profiles.publish.path>
<profiles.nacos.server-addr>
192.168.0.252:8848
</profiles.nacos.server-addr>
...
...
@@ -90,6 +92,7 @@
<properties>
<profiles.active>
product
</profiles.active>
<profiles.server.port>
17500
</profiles.server.port>
<profiles.server.debug.port>
51750
</profiles.server.debug.port>
<profiles.server.path>
/attendance
</profiles.server.path>
<profiles.publish.path>
/home/publish
</profiles.publish.path>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
...
...
@@ -122,6 +125,7 @@
<properties>
<profiles.active>
yibin
</profiles.active>
<profiles.server.port>
17500
</profiles.server.port>
<profiles.server.debug.port>
51750
</profiles.server.debug.port>
<profiles.server.path>
/attendance
</profiles.server.path>
<profiles.publish.path>
/home/publish
</profiles.publish.path>
<profiles.nacos.server-addr>
172.15.28.120:8848
</profiles.nacos.server-addr>
...
...
@@ -156,6 +160,7 @@
<properties>
<profiles.active>
reg
</profiles.active>
<profiles.server.port>
17500
</profiles.server.port>
<profiles.server.debug.port>
51750
</profiles.server.debug.port>
<profiles.server.path>
/attendance
</profiles.server.path>
<profiles.publish.path>
/home/publish
</profiles.publish.path>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
...
...
@@ -190,6 +195,7 @@
<properties>
<profiles.active>
pengxi
</profiles.active>
<profiles.server.port>
17500
</profiles.server.port>
<profiles.server.debug.port>
51750
</profiles.server.debug.port>
<profiles.server.path>
/attendance
</profiles.server.path>
<profiles.publish.path>
/home/publish
</profiles.publish.path>
<profiles.nacos.server-addr>
192.168.106.6:8848
</profiles.nacos.server-addr>
...
...
attendance-performance-manager/src/main/bin/shutdown.sh
View file @
cf270c75
...
...
@@ -22,5 +22,6 @@ fi
echo
"stoping application
$PROJECT_NAME
......"
kill
-15
${
pid
}
sleep
5
echo
"Send shutdown request to Server
$PROJECT_NAME
OK"
attendance-performance-manager/src/main/bin/start.sh
View file @
cf270c75
#!/bin/sh
PORT
=
"@profiles.server.port@"
DEBUG_PORT
=
@profiles.server.debug.port@
BASEDIR
=
`
dirname
$0
`
/..
BASEDIR
=
`
(
cd
"
$BASEDIR
"
;
pwd
)
`
PROJECT_NAME
=
"@project.artifactId@"
;
...
...
@@ -60,7 +61,7 @@ exec "$JAVACMD" $JAVA_OPTS \
-Dbasedir
=
"
$BASEDIR
"
\
-Djava
.io.tmpdir
=
$TEMP_PATH
\
-Dloader
.path
=
"file://
$BASEDIR
/conf,file://
$BASEDIR
/lib"
\
-agentlib
:jdwp
=
transport
=
dt_socket,server
=
y,suspend
=
n,address
=
51750
\
-agentlib
:jdwp
=
transport
=
dt_socket,server
=
y,suspend
=
n,address
=
$DEBUG_PORT
\
-jar
$MAIN_CLASS
\
>
/dev/null &
...
...
attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http
View file @
cf270c75
...
...
@@ -68,7 +68,6 @@ Content-Type: application/json
###海康考勤打卡记录原始记录同步
POST {{baseUrl}}/attendance/record/hik/addAttendanceHikRecordCustom
Authorization: {{authToken}}
Content-Type: application/json
{
...
...
@@ -79,10 +78,9 @@ Content-Type: application/json
###考勤汇总计算
POST {{baseUrl}}//attendance/stat/summary
Authorization: {{authToken}}
Content-Type: application/json
{"summaryTimeStart":"2024-0
1-01","summaryTimeEnd":"2024-12-30
"}
{"summaryTimeStart":"2024-0
2-01","summaryTimeEnd":"2024-02-29
"}
###短信设置编辑
...
...
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