Merge remote-tracking branch 'origin/master'

assembly/assembly-manager-ui.xml

-<assembly
-        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-    <id>release</id>
-    <formats>
-        <format>tar.gz</format>
-    </formats>
-
-    <!-- 需要打包的文件集 -->
-    <fileSets>
-        <fileSet>
-            <directory>${project.parent.basedir}/attendance-performance-manager-ui/admin/dist</directory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-            <outputDirectory>/dist</outputDirectory>
-        </fileSet>
-    </fileSets>
-
-
-</assembly>
\ No newline at end of file

assembly/assembly.xml

@@ -19,11 +19,9 @@
             <fileMode>0755</fileMode>
         </fileSet>
         <fileSet>
-            <directory>./db</directory>
+            <directory>../db</directory>
             <includes>
                 <include>*.sql</include>
-                <include>service.exe</include>
-                <include>service.xml</include>
             </includes>
             <outputDirectory>db</outputDirectory>
             <fileMode>0755</fileMode>

attendance-performance-manager-ui/admin/src/views/SSO.vue

@@ -5,27 +5,40 @@
 </template>
 
 <script>
+import { mapMutations } from "vuex";
 export default {
-  mounted() {
-    let token = this.$route.query.token;
-    let siteid = this.$route.query.siteid;
-    if (token) {
-      window.sessionStorage.setItem("token", token);
-      window.sessionStorage.setItem("siteid", siteid);
-      this.$router.push("/index"); // 有token直接跳转首页
-    } else {
-      this.$message({
-        message: "没有权限，正在跳转登录页面...",
-        center: true,
-      });
-      setTimeout(function () {
-        window.location.href =
+  data() {
+    return {};
+  },
+  created() {
+    this.getInfo();
+  },
+  mounted() {},
+  methods: {
+    ...mapMutations(["SET_sysName", "SET_sysLogo"]),
+    // 获取token和站点信息
+    async getInfo() {
+      let { token, siteid, sysName, sysLogo } = this.$route.query;
+      if (token) {
+        window.sessionStorage.setItem("token", token);
+        window.sessionStorage.setItem("siteid", siteid);
+        this.SET_sysName(sysName);
+        this.SET_sysLogo(sysLogo);
+        this.$router.push("/index"); // 有token直接跳转首页
+      } else {
+        this.$message({
+          message: "没有权限，正在跳转登录页面...",
+          center: true,
+        });
+        setTimeout(function () {
+          window.location.href =
             process.env.VUE_APP_PORTAL_URL == "undefined"
-                ? "http://192.168.0.98:11072"
-                : process.env.VUE_APP_PORTAL_URL;
-        //this.$router.push('/login')
-      }, 1000);
-    }
+              ? "http://192.168.0.98:11072"
+              : process.env.VUE_APP_PORTAL_URL;
+          //this.$router.push('/login')
+        }, 1000);
+      }
+    },
   },
 };
 </script>
@@ -35,4 +48,4 @@ export default {
   width: 300px;
   height: 100px;
 }
-</style>
+</style>
\ No newline at end of file

attendance-performance-manager/pom.xml

@@ -48,7 +48,6 @@
 			<properties>
 				<profiles.active>develop</profiles.active>
 				<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
-
 				<profiles.sms.smsSendUrl>http://127.0.0.1:8089/api/index/index</profiles.sms.smsSendUrl>
 				<profiles.sms.apiId>k6BVS1PEbyzcJAE4</profiles.sms.apiId>
 				<skipUi>ture</skipUi>
@@ -60,24 +59,8 @@
 				<profiles.active>test</profiles.active>
 				<profiles.server.debug>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=51750</profiles.server.debug>
 				<profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr>
-				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
-				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
-				<profiles.sms.smsSendUrl>http://sms.wx3.com.cn/api/index/index</profiles.sms.smsSendUrl>
-				<profiles.sms.apiId>ADsUXLrS81vZDU95</profiles.sms.apiId>
-				<profiles.hik.host>8.136.255.30:8001</profiles.hik.host>
-				<profiles.hik.protocol>http://</profiles.hik.protocol>
-				<profiles.hik.appKey>25128371</profiles.hik.appKey>
-				<profiles.hik.appSecret>2m9RcPJOKq5j2QPQM4v5</profiles.hik.appSecret>
-				<profiles.dingtalk.domain>https://oapi.dingtalk.com</profiles.dingtalk.domain>
-				<profiles.dingtalk.oaScheme>https</profiles.dingtalk.oaScheme>
-				<profiles.dingtalk.oaUrl>api.dingtalk.com</profiles.dingtalk.oaUrl>
-				<profiles.dingtalk.agentId>2652674890</profiles.dingtalk.agentId>
-				<profiles.dingtalk.appKey>dingpqzradgfr4efdi2j</profiles.dingtalk.appKey>
-				<profiles.dingtalk.appSecret>bF2WALmo5_Wuj3hg5gXeWqezrYnZChUJ88HjzNWpkA9ivdOxfBDGOGYcfVRfB3vd</profiles.dingtalk.appSecret>
-				<profiles.dingtalk.aesKey>1QcPYuSpAc98OS3qQwwx5HPH85CZDidxF95yBGad2fJ</profiles.dingtalk.aesKey>
-				<profiles.dingtalk.token>m3WeuVx5kcTY76kh22uWZOTSu0XjvcwNhd</profiles.dingtalk.token>
-				<profiles.dingtalk.opUserId>254868153920685466</profiles.dingtalk.opUserId>
-				<profiles.webUrl>http://8.136.255.30:11039/attendance</profiles.webUrl>
+				<profiles.sms.smsSendUrl>http://127.0.0.1:8089/api/index/index</profiles.sms.smsSendUrl>
+				<profiles.sms.apiId>k6BVS1PEbyzcJAE4</profiles.sms.apiId>
 				<skipUi>ture</skipUi>
 			</properties>
 		</profile>
@@ -87,24 +70,9 @@
 			<properties>
 				<profiles.active>product</profiles.active>
 				<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
-				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
-				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
 				<profiles.sms.smsSendUrl>http://127.0.0.1:8089/api/index/index</profiles.sms.smsSendUrl>
+				<profiles.server.debug>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=51750</profiles.server.debug>
 				<profiles.sms.apiId>k6BVS1PEbyzcJAE4</profiles.sms.apiId>
-				<profiles.hik.host>8.136.255.30:8001</profiles.hik.host>
-				<profiles.hik.protocol>http://</profiles.hik.protocol>
-				<profiles.hik.appKey>25128371</profiles.hik.appKey>
-				<profiles.hik.appSecret>2m9RcPJOKq5j2QPQM4v5</profiles.hik.appSecret>
-				<profiles.dingtalk.domain>https://oapi.dingtalk.com</profiles.dingtalk.domain>
-				<profiles.dingtalk.oaUrl>api.dingtalk.com</profiles.dingtalk.oaUrl>
-				<profiles.dingtalk.agentId>2652674890</profiles.dingtalk.agentId>
-				<profiles.dingtalk.appKey>dingpqzradgfr4efdi2j</profiles.dingtalk.appKey>
-				<profiles.dingtalk.appSecret>bF2WALmo5_Wuj3hg5gXeWqezrYnZChUJ88HjzNWpkA9ivdOxfBDGOGYcfVRfB3vd</profiles.dingtalk.appSecret>
-				<profiles.dingtalk.aesKey>1QcPYuSpAc98OS3qQwwx5HPH85CZDidxF95yBGad2fJ</profiles.dingtalk.aesKey>
-				<profiles.dingtalk.token>m3WeuVx5kcTY76kh22uWZOTSu0XjvcwNhd</profiles.dingtalk.token>
-				<profiles.dingtalk.opUserId>254868153920685466</profiles.dingtalk.opUserId>
-				<profiles.webUrl>http://8.136.255.30:21039/attendance</profiles.webUrl>
-				<package.environment>build</package.environment>
 				<skipUi>ture</skipUi>
 			</properties>
 		</profile>

attendance-performance-manager/src/main/bin/project_deploy.sh

+#!/bin/sh
+RETVAL=$?
+SHELL_NAME="deploy"
+BASEDIR=$(dirname $0)
+BASEDIR=$( (
+  cd "$BASEDIR"
+  pwd
+))
+LOCK_FILE="/tmp/deploy.lock"
+# 时间变量
+CDATE=$(date "+%Y-%m-%d")
+CTIME=$(date "+%H:%M:%S")
+SHELL_LOG="${BASEDIR}/${SHELL_NAME}.log"
+
+JAVA_HOME="/usr/local/java/jdk1.8"
+SERVICE_PATH="/usr/lib/systemd/system"
+PUBLISH_PATH="/home/publish"
+PROJECT_NAME="@project.artifactId@"
+
+PROJECT_EXECPATH="${PUBLISH_PATH}/${PROJECT_NAME}"
+PROJECT_FILENAME="${PROJECT_NAME}.tar.gz"
+PROJECT_SERVICE="${SERVICE_PATH}/${PROJECT_NAME}.service"
+
+#写日志
+writelog() {
+  LOGINFO=$1
+  echo "${CDATE} ${CTIME}: ${SHELL_NAME} : ${LOGINFO}" >>${SHELL_LOG}
+  echo ${LOGINFO}
+}
+
+#清理目标
+clear_deploy() {
+  SERVICE=$1
+  EXECPATH=$2
+  #清理后台自启服务
+  rm -f ${SERVICE}
+  #清理执行文件目录
+}
+build_service() {
+  SERVICE=$1
+  EXECPATH=$2
+  echo "" >${SERVICE}
+  echo "[Unit]" >>${SERVICE}
+  echo "Description=${PROJECT_NAME}" >>${SERVICE}
+  echo "After=network.target" >>${SERVICE}
+  echo "" >>${SERVICE}
+  echo "[Service]" >>${SERVICE}
+  echo "Environment=\"JAVA_HOME=$JAVA_HOME\"" >>${SERVICE}
+  echo "Type=forking" >>${SERVICE}
+  echo "ExecStartPre=-/bin/sleep 5s" >>${SERVICE}
+  echo "ExecStart=${EXECPATH}/bin/start.sh" >>${SERVICE}
+  echo "ExecStop=${EXECPATH}/bin/shutdown.sh" >>${SERVICE}
+  echo "PrivateTmp=true" >>${SERVICE}
+  echo "" >>${SERVICE}
+  echo "[Install]" >>${SERVICE}
+  echo "WantedBy=multi-user.target" >>${SERVICE}
+  writelog "${PROJECT_NAME}服务创建完成!"
+
+}
+
+#启动服务与nginx
+start_service() {
+  systemctl enable ${PROJECT_NAME}
+  systemctl daemon-reload
+  writelog "${PROJECT_NAME}服务启动..."
+  systemctl stop ${PROJECT_NAME}&&systemctl start ${PROJECT_NAME}
+  project_status=$(systemctl status "${PROJECT_NAME}"|grep Active |awk '{print $2}')
+  jcpid=$(ps -ef | grep -v "grep" | grep "${PROJECT_NAME} " | awk '{print $2}')
+  writelog "${PROJECT_NAME}服务启动,PID is ${jcpid} ,status:${project_status}"
+}
+#部署后台服务
+project_deploy() {
+  writelog "${PROJECT_NAME}_deploy"
+  clear_deploy ${PROJECT_SERVICE} ${PROJECT_EXECPATH}
+  writelog "${PROJECT_NAME}_clear_finish"
+  tar -zvxf ./${PROJECT_FILENAME} -C ${PUBLISH_PATH}
+  build_service ${PROJECT_SERVICE} ${PROJECT_EXECPATH}
+  start_service
+  writelog "${PROJECT_NAME}_deploy_finish"
+}
+
+
+#主函数
+main() {
+  echo "后台服务部署"
+  project_deploy
+  exit ${RETVAL}
+}
+
+main $1

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/StartedService.java

+package com.mortals.xhx.daemon.applicationservice;
+
+import com.mortals.framework.springcloud.service.IApplicationStartedService;
+import com.mortals.xhx.base.system.user.service.UserService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+@Slf4j
+public class StartedService implements IApplicationStartedService {
+
+    @Autowired
+    private UserService userService;
+
+
+    @Override
+    public void start() {
+        log.info("开始服务..[配置已加载完成，并且所有框架都已经初始化]");
+
+        //初始执行同步用户与皮肤任务
+
+    }
+
+    @Override
+    public void stop() {
+        log.info("停止服务..");
+    }
+
+    @Override
+    public int getOrder() {
+        return 10;
+    }
+
+}

attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http

@@ -49,8 +49,8 @@ POST {{baseUrl}}/attendance/record/hik/addAttendanceRecord
 Content-Type: application/json
 
 {
-  "attendanceDateStart": "2024-10-08",
-  "attendanceDateEnd": "2024-10-08"
+  "attendanceDateStart": "2024-10-19",
+  "attendanceDateEnd": "2024-10-31"
 }
 
 ###海康考勤打卡记录计算1
@@ -58,8 +58,8 @@ POST {{baseUrl}}/attendance/record/hik/addAttendanceRecord
 Content-Type: application/json
 
 {
-  "attendanceDateStart": "2024-10-11",
-  "attendanceDateEnd": "2024-10-30"
+  "attendanceDateStart": "2024-11-18",
+  "attendanceDateEnd": "2024-11-26"
 }
 
 
@@ -79,8 +79,8 @@ POST {{baseUrl}}/attendance/record/hik/addAttendanceHikRecordCustom
 Content-Type: application/json
 
 {
-  "attendanceDateStart": "2024-03-22",
-  "attendanceDateEnd": "2024-03-22"
+  "attendanceDateStart": "2024-11-18",
+  "attendanceDateEnd": "2024-11-26"
 }
 
 
@@ -89,8 +89,8 @@ POST {{baseUrl}}/attendance/stat/summary
 Content-Type: application/json
 
 {
-  "summaryTimeStart": "2024-08-01",
-  "summaryTimeEnd": "2024-08-25"
+  "summaryTimeStart": "2024-10-08",
+  "summaryTimeEnd": "2024-10-31"
 }