Commit cf270c75 authored by 赵啸非's avatar 赵啸非

修改每日考勤记录重复多条情况

parent cfc25531
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
<properties> <properties>
<profiles.active>develop</profiles.active> <profiles.active>develop</profiles.active>
<profiles.server.port>17500</profiles.server.port> <profiles.server.port>17500</profiles.server.port>
<profiles.server.debug.port>51750</profiles.server.debug.port>
<profiles.server.path>/attendance</profiles.server.path> <profiles.server.path>/attendance</profiles.server.path>
<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr> <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group> <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
...@@ -57,6 +58,7 @@ ...@@ -57,6 +58,7 @@
<properties> <properties>
<profiles.active>test</profiles.active> <profiles.active>test</profiles.active>
<profiles.server.port>17500</profiles.server.port> <profiles.server.port>17500</profiles.server.port>
<profiles.server.debug.port>51750</profiles.server.debug.port>
<profiles.server.path>/attendance</profiles.server.path> <profiles.server.path>/attendance</profiles.server.path>
<profiles.publish.path>/home/publish</profiles.publish.path> <profiles.publish.path>/home/publish</profiles.publish.path>
<profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr> <profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr>
...@@ -90,6 +92,7 @@ ...@@ -90,6 +92,7 @@
<properties> <properties>
<profiles.active>product</profiles.active> <profiles.active>product</profiles.active>
<profiles.server.port>17500</profiles.server.port> <profiles.server.port>17500</profiles.server.port>
<profiles.server.debug.port>51750</profiles.server.debug.port>
<profiles.server.path>/attendance</profiles.server.path> <profiles.server.path>/attendance</profiles.server.path>
<profiles.publish.path>/home/publish</profiles.publish.path> <profiles.publish.path>/home/publish</profiles.publish.path>
<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr> <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
...@@ -122,6 +125,7 @@ ...@@ -122,6 +125,7 @@
<properties> <properties>
<profiles.active>yibin</profiles.active> <profiles.active>yibin</profiles.active>
<profiles.server.port>17500</profiles.server.port> <profiles.server.port>17500</profiles.server.port>
<profiles.server.debug.port>51750</profiles.server.debug.port>
<profiles.server.path>/attendance</profiles.server.path> <profiles.server.path>/attendance</profiles.server.path>
<profiles.publish.path>/home/publish</profiles.publish.path> <profiles.publish.path>/home/publish</profiles.publish.path>
<profiles.nacos.server-addr>172.15.28.120:8848</profiles.nacos.server-addr> <profiles.nacos.server-addr>172.15.28.120:8848</profiles.nacos.server-addr>
...@@ -156,6 +160,7 @@ ...@@ -156,6 +160,7 @@
<properties> <properties>
<profiles.active>reg</profiles.active> <profiles.active>reg</profiles.active>
<profiles.server.port>17500</profiles.server.port> <profiles.server.port>17500</profiles.server.port>
<profiles.server.debug.port>51750</profiles.server.debug.port>
<profiles.server.path>/attendance</profiles.server.path> <profiles.server.path>/attendance</profiles.server.path>
<profiles.publish.path>/home/publish</profiles.publish.path> <profiles.publish.path>/home/publish</profiles.publish.path>
<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr> <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
...@@ -190,6 +195,7 @@ ...@@ -190,6 +195,7 @@
<properties> <properties>
<profiles.active>pengxi</profiles.active> <profiles.active>pengxi</profiles.active>
<profiles.server.port>17500</profiles.server.port> <profiles.server.port>17500</profiles.server.port>
<profiles.server.debug.port>51750</profiles.server.debug.port>
<profiles.server.path>/attendance</profiles.server.path> <profiles.server.path>/attendance</profiles.server.path>
<profiles.publish.path>/home/publish</profiles.publish.path> <profiles.publish.path>/home/publish</profiles.publish.path>
<profiles.nacos.server-addr>192.168.106.6:8848</profiles.nacos.server-addr> <profiles.nacos.server-addr>192.168.106.6:8848</profiles.nacos.server-addr>
......
...@@ -22,5 +22,6 @@ fi ...@@ -22,5 +22,6 @@ fi
echo "stoping application $PROJECT_NAME......" echo "stoping application $PROJECT_NAME......"
kill -15 ${pid} kill -15 ${pid}
sleep 5
echo "Send shutdown request to Server $PROJECT_NAME OK" echo "Send shutdown request to Server $PROJECT_NAME OK"
#!/bin/sh #!/bin/sh
PORT="@profiles.server.port@" PORT="@profiles.server.port@"
DEBUG_PORT=@profiles.server.debug.port@
BASEDIR=`dirname $0`/.. BASEDIR=`dirname $0`/..
BASEDIR=`(cd "$BASEDIR"; pwd)` BASEDIR=`(cd "$BASEDIR"; pwd)`
PROJECT_NAME="@project.artifactId@"; PROJECT_NAME="@project.artifactId@";
...@@ -60,7 +61,7 @@ exec "$JAVACMD" $JAVA_OPTS \ ...@@ -60,7 +61,7 @@ exec "$JAVACMD" $JAVA_OPTS \
-Dbasedir="$BASEDIR" \ -Dbasedir="$BASEDIR" \
-Djava.io.tmpdir=$TEMP_PATH \ -Djava.io.tmpdir=$TEMP_PATH \
-Dloader.path="file://$BASEDIR/conf,file://$BASEDIR/lib" \ -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 \ -jar $MAIN_CLASS \
> /dev/null & > /dev/null &
......
...@@ -68,7 +68,6 @@ Content-Type: application/json ...@@ -68,7 +68,6 @@ Content-Type: application/json
###海康考勤打卡记录原始记录同步 ###海康考勤打卡记录原始记录同步
POST {{baseUrl}}/attendance/record/hik/addAttendanceHikRecordCustom POST {{baseUrl}}/attendance/record/hik/addAttendanceHikRecordCustom
Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
...@@ -79,10 +78,9 @@ Content-Type: application/json ...@@ -79,10 +78,9 @@ Content-Type: application/json
###考勤汇总计算 ###考勤汇总计算
POST {{baseUrl}}//attendance/stat/summary POST {{baseUrl}}//attendance/stat/summary
Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{"summaryTimeStart":"2024-01-01","summaryTimeEnd":"2024-12-30"} {"summaryTimeStart":"2024-02-01","summaryTimeEnd":"2024-02-29"}
###短信设置编辑 ###短信设置编辑
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment