diff --git a/ds-base/src/main/java/com/dsideal/base/Handler/SsoHandler.java b/ds-base/src/main/java/com/dsideal/base/Handler/SsoHandler.java deleted file mode 100644 index ad020d76..00000000 --- a/ds-base/src/main/java/com/dsideal/base/Handler/SsoHandler.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.dsideal.base.Handler; - -import com.dsideal.base.Util.SsoUtil; -import com.jfinal.handler.Handler; -import com.jfinal.kit.PropKit; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.Map; - -import static com.jfinal.kit.HandlerKit.redirect; - - -/** - * 用于sso验证辅助使用,并存储用户信息到cookie - * - * @author 黄海 - */ -@SuppressWarnings("unchecked") -public class SsoHandler extends Handler { - @Override - public void handle(String target, HttpServletRequest req, - HttpServletResponse res, boolean[] isHandled) { - - String servletPath = req.getServletPath(); - - //根据IP获取是走内网还是走外网 - String ssoServerUrl = PropKit.get("SSO_SERVER_NW"); - String serverIp = req.getServerName(); - String IntranetIP = PropKit.get("IntranetIP"); - String firstPart = serverIp.split("\\.")[0]; - if (IntranetIP.indexOf(firstPart) == -1) { - ssoServerUrl = PropKit.get("SSO_SERVER_WW"); - } - - String link = req.getRequestURL().toString(); - - String cookieSessionId = SsoUtil.getSessionIdByCookie(req, PropKit.get("SSO_SESSIONID")); - if (cookieSessionId == null) { - String paramSessionId = req.getParameter(PropKit.get("SSO_SESSIONID")); - if (paramSessionId != null) { - Map loginMap = SsoUtil.loginCheck(paramSessionId, ssoServerUrl); - loginMap.put("person_id", loginMap.get("person_id").toString()); - loginMap.put("identity_id", loginMap.get("identity_id").toString()); - loginMap.put(PropKit.get("SSO_SESSIONID"), paramSessionId); - SsoUtil.setCookieMap(res, loginMap); - } else { - String loginPageUrl = ssoServerUrl.concat("/login?redirect_url=" + link); - redirect(loginPageUrl, req, res, isHandled); - } - - } else { - Map loginMap = SsoUtil.loginCheck(cookieSessionId, ssoServerUrl); - loginMap.put("person_id", loginMap.get("person_id").toString()); - loginMap.put("identity_id", loginMap.get("identity_id").toString()); - loginMap.put(PropKit.get("SSO_SESSIONID"), cookieSessionId); - SsoUtil.setCookieMap(res, loginMap); - } - - next.handle(target, req, res, isHandled); - } -} diff --git a/ds-base/src/main/java/com/dsideal/base/Util/MinioUtils.java b/ds-base/src/main/java/com/dsideal/base/Util/MinioUtils.java new file mode 100644 index 00000000..9faadbd4 --- /dev/null +++ b/ds-base/src/main/java/com/dsideal/base/Util/MinioUtils.java @@ -0,0 +1,79 @@ +package com.dsideal.base.Util; + +import cn.hutool.core.io.FileUtil; +import com.jfinal.kit.PathKit; +import com.jfinal.kit.PropKit; +import io.minio.MinioClient; +import io.minio.SetBucketPolicyArgs; +import io.minio.UploadObjectArgs; +import io.minio.errors.*; + +import java.io.IOException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; + +public class MinioUtils { + /** + * 功能：获取Minio操作实例 + * + * @return + */ + public static MinioClient getMinioClient() { +// //配置文件 +// String configFile = "application_dev.properties"; +// String myEnvVar = System.getenv("WORKING_ENV"); +// if (myEnvVar != null) { +// configFile = configFile.replace("_dev", "_pro"); +// System.out.println("环境变量 WORKING_ENV 的值是: " + myEnvVar); +// } else { +// System.out.println("环境变量 WORKING_ENV 未设置。"); +// } +// PropKit.use(configFile); + + String minio_endpoint = PropKit.get("minio_endpoint"); + String minio_accesskey = PropKit.get("minio_accesskey"); + String minio_secretkey = PropKit.get("minio_secretkey"); + return MinioClient.builder() + .endpoint(minio_endpoint) + .credentials(minio_accesskey, minio_secretkey) + .build(); + } + + /** + * 功能：上传文件 + * + * @param minioClient + * @param key + * @param source + * @throws IOException + * @throws ServerException + * @throws InsufficientDataException + * @throws ErrorResponseException + * @throws NoSuchAlgorithmException + * @throws InvalidKeyException + * @throws InvalidResponseException + * @throws XmlParserException + * @throws InternalException + */ + public static void uploadFile(MinioClient minioClient, String key, String source) throws IOException, ServerException, InsufficientDataException, ErrorResponseException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException { + minioClient.uploadObject( + UploadObjectArgs.builder() + .bucket(PropKit.get("minio_bucketName")) + .object(key) + .filename(source) + .build()); + } + + public static void main(String[] args) throws ServerException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException { + String policy = FileUtil.readUtf8String(PathKit.getRootClassPath() + "/SetMinioDownload.json"); + MinioClient client = getMinioClient(); + SetBucketPolicyArgs setBucketPolicyArgs = SetBucketPolicyArgs.builder() + .bucket(PropKit.get("minio_bucketName")) + .config(policy) + .build(); + client.setBucketPolicy(setBucketPolicyArgs); + System.out.println("完成全局权限设置！"); + //测试样例 + //http://10.10.14.212:9000/dsideal/%E5%AE%89%E5%90%89%E4%B8%BD%E5%A8%9C%E6%9C%B1%E8%8E%89.jpg + } +} \ No newline at end of file diff --git a/ds-base/src/main/resource/ExcelImportTemplate/.idea/ExcelImportTemplate.iml b/ds-base/src/main/resource/ExcelImportTemplate/.idea/ExcelImportTemplate.iml deleted file mode 100644 index d9e6024f..00000000 --- a/ds-base/src/main/resource/ExcelImportTemplate/.idea/ExcelImportTemplate.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/ds-base/src/main/resource/ExcelImportTemplate/.idea/inspectionProfiles/Project_Default.xml b/ds-base/src/main/resource/ExcelImportTemplate/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index c26d685f..00000000 --- a/ds-base/src/main/resource/ExcelImportTemplate/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/ds-base/src/main/resource/ExcelImportTemplate/.idea/inspectionProfiles/profiles_settings.xml b/ds-base/src/main/resource/ExcelImportTemplate/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 105ce2da..00000000 --- a/ds-base/src/main/resource/ExcelImportTemplate/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/ds-base/src/main/resource/ExcelImportTemplate/.idea/misc.xml b/ds-base/src/main/resource/ExcelImportTemplate/.idea/misc.xml deleted file mode 100644 index 8d93904d..00000000 --- a/ds-base/src/main/resource/ExcelImportTemplate/.idea/misc.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/ds-base/src/main/resource/ExcelImportTemplate/.idea/modules.xml b/ds-base/src/main/resource/ExcelImportTemplate/.idea/modules.xml deleted file mode 100644 index 59750d26..00000000 --- a/ds-base/src/main/resource/ExcelImportTemplate/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/ds-base/src/main/resource/ExcelImportTemplate/.idea/vcs.xml b/ds-base/src/main/resource/ExcelImportTemplate/.idea/vcs.xml deleted file mode 100644 index 15b5e29f..00000000 --- a/ds-base/src/main/resource/ExcelImportTemplate/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ds-base/src/main/resource/ExcelImportTemplate/.idea/workspace.xml b/ds-base/src/main/resource/ExcelImportTemplate/.idea/workspace.xml deleted file mode 100644 index 02e51a56..00000000 --- a/ds-base/src/main/resource/ExcelImportTemplate/.idea/workspace.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - 1653553376213 - - - - - - \ No newline at end of file diff --git a/ds-base/src/main/resource/ExcelImportTemplate/excelTemp/占位.txt b/ds-base/src/main/resource/ExcelImportTemplate/excelTemp/占位.txt deleted file mode 100644 index 2f259b79..00000000 --- a/ds-base/src/main/resource/ExcelImportTemplate/excelTemp/占位.txt +++ /dev/null @@ -1 +0,0 @@ -s \ No newline at end of file diff --git a/ds-base/src/main/resource/application_dev.properties b/ds-base/src/main/resource/application_dev.properties index 916d340f..2ec2e146 100644 --- a/ds-base/src/main/resource/application_dev.properties +++ b/ds-base/src/main/resource/application_dev.properties @@ -14,8 +14,6 @@ CookieMd5SingPwd=DsideaL4r5t6y7u excelExportTemplatePathSuffix=/ExcelExportTemplate/ # 导入excel 的模板配置路径 ExcelImportTemplatePathSuffix=/ExcelImportTemplate/ -# sso的cookie名称 -SSO_SESSIONID=ds_sso_sessionid #mongodb mongodbUri=mongodb://yltcharge:yltcharge@10.10.14.210:27017/yltcharge diff --git a/操作文档/Minio安装.md b/操作文档/Minio安装.md new file mode 100644 index 00000000..294e177b --- /dev/null +++ b/操作文档/Minio安装.md @@ -0,0 +1,35 @@ +#### 摘取镜像 + +```shell +docker pull minio/minio +``` + + + +#### 启动实例 + +```shell +mkdir -p /opt/minio/{data,.minio} + +docker run --name minio -d -p 9000:9000 -p 9090:9090 -v /opt/minio/data:/data -v /opt/minio/.minio:/root/.minio minio/minio server /data --console-address ":9090" --address ":9000" +``` + + + +#### 访问办法 +通过浏览器访问`http://10.10.14.212:9090/login`，即可访问MinIO的Web管理界面， + +默认凭证 + +``` +minioadmin +minioadmin +``` + + + +#### 匿名访问 + +进入桶管理，配置匿名访问规则。Prefix输入 /，Access选择 readonly。保存后，再次访问`http://10.10.14.212:9090/dsideal/安吉丽娜朱莉.jpg`可以看到图片了。 + +![](https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/BlogImages/202409050828779.png)