LY 侧厚

master/src/main/java/com/ruoyi/project/officeConvert/officeConvertController.java → master/src/main/java/com/ruoyi/project/officeConvert/OfficeConvertController.java

@@ -1,14 +1,10 @@
 package com.ruoyi.project.officeConvert;
 
-import com.google.common.primitives.Bytes;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.common.utils.ffmpeg.MediaConvertUtils;
-import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.framework.web.domain.AjaxResult;
 
 import org.jodconverter.DocumentConverter;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.*;
@@ -19,20 +15,19 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static com.ruoyi.project.officeConvert.pptPreview.pptToImage;
-import static com.ruoyi.project.officeConvert.pptPreview.pptxToImage;
+import static com.ruoyi.project.officeConvert.PptPreview.pptToImage;
+import static com.ruoyi.project.officeConvert.PptPreview.pptxToImage;
 
 
 @Component
 @RestController
 @RequestMapping(value="/office",method = RequestMethod.POST)
-public class officeConvertController {
+public class OfficeConvertController {
     /**
      office类型的文件
      先远程服务端获取文件

master/src/main/java/com/ruoyi/project/officeConvert/pptPreview.java → master/src/main/java/com/ruoyi/project/officeConvert/PptPreview.java

@@ -17,7 +17,7 @@ import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 
-public class pptPreview {
+public class PptPreview {
 
     //pptx转为图片的方法
     public static List pptToImage(File pptFile, File imgFile,String newName) {

master/src/main/resources/application.yml

@@ -179,15 +179,6 @@ jodconverter:
     # 开启多个LibreOffice进程，每个端口对应一个进程
     portNumbers: 9080,9081,9089
 
-  # 文件预览
-  jodconverter:
-    local:
-      enabled: true
-      max-tasks-per-process: 100
-      port-numbers: 8100
-      # 开启多个LibreOffice进程，每个端口对应一个进程
-      portNumbers: 9080,9081,9089
-
 # 代码生成
 gen:
   # 作者

ui/package.json

@@ -42,6 +42,7 @@
   "dependencies": {
     "@balkangraph/orgchart.js": "^7.9.15",
     "@jiaminghi/data-view": "^2.10.0",
+    "@popperjs/core": "^2.11.5",
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "^0.21.1",
     "clipboard": "2.0.4",
@@ -52,7 +53,6 @@
     "element-ui": "^2.15.5",
     "file-saver": "2.0.1",
     "fuse.js": "3.4.4",
-    "jquery": "^3.6.0",
     "js-beautify": "1.10.2",
     "js-cookie": "2.2.0",
     "jsencrypt": "3.0.0-rc.1",
@@ -83,7 +83,6 @@
     "babel-eslint": "10.1.0",
     "babel-jest": "23.6.0",
     "babel-plugin-dynamic-import-node": "2.3.3",
-    "bootstrap": "^5.1.3",
     "chalk": "2.4.2",
     "chokidar": "2.1.5",
     "connect": "3.6.6",
@@ -91,7 +90,6 @@
     "eslint-plugin-vue": "6.2.2",
     "html-webpack-plugin": "3.2.0",
     "husky": "1.3.1",
-    "jquery": "^3.6.0",
     "lint-staged": "8.1.5",
     "mockjs": "1.0.1-beta3",
     "node-sass": "4.14.1",
@@ -111,5 +109,5 @@
   "browserslist": [
     "> 1%",
     "last 2 versions"
-  ] 
+  ]
 }

ui/src/assets/css/myCss.css

@@ -1,37 +0,0 @@
-.el-loading-spinner{
-
-    /*这个是自己想设置的 gif 加载动图*/
-  
-    background-image:url('../img/loading.gif');
-  
-    background-repeat: no-repeat;
-  
-    background-size: 200px 120px;
-  
-    height:100px;
-  
-    width:100%;
-  
-    background-position:center;
-  
-    /*覆盖 element-ui 默认的 50% 因为此处设置了height:100%,所以不设置的话，会只显示一半，因为被top顶下去了*/
-  
-    top:40%;
-  
-   }
-  
-  .el-loading-spinner .circular {
-  
-   /*隐藏 之前 element-ui 默认的 loading 动画*/
-  
-   display: none; 
-  
-  } 
-  
-  .el-loading-spinner .el-loading-text{
-  
-   /*为了使得文字在loading图下面*/
-  
-   margin:85px 0px; 
-  
-  }

ui/src/main.js

@@ -1,18 +1,13 @@
 import Vue from 'vue'
-import $ from 'jquery' ;
-import 'bootstrap'
 import Cookies from 'js-cookie'
 
 import 'normalize.css/normalize.css' // a modern alternative to CSS resets
 
 import Element from 'element-ui'
-import 'element-ui/lib/theme-chalk/index.css';
 import './assets/styles/element-variables.scss'
-import './assets/css/myCss.css';
-
 import '@/assets/styles/index.scss' // global css
 import '@/assets/styles/ruoyi.scss' // ruoyi css
-  
+
 
 import App from './App'
 import store from './store'

ui/vue.config.js

@@ -1,8 +1,6 @@
 'use strict'
 const path = require('path')
 const defaultSettings = require('./src/settings.js')
-const webpack = require("webpack");
-
 function resolve(dir) {
   return path.join(__dirname, dir)
 }
@@ -47,16 +45,6 @@ module.exports = {
     },
     disableHostCheck: true
   },
-  configureWebpack: {
-    plugins: [
-      new webpack.ProvidePlugin({
-        $: "jquery",
-        jQuery: "jquery",
-        jquery: "jquery",
-        "window.jQuery": "jquery"
-      })
-    ],
-  },
   chainWebpack(config) {
     //去除打包后缀的hash值
     // config.output.filename('static/js/[name].js').end();
@@ -125,6 +113,6 @@ module.exports = {
              to:'./',//到根目录下
           }
         }
-      ) 
+      )
   }
 }