release: 1.2.0-beta.2.

308aefac · ruibaby · 66e9c98d · 308aefac · 66e9c98d · 308aefac
Commit 308aefac authored 5 years ago by ruibaby
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 19 additions and 22 deletions
+19 -22
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ apply plugin: 'io.spring.dependency-management'

 group = 'run.halo.app'
 archivesBaseName = 'halo'
-version = '1.2.0-beta.1'
+version = '1.2.0-beta.2'
 sourceCompatibility = '1.8'
 description = 'Halo, personal blog system developed in Java.'


--- a/src/main/resources/admin/css/app.01b9c5fe.css
+++ b/src/main/resources/admin/css/app.01b9c5fe.css
--- a/src/main/resources/admin/css/app.747e01d4.css
+++ b/src/main/resources/admin/css/app.747e01d4.css
--- a/src/main/resources/admin/css/chunk-0e87dfa3.0e33e21a.css
+++ b/src/main/resources/admin/css/chunk-0e87dfa3.0e33e21a.css
-body{height:100%;background-color:#f5f5f5}.container-wrapper{background:#fff;position:absolute;border-radius:5px;top:45%;left:50%;margin:-160px 0 0 -160px;width:320px;padding:18px 28px 28px 28px;-webkit-box-shadow:-4px 7px 46px 2px rgba(0,0,0,.1);box-shadow:-4px 7px 46px 2px rgba(0,0,0,.1)}.container-wrapper .halo-logo{margin-bottom:20px;text-align:center}.container-wrapper .halo-logo span{vertical-align:text-bottom;font-size:38px;display:inline-block;font-weight:600;color:#1790fe;background-image:linear-gradient(-20deg,#6e45e2,#88d3ce);-webkit-text-fill-color:transparent;-webkit-background-clip:text;background-clip:text}.container-wrapper .halo-logo span small{margin-left:5px;font-size:35%}.container-wrapper .tip{cursor:pointer;margin-left:.5rem;float:right}
\ No newline at end of file
--- a/src/main/resources/admin/css/chunk-7b4a6534.0e33e21a.css
+++ b/src/main/resources/admin/css/chunk-7b4a6534.0e33e21a.css
-body{height:100%;background-color:#f5f5f5}.container-wrapper{background:#fff;position:absolute;border-radius:5px;top:45%;left:50%;margin:-160px 0 0 -160px;width:320px;padding:18px 28px 28px 28px;-webkit-box-shadow:-4px 7px 46px 2px rgba(0,0,0,.1);box-shadow:-4px 7px 46px 2px rgba(0,0,0,.1)}.container-wrapper .halo-logo{margin-bottom:20px;text-align:center}.container-wrapper .halo-logo span{vertical-align:text-bottom;font-size:38px;display:inline-block;font-weight:600;color:#1790fe;background-image:linear-gradient(-20deg,#6e45e2,#88d3ce);-webkit-text-fill-color:transparent;-webkit-background-clip:text;background-clip:text}.container-wrapper .halo-logo span small{margin-left:5px;font-size:35%}.container-wrapper .tip{cursor:pointer;margin-left:.5rem;float:right}
\ No newline at end of file
--- a/src/main/resources/admin/css/chunk-vendors.473c34a0.css
+++ b/src/main/resources/admin/css/chunk-vendors.473c34a0.css
--- a/src/main/resources/admin/images/placeholder.jpg
+++ b/src/main/resources/admin/images/placeholder.jpg
--- a/src/main/resources/admin/images/placeholder.png
+++ b/src/main/resources/admin/images/placeholder.png
--- a/src/main/resources/admin/index.html
+++ b/src/main/resources/admin/index.html
-<!DOCTYPE html><html lang=zh-cmn-Hans><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><meta name=robots content=noindex,nofllow><meta name=generator content="Halo 1.2.0-beta.1"><link rel=icon href=/logo.png><title>Halo Dashboard</title><style>#loader{position:absolute;top:0;right:0;bottom:0;left:0;margin:auto;border:solid 3px #e5e5e5;border-top-color:#333;border-radius:50%;width:30px;height:30px;animation:spin .6s linear infinite}@keyframes spin{to{transform:rotate(360deg)}}</style><link href=/css/chunk-0b44f908.c76aeee1.css rel=prefetch><link href=/css/chunk-0e87dfa3.0e33e21a.css rel=prefetch><link href=/css/chunk-7b4a6534.0e33e21a.css rel=prefetch><link href=/css/chunk-7e9c61cd.e32891ce.css rel=prefetch><link href=/css/chunk-8adae550.ae3f2f3c.css rel=prefetch><link href=/css/chunk-966610cc.be194fd2.css rel=prefetch><link href=/css/chunk-db4f48dc.e76ee991.css rel=prefetch><link href=/js/chunk-0b44f908.4f129c2e.js rel=prefetch><link href=/js/chunk-0ba750a2.a3aae303.js rel=prefetch><link href=/js/chunk-0e87dfa3.613e35ea.js rel=prefetch><link href=/js/chunk-17f8cd22.212b0305.js rel=prefetch><link href=/js/chunk-27659703.4ea75fab.js rel=prefetch><link href=/js/chunk-2d0b383e.adb53737.js rel=prefetch><link href=/js/chunk-2d0b64bf.ee7f7ab3.js rel=prefetch><link href=/js/chunk-2d0b8b03.d1890be1.js rel=prefetch><link href=/js/chunk-2d0cf13d.d40d4f27.js rel=prefetch><link href=/js/chunk-2d21a35c.33d6a9d2.js rel=prefetch><link href=/js/chunk-2d221c57.5d8dcffe.js rel=prefetch><link href=/js/chunk-2d228c74.56913b27.js rel=prefetch><link href=/js/chunk-2d228d13.8662d997.js rel=prefetch><link href=/js/chunk-37a26d88.728cb7c7.js rel=prefetch><link href=/js/chunk-5889a1fc.7b49eaf0.js rel=prefetch><link href=/js/chunk-5b9394ac.474c8c42.js rel=prefetch><link href=/js/chunk-664d53d7.377af06e.js rel=prefetch><link href=/js/chunk-6709ac89.7a98f194.js rel=prefetch><link href=/js/chunk-76ee4b7f.677347b0.js rel=prefetch><link href=/js/chunk-7b4a6534.f1d63242.js rel=prefetch><link href=/js/chunk-7e9c61cd.15eaa9c8.js rel=prefetch><link href=/js/chunk-8adae550.cf26d4e7.js rel=prefetch><link href=/js/chunk-966610cc.22160297.js rel=prefetch><link href=/js/chunk-98555926.05f61e9d.js rel=prefetch><link href=/js/chunk-db4f48dc.00fbfdd6.js rel=prefetch><link href=/js/chunk-ddaf34b4.7faf5a6d.js rel=prefetch><link href=/js/chunk-ec5bbb3c.9b0a75e4.js rel=prefetch><link href=/js/chunk-f04cc1dc.2447c1e9.js rel=prefetch><link href=/css/app.01b9c5fe.css rel=preload as=style><link href=/css/chunk-vendors.473c34a0.css rel=preload as=style><link href=/js/app.3874b09d.js rel=preload as=script><link href=/js/chunk-vendors.a941ddfb.js rel=preload as=script><link href=/css/chunk-vendors.473c34a0.css rel=stylesheet><link href=/css/app.01b9c5fe.css rel=stylesheet></head><body><noscript><strong>We're sorry but vue-antd-pro doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app><div id=loader></div></div><script src=/js/chunk-vendors.a941ddfb.js></script><script src=/js/app.3874b09d.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang=zh-cmn-Hans><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><meta name=robots content=noindex,nofllow><meta name=generator content="Halo 1.2.0-beta.1"><link rel=icon href=/logo.png><title>Halo Dashboard</title><style>body {height: 100%;background-color: #f5f5f5;}#loader{position:absolute;top:0;right:0;bottom:0;left:0;margin:auto;border:solid 3px #e5e5e5;border-top-color:#333;border-radius:50%;width:30px;height:30px;animation:spin .6s linear infinite}@keyframes spin{to{transform:rotate(360deg)}}</style><link href=/css/chunk-0b44f908.c76aeee1.css rel=prefetch><link href=/css/chunk-7e9c61cd.e32891ce.css rel=prefetch><link href=/css/chunk-8adae550.ae3f2f3c.css rel=prefetch><link href=/css/chunk-966610cc.be194fd2.css rel=prefetch><link href=/css/chunk-db4f48dc.e76ee991.css rel=prefetch><link href=/js/chunk-0b44f908.4bb4fac6.js rel=prefetch><link href=/js/chunk-0ba750a2.09c3ecc9.js rel=prefetch><link href=/js/chunk-17f8cd22.c1f70525.js rel=prefetch><link href=/js/chunk-27659703.8ee9e924.js rel=prefetch><link href=/js/chunk-2d0b383e.e8ccadf6.js rel=prefetch><link href=/js/chunk-2d0b64bf.41b6c26c.js rel=prefetch><link href=/js/chunk-2d0b8b03.7ad6f330.js rel=prefetch><link href=/js/chunk-2d0cf13d.681c4997.js rel=prefetch><link href=/js/chunk-2d213307.b1dcd466.js rel=prefetch><link href=/js/chunk-2d2165e6.4dbdf8c3.js rel=prefetch><link href=/js/chunk-2d21a35c.bc6f8019.js rel=prefetch><link href=/js/chunk-2d221c57.9693b8e1.js rel=prefetch><link href=/js/chunk-2d228c74.7e3f0c24.js rel=prefetch><link href=/js/chunk-2d228d13.656e977e.js rel=prefetch><link href=/js/chunk-37a26d88.56a14ff2.js rel=prefetch><link href=/js/chunk-5889a1fc.5ba47f6c.js rel=prefetch><link href=/js/chunk-595876d0.c8d65f3a.js rel=prefetch><link href=/js/chunk-5b9394ac.7a31c15d.js rel=prefetch><link href=/js/chunk-664d53d7.cbd634d4.js rel=prefetch><link href=/js/chunk-6709ac89.230de3ac.js rel=prefetch><link href=/js/chunk-76ee4b7f.38f0f48c.js rel=prefetch><link href=/js/chunk-7e9c61cd.56266ff7.js rel=prefetch><link href=/js/chunk-8adae550.0f21f62f.js rel=prefetch><link href=/js/chunk-966610cc.60ec64b2.js rel=prefetch><link href=/js/chunk-db4f48dc.09c3178d.js rel=prefetch><link href=/js/chunk-ddaf34b4.1ae47518.js rel=prefetch><link href=/js/chunk-ec5bbb3c.85b591fb.js rel=prefetch><link href=/js/chunk-f04cc1dc.44a808b9.js rel=prefetch><link href=/css/app.747e01d4.css rel=preload as=style><link href=/css/chunk-vendors.e151fbfd.css rel=preload as=style><link href=/js/app.e3b36e2c.js rel=preload as=script><link href=/js/chunk-vendors.1792b9fd.js rel=preload as=script><link href=/css/chunk-vendors.e151fbfd.css rel=stylesheet><link href=/css/app.747e01d4.css rel=stylesheet></head><body><noscript><strong>We're sorry but vue-antd-pro doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app><div id=loader></div></div><script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script><script src=//cdn.jsdelivr.net/npm/vue-router@3.1.3/dist/vue-router.min.js></script><script src=//cdn.jsdelivr.net/npm/vuex@3.1.1/dist/vuex.min.js></script><script src=//cdn.jsdelivr.net/npm/axios@0.19.0/dist/axios.min.js></script><script src=//cdn.jsdelivr.net/npm/marked@0.8.0/marked.min.js></script><script src=/js/chunk-vendors.1792b9fd.js></script><script src=/js/app.e3b36e2c.js></script></body></html>
\ No newline at end of file
--- a/src/main/resources/admin/js/app.3874b09d.js
+++ b/src/main/resources/admin/js/app.3874b09d.js
--- a/src/main/resources/admin/js/app.e3b36e2c.js
+++ b/src/main/resources/admin/js/app.e3b36e2c.js
--- a/src/main/resources/admin/js/chunk-0b44f908.4f129c2e.js
+++ b/src/main/resources/admin/js/chunk-0b44f908.4f129c2e.js
--- a/src/main/resources/admin/js/chunk-0ba750a2.a3aae303.js
+++ b/src/main/resources/admin/js/chunk-0ba750a2.a3aae303.js
--- a/src/main/resources/admin/js/chunk-0e87dfa3.613e35ea.js
+++ b/src/main/resources/admin/js/chunk-0e87dfa3.613e35ea.js
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0e87dfa3"],{1439:function(e,t,a){"use strict";var i=a("72e8"),n=a.n(i);n.a},"72e8":function(e,t,a){},ac2a:function(e,t,a){"use strict";a.r(t);var i=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"container-wrapper"},[e._m(0),a("div",{staticClass:"animated"},[a("a-form",{attrs:{layout:"vertical"},nativeOn:{keyup:function(t){return!t.type.indexOf("key")&&e._k(t.keyCode,"enter",13,t.key,"Enter")?null:e.handleLogin(t)}}},[a("a-form-item",{staticClass:"animated fadeInUp",style:{"animation-delay":"0.1s"}},[a("a-input",{attrs:{placeholder:"用户名/邮箱"},model:{value:e.username,callback:function(t){e.username=t},expression:"username"}},[a("a-icon",{staticStyle:{color:"rgba(0,0,0,.25)"},attrs:{slot:"prefix",type:"user"},slot:"prefix"})],1)],1),a("a-form-item",{staticClass:"animated fadeInUp",style:{"animation-delay":"0.2s"}},[a("a-input",{attrs:{type:"password",placeholder:"密码"},model:{value:e.password,callback:function(t){e.password=t},expression:"password"}},[a("a-icon",{staticStyle:{color:"rgba(0,0,0,.25)"},attrs:{slot:"prefix",type:"lock"},slot:"prefix"})],1)],1),a("a-form-item",{staticClass:"animated fadeInUp",style:{"animation-delay":"0.3s"}},[a("a-button",{attrs:{type:"primary",block:!0},on:{click:e.handleLogin}},[e._v("登录")])],1),a("a-row",[a("router-link",{attrs:{to:{name:"ResetPassword"}}},[e.resetPasswordButton?a("a",{staticClass:"tip animated fadeInRight",attrs:{href:"javascript:void(0);"}},[e._v("\n            找回密码\n          ")]):e._e()]),a("a",{staticClass:"tip animated fadeInUp",style:{"animation-delay":"0.4s"},on:{click:e.handleApiModifyModalOpen}},[e._v("\n          API 设置\n        ")])],1),a("a-modal",{attrs:{title:"API 设置",visible:e.apiModifyVisible},on:{ok:e.handleApiModifyOk,cancel:e.handleApiModifyCancel}},[a("a-form",[a("a-form-item",{attrs:{extra:"如果 halo admin 不是独立部署，请不要更改此 API"}},[a("a-input",{model:{value:e.apiUrl,callback:function(t){e.apiUrl=t},expression:"apiUrl"}})],1),a("a-form-item",[a("a-button",{on:{click:e.handleApiUrlRestore}},[e._v("\n              恢复默认\n            ")])],1)],1)],1)],1)],1)])},n=[function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"halo-logo animated fadeInUp"},[a("span",[e._v("Halo")])])}],r=(a("8e6e"),a("ac6a"),a("456d"),a("a481"),a("bd86")),s=a("2f62");function o(e,t){var a=Object.keys(e);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(e);t&&(i=i.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),a.push.apply(a,i)}return a}function l(e){for(var t=1;t<arguments.length;t++){var a=null!=arguments[t]?arguments[t]:{};t%2?o(Object(a),!0).forEach((function(t){Object(r["a"])(e,t,a[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(a)):o(Object(a)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(a,t))}))}return e}var c={data:function(){return{username:null,password:null,apiModifyVisible:!1,defaultApiBefore:window.location.protocol+"//",apiUrl:window.location.host,resetPasswordButton:!1}},computed:l({},Object(s["c"])({defaultApiUrl:"apiUrl"})),created:function(){var e=this;document.addEventListener("keydown",(function(t){72===t.keyCode&&t.altKey&&t.shiftKey&&e.toggleHidden()}))},methods:l({},Object(s["b"])(["login","loadUser","loadOptions"]),{},Object(s["d"])({setApiUrl:"SET_API_URL",restoreApiUrl:"RESTORE_API_URL"}),{handleLogin:function(){var e=this;this.username?this.password?this.login({username:this.username,password:this.password}).then((function(t){e.loginSuccess()})):this.$message.warn("密码不能为空！"):this.$message.warn("用户名不能为空！")},loginSuccess:function(){this.loadUser(),this.loadOptions(),this.$route.query.redirect?this.$router.replace(this.$route.query.redirect):this.$router.replace({name:"Dashboard"})},handleApiModifyModalOpen:function(){this.apiUrl=this.defaultApiUrl,this.apiModifyVisible=!0},handleApiModifyOk:function(){this.setApiUrl(this.apiUrl),this.apiModifyVisible=!1},handleApiModifyCancel:function(){this.apiModifyVisible=!1},handleApiUrlRestore:function(){this.restoreApiUrl(),this.apiUrl=this.defaultApiUrl},toggleHidden:function(){this.resetPasswordButton=!this.resetPasswordButton}})},d=c,p=(a("1439"),a("2877")),u=Object(p["a"])(d,i,n,!1,null,null,null);t["default"]=u.exports}}]);
\ No newline at end of file
--- a/src/main/resources/admin/js/chunk-17f8cd22.212b0305.js
+++ b/src/main/resources/admin/js/chunk-17f8cd22.212b0305.js
--- a/src/main/resources/admin/js/chunk-17f8cd22.c1f70525.js
+++ b/src/main/resources/admin/js/chunk-17f8cd22.c1f70525.js
--- a/src/main/resources/admin/js/chunk-27659703.4ea75fab.js
+++ b/src/main/resources/admin/js/chunk-27659703.4ea75fab.js
--- a/src/main/resources/admin/js/chunk-2d0b383e.adb53737.js
+++ b/src/main/resources/admin/js/chunk-2d0b383e.adb53737.js
--- a/src/main/resources/admin/js/chunk-2d0b64bf.ee7f7ab3.js
+++ b/src/main/resources/admin/js/chunk-2d0b64bf.ee7f7ab3.js
--- a/src/main/resources/admin/js/chunk-2d0b8b03.d1890be1.js
+++ b/src/main/resources/admin/js/chunk-2d0b8b03.d1890be1.js