jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity

注释掉华为obs代码,不需要

Browse Source
tags/yfai-mes-ext-v2.3
臧学普 6 months ago
parent 010663944e
commit ebd39ef044
6 changed files with 579 additions and 601 deletions
Show Stats Download Patch File Download Diff File

10
modules/i3plus-ext-mes-apiservice/pom.xml
Unescape Escape View File

@ -19,11 +19,11 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-spring-boot-starter-jaxws</artifactId>
</dependency>
<dependency>
<groupId>com.huaweicloud</groupId>
<artifactId>esdk-obs-java-bundle</artifactId>
<version>3.23.9</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.huaweicloud</groupId>-->
<!-- <artifactId>esdk-obs-java-bundle</artifactId>-->
<!-- <version>3.23.9</version>-->
<!-- </dependency>-->
<!-- impp framework -->
<dependency>
<groupId>impp.framework</groupId>

88
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/config/HuaWeiCloudObsConfig.java
Unescape Escape View File

@ -1,44 +1,44 @@
package cn.estsh.i3plus.ext.mes.apiservice.config;
import cn.estsh.i3plus.ext.mes.apiservice.utils.HuaWeiOBSUtil;
import com.obs.services.ObsClient;
import lombok.Getter;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* @Description : HuaWeiCloudObsConfig
* @Author :gsz
* @Date 2024/6/11 13:28
* @Modify
**/
@Configuration
public class HuaWeiCloudObsConfig {
@Value("${huaweiobs.bucketName}")
@Getter
private String bucketName;
@Value("${huaweiobs.ak}")
@Getter
private String ak;
@Value("${huaweiobs.sk}")
@Getter
private String sk;
@Value("${huaweiobs.endPoint}")
@Getter
private String endPoint;
@Bean
public ObsClient getObsClient() {
ObsClient obsClient = new ObsClient(ak, sk, endPoint);
return obsClient;
}
@Bean
public HuaWeiOBSUtil huaWeiOBSUtil() {
return new HuaWeiOBSUtil(bucketName, ak, sk, endPoint);
}
}
//package cn.estsh.i3plus.ext.mes.apiservice.config;
//
//import cn.estsh.i3plus.ext.mes.apiservice.utils.HuaWeiOBSUtil;
//import com.obs.services.ObsClient;
//import lombok.Getter;
//import org.springframework.beans.factory.annotation.Value;
//import org.springframework.context.annotation.Bean;
//import org.springframework.context.annotation.Configuration;
//
///**
// * @Description : HuaWeiCloudObsConfig
// * @Author :gsz
// * @Date 2024/6/11 13:28
// * @Modify
// **/
//@Configuration
//public class HuaWeiCloudObsConfig {
//
// @Value("${huaweiobs.bucketName}")
// @Getter
// private String bucketName;
//
// @Value("${huaweiobs.ak}")
// @Getter
// private String ak;
//
// @Value("${huaweiobs.sk}")
// @Getter
// private String sk;
//
// @Value("${huaweiobs.endPoint}")
// @Getter
// private String endPoint;
//
// @Bean
// public ObsClient getObsClient() {
// ObsClient obsClient = new ObsClient(ak, sk, endPoint);
// return obsClient;
// }
// @Bean
// public HuaWeiOBSUtil huaWeiOBSUtil() {
// return new HuaWeiOBSUtil(bucketName, ak, sk, endPoint);
// }
//}

26
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesMediaFileCfgController.java
Unescape Escape View File

@ -1,39 +1,17 @@
package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
import cn.estsh.i3plus.ext.mes.api.base.IMesMediaFileCfgService;
import cn.estsh.i3plus.ext.mes.apiservice.config.HuaWeiCloudObsConfig;
import cn.estsh.i3plus.ext.mes.apiservice.utils.HuaWeiOBSUtil;
import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
import cn.estsh.i3plus.icloud.core.sdk.ICoreSysFileCloud;
import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.mes.bean.MesMediaFileCfg;
import cn.estsh.i3plus.pojo.mes.repository.MesMediaFileCfgRepository;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.fileservice.ImppFileService;
import cn.estsh.impp.framework.boot.util.ResultBean;
import com.obs.services.ObsClient;
import com.obs.services.exception.ObsException;
import com.obs.services.model.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @Description: 媒体文件维护

1042
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/utils/HuaWeiOBSUtil.java
View File

File diff suppressed because it is too large Load Diff

12
modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java
Unescape Escape View File

@ -40,12 +40,12 @@ public class MesCommonConstant {
public static final String CCSC_TASK_NO = "CCSC_TASK_NO";
public static final String CCSC_RETEST_NO = "RETEST_%s";
//OBS
public static final String OBS_AK = "TPNXQ2LUMRHNYYOBO8QO";
public static final String OBS_SK = "ppTtbisjdBxQsU124mFnubSojUsB6Wvp9KSaUAeb";
public static final String OBS_END_POINT = "obs.cn-east-3.myhuaweicloud.com";
public static final String OBS_BUCKET_NAME = "mes-wms-obs";
public static final String OBS_LOCATION = "cn-east-3";
// //OBS
// public static final String OBS_AK = "TPNXQ2LUMRHNYYOBO8QO";
// public static final String OBS_SK = "ppTtbisjdBxQsU124mFnubSojUsB6Wvp9KSaUAeb";
// public static final String OBS_END_POINT = "obs.cn-east-3.myhuaweicloud.com";
// public static final String OBS_BUCKET_NAME = "mes-wms-obs";
// public static final String OBS_LOCATION = "cn-east-3";
//字体位置
public static final String FONDS_TEMP_PATH = File.separator+"usr" + File.separator+ "share" + File.separator+ "fonts" + File.separator+ "myfonts" + File.separator;

2
pom.xml
Unescape Escape View File

@ -29,8 +29,8 @@
<log4j2.level>INFO</log4j2.level>
<skipTests>true</skipTests>
<app.charset>UTF-8</app.charset>
<impp.framework.version>1.0.1-YZ</impp.framework.version>
<!-- <impp.framework.version>1.0.0.4-patch</impp.framework.version>-->
<i3plus.pojo.version>1.0.0-yfai</i3plus.pojo.version>
<i3plus.platform.version>1.0.0.1-patch</i3plus.platform.version>
<i3plus.icloud.version>1.0.0.1-patch</i3plus.icloud.version>

Write Preview
Loading…
Cancel
Save