Skip to content

Commit 082a672

Browse files
iwindiwind
committed
版本号修改为1.3.1.2
1 parent d515a20 commit 082a672

File tree

3 files changed

+109
-11
lines changed

3 files changed

+109
-11
lines changed

‎internal/const/const.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package teaconst
22

33
const (
4-
Version = "1.3.1"
4+
Version = "1.3.1.2"
55

6-
APINodeVersion = "1.3.1"
6+
APINodeVersion = "1.3.1.2"
77

88
ProductName = "Edge Admin"
99
ProcessName = "edge-admin"

‎web/public/js/components.js‎

Lines changed: 47 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,8 +1018,8 @@ Vue.component("traffic-map-box",{props:["v-stats","v-is-attack"],mounted:functio
10181018
</div>`}),Vue.component("plan-limit-view",{props:["value","v-single-mode"],data:function(){var e=this.value;let t=!1;return this.vSingleMode||(null!=e.trafficLimit&&e.trafficLimit.isOn&&(null!=e.trafficLimit.dailySize&&0<e.trafficLimit.dailySize.count||null!=e.trafficLimit.monthlySize&&0<e.trafficLimit.monthlySize.count)||0<e.dailyRequests||0<e.monthlyRequests)&&(t=!0),{config:e,hasLimit:t}},methods:{formatNumber:function(e){return teaweb.formatNumber(e)}},template:`<div style="font-size: 0.8em; color: grey">
10191019
<div class="ui divider" v-if="hasLimit"></div>
10201020
<div v-if="config.trafficLimit != null && config.trafficLimit.isOn">
1021-
<span v-if="config.trafficLimit.dailySize != null && config.trafficLimit.dailySize.count > 0">日流量限制：{{config.trafficLimit.dailySize.count}}{{config.trafficLimit.dailySize.unit.toUpperCase()}}<br/></span>
1022-
<span v-if="config.trafficLimit.monthlySize != null && config.trafficLimit.monthlySize.count > 0">月流量限制：{{config.trafficLimit.monthlySize.count}}{{config.trafficLimit.monthlySize.unit.toUpperCase()}}<br/></span>
1021+
<span v-if="config.trafficLimit.dailySize != null && config.trafficLimit.dailySize.count > 0">日流量限制：{{config.trafficLimit.dailySize.count}}{{config.trafficLimit.dailySize.unit.toUpperCase().replace(/(.)B/, "$1iB")}}<br/></span>
1022+
<span v-if="config.trafficLimit.monthlySize != null && config.trafficLimit.monthlySize.count > 0">月流量限制：{{config.trafficLimit.monthlySize.count}}{{config.trafficLimit.monthlySize.unit.toUpperCase().replace(/(.)B/, "$1iB")}}<br/></span>
10231023
</div>
10241024
<div v-if="config.dailyRequests > 0">单日请求数限制：{{formatNumber(config.dailyRequests)}}</div>
10251025
<div v-if="config.monthlyRequests > 0">单月请求数限制：{{formatNumber(config.monthlyRequests)}}</div>
@@ -1037,7 +1037,7 @@ Vue.component("traffic-map-box",{props:["v-stats","v-is-attack"],mounted:functio
10371037
<span v-if="plan.priceType == 'traffic'">
10381038
按流量计费
10391039
<div>
1040-
<span class="grey small">基础价格：￥{{plan.trafficPrice.base}}元/GB</span>
1040+
<span class="grey small">基础价格：￥{{plan.trafficPrice.base}}元/GiB</span>
10411041
</div>
10421042
</span>
10431043
<div v-if="plan.priceType == 'bandwidth' && plan.bandwidthPrice != null && plan.bandwidthPrice.percentile > 0">
@@ -2178,7 +2178,7 @@ Vue.component("traffic-map-box",{props:["v-stats","v-is-attack"],mounted:functio
21782178
<h4>{{chart.name}} <span>（{{valueTypeName}}）</span></h4>
21792179
<div class="ui divider"></div>
21802180
<div style="height: 14em; padding-bottom: 1em; " :id="chartId" :class="{'scroll-box': chart.type == 'table'}"></div>
2181-
</div>`}),Vue.component("metric-board",{template:"<div><slot></slot></div>"}),Vue.component("http-cache-config-box",{props:["v-cache-config","v-is-location","v-is-group","v-cache-policy","v-web-id"],data:function(){let e=this.vCacheConfig;null==(e=null==e?{isPrior:!1,isOn:!1,addStatusHeader:!0,addAgeHeader:!1,enableCacheControlMaxAge:!1,cacheRefs:[],purgeIsOn:!1,purgeKey:"",disablePolicyRefs:!1}:e).cacheRefs&&(e.cacheRefs=[]);var t=null;return null!=this.vCachePolicy&&null!=this.vCachePolicy.maxBytes&&(t=this.vCachePolicy.maxBytes),{cacheConfig:e,moreOptionsVisible:!1,enablePolicyRefs:!e.disablePolicyRefs,maxBytes:t,searchBoxVisible:!1,searchKeyword:""}},watch:{enablePolicyRefs:function(e){this.cacheConfig.disablePolicyRefs=!e},searchKeyword:function(e){this.$refs.cacheRefsConfigBoxRef.search(e)}},methods:{isOn:function(){return(!this.vIsLocation&&!this.vIsGroup||this.cacheConfig.isPrior)&&this.cacheConfig.isOn},isPlus:function(){return Tea.Vue.teaIsPlus},generatePurgeKey:function(){let e=Math.random().toString()+Math.random().toString(),t=e.replace(/0\./g,"").replace(/\./g,""),i="";for(let e=0;e<t.length;e++)i+=String.fromCharCode(parseInt(t.substring(e,e+1))+(Math.random()<.5?"a":"A").charCodeAt(0));this.cacheConfig.purgeKey=i},showMoreOptions:function(){this.moreOptionsVisible=!this.moreOptionsVisible},changeStale:function(e){this.cacheConfig.stale=e},showSearchBox:function(){if(this.searchBoxVisible=!this.searchBoxVisible,this.searchBoxVisible){let e=this;setTimeout(function(){e.$refs.searchBox.focus()})}else this.searchKeyword=""}},template:`<div>
2181+
</div>`}),Vue.component("metric-board",{template:"<div><slot></slot></div>"}),Vue.component("http-cache-config-box",{props:["v-cache-config","v-is-location","v-is-group","v-cache-policy","v-web-id"],data:function(){let e=this.vCacheConfig,t=(null==(e=null==e?{isPrior:!1,isOn:!1,addStatusHeader:!0,addAgeHeader:!1,enableCacheControlMaxAge:!1,cacheRefs:[],purgeIsOn:!1,purgeKey:"",disablePolicyRefs:!1}:e).cacheRefs&&(e.cacheRefs=[]),null);return null!=this.vCachePolicy&&null!=this.vCachePolicy.maxBytes&&(t=this.vCachePolicy.maxBytes),null==e.key&&Vue.set(e,"key",{isOn:!1,scheme:"https",host:""}),{cacheConfig:e,moreOptionsVisible:!1,enablePolicyRefs:!e.disablePolicyRefs,maxBytes:t,searchBoxVisible:!1,searchKeyword:"",keyOptionsVisible:!1}},watch:{enablePolicyRefs:function(e){this.cacheConfig.disablePolicyRefs=!e},searchKeyword:function(e){this.$refs.cacheRefsConfigBoxRef.search(e)}},methods:{isOn:function(){return(!this.vIsLocation&&!this.vIsGroup||this.cacheConfig.isPrior)&&this.cacheConfig.isOn},isPlus:function(){return Tea.Vue.teaIsPlus},generatePurgeKey:function(){let e=Math.random().toString()+Math.random().toString(),t=e.replace(/0\./g,"").replace(/\./g,""),i="";for(let e=0;e<t.length;e++)i+=String.fromCharCode(parseInt(t.substring(e,e+1))+(Math.random()<.5?"a":"A").charCodeAt(0));this.cacheConfig.purgeKey=i},showMoreOptions:function(){this.moreOptionsVisible=!this.moreOptionsVisible},changeStale:function(e){this.cacheConfig.stale=e},showSearchBox:function(){if(this.searchBoxVisible=!this.searchBoxVisible,this.searchBoxVisible){let e=this;setTimeout(function(){e.$refs.searchBox.focus()})}else this.searchKeyword=""}},template:`<div>
21822182
<input type="hidden" name="cacheJSON" :value="JSON.stringify(cacheConfig)"/>
21832183

21842184
<table class="ui table definition selectable" v-show="!vIsGroup">
@@ -2206,6 +2206,44 @@ Vue.component("traffic-map-box",{props:["v-stats","v-is-attack"],mounted:functio
22062206
</td>
22072207
</tr>
22082208
</tbody>
2209+
<tbody v-show="isOn() && !vIsGroup">
2210+
<tr>
2211+
<td>缓存主域名</td>
2212+
<td>
2213+
<div v-show="!cacheConfig.key.isOn">默认 &nbsp; <a href="" @click.prevent="keyOptionsVisible = !keyOptionsVisible"><span class="small">[修改]</span></a></div>
2214+
<div v-show="cacheConfig.key.isOn">使用主域名：{{cacheConfig.key.scheme}}://{{cacheConfig.key.host}} &nbsp; <a href="" @click.prevent="keyOptionsVisible = !keyOptionsVisible"><span class="small">[修改]</span></a></div>
2215+
<div v-show="keyOptionsVisible" style="margin-top: 1em">
2216+
<div class="ui divider"></div>
2217+
<table class="ui table definition">
2218+
<tr>
2219+
<td class="title">启用主域名</td>
2220+
<td><checkbox v-model="cacheConfig.key.isOn"></checkbox>
2221+
<p class="comment">启用主域名后，所有缓存键值中的协议和域名部分都会修改为主域名，用来实现缓存不区分域名。</p>
2222+
</td>
2223+
</tr>
2224+
<tr v-show="cacheConfig.key.isOn">
2225+
<td>主域名 *</td>
2226+
<td>
2227+
<div class="ui fields inline">
2228+
<div class="ui field">
2229+
<select class="ui dropdown" v-model="cacheConfig.key.scheme">
2230+
<option value="https">https://</option>
2231+
<option value="http">http://</option>
2232+
</select>
2233+
</div>
2234+
<div class="ui field">
2235+
<input type="text" v-model="cacheConfig.key.host" placeholder="example.com" @keyup.enter="keyOptionsVisible = false" @keypress.enter.prevent="1"/>
2236+
</div>
2237+
</div>
2238+
<p class="comment">此域名<strong>必须</strong>是当前网站已绑定域名，在刷新缓存时也需要使用此域名。</p>
2239+
</td>
2240+
</tr>
2241+
</table>
2242+
<button class="ui button tiny" type="button" @click.prevent="keyOptionsVisible = false">完成</button>
2243+
</div>
2244+
</td>
2245+
</tr>
2246+
</tbody>
22092247
<tbody v-show="isOn()">
22102248
<tr>
22112249
<td colspan="2">
@@ -2264,6 +2302,11 @@ Vue.component("traffic-map-box",{props:["v-stats","v-is-attack"],mounted:functio
22642302
<http-cache-stale-config :v-cache-stale-config="cacheConfig.stale" @change="changeStale"></http-cache-stale-config>
22652303
</div>
22662304

2305+
<div v-show="isOn()">
2306+
<submit-btn></submit-btn>
2307+
<div class="ui divider"></div>
2308+
</div>
2309+
22672310
<div v-show="isOn()" style="margin-top: 1em">
22682311
<h4 style="position: relative">缓存条件 &nbsp; <a href="" style="font-size: 0.8em" @click.prevent="$refs.cacheRefsConfigBoxRef.addRef(false)">[添加]</a> &nbsp; <a href="" style="font-size: 0.8em" @click.prevent="showSearchBox" v-show="!searchBoxVisible">[搜索]</a>
22692312
<div class="ui input small right labeled" style="position: absolute; top: -0.4em; margin-left: 0.5em; zoom: 0.9" v-show="searchBoxVisible">

‎web/public/js/components.src.js‎

Lines changed: 60 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2876,8 +2876,8 @@ Vue.component("plan-limit-view", {
28762876
template: `<div style="font-size: 0.8em; color: grey">
28772877
<div class="ui divider" v-if="hasLimit"></div>
28782878
<div v-if="config.trafficLimit != null && config.trafficLimit.isOn">
2879-
<span v-if="config.trafficLimit.dailySize != null && config.trafficLimit.dailySize.count > 0">日流量限制：{{config.trafficLimit.dailySize.count}}{{config.trafficLimit.dailySize.unit.toUpperCase()}}<br/></span>
2880-
<span v-if="config.trafficLimit.monthlySize != null && config.trafficLimit.monthlySize.count > 0">月流量限制：{{config.trafficLimit.monthlySize.count}}{{config.trafficLimit.monthlySize.unit.toUpperCase()}}<br/></span>
2879+
<span v-if="config.trafficLimit.dailySize != null && config.trafficLimit.dailySize.count > 0">日流量限制：{{config.trafficLimit.dailySize.count}}{{config.trafficLimit.dailySize.unit.toUpperCase().replace(/(.)B/, "$1iB")}}<br/></span>
2880+
<span v-if="config.trafficLimit.monthlySize != null && config.trafficLimit.monthlySize.count > 0">月流量限制：{{config.trafficLimit.monthlySize.count}}{{config.trafficLimit.monthlySize.unit.toUpperCase().replace(/(.)B/, "$1iB")}}<br/></span>
28812881
</div>
28822882
<div v-if="config.dailyRequests > 0">单日请求数限制：{{formatNumber(config.dailyRequests)}}</div>
28832883
<div v-if="config.monthlyRequests > 0">单月请求数限制：{{formatNumber(config.monthlyRequests)}}</div>
@@ -2905,7 +2905,7 @@ Vue.component("plan-price-view", {
29052905
<span v-if="plan.priceType == 'traffic'">
29062906
按流量计费
29072907
<div>
2908-
<span class="grey small">基础价格：￥{{plan.trafficPrice.base}}元/GB</span>
2908+
<span class="grey small">基础价格：￥{{plan.trafficPrice.base}}元/GiB</span>
29092909
</div>
29102910
</span>
29112911
<div v-if="plan.priceType == 'bandwidth' && plan.bandwidthPrice != null && plan.bandwidthPrice.percentile > 0">
@@ -6258,19 +6258,31 @@ Vue.component("http-cache-config-box", {
62586258
cacheConfig.cacheRefs = []
62596259
}
62606260

6261-
var maxBytes = null
6261+
let maxBytes = null
62626262
if (this.vCachePolicy != null && this.vCachePolicy.maxBytes != null) {
62636263
maxBytes = this.vCachePolicy.maxBytes
62646264
}
62656265

6266+
// key
6267+
if (cacheConfig.key == null) {
6268+
// use Vue.set to activate vue events
6269+
Vue.set(cacheConfig, "key", {
6270+
isOn: false,
6271+
scheme: "https",
6272+
host: ""
6273+
})
6274+
}
6275+
62666276
return {
62676277
cacheConfig: cacheConfig,
62686278
moreOptionsVisible: false,
62696279
enablePolicyRefs: !cacheConfig.disablePolicyRefs,
62706280
maxBytes: maxBytes,
62716281

62726282
searchBoxVisible: false,
6273-
searchKeyword: ""
6283+
searchKeyword: "",
6284+
6285+
keyOptionsVisible: false
62746286
}
62756287
},
62766288
watch: {
@@ -6345,6 +6357,44 @@ Vue.component("http-cache-config-box", {
63456357
</td>
63466358
</tr>
63476359
</tbody>
6360+
<tbody v-show="isOn() && !vIsGroup">
6361+
<tr>
6362+
<td>缓存主域名</td>
6363+
<td>
6364+
<div v-show="!cacheConfig.key.isOn">默认 &nbsp; <a href="" @click.prevent="keyOptionsVisible = !keyOptionsVisible"><span class="small">[修改]</span></a></div>
6365+
<div v-show="cacheConfig.key.isOn">使用主域名：{{cacheConfig.key.scheme}}://{{cacheConfig.key.host}} &nbsp; <a href="" @click.prevent="keyOptionsVisible = !keyOptionsVisible"><span class="small">[修改]</span></a></div>
6366+
<div v-show="keyOptionsVisible" style="margin-top: 1em">
6367+
<div class="ui divider"></div>
6368+
<table class="ui table definition">
6369+
<tr>
6370+
<td class="title">启用主域名</td>
6371+
<td><checkbox v-model="cacheConfig.key.isOn"></checkbox>
6372+
<p class="comment">启用主域名后，所有缓存键值中的协议和域名部分都会修改为主域名，用来实现缓存不区分域名。</p>
6373+
</td>
6374+
</tr>
6375+
<tr v-show="cacheConfig.key.isOn">
6376+
<td>主域名 *</td>
6377+
<td>
6378+
<div class="ui fields inline">
6379+
<div class="ui field">
6380+
<select class="ui dropdown" v-model="cacheConfig.key.scheme">
6381+
<option value="https">https://</option>
6382+
<option value="http">http://</option>
6383+
</select>
6384+
</div>
6385+
<div class="ui field">
6386+
<input type="text" v-model="cacheConfig.key.host" placeholder="example.com" @keyup.enter="keyOptionsVisible = false" @keypress.enter.prevent="1"/>
6387+
</div>
6388+
</div>
6389+
<p class="comment">此域名<strong>必须</strong>是当前网站已绑定域名，在刷新缓存时也需要使用此域名。</p>
6390+
</td>
6391+
</tr>
6392+
</table>
6393+
<button class="ui button tiny" type="button" @click.prevent="keyOptionsVisible = false">完成</button>
6394+
</div>
6395+
</td>
6396+
</tr>
6397+
</tbody>
63486398
<tbody v-show="isOn()">
63496399
<tr>
63506400
<td colspan="2">
@@ -6403,6 +6453,11 @@ Vue.component("http-cache-config-box", {
64036453
<http-cache-stale-config :v-cache-stale-config="cacheConfig.stale" @change="changeStale"></http-cache-stale-config>
64046454
</div>
64056455

6456+
<div v-show="isOn()">
6457+
<submit-btn></submit-btn>
6458+
<div class="ui divider"></div>
6459+
</div>
6460+
64066461
<div v-show="isOn()" style="margin-top: 1em">
64076462
<h4 style="position: relative">缓存条件 &nbsp; <a href="" style="font-size: 0.8em" @click.prevent="$refs.cacheRefsConfigBoxRef.addRef(false)">[添加]</a> &nbsp; <a href="" style="font-size: 0.8em" @click.prevent="showSearchBox" v-show="!searchBoxVisible">[搜索]</a>
64086463
<div class="ui input small right labeled" style="position: absolute; top: -0.4em; margin-left: 0.5em; zoom: 0.9" v-show="searchBoxVisible">

0 commit comments

Comments
 (0)