diff --git a/backend/src/main/java/io/metersphere/Application.java b/backend/src/main/java/io/metersphere/Application.java
index 33f41bce49..5c697419a6 100644
--- a/backend/src/main/java/io/metersphere/Application.java
+++ b/backend/src/main/java/io/metersphere/Application.java
@@ -17,6 +17,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
         JmeterProperties.class
 })
 @EnableScheduling
+//@PropertySource(value = {"file:c:\\opt\\metersphere\\conf\\metersphere.properties"}, encoding = "UTF-8", ignoreResourceNotFound = true)
 @PropertySource(value = {"file:/opt/metersphere/conf/metersphere.properties"}, encoding = "UTF-8", ignoreResourceNotFound = true)
 public class Application {
     public static void main(String[] args) {
diff --git a/frontend/src/business/components/common/components/MsScheduleEdit.vue b/frontend/src/business/components/common/components/MsScheduleEdit.vue
index 71a85de668..ada33806a2 100644
--- a/frontend/src/business/components/common/components/MsScheduleEdit.vue
+++ b/frontend/src/business/components/common/components/MsScheduleEdit.vue
@@ -3,12 +3,14 @@
     <div id="app">
       <el-form :model="form" :rules="rules" ref="from">
         <el-form-item
-          :placeholder="$t('schedule.please_input_cron_expression')"
           prop="cronValue">
-          <el-input v-model="form.cronValue" placeholder class="inp"/>
-          <el-button type="primary" @click="showCronDialog">{{$t('schedule.generate_expression')}}</el-button>
+          <el-input v-model="form.cronValue" class="inp" :placeholder="$t('schedule.please_input_cron_expression')"/>
+<!--          <el-button type="primary" @click="showCronDialog">{{$t('schedule.generate_expression')}}</el-button>-->
           <el-button type="primary" @click="saveCron">{{$t('commons.save')}}</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-link type="primary" @click="showCronDialog">{{$t('schedule.generate_expression')}}</el-link>
+        </el-form-item>
         <crontab-result :ex="form.cronValue" ref="crontabResult" />
       </el-form>
       <el-dialog :title="$t('schedule.generate_expression')" :visible.sync="showCron" :modal="false">
@@ -124,4 +126,8 @@
     margin-right: 20px;
   }
 
+  .el-form-item {
+    margin-bottom: 10px;
+  }
+
 </style>
diff --git a/frontend/src/business/components/common/cron/CrontabDay.vue b/frontend/src/business/components/common/cron/CrontabDay.vue
index 16778448df..873a0c3582 100644
--- a/frontend/src/business/components/common/cron/CrontabDay.vue
+++ b/frontend/src/business/components/common/cron/CrontabDay.vue
@@ -154,19 +154,19 @@ export default {
 	computed: {
 		// 计算两个周期值
 		cycleTotal: function () {
-			this.cycle01 = this.checkNum(this.cycle01, 1, 31)
-			this.cycle02 = this.checkNum(this.cycle02, 1, 31)
+			this.checkNum(this.cycle01, 1, 31)
+			this.checkNum(this.cycle02, 1, 31)
 			return this.cycle01 + '-' + this.cycle02;
 		},
 		// 计算平均用到的值
 		averageTotal: function () {
-			this.average01 = this.checkNum(this.average01, 1, 31)
-			this.average02 = this.checkNum(this.average02, 1, 31)
+			this.checkNum(this.average01, 1, 31)
+			this.checkNum(this.average02, 1, 31)
 			return this.average01 + '/' + this.average02;
 		},
 		// 计算工作日格式
 		workdayCheck: function () {
-			this.workday = this.checkNum(this.workday, 1, 31)
+			this.checkNum(this.workday, 1, 31)
 			return this.workday;
 		},
 		// 计算勾选的checkbox值合集
diff --git a/frontend/src/business/components/common/cron/CrontabHour.vue b/frontend/src/business/components/common/cron/CrontabHour.vue
index 36585b4a97..ad50ac4b60 100644
--- a/frontend/src/business/components/common/cron/CrontabHour.vue
+++ b/frontend/src/business/components/common/cron/CrontabHour.vue
@@ -102,14 +102,14 @@ export default {
 	computed: {
 		// 计算两个周期值
 		cycleTotal: function () {
-			this.cycle01 = this.checkNum(this.cycle01, 0, 23)
-			this.cycle02 = this.checkNum(this.cycle02, 0, 23)
+			this.checkNum(this.cycle01, 0, 23)
+			this.checkNum(this.cycle02, 0, 23)
 			return this.cycle01 + '-' + this.cycle02;
 		},
 		// 计算平均用到的值
 		averageTotal: function () {
-			this.average01 = this.checkNum(this.average01, 0, 23)
-			this.average02 = this.checkNum(this.average02, 1, 23)
+			this.checkNum(this.average01, 0, 23)
+			this.checkNum(this.average02, 1, 23)
 			return this.average01 + '/' + this.average02;
 		},
 		// 计算勾选的checkbox值合集
diff --git a/frontend/src/business/components/common/cron/CrontabMin.vue b/frontend/src/business/components/common/cron/CrontabMin.vue
index 9871c6b740..f2a9d68ca9 100644
--- a/frontend/src/business/components/common/cron/CrontabMin.vue
+++ b/frontend/src/business/components/common/cron/CrontabMin.vue
@@ -9,15 +9,15 @@
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="2">
         {{$t('schedule.cron.period')}} {{$t('schedule.cron.from')}}
-				<el-input-number v-model='cycle01' :min="0" :max="60" /> -
-				<el-input-number v-model='cycle02' :min="0" :max="60" /> {{$t('schedule.cron.minutes')}}
+				<el-input-number v-model='cycle01' :min="0" :max="59" /> -
+				<el-input-number v-model='cycle02' :min="0" :max="59" /> {{$t('schedule.cron.minutes')}}
 			</el-radio>
 		</el-form-item>
 
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="3">
         {{$t('schedule.cron.from')}}
-				<el-input-number v-model='average01' :min="0" :max="60" /> {{$t('schedule.cron.minutes')}}{{$t('schedule.cron.start')}}，{{$t('schedule.cron.every')}}
+				<el-input-number v-model='average01' :min="0" :max="59" /> {{$t('schedule.cron.minutes')}}{{$t('schedule.cron.start')}}，{{$t('schedule.cron.every')}}
 				<el-input-number v-model='average02' :min="0" :max="60" /> {{$t('schedule.cron.minutes')}}{{$t('schedule.cron.execute_once')}}
 			</el-radio>
 		</el-form-item>
@@ -100,14 +100,14 @@ export default {
 	computed: {
 		// 计算两个周期值
 		cycleTotal: function () {
-			this.cycle01 = this.checkNum(this.cycle01, 0, 59)
-			this.cycle02 = this.checkNum(this.cycle02, 0, 59)
+			this.checkNum(this.cycle01, 0, 59)
+			this.checkNum(this.cycle02, 0, 59)
 			return this.cycle01 + '-' + this.cycle02;
 		},
 		// 计算平均用到的值
 		averageTotal: function () {
-			this.average01 = this.checkNum(this.average01, 0, 59)
-			this.average02 = this.checkNum(this.average02, 1, 59)
+			this.checkNum(this.average01, 0, 59)
+			this.checkNum(this.average02, 1, 59)
 			return this.average01 + '/' + this.average02;
 		},
 		// 计算勾选的checkbox值合集
diff --git a/frontend/src/business/components/common/cron/CrontabMouth.vue b/frontend/src/business/components/common/cron/CrontabMouth.vue
index f1d6545b8b..43def925d5 100644
--- a/frontend/src/business/components/common/cron/CrontabMouth.vue
+++ b/frontend/src/business/components/common/cron/CrontabMouth.vue
@@ -108,14 +108,14 @@ export default {
 	computed: {
 		// 计算两个周期值
 		cycleTotal: function () {
-			this.cycle01 = this.checkNum(this.cycle01, 1, 12)
-			this.cycle02 = this.checkNum(this.cycle02, 1, 12)
+			this.checkNum(this.cycle01, 1, 12)
+			this.checkNum(this.cycle02, 1, 12)
 			return this.cycle01 + '-' + this.cycle02;
 		},
 		// 计算平均用到的值
 		averageTotal: function () {
-			this.average01 = this.checkNum(this.average01, 1, 12)
-			this.average02 = this.checkNum(this.average02, 1, 12)
+			this.checkNum(this.average01, 1, 12)
+			this.checkNum(this.average02, 1, 12)
 			return this.average01 + '/' + this.average02;
 		},
 		// 计算勾选的checkbox值合集
diff --git a/frontend/src/business/components/common/cron/CrontabResult.vue b/frontend/src/business/components/common/cron/CrontabResult.vue
index 10a69029b5..85bee44d22 100644
--- a/frontend/src/business/components/common/cron/CrontabResult.vue
+++ b/frontend/src/business/components/common/cron/CrontabResult.vue
@@ -586,7 +586,7 @@ export default {
   .popup-result {
     box-sizing: border-box;
     line-height: 24px;
-    margin: 25px auto;
+    margin: 10px auto;
     padding: 15px 10px 10px;
     border: 1px solid #ccc;
     position: relative;
diff --git a/frontend/src/business/components/common/cron/CrontabSecond.vue b/frontend/src/business/components/common/cron/CrontabSecond.vue
index 903c93d7e4..c0fd71b5eb 100644
--- a/frontend/src/business/components/common/cron/CrontabSecond.vue
+++ b/frontend/src/business/components/common/cron/CrontabSecond.vue
@@ -9,15 +9,15 @@
     <el-form-item>
       <el-radio v-model='radioValue' :label="2">
         {{$t('schedule.cron.period')}} {{$t('schedule.cron.from')}}
-        <el-input-number v-model='cycle01' :min="0" :max="60" /> -
-        <el-input-number v-model='cycle02' :min="0" :max="60" /> {{$t('schedule.cron.seconds')}}
+        <el-input-number v-model='cycle01' :min="0" :max="59" /> -
+        <el-input-number v-model='cycle02' :min="0" :max="59" /> {{$t('schedule.cron.seconds')}}
       </el-radio>
     </el-form-item>
 
     <el-form-item>
       <el-radio v-model='radioValue' :label="3">
         {{$t('schedule.cron.from')}}
-        <el-input-number v-model='average01' :min="0" :max="60" /> {{$t('schedule.cron.seconds')}}{{$t('schedule.cron.start')}}，{{$t('schedule.cron.every')}}
+        <el-input-number v-model='average01' :min="0" :max="59" /> {{$t('schedule.cron.seconds')}}{{$t('schedule.cron.start')}}，{{$t('schedule.cron.every')}}
         <el-input-number v-model='average02' :min="0" :max="60" /> {{$t('schedule.cron.seconds')}}{{$t('schedule.cron.execute_once')}}
       </el-radio>
     </el-form-item>
@@ -113,14 +113,14 @@
     computed: {
       // 计算两个周期值
       cycleTotal: function () {
-        this.cycle01 = this.checkNum(this.cycle01, 0, 59);
-        this.cycle02 = this.checkNum(this.cycle02, 0, 59);
+        this.checkNum(this.cycle01, 0, 59);
+        this.checkNum(this.cycle02, 0, 59);
         return this.cycle01 + '-' + this.cycle02;
       },
       // 计算平均用到的值
       averageTotal: function () {
-        this.average01 = this.checkNum(this.average01, 0, 59)
-        this.average02 = this.checkNum(this.average02, 1, 59)
+        this.checkNum(this.average01, 0, 59)
+        this.checkNum(this.average02, 1, 59)
         return this.average01 + '/' + this.average02;
       },
       // 计算勾选的checkbox值合集
diff --git a/frontend/src/business/components/common/cron/CrontabWeek.vue b/frontend/src/business/components/common/cron/CrontabWeek.vue
index d77495c105..2d3948d895 100644
--- a/frontend/src/business/components/common/cron/CrontabWeek.vue
+++ b/frontend/src/business/components/common/cron/CrontabWeek.vue
@@ -58,8 +58,7 @@ export default {
 			average01: 1,
 			average02: 1,
 			checkboxList: [],
-			weekList: [
-			  this.$t('commons.weeks_1'),
+			weekList: [this.$t('commons.weeks_1'),
         this.$t('commons.weeks_2'),
         this.$t('commons.weeks_3'),
         this.$t('commons.weeks_4'),
@@ -150,19 +149,19 @@ export default {
 	computed: {
 		// 计算两个周期值
 		cycleTotal: function () {
-			this.cycle01 = this.checkNum(this.cycle01, 1, 7)
-			this.cycle02 = this.checkNum(this.cycle02, 1, 7)
+			this.checkNum(this.cycle01, 1, 7)
+			this.checkNum(this.cycle02, 1, 7)
 			return this.cycle01 + '-' + this.cycle02;
 		},
 		// 计算平均用到的值
 		averageTotal: function () {
-			this.average01 = this.checkNum(this.average01, 1, 4)
-			this.average02 = this.checkNum(this.average02, 1, 7)
+			this.checkNum(this.average01, 1, 4)
+			this.checkNum(this.average02, 1, 7)
 			return this.average01 + '#' + this.average02;
 		},
 		// 最近的工作日（格式）
 		weekdayCheck: function () {
-			this.weekday = this.checkNum(this.weekday, 1, 7)
+			this.checkNum(this.weekday, 1, 7)
 			return this.weekday;
 		},
 		// 计算勾选的checkbox值合集
diff --git a/frontend/src/business/components/common/cron/CrontabYear.vue b/frontend/src/business/components/common/cron/CrontabYear.vue
index b94cf40082..f6775d6de4 100644
--- a/frontend/src/business/components/common/cron/CrontabYear.vue
+++ b/frontend/src/business/components/common/cron/CrontabYear.vue
@@ -120,14 +120,14 @@ export default {
 	computed: {
 		// 计算两个周期值
 		cycleTotal: function () {
-			this.cycle01 = this.checkNum(this.cycle01, this.fullYear, this.fullYear + 100)
-			this.cycle02 = this.checkNum(this.cycle02, this.fullYear + 1, this.fullYear + 101)
+			this.checkNum(this.cycle01, this.fullYear, this.fullYear + 100)
+			this.checkNum(this.cycle02, this.fullYear + 1, this.fullYear + 101)
 			return this.cycle01 + '-' + this.cycle02;
 		},
 		// 计算平均用到的值
 		averageTotal: function () {
-			this.average01 = this.checkNum(this.average01, this.fullYear, this.fullYear + 100)
-			this.average02 = this.checkNum(this.average02, 1, 10)
+			this.checkNum(this.average01, this.fullYear, this.fullYear + 100)
+			this.checkNum(this.average02, 1, 10)
 			return this.average01 + '/' + this.average02;
 		},
 		// 计算勾选的checkbox值合集