优化自动部署

src/main/vue/src/pages/DeploySystem.vue

@@ -1,27 +1,43 @@
 <template>
     <div class="container">
-        <div v-if="building" class="building">
-            <el-alert
-                v-if="percentage<100"
-                :closable="false"
-                title="部署中"
-                type="info"
-                show-icon>
-            </el-alert>
-            <el-alert
-                v-else
-                :closable="false"
-                title="部署成功"
-                type="success"
-                show-icon>
-            </el-alert>
-            <el-progress :percentage="percentage"></el-progress>
-            <pre class="output" ref="output">{{output}}</pre>
-        </div>
-        <div v-else>
-            <el-alert title="请谨慎操作" type="warning" description="重新部署会导致网站暂时无法访问" :closable="false" show-icon></el-alert>
-            <el-button size="small" style="margin-top:20px" @click="deploy">重新部署</el-button>
+        <el-alert
+            v-if="state === 0"
+            title="请谨慎操作"
+            type="warning"
+            description="重新部署会导致网站暂时无法访问"
+            :closable="false"
+            show-icon>
+        </el-alert>
+        <div v-if="state === 0" style="margin-top:20px">
+            <el-button size="small" @click="deploy" type="danger" plain>重新部署</el-button>
         </div>
+
+
+        <el-alert
+            v-if="state === 1"
+            :closable="false"
+            title="部署中-编译代码"
+            description="部署过程中请不要进行其他操作"
+            type="info"
+            show-icon>
+        </el-alert>
+        <el-alert
+            v-if="state === 2"
+            :closable="false"
+            title="部署中-重启tomcat"
+            description="部署过程中请不要进行其他操作"
+            type="info"
+            show-icon>
+        </el-alert>
+        <el-alert
+            v-if="state === 3"
+            :closable="false"
+            title="部署成功"
+            type="success"
+            show-icon>
+        </el-alert>
+        <el-progress :percentage="percentage" v-if="state !== 0"></el-progress>
+        <pre class="output" ref="output" v-if="state !== 0">{{output}}</pre>
     </div>
 </template>
 <script>
@@ -32,7 +48,7 @@
             return {
                 url: '',
                 percentage: 0,
-                building: false,
+                state: 0,
                 output: ''
             }
         },
@@ -59,7 +75,7 @@
                     this.url = res.data.executable.url;
                     this.percentage = 0;
                     this.output = '';
-                    this.building = true;
+                    this.state = 1;
                     this.pollingStatus();
                 }).catch(e => {
                 });
@@ -73,16 +89,21 @@
                             this.percentage = p;
                             setTimeout(() => {
                                 this.pollingStatus();
-                                this.pollingOutputs();
-                            }, 500);
+                            }, 1000);
                         } else {
-                            this.percentage = 100;
-                            this.$message.success('部署成功')
+                            this.state = 2;
+                            axios.get('http://49.4.67.181:8083/admin#/myTasks' || this.$baseUrl, {
+                                timeout: 600000
+                            }).then(res => {
+                                this.state = 3;
+                                this.percentage = 100;
+                                this.$message.success('部署成功')
+                            }).catch(e => {
+
+                            });
                         }
                     }
-                })
-            },
-            pollingOutputs() {
+                });
                 axios.get(`${this.url}/logText/progressiveText?start=0`).then(res => {
                     if (res.status === 200) {
                         this.output = res.data;
@@ -100,20 +121,13 @@
         display: flex;
         flex-direction: column;
         height: 100%;
-        overflow: auto;
-        .building {
-            display: flex;
-            flex-direction: column;
-            height: 100%;
+        .output {
+            flex-basis: 0;
+            flex-grow: 1;
             overflow: auto;
-            .output {
-                flex-basis: 0;
-                flex-grow: 1;
-                overflow: auto;
-                margin-top: 40px;
-                font-size: 14px;
-                color: #666666;
-            }
+            margin-top: 40px;
+            font-size: 14px;
+            color: #666666;
         }
     }
 </style>

src/main/vue/src/router/index.js

@@ -238,40 +238,9 @@ const router = new Router({
             name: 'login',
             component: () => import('../pages/Login')
         },
-
-        {
-            path: '/appLineChart',
-            name: 'appLineChart',
-            component: () => import('../pages/LineChart')
-        },
-        {
-            path: '/appBarChart',
-            name: 'appBarChart',
-            component: () => import('../pages/BarChart')
-        },
-        {
-            path: '/appPieChart',
-            name: 'appPieChart',
-            component: () =>
-                import('../pages/PieChart')
-        },
-        {
-            path: '/appPolarAreaChart',
-            name: 'appPolarAreaChart',
-            component: () =>
-                import('../pages/PolarAreaChart')
-        },
-        {
-            path: '/appRadarChart',
-            name: 'appRadarChart',
-            component: () =>
-                import('../pages/RadarChart')
-        },
         {
-            path: '/appBubbleChart',
-            name: 'appBubbleChart',
-            component: () =>
-                import('../pages/BubbleChart')
+            path: '*',
+            redirect: '/404'
         }
     ]
 });
@@ -314,4 +283,4 @@ router.afterEach((to, from) => {
     window.onresize();
 });
 
-export default router;
+export default router;

src/main/webapp/WEB-INF/html/admin.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>管理后台</title><link rel=icon href=static/favicon.ico><script defer=defer src=https://use.fontawesome.com/releases/v5.0.10/js/all.js integrity=sha384-slN8GvtUJGnv6ca26v8EzVaR9DC58QEwsIk9q1QXdCU8Yu8ck/tL/5szYlBbqmS+ crossorigin=anonymous></script><link href=/static/css/app.cde909f66885a65244b75d4e720d7459.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.14eed82b21c451527bf2.js></script><script type=text/javascript src=/static/js/vendor.8ba0fb9bc5a4e3599956.js></script><script type=text/javascript src=/static/js/app.f0b3de52dfd123166b1d.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>管理后台</title><link rel=icon href=static/favicon.ico><script defer=defer src=https://use.fontawesome.com/releases/v5.0.10/js/all.js integrity=sha384-slN8GvtUJGnv6ca26v8EzVaR9DC58QEwsIk9q1QXdCU8Yu8ck/tL/5szYlBbqmS+ crossorigin=anonymous></script><link href=/static/css/app.503b9a47068372c2ed0e84e4c2611dfd.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.ea96398ff0b1082ca2db.js></script><script type=text/javascript src=/static/js/vendor.7314dc34c0154e966ee1.js></script><script type=text/javascript src=/static/js/app.448604a8851dbb65c694.js></script></body></html>

src/main/webapp/static/js/22.c5bc34261e9f67860c34.js → src/main/webapp/static/js/24.c19b15f844d5b1f05375.js

@@ -1,2 +1,2 @@
-webpackJsonp([22],{BXS2:function(t,e,o){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=o("mtWM"),a=o.n(r),n={data:function(){return{taskForm:[],taskFormData:{},loading:!1}},created:function(){var t=this;this.$http.get({url:"/rest/form/form-data",data:{taskId:this.$route.query.id}}).then(function(e){t.taskForm=e.formProperties,t.taskFormData={}})},methods:{completeTask:function(){var t=this;this.$refs.taskForm.validate(function(e){e&&(t.loading=!0,a.a.post("rest/form/form-data",{taskId:t.$route.query.id,properties:t.$refs.taskForm.getData()}).then(function(e){t.loading=!1,t.$message.success("成功"),t.$router.go(-1)}).catch(function(e){console.log(e),t.loading=!1,t.$message.error("失败")}))})}},components:{DynamicForm:o("uBmv").a}},s={render:function(){var t=this,e=t.$createElement,o=t._self._c||e;return o("div",[o("h3"),t._v(" "),o("dynamic-form",{ref:"taskForm",staticStyle:{width:"500px"},attrs:{formProps:t.taskForm}},[o("el-form-item",[o("el-button",{on:{click:function(e){t.$router.go(-1)}}},[t._v("取消")]),t._v(" "),o("el-button",{attrs:{type:"primary",loading:t.loading},on:{click:t.completeTask}},[t._v("完成")])],1)],1)],1)},staticRenderFns:[]};var i=o("VU/8")(n,s,!1,function(t){o("j9OR")},"data-v-75280462",null);e.default=i.exports},j9OR:function(t,e){}});
-//# sourceMappingURL=22.c5bc34261e9f67860c34.js.map
+webpackJsonp([24],{BXS2:function(t,e,o){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=o("mtWM"),a=o.n(r),n={data:function(){return{taskForm:[],taskFormData:{},loading:!1}},created:function(){var t=this;this.$http.get({url:"/rest/form/form-data",data:{taskId:this.$route.query.id}}).then(function(e){t.taskForm=e.formProperties,t.taskFormData={}})},methods:{completeTask:function(){var t=this;this.$refs.taskForm.validate(function(e){e&&(t.loading=!0,a.a.post("rest/form/form-data",{taskId:t.$route.query.id,properties:t.$refs.taskForm.getData()}).then(function(e){t.loading=!1,t.$message.success("成功"),t.$router.go(-1)}).catch(function(e){console.log(e),t.loading=!1,t.$message.error("失败")}))})}},components:{DynamicForm:o("uBmv").a}},s={render:function(){var t=this,e=t.$createElement,o=t._self._c||e;return o("div",[o("h3"),t._v(" "),o("dynamic-form",{ref:"taskForm",staticStyle:{width:"500px"},attrs:{formProps:t.taskForm}},[o("el-form-item",[o("el-button",{on:{click:function(e){t.$router.go(-1)}}},[t._v("取消")]),t._v(" "),o("el-button",{attrs:{type:"primary",loading:t.loading},on:{click:t.completeTask}},[t._v("完成")])],1)],1)],1)},staticRenderFns:[]};var i=o("VU/8")(n,s,!1,function(t){o("j9OR")},"data-v-75280462",null);e.default=i.exports},j9OR:function(t,e){}});
+//# sourceMappingURL=24.c19b15f844d5b1f05375.js.map

src/main/webapp/static/js/31.347f8468819d5d878958.js → src/main/webapp/static/js/38.29f8abbe94a7c5d999f8.js

@@ -1,2 +1,2 @@
-webpackJsonp([31],{Wh3M:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",[a("el-form",{ref:"form",staticStyle:{"max-width":"500px"},attrs:{model:e.formData,rules:e.rules,"label-width":"80px","label-position":"right",size:"small"}},[a("el-form-item",{attrs:{prop:"dataruleName",label:"权限名称"}},[a("el-input",{model:{value:e.formData.dataruleName,callback:function(t){e.$set(e.formData,"dataruleName",t)},expression:"formData.dataruleName"}})],1),e._v(" "),a("el-form-item",{attrs:{prop:"permission",label:"权限标识"}},[a("el-input",{model:{value:e.formData.permission,callback:function(t){e.$set(e.formData,"permission",t)},expression:"formData.permission"}})],1),e._v(" "),a("el-form-item",[a("el-button",{attrs:{loading:e.$store.state.fetchingData,type:"primary"},on:{click:e.onSave}},[e._v("保存")]),e._v(" "),a("el-button",{on:{click:function(t){e.$router.go(-1)}}},[e._v("取消")])],1)],1)],1)},staticRenderFns:[]};var s=a("VU/8")({created:function(){var e=this;this.$route.query.id&&this.$http.get({url:"/sysDatarule/getOne",data:{id:this.$route.query.id}}).then(function(t){t.success&&(e.formData=t.data)})},data:function(){return{saving:!1,formData:{},rules:{dataruleName:[{required:!0,message:"请填写权限名称",trigger:"blur"}],permission:[{required:!0,message:"请填写权限标识",trigger:"blur"}]},menus:[]}},methods:{onSave:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;e.submit()})},submit:function(){var e=this;this.$http.post({url:this.formData.id?"/sysDatarule/update":"/sysDatarule/save",data:this.formData}).then(function(t){t.success?(e.$message.success("成功"),e.$router.go(-1)):e.$message.warning("失败")})}}},r,!1,function(e){a("awIv")},"data-v-3d1f3150",null);t.default=s.exports},awIv:function(e,t){}});
-//# sourceMappingURL=31.347f8468819d5d878958.js.map
+webpackJsonp([38],{Wh3M:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",[a("el-form",{ref:"form",staticStyle:{"max-width":"500px"},attrs:{model:e.formData,rules:e.rules,"label-width":"80px","label-position":"right",size:"small"}},[a("el-form-item",{attrs:{prop:"dataruleName",label:"权限名称"}},[a("el-input",{model:{value:e.formData.dataruleName,callback:function(t){e.$set(e.formData,"dataruleName",t)},expression:"formData.dataruleName"}})],1),e._v(" "),a("el-form-item",{attrs:{prop:"permission",label:"权限标识"}},[a("el-input",{model:{value:e.formData.permission,callback:function(t){e.$set(e.formData,"permission",t)},expression:"formData.permission"}})],1),e._v(" "),a("el-form-item",[a("el-button",{attrs:{loading:e.$store.state.fetchingData,type:"primary"},on:{click:e.onSave}},[e._v("保存")]),e._v(" "),a("el-button",{on:{click:function(t){e.$router.go(-1)}}},[e._v("取消")])],1)],1)],1)},staticRenderFns:[]};var s=a("VU/8")({created:function(){var e=this;this.$route.query.id&&this.$http.get({url:"/sysDatarule/getOne",data:{id:this.$route.query.id}}).then(function(t){t.success&&(e.formData=t.data)})},data:function(){return{saving:!1,formData:{},rules:{dataruleName:[{required:!0,message:"请填写权限名称",trigger:"blur"}],permission:[{required:!0,message:"请填写权限标识",trigger:"blur"}]},menus:[]}},methods:{onSave:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;e.submit()})},submit:function(){var e=this;this.$http.post({url:this.formData.id?"/sysDatarule/update":"/sysDatarule/save",data:this.formData}).then(function(t){t.success?(e.$message.success("成功"),e.$router.go(-1)):e.$message.warning("失败")})}}},r,!1,function(e){a("awIv")},"data-v-3d1f3150",null);t.default=s.exports},awIv:function(e,t){}});
+//# sourceMappingURL=38.29f8abbe94a7c5d999f8.js.map