Ver Fonte

新增bucke_name数据库配置

吴志根 há 4 anos atrás
pai
commit
2ee878ed7f

+ 2 - 0
src/dsb/com/cnd3b/common/Controller.java

@@ -114,7 +114,9 @@ public class Controller extends BaseClass {
 
         if (ossClient == null) {
             ossClient = new OSSClientBuilder().build(END_POINT, AccessKey_ID, AccessKey_Secret);
+
         }
+        System.err.println("BUCKE_NAME_1:" + BUCKE_NAME_1);
 
     }
 

+ 10 - 0
src/dsb/com/cnd3b/common/parameter/parameter.java

@@ -141,6 +141,11 @@ public class parameter {
         return Bucket_sk;
     }
 
+    public static String oss_bucke_name() {
+        parameter_init();
+        return oss_bucke_name;
+    }
+
     public static void parameter_init() {
         if (isparameterinit) {
             return;
@@ -159,6 +164,7 @@ public class parameter {
                 OBS_expireSeconds = pao.getLong("obs_expireseconds");
                 SQLiteFilePath = pao.getString("sqlitefilepath");
                 UpLoadExcelErrFilePath = pao.getString("uploadexcelerrfilepath");
+                oss_bucke_name = pao.getString("oss_bucke_name");
                 isparameterinit = true;
             }
         } catch (Exception e) {
@@ -184,6 +190,10 @@ public class parameter {
     private static String Bucket_location;
     private static String Bucket_ak;
     private static String Bucket_sk;
+    /**
+     * oss
+     */
+    private static String oss_bucke_name;
     /**
      * ÊÇ·ñµ÷ÊÔģʽ
      */

+ 2 - 2
src/dsb/com/cnd3b/restcontroller/system/system/uploadExcelData.java

@@ -52,7 +52,7 @@ public class uploadExcelData extends Controller {
             if (!uploadData_tagentauth(writableWorkbook)) {
                 writableWorkbook.write();
                 errfile.exists();
-                return getErrReturnObject().setErrMsg("导入错误,是否下载错误信息").addKeyValue("errfileurl", "https://test.buwanjia.com/jsmanage/" + filename).toString();
+                return getErrReturnObject().setErrMsg("导入错误,是否下载错误信息").addKeyValue("errfileurl", "https://121.43.35.149/manage/" + filename).toString();
             } else {
                 errfile.delete();
                 errfile.exists();
@@ -89,7 +89,7 @@ public class uploadExcelData extends Controller {
             if (!uploadData_tagentauth(writableWorkbook)) {
                 writableWorkbook.write();
                 errfile.exists();
-                return getErrReturnObject().setErrMsg("导入错误,是否下载错误信息").addKeyValue("errfileurl", "https://test.buwanjia.com/jsmanage/" + filename).toString();
+                return getErrReturnObject().setErrMsg("导入错误,是否下载错误信息").addKeyValue("errfileurl", "https://121.43.35.149/manage/" + filename).toString();
             } else {
                 errfile.delete();
                 errfile.exists();

+ 4 - 1
src/dsb/com/cnd3b/utility/aliyun/oss/AliyunOSSUtil.java

@@ -6,6 +6,7 @@ import com.aliyun.oss.HttpMethod;
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
 import com.aliyun.oss.model.*;
+import com.cnd3b.common.parameter.parameter;
 
 import java.io.ByteArrayInputStream;
 import java.io.UnsupportedEncodingException;
@@ -20,7 +21,9 @@ import java.util.List;
 public class AliyunOSSUtil {
 
     //仓库名称-培训学习
-    public static final String BUCKE_NAME_1 = "jssx";
+//    public static final String BUCKE_NAME_1 = "jssx";
+    //仓库名称-培训学习测试用
+    public static final String BUCKE_NAME_1 = parameter.oss_bucke_name();
     //地域节点
     public static final String END_POINT = "oss-cn-hangzhou.aliyuncs.com";
     //AccessKey ID 阿里云AccessKey