Merge branch 'master' into test

sys-sdk/src/main/java/com/xy/utils/LogUtils.java

@@ -40,6 +40,12 @@ public class LogUtils {
      * @param optTime    操作耗时
      */
     public static void operate(LogEnum.LogType logType, LogEnum.OptType optType, String logContent, int optTime) {
+        Long loginId = null;
+        try {
+            loginId = AuthorizeUtils.getLoginId(Long.class);
+        } catch (Exception e) {
+
+        }
         JSONObject jsonObject = new JSONObject()
                 .set("logType", logType.getValue())
                 .set("logContent", logContent)
@@ -48,7 +54,7 @@ public class LogUtils {
                 .set("optTime", optTime)
                 .set("clientType", AuthorizeUtils.getClientType())
                 .set("sysId", AuthorizeUtils.getSysId())
-                .set("optUserId", AuthorizeUtils.getLoginId(Long.class))
+                .set("optUserId", loginId)
                 .set("clientIp", getIp())
                 .set("serviceName", springConfigs.getApplication().getName())
                 .set("type", "operate");