bug修改

src/main/java/com/izouma/awesomeadmin/dao/ContactUsMapper.xml

@@ -13,6 +13,8 @@
                                 <result column="faxes" property="faxes" jdbcType="VARCHAR" />
                                 <result column="postcode" property="postcode" jdbcType="VARCHAR" />
                                 <result column="address" property="address" jdbcType="VARCHAR" />
+                                <result column="service_time" property="serviceTime" jdbcType="VARCHAR" />
+                                <result column="service_phone" property="servicePhone" jdbcType="VARCHAR" />
             </resultMap>
     <sql id="Base_Column_List" >
         <trim  suffixOverrides="," >
@@ -38,6 +40,10 @@
 
             address,
 
+            service_time,
+
+            service_phone,
+
             </trim>
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
@@ -85,6 +91,12 @@
             </if>
                 <if test="address!= null" >
                 address,
+            </if>
+                <if test="serviceTime!= null" >
+                service_time,
+            </if>
+                <if test="servicePhone!= null" >
+                service_phone,
             </if>
             </trim>
         <trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -120,6 +132,12 @@
             </if>
                     <if test="address != null" >
                 #{address,jdbcType=VARCHAR},
+            </if>
+                    <if test="serviceTime != null" >
+                #{serviceTime,jdbcType=VARCHAR},
+            </if>
+                    <if test="servicePhone != null" >
+                #{servicePhone,jdbcType=VARCHAR},
             </if>
                 </trim>
     </insert>
@@ -158,6 +176,12 @@
             </if>
                      <if test="address != null" >
                address= #{address,jdbcType=VARCHAR},
+            </if>
+                     <if test="serviceTime != null" >
+               service_time= #{serviceTime,jdbcType=VARCHAR},
+            </if>
+                     <if test="servicePhone != null" >
+               service_phone= #{servicePhone,jdbcType=VARCHAR},
             </if>
                  </set>
         where id = #{id,jdbcType=INTEGER}

src/main/java/com/izouma/awesomeadmin/model/ContactUs.java

@@ -1,13 +1,14 @@
 package com.izouma.awesomeadmin.model;
 
 import java.util.*;
+
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 
 @JsonAutoDetect
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class ContactUs{
+public class ContactUs {
     private Integer id;
     private String delFlag;
     private Date updateTime;
@@ -20,119 +21,149 @@ public class ContactUs{
     private String postcode;
     private String address;
 
-private String searchKey;
+    private String serviceTime;
+
+    private String servicePhone;
+
 
-/**
-* and,test_name,like,value;or,remark,=,123
-*/
-private String advancedQuery;
+    private String searchKey;
 
-/**
-* column_name_,desc_;column_name_,asc
-*/
-private String orderByStr;
+    /**
+     * and,test_name,like,value;or,remark,=,123
+     */
+    private String advancedQuery;
 
-    public Integer getId(){
+    /**
+     * column_name_,desc_;column_name_,asc
+     */
+    private String orderByStr;
+
+    public Integer getId() {
         return this.id;
     }
 
-    public void setId(Integer id){
+    public void setId(Integer id) {
         this.id = id;
     }
-    public String getDelFlag(){
+
+    public String getDelFlag() {
         return this.delFlag;
     }
 
-    public void setDelFlag(String delFlag){
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
-    public Date getUpdateTime(){
+
+    public Date getUpdateTime() {
         return this.updateTime;
     }
 
-    public void setUpdateTime(Date updateTime){
+    public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-    public String getUpdateUser(){
+
+    public String getUpdateUser() {
         return this.updateUser;
     }
 
-    public void setUpdateUser(String updateUser){
+    public void setUpdateUser(String updateUser) {
         this.updateUser = updateUser;
     }
-    public Date getCreateTime(){
+
+    public Date getCreateTime() {
         return this.createTime;
     }
 
-    public void setCreateTime(Date createTime){
+    public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-    public String getCreateUser(){
+
+    public String getCreateUser() {
         return this.createUser;
     }
 
-    public void setCreateUser(String createUser){
+    public void setCreateUser(String createUser) {
         this.createUser = createUser;
     }
-    public String getCompanyName(){
+
+    public String getCompanyName() {
         return this.companyName;
     }
 
-    public void setCompanyName(String companyName){
+    public void setCompanyName(String companyName) {
         this.companyName = companyName;
     }
-    public String getTelephone(){
+
+    public String getTelephone() {
         return this.telephone;
     }
 
-    public void setTelephone(String telephone){
+    public void setTelephone(String telephone) {
         this.telephone = telephone;
     }
-    public String getFaxes(){
+
+    public String getFaxes() {
         return this.faxes;
     }
 
-    public void setFaxes(String faxes){
+    public void setFaxes(String faxes) {
         this.faxes = faxes;
     }
-    public String getPostcode(){
+
+    public String getPostcode() {
         return this.postcode;
     }
 
-    public void setPostcode(String postcode){
+    public void setPostcode(String postcode) {
         this.postcode = postcode;
     }
-    public String getAddress(){
+
+    public String getAddress() {
         return this.address;
     }
 
-    public void setAddress(String address){
+    public void setAddress(String address) {
         this.address = address;
     }
 
-public String getSearchKey() {
-    return searchKey;
-}
+    public String getSearchKey() {
+        return searchKey;
+    }
 
-public void setSearchKey(String searchKey) {
-    this.searchKey = searchKey;
-}
+    public void setSearchKey(String searchKey) {
+        this.searchKey = searchKey;
+    }
 
-public String getAdvancedQuery() {
-    return advancedQuery;
-}
+    public String getAdvancedQuery() {
+        return advancedQuery;
+    }
 
-public void setAdvancedQuery(String advancedQuery) {
-    this.advancedQuery = advancedQuery;
-}
+    public void setAdvancedQuery(String advancedQuery) {
+        this.advancedQuery = advancedQuery;
+    }
 
-public String getOrderByStr() {
-    return orderByStr;
-}
+    public String getOrderByStr() {
+        return orderByStr;
+    }
 
-public void setOrderByStr(String orderByStr) {
-    this.orderByStr = orderByStr;
-}
+    public void setOrderByStr(String orderByStr) {
+        this.orderByStr = orderByStr;
+    }
+
+    public String getServiceTime() {
+        return serviceTime;
+    }
+
+    public void setServiceTime(String serviceTime) {
+        this.serviceTime = serviceTime;
+    }
+
+    public String getServicePhone() {
+        return servicePhone;
+    }
 
+    public void setServicePhone(String servicePhone) {
+        this.servicePhone = servicePhone;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/web/ChatInfoController.java

@@ -5,6 +5,7 @@ import com.izouma.awesomeadmin.dto.Page;
 import com.izouma.awesomeadmin.dto.Result;
 import com.izouma.awesomeadmin.model.ChatInfo;
 import com.izouma.awesomeadmin.service.ChatInfoService;
+import org.apache.shiro.authz.annotation.RequiresAuthentication;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,6 +19,7 @@ import java.util.Map;
 
 @Controller
 @RequestMapping("/chatInfo")
+@RequiresAuthentication
 public class ChatInfoController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/ImageDownLogController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/imageDownLog")
+@RequiresAuthentication
 public class ImageDownLogController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/ImageUploadLogController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/imageUploadLog")
+@RequiresAuthentication
 public class ImageUploadLogController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/SystemConfigController.java

@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 */
 @Controller
 @RequestMapping("/systemConfig")
+@RequiresAuthentication
 public class SystemConfigController {
 
     @Autowired

src/main/java/com/izouma/awesomeadmin/web/UsersSessionController.java

@@ -23,6 +23,7 @@ import java.util.Map;
  */
 @Controller
 @RequestMapping("/usersSession")
+@RequiresAuthentication
 public class UsersSessionController {
 
     @Autowired

src/main/vue/src/pages/ContactUs.vue

@@ -16,6 +16,12 @@
             <el-form-item prop="address" label="地址">
                 <el-input v-model="formData.address" :disabled="'address'==subColumn"></el-input>
             </el-form-item>
+            <el-form-item prop="serviceTime" label="服务时间">
+                <el-input v-model="formData.serviceTime"></el-input>
+            </el-form-item>
+            <el-form-item prop="servicePhone" label="服务热线">
+                <el-input v-model="formData.servicePhone"></el-input>
+            </el-form-item>
             <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
             </el-form-item>

src/main/vue/src/pages/QuickLinks.vue

@@ -77,7 +77,7 @@ export default {
                         { required: true, message: '请输入 链接名', trigger: 'blur' },
                     ],
             },
-            typeFlagOptions: [{ label: '友情链接', value: '1' }, { label: '快速链接', value: '2' }, { label: 'ICP认证', value: '3' }],
+            typeFlagOptions: [{ label: '友情链接', value: '1' }, { label: '快速链接', value: '2' }, { label: 'ICP认证', value: '3' }, { label: '网站欢迎语', value: '4' }],
             subColumn: '',
             subValue: '',
         }

src/main/vue/src/pages/QuickLinkss.vue

@@ -2,6 +2,11 @@
     <div>
         <div class="filters-container">
 
+            <el-select v-model="typeFlag" clearable filterable placeholder="类型" @change="typeFlagChange">
+                <el-option v-for="item in typeFlagOptions" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
+            </el-select>
+
             <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
             <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
             </el-button>
@@ -228,7 +233,8 @@ export default {
             orderByStr: '',
             imgSrc: '',
             imageDialogVisible: false,
-            typeFlagOptions: [{ label: '友情链接', value: '1' }, { label: '快速链接', value: '2' }, { label: 'ICP认证', value: '3' }],
+            typeFlagOptions: [{ label: '友情链接', value: '1' }, { label: '快速链接', value: '2' }, { label: 'ICP认证', value: '3' }, { label: '网站欢迎语', value: '4' }],
+            typeFlag: '',
         }
     },
     computed: {
@@ -255,6 +261,7 @@ export default {
                 searchKey: this.filter1,
                 advancedQuery: this.advancedQuerySearchKey,
                 orderByStr: this.orderByStr,
+                typeFlag: this.typeFlag,
             }
 
             if (this.$route.query.column) {
@@ -427,6 +434,10 @@ export default {
             }
 
         },
+        typeFlagChange() {
+            this.currentPage = 1;
+            this.getData();
+        },
 
     }
 }