diff --git a/ArcFace64.dat b/ArcFace64.dat index 0f14872..1068490 100644 --- a/ArcFace64.dat +++ b/ArcFace64.dat @@ -1 +1 @@ -EWEPEPEOGMGTELIZJUGECKIUJDBCJTCNISGPBNHLJTJUBHEWGNAKGEGAIOHJDQAJGNCFDRFZJEDMJTGFHLAYBZHFFEJTGGEQISJJEJBYCQFZIIJCHQAXCREZEHIYEWIHIGBHBOBFAZHKJFFEHICACEBBBMIPIDBQETFPBOIAFCFVHNFIGODZBXEADHFBFUJPIXHVAQGLHTGEEUBNDWCPGRBRGZIQFGHQFYFCBHFCGXIAGCBKHVBHGWJUIYBJFAGPFUEBENJVGMCIIUJSJKCBJTBXEQIOEIGIIYGJCHFZFGECHEBOCAHQGADQACCPBMDTBUCNAJCYDSCNBPIVDFIICCHPGUHJEZIJDUFPGXECJBBCEJHVAOJFCHFKCWCICAEKHODKBTJKATCLALJDCOHUFTANAQBMBXAEEEFVJJDJJTBOGRDGJMIBGODYHWBDECEZFSEMCUFLELDMBBHRCFCXEKETEVEXJTBRFJDMJPBUEICZGBABFHIYDBBAIFEUBXDWAPGBGMDYHQAIFBFEAHDBECBUDKJQEVECHXCZFRAKHKHQCLJOACJFBTCPJQHNGGJLCSCPARCJAUIJHKGVEIAABXDXELJACXGSBPHMEEGDDSFZCWFQEKBVBCEKHRFTGDDIHNDFEOIVHXAAFUEDCJDEGGADHCJCFNCFEUDIJJFHGEBIJEGEDQEBEOELDPAUHCITAZAACSAWHAEIHUGMAFGFGVBPDHDYJJGYITGPAMIQBEIZDUFDGYBLBMCYBMGCCOISBGIACLCFGPHEDGCPAHIXDOCHJUAXCOHWANJLGUIWDNDSEHIPIHIVFVDWAHDVIMEOFAJNBFAJHFHGCIEABGFDIQBOEKIQDPDLJBIUGCEOHUBCIGILECJNDREWFEHACPCADSIKJJFFACGKALAAIIGACMEKDSEEDUFIALDHDQFRDGAGDHJUJFGLHRDYCTBDFDAYGZILFCFKDNGYADHMIOHEAKJRFKBMEBJEIBHHJGCSGTFZFKEJGTHFFOIDBGFLDODCEAASHEFUFMCSICIAFSCHFUFSBQFRJBBLGODPCGDTEPJJAIFYFKHQGIBUAKCMJOFOCYDNGRAZBRFCIVFXHIHKAYAAEDJPHLBAEYDUDAFNGNFUAICZDMJDEXAYJQFWEWFPCBCGIQHVFYGPHXCGBDBCHBINCPARGAASDVICCFBZEEAZDQ \ No newline at end of file +EWEPEPEOGMGTELIZJUGECKIUJDBCJTCNISGPBNHLJTJUBHEWGNAKGEGAIOHJDQAJGNCFDRFZJEDMJTGFHLAYBZHFFEJTGGEQISJJEJBYCQFZIIJCHQAXCREZEHJFGCIEEAGLIYJDGPGGGPCVAXJEBRILDTALHEACDJJLIOFDHOIPEDEUEYHXAOCUHZFWGVHAILAZAMDWHNDMCCAPEBHEBLARGZANGSJIDRFYCRDECPBCBYJCDGBYDNDTDPGXFWAHHLESEHJCDTBOEQHJEUIFFEHYELDIBGEDHVIUDQBIEOAFGOAQHXFFIYCCDLFPCXCABUGEEKBREXDLHSFPIAGUFSIUFCGPEXESFEDTAAILCGIJBBEBGWGLHJIOIXCYHWFYBJIKJLGNFCGBITCVJSACAGCPDDEJFYCEFSJBGYCFHIARGXFKAZELBMCLAODUDGARCBEBGLGIEHFNBAGRFHJRGUECBWFJHBDIEUIEIQCQDZIOFVHLCIFYAMBAGMGEBVCHGOCUGKFFEZCDACBEECCLBEBRDDBBGWEAJBDKIUAXFABDEUABHZCPAIGGGNDWFLHDGJFACDEWGPHPFRAPHBCPHJBZFTFNDBDIBRGJJDJKFVGKHNEIHDDLGWCQBKHCCHESJIFUAMAHJLEYEMHFBRBYAEGKDJFPHXFAJEERIMGEJAJGACAWEPAGAEIGFOFFDLECAUINHKGCCRAUITFTJCGFFWJNFFJQFACPFYFACEJQIWCEHJDUJMDQDKGKANANHQFMCTIAJEJSCPEHCZENGVJPANFRBREIISAQCMGBBAAMJPCKDYHOEQFJJGBIEICGHVAABSJAGWGKJGBRENGMBRCOIZGGAFCYHQCCDNDMBQJFHDIPBEGLJIBVJAFOCWJGCOINGFDUGBCPEKEIHUIIDUITANDZFBDIIVEWDDAZCUIZACDOGBFQDYFPGWJDAMFLGWBXFVAKBVBUGSGFCLDGBADFHBEZCIHZECDHEFFWAFHHGZCOBMASHYEFEDGUBADIIFDFDZDQAHBVDQEDEFHZHOBBJMCVINGUIUGYAIEHCXBBGGGWBBGNDWFGBHAKIQDRHRHLBJGEDEDCDRGHEKJBBIEGALDXAPBAFRIOGHEJCLJVITCODLGPBEJUCQBIJTCTHYFUFHDOHDBPHOEOFTGYHSAEAVFKGSFBAOJDDKJRGFHXASDHFP \ No newline at end of file diff --git a/gateway/src/main/java/com/bonus/gateway/config/AuthWriteUtils.java b/gateway/src/main/java/com/bonus/gateway/config/AuthWriteUtils.java index cd3a352..9116a0d 100644 --- a/gateway/src/main/java/com/bonus/gateway/config/AuthWriteUtils.java +++ b/gateway/src/main/java/com/bonus/gateway/config/AuthWriteUtils.java @@ -11,32 +11,47 @@ public class AuthWriteUtils { public static boolean endWith(String url){ if(url.endsWith(".js")){ - return true; + return true; }else if(url.endsWith(".ttf")){ - return true; + return true; }else if(url.endsWith(".woff2")){ - return true; + return true; }else if(url.endsWith(".woff")){ - return true; + return true; }else if(url.endsWith(".ico")){ - return true; + return true; }else if(url.endsWith(".css")){ - return true; + return true; }else if(url.endsWith(".jpg")){ - return true; + return true; }else if(url.endsWith(".png")){ - return true; + return true; }else if(url.endsWith(".html")){ - return true; + return true; + }else if(url.endsWith(".yml")){ + return true; + }else if(url.endsWith(".svg")){ + return true; + }else if(url.endsWith(".json")){ + return true; + }else if(url.endsWith(".pdf")){ + return true; + }else if(url.endsWith(".mp4") || url.endsWith(".avi")){ + return true; + }else if(url.endsWith(".ppt") || url.endsWith(".pptx")){ + return true; + }else if(url.endsWith(".xls") || url.endsWith(".xlsx")){ + return true; + }else if(url.endsWith(".docx") || url.endsWith(".doc")){ + return true; }else { return url.endsWith(".jpeg"); } - } public static List getBlackUrl(){ List whiteUrl=new ArrayList<>(); whiteUrl.add("/bmw/**"); - whiteUrl.add("/file/file/ynRealName/**"); + whiteUrl.add("/file/ynRealName/**"); return whiteUrl; } diff --git a/gateway/src/main/java/com/bonus/gateway/config/ContextPathConfig.java b/gateway/src/main/java/com/bonus/gateway/config/ContextPathConfig.java index da853af..ccd4eae 100644 --- a/gateway/src/main/java/com/bonus/gateway/config/ContextPathConfig.java +++ b/gateway/src/main/java/com/bonus/gateway/config/ContextPathConfig.java @@ -1,42 +1,42 @@ -package com.bonus.gateway.config; - -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.autoconfigure.web.ServerProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.Ordered; -import org.springframework.core.annotation.Order; -import org.springframework.http.HttpStatus; -import org.springframework.http.server.reactive.ServerHttpRequest; -import org.springframework.web.server.ResponseStatusException; -import org.springframework.web.server.WebFilter; - -/** - * @author HeiZi - */ -@Configuration -public class ContextPathConfig { - - @Bean - @ConditionalOnProperty("server.servlet.context-path") - @Order(Ordered.HIGHEST_PRECEDENCE) - public WebFilter contextPathWebFilter(ServerProperties serverProperties){ - String contextPath = serverProperties.getServlet().getContextPath(); - return (serverWebExchange, webFilterChain) ->{ - ServerHttpRequest request = serverWebExchange.getRequest(); - String requestPath = request.getURI().getPath(); - - if(requestPath.contains(contextPath)){ - String newPath = requestPath.replaceFirst(contextPath+"/", ""); - ServerHttpRequest newRequest = request.mutate() - .path(newPath).build(); - return webFilterChain.filter(serverWebExchange.mutate() - .request(newRequest) - .build() - ); - }else { - throw new ResponseStatusException(HttpStatus.NOT_FOUND); - } - }; - } -} \ No newline at end of file +//package com.bonus.gateway.config; +// +//import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +//import org.springframework.boot.autoconfigure.web.ServerProperties; +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +//import org.springframework.core.Ordered; +//import org.springframework.core.annotation.Order; +//import org.springframework.http.HttpStatus; +//import org.springframework.http.server.reactive.ServerHttpRequest; +//import org.springframework.web.server.ResponseStatusException; +//import org.springframework.web.server.WebFilter; +// +///** +// * @author HeiZi +// */ +//@Configuration +//public class ContextPathConfig { +// +// @Bean +// @ConditionalOnProperty("server.servlet.context-path") +// @Order(Ordered.HIGHEST_PRECEDENCE) +// public WebFilter contextPathWebFilter(ServerProperties serverProperties){ +// String contextPath = serverProperties.getServlet().getContextPath(); +// return (serverWebExchange, webFilterChain) ->{ +// ServerHttpRequest request = serverWebExchange.getRequest(); +// String requestPath = request.getURI().getPath(); +// +// if(requestPath.contains(contextPath)){ +// String newPath = requestPath.replaceFirst(contextPath+"/", ""); +// ServerHttpRequest newRequest = request.mutate() +// .path(newPath).build(); +// return webFilterChain.filter(serverWebExchange.mutate() +// .request(newRequest) +// .build() +// ); +// }else { +// throw new ResponseStatusException(HttpStatus.NOT_FOUND); +// } +// }; +// } +//} \ No newline at end of file diff --git a/gateway/src/main/resources/bootstrap.yml b/gateway/src/main/resources/bootstrap.yml index cdd47f5..3b367f3 100644 --- a/gateway/src/main/resources/bootstrap.yml +++ b/gateway/src/main/resources/bootstrap.yml @@ -1,8 +1,11 @@ # Tomcat server: + # 本地、测试 port: 39100 - servlet: - context-path: lpRealName + # 线上 +# port: 9100 +# servlet: +# context-path: lpRealName # Spring spring: diff --git a/modules/bmw/lib/arcsoft-sdk-face-3.0.0-linux.jar b/modules/bmw/lib/arcsoft-sdk-face-3.0.0-linux.jar index 3091a2e..f33703d 100644 Binary files a/modules/bmw/lib/arcsoft-sdk-face-3.0.0-linux.jar and b/modules/bmw/lib/arcsoft-sdk-face-3.0.0-linux.jar differ diff --git a/modules/bmw/lib/arcsoft-sdk-face-3.0.0.0-windows.jar b/modules/bmw/lib/arcsoft-sdk-face-3.0.0.0-windows.jar deleted file mode 100644 index a5dcac9..0000000 Binary files a/modules/bmw/lib/arcsoft-sdk-face-3.0.0.0-windows.jar and /dev/null differ diff --git a/modules/bmw/src/main/java/com/bonus/bmw/config/IpAndPathConfig.java b/modules/bmw/src/main/java/com/bonus/bmw/config/IpAndPathConfig.java index d6940f4..1617fdc 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/config/IpAndPathConfig.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/config/IpAndPathConfig.java @@ -14,7 +14,7 @@ public class IpAndPathConfig { */ // @Value("${environment}") // public static String environment; - public static String environment = "prod"; + public static String environment = "test"; /** * 持证 @@ -28,9 +28,9 @@ public class IpAndPathConfig { /** * 人脸检测后端相关 */ - public static String faceDevUrl = "http://127.0.0.1:1909/file/"; - public static String faceTestUrl = "http://192.168.0.14:18017/file/"; - public static String faceProdUrl = "http://112.29.103.165:14413/file/"; + public static String faceDevUrl = "http://127.0.0.1:39100/file/"; + public static String faceTestUrl = "http://192.168.0.14:39100/file/"; + public static String faceProdUrl = "http://112.29.103.165:9100/file/"; /** * 统一工作平台url地址 diff --git a/modules/bmw/src/main/java/com/bonus/bmw/person/utils/ArcFaceHelper.java b/modules/bmw/src/main/java/com/bonus/bmw/person/utils/ArcFaceHelper.java index 0c026c9..e354e0d 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/person/utils/ArcFaceHelper.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/person/utils/ArcFaceHelper.java @@ -40,7 +40,7 @@ public class ArcFaceHelper { try{ String os = System.getProperty("os.name"); if(StringUtils.startsWith(os.toLowerCase(), "win")){ - faceEngine = new FaceEngine("D:\\arcsoft_lib_64"); + faceEngine = new FaceEngine("E:\\files\\arcsoft_lib_64"); //激活引擎 faceEngine.activeOnline(APP_ID, WIN64_SDK_KEY); } else { diff --git a/modules/bmw/src/main/resources/bootstrap.yml b/modules/bmw/src/main/resources/bootstrap.yml index 728eab1..0af65ad 100644 --- a/modules/bmw/src/main/resources/bootstrap.yml +++ b/modules/bmw/src/main/resources/bootstrap.yml @@ -1,6 +1,9 @@ # Tomcat server: + # 本地、测试 port: 31912 + # 线上 +# port: 1912 # servlet: # context-path: /bmw diff --git a/modules/bmw/src/main/resources/static/js/publicJs.js b/modules/bmw/src/main/resources/static/js/publicJs.js index 3552e3c..00f9f2c 100644 --- a/modules/bmw/src/main/resources/static/js/publicJs.js +++ b/modules/bmw/src/main/resources/static/js/publicJs.js @@ -1,11 +1,15 @@ -//测试环境 -// let IP_URL="http://127.0.0.1:39100/lpRealName" +// 本地环境 +// let IP_URL="http://127.0.0.1:39100" // let ctxPath = IP_URL+"/bmw"; -//正式环境 -let IP_URL="http://112.29.103.165:39100/lpRealName" +// //测试环境 +let IP_URL="http://192.168.0.14:39100" let ctxPath = IP_URL+"/bmw"; +//正式环境 +// let IP_URL="http://112.29.103.165:14413" +// let ctxPath = IP_URL+"/bmw"; + let currentHostname = window.location.hostname; diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.js b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.js index 7e0f6fe..53aeaa3 100644 --- a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.js +++ b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.js @@ -1674,13 +1674,27 @@ function setData(data) { } var htmlProve = ""; for (var i = 0; i < socialSecurityPath.length; i++) { + + var file = socialSecurityPath[i]; + var fileSrc = file; + var lowerFile = file.toLowerCase(); + + // 判断是不是图片 + if (lowerFile.endsWith(".jpg") || lowerFile.endsWith(".jpeg") || lowerFile.endsWith(".png")) { + fileSrc = fileUrl + "/" + file; // 图片直接显示 + } else { + // 不是图片，使用文件类型图标 + fileSrc = getTypeImgConsPerson(file); + } + + htmlProve += '
'; htmlProve += ''; // htmlProve += '
' + (socialSecurityUnit[i].length > 8 ? (socialSecurityUnit[i].substr(0, 8) + "..") : socialSecurityUnit[i]) + '
' htmlProve += "
"; diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.js b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.js index a01b3d4..13e4755 100644 --- a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.js +++ b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.js @@ -220,13 +220,27 @@ function setData(data) { } var htmlProve = ""; for (var i = 0; i < socialSecurityPath.length; i++) { + + var file = socialSecurityPath[i]; + var fileSrc = file; + var lowerFile = file.toLowerCase(); + + // 判断是不是图片 + if (lowerFile.endsWith(".jpg") || lowerFile.endsWith(".jpeg") || lowerFile.endsWith(".png")) { + fileSrc = fileUrl + "/" + file; // 图片直接显示 + } else { + // 不是图片，使用文件类型图标 + fileSrc = getTypeImgConsPerson(file); + } + + htmlProve += '
'; htmlProve += ''; // htmlProve += '
' + (socialSecurityUnit[i].length > 8 ? (socialSecurityUnit[i].substr(0, 8) + "..") : socialSecurityUnit[i]) + '
' htmlProve += "
"; diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/train/personTrainFrom.js b/modules/bmw/src/main/resources/static/pages/work/Person/train/personTrainFrom.js index c832676..910bbf6 100644 --- a/modules/bmw/src/main/resources/static/pages/work/Person/train/personTrainFrom.js +++ b/modules/bmw/src/main/resources/static/pages/work/Person/train/personTrainFrom.js @@ -54,7 +54,7 @@ function setData(data) { '" style="display: inline-block;text-align: center;width:150px">'; htmlCompany += ''; htmlCompany += ""; $("#companyExamDemoProve").append(htmlCompany); @@ -74,7 +74,7 @@ function setData(data) { '" style="display: inline-block;text-align: center;width:150px">'; htmlDept += ''; htmlDept += ""; $("#deptExamDemoProve").append(htmlDept); @@ -94,7 +94,7 @@ function setData(data) { '" style="display: inline-block;text-align: center;width:150px">'; htmlTeam += ''; htmlTeam += ""; $("#teamExamDemoProve").append(htmlTeam); diff --git a/modules/file/src/main/resources/bootstrap.yml b/modules/file/src/main/resources/bootstrap.yml index c5e6d6e..244e6dc 100644 --- a/modules/file/src/main/resources/bootstrap.yml +++ b/modules/file/src/main/resources/bootstrap.yml @@ -1,8 +1,13 @@ # Tomcat server: + # 本地、测试 port: 31909 - servlet: - context-path: /file + # 线上 +# port: 1909 + + +# servlet: +# context-path: /file # Spring spring: diff --git a/pom.xml b/pom.xml index a6cb8ab..e9dcf1b 100644 --- a/pom.xml +++ b/pom.xml @@ -353,7 +353,7 @@ lp_smz_dev 192.168.0.14:8848 - lp_smz_new + lp_smz_dev nacos nacos @@ -363,26 +363,19 @@ - lp_fl + lSun - lp_fl - 192.168.1.6:4412 - lp_fl + lp_smz_dev + 127.0.0.1:8848 + lp_smz_dev nacos nacos + + true + - - zys_dev - - lp_zys - 192.168.1.6:4412 - lp_zys - nacos - nacos - - lp_prod