浏览代码

修改编译版本,添加依赖jar包

liyan 4 年之前
父节点
当前提交
6d31dfab96

+ 2 - 2
build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 
 group = "jit.xms"
 version = "1.0.1116"
-java.sourceCompatibility = JavaVersion.VERSION_11
+java.sourceCompatibility = JavaVersion.VERSION_1_8
 
 val repoConf: String = System.getProperty("repoPath") ?: "/var/repo"
 val repoPath: String = file("$rootDir").toPath().root.resolve(repoConf).toString()
@@ -77,6 +77,6 @@ tasks.withType<Test> {
 tasks.withType<KotlinCompile> {
     kotlinOptions {
         freeCompilerArgs = listOf("-Xjsr305=strict")
-        jvmTarget = "11"
+        jvmTarget = "1.8"
     }
 }

二进制
libs/xms-auth-prov-util-1.0.0.jar


二进制
libs/xms-auth-util-1.0.0.jar


+ 2 - 2
src/main/kotlin/jit/xms/qrscan/QRScanConfigure.kt

@@ -1,10 +1,10 @@
 package jit.xms.qrscan
 
+import gaf3.core.cloud.GafCloudConfiguration
 import gaf3.core.gateway.filter.factory.ForwardGatewayFilterFactory
 import gaf3.core.gateway.filter.factory.SetRequestParameterGatewayFilterFactory
 import gaf3.core.gateway.handler.predicate.JwtRoutePredicateFactory
 import io.jsonwebtoken.SignatureAlgorithm
-import io.netty.handler.codec.http.cors.CorsConfig
 import jit.xms.auth.api.support.config.MultiFactorConfigure
 import jit.xms.auth.api.support.web.MultiFactorWebAdviceConfiguration
 import jit.xms.qrscan.support.QRScanWebSocketHandler
@@ -33,7 +33,7 @@ import javax.crypto.spec.SecretKeySpec
 @EnableConfigurationProperties(QRScanAuthConfigure::class, MultiFactorConfigure::class)
 @EntityScan(basePackages = ["jit.xms.core.services"])
 @EnableJpaRepositories(basePackages = ["jit.xms.core.services"])
-@Import(MultiFactorWebAdviceConfiguration::class)
+@Import(MultiFactorWebAdviceConfiguration::class, GafCloudConfiguration::class)
 @ComponentScan(basePackages = ["jit.xms.core.services", "gaf3.core.services"], basePackageClasses = [QRScanConfigure::class])
 class QRScanConfigure {
 

+ 1 - 0
src/main/kotlin/jit/xms/qrscan/service/AuthService.kt

@@ -57,6 +57,7 @@ class AuthService(@Qualifier("jwtSigningKey") val jwtSigningKey: Key, val authCo
         val claims = parseJwt(realToken, gafKey)
         val authResult = TicketResult(0, "认证成功", ticket = createTicket(claims))
         webSocketSender.send(JSON.toJSONString(authResult))
+        senderMap.remove(id)
     }
 
     /**

+ 1 - 1
src/main/resources/static/client.html

@@ -15,7 +15,7 @@ token:<input type="text" id="msg"><input type="button" id="sendBtn" onclick="s
     function send() {
         let msg = msgBox.value
         $.ajax({
-            url: "http://192.168.0.65:18090/api/xms/qrscan/ticket?id="+getQueryVariable("id"),
+            url: "http://192.168.0.68:18090/api/xms/qrscan/ticket?id="+getQueryVariable("id"),
             method: "post",
             dataType: "json",
             async: false,

+ 5 - 4
src/main/resources/static/index2.html

@@ -29,12 +29,12 @@
     function getuuid() {
         console.log("获取uuid...")
         $.ajax({
-            url: "http://192.168.0.65:18090/api/xms/qrscan/uuid",
+            url: "http://192.168.0.68:18090/api/xms/qrscan/uuid",
             dataType: "json",
             async: false,
             success: function (data) {
-                new QRCode(document.getElementById("qrcode"), "http://192.168.0.65:18090/client.html?id=" + data.uuid);
-                let wsUrl = "ws://192.168.0.65:18090/qrscan/auth?id=" + data.uuid
+                new QRCode(document.getElementById("qrcode"), "http://192.168.0.68:18090/client.html?id=" + data.uuid);
+                let wsUrl = "ws://192.168.0.68:18090/qrscan/auth?id=" + data.uuid
                 let ws = new WebSocket(wsUrl)
                 ws.onopen = function (evt) {
                     console.log("WebSocket Connection open ...");
@@ -65,7 +65,7 @@
         }
         console.log("data:" + JSON.stringify(authForm))
         $.ajax({
-            url: "http://127.0.0.1:18090/api/xms/qrscan/auth",
+            url: "http://192.168.0.68:18090/api/xms/qrscan/auth",
             method: "post",
             contentType: "application/json",
             data: JSON.stringify(authForm),
@@ -74,6 +74,7 @@
             success: function (data) {
                 console.log("认证结果:")
                 console.log(JSON.stringify(data))
+                alert("登录成功,正在跳转登录界面...")
                 // console.log(data)
             }
         })