浏览代码

消费端,修改上传脚本命令

wuweihao 2 年之前
父节点
当前提交
c3f8803e55

+ 1 - 1
720yun_fd_consumer/gis_oss/src/main/java/com/gis/oss/command/CmdConstant.java

@@ -43,5 +43,5 @@ public class CmdConstant {
      *
      *  sudo bash /opt/ossutil/fyun-upload.sh test-4dkankan /root/data test_2/data aws folder
      */
-    public final static String UPLOAD_DIR = "sudo bash /opt/ossutil/fyun-upload.sh %s %s %s %s folder";
+    public final static String UPLOAD_DIR = "bash /opt/ossutil/fyun-upload.sh %s %s %s %s folder";
 }

+ 2 - 1
720yun_fd_consumer/gis_oss/src/main/java/com/gis/oss/util/FileAndOssUtil.java

@@ -104,7 +104,8 @@ public class FileAndOssUtil {
 
 	//上传的数据是byte[],key是上传后的文件名
 	public void upload(byte[] data,String key1) throws IOException{
-		log.info("开始上传文件 源路径:{},目标路径:{}, type:{}" , new String(data, "UTF-8"), key1, type);
+//		log.info("开始上传文件 源路径:{},目标路径:{}, type:{}" , new String(data, "UTF-8"), key1, type);
+		log.info("开始上传文件 , 目标路径:{}, type:{}" ,  key1, type);
 		StorageType storageType = StorageType.get(type);
 		switch (storageType){
 			case OSS:

+ 39 - 2
720yun_fd_manage/gis_application/src/main/resources/data/someData.json

@@ -37,5 +37,42 @@
   "share": "",
   "id": "",
   "remindTime": 1,
-  "status": 0
-}
+  "status": 0,
+  "openingAnimationType": "小行星开场",
+  "backgroundMusic": {
+    "id": "",
+    "name": "",
+    "ossPath": ""
+  },
+  "customMask": {
+    "earth": {
+      "icon": "",
+      "isShow": false
+    },
+    "sky": {
+      "icon": "",
+      "isShow": true
+    }
+  },
+  "customButton": [
+    {
+      "type": "电话",
+      "name": "电话",
+      "value": "",
+      "isShow": false
+    },
+    {
+      "type": "链接",
+      "name": "链接",
+      "value": "",
+      "isShow": false
+    }
+  ],
+  "explanation": {
+    "audioId": "",
+    "audioName": "",
+    "audioUrl": "",
+    "openByDefault": true,
+    "repeat": true
+  }
+}

+ 3 - 2
720yun_fd_manage/gis_oss/src/main/java/com/gis/oss/util/FileAndOssUtil.java

@@ -103,7 +103,8 @@ public class FileAndOssUtil {
 
 	//上传的数据是byte[],key是上传后的文件名
 	public void upload(byte[] data,String key1) throws IOException{
-		log.info("开始上传文件 源路径:{},目标路径:{}, type:{}" , new String(data, "UTF-8"), key1, type);
+//		log.info("开始上传文件 源路径:{},目标路径:{}, type:{}" , new String(data, "UTF-8"), key1, type);
+		log.info("开始上传文件 ,目标路径:{}, type:{}" ,  key1, type);
 		StorageType storageType = StorageType.get(type);
 		switch (storageType){
 			case OSS:
@@ -121,7 +122,7 @@ public class FileAndOssUtil {
 	}
 
 	public void upload(String filePath, String key1) {
-		log.info("开始上传文件 源路径:{},目标路径:{},type:{}" , filePath,key1,type);
+		log.info("开始上传文件 源路径:{},目标路径:{},type:{}" , filePath, key1, type);
 		StorageType storageType = StorageType.get(type);
 		switch (storageType){
 			case OSS:

+ 1 - 1
720yun_fd_manage/remark-m.md

@@ -89,7 +89,7 @@
          8. redis token 兼容v4 token问题
             
 ## sitPro 2022-11-21
-    doc:     
+    doc: https://testeur.4dkankan.com/qjkankan/doc.html  
  
 # 交换状态逻辑
     1. 用户体系用四维看看的sso