ly пре 7 месеци
родитељ
комит
ff447b35b5

+ 17 - 1
master/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java

@@ -1,12 +1,16 @@
 package com.ruoyi.project.monitor.service.impl;
 
 import java.util.List;
+
+import com.alibaba.fastjson.JSON;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.project.monitor.domain.SysOperLog;
 import com.ruoyi.project.monitor.mapper.SysOperLogMapper;
 import com.ruoyi.project.monitor.service.ISysOperLogService;
 
+import javax.annotation.Resource;
+
 /**
  * 操作日志 服务层处理
  *
@@ -15,7 +19,7 @@ import com.ruoyi.project.monitor.service.ISysOperLogService;
 @Service
 public class SysOperLogServiceImpl implements ISysOperLogService
 {
-    @Autowired
+    @Resource
     private SysOperLogMapper operLogMapper;
 
     /**
@@ -26,9 +30,21 @@ public class SysOperLogServiceImpl implements ISysOperLogService
     @Override
     public void insertOperlog(SysOperLog operLog)
     {
+        operLog.setOperParam(truncateToVarchar2(operLog.getOperParam()));
+        operLog.setErrorMsg(truncateToVarchar2(operLog.getErrorMsg()));
+        operLog.setJsonResult(truncateToVarchar2(operLog.getJsonResult()));
+        operLog.setOperUrl(truncateToVarchar2(operLog.getOperUrl()));
+        System.out.println(JSON.toJSONString(operLog));
         operLogMapper.insertOperlog(operLog);
     }
 
+    public String truncateToVarchar2(String input) {
+        if (input != null && input.length() > 1998) {
+            return input.substring(0, 1998);
+        }
+        return input;
+    }
+
     /**
      * 查询系统操作日志集合
      *

+ 1 - 0
master/src/main/java/com/ruoyi/project/training/elearn/service/impl/TElPaperServiceImpl.java

@@ -481,6 +481,7 @@ public class TElPaperServiceImpl implements ITElPaperService {
         List<TElPaperQuAnswer> batchAnswerList = new ArrayList<>();
         long sort = 0;
         TElQuAnswer qury = new TElQuAnswer();
+        //线程池
 
         for (TElPaperQu item : quList) {
             item.setPaperId(paperId);

+ 2 - 1
ui/src/layout/components/Navbar.vue

@@ -172,7 +172,8 @@ export default {
         type: 'warning'
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
-          location.href = '/index';
+          location.href = '/cpms/index.html';
+          // location.href = '/index';
         })
       })
     }

+ 1 - 1
ui/src/views/production/prdRecord/index.vue

@@ -84,7 +84,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleExport(scope.row)"
-            v-hasPermi="['production:prdRecord:edit']"
+            v-hasPermi="['production:prdRecord:export']"
           >导出</el-button>
           <el-button
             size="mini"