登录次数和存储空间配置

log.txt

@@ -200,3 +200,4 @@ Caused by: com.mysql.jdbc.exceptions.jdbc4.MySQLNonTransientConnectionException:
 	... 24 more
 [2018-10-15 15:12:55] [WARN ] - Bad pool size config, start 3 < min 5. Using 5 as start.
 [2018-10-15 15:18:04] [WARN ] - Bad pool size config, start 3 < min 5. Using 5 as start.
+[2018-10-26 10:48:33] [WARN ] - Bad pool size config, start 3 < min 5. Using 5 as start.

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

@@ -936,6 +936,9 @@
             <if test="typeFlag != null">
                 type_flag= #{typeFlag},
             </if>
+            <if test="memorySpace != null">
+                memory_space= #{memorySpace},
+            </if>
         </set>
         <where>
             AND del_flag = 'N'

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

@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.izouma.awesomeadmin.dao.SystemConfigMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.SystemConfig" >
-                <id column="id" property="id" jdbcType="INTEGER" />
-                                        <result column="del_flag" property="delFlag" jdbcType="CHAR" />
-                                <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
-                                <result column="update_user" property="updateUser" jdbcType="VARCHAR" />
-                                <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
-                                <result column="create_user" property="createUser" jdbcType="VARCHAR" />
-                                <result column="order_rate" property="orderRate" jdbcType="VARCHAR" />
-                                <result column="tixian_rate" property="tixianRate" jdbcType="VARCHAR" />
-                                <result column="extra" property="extra" jdbcType="VARCHAR" />
-                                <result column="use_flag" property="useFlag" jdbcType="CHAR" />
-                                <result column="personal_deposit" property="personalDeposit" jdbcType="INTEGER" />
-                                <result column="company_deposit" property="companyDeposit" jdbcType="INTEGER" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
+<mapper namespace="com.izouma.awesomeadmin.dao.SystemConfigMapper">
+    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.SystemConfig">
+        <id column="id" property="id" jdbcType="INTEGER"/>
+        <result column="del_flag" property="delFlag" jdbcType="CHAR"/>
+        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+        <result column="update_user" property="updateUser" jdbcType="VARCHAR"/>
+        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
+        <result column="create_user" property="createUser" jdbcType="VARCHAR"/>
+        <result column="order_rate" property="orderRate" jdbcType="VARCHAR"/>
+        <result column="tixian_rate" property="tixianRate" jdbcType="VARCHAR"/>
+        <result column="extra" property="extra" jdbcType="VARCHAR"/>
+        <result column="use_flag" property="useFlag" jdbcType="CHAR"/>
+        <result column="personal_deposit" property="personalDeposit" jdbcType="INTEGER"/>
+        <result column="company_deposit" property="companyDeposit" jdbcType="INTEGER"/>
+        <result column="personal_size" property="personalSize" jdbcType="INTEGER"/>
+        <result column="company_size" property="companySize" jdbcType="INTEGER"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <trim suffixOverrides=",">
             id,
 
             del_flag,
@@ -41,137 +43,160 @@
 
             company_deposit,
 
-            </trim>
+            personal_size,
+
+            company_size,
+
+        </trim>
     </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
         select
-        <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from system_config
         where id = #{id,jdbcType=INTEGER}
     </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
         delete from system_config
         where id = #{id,jdbcType=INTEGER}
     </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.SystemConfig" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.SystemConfig" useGeneratedKeys="true"
+            keyProperty="id">
         insert into system_config
-        <trim prefix="(" suffix=")" suffixOverrides="," >
-                <if test="id!= null" >
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id!= null">
                 id,
             </if>
-                <if test="delFlag!= null" >
+            <if test="delFlag!= null">
                 del_flag,
             </if>
-                <if test="updateTime!= null" >
+            <if test="updateTime!= null">
                 update_time,
             </if>
-                <if test="updateUser!= null" >
+            <if test="updateUser!= null">
                 update_user,
             </if>
-                <if test="createTime!= null" >
+            <if test="createTime!= null">
                 create_time,
             </if>
-                <if test="createUser!= null" >
+            <if test="createUser!= null">
                 create_user,
             </if>
-                <if test="orderRate!= null" >
+            <if test="orderRate!= null">
                 order_rate,
             </if>
-                <if test="tixianRate!= null" >
+            <if test="tixianRate!= null">
                 tixian_rate,
             </if>
-                <if test="extra!= null" >
+            <if test="extra!= null">
                 extra,
             </if>
-                <if test="useFlag!= null" >
+            <if test="useFlag!= null">
                 use_flag,
             </if>
-                <if test="personalDeposit!= null" >
+            <if test="personalDeposit!= null">
                 personal_deposit,
             </if>
-                <if test="companyDeposit!= null" >
+            <if test="companyDeposit!= null">
                 company_deposit,
             </if>
-            </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides="," >
-                    <if test="id != null" >
+            <if test="personalSize!= null">
+                personal_size,
+            </if>
+            <if test="companySize!= null">
+                company_size,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
                 #{id,jdbcType=INTEGER},
             </if>
-                    <if test="delFlag != null" >
+            <if test="delFlag != null">
                 #{delFlag,jdbcType=CHAR},
             </if>
-                    <if test="updateTime != null" >
+            <if test="updateTime != null">
                 #{updateTime,jdbcType=TIMESTAMP},
             </if>
-                    <if test="updateUser != null" >
+            <if test="updateUser != null">
                 #{updateUser,jdbcType=VARCHAR},
             </if>
-                    <if test="createTime != null" >
+            <if test="createTime != null">
                 #{createTime,jdbcType=TIMESTAMP},
             </if>
-                    <if test="createUser != null" >
+            <if test="createUser != null">
                 #{createUser,jdbcType=VARCHAR},
             </if>
-                    <if test="orderRate != null" >
+            <if test="orderRate != null">
                 #{orderRate,jdbcType=VARCHAR},
             </if>
-                    <if test="tixianRate != null" >
+            <if test="tixianRate != null">
                 #{tixianRate,jdbcType=VARCHAR},
             </if>
-                    <if test="extra != null" >
+            <if test="extra != null">
                 #{extra,jdbcType=VARCHAR},
             </if>
-                    <if test="useFlag != null" >
+            <if test="useFlag != null">
                 #{useFlag,jdbcType=CHAR},
             </if>
-                    <if test="personalDeposit != null" >
+            <if test="personalDeposit != null">
                 #{personalDeposit,jdbcType=INTEGER},
             </if>
-                    <if test="companyDeposit != null" >
+            <if test="companyDeposit != null">
                 #{companyDeposit,jdbcType=INTEGER},
             </if>
-                </trim>
+            <if test="personalSize != null">
+                #{personalSize,jdbcType=INTEGER},
+            </if>
+            <if test="companySize != null">
+                #{companySize,jdbcType=INTEGER},
+            </if>
+        </trim>
     </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.SystemConfig" >
+    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.SystemConfig">
         update system_config
-        <set >
-                    <if test="id != null" >
-               id= #{id,jdbcType=INTEGER},
+        <set>
+            <if test="id != null">
+                id= #{id,jdbcType=INTEGER},
             </if>
-                     <if test="delFlag != null" >
-               del_flag= #{delFlag,jdbcType=CHAR},
+            <if test="delFlag != null">
+                del_flag= #{delFlag,jdbcType=CHAR},
             </if>
-                     <if test="updateTime != null" >
-               update_time= #{updateTime,jdbcType=TIMESTAMP},
+            <if test="updateTime != null">
+                update_time= #{updateTime,jdbcType=TIMESTAMP},
             </if>
-                     <if test="updateUser != null" >
-               update_user= #{updateUser,jdbcType=VARCHAR},
+            <if test="updateUser != null">
+                update_user= #{updateUser,jdbcType=VARCHAR},
             </if>
-                     <if test="createTime != null" >
-               create_time= #{createTime,jdbcType=TIMESTAMP},
+            <if test="createTime != null">
+                create_time= #{createTime,jdbcType=TIMESTAMP},
             </if>
-                     <if test="createUser != null" >
-               create_user= #{createUser,jdbcType=VARCHAR},
+            <if test="createUser != null">
+                create_user= #{createUser,jdbcType=VARCHAR},
             </if>
-                     <if test="orderRate != null" >
-               order_rate= #{orderRate,jdbcType=VARCHAR},
+            <if test="orderRate != null">
+                order_rate= #{orderRate,jdbcType=VARCHAR},
             </if>
-                     <if test="tixianRate != null" >
-               tixian_rate= #{tixianRate,jdbcType=VARCHAR},
+            <if test="tixianRate != null">
+                tixian_rate= #{tixianRate,jdbcType=VARCHAR},
             </if>
-                     <if test="extra != null" >
-               extra= #{extra,jdbcType=VARCHAR},
+            <if test="extra != null">
+                extra= #{extra,jdbcType=VARCHAR},
             </if>
-                     <if test="useFlag != null" >
-               use_flag= #{useFlag,jdbcType=CHAR},
+            <if test="useFlag != null">
+                use_flag= #{useFlag,jdbcType=CHAR},
             </if>
-                     <if test="personalDeposit != null" >
-               personal_deposit= #{personalDeposit,jdbcType=INTEGER},
+            <if test="personalDeposit != null">
+                personal_deposit= #{personalDeposit,jdbcType=INTEGER},
             </if>
-                     <if test="companyDeposit != null" >
-               company_deposit= #{companyDeposit,jdbcType=INTEGER},
+            <if test="companyDeposit != null">
+                company_deposit= #{companyDeposit,jdbcType=INTEGER},
             </if>
-                 </set>
+            <if test="personalSize != null">
+                personal_size= #{personalSize,jdbcType=INTEGER},
+            </if>
+            <if test="companySize != null">
+                company_size= #{companySize,jdbcType=INTEGER},
+            </if>
+        </set>
         where
         <if test="id != null and !&quot;&quot;.equals(id)">
             id = #{id,jdbcType=INTEGER}
@@ -182,59 +207,62 @@
         </if>
 
     </update>
-    <select id="querySystemConfigByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.SystemConfig">
-        select <include refid="Base_Column_List"/> from system_config
+    <select id="querySystemConfigByPage" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.SystemConfig">
+        select
+        <include refid="Base_Column_List"/>
+        from system_config
         <where>
             and del_flag = 'N'
             <if test="record.idStr != null and !&quot;&quot;.equals(record.idStr)">
                 and id in (${record.idStr})
             </if>
-                    <if test="record.id != null and !&quot;&quot;.equals(record.id)">
-                and  id = #{record.id}
+            <if test="record.id != null and !&quot;&quot;.equals(record.id)">
+                and id = #{record.id}
             </if>
-                     <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
-                and  del_flag = #{record.delFlag}
+            <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
+                and del_flag = #{record.delFlag}
             </if>
-                     <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
-                and  update_time = #{record.updateTime}
+            <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
+                and update_time = #{record.updateTime}
             </if>
-                     <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
-                and  update_user = #{record.updateUser}
+            <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
+                and update_user = #{record.updateUser}
             </if>
-                     <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
-                and  create_time = #{record.createTime}
+            <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
+                and create_time = #{record.createTime}
             </if>
-                     <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
-                and  create_user = #{record.createUser}
+            <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
+                and create_user = #{record.createUser}
             </if>
-                     <if test="record.orderRate != null and !&quot;&quot;.equals(record.orderRate)">
-                and  order_rate = #{record.orderRate}
+            <if test="record.orderRate != null and !&quot;&quot;.equals(record.orderRate)">
+                and order_rate = #{record.orderRate}
             </if>
-                     <if test="record.tixianRate != null and !&quot;&quot;.equals(record.tixianRate)">
-                and  tixian_rate = #{record.tixianRate}
+            <if test="record.tixianRate != null and !&quot;&quot;.equals(record.tixianRate)">
+                and tixian_rate = #{record.tixianRate}
             </if>
-                     <if test="record.extra != null and !&quot;&quot;.equals(record.extra)">
-                and  extra = #{record.extra}
+            <if test="record.extra != null and !&quot;&quot;.equals(record.extra)">
+                and extra = #{record.extra}
             </if>
-                     <if test="record.useFlag != null and !&quot;&quot;.equals(record.useFlag)">
-                and  use_flag = #{record.useFlag}
+            <if test="record.useFlag != null and !&quot;&quot;.equals(record.useFlag)">
+                and use_flag = #{record.useFlag}
             </if>
-                     <if test="record.personalDeposit != null and !&quot;&quot;.equals(record.personalDeposit)">
-                and  personal_deposit = #{record.personalDeposit}
+            <if test="record.personalDeposit != null and !&quot;&quot;.equals(record.personalDeposit)">
+                and personal_deposit = #{record.personalDeposit}
             </if>
-                     <if test="record.companyDeposit != null and !&quot;&quot;.equals(record.companyDeposit)">
-                and  company_deposit = #{record.companyDeposit}
+            <if test="record.companyDeposit != null and !&quot;&quot;.equals(record.companyDeposit)">
+                and company_deposit = #{record.companyDeposit}
+            </if>
+            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR order_rate LIKE concat('%',#{record.searchKey},'%')
+                    OR tixian_rate LIKE concat('%',#{record.searchKey},'%')
+                    OR extra LIKE concat('%',#{record.searchKey},'%')
+                    OR use_flag LIKE concat('%',#{record.searchKey},'%')
+                    OR personal_deposit LIKE concat('%',#{record.searchKey},'%')
+                    OR company_deposit LIKE concat('%',#{record.searchKey},'%')
+                </trim>
             </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  order_rate LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  tixian_rate LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  extra LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  use_flag LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  personal_deposit LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  company_deposit LIKE concat('%',#{record.searchKey},'%')
-                                                             </trim>
-         </if>
 
             <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
                 <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
@@ -288,93 +316,96 @@
         </if>
         id desc
     </select>
-    <select id="queryAllSystemConfig" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.SystemConfig">
-        select <include refid="Base_Column_List"/> from system_config
+    <select id="queryAllSystemConfig" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.SystemConfig">
+        select
+        <include refid="Base_Column_List"/>
+        from system_config
         <where>
             and del_flag = 'N'
             <if test="idStr != null and !&quot;&quot;.equals(idStr)">
                 and id in (${idStr})
             </if>
-                    <if test="id != null and !&quot;&quot;.equals(id)">
-                and  id = #{id}
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
             </if>
-                    <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
-                and  del_flag = #{delFlag}
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and del_flag = #{delFlag}
             </if>
-                    <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
-                and  update_time = #{updateTime}
+            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                and update_time = #{updateTime}
             </if>
-                    <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
-                and  update_user = #{updateUser}
+            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                and update_user = #{updateUser}
             </if>
-                    <if test="createTime != null and !&quot;&quot;.equals(createTime)">
-                and  create_time = #{createTime}
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and create_time = #{createTime}
             </if>
-                    <if test="createUser != null and !&quot;&quot;.equals(createUser)">
-                and  create_user = #{createUser}
+            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                and create_user = #{createUser}
             </if>
-                    <if test="orderRate != null and !&quot;&quot;.equals(orderRate)">
-                and  order_rate = #{orderRate}
+            <if test="orderRate != null and !&quot;&quot;.equals(orderRate)">
+                and order_rate = #{orderRate}
             </if>
-                    <if test="tixianRate != null and !&quot;&quot;.equals(tixianRate)">
-                and  tixian_rate = #{tixianRate}
+            <if test="tixianRate != null and !&quot;&quot;.equals(tixianRate)">
+                and tixian_rate = #{tixianRate}
             </if>
-                    <if test="extra != null and !&quot;&quot;.equals(extra)">
-                and  extra = #{extra}
+            <if test="extra != null and !&quot;&quot;.equals(extra)">
+                and extra = #{extra}
             </if>
-                    <if test="useFlag != null and !&quot;&quot;.equals(useFlag)">
-                and  use_flag = #{useFlag}
+            <if test="useFlag != null and !&quot;&quot;.equals(useFlag)">
+                and use_flag = #{useFlag}
             </if>
-                    <if test="personalDeposit != null and !&quot;&quot;.equals(personalDeposit)">
-                and  personal_deposit = #{personalDeposit}
+            <if test="personalDeposit != null and !&quot;&quot;.equals(personalDeposit)">
+                and personal_deposit = #{personalDeposit}
             </if>
-                    <if test="companyDeposit != null and !&quot;&quot;.equals(companyDeposit)">
-                and  company_deposit = #{companyDeposit}
+            <if test="companyDeposit != null and !&quot;&quot;.equals(companyDeposit)">
+                and company_deposit = #{companyDeposit}
             </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  order_rate LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  tixian_rate LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  extra LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  use_flag LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  personal_deposit LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  company_deposit LIKE concat('%',#{searchKey},'%')
-                                                                                        </trim>
+            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR order_rate LIKE concat('%',#{searchKey},'%')
+                    OR tixian_rate LIKE concat('%',#{searchKey},'%')
+                    OR extra LIKE concat('%',#{searchKey},'%')
+                    OR use_flag LIKE concat('%',#{searchKey},'%')
+                    OR personal_deposit LIKE concat('%',#{searchKey},'%')
+                    OR company_deposit LIKE concat('%',#{searchKey},'%')
+                </trim>
             </if>
-<if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
-    <foreach item="item" index="index" collection="advancedQuery.split('_;')">
-        <choose>
-            <when test="item.indexOf('like') != -1">
-                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                    <if test="detailIndex == 3">
-                        concat('%',#{itemDetail},'%')
-                    </if>
+            <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
+                <foreach item="item" index="index" collection="advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
 
-                    <if test="detailIndex &lt; 3">
-                        ${itemDetail}
-                    </if>
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
 
-                </foreach>
-            </when>
-            <otherwise>
-                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                    <if test="detailIndex == 3">
-                        #{itemDetail}
-                    </if>
-
-                    <if test="detailIndex &lt; 3">
-                        ${itemDetail}
-                    </if>
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
 
-                </foreach>
-            </otherwise>
-        </choose>
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </otherwise>
+                    </choose>
 
 
-    </foreach>
+                </foreach>
 
 
-</if>
+            </if>
         </where>
         order by
 
@@ -393,47 +424,50 @@
 
         id desc
     </select>
-    <select id="querySystemConfig" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.SystemConfig">
-        select <include refid="Base_Column_List"/> from system_config
+    <select id="querySystemConfig" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.SystemConfig">
+        select
+        <include refid="Base_Column_List"/>
+        from system_config
         <where>
             and del_flag = 'N'
-                    <if test="id != null and !&quot;&quot;.equals(id)">
+            <if test="id != null and !&quot;&quot;.equals(id)">
                 and id = #{id}
             </if>
-                     <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
                 and del_flag = #{delFlag}
             </if>
-                     <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
                 and update_time = #{updateTime}
             </if>
-                     <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
                 and update_user = #{updateUser}
             </if>
-                     <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
                 and create_time = #{createTime}
             </if>
-                     <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
                 and create_user = #{createUser}
             </if>
-                     <if test="orderRate != null and !&quot;&quot;.equals(orderRate)">
+            <if test="orderRate != null and !&quot;&quot;.equals(orderRate)">
                 and order_rate = #{orderRate}
             </if>
-                     <if test="tixianRate != null and !&quot;&quot;.equals(tixianRate)">
+            <if test="tixianRate != null and !&quot;&quot;.equals(tixianRate)">
                 and tixian_rate = #{tixianRate}
             </if>
-                     <if test="extra != null and !&quot;&quot;.equals(extra)">
+            <if test="extra != null and !&quot;&quot;.equals(extra)">
                 and extra = #{extra}
             </if>
-                     <if test="useFlag != null and !&quot;&quot;.equals(useFlag)">
+            <if test="useFlag != null and !&quot;&quot;.equals(useFlag)">
                 and use_flag = #{useFlag}
             </if>
-                     <if test="personalDeposit != null and !&quot;&quot;.equals(personalDeposit)">
+            <if test="personalDeposit != null and !&quot;&quot;.equals(personalDeposit)">
                 and personal_deposit = #{personalDeposit}
             </if>
-                     <if test="companyDeposit != null and !&quot;&quot;.equals(companyDeposit)">
+            <if test="companyDeposit != null and !&quot;&quot;.equals(companyDeposit)">
                 and company_deposit = #{companyDeposit}
             </if>
-         
+
         </where>
         LIMIT 1
     </select>
@@ -449,10 +483,12 @@
         </if>
     </update>
     <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.SystemConfig">
-        select <include refid="Base_Column_List"/> from system_config
+        select
+        <include refid="Base_Column_List"/>
+        from system_config
         <where>
             and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
+        </where>
         order by id desc
     </select>
 </mapper>

src/main/java/com/izouma/awesomeadmin/dao/UserInfoMapper.java

@@ -40,5 +40,10 @@ public interface UserInfoMapper {
 
     int updatePassword(UserInfo record);
 
+    UserInfo checkLoginNum(UserInfo record);
+
+    int addLoginNum(UserInfo record);
+
+    int clearLoginNum(UserInfo record);
 }
 

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

@@ -31,6 +31,8 @@
         <result column="store_flag" property="storeFlag" jdbcType="CHAR"/>
         <result column="company_flag" property="companyFlag" jdbcType="CHAR"/>
         <result column="approve_step" property="approveStep" jdbcType="INTEGER"/>
+        <result column="login_num" property="loginNum" jdbcType="INTEGER"/>
+        <result column="login_time" property="loginTime" jdbcType="TIMESTAMP"/>
         <association property="departId" javaType="string" column="id"
                      select="com.izouma.awesomeadmin.dao.DepartInfoMapper.getUserDepartId"/>
         <association property="roleId" javaType="string" column="id"
@@ -42,7 +44,7 @@
         id, username, nickname, icon, birthday, sex, open_id, union_id, phone, mail,
         country, province, city, district, create_time, del_flag, money_coin, money_point,
         contacter, contact_phone, company_name, company_type, admin_flag, cash_pledge,
-        approve_flag, store_flag, company_flag, approve_step
+        approve_flag, store_flag, company_flag, approve_step, login_num, login_time
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
         select
@@ -656,8 +658,17 @@
         SELECT
         <include refid="Base_Column_List"/>
         from sys_user
-        WHERE (username = #{username} or phone = #{username} or mail = #{username}) AND password = #{password} AND del_flag = 'N'
+        WHERE (username = #{username} or phone = #{username} or mail = #{username}) AND password = #{password} AND
+        del_flag = 'N'
     </select>
+
+    <select id="checkLoginNum" resultType="com.izouma.awesomeadmin.model.UserInfo" parameterType="java.util.Map">
+        SELECT
+        <include refid="Base_Column_List"/>
+        from sys_user
+        WHERE (username = #{username} or phone = #{username} or mail = #{username}) AND del_flag = 'N'
+    </select>
+
     <select id="findDepartLeader" resultType="java.lang.String">
         SELECT *
         FROM (SELECT user_id, GROUP_CONCAT(depart_id ORDER BY depart_id) AS depart_id
@@ -706,5 +717,17 @@
 
     </update>
 
+    <update id="addLoginNum" parameterType="com.izouma.awesomeadmin.model.UserInfo">
+        UPDATE sys_user SET login_num = login_num + 1 , login_time = NOW()
+        WHERE del_flag='N'
+        AND (username = #{username} or phone = #{username} or mail = #{username})
+    </update>
+
+    <update id="clearLoginNum" parameterType="com.izouma.awesomeadmin.model.UserInfo">
+        UPDATE sys_user SET login_num = 0
+        WHERE del_flag='N'
+        AND (username = #{username} or phone = #{username} or mail = #{username})
+    </update>
+
 </mapper>
 

src/main/java/com/izouma/awesomeadmin/model/SystemConfig.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 SystemConfig{
+public class SystemConfig {
     private Integer id;
     private String delFlag;
     private Date updateTime;
@@ -21,136 +22,167 @@ public class SystemConfig{
     private Integer personalDeposit;
     private Integer companyDeposit;
 
-private String idStr;
+    private Integer personalSize;
+
+    private Integer companySize;
+
 
-private String searchKey;
+    private String idStr;
 
-/**
-* 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 getOrderRate(){
+
+    public String getOrderRate() {
         return this.orderRate;
     }
 
-    public void setOrderRate(String orderRate){
+    public void setOrderRate(String orderRate) {
         this.orderRate = orderRate;
     }
-    public String getTixianRate(){
+
+    public String getTixianRate() {
         return this.tixianRate;
     }
 
-    public void setTixianRate(String tixianRate){
+    public void setTixianRate(String tixianRate) {
         this.tixianRate = tixianRate;
     }
-    public String getExtra(){
+
+    public String getExtra() {
         return this.extra;
     }
 
-    public void setExtra(String extra){
+    public void setExtra(String extra) {
         this.extra = extra;
     }
-    public String getUseFlag(){
+
+    public String getUseFlag() {
         return this.useFlag;
     }
 
-    public void setUseFlag(String useFlag){
+    public void setUseFlag(String useFlag) {
         this.useFlag = useFlag;
     }
-    public Integer getPersonalDeposit(){
+
+    public Integer getPersonalDeposit() {
         return this.personalDeposit;
     }
 
-    public void setPersonalDeposit(Integer personalDeposit){
+    public void setPersonalDeposit(Integer personalDeposit) {
         this.personalDeposit = personalDeposit;
     }
-    public Integer getCompanyDeposit(){
+
+    public Integer getCompanyDeposit() {
         return this.companyDeposit;
     }
 
-    public void setCompanyDeposit(Integer companyDeposit){
+    public void setCompanyDeposit(Integer companyDeposit) {
         this.companyDeposit = companyDeposit;
     }
 
-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 getIdStr() {
-    return idStr;
-}
+    public String getIdStr() {
+        return idStr;
+    }
 
-public void setIdStr(String idStr) {
-    this.idStr = idStr;
-}
+    public void setIdStr(String idStr) {
+        this.idStr = idStr;
+    }
 
+    public Integer getPersonalSize() {
+        return personalSize;
+    }
+
+    public void setPersonalSize(Integer personalSize) {
+        this.personalSize = personalSize;
+    }
+
+    public Integer getCompanySize() {
+        return companySize;
+    }
+
+    public void setCompanySize(Integer companySize) {
+        this.companySize = companySize;
+    }
 }
 

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

@@ -77,6 +77,10 @@ public class UserInfo {
 
     private StoreInfo storeInfo;
 
+    private Integer loginNum;
+
+    private Date loginTime;
+
     public String getDepartId() {
         return departId;
     }
@@ -332,5 +336,21 @@ public class UserInfo {
     public void setStoreInfo(StoreInfo storeInfo) {
         this.storeInfo = storeInfo;
     }
+
+    public Integer getLoginNum() {
+        return loginNum;
+    }
+
+    public void setLoginNum(Integer loginNum) {
+        this.loginNum = loginNum;
+    }
+
+    public Date getLoginTime() {
+        return loginTime;
+    }
+
+    public void setLoginTime(Date loginTime) {
+        this.loginTime = loginTime;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/service/UserInfoService.java

@@ -43,5 +43,11 @@ public interface UserInfoService {
     boolean updatePassword(UserInfo userInfo);
 
     void alipaySuccess(String tradeNo, String tradeStatus);
+
+    UserInfo checkLoginNum(UserInfo record);
+
+    boolean addLoginNum(UserInfo record);
+
+    boolean clearLoginNum(UserInfo record);
 }
 

src/main/java/com/izouma/awesomeadmin/service/impl/CompanyAuthenticationServiceImpl.java

@@ -3,9 +3,11 @@ package com.izouma.awesomeadmin.service.impl;
 import com.izouma.awesomeadmin.constant.AppConstant;
 import com.izouma.awesomeadmin.dao.CompanyAuthenticationMapper;
 import com.izouma.awesomeadmin.dao.StoreInfoMapper;
+import com.izouma.awesomeadmin.dao.SystemConfigMapper;
 import com.izouma.awesomeadmin.dao.UserInfoMapper;
 import com.izouma.awesomeadmin.dto.Page;
 import com.izouma.awesomeadmin.model.CompanyAuthentication;
+import com.izouma.awesomeadmin.model.SystemConfig;
 import com.izouma.awesomeadmin.model.UserInfo;
 import com.izouma.awesomeadmin.service.CompanyAuthenticationService;
 import org.apache.log4j.Logger;
@@ -33,6 +35,9 @@ public class CompanyAuthenticationServiceImpl implements CompanyAuthenticationSe
     @Autowired
     private StoreInfoMapper storeInfoMapper;
 
+    @Autowired
+    private SystemConfigMapper systemConfigMapper;
+
 
     @Override
     public List<CompanyAuthentication> getCompanyAuthenticationList(CompanyAuthentication record) {
@@ -170,10 +175,13 @@ public class CompanyAuthenticationServiceImpl implements CompanyAuthenticationSe
                 userInfo.setApproveStep(5);
                 userInfoMapper.updateByPrimaryKeySelective(userInfo);//更新用户状态。
 
+                SystemConfig systemConfig = systemConfigMapper.selectByPrimaryKey(1);
+
                 Map<String, Object> parameter = new HashMap<String, Object>();
                 parameter.put("userId", companyAuthentication.getUserId());
                 parameter.put("useFlag", "Y");
                 parameter.put("typeFlag", 1);//企业店铺
+                parameter.put("memorySpace", systemConfig.getCompanySize() * 1024);//存储空间
 
                 storeInfoMapper.updateUseFlagByUserId(parameter);//更新店铺为可用
 

src/main/java/com/izouma/awesomeadmin/service/impl/PersonalAuthenticationServiceImpl.java

@@ -3,8 +3,10 @@ package com.izouma.awesomeadmin.service.impl;
 import java.util.*;
 
 import com.izouma.awesomeadmin.dao.StoreInfoMapper;
+import com.izouma.awesomeadmin.dao.SystemConfigMapper;
 import com.izouma.awesomeadmin.dao.UserInfoMapper;
 import com.izouma.awesomeadmin.model.StoreInfo;
+import com.izouma.awesomeadmin.model.SystemConfig;
 import com.izouma.awesomeadmin.model.UserInfo;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +34,9 @@ public class PersonalAuthenticationServiceImpl implements PersonalAuthentication
     @Autowired
     private StoreInfoMapper storeInfoMapper;
 
+    @Autowired
+    private SystemConfigMapper systemConfigMapper;
+
 
     @Override
     public List<PersonalAuthentication> getPersonalAuthenticationList(PersonalAuthentication record) {
@@ -168,10 +173,14 @@ public class PersonalAuthenticationServiceImpl implements PersonalAuthentication
                 userInfo.setApproveStep(5);
                 userInfoMapper.updateByPrimaryKeySelective(userInfo);//更新用户状态。
 
+                SystemConfig systemConfig = systemConfigMapper.selectByPrimaryKey(1);
+
                 Map<String, Object> parameter = new HashMap<String, Object>();
                 parameter.put("userId", personalAuthentication.getUserId());
                 parameter.put("useFlag", "Y");
                 parameter.put("typeFlag", 2);//个人店铺
+                parameter.put("memorySpace", systemConfig.getPersonalSize() * 1024);//存储空间
+
 
                 storeInfoMapper.updateUseFlagByUserId(parameter);//更新店铺为可用
 

src/main/java/com/izouma/awesomeadmin/service/impl/UserInfoServiceImpl.java

@@ -198,6 +198,42 @@ public class UserInfoServiceImpl implements UserInfoService {
         return false;
     }
 
+    @Override
+    public boolean addLoginNum(UserInfo record) {
+
+        logger.info("addLoginNum");
+        try {
+
+            int updates = userInfoMapper.addLoginNum(record);
+
+            if (updates > 0) {
+                return true;
+            }
+        } catch (Exception e) {
+            logger.error("addLoginNum", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean clearLoginNum(UserInfo record) {
+
+        logger.info("clearLoginNum");
+        try {
+
+            int updates = userInfoMapper.clearLoginNum(record);
+
+            if (updates > 0) {
+                return true;
+            }
+        } catch (Exception e) {
+            logger.error("clearLoginNum", e);
+        }
+
+        return false;
+    }
+
     @Override
     public boolean updatePassword(UserInfo record) {
 
@@ -234,6 +270,18 @@ public class UserInfoServiceImpl implements UserInfoService {
         return null;
     }
 
+    @Override
+    public UserInfo checkLoginNum(UserInfo record) {
+        logger.info("checkLoginNum");
+        try {
+            UserInfo result = userInfoMapper.checkLoginNum(record);
+            return result;
+        } catch (Exception e) {
+            logger.error("checkLoginNum", e);
+        }
+        return null;
+    }
+
     @Override
     public UserInfo loginSms(String phone, String code, String sessionId) throws LoginException {
         logger.info("loginSms");

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

@@ -228,6 +228,36 @@ public class UserInfoController {
         }
     }
 
+    @RequestMapping(value = "/checkLoginNum", method = RequestMethod.GET)
+    @ResponseBody
+    public Result checkLoginNum(UserInfo record) {
+
+        UserInfo data = userInfoService.checkLoginNum(record);
+        return new Result(true, data);
+    }
+
+    @RequestMapping(value = "/addLoginNum", method = RequestMethod.POST)
+    @ResponseBody
+    public Result addLoginNum(UserInfo record) {
+
+        boolean num = userInfoService.addLoginNum(record);
+        if (num) {
+            return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
+    @RequestMapping(value = "/clearLoginNum", method = RequestMethod.POST)
+    @ResponseBody
+    public Result clearLoginNum(UserInfo record) {
+
+        boolean num = userInfoService.clearLoginNum(record);
+        if (num) {
+            return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
 
 }
 

src/main/vue/src/pages/SystemConfig.vue

@@ -13,6 +13,12 @@
             <el-form-item prop="companyDeposit" label="公司押金">
                 <el-input v-model="formData.companyDeposit" ></el-input>
             </el-form-item>
+            <el-form-item prop="personalSize" label="个人存储(GB)">
+                <el-input v-model="formData.personalSize" ></el-input>
+            </el-form-item>
+            <el-form-item prop="companySize" label="公司存储(GB)">
+                <el-input v-model="formData.companySize" ></el-input>
+            </el-form-item>
             <el-form-item prop="extra" label="订单清理天数">
                 <el-input v-model="formData.extra" :disabled="'extra'==subColumn"></el-input>
             </el-form-item>

src/test/java/OrderServiceTest.java

@@ -1,4 +1,8 @@
+import com.izouma.awesomeadmin.model.CompanyAuthentication;
+import com.izouma.awesomeadmin.model.PersonalAuthentication;
+import com.izouma.awesomeadmin.service.CompanyAuthenticationService;
 import com.izouma.awesomeadmin.service.OSSFileService;
+import com.izouma.awesomeadmin.service.PersonalAuthenticationService;
 import com.izouma.awesomeadmin.service.UserInfoService;
 import com.izouma.awesomeadmin.util.MbappUtil;
 import org.junit.Test;
@@ -19,6 +23,9 @@ public class OrderServiceTest {
     @Autowired
     private OSSFileService oSSFileService;
 
+    @Autowired
+    private CompanyAuthenticationService companyAuthenticationService;
+
     @Test
     public void testGenOrderID() {
         String machineId = "1";
@@ -35,4 +42,10 @@ public class OrderServiceTest {
         oSSFileService.deleteObject("tutuxiang/null/null/null/2.jpg");
     }
 
+    @Test
+    public void personalAuthenticationTest() {
+        CompanyAuthentication record = new CompanyAuthentication();
+        record.setId(2);
+        companyAuthenticationService.pass(record);
+    }
 }