配置文件变更

ArcFace64.dat

@@ -1 +1 @@
-EWEPEPEOGMGTELIZJUGECKIUJDBCJTCNISGPBNHLJTJUBHEWGNAKGEGAIOHJDQAJGNCFDRFZJEDMJTGFHLAYBZHFFEJTGGEQISJJEJBYCQFZIIJCHQAXCREZEHIYEWIHIGBHBOBFAZHKJFFEHICACEBBBMIPIDBQETFPBOIAFCFVHNFIGODZBXEADHFBFUJPIXHVAQGLHTGEEUBNDWCPGRBRGZIQFGHQFYFCBHFCGXIAGCBKHVBHGWJUIYBJFAGPFUEBENJVGMCIIUJSJKCBJTBXEQIOEIGIIYGJCHFZFGECHEBOCAHQGADQACCPBMDTBUCNAJCYDSCNBPIVDFIICCHPGUHJEZIJDUFPGXECJBBCEJHVAOJFCHFKCWCICAEKHODKBTJKATCLALJDCOHUFTANAQBMBXAEEEFVJJDJJTBOGRDGJMIBGODYHWBDECEZFSEMCUFLELDMBBHRCFCXEKETEVEXJTBRFJDMJPBUEICZGBABFHIYDBBAIFEUBXDWAPGBGMDYHQAIFBFEAHDBECBUDKJQEVECHXCZFRAKHKHQCLJOACJFBTCPJQHNGGJLCSCPARCJAUIJHKGVEIAABXDXELJACXGSBPHMEEGDDSFZCWFQEKBVBCEKHRFTGDDIHNDFEOIVHXAAFUEDCJDEGGADHCJCFNCFEUDIJJFHGEBIJEGEDQEBEOELDPAUHCITAZAACSAWHAEIHUGMAFGFGVBPDHDYJJGYITGPAMIQBEIZDUFDGYBLBMCYBMGCCOISBGIACLCFGPHEDGCPAHIXDOCHJUAXCOHWANJLGUIWDNDSEHIPIHIVFVDWAHDVIMEOFAJNBFAJHFHGCIEABGFDIQBOEKIQDPDLJBIUGCEOHUBCIGILECJNDREWFEHACPCADSIKJJFFACGKALAAIIGACMEKDSEEDUFIALDHDQFRDGAGDHJUJFGLHRDYCTBDFDAYGZILFCFKDNGYADHMIOHEAKJRFKBMEBJEIBHHJGCSGTFZFKEJGTHFFOIDBGFLDODCEAASHEFUFMCSICIAFSCHFUFSBQFRJBBLGODPCGDTEPJJAIFYFKHQGIBUAKCMJOFOCYDNGRAZBRFCIVFXHIHKAYAAEDJPHLBAEYDUDAFNGNFUAICZDMJDEXAYJQFWEWFPCBCGIQHVFYGPHXCGBDBCHBINCPARGAASDVICCFBZEEAZDQ
+EWEPEPEOGMGTELIZJUGECKIUJDBCJTCNISGPBNHLJTJUBHEWGNAKGEGAIOHJDQAJGNCFDRFZJEDMJTGFHLAYBZHFFEJTGGEQISJJEJBYCQFZIIJCHQAXCREZEHJFGCIEEAGLIYJDGPGGGPCVAXJEBRILDTALHEACDJJLIOFDHOIPEDEUEYHXAOCUHZFWGVHAILAZAMDWHNDMCCAPEBHEBLARGZANGSJIDRFYCRDECPBCBYJCDGBYDNDTDPGXFWAHHLESEHJCDTBOEQHJEUIFFEHYELDIBGEDHVIUDQBIEOAFGOAQHXFFIYCCDLFPCXCABUGEEKBREXDLHSFPIAGUFSIUFCGPEXESFEDTAAILCGIJBBEBGWGLHJIOIXCYHWFYBJIKJLGNFCGBITCVJSACAGCPDDEJFYCEFSJBGYCFHIARGXFKAZELBMCLAODUDGARCBEBGLGIEHFNBAGRFHJRGUECBWFJHBDIEUIEIQCQDZIOFVHLCIFYAMBAGMGEBVCHGOCUGKFFEZCDACBEECCLBEBRDDBBGWEAJBDKIUAXFABDEUABHZCPAIGGGNDWFLHDGJFACDEWGPHPFRAPHBCPHJBZFTFNDBDIBRGJJDJKFVGKHNEIHDDLGWCQBKHCCHESJIFUAMAHJLEYEMHFBRBYAEGKDJFPHXFAJEERIMGEJAJGACAWEPAGAEIGFOFFDLECAUINHKGCCRAUITFTJCGFFWJNFFJQFACPFYFACEJQIWCEHJDUJMDQDKGKANANHQFMCTIAJEJSCPEHCZENGVJPANFRBREIISAQCMGBBAAMJPCKDYHOEQFJJGBIEICGHVAABSJAGWGKJGBRENGMBRCOIZGGAFCYHQCCDNDMBQJFHDIPBEGLJIBVJAFOCWJGCOINGFDUGBCPEKEIHUIIDUITANDZFBDIIVEWDDAZCUIZACDOGBFQDYFPGWJDAMFLGWBXFVAKBVBUGSGFCLDGBADFHBEZCIHZECDHEFFWAFHHGZCOBMASHYEFEDGUBADIIFDFDZDQAHBVDQEDEFHZHOBBJMCVINGUIUGYAIEHCXBBGGGWBBGNDWFGBHAKIQDRHRHLBJGEDEDCDRGHEKJBBIEGALDXAPBAFRIOGHEJCLJVITCODLGPBEJUCQBIJTCTHYFUFHDOHDBPHOEOFTGYHSAEAVFKGSFBAOJDDKJRGFHXASDHFP

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<String> getBlackUrl(){
         List<String> whiteUrl=new ArrayList<>();
         whiteUrl.add("/bmw/**");
-        whiteUrl.add("/file/file/ynRealName/**");
+        whiteUrl.add("/file/ynRealName/**");
         return  whiteUrl;
     }
 

gateway/src/main/java/com/bonus/gateway/config/ContextPathConfig.java

@@ -1,42 +1,42 @@
-package com.bonus.gateway.config;
+//package com.bonus.gateway.config;
-
+//
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+//import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.web.ServerProperties;
+//import org.springframework.boot.autoconfigure.web.ServerProperties;
-import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
+//import org.springframework.context.annotation.Configuration;
-import org.springframework.core.Ordered;
+//import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
+//import org.springframework.core.annotation.Order;
-import org.springframework.http.HttpStatus;
+//import org.springframework.http.HttpStatus;
-import org.springframework.http.server.reactive.ServerHttpRequest;
+//import org.springframework.http.server.reactive.ServerHttpRequest;
-import org.springframework.web.server.ResponseStatusException;
+//import org.springframework.web.server.ResponseStatusException;
-import org.springframework.web.server.WebFilter;
+//import org.springframework.web.server.WebFilter;
-
+//
-/**
+///**
- * @author HeiZi
+// * @author HeiZi
- */
+// */
-@Configuration
+//@Configuration
-public class ContextPathConfig {
+//public class ContextPathConfig {
-
+//
-    @Bean
+//    @Bean
-    @ConditionalOnProperty("server.servlet.context-path")
+//    @ConditionalOnProperty("server.servlet.context-path")
-    @Order(Ordered.HIGHEST_PRECEDENCE)
+//    @Order(Ordered.HIGHEST_PRECEDENCE)
-    public WebFilter contextPathWebFilter(ServerProperties serverProperties){
+//    public WebFilter contextPathWebFilter(ServerProperties serverProperties){
-        String contextPath = serverProperties.getServlet().getContextPath();
+//        String contextPath = serverProperties.getServlet().getContextPath();
-        return (serverWebExchange, webFilterChain) ->{
+//        return (serverWebExchange, webFilterChain) ->{
-            ServerHttpRequest request = serverWebExchange.getRequest();
+//            ServerHttpRequest request = serverWebExchange.getRequest();
-            String requestPath = request.getURI().getPath();
+//            String requestPath = request.getURI().getPath();
-
+//
-            if(requestPath.contains(contextPath)){
+//            if(requestPath.contains(contextPath)){
-                String newPath = requestPath.replaceFirst(contextPath+"/", "");
+//                String newPath = requestPath.replaceFirst(contextPath+"/", "");
-                ServerHttpRequest newRequest = request.mutate()
+//                ServerHttpRequest newRequest = request.mutate()
-                        .path(newPath).build();
+//                        .path(newPath).build();
-                return webFilterChain.filter(serverWebExchange.mutate()
+//                return webFilterChain.filter(serverWebExchange.mutate()
-                        .request(newRequest)
+//                        .request(newRequest)
-                        .build()
+//                        .build()
-                );
+//                );
-            }else {
+//            }else {
-                throw new ResponseStatusException(HttpStatus.NOT_FOUND);
+//                throw new ResponseStatusException(HttpStatus.NOT_FOUND);
-            }
+//            }
-        };
+//        };
-    }
+//    }
-}
+//}

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: 

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 faceDevUrl = "http://127.0.0.1:39100/file/";
-    public static String faceTestUrl = "http://192.168.0.14:18017/file/";
+    public static String faceTestUrl = "http://192.168.0.14:39100/file/";
-    public static String faceProdUrl = "http://112.29.103.165:14413/file/";
+    public static String faceProdUrl = "http://112.29.103.165:9100/file/";
 
     /**
      * 统一工作平台url地址

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 {

modules/bmw/src/main/resources/bootstrap.yml

@@ -1,6 +1,9 @@
 # Tomcat
 server:
+  # 本地、测试
   port: 31912
+  # 线上
+#  port: 1912
 #  servlet:
 #    context-path: /bmw
 

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;
 
 

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 +=
             '<div id="' +
             i +
             '" style="display: inline-block;text-align: center;width:150px">';
         htmlProve +=
             '<img src="' +
-            (fileUrl + "/" + socialSecurityPath[i]) +
+            (fileSrc) +
             '" alt="" style="height: 80px;width: 80px;margin-right: 10px" class="layui-upload-img ">';
         // htmlProve += '<div><span>' + (socialSecurityUnit[i].length > 8 ? (socialSecurityUnit[i].substr(0, 8) + "..") : socialSecurityUnit[i]) + '</span></div>'
         htmlProve += "</div>";

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 +=
             '<div id="' +
             i +
             '" style="display: inline-block;text-align: center;width:150px">';
         htmlProve +=
             '<img src="' +
-            (fileUrl + "/" + socialSecurityPath[i]) +
+            (fileSrc) +
             '" alt="" style="height: 80px;width: 80px;margin-right: 10px" class="layui-upload-img ">';
         // htmlProve += '<div><span>' + (socialSecurityUnit[i].length > 8 ? (socialSecurityUnit[i].substr(0, 8) + "..") : socialSecurityUnit[i]) + '</span></div>'
         htmlProve += "</div>";

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 +=
             '<img src="' +
-            (fileUrl + "/" + data.companyExamFilePath) +
+            (fileUrl + "/" + companyExamFilePath) +
             '" alt="" style="height: 80px;width: 80px;margin-right: 10px" class="layui-upload-img ">';
         htmlCompany += "</div>";
         $("#companyExamDemoProve").append(htmlCompany);
@@ -74,7 +74,7 @@ function setData(data) {
             '" style="display: inline-block;text-align: center;width:150px">';
         htmlDept +=
             '<img src="' +
-            (fileUrl + "/" + data.deptExamFilePath) +
+            (fileUrl + "/" + deptExamFilePath) +
             '" alt="" style="height: 80px;width: 80px;margin-right: 10px" class="layui-upload-img ">';
         htmlDept += "</div>";
         $("#deptExamDemoProve").append(htmlDept);
@@ -94,7 +94,7 @@ function setData(data) {
             '" style="display: inline-block;text-align: center;width:150px">';
         htmlTeam +=
             '<img src="' +
-            (fileUrl + "/" + data.teamExamFilePath) +
+            (fileUrl + "/" + teamExamFilePath) +
             '" alt="" style="height: 80px;width: 80px;margin-right: 10px" class="layui-upload-img ">';
         htmlTeam += "</div>";
         $("#teamExamDemoProve").append(htmlTeam);

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:

pom.xml

@@ -353,7 +353,7 @@
             <properties>
                 <profiles.active>lp_smz_dev</profiles.active>
                 <nacos.server>192.168.0.14:8848</nacos.server>
-                <name.space>lp_smz_new</name.space>
+                <name.space>lp_smz_dev</name.space>
                 <username>nacos</username>
                 <password>nacos</password>
             </properties>
@@ -363,26 +363,19 @@
         </profile>
 
         <profile>
-            <id>lp_fl</id>
+            <id>lSun</id>
             <properties>
-                <profiles.active>lp_fl</profiles.active>
+                <profiles.active>lp_smz_dev</profiles.active>
-                <nacos.server>192.168.1.6:4412</nacos.server>
+                <nacos.server>127.0.0.1:8848</nacos.server>
-                <name.space>lp_fl</name.space>
+                <name.space>lp_smz_dev</name.space>
                 <username>nacos</username>
                 <password>nacos</password>
             </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
         </profile>
 
-        <profile>
-            <id>zys_dev</id>
-            <properties>
-                <profiles.active>lp_zys</profiles.active>
-                <nacos.server>192.168.1.6:4412</nacos.server>
-                <name.space>lp_zys</name.space>
-                <username>nacos</username>
-                <password>nacos</password>
-            </properties>
-        </profile>
         <profile>
             <id>lp_prod</id>
             <properties>