Merge remote-tracking branch 'origin/main'

policeManagement/src/views/query/index.tsx

@@ -218,7 +218,6 @@ const clearForm = () => {
   _formParams.homeAddress = ''
   _formParams.remark = ''
   _formParams.educationLevel = ''
-  
 }
 export const showEnterprisesUnit = (record_) => {
   // console.log('🚀 ~ showEnterprisesUnit ~ record_:', record_)
@@ -346,20 +345,6 @@ export const showEnterprisesUnit = (record_) => {
         size='small'
         columns={_columns}
         requestApi={_reqApi}
-        // searchFormOptions={{
-        //   name: {
-        //     type: 'input',
-        //     label: '姓名',
-        //   },
-        //   securityNumber: {
-        //     type: 'input',
-        //     label: '保安证号',
-        //   },
-        //   telephone: {
-        //     type: 'input',
-        //     label: '手机号',
-        //   },
-        // }}
         v-slots={
           {
             tableHeader: (_) => {

policeSecurityServer/src/main/java/com/changhu/module/policeManagement/pojo/params/ServiceProjectSaveOrUpdateParams.java

@@ -48,6 +48,9 @@ public class ServiceProjectSaveOrUpdateParams {
     @Schema(description = "证件号(保安服务许可证/备案证)")
     private String idNumber;
 
+    @Schema(description = "保安服务合同")
+    private String securityServiceContract;
+
     @Schema(description = "服务区域面积")
     private Double serviceArea;
 

policeSecurityServer/src/main/java/com/changhu/module/policeManagement/pojo/vo/ServiceProjectListVo.java

@@ -43,6 +43,8 @@ public class ServiceProjectListVo {
     private IsOrNot isFiling;
     @Schema(description = "证件号(服务类型为保安必填 服务类型为物业则需自招保安为必填)")
     private String idNumber;
+    @Schema(description = "保安服务合同")
+    private String securityServiceContract;
 
     @Schema(description = "服务区域面积")
     private Double serviceArea;

policeSecurityServer/src/main/java/com/changhu/module/securityManagement/pojo/params/ServiceProjectSaveOrUpdateParams.java

@@ -45,6 +45,9 @@ public class ServiceProjectSaveOrUpdateParams {
     @Schema(description = "证件号(保安服务许可证/备案证)")
     private String idNumber;
 
+    @Schema(description = "保安服务合同")
+    private String securityServiceContract;
+
     @Schema(description = "服务区域面积")
     private Double serviceArea;
 

policeSecurityServer/src/main/java/com/changhu/module/securityManagement/pojo/vo/ServiceProjectPagerVo.java

@@ -46,6 +46,8 @@ public class ServiceProjectPagerVo {
     private IsOrNot isFiling;
     @Schema(description = "证件号(服务类型为保安必填 服务类型为物业则需自招保安为必填)")
     private String idNumber;
+    @Schema(description = "保安服务合同")
+    private String securityServiceContract;
 
     @Schema(description = "服务区域面积")
     private Double serviceArea;

policeSecurityServer/src/main/java/com/changhu/pojo/entity/SecurityUnit.java

@@ -48,6 +48,11 @@ public class SecurityUnit extends BaseEntity implements Serializable {
      */
     private String businessLicense;
 
+    /**
+     * 保安服务许可证
+     */
+    private String securityServiceLicence;
+
     /**
      * 法人信息
      */

policeSecurityServer/src/main/java/com/changhu/pojo/entity/ServiceProject.java

@@ -76,6 +76,11 @@ public class ServiceProject extends BaseEntity implements Serializable {
      */
     private String idNumber;
 
+    /**
+     * 保安服务合同
+     */
+    private String securityServiceContract;
+
     /**
      * 服务区域面积
      */

policeSecurityServer/src/main/java/com/changhu/pojo/params/SecurityUnitRegisterParams.java

@@ -30,6 +30,9 @@ public class SecurityUnitRegisterParams {
     @Schema(description = "营业执照")
     private String businessLicense;
 
+    @Schema(description = "保安服务许可证")
+    private String securityServiceLicence;
+
     @Schema(description = "法人信息")
     private LegalPersonInfo legalPersonInfo;
 

policeSecurityServer/src/main/java/com/changhu/support/minio/MinioProperties.java

@@ -3,16 +3,10 @@ package com.changhu.support.minio;
 import io.minio.MinioClient;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
-import okhttp3.OkHttpClient;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-import java.security.cert.X509Certificate;
-
 /**
  * fileName: MinioProperties
  * author: LuoZhun
@@ -47,43 +41,9 @@ public class MinioProperties {
 
     @Bean
     public MinioClient minioClient() {
-        // Create a trust manager that does not validate certificate chains
-        TrustManager[] trustAllCerts = new TrustManager[]{
-                new X509TrustManager() {
-                    public X509Certificate[] getAcceptedIssuers() {
-                        return new X509Certificate[0];
-                    }
-
-                    public void checkClientTrusted(X509Certificate[] certs, String authType) {
-                        // Do nothing (trust any client certificate)
-                    }
-
-                    public void checkServerTrusted(X509Certificate[] certs, String authType) {
-                        // Do nothing (trust any server certificate)
-                    }
-                }
-        };
-
-        // Install the all-trusting trust manager
-        SSLContext sslContext = null;
-        try {
-            sslContext = SSLContext.getInstance("SSL");
-            sslContext.init(null, trustAllCerts, new java.security.SecureRandom());
-        } catch (Exception e) {
-            log.error("Install the all-trusting trust manager error:{}", e.getMessage());
-        }
-
-
-        // Create a custom OkHttpClient that trusts all certificates
-        OkHttpClient customHttpClient = new OkHttpClient.Builder()
-                .sslSocketFactory(sslContext.getSocketFactory(), (X509TrustManager) trustAllCerts[0])
-                .hostnameVerifier((hostname, session) -> true)
-                .build();
-
         return MinioClient.builder()
                 .endpoint(url)
                 .credentials(accessKey, secretKey)
-                .httpClient(customHttpClient)
                 .build();
     }
 }

policeSecurityServer/src/main/java/com/changhu/support/minio/service/impl/MinioServiceImpl.java

@@ -181,7 +181,7 @@ public class MinioServiceImpl implements MinioService {
                     .method(Method.PUT)
                     .bucket(bucketName)
                     .object(objectName)
-                    .expiry(10, TimeUnit.SECONDS)
+                    .expiry(3, TimeUnit.MINUTES)
                     .build());
         } catch (Exception e) {
             throw new MessageException("获取临时上传地址失败:{}", e.getMessage());