Merge branch 'develop'

src/dsb/com/cnd3b/restcontroller/enterprise/webclient/archives/archives_ad.java

@@ -29,8 +29,8 @@ public class archives_ad extends Controller {
         /**
          *排序条件设置
          */
-        String[] sortfield = {"t1.checkdate", "t1.fvisitors", "t1.fshares"};
-        String sort = getSort(sortfield, "t1.checkdate desc");
+        String[] sortfield = {"t1.tarchives_adid desc"};
+        String sort = getSort(sortfield, "t1.tarchives_adid desc");
 
         /**
          * 过滤条件设置

src/dsb/com/cnd3b/restcontroller/enterprise/webclient/complaint/complaint.java

@@ -26,8 +26,8 @@ public class complaint extends Controller {
         /**
          *排序条件设置
          */
-        String[] sortfield = {"createdate"};
-        String sort = getSort(sortfield, "createdate");
+        String[] sortfield = {"createdate desc"};
+        String sort = getSort(sortfield, "createdate desc");
         /**
          * 过滤条件设置
          */

src/dsb/com/cnd3b/restcontroller/system/system/docManage.java

@@ -227,9 +227,13 @@ public class docManage extends Controller {
                     if (obsfilename.endsWith("mp4") || obsfilename.endsWith("MP4")) {
                         MpcFactory mpcFactory = new MpcFactory();
                         MediaMetaData data = mpcFactory.getMetaData(siteid, obsfilename);
-                        if (data != null && data.getBitrate() > 0 && data.getBitrate() / 1024 > 5000) {
-                            System.err.println("开始进行视频转码：" + siteid + "," + obsfilename);
-                            mpctaskid = mpcFactory.createMpcTask(siteid, obsfilename);
+                        if (data != null) {
+                            long bitrate = data.getBitrate();
+                            long size = data.getSize();
+                            if (bitrate / 1024 > 5000 || size / (1024 * 1024) > 500) {
+                                System.err.println("开始进行视频转码：" + siteid + "," + obsfilename);
+                                mpctaskid = mpcFactory.createMpcTask(siteid, obsfilename);
+                            }
                         }
                     } else if (obsfilename.endsWith("mov") || obsfilename.endsWith("MOV")) {
                         System.err.println("开始进行视频转码：" + siteid + "," + obsfilename);
@@ -297,9 +301,13 @@ public class docManage extends Controller {
             if (obsfilename.endsWith("mp4") || obsfilename.endsWith("MP4")) {
                 MpcFactory mpcFactory = new MpcFactory();
                 MediaMetaData data = mpcFactory.getMetaData(siteid, obsfilename);
-                if (data != null && data.getBitrate() > 0 && data.getBitrate() / 1024 > 5000) {
-                    System.err.println("开始进行视频转码：" + siteid + "," + obsfilename);
-                    mpctaskid = mpcFactory.createMpcTask(siteid, obsfilename);
+                if (data != null) {
+                    long bitrate = data.getBitrate();
+                    long size = data.getSize();
+                    if (bitrate / 1024 > 5000 || size / (1024 * 1024) > 500) {
+                        System.err.println("开始进行视频转码：" + siteid + "," + obsfilename);
+                        mpctaskid = mpcFactory.createMpcTask(siteid, obsfilename);
+                    }
                 }
             } else if (obsfilename.endsWith("mov") || obsfilename.endsWith("MOV")) {
                 System.err.println("开始进行视频转码：" + siteid + "," + obsfilename);
@@ -393,9 +401,13 @@ public class docManage extends Controller {
                 if (obsfilename.endsWith("mp4") || obsfilename.endsWith("MP4")) {
                     MpcFactory mpcFactory = new MpcFactory();
                     MediaMetaData data = mpcFactory.getMetaData(siteid, obsfilename);
-                    if (data != null && data.getBitrate() > 0 && data.getBitrate() / 1024 > 5000) {
-                        System.err.println("开始进行视频转码：" + siteid + "," + obsfilename);
-                        mpctaskid = mpcFactory.createMpcTask(siteid, obsfilename);
+                    if (data != null) {
+                        long bitrate = data.getBitrate();
+                        long size = data.getSize();
+                        if (bitrate / 1024 > 5000 || size / (1024 * 1024) > 500) {
+                            System.err.println("开始进行视频转码：" + siteid + "," + obsfilename);
+                            mpctaskid = mpcFactory.createMpcTask(siteid, obsfilename);
+                        }
                     }
                 } else if (obsfilename.endsWith("mov") || obsfilename.endsWith("MOV")) {
                     System.err.println("开始进行视频转码：" + siteid + "," + obsfilename);

src/dsb/com/cnd3b/restcontroller/system/tiktok/tiktok.java

@@ -0,0 +1,22 @@
+package com.cnd3b.restcontroller.system.tiktok;
+
+import com.alibaba.fastjson.JSONObject;
+import com.cnd3b.common.Controller;
+
+public class tiktok extends Controller {
+    /**
+     * ¹¹Ô캯Êý
+     *
+     * @param content
+     */
+    public tiktok(JSONObject content) {
+        super(content);
+    }
+
+    public String getParameter() {
+        JSONObject object = new JSONObject();
+        object.put("client_key", "awuzim1t30hfh6sa");
+        //object.put("client_secret", "5ee99ece849ac07c9af270ebe9b694f4");
+        return getSucReturnObject().setData(object).saveToDataPool().toString();
+    }
+}

src/dsb/com/cnd3b/restcontroller/system/users/Users.java

@@ -102,7 +102,7 @@ public class Users extends Controller {
         if (resultcode == 0) {
             PaoSetRemote tenterprise_usersSet = getP2ServerSystemPaoSet("tenterprise_users", "tenterprise_userid='" + userid + "' and siteid='" + siteid + "'");
             if (!tenterprise_usersSet.isEmpty()) {
-                tenterprise_usersSet.getPao(0).setValue("fphonenumber", fphonenumber, 11L);
+                tenterprise_usersSet.getPao(0).setValue("fphonenumber", phonenumber, 11L);
                 tenterprise_usersSet.save();
             } else {
                 return getErrReturnObject().setErrMsg("ÕÒ²»µ½µ±Ç°Õ˺ÅÐÅÏ¢").toString();