Merge remote-tracking branch 'origin/master'

.gitignore

@@ -30,6 +30,7 @@ nbproject/private/
 build/*
 nbbuild/
 dist/
+node_modules/
 nbdist/
 .nb-gradle/
 

dgtly-admin/src/main/resources/static/assets/js/index.9885e3e3.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"./assets/js/index.9885e3e3.js","sources":["webpack:///./assets/js/index.9885e3e3.js"],"mappings":"AAAA;;;;;;;;;;;;;AA08EA;;;;;;;;;;;AA6fA;;;;;;;;AAotYA","sourceRoot":""}

dgtly-admin/src/main/resources/static/assets/js/index.e1888b97.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"./assets/js/index.e1888b97.js","sources":["webpack:///./assets/js/index.e1888b97.js"],"mappings":"AAAA;;;;;;;;;;;;;AAy0EA;;;;;;;;;;;AA6fA;;;;;;;;AAu2YA;;;;;;;AA2jkBA","sourceRoot":""}

dgtly-homeIndexSrc/shuoming.md

@@ -0,0 +1,3 @@
+这是 框架改造首页磁贴页面的源码，编译后生成的index页面和js等文件要替换admin下的页面
+其中index.html页面 应改为homeIndex.html页面进行替换  js等文件要替换static/assets
+下的所有文件。

dgtly-admin/src/main/resources/templates/homeIndexSrc/src/modules/index.ts

@@ -147,7 +147,6 @@ class MagnetManager {
     if (magnet.appType === 1) {
       magnet.url = `/appIndex?menuId=${magnet.menuId}`;
     }
-    magnet.url = `${process.env.BASE_API}${magnet.url}`;
     const iframe = $("<iframe>").appendTo(this.box!);
     const div = $("<div>")
       .on({

dgtly-admin/src/main/resources/templates/homeIndexSrc/webpack.config.js

@@ -1,3 +1,4 @@
+
 const path = require('path');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');