ly 3 years ago
parent
commit
15e0899973

+ 14 - 14
master/src/main/resources/application.yml

@@ -90,24 +90,24 @@ spring:
         max-wait: -1ms
         max-wait: -1ms
   # 邮箱配置
   # 邮箱配置
   mail:
   mail:
-    host: smtpout.basf-it-services.com
-    protocol: smtp
-    default-encoding: UTF-8
-    password:
-    username:
-    port: 25
-    properties.mail.stmp.socketFactory.class: javax.net.ssl.SSLSocketFactory
-    properties.mail.debug: true
-    from: CPMS.byc@BASF-YPC.com.cn
-#    host: smtp.exmail.qq.com
+#    host: smtpout.basf-it-services.com
 #    protocol: smtp
 #    protocol: smtp
 #    default-encoding: UTF-8
 #    default-encoding: UTF-8
-#    password: vvTAT8hciG7FLk4C
-#    username: email@seashoreept.com
-#    port: 587
+#    password:
+#    username:
+#    port: 25
 #    properties.mail.stmp.socketFactory.class: javax.net.ssl.SSLSocketFactory
 #    properties.mail.stmp.socketFactory.class: javax.net.ssl.SSLSocketFactory
 #    properties.mail.debug: true
 #    properties.mail.debug: true
-#    from: email@seashoreept.com
+#    from: CPMS.byc@BASF-YPC.com.cn
+    host: smtp.exmail.qq.com
+    protocol: smtp
+    default-encoding: UTF-8
+    password: vvTAT8hciG7FLk4C
+    username: email@seashoreept.com
+    port: 587
+    properties.mail.stmp.socketFactory.class: javax.net.ssl.SSLSocketFactory
+    properties.mail.debug: true
+    from: email@seashoreept.com
 # token配置
 # token配置
 token:
 token:
     # 令牌自定义标识
     # 令牌自定义标识

+ 1 - 7
ui/package.json

@@ -44,7 +44,6 @@
     "@jiaminghi/data-view": "^2.10.0",
     "@jiaminghi/data-view": "^2.10.0",
     "@riophae/vue-treeselect": "0.4.0",
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "^0.21.1",
     "axios": "^0.21.1",
-    "bl-select": "^1.0.9",
     "clipboard": "2.0.4",
     "clipboard": "2.0.4",
     "core-js": "3.6.5",
     "core-js": "3.6.5",
     "dayjs": "^1.10.6",
     "dayjs": "^1.10.6",
@@ -61,7 +60,6 @@
     "quill": "1.3.7",
     "quill": "1.3.7",
     "screenfull": "4.2.0",
     "screenfull": "4.2.0",
     "sortablejs": "1.8.4",
     "sortablejs": "1.8.4",
-    "video.js": "^7.14.3",
     "vue": "2.6.10",
     "vue": "2.6.10",
     "vue-awesome": "^4.0.2",
     "vue-awesome": "^4.0.2",
     "vue-count-to": "1.0.13",
     "vue-count-to": "1.0.13",
@@ -71,7 +69,6 @@
     "vue-pdf": "^4.2.0",
     "vue-pdf": "^4.2.0",
     "vue-router": "3.0.2",
     "vue-router": "3.0.2",
     "vue-splitpane": "1.0.4",
     "vue-splitpane": "1.0.4",
-    "vue-video-player": "^5.0.2",
     "vuedraggable": "2.20.0",
     "vuedraggable": "2.20.0",
     "vuex": "3.1.0"
     "vuex": "3.1.0"
   },
   },
@@ -102,10 +99,7 @@
     "script-loader": "0.7.2",
     "script-loader": "0.7.2",
     "serve-static": "1.13.2",
     "serve-static": "1.13.2",
     "svg-sprite-loader": "4.1.3",
     "svg-sprite-loader": "4.1.3",
-    "svgo": "1.2.0",
-    "vue-organization-chart": "^1.1.6",
-    "vue-template-compiler": "2.6.10",
-    "vue-tree-chart": "^1.2.9"
+    "vue-template-compiler": "2.6.10"
   },
   },
   "engines": {
   "engines": {
     "node": ">=8.9",
     "node": ">=8.9",

+ 0 - 13
ui/src/main.js

@@ -21,7 +21,6 @@ import { getConfigKey } from "@/api/system/config";
 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/ruoyi";
 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/ruoyi";
 import Pagination from "@/components/Pagination";
 import Pagination from "@/components/Pagination";
 import i18n from './lang'
 import i18n from './lang'
-import BlSelect from 'bl-select'
 import "@/components/dialogdrag.js"
 import "@/components/dialogdrag.js"
 import dataV from '@jiaminghi/data-view';
 import dataV from '@jiaminghi/data-view';
 //自定义表格工具扩展
 //自定义表格工具扩展
@@ -37,20 +36,10 @@ import 'vue-awesome/icons/chart-line.js';
 import 'vue-awesome/icons/align-left.js';
 import 'vue-awesome/icons/align-left.js';
 // 适配flex
 // 适配flex
 
 
-
-import VueVideoPlayer from 'vue-video-player';
-import 'video.js/dist/video-js.css';
-
-Vue.use(VueVideoPlayer);
-
 // 全局注册图标
 // 全局注册图标
 Vue.component('icon', Icon);
 Vue.component('icon', Icon);
 // 全局方法挂载
 // 全局方法挂载
 
 
-import VideoPlayer from 'vue-video-player'
-require('video.js/dist/video-js.css')
-require('vue-video-player/src/custom-theme.css')
-
 Vue.prototype.getDicts = getDicts
 Vue.prototype.getDicts = getDicts
 Vue.prototype.getConfigKey = getConfigKey
 Vue.prototype.getConfigKey = getConfigKey
 Vue.prototype.parseTime = parseTime
 Vue.prototype.parseTime = parseTime
@@ -79,10 +68,8 @@ Vue.component('Pagination', Pagination)
 Vue.component('RightToolbar', RightToolbar)
 Vue.component('RightToolbar', RightToolbar)
 
 
 Vue.use(permission)
 Vue.use(permission)
-Vue.use(BlSelect)
 Vue.use(dataV)
 Vue.use(dataV)
 
 
-Vue.use(VideoPlayer)
 /**
 /**
  * If you don't want to use mock-server
  * If you don't want to use mock-server
  * you want to use MockJs for mock api
  * you want to use MockJs for mock api

+ 1 - 1
ui/src/router/index.js

@@ -446,7 +446,7 @@ export const constantRoutes = [
         meta: { title: '主要内容' }
         meta: { title: '主要内容' }
       }
       }
     ]
     ]
-  }
+  },
 ]
 ]
 
 
 export default new Router({
 export default new Router({

+ 0 - 28
ui/src/views/front/materialBalance.vue

@@ -22,38 +22,10 @@
 </template>
 </template>
 
 
 <script>
 <script>
-  import 'videojs-flash'
-
   export default {
   export default {
     name: "materialBalance",
     name: "materialBalance",
     data () {
     data () {
       return {
       return {
-        // 视频播放
-        playerOptions: {
-          playbackRates: [0.7, 1.0, 1.5, 2.0], //播放速度
-          autoplay: false, //如果true,浏览器准备好时开始回放。
-          muted: false, // 默认情况下将会消除任何音频。
-          loop: false, // 导致视频一结束就重新开始。
-          preload: 'auto', // 建议浏览器在<video>加载元素后是否应该开始下载视频数据。auto浏览器选择最佳行为,立即开始加载视频(如果浏览器支持)
-          language: 'zh-CN',
-          aspectRatio: '16:9', // 将播放器置于流畅模式,并在计算播放器的动态大小时使用该值。值应该代表一个比例 - 用冒号分隔的两个数字(例如"16:9"或"4:3")
-          fluid: true, // 当true时,Video.js player将拥有流体大小。换句话说,它将按比例缩放以适应其容器。
-          sources: [{
-            type: "",
-            src: 'http://sante.weixinbe.com/public/supplier/1527739003138040.mp4'//url地址
-            // src: 'http://www.html5videoplayer.net/videos/madagascar3.mp4'//url地址
-            // src: "" //url地址
-          }],
-          poster: "", //你的封面地址
-          // width: document.documentElement.clientWidth,
-          notSupportedMessage: '此视频暂无法播放,请稍后再试', //允许覆盖Video.js无法播放媒体源时显示的默认信息。
-          controlBar: {
-            timeDivider: true,
-            durationDisplay: true,
-            remainingTimeDisplay: false,
-            fullscreenToggle: true  //全屏按钮
-          }
-        }
       }
       }
     }
     }
   }
   }

+ 1 - 0
ui/src/views/index.vue

@@ -142,6 +142,7 @@
   import productTank from "./front/productTank";
   import productTank from "./front/productTank";
   import dayjs from "dayjs";
   import dayjs from "dayjs";
   import '@/common/flexible.js';
   import '@/common/flexible.js';
+  import dataV from '@jiaminghi/data-view';
 
 
   export default {
   export default {
     data() {
     data() {

+ 7 - 1
ui/vue.config.js

@@ -53,6 +53,9 @@ module.exports = {
     }
     }
   },
   },
   chainWebpack(config) {
   chainWebpack(config) {
+    //去除打包后缀的hash值
+    // config.output.filename('static/js/[name].js').end();
+    // config.output.chunkFilename('static/js/[name].js').end();
     config.plugins.delete('preload') // TODO: need test
     config.plugins.delete('preload') // TODO: need test
     config.plugins.delete('prefetch') // TODO: need test
     config.plugins.delete('prefetch') // TODO: need test
 
 
@@ -87,9 +90,12 @@ module.exports = {
           config
           config
             .optimization.splitChunks({
             .optimization.splitChunks({
               chunks: 'all',
               chunks: 'all',
+              maxAsyncRequests: 100,
+              minSize: 30000, // 字节 引入的文件大于30kb才进行分割
               cacheGroups: {
               cacheGroups: {
                 libs: {
                 libs: {
                   name: 'chunk-libs',
                   name: 'chunk-libs',
+                  minChunks: 3,
                   test: /[\\/]node_modules[\\/]/,
                   test: /[\\/]node_modules[\\/]/,
                   priority: 10,
                   priority: 10,
                   chunks: 'initial' // only package third parties that are initially dependent
                   chunks: 'initial' // only package third parties that are initially dependent
@@ -102,7 +108,7 @@ module.exports = {
                 commons: {
                 commons: {
                   name: 'chunk-commons',
                   name: 'chunk-commons',
                   test: resolve('src/components'), // can customize your rules
                   test: resolve('src/components'), // can customize your rules
-                  minChunks: 3, //  minimum common number
+                  minChunks: 100, //  minimum common number
                   priority: 5,
                   priority: 5,
                   reuseExistingChunk: true
                   reuseExistingChunk: true
                 }
                 }