🆗 增加dockerFile用于直接部署到docker

DockerFile

@@ -0,0 +1,8 @@
+FROM openjdk:8-jre
+LABEL name="hoperun-custom-sign"
+MAINTAINER li@2ha.me
+WORKDIR /
+ADD target/hoperun-sign-1.0-SNAPSHOT.jar app.jar
+EXPOSE 8982
+ENTRYPOINT ["java", "-jar"]
+CMD ["app.jar"]

pom.xml

@@ -21,7 +21,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <kotlin.code.style>official</kotlin.code.style>
         <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
-        <kotlin.version>1.7.22</kotlin.version>
+        <kotlin.version>2.0.20</kotlin.version>
     </properties>
 
     <build>
@@ -34,7 +34,7 @@
                 <configuration>
                     <fork>true</fork>
                     <outputDirectory>./target</outputDirectory>
-                    <classifier>executable</classifier>
+<!--                    <classifier>executable</classifier>-->
                 </configuration>
                 <executions>
                     <execution>
@@ -89,6 +89,7 @@
                     <jvmTarget>1.8</jvmTarget>
                 </configuration>
             </plugin>
+
         </plugins>
     </build>
 

src/main/kotlin/com/pomelotea/hoperun/sign/api/HoperunDakaController.kt

@@ -252,6 +252,8 @@ class HoperunSignController {
 
 
     private fun setUserConfig(employeeNo: String) {
+        if (userConfigMap[employeeNo] != null
+            && userConfigMap[employeeNo]!!.timeout > System.currentTimeMillis()) return
         // 获取deviceua
         val loginRequest = Request.Builder()
             .url("http://pom.hoperun.com:8187/attp/login/login.do")
@@ -300,7 +302,8 @@ class HoperunSignController {
         val username: String = lastDakaInfo.getString("staff_name")
         userConfig.username = username
         if (userConfig.device == null) {
-            if (lastDakaInfo.getString("actual_area_end") != null) {
+            if (lastDakaInfo.getString("actual_area_end") != null
+                    && lastDakaInfo.getString("actual_area_end") != "buqianka") {
                 val area: String = lastDakaInfo.getString("actual_area_end")
                 userConfig.device = area.substring(area.lastIndexOf("Qing") + 13)
             } else if (lastDakaInfo.getString("actual_area_begin") != null) {

src/main/kotlin/com/pomelotea/hoperun/sign/config/HoperunUserConfig.kt

@@ -15,7 +15,7 @@ object HoperunUserConfig {
     )
 
     val userConfigMap: MutableMap<String, UserConfig> = HashMap()
-    var address: String = "浙江省杭州市西湖区转塘街道凌家桥路飞天园区"
+    var address: String = "浙江省杭州市西湖区飞天园区1号楼"
     var longitueHead: String = "120.085"
     var latitudeHead: String = "30.138"
     var longitueShort: String = "120.0845715522375"
@@ -62,5 +62,6 @@ data class UserConfig(
     var project_id: String? = null,
     var projectname: String? = null,
     var projectcode: String? = null,
-    var autoDaka: Boolean = false
+    var autoDaka: Boolean = false,
+    val timeout: Long = System.currentTimeMillis() + 1000 * 60 * 30
 )

src/main/kotlin/com/pomelotea/hoperun/sign/scheduler/AutoDakaScheduler.kt

@@ -140,7 +140,7 @@ class AutoDakaScheduler {
     }
 
     private fun getRandomEndTime(): String {
-        val hourArray = intArrayOf(18, 19, 20, 21, 22, 23, 19, 20, 20, 19, 18, 20)
+        val hourArray = intArrayOf(18, 19, 20, 19, 19, 20, 19, 20, 20, 19, 18, 20)
         val randomHour = hourArray[Math.round(Math.random() * 9).toInt()]
         val randomMinute = if (randomHour == 18) {
             30 + Random().nextInt(19)

src/main/resources/config/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8082
+  port: 8982
 
 hoperun:
   address: "浙江省杭州市西湖区转塘街道凌家桥路飞天园区120"