xiongzhu 3 лет назад
Родитель
Сommit
c2f3d36cad

+ 3 - 0
src/main/java/com/izouma/jmrh/domain/Article.java

@@ -53,4 +53,7 @@ public class Article extends BaseEntity {
 
     @ApiModelProperty("审核时间")
     private LocalDateTime auditTime;
+
+    @ApiModelProperty("来源")
+    private String source;
 }

+ 3 - 0
src/main/java/com/izouma/jmrh/domain/Editing.java

@@ -49,4 +49,7 @@ public class Editing extends BaseEntity {
     @ApiModelProperty("审核状态")
     @Enumerated(EnumType.STRING)
     private AuditStatus status;
+
+    @ApiModelProperty("来源")
+    private String source;
 }

+ 3 - 1
src/main/jmrh/src/views/article.vue

@@ -15,6 +15,7 @@
                 {{ article.title }}
             </div>
             <div class="time">发布日期:{{ article.createdAt }}</div>
+            <div class="source" v-if="article.source">来源:{{ article.source }}</div>
             <div class="divider"></div>
             <div class="article-content" v-html="article.content"></div>
         </div>
@@ -65,7 +66,8 @@ export default {
     line-height: 33px;
     text-align: center;
 }
-.time {
+.time,
+.source {
     text-align: center;
     color: black;
     font-size: 14px;

+ 5 - 3
src/main/vue/src/components/CropUpload.vue

@@ -12,7 +12,7 @@
             trigger="#upload-wrapper"
             :cropper-options="cropperOptions"
             :output-options="outputOptions"
-            :upload-url="$baseUrl + '/upload/file'"
+            :upload-url="uploadUrl"
             :labels="{ submit: '确定', cancel: '取消' }"
             :upload-headers="headers"
         />
@@ -20,7 +20,7 @@
 </template>
 <script>
 import AvatarCropper from 'vue-avatar-cropper';
-
+import resolveUrl from 'resolve-url';
 export default {
     props: {
         value: {},
@@ -34,6 +34,7 @@ export default {
         }
     },
     created() {
+        this.uploadUrl = resolveUrl(this.$baseUrl, 'upload/file');
         if (this.value) {
             this.src = this.value;
         }
@@ -53,7 +54,8 @@ export default {
             loading: false,
             headers: {
                 Authorization: 'Bearer ' + localStorage.getItem('token')
-            }
+            },
+            uploadUrl: ''
         };
     },
     computed: {

+ 6 - 6
src/main/vue/src/views/Admin.vue

@@ -225,12 +225,12 @@ export default {
         this.currentTab = this.$route.name;
         this.getMenus();
 
-        let pwdUpdateAt = this.userInfo.pwdUpdateAt;
-        if (!pwdUpdateAt || isBefore(parse(pwdUpdateAt, 'yyyy-MM-dd HH:mm:ss', new Date()), addDays(new Date(), -30))) {
-            this.$alert('您已30天未修改密码,请尽快修改密码', '提示').then(() => {
-                this.onShowPwdDialog();
-            });
-        }
+        // let pwdUpdateAt = this.userInfo.pwdUpdateAt;
+        // if (!pwdUpdateAt || isBefore(parse(pwdUpdateAt, 'yyyy-MM-dd HH:mm:ss', new Date()), addDays(new Date(), -30))) {
+        //     this.$alert('您已30天未修改密码,请尽快修改密码', '提示').then(() => {
+        //         this.onShowPwdDialog();
+        //     });
+        // }
     },
     data() {
         return {

+ 3 - 0
src/main/vue/src/views/ArticleEdit.vue

@@ -15,6 +15,9 @@
             <el-form-item prop="cover" label="封面">
                 <single-upload v-model="formData.cover"></single-upload>
             </el-form-item>
+            <el-form-item prop="source" label="来源">
+                <el-input v-model="formData.source"></el-input>
+            </el-form-item>
             <el-form-item prop="content" label="内容" style="width:1000px">
                 <rich-text v-model="formData.content"></rich-text>
             </el-form-item>

+ 3 - 0
src/main/vue/src/views/EditingEdit.vue

@@ -15,6 +15,9 @@
             <el-form-item prop="cover" label="封面">
                 <single-upload v-model="formData.cover"></single-upload>
             </el-form-item>
+            <el-form-item prop="source" label="来源">
+                <el-input v-model="formData.source"></el-input>
+            </el-form-item>
             <el-form-item prop="content" label="内容" style="width:1000px">
                 <rich-text v-model="formData.content"></rich-text>
             </el-form-item>