Kaynağa Gözat

修改指导列表

anderx 4 yıl önce
ebeveyn
işleme
458edbf074

+ 9 - 4
pom.xml

@@ -395,12 +395,17 @@
 			<version>2.2.9</version>
 			<type>pom</type>
 		</dependency>
+		<dependency>
+			<groupId>org.mybatis.generator</groupId>
+			<artifactId>mybatis-generator-core</artifactId>
+			<version>1.3.7</version>
+		</dependency>
 
 	</dependencies>
 	<build>
 		<resources>
 			<resource>
-				<directory>src/resources</directory>
+				<directory>src/main/resources</directory>
 				<includes>
 					<include>**/*.properties</include>
 					<include>**/*.xml</include>
@@ -411,17 +416,17 @@
 				<resource>
 					<directory>src/main/java</directory>
 					<includes>
-						<include>**/**/*.xml</include>
+						<include>**/*.properties</include>
+						<include>**/*.xml</include>
 					</includes>
 				</resource>
-
 		</resources>
 		<plugins>
 			<plugin>
 				<!--IDEA在maven Project加入generator插件-->
 				<groupId>org.mybatis.generator</groupId>
 				<artifactId>mybatis-generator-maven-plugin</artifactId>
-				<version>1.3.2</version>
+				<version>1.3.7</version>
 				<configuration>
 					<verbose>true</verbose>
 					<overwrite>true</overwrite>

+ 0 - 6
src/main/java/com/goafanti/common/dao/AdminMapper.java

@@ -138,8 +138,6 @@ public interface AdminMapper {
 	
 	int deleteById(String id);
 
-	Pagination<AppAdminListBo> consultantList();
-	
 	List<Admin> selectIDNBySuperiorId(String superiorId);
 	
 	String selectUserNoById(String superiorId);
@@ -156,8 +154,6 @@ public interface AdminMapper {
 	List<AdminListBo> selectSubList(@Param("adminId")String adminId);
 	
 	/**
-	 * 查询订单变更信息通知�??
-	 * @param orderNo
 	 * @return
 	 */
 	Admin selectAdminByRoleId(@Param("roleId")String roleId);
@@ -175,7 +171,6 @@ public interface AdminMapper {
 
 	int updateLockIds(@Param("lockIds")String lockIds);
 
-	List<AdminListBo> getListDefaultPassword(String id);
 
 	int getCountById(String id);
 	AdminListBo getDeptNameByAid(String id);
@@ -198,7 +193,6 @@ public interface AdminMapper {
 
 	List<String> selectDepIdWithSpuerId(String superId);
 
-	void getAllDep();
 
 	List<String> getAdminRoleListByAid(String id);
 

+ 43 - 64
src/main/java/com/goafanti/common/dao/UserFollowMapper.java

@@ -1,71 +1,50 @@
 package com.goafanti.common.dao;
 
 import com.goafanti.common.model.UserFollow;
-import com.goafanti.common.model.UserFollowExample;
-import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
-public interface UserFollowMapper {
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	long countByExample(UserFollowExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	int deleteByExample(UserFollowExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	int deleteByPrimaryKey(String id);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	int insert(UserFollow record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	int insertSelective(UserFollow record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	List<UserFollow> selectByExample(UserFollowExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	UserFollow selectByPrimaryKey(String id);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	int updateByExampleSelective(@Param("record") UserFollow record, @Param("example") UserFollowExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	int updateByExample(@Param("record") UserFollow record, @Param("example") UserFollowExample example);
+import java.util.List;
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	int updateByPrimaryKeySelective(UserFollow record);
+public interface UserFollowMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_follow
+     *
+     * @mbggenerated
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_follow
+     *
+     * @mbggenerated
+     */
+    int insert(UserFollow record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_follow
+     *
+     * @mbggenerated
+     */
+    int insertSelective(UserFollow record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_follow
+     *
+     * @mbggenerated
+     */
+    UserFollow selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_follow
+     *
+     * @mbggenerated
+     */
+    int updateByPrimaryKeySelective(UserFollow record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_follow
@@ -76,7 +55,7 @@ public interface UserFollowMapper {
 
 	int pushUserGuidance(@Param("id")String id, @Param("guidance")Integer guidance);
 
-	List<UserFollow> selectbyUid(@Param("uid")String uid,@Param("aid")String aid);
+	List<UserFollow> selectbyUid(@Param("uid")String uid, @Param("aid")String aid);
+
 
-	
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/UserMapper.java

@@ -295,6 +295,8 @@ public interface UserMapper {
 
 	List<OutUser> getAllUser();
 
+
+	List<CustomerListOut> selectPrivateOrganizationCustomerList(Map<String,Object> map);
 	
 	
 }

+ 1 - 1
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -531,7 +531,7 @@
     where mobile = #{mobile,jdbcType=VARCHAR}
   </select> 
   
-  <select id="selectRolesByPrimaryKey" parameterType="java.lang.String">
+  <select id="selectRolesByPrimaryKey" parameterType="java.lang.String" resultType="com.goafanti.common.model.Role">
    select r.name, r.id, r.type
     from role r
     left join user_role ur on ur.rid=r.id

+ 4 - 1
src/main/java/com/goafanti/common/mapper/UserBusinessMapper.xml

@@ -413,7 +413,10 @@
   </select>
   
   <select id="selectFollowCountByUAid" parameterType="java.lang.String" resultType="java.lang.Integer">
-  	select count(0) from user_follow where uid = #{uid,jdbcType=VARCHAR} and aid = #{aid,jdbcType=VARCHAR}
+  	select count(0) from user_follow where uid = #{uid,jdbcType=VARCHAR}
+  	<if test="aid !=null">
+=   and aid = #{aid,jdbcType=VARCHAR}
+    </if>
   </select>
   
   

+ 255 - 425
src/main/java/com/goafanti/common/mapper/UserFollowMapper.xml

@@ -1,434 +1,264 @@
 <?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.goafanti.common.dao.UserFollowMapper">
-	<resultMap id="BaseResultMap"
-		type="com.goafanti.common.model.UserFollow">
-		<!-- WARNING - @mbg.generated This element is automatically generated by 
-			MyBatis Generator, do not modify. This element was generated on Sat Oct 10 
-			10:18:15 CST 2020. -->
-		<id column="id" jdbcType="VARCHAR" property="id" />
-		<result column="uid" jdbcType="VARCHAR" property="uid" />
-		<result column="aid" jdbcType="VARCHAR" property="aid" />
-		<result column="paid" jdbcType="VARCHAR" property="paid" />
-		<result column="result" jdbcType="VARCHAR" property="result" />
-		<result column="attachment_url" jdbcType="VARCHAR"
-			property="attachmentUrl" />
-		<result column="create_time" jdbcType="TIMESTAMP"
-			property="createTime" />
-		<result column="ocb_id" jdbcType="VARCHAR" property="ocbId" />
-		<result column="contact_type" jdbcType="INTEGER"
-			property="contactType" />
-		<result column="effective" jdbcType="INTEGER"
-			property="effective" />
-		<result column="time_stamp" jdbcType="TIMESTAMP"
-			property="timeStamp" />
-		<result column="follow_count" jdbcType="INTEGER"
-			property="followCount" />
-		<result column="guidance" jdbcType="VARCHAR"
-			property="guidance" />
-		<result column="guidance_time" jdbcType="TIMESTAMP"
-			property="guidanceTime" />
-	</resultMap>
-	<sql id="Example_Where_Clause">
-		<!-- WARNING - @mbg.generated This element is automatically generated by 
-			MyBatis Generator, do not modify. This element was generated on Sat Oct 10 
-			10:18:15 CST 2020. -->
-		<where>
-			<foreach collection="oredCriteria" item="criteria"
-				separator="or">
-				<if test="criteria.valid">
-					<trim prefix="(" prefixOverrides="and" suffix=")">
-						<foreach collection="criteria.criteria" item="criterion">
-							<choose>
-								<when test="criterion.noValue">
-									and ${criterion.condition}
-								</when>
-								<when test="criterion.singleValue">
-									and ${criterion.condition} #{criterion.value}
-								</when>
-								<when test="criterion.betweenValue">
-									and ${criterion.condition} #{criterion.value} and
-									#{criterion.secondValue}
-								</when>
-								<when test="criterion.listValue">
-									and ${criterion.condition}
-									<foreach close=")" collection="criterion.value"
-										item="listItem" open="(" separator=",">
-										#{listItem}
-									</foreach>
-								</when>
-							</choose>
-						</foreach>
-					</trim>
-				</if>
-			</foreach>
-		</where>
-	</sql>
-	<sql id="Update_By_Example_Where_Clause">
-		<!-- WARNING - @mbg.generated This element is automatically generated by 
-			MyBatis Generator, do not modify. This element was generated on Sat Oct 10 
-			10:18:15 CST 2020. -->
-		<where>
-			<foreach collection="example.oredCriteria" item="criteria"
-				separator="or">
-				<if test="criteria.valid">
-					<trim prefix="(" prefixOverrides="and" suffix=")">
-						<foreach collection="criteria.criteria" item="criterion">
-							<choose>
-								<when test="criterion.noValue">
-									and ${criterion.condition}
-								</when>
-								<when test="criterion.singleValue">
-									and ${criterion.condition} #{criterion.value}
-								</when>
-								<when test="criterion.betweenValue">
-									and ${criterion.condition} #{criterion.value} and
-									#{criterion.secondValue}
-								</when>
-								<when test="criterion.listValue">
-									and ${criterion.condition}
-									<foreach close=")" collection="criterion.value"
-										item="listItem" open="(" separator=",">
-										#{listItem}
-									</foreach>
-								</when>
-							</choose>
-						</foreach>
-					</trim>
-				</if>
-			</foreach>
-		</where>
-	</sql>
-	<sql id="Base_Column_List">
-		<!-- WARNING - @mbg.generated This element is automatically generated by 
-			MyBatis Generator, do not modify. This element was generated on Sat Oct 10 
-			10:18:15 CST 2020. -->
-		id, uid, aid, paid, result, attachment_url, create_time, ocb_id,
-		contact_type, effective,
-		time_stamp, follow_count, guidance, guidance_time
-	</sql>
-	<select id="selectByExample"
-		parameterType="com.goafanti.common.model.UserFollowExample"
-		resultMap="BaseResultMap">
-		<!-- WARNING - @mbg.generated This element is automatically generated by 
-			MyBatis Generator, do not modify. This element was generated on Sat Oct 10 
-			10:18:15 CST 2020. -->
-		select
-		<if test="distinct">
-			distinct
-		</if>
-		<include refid="Base_Column_List" />
-		from user_follow
-		<if test="_parameter != null">
-			<include refid="Example_Where_Clause" />
-		</if>
-		<if test="orderByClause != null">
-			order by ${orderByClause}
-		</if>
-	</select>
-	<select id="selectByPrimaryKey" parameterType="java.lang.String"
-		resultMap="BaseResultMap">
-		<!-- WARNING - @mbg.generated This element is automatically generated by 
-			MyBatis Generator, do not modify. This element was generated on Sat Oct 10 
-			10:18:15 CST 2020. -->
-		select
-		<include refid="Base_Column_List" />
-		from user_follow
-		where id = #{id,jdbcType=VARCHAR}
-	</select>
-	<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-		<!-- WARNING - @mbg.generated This element is automatically generated by 
-			MyBatis Generator, do not modify. This element was generated on Sat Oct 10 
-			10:18:15 CST 2020. -->
-		delete from user_follow
-		where id = #{id,jdbcType=VARCHAR}
-	</delete>
-	<delete id="deleteByExample"
-		parameterType="com.goafanti.common.model.UserFollowExample">
-		<!-- WARNING - @mbg.generated This element is automatically generated by 
-			MyBatis Generator, do not modify. This element was generated on Sat Oct 10 
-			10:18:15 CST 2020. -->
-		delete from user_follow
-		<if test="_parameter != null">
-			<include refid="Example_Where_Clause" />
-		</if>
-	</delete>
-	<insert id="insert"
-		parameterType="com.goafanti.common.model.UserFollow">
-		<!-- WARNING - @mbg.generated This element is automatically generated by 
-			MyBatis Generator, do not modify. This element was generated on Sat Oct 10 
-			10:18:15 CST 2020. -->
-		insert into user_follow (id, uid, aid,
-		paid, result, attachment_url,
-		create_time, ocb_id, contact_type,
-		effective, time_stamp, follow_count,
-		guidance, guidance_time)
-		values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR},
-		#{aid,jdbcType=VARCHAR},
-		#{paid,jdbcType=VARCHAR}, #{result,jdbcType=VARCHAR}, #{attachmentUrl,jdbcType=VARCHAR},
-		#{createTime,jdbcType=TIMESTAMP}, #{ocbId,jdbcType=VARCHAR},
-		#{contactType,jdbcType=INTEGER},
-		#{effective,jdbcType=INTEGER}, #{timeStamp,jdbcType=TIMESTAMP}, #{followCount,jdbcType=INTEGER},
-		#{guidance,jdbcType=VARCHAR}, #{guidanceTime,jdbcType=TIMESTAMP})
-	</insert>
-	<insert id="insertSelective"
-		parameterType="com.goafanti.common.model.UserFollow">
-		<!-- WARNING - @mbg.generated This element is automatically generated by 
-			MyBatis Generator, do not modify. This element was generated on Sat Oct 10 
-			10:18:15 CST 2020. -->
-		insert into user_follow
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">
-				id,
-			</if>
-			<if test="uid != null">
-				uid,
-			</if>
-			<if test="aid != null">
-				aid,
-			</if>
-			<if test="paid != null">
-				paid,
-			</if>
-			<if test="result != null">
-				result,
-			</if>
-			<if test="attachmentUrl != null">
-				attachment_url,
-			</if>
-			<if test="createTime != null">
-				create_time,
-			</if>
-			<if test="ocbId != null">
-				ocb_id,
-			</if>
-			<if test="contactType != null">
-				contact_type,
-			</if>
-			<if test="effective != null">
-				effective,
-			</if>
-			<if test="timeStamp != null">
-				time_stamp,
-			</if>
-			<if test="followCount != null">
-				follow_count,
-			</if>
-			<if test="guidance != null">
-				guidance,
-			</if>
-			<if test="guidanceTime != null">
-				guidance_time,
-			</if>
-		</trim>
-		<trim prefix="values (" suffix=")" suffixOverrides=",">
-			<if test="id != null">
-				#{id,jdbcType=VARCHAR},
-			</if>
-			<if test="uid != null">
-				#{uid,jdbcType=VARCHAR},
-			</if>
-			<if test="aid != null">
-				#{aid,jdbcType=VARCHAR},
-			</if>
-			<if test="paid != null">
-				#{paid,jdbcType=VARCHAR},
-			</if>
-			<if test="result != null">
-				#{result,jdbcType=VARCHAR},
-			</if>
-			<if test="attachmentUrl != null">
-				#{attachmentUrl,jdbcType=VARCHAR},
-			</if>
-			<if test="createTime != null">
-				#{createTime,jdbcType=TIMESTAMP},
-			</if>
-			<if test="ocbId != null">
-				#{ocbId,jdbcType=VARCHAR},
-			</if>
-			<if test="contactType != null">
-				#{contactType,jdbcType=INTEGER},
-			</if>
-			<if test="effective != null">
-				#{effective,jdbcType=INTEGER},
-			</if>
-			<if test="timeStamp != null">
-				#{timeStamp,jdbcType=TIMESTAMP},
-			</if>
-			<if test="followCount != null">
-				#{followCount,jdbcType=INTEGER},
-			</if>
-			<if test="guidance != null">
-				#{guidance,jdbcType=VARCHAR},
-			</if>
-			<if test="guidanceTime != null">
-				#{guidanceTime,jdbcType=TIMESTAMP},
-			</if>
-		</trim>
-	</insert>
-	<select id="countByExample"
-		parameterType="com.goafanti.common.model.UserFollowExample"
-		resultType="java.lang.Long">
-		<!-- WARNING - @mbg.generated This element is automatically generated by 
-			MyBatis Generator, do not modify. This element was generated on Sat Oct 10 
-			10:18:15 CST 2020. -->
-		select count(*) from user_follow
-		<if test="_parameter != null">
-			<include refid="Example_Where_Clause" />
-		</if>
-	</select>
-	<update id="updateByExampleSelective" parameterType="map">
-		<!-- WARNING - @mbg.generated This element is automatically generated by 
-			MyBatis Generator, do not modify. This element was generated on Sat Oct 10 
-			10:18:15 CST 2020. -->
-		update user_follow
-		<set>
-			<if test="record.id != null">
-				id = #{record.id,jdbcType=VARCHAR},
-			</if>
-			<if test="record.uid != null">
-				uid = #{record.uid,jdbcType=VARCHAR},
-			</if>
-			<if test="record.aid != null">
-				aid = #{record.aid,jdbcType=VARCHAR},
-			</if>
-			<if test="record.paid != null">
-				paid = #{record.paid,jdbcType=VARCHAR},
-			</if>
-			<if test="record.result != null">
-				result = #{record.result,jdbcType=VARCHAR},
-			</if>
-			<if test="record.attachmentUrl != null">
-				attachment_url = #{record.attachmentUrl,jdbcType=VARCHAR},
-			</if>
-			<if test="record.createTime != null">
-				create_time = #{record.createTime,jdbcType=TIMESTAMP},
-			</if>
-			<if test="record.ocbId != null">
-				ocb_id = #{record.ocbId,jdbcType=VARCHAR},
-			</if>
-			<if test="record.contactType != null">
-				contact_type = #{record.contactType,jdbcType=INTEGER},
-			</if>
-			<if test="record.effective != null">
-				effective = #{record.effective,jdbcType=INTEGER},
-			</if>
-			<if test="record.timeStamp != null">
-				time_stamp = #{record.timeStamp,jdbcType=TIMESTAMP},
-			</if>
-			<if test="record.followCount != null">
-				follow_count = #{record.followCount,jdbcType=INTEGER},
-			</if>
-			<if test="record.guidance != null">
-				guidance = #{record.guidance,jdbcType=VARCHAR},
-			</if>
-			<if test="record.guidanceTime != null">
-				guidance_time = #{record.guidanceTime,jdbcType=TIMESTAMP},
-			</if>
-		</set>
-		<if test="_parameter != null">
-			<include refid="Update_By_Example_Where_Clause" />
-		</if>
-	</update>
-	<update id="updateByExample" parameterType="map">
-		<!-- WARNING - @mbg.generated This element is automatically generated by 
-			MyBatis Generator, do not modify. This element was generated on Sat Oct 10 
-			10:18:15 CST 2020. -->
-		update user_follow
-		set id = #{record.id,jdbcType=VARCHAR},
-		uid = #{record.uid,jdbcType=VARCHAR},
-		aid = #{record.aid,jdbcType=VARCHAR},
-		paid = #{record.paid,jdbcType=VARCHAR},
-		result = #{record.result,jdbcType=VARCHAR},
-		attachment_url = #{record.attachmentUrl,jdbcType=VARCHAR},
-		create_time = #{record.createTime,jdbcType=TIMESTAMP},
-		ocb_id = #{record.ocbId,jdbcType=VARCHAR},
-		contact_type = #{record.contactType,jdbcType=INTEGER},
-		effective = #{record.effective,jdbcType=INTEGER},
-		time_stamp = #{record.timeStamp,jdbcType=TIMESTAMP},
-		follow_count = #{record.followCount,jdbcType=INTEGER},
-		guidance = #{record.guidance,jdbcType=VARCHAR},
-		guidance_time = #{record.guidanceTime,jdbcType=TIMESTAMP}
-		<if test="_parameter != null">
-			<include refid="Update_By_Example_Where_Clause" />
-		</if>
-	</update>
-	<update id="updateByPrimaryKeySelective"
-		parameterType="com.goafanti.common.model.UserFollow">
-		<!-- WARNING - @mbg.generated This element is automatically generated by 
-			MyBatis Generator, do not modify. This element was generated on Sat Oct 10 
-			10:18:15 CST 2020. -->
-		update user_follow
-		<set>
-			<if test="uid != null">
-				uid = #{uid,jdbcType=VARCHAR},
-			</if>
-			<if test="aid != null">
-				aid = #{aid,jdbcType=VARCHAR},
-			</if>
-			<if test="paid != null">
-				paid = #{paid,jdbcType=VARCHAR},
-			</if>
-			<if test="result != null">
-				result = #{result,jdbcType=VARCHAR},
-			</if>
-			<if test="attachmentUrl != null">
-				attachment_url = #{attachmentUrl,jdbcType=VARCHAR},
-			</if>
-			<if test="createTime != null">
-				create_time = #{createTime,jdbcType=TIMESTAMP},
-			</if>
-			<if test="ocbId != null">
-				ocb_id = #{ocbId,jdbcType=VARCHAR},
-			</if>
-			<if test="contactType != null">
-				contact_type = #{contactType,jdbcType=INTEGER},
-			</if>
-			<if test="effective != null">
-				effective = #{effective,jdbcType=INTEGER},
-			</if>
-			<if test="timeStamp != null">
-				time_stamp = #{timeStamp,jdbcType=TIMESTAMP},
-			</if>
-			<if test="followCount != null">
-				follow_count = #{followCount,jdbcType=INTEGER},
-			</if>
-			<if test="guidance != null">
-				guidance = #{guidance,jdbcType=VARCHAR},
-			</if>
-			<if test="guidanceTime != null">
-				guidance_time = #{guidanceTime,jdbcType=TIMESTAMP},
-			</if>
-		</set>
-		where id = #{id,jdbcType=VARCHAR}
-	</update>
-	<update id="updateByPrimaryKey"
-		parameterType="com.goafanti.common.model.UserFollow">
-		<!-- WARNING - @mbg.generated This element is automatically generated by 
-			MyBatis Generator, do not modify. This element was generated on Sat Oct 10 
-			10:18:15 CST 2020. -->
-		update user_follow
-		set uid = #{uid,jdbcType=VARCHAR},
-		aid = #{aid,jdbcType=VARCHAR},
-		paid = #{paid,jdbcType=VARCHAR},
-		result = #{result,jdbcType=VARCHAR},
-		attachment_url = #{attachmentUrl,jdbcType=VARCHAR},
-		create_time = #{createTime,jdbcType=TIMESTAMP},
-		ocb_id = #{ocbId,jdbcType=VARCHAR},
-		contact_type = #{contactType,jdbcType=INTEGER},
-		effective = #{effective,jdbcType=INTEGER},
-		time_stamp = #{timeStamp,jdbcType=TIMESTAMP},
-		follow_count = #{followCount,jdbcType=INTEGER},
-		guidance = #{guidance,jdbcType=VARCHAR},
-		guidance_time = #{guidanceTime,jdbcType=TIMESTAMP}
-		where id = #{id,jdbcType=VARCHAR}
-	</update>
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.UserFollow">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="uid" jdbcType="VARCHAR" property="uid" />
+    <result column="aid" jdbcType="VARCHAR" property="aid" />
+    <result column="paid" jdbcType="VARCHAR" property="paid" />
+    <result column="result" jdbcType="VARCHAR" property="result" />
+    <result column="attachment_url" jdbcType="VARCHAR" property="attachmentUrl" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="ocb_id" jdbcType="VARCHAR" property="ocbId" />
+    <result column="contact_type" jdbcType="INTEGER" property="contactType" />
+    <result column="effective" jdbcType="INTEGER" property="effective" />
+    <result column="time_stamp" jdbcType="TIMESTAMP" property="timeStamp" />
+    <result column="follow_count" jdbcType="INTEGER" property="followCount" />
+    <result column="guidance" jdbcType="VARCHAR" property="guidance" />
+    <result column="guidance_time" jdbcType="TIMESTAMP" property="guidanceTime" />
+    <result column="guidance_aid" jdbcType="VARCHAR" property="guidanceAid" />
+    <result column="guidance_name" jdbcType="VARCHAR" property="guidanceName" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    id, `uid`, aid, paid, `result`, attachment_url, create_time, ocb_id, contact_type, 
+    effective, time_stamp, follow_count, guidance, guidance_time, guidance_aid, guidance_name
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from user_follow
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from user_follow
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.UserFollow">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into user_follow (id, `uid`, aid, 
+      paid, `result`, attachment_url, 
+      create_time, ocb_id, contact_type, 
+      effective, time_stamp, follow_count, 
+      guidance, guidance_time, guidance_aid, 
+      guidance_name)
+    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, 
+      #{paid,jdbcType=VARCHAR}, #{result,jdbcType=VARCHAR}, #{attachmentUrl,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{ocbId,jdbcType=VARCHAR}, #{contactType,jdbcType=INTEGER}, 
+      #{effective,jdbcType=INTEGER}, #{timeStamp,jdbcType=TIMESTAMP}, #{followCount,jdbcType=INTEGER}, 
+      #{guidance,jdbcType=VARCHAR}, #{guidanceTime,jdbcType=TIMESTAMP}, #{guidanceAid,jdbcType=VARCHAR}, 
+      #{guidanceName,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.UserFollow">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into user_follow
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="uid != null">
+        `uid`,
+      </if>
+      <if test="aid != null">
+        aid,
+      </if>
+      <if test="paid != null">
+        paid,
+      </if>
+      <if test="result != null">
+        `result`,
+      </if>
+      <if test="attachmentUrl != null">
+        attachment_url,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="ocbId != null">
+        ocb_id,
+      </if>
+      <if test="contactType != null">
+        contact_type,
+      </if>
+      <if test="effective != null">
+        effective,
+      </if>
+      <if test="timeStamp != null">
+        time_stamp,
+      </if>
+      <if test="followCount != null">
+        follow_count,
+      </if>
+      <if test="guidance != null">
+        guidance,
+      </if>
+      <if test="guidanceTime != null">
+        guidance_time,
+      </if>
+      <if test="guidanceAid != null">
+        guidance_aid,
+      </if>
+      <if test="guidanceName != null">
+        guidance_name,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="uid != null">
+        #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="aid != null">
+        #{aid,jdbcType=VARCHAR},
+      </if>
+      <if test="paid != null">
+        #{paid,jdbcType=VARCHAR},
+      </if>
+      <if test="result != null">
+        #{result,jdbcType=VARCHAR},
+      </if>
+      <if test="attachmentUrl != null">
+        #{attachmentUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ocbId != null">
+        #{ocbId,jdbcType=VARCHAR},
+      </if>
+      <if test="contactType != null">
+        #{contactType,jdbcType=INTEGER},
+      </if>
+      <if test="effective != null">
+        #{effective,jdbcType=INTEGER},
+      </if>
+      <if test="timeStamp != null">
+        #{timeStamp,jdbcType=TIMESTAMP},
+      </if>
+      <if test="followCount != null">
+        #{followCount,jdbcType=INTEGER},
+      </if>
+      <if test="guidance != null">
+        #{guidance,jdbcType=VARCHAR},
+      </if>
+      <if test="guidanceTime != null">
+        #{guidanceTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="guidanceAid != null">
+        #{guidanceAid,jdbcType=VARCHAR},
+      </if>
+      <if test="guidanceName != null">
+        #{guidanceName,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.UserFollow">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update user_follow
+    <set>
+      <if test="uid != null">
+        `uid` = #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="aid != null">
+        aid = #{aid,jdbcType=VARCHAR},
+      </if>
+      <if test="paid != null">
+        paid = #{paid,jdbcType=VARCHAR},
+      </if>
+      <if test="result != null">
+        `result` = #{result,jdbcType=VARCHAR},
+      </if>
+      <if test="attachmentUrl != null">
+        attachment_url = #{attachmentUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ocbId != null">
+        ocb_id = #{ocbId,jdbcType=VARCHAR},
+      </if>
+      <if test="contactType != null">
+        contact_type = #{contactType,jdbcType=INTEGER},
+      </if>
+      <if test="effective != null">
+        effective = #{effective,jdbcType=INTEGER},
+      </if>
+      <if test="timeStamp != null">
+        time_stamp = #{timeStamp,jdbcType=TIMESTAMP},
+      </if>
+      <if test="followCount != null">
+        follow_count = #{followCount,jdbcType=INTEGER},
+      </if>
+      <if test="guidance != null">
+        guidance = #{guidance,jdbcType=VARCHAR},
+      </if>
+      <if test="guidanceTime != null">
+        guidance_time = #{guidanceTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="guidanceAid != null">
+        guidance_aid = #{guidanceAid,jdbcType=VARCHAR},
+      </if>
+      <if test="guidanceName != null">
+        guidance_name = #{guidanceName,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.UserFollow">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update user_follow
+    set `uid` = #{uid,jdbcType=VARCHAR},
+      aid = #{aid,jdbcType=VARCHAR},
+      paid = #{paid,jdbcType=VARCHAR},
+      `result` = #{result,jdbcType=VARCHAR},
+      attachment_url = #{attachmentUrl,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      ocb_id = #{ocbId,jdbcType=VARCHAR},
+      contact_type = #{contactType,jdbcType=INTEGER},
+      effective = #{effective,jdbcType=INTEGER},
+      time_stamp = #{timeStamp,jdbcType=TIMESTAMP},
+      follow_count = #{followCount,jdbcType=INTEGER},
+      guidance = #{guidance,jdbcType=VARCHAR},
+      guidance_time = #{guidanceTime,jdbcType=TIMESTAMP},
+      guidance_aid = #{guidanceAid,jdbcType=VARCHAR},
+      guidance_name = #{guidanceName,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
 	<update id="pushUserGuidance">
 		update user_follow b, `user` a
 		set a.guidance= #{guidance}
 		where a.id=b.uid and b.id= #{id}
 	</update>
-	<select id="selectbyUid"  resultMap="BaseResultMap">
+	<select id="selectbyUid" resultMap="BaseResultMap">
+
 		select
 		<include refid="Base_Column_List" />
 		from user_follow a
@@ -437,7 +267,7 @@
 	</select>
 
 
-	<select id="userFollowList" resultType="com.goafanti.user.bo.outUserFollowList" >
+	<select id="userFollowList" resultType="com.goafanti.user.bo.outUserFollowList">
 		select b.nickname,b.share_type shareType ,b.channel,b.id,
 			   date_format(b.transfer_time,'%Y-%m-%d %H:%i:%s')startTimes,
 			   a.contact_type contactType,c.name followName ,d.name followDep,a.`result` ,a.follow_count followCount,
@@ -475,7 +305,7 @@
 			${page_sql}
 		</if>
 	</select>
-	<select id="userFollowCount" resultType="java.lang.Integer" >
+	<select id="userFollowCount" resultType="java.lang.Integer">
 		select count(*)
 		from user_follow a left join  `user`b on a.uid =b.id left join admin c on b.aid =c.id
 		left join department d on c.department_id =d.id where 1=1

+ 113 - 0
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -1652,5 +1652,118 @@
     from user
     where nickname  = #{name} limit 1
   </select>
+
+  <select id="selectPrivateOrganizationCustomerList" resultType="com.goafanti.customer.bo.CustomerListOut">
+    select a.id uid,a.aid,a.nickname name,a.society_tag societyTag,a.`level`,b.name aName,dg1.name as province,dg2.name as city,
+    a.guidance, dg3.name as area,
+    date_format(um.last_sign_time,'%Y-%m-%d %H:%i:%S') lastSignTime,
+    date_format(a.transfer_time,'%Y-%m-%d %H:%i:%S') as transferTime,
+    date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as createTime,
+    date_format(um.last_follow_time,'%Y-%m-%d %H:%i:%S') lastFollowTime,
+    if(a.transfer_time &lt; um.last_follow_time,um.last_follow_time,a.transfer_time) as orderTime
+    from user a left join admin b on a.aid=b.id left join organization_identity d on a.id = d.uid
+    left join district_glossory dg1 on d.location_province = dg1.id
+    left join district_glossory dg2 on d.location_city = dg2.id
+    left join district_glossory dg3 on d.location_area = dg3.id
+    left join user_mid um on um.aid=a.aid and um.uid=a.id
+    inner join (select aid,uid from user_follow uf group by aid,uid) t0
+    on a.id=t0.uid and a.aid =t0.aid
+    where a.type= 1   and a.source in(1,2,3) and a.share_type in (0,2)
+    <if test="power ==0">
+      and a.aid = #{aid,jdbcType=VARCHAR}
+    </if>
+    <if test="power ==1  or power ==2">
+      and a.aid
+      <if test="alist != null">
+        in
+        <foreach item="item" collection="alist" separator="," open="(" close=")" index="">
+          #{item}
+        </foreach>
+      </if>
+      <if test="alist == null">
+        is null
+      </if>
+    </if>
+    <if test="name != null and name != ''">
+      and a.nickname like concat('%',#{name},'%')
+    </if>
+    <if test="startDate != null and startDate != ''">
+      and a.transfer_time &gt; #{startDate}
+    </if>
+    <if test="endDate != null and endDate != ''">
+      and a.transfer_time &lt; #{endDate}
+    </if>
+    <if test="province != null">
+      and d.location_province = #{province,jdbcType=INTEGER}
+    </if>
+    <if test="city != null">
+      and d.location_city = #{city,jdbcType=INTEGER}
+    </if>
+    <if test="area != null">
+      and d.location_area = #{area,jdbcType=INTEGER}
+    </if>
+    <if test="level != null">
+      and a.level = #{level,jdbcType=INTEGER}
+    </if>
+    <if test="sort != 1">
+      order by orderTime
+    </if>
+    <if test="sort == 1">
+      order by a.create_time
+    </if>
+    <if test="sortType == 1">
+      desc
+    </if>
+    ,a.transfer_time desc
+    <if test="page_sql != null">
+      ${page_sql}
+    </if>
+  </select>
+  <select id="selectPrivateOrganizationCustomerCount" resultType="java.lang.Integer">
+    select count(*)
+    from user a left join admin b on a.aid=b.id left join organization_identity d on a.id = d.uid
+    left join district_glossory dg1 on d.location_province = dg1.id
+    left join district_glossory dg2 on d.location_city = dg2.id
+    left join district_glossory dg3 on d.location_area = dg3.id
+    left join user_mid um on um.aid=a.aid and um.uid=a.id
+    inner join (select aid,uid from user_follow uf group by aid,uid) t0
+    on a.id=t0.uid and a.aid =t0.aid
+    where a.type= 1   and a.source in(1,2,3) and a.share_type in (0,2)
+    <if test="power ==0">
+      and a.aid = #{aid,jdbcType=VARCHAR}
+    </if>
+    <if test="power ==1  or power ==2">
+      and a.aid
+      <if test="alist2 !=null">
+        <foreach item="item" collection="alist" separator="," open="(" close=")" index="">
+          in #{item}
+        </foreach>
+      </if>
+      <if test="alist2 !=null">
+        is null
+      </if>
+    </if>
+    <if test="name != null and name != ''">
+      and a.nickname like concat('%',#{name},'%')
+    </if>
+    <if test="startDate != null and startDate != ''">
+      and a.transfer_time &gt; #{startDate}
+    </if>
+    <if test="endDate != null and endDate != ''">
+      and a.transfer_time &lt; #{endDate}
+    </if>
+    <if test="province != null">
+      and d.location_province = #{province,jdbcType=INTEGER}
+    </if>
+    <if test="city != null">
+      and d.location_city = #{city,jdbcType=INTEGER}
+    </if>
+    <if test="area != null">
+      and d.location_area = #{area,jdbcType=INTEGER}
+    </if>
+    <if test="level != null">
+      and a.level = #{level,jdbcType=INTEGER}
+    </if>
+  </select>
   
 </mapper>

+ 1 - 106
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -414,112 +414,7 @@
 		</if>
 	</select>
 	
-	<select id="selectPrivateOrganizationCustomerList" resultType="com.goafanti.customer.bo.CustomerListOut">
-	select a.id uid,a.aid,a.nickname name,a.society_tag societyTag,a.`level`,b.name aName,dg1.name as province,dg2.name as city,
-	a.guidance, dg3.name as area,
-	date_format(um.last_sign_time,'%Y-%m-%d %H:%i:%S') lastSignTime,
-	date_format(a.transfer_time,'%Y-%m-%d %H:%i:%S') as transferTime, 
-	date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as createTime,
-	date_format(um.last_follow_time,'%Y-%m-%d %H:%i:%S') lastFollowTime, 
-	if(a.transfer_time &lt; um.last_follow_time,um.last_follow_time,a.transfer_time) as orderTime 
-	from user a left join admin b on a.aid=b.id left join organization_identity d on a.id = d.uid 
-	left join district_glossory dg1 on d.location_province = dg1.id 
-	left join district_glossory dg2 on d.location_city = dg2.id 
-	left join district_glossory dg3 on d.location_area = dg3.id
-	left join user_mid um on um.aid=a.aid and um.uid=a.id
-	where a.type= 1 and a.share_type=0  and a.source in(1,2,3) and a.channel=0
-		<if test="power ==0">
-			and a.aid = #{aid,jdbcType=VARCHAR}
-		</if>
-		<if test="power ==1  or power ==2">
-			and a.aid
-			<if test="alist != null">
-			in
-			<foreach item="item" collection="alist" separator="," open="(" close=")" index="">
-		       #{item}
-		     </foreach> 
-			</if>
-			<if test="alist == null">
-			 is null
-			 </if>
-		</if>
-		<if test="name != null and name != ''">
-			and a.nickname like concat('%',#{name},'%')
-		</if>
-		<if test="startDate != null and startDate != ''">
-			and a.transfer_time &gt; #{startDate}
-		</if>
-		<if test="endDate != null and endDate != ''">
-			and a.transfer_time &lt; #{endDate}
-		</if>
-		<if test="province != null">
-			and d.location_province = #{province,jdbcType=INTEGER}
-		</if>
-		<if test="city != null">
-			and d.location_city = #{city,jdbcType=INTEGER}
-		</if>
-		<if test="area != null">
-			and d.location_area = #{area,jdbcType=INTEGER}
-		</if>
-		 <if test="level != null">
-			and a.level = #{level,jdbcType=INTEGER}
-		</if>
-		<if test="sort != 1">
-		   order by orderTime 
-		</if>
-		<if test="sort == 1"> 
-		 order by a.create_time 
-		 </if>
-		 <if test="sortType == 1">
-		 		desc
-		 </if>
-		 ,a.`number`
-		 <if test="page_sql != null">
-    		${page_sql}
-   		 </if> 
-	</select>
-	<select id="selectPrivateOrganizationCustomerCount" resultType="java.lang.Integer">
-			select count(*)
-			from user a left join admin b on  a.aid=b.id 
-			left join organization_identity d on a.id = d.uid left join district_glossory dg1 on d.location_province = dg1.id
-			left join district_glossory dg2 on d.location_city = dg2.id left join district_glossory dg3 on d.location_area = dg3.id
-			where a.type= 1 and a.share_type=0  and a.source in(1,2,3) and a.channel=0
-		<if test="power ==0">
-			and a.aid = #{aid,jdbcType=VARCHAR}
-		</if>
-			<if test="power ==1  or power ==2">
-			and a.aid
-			<if test="alist2 !=null">
-			<foreach item="item" collection="alist" separator="," open="(" close=")" index="">
-		      in #{item}
-		     </foreach> 
-			</if>
-			<if test="alist2 !=null">
-			 is null
-			 </if>
-		</if>
-		<if test="name != null and name != ''">
-			and a.nickname like concat('%',#{name},'%')
-		</if>
-		<if test="startDate != null and startDate != ''">
-			and a.transfer_time &gt; #{startDate}
-		</if>
-		<if test="endDate != null and endDate != ''">
-			and a.transfer_time &lt; #{endDate}
-		</if>
-		<if test="province != null">
-			and d.location_province = #{province,jdbcType=INTEGER}
-		</if>
-		<if test="city != null">
-			and d.location_city = #{city,jdbcType=INTEGER}
-		</if>
-		<if test="area != null">
-			and d.location_area = #{area,jdbcType=INTEGER}
-		</if>
-		<if test="level != null">
-			and a.level = #{level,jdbcType=INTEGER}
-		</if>
-	</select>
+
 	<select id="selectPublicOrganizationCustomerList" resultType="com.goafanti.customer.bo.CustomerListOut">
 		select
 			a.id as uid,

+ 605 - 324
src/main/java/com/goafanti/common/model/UserFollow.java

@@ -1,329 +1,610 @@
 package com.goafanti.common.model;
 
+import java.io.Serializable;
 import java.util.Date;
 
-public class UserFollow {
-
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.id
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	private String id;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.uid
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	private String uid;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.aid
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	private String aid;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.paid
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	private String paid;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.result
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	private String result;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.attachment_url
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	private String attachmentUrl;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.create_time
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	private Date createTime;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.ocb_id
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	private String ocbId;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.contact_type
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	private Integer contactType;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.effective
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	private Integer effective;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.time_stamp
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	private Date timeStamp;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.follow_count
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	private Integer followCount;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.guidance
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	private String guidance;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_follow.guidance_time
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	private Date guidanceTime;
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.id
-	 * @return  the value of user_follow.id
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.id
-	 * @param id  the value for user_follow.id
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.uid
-	 * @return  the value of user_follow.uid
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public String getUid() {
-		return uid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.uid
-	 * @param uid  the value for user_follow.uid
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public void setUid(String uid) {
-		this.uid = uid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.aid
-	 * @return  the value of user_follow.aid
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public String getAid() {
-		return aid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.aid
-	 * @param aid  the value for user_follow.aid
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public void setAid(String aid) {
-		this.aid = aid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.paid
-	 * @return  the value of user_follow.paid
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public String getPaid() {
-		return paid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.paid
-	 * @param paid  the value for user_follow.paid
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public void setPaid(String paid) {
-		this.paid = paid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.result
-	 * @return  the value of user_follow.result
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public String getResult() {
-		return result;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.result
-	 * @param result  the value for user_follow.result
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public void setResult(String result) {
-		this.result = result;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.attachment_url
-	 * @return  the value of user_follow.attachment_url
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public String getAttachmentUrl() {
-		return attachmentUrl;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.attachment_url
-	 * @param attachmentUrl  the value for user_follow.attachment_url
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public void setAttachmentUrl(String attachmentUrl) {
-		this.attachmentUrl = attachmentUrl;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.create_time
-	 * @return  the value of user_follow.create_time
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.create_time
-	 * @param createTime  the value for user_follow.create_time
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.ocb_id
-	 * @return  the value of user_follow.ocb_id
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public String getOcbId() {
-		return ocbId;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.ocb_id
-	 * @param ocbId  the value for user_follow.ocb_id
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public void setOcbId(String ocbId) {
-		this.ocbId = ocbId;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.contact_type
-	 * @return  the value of user_follow.contact_type
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public Integer getContactType() {
-		return contactType;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.contact_type
-	 * @param contactType  the value for user_follow.contact_type
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public void setContactType(Integer contactType) {
-		this.contactType = contactType;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.effective
-	 * @return  the value of user_follow.effective
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public Integer getEffective() {
-		return effective;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.effective
-	 * @param effective  the value for user_follow.effective
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public void setEffective(Integer effective) {
-		this.effective = effective;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.time_stamp
-	 * @return  the value of user_follow.time_stamp
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public Date getTimeStamp() {
-		return timeStamp;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.time_stamp
-	 * @param timeStamp  the value for user_follow.time_stamp
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public void setTimeStamp(Date timeStamp) {
-		this.timeStamp = timeStamp;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.follow_count
-	 * @return  the value of user_follow.follow_count
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public Integer getFollowCount() {
-		return followCount;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.follow_count
-	 * @param followCount  the value for user_follow.follow_count
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public void setFollowCount(Integer followCount) {
-		this.followCount = followCount;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.guidance
-	 * @return  the value of user_follow.guidance
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public String getGuidance() {
-		return guidance;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.guidance
-	 * @param guidance  the value for user_follow.guidance
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public void setGuidance(String guidance) {
-		this.guidance = guidance;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_follow.guidance_time
-	 * @return  the value of user_follow.guidance_time
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public Date getGuidanceTime() {
-		return guidanceTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_follow.guidance_time
-	 * @param guidanceTime  the value for user_follow.guidance_time
-	 * @mbg.generated  Sat Oct 10 10:18:15 CST 2020
-	 */
-	public void setGuidanceTime(Date guidanceTime) {
-		this.guidanceTime = guidanceTime;
-	}
+/**
+ *
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table user_follow
+ */
+public class UserFollow implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_follow.id
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     * Database Column Remarks:
+     *   客户ID
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_follow.uid
+     *
+     * @mbg.generated
+     */
+    private String uid;
+
+    /**
+     * Database Column Remarks:
+     *   营销员ID
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_follow.aid
+     *
+     * @mbg.generated
+     */
+    private String aid;
+
+    /**
+     * Database Column Remarks:
+     *   营销员上级集合
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_follow.paid
+     *
+     * @mbg.generated
+     */
+    private String paid;
+
+    /**
+     * Database Column Remarks:
+     *   跟进结果
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_follow.result
+     *
+     * @mbg.generated
+     */
+    private String result;
+
+    /**
+     * Database Column Remarks:
+     *   附件地址
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_follow.attachment_url
+     *
+     * @mbg.generated
+     */
+    private String attachmentUrl;
+
+    /**
+     * Database Column Remarks:
+     *   跟进时间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_follow.create_time
+     *
+     * @mbg.generated
+     */
+    private Date createTime;
+
+    /**
+     * Database Column Remarks:
+     *   企业联系人ID
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_follow.ocb_id
+     *
+     * @mbg.generated
+     */
+    private String ocbId;
+
+    /**
+     * Database Column Remarks:
+     *   联系方式1.电话 2.QQ 3.微信 0外出
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_follow.contact_type
+     *
+     * @mbg.generated
+     */
+    private Integer contactType;
+
+    /**
+     * Database Column Remarks:
+     *   生效标示 0-有效 1-失效
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_follow.effective
+     *
+     * @mbg.generated
+     */
+    private Integer effective;
+
+    /**
+     * Database Column Remarks:
+     *   时间戳
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_follow.time_stamp
+     *
+     * @mbg.generated
+     */
+    private Date timeStamp;
+
+    /**
+     * Database Column Remarks:
+     *   累计拜访次数
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_follow.follow_count
+     *
+     * @mbg.generated
+     */
+    private Integer followCount;
+
+    /**
+     * Database Column Remarks:
+     *   指导意见
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_follow.guidance
+     *
+     * @mbg.generated
+     */
+    private String guidance;
+
+    /**
+     * Database Column Remarks:
+     *   指导时间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_follow.guidance_time
+     *
+     * @mbg.generated
+     */
+    private Date guidanceTime;
+
+    /**
+     * Database Column Remarks:
+     *   指导人编号
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_follow.guidance_aid
+     *
+     * @mbg.generated
+     */
+    private String guidanceAid;
+
+    /**
+     * Database Column Remarks:
+     *   指导人名称
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_follow.guidance_name
+     *
+     * @mbg.generated
+     */
+    private String guidanceName;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table user_follow
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_follow.id
+     *
+     * @return the value of user_follow.id
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_follow.id
+     *
+     * @param id the value for user_follow.id
+     *
+     * @mbg.generated
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_follow.uid
+     *
+     * @return the value of user_follow.uid
+     *
+     * @mbg.generated
+     */
+    public String getUid() {
+        return uid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_follow.uid
+     *
+     * @param uid the value for user_follow.uid
+     *
+     * @mbg.generated
+     */
+    public void setUid(String uid) {
+        this.uid = uid == null ? null : uid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_follow.aid
+     *
+     * @return the value of user_follow.aid
+     *
+     * @mbg.generated
+     */
+    public String getAid() {
+        return aid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_follow.aid
+     *
+     * @param aid the value for user_follow.aid
+     *
+     * @mbg.generated
+     */
+    public void setAid(String aid) {
+        this.aid = aid == null ? null : aid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_follow.paid
+     *
+     * @return the value of user_follow.paid
+     *
+     * @mbg.generated
+     */
+    public String getPaid() {
+        return paid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_follow.paid
+     *
+     * @param paid the value for user_follow.paid
+     *
+     * @mbg.generated
+     */
+    public void setPaid(String paid) {
+        this.paid = paid == null ? null : paid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_follow.result
+     *
+     * @return the value of user_follow.result
+     *
+     * @mbg.generated
+     */
+    public String getResult() {
+        return result;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_follow.result
+     *
+     * @param result the value for user_follow.result
+     *
+     * @mbg.generated
+     */
+    public void setResult(String result) {
+        this.result = result == null ? null : result.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_follow.attachment_url
+     *
+     * @return the value of user_follow.attachment_url
+     *
+     * @mbg.generated
+     */
+    public String getAttachmentUrl() {
+        return attachmentUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_follow.attachment_url
+     *
+     * @param attachmentUrl the value for user_follow.attachment_url
+     *
+     * @mbg.generated
+     */
+    public void setAttachmentUrl(String attachmentUrl) {
+        this.attachmentUrl = attachmentUrl == null ? null : attachmentUrl.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_follow.create_time
+     *
+     * @return the value of user_follow.create_time
+     *
+     * @mbg.generated
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_follow.create_time
+     *
+     * @param createTime the value for user_follow.create_time
+     *
+     * @mbg.generated
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_follow.ocb_id
+     *
+     * @return the value of user_follow.ocb_id
+     *
+     * @mbg.generated
+     */
+    public String getOcbId() {
+        return ocbId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_follow.ocb_id
+     *
+     * @param ocbId the value for user_follow.ocb_id
+     *
+     * @mbg.generated
+     */
+    public void setOcbId(String ocbId) {
+        this.ocbId = ocbId == null ? null : ocbId.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_follow.contact_type
+     *
+     * @return the value of user_follow.contact_type
+     *
+     * @mbg.generated
+     */
+    public Integer getContactType() {
+        return contactType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_follow.contact_type
+     *
+     * @param contactType the value for user_follow.contact_type
+     *
+     * @mbg.generated
+     */
+    public void setContactType(Integer contactType) {
+        this.contactType = contactType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_follow.effective
+     *
+     * @return the value of user_follow.effective
+     *
+     * @mbg.generated
+     */
+    public Integer getEffective() {
+        return effective;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_follow.effective
+     *
+     * @param effective the value for user_follow.effective
+     *
+     * @mbg.generated
+     */
+    public void setEffective(Integer effective) {
+        this.effective = effective;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_follow.time_stamp
+     *
+     * @return the value of user_follow.time_stamp
+     *
+     * @mbg.generated
+     */
+    public Date getTimeStamp() {
+        return timeStamp;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_follow.time_stamp
+     *
+     * @param timeStamp the value for user_follow.time_stamp
+     *
+     * @mbg.generated
+     */
+    public void setTimeStamp(Date timeStamp) {
+        this.timeStamp = timeStamp;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_follow.follow_count
+     *
+     * @return the value of user_follow.follow_count
+     *
+     * @mbg.generated
+     */
+    public Integer getFollowCount() {
+        return followCount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_follow.follow_count
+     *
+     * @param followCount the value for user_follow.follow_count
+     *
+     * @mbg.generated
+     */
+    public void setFollowCount(Integer followCount) {
+        this.followCount = followCount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_follow.guidance
+     *
+     * @return the value of user_follow.guidance
+     *
+     * @mbg.generated
+     */
+    public String getGuidance() {
+        return guidance;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_follow.guidance
+     *
+     * @param guidance the value for user_follow.guidance
+     *
+     * @mbg.generated
+     */
+    public void setGuidance(String guidance) {
+        this.guidance = guidance == null ? null : guidance.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_follow.guidance_time
+     *
+     * @return the value of user_follow.guidance_time
+     *
+     * @mbg.generated
+     */
+    public Date getGuidanceTime() {
+        return guidanceTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_follow.guidance_time
+     *
+     * @param guidanceTime the value for user_follow.guidance_time
+     *
+     * @mbg.generated
+     */
+    public void setGuidanceTime(Date guidanceTime) {
+        this.guidanceTime = guidanceTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_follow.guidance_aid
+     *
+     * @return the value of user_follow.guidance_aid
+     *
+     * @mbg.generated
+     */
+    public String getGuidanceAid() {
+        return guidanceAid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_follow.guidance_aid
+     *
+     * @param guidanceAid the value for user_follow.guidance_aid
+     *
+     * @mbg.generated
+     */
+    public void setGuidanceAid(String guidanceAid) {
+        this.guidanceAid = guidanceAid == null ? null : guidanceAid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_follow.guidance_name
+     *
+     * @return the value of user_follow.guidance_name
+     *
+     * @mbg.generated
+     */
+    public String getGuidanceName() {
+        return guidanceName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_follow.guidance_name
+     *
+     * @param guidanceName the value for user_follow.guidance_name
+     *
+     * @mbg.generated
+     */
+    public void setGuidanceName(String guidanceName) {
+        this.guidanceName = guidanceName == null ? null : guidanceName.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_follow
+     *
+     * @mbg.generated
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", uid=").append(uid);
+        sb.append(", aid=").append(aid);
+        sb.append(", paid=").append(paid);
+        sb.append(", result=").append(result);
+        sb.append(", attachmentUrl=").append(attachmentUrl);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", ocbId=").append(ocbId);
+        sb.append(", contactType=").append(contactType);
+        sb.append(", effective=").append(effective);
+        sb.append(", timeStamp=").append(timeStamp);
+        sb.append(", followCount=").append(followCount);
+        sb.append(", guidance=").append(guidance);
+        sb.append(", guidanceTime=").append(guidanceTime);
+        sb.append(", guidanceAid=").append(guidanceAid);
+        sb.append(", guidanceName=").append(guidanceName);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
 }

+ 1 - 6
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -119,8 +119,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	@Resource
 	private UserFollowBusinessMapper userFollowBusinessMapper;
 	@Resource
-	private BusinessGlossoryMapper businessGlossoryMapper;
-	@Resource
 	private BusinessProjectMapper businessProjectMapper;
 	@Resource
 	private UserLockReleaseMapper userLockReleaseMapper;
@@ -131,8 +129,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	@Resource
 	private OrganizationAnnualReportMapper organizationAnnualReportMapper;
 	@Resource
-	private OrganizationYearProjectMapper organizationYearProjectMapper;
-	@Resource
 	private OrganizationBusinessScopeMapper organizationBusinessScopeMapper;
 	@Resource
 	private OrganizationSalesTargetMapper organizationSalesTargetMapper;
@@ -142,7 +138,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	private UserChannelMapper userChannelMapper;
 	@Resource
 	private UserNamesMapper	userNamesMapper;
-	
 	@Value(value = "${upload.path}")
 	private String uploadPath = null;
 
@@ -660,7 +655,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		userFollow.setOcbId(fbb.getOcbId());
 		userFollow.setResult(fbb.getResult());
 		userFollow.setUid(fbb.getUid());
-		int followCount = userBusinessMapper.selectFollowCountByUAid(fbb.getUid(), TokenManager.getAdminId()) + 1;
+		int followCount = userBusinessMapper.selectFollowCountByUAid(fbb.getUid(), null) + 1;
 		userFollow.setFollowCount(followCount);
 		userFollowMapper.insert(userFollow);
 		// 判断是跟进还是签单

+ 0 - 58
src/main/resources/generatorConfig.xml

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE generatorConfiguration
-        PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
-        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
-<generatorConfiguration>
-    <classPathEntry location="C:\Users\Administrator.SC-202107051558\AppData\Roaming\DBeaverData\drivers\maven\maven-central\mysql\mysql-connector-java-8.0.17.jar" />
-   <!-- <classPathEntry location="C:\Users\Administrator.SC-202009251130\AppData\Roaming\DBeaverData\drivers\maven\maven-central\mysql\mysql-connector-java-8.0.17.jar" /> /> -->
-  <context  id="MysqlTables" targetRuntime="MyBatis3" defaultModelType="flat">
-  <!-- 自动识别数据库关键字,默认false,如果设置为true,根据SqlReservedWords中定义的关键字列表;一般保留默认值,遇到数据库关键字(Java关键字),使用columnOverride覆盖 -->
-        <property name="autoDelimitKeywords" value="true"/>	
-        <!-- 生成的Java文件的编码 -->
-        <property name="javaFileEncoding" value="utf-8"/>
-        <!-- beginningDelimiter和endingDelimiter:指明数据库的用于标记数据库对象名的符号,比如ORACLE就是双引号,MYSQL默认是`反引号; -->
-        <property name="beginningDelimiter" value="`"/>
-        <property name="endingDelimiter" value="`"/>
-        <property name="addRemarkComments" value="true"/>
-        <!-- 格式化XML代码 -->
-        <property name="xmlFormatter" value="org.mybatis.generator.api.dom.DefaultXmlFormatter"/>
-        <plugin type="org.mybatis.generator.plugins.SerializablePlugin"/>
-        <plugin type="org.mybatis.generator.plugins.ToStringPlugin"/>
-        <!-- 注释 -->
-        <commentGenerator>
-            <property name="suppressAllComments" value="false"/><!-- 是否取消注释 -->
-            <property name="suppressDate" value="false"/> <!-- 是否生成注释代时间戳-->
-            <property name="addRemarkComments" value="true"/> 
-        </commentGenerator>
-     <jdbcConnection connectionURL="jdbc:mysql://localhost:3306/aft?serverTimezone=UTC"  
-    	driverClass="com.mysql.jdbc.Driver" password="123456" userId="root" >
-    	 <!-- 防止生成其它库的表 -->
-            <property name="nullCatalogMeansCurrent" value="true"/>
-        </jdbcConnection>
-         <!-- 类型转换 -->
-        <javaTypeResolver>
-            <!-- 是否使用bigDecimal, false可自动转化以下类型(Long, Integer, Short, etc.) -->
-            <property name="forceBigDecimals" value="false"/>
-        </javaTypeResolver>
-    <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="kede-server" >
-    		<!-- 是否让schema作为包的后缀 -->
-            <property name="enableSubPackages" value="false"/>
-            <!-- 从数据库返回的值去掉前后空格 -->
-            <property name="trimStrings" value="true"/>
-    </javaModelGenerator>
-    <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="kede-server" >
-    	<property name="enableSubPackages" value="false"/>
-    </sqlMapGenerator>
-    <javaClientGenerator  targetPackage="com.goafanti.common.dao"  type="XMLMAPPER" targetProject="kede-server"  >
-    <property name="enableSubPackages" value="false"/>
-     <property name="nullCatalogMeansCurrent" value="true"/>
-    </javaClientGenerator>
-    <table schema="aft" tableName="user_follow"
-	enableCountByExample="false" enableUpdateByExample="false"
-	enableDeleteByExample="false" enableSelectByExample="false"
-	selectByExampleQueryId="false" enableSelectByPrimaryKey="true"
-	enableUpdateByPrimaryKey="true" enableDeleteByPrimaryKey="true">
-         <property name="useActualColumnNames" value="false"/>
-        </table>
-  </context>
-</generatorConfiguration>

+ 78 - 78
src/main/resources/props/config_dev.properties

@@ -1,79 +1,79 @@
-#Driver
-jdbc.driverClassName=com.mysql.jdbc.Driver
-#\u6570\u636E\u5E93\u94FE\u63A5\uFF0C
-jdbc.url=jdbc:mysql://123.57.207.214:3306/pro_aft_test?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#\u5E10\u53F7
-jdbc.username=xiaolong
-#\u5BC6\u7801
-jdbc.password=!qaz2wsx
-#\u68C0\u6D4B\u6570\u636E\u5E93\u94FE\u63A5\u662F\u5426\u6709\u6548\uFF0C\u5FC5\u987B\u914D\u7F6E
-jdbc.validationQuery=SELECT 'x'
-#\u521D\u59CB\u8FDE\u63A5\u6570
-jdbc.initialSize=3
-#\u6700\u5927\u8FDE\u63A5\u6C60\u6570\u91CF
-jdbc.maxActive=20
-#\u53BB\u6389\uFF0C\u914D\u7F6E\u6587\u4EF6\u5BF9\u5E94\u53BB\u6389
-#jdbc.maxIdle=20
-#\u914D\u7F6E0,\u5F53\u7EBF\u7A0B\u6C60\u6570\u91CF\u4E0D\u8DB3\uFF0C\u81EA\u52A8\u8865\u5145\u3002
-jdbc.minIdle=0
-#\u83B7\u53D6\u94FE\u63A5\u8D85\u65F6\u65F6\u95F4\u4E3A1\u5206\u949F\uFF0C\u5355\u4F4D\u4E3A\u6BEB\u79D2\u3002
-jdbc.maxWait=120000
-#\u83B7\u53D6\u94FE\u63A5\u7684\u65F6\u5019\uFF0C\u4E0D\u6821\u9A8C\u662F\u5426\u53EF\u7528\uFF0C\u5F00\u542F\u4F1A\u6709\u635F\u6027\u80FD\u3002
-jdbc.testOnBorrow=false
-#\u5F52\u8FD8\u94FE\u63A5\u5230\u8FDE\u63A5\u6C60\u7684\u65F6\u5019\u6821\u9A8C\u94FE\u63A5\u662F\u5426\u53EF\u7528\u3002
-jdbc.testOnReturn=false
-#\u6B64\u9879\u914D\u7F6E\u4E3Atrue\u5373\u53EF\uFF0C\u4E0D\u5F71\u54CD\u6027\u80FD\uFF0C\u5E76\u4E14\u4FDD\u8BC1\u5B89\u5168\u6027\u3002\u610F\u4E49\u4E3A\uFF1A\u7533\u8BF7\u8FDE\u63A5\u7684\u65F6\u5019\u68C0\u6D4B\uFF0C\u5982\u679C\u7A7A\u95F2\u65F6\u95F4\u5927\u4E8EtimeBetweenEvictionRunsMillis\uFF0C\u6267\u884CvalidationQuery\u68C0\u6D4B\u8FDE\u63A5\u662F\u5426\u6709\u6548\u3002
-jdbc.testWhileIdle=true
-#1.Destroy\u7EBF\u7A0B\u4F1A\u68C0\u6D4B\u8FDE\u63A5\u7684\u95F4\u9694\u65F6\u95F4
-#2.testWhileIdle\u7684\u5224\u65AD\u4F9D\u636E
-jdbc.timeBetweenEvictionRunsMillis=60000
-#\u4E00\u4E2A\u94FE\u63A5\u751F\u5B58\u7684\u65F6\u95F4\uFF08\u4E4B\u524D\u7684\u503C\uFF1A25200000\uFF0C\u8FD9\u4E2A\u65F6\u95F4\u6709\u70B9BT\uFF0C\u8FD9\u4E2A\u7ED3\u679C\u4E0D\u77E5\u9053\u662F\u600E\u4E48\u6765\u7684\uFF0C\u6362\u7B97\u540E\u7684\u7ED3\u679C\u662F\uFF1A25200000/1000/60/60 = 7\u4E2A\u5C0F\u65F6\uFF09
-jdbc.minEvictableIdleTimeMillis=300000
-#\u94FE\u63A5\u4F7F\u7528\u8D85\u8FC7\u65F6\u95F4\u9650\u5236\u662F\u5426\u56DE\u6536
-jdbc.removeAbandoned=true
-#\u8D85\u8FC7\u65F6\u95F4\u9650\u5236\u65F6\u95F4\uFF08\u5355\u4F4D\u79D2\uFF09\uFF0C\u76EE\u524D\u4E3A5\u5206\u949F\uFF0C\u5982\u679C\u6709\u4E1A\u52A1\u5904\u7406\u65F6\u95F4\u8D85\u8FC75\u5206\u949F\uFF0C\u53EF\u4EE5\u9002\u5F53\u8C03\u6574\u3002
-jdbc.removeAbandonedTimeout=300
-#\u94FE\u63A5\u56DE\u6536\u7684\u65F6\u5019\u63A7\u5236\u53F0\u6253\u5370\u4FE1\u606F\uFF0C\u6D4B\u8BD5\u73AF\u5883\u53EF\u4EE5\u52A0\u4E0Atrue\uFF0C\u7EBF\u4E0A\u73AF\u5883false\u3002\u4F1A\u5F71\u54CD\u6027\u80FD\u3002
-jdbc.logAbandoned=true
-#\u7EDF\u8BA1\u76D1\u63A7
-jdbc.filters=stat
-
-jedis.host=localhost
-jedis.port=6379
-jedis.timeout=5000
-jedis.password=aft@2016!redis$
-
-pwd.hash_algorithm_name=md5
-pwd.hash_iterations=2
-
-session.timeout=12000000
-session.validate.timespan=18000000
-
-app.name=AFT
-
-static.host=//afts.hnzhiming.com/1.0.44
-
-upload.path=/data/wwwroot/aft/upload
-upload.private.path=/data/upload
-
-accessKey=LTAIqTgQLLwz252Z
-accessSecret=ICGuiUnqzaar7urw4zecVcJrJ1MHg9
-
-avatar.host=//afts.hnzhiming.com
-
-aesSecretKey=aft1234567890123
-
-template.cacheable=false
-
-mobileCodeTemplate=SMS_37845022
-mobileRemindCodeTemplate=SMS_137421952
-
-portal.host=//afts.hnzhiming.com/portal/2.0.0
-
-patentTemplate=SMS_72005286
-
-avatar.upload.host=//afts.hnzhiming.com/upload
-
-easemob.client.url=https://a1.easemob.com/1117170814115609/jitao
-easemob.client.id=YXA6RUDGkIDSEeemq9_4PWzcNA
+#Driver
+jdbc.driverClassName=com.mysql.jdbc.Driver
+#\u6570\u636E\u5E93\u94FE\u63A5\uFF0C
+jdbc.url=jdbc:mysql://123.57.207.214:3306/pro_aft_test?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#\u5E10\u53F7
+jdbc.username=xiaolong
+#\u5BC6\u7801
+jdbc.password=!qaz2wsx
+#\u68C0\u6D4B\u6570\u636E\u5E93\u94FE\u63A5\u662F\u5426\u6709\u6548\uFF0C\u5FC5\u987B\u914D\u7F6E
+jdbc.validationQuery=SELECT 'x'
+#\u521D\u59CB\u8FDE\u63A5\u6570
+jdbc.initialSize=3
+#\u6700\u5927\u8FDE\u63A5\u6C60\u6570\u91CF
+jdbc.maxActive=20
+#\u53BB\u6389\uFF0C\u914D\u7F6E\u6587\u4EF6\u5BF9\u5E94\u53BB\u6389
+#jdbc.maxIdle=20
+#\u914D\u7F6E0,\u5F53\u7EBF\u7A0B\u6C60\u6570\u91CF\u4E0D\u8DB3\uFF0C\u81EA\u52A8\u8865\u5145\u3002
+jdbc.minIdle=0
+#\u83B7\u53D6\u94FE\u63A5\u8D85\u65F6\u65F6\u95F4\u4E3A1\u5206\u949F\uFF0C\u5355\u4F4D\u4E3A\u6BEB\u79D2\u3002
+jdbc.maxWait=120000
+#\u83B7\u53D6\u94FE\u63A5\u7684\u65F6\u5019\uFF0C\u4E0D\u6821\u9A8C\u662F\u5426\u53EF\u7528\uFF0C\u5F00\u542F\u4F1A\u6709\u635F\u6027\u80FD\u3002
+jdbc.testOnBorrow=false
+#\u5F52\u8FD8\u94FE\u63A5\u5230\u8FDE\u63A5\u6C60\u7684\u65F6\u5019\u6821\u9A8C\u94FE\u63A5\u662F\u5426\u53EF\u7528\u3002
+jdbc.testOnReturn=false
+#\u6B64\u9879\u914D\u7F6E\u4E3Atrue\u5373\u53EF\uFF0C\u4E0D\u5F71\u54CD\u6027\u80FD\uFF0C\u5E76\u4E14\u4FDD\u8BC1\u5B89\u5168\u6027\u3002\u610F\u4E49\u4E3A\uFF1A\u7533\u8BF7\u8FDE\u63A5\u7684\u65F6\u5019\u68C0\u6D4B\uFF0C\u5982\u679C\u7A7A\u95F2\u65F6\u95F4\u5927\u4E8EtimeBetweenEvictionRunsMillis\uFF0C\u6267\u884CvalidationQuery\u68C0\u6D4B\u8FDE\u63A5\u662F\u5426\u6709\u6548\u3002
+jdbc.testWhileIdle=true
+#1.Destroy\u7EBF\u7A0B\u4F1A\u68C0\u6D4B\u8FDE\u63A5\u7684\u95F4\u9694\u65F6\u95F4
+#2.testWhileIdle\u7684\u5224\u65AD\u4F9D\u636E
+jdbc.timeBetweenEvictionRunsMillis=60000
+#\u4E00\u4E2A\u94FE\u63A5\u751F\u5B58\u7684\u65F6\u95F4\uFF08\u4E4B\u524D\u7684\u503C\uFF1A25200000\uFF0C\u8FD9\u4E2A\u65F6\u95F4\u6709\u70B9BT\uFF0C\u8FD9\u4E2A\u7ED3\u679C\u4E0D\u77E5\u9053\u662F\u600E\u4E48\u6765\u7684\uFF0C\u6362\u7B97\u540E\u7684\u7ED3\u679C\u662F\uFF1A25200000/1000/60/60 = 7\u4E2A\u5C0F\u65F6\uFF09
+jdbc.minEvictableIdleTimeMillis=300000
+#\u94FE\u63A5\u4F7F\u7528\u8D85\u8FC7\u65F6\u95F4\u9650\u5236\u662F\u5426\u56DE\u6536
+jdbc.removeAbandoned=true
+#\u8D85\u8FC7\u65F6\u95F4\u9650\u5236\u65F6\u95F4\uFF08\u5355\u4F4D\u79D2\uFF09\uFF0C\u76EE\u524D\u4E3A5\u5206\u949F\uFF0C\u5982\u679C\u6709\u4E1A\u52A1\u5904\u7406\u65F6\u95F4\u8D85\u8FC75\u5206\u949F\uFF0C\u53EF\u4EE5\u9002\u5F53\u8C03\u6574\u3002
+jdbc.removeAbandonedTimeout=300
+#\u94FE\u63A5\u56DE\u6536\u7684\u65F6\u5019\u63A7\u5236\u53F0\u6253\u5370\u4FE1\u606F\uFF0C\u6D4B\u8BD5\u73AF\u5883\u53EF\u4EE5\u52A0\u4E0Atrue\uFF0C\u7EBF\u4E0A\u73AF\u5883false\u3002\u4F1A\u5F71\u54CD\u6027\u80FD\u3002
+jdbc.logAbandoned=true
+#\u7EDF\u8BA1\u76D1\u63A7
+jdbc.filters=stat
+
+jedis.host=localhost
+jedis.port=6379
+jedis.timeout=5000
+jedis.password=aft@2016!redis$
+
+pwd.hash_algorithm_name=md5
+pwd.hash_iterations=2
+
+session.timeout=12000000
+session.validate.timespan=18000000
+
+app.name=AFT
+
+static.host=//afts.hnzhiming.com/1.0.44
+
+upload.path=/data/wwwroot/aft/upload
+upload.private.path=/data/upload
+
+accessKey=LTAIqTgQLLwz252Z
+accessSecret=ICGuiUnqzaar7urw4zecVcJrJ1MHg9
+
+avatar.host=//afts.hnzhiming.com
+
+aesSecretKey=aft1234567890123
+
+template.cacheable=false
+
+mobileCodeTemplate=SMS_37845022
+mobileRemindCodeTemplate=SMS_137421952
+
+portal.host=//afts.hnzhiming.com/portal/2.0.0
+
+patentTemplate=SMS_72005286
+
+avatar.upload.host=//afts.hnzhiming.com/upload
+
+easemob.client.url=https://a1.easemob.com/1117170814115609/jitao
+easemob.client.id=YXA6RUDGkIDSEeemq9_4PWzcNA
 easemob.client.secret=YXA61NHE0renI5N8gEgizoI5ivM9SYE

+ 27 - 27
src/main/resources/shiro_base_auth.ini

@@ -1,28 +1,28 @@
-[base_auth]
-/=anon
-/index=anon
-/login=anon
-/user/login.html=anon
-/user/login=anon
-/user/signIn.html=anon
-/user/signIn=anon
-/admin/login=anon
-/admin/login.html=anon
-/mlogin=anon
-/signin=anon
-/managesignin=anon
-/register=anon
-/webSocketServer=anon
-/mregister=anon
-/open/**=anon
-/favicon.ico=anon
-/static/**=anon
-/portal/**=anon
-/api/portal/**=anon
-/api/admin/**=admin
-/api/admin/**/**=admin
-/api/user/**=login
-/admin/**=admin
-/role/**=admin,permission
-/permission/**=admin,permission
+[base_auth]
+/=anon
+/index=anon
+/login=anon
+/user/login.html=anon
+/user/login=anon
+/user/signIn.html=anon
+/user/signIn=anon
+/admin/login=anon
+/admin/login.html=anon
+/mlogin=anon
+/signin=anon
+/managesignin=anon
+/register=anon
+/webSocketServer=anon
+/mregister=anon
+/open/**=anon
+/favicon.ico=anon
+/static/**=anon
+/portal/**=anon
+/api/portal/**=anon
+/api/admin/**=admin
+/api/admin/**/**=admin
+/api/user/**=login
+/admin/**=admin
+/role/**=admin,permission
+/permission/**=admin,permission
 /**=login

Dosya farkı çok büyük olduğundan ihmal edildi
+ 517 - 517
src/main/resources/spring-context-4.0.xsd


+ 96 - 96
src/main/resources/spring/spring-mybatis.xml

@@ -1,97 +1,97 @@
-<?xml version="1.0" encoding="utf-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:cache="http://www.springframework.org/schema/cache"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="
-    		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
-			http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd
-			http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
-			http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-4.0.xsd
-			http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
-			http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache-4.0.xsd">
-	
-	<context:component-scan base-package="com.goafanti.*.service;com.goafanti.*.*.service" />
-	
-	<bean id="log-filter" class="com.alibaba.druid.filter.logging.Log4jFilter">
-    	<property name="resultSetLogEnabled" value="true" />
-	</bean>
-	
-	<bean id="idGenerator" class="com.goafanti.core.mybatis.JDBCIdGenerator"></bean>
-	
-	<bean name="dataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
-		<property name="url" value="${jdbc.url}" /> 
-		<property name="username" value="${jdbc.username}" /> 
-		<property name="password" value="${jdbc.password}" /> 
-		<property name="initialSize" value="${jdbc.initialSize}" /> 
-	    <property name="minIdle" value="${jdbc.minIdle}" /> 
-	    <property name="maxActive" value="${jdbc.maxActive}" /> 
-	    <property name="maxWait" value="${jdbc.maxWait}" /> 
-	    <property name="timeBetweenEvictionRunsMillis" value="${jdbc.timeBetweenEvictionRunsMillis}" /> 
-	    <property name="minEvictableIdleTimeMillis" value="${jdbc.minEvictableIdleTimeMillis}" /> 
-	    <property name="validationQuery" value="${jdbc.validationQuery}" /> 
-	    <property name="testWhileIdle" value="${jdbc.testWhileIdle}" /> 
-	    <property name="testOnBorrow" value="${jdbc.testOnBorrow}" /> 
-	    <property name="testOnReturn" value="${jdbc.testOnReturn}" /> 
-	    <property name="removeAbandoned" value="${jdbc.removeAbandoned}" /> 
-	    <property name="removeAbandonedTimeout" value="${jdbc.removeAbandonedTimeout}" /> 
-		<property name="logAbandoned" value="${jdbc.logAbandoned}" />
-	    <property name="filters" value="${jdbc.filters}" />
-		<property name="proxyFilters">
-	        <list>
-	            <ref bean="log-filter"/>
-	        </list>
-	    </property>
-	</bean>
-
-	<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-		<property name="dataSource" ref="dataSource" />
-		<property name="configLocation" value="classpath:mybatis-config.xml"/>
-		<property name="mapperLocations"  >
-			<list>
-				<value>classpath:com/goafanti/common/mapper/*.xml</value>
-			</list>
-		</property>
-	</bean>
-	
-	<bean id="sqlSessionTemplate" class="org.mybatis.spring.SqlSessionTemplate">
-		<constructor-arg index="0" ref="sqlSessionFactory" />
-	</bean>
-	<bean id="baseMybatisDao" class="com.goafanti.core.mybatis.BaseMybatisDao" >
-		<property name="sqlSessionFactory" ref="sqlSessionFactory" />
-	</bean>	
-	<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-		<property name="basePackage" value="com.goafanti.common.dao" />
-		<property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
-	</bean>
-	 <bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-	     <property name="dataSource" ref="dataSource" />
-	 </bean>
-	 
-	<tx:advice id="txAdvice" transaction-manager="transactionManager">
-		<tx:attributes>
-			<tx:method name="publish*"  rollback-for="Exception" />
-			<tx:method name="save*" rollback-for="Exception" />
-			<tx:method name="push*" rollback-for="Exception" />
-			<tx:method name="add*" rollback-for="Exception" />
-			<tx:method name="update*" rollback-for="Exception" />
-			<tx:method name="insert*" rollback-for="Exception" />
-			<tx:method name="create*" rollback-for="Exception" />
-			<tx:method name="batch*" rollback-for="Exception" />
-			<tx:method name="del*" rollback-for="Exception" />
-			<tx:method name="init*" rollback-for="Exception" />
-			<tx:method name="bind*" rollback-for="Exception" />
-			<tx:method name="*"  read-only="true" />
-		</tx:attributes>
-	</tx:advice>
-		
-	<aop:config proxy-target-class="true">
-		<aop:pointcut id="myPointcut" expression="execution(* com.goafanti.*.service..*.*(..))" />
-		<aop:advisor advice-ref="txAdvice" pointcut-ref="myPointcut" />
-	</aop:config>
-	
- 	<cache:annotation-driven />
-	
+<?xml version="1.0" encoding="utf-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:cache="http://www.springframework.org/schema/cache"
+	xmlns:tx="http://www.springframework.org/schema/tx"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xsi:schemaLocation="
+    		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+			http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd
+			http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
+			http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-4.0.xsd
+			http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
+			http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache-4.0.xsd">
+	
+	<context:component-scan base-package="com.goafanti.*.service;com.goafanti.*.*.service" />
+	
+	<bean id="log-filter" class="com.alibaba.druid.filter.logging.Log4jFilter">
+    	<property name="resultSetLogEnabled" value="true" />
+	</bean>
+	
+	<bean id="idGenerator" class="com.goafanti.core.mybatis.JDBCIdGenerator"></bean>
+	
+	<bean name="dataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
+		<property name="url" value="${jdbc.url}" /> 
+		<property name="username" value="${jdbc.username}" /> 
+		<property name="password" value="${jdbc.password}" /> 
+		<property name="initialSize" value="${jdbc.initialSize}" /> 
+	    <property name="minIdle" value="${jdbc.minIdle}" /> 
+	    <property name="maxActive" value="${jdbc.maxActive}" /> 
+	    <property name="maxWait" value="${jdbc.maxWait}" /> 
+	    <property name="timeBetweenEvictionRunsMillis" value="${jdbc.timeBetweenEvictionRunsMillis}" /> 
+	    <property name="minEvictableIdleTimeMillis" value="${jdbc.minEvictableIdleTimeMillis}" /> 
+	    <property name="validationQuery" value="${jdbc.validationQuery}" /> 
+	    <property name="testWhileIdle" value="${jdbc.testWhileIdle}" /> 
+	    <property name="testOnBorrow" value="${jdbc.testOnBorrow}" /> 
+	    <property name="testOnReturn" value="${jdbc.testOnReturn}" /> 
+	    <property name="removeAbandoned" value="${jdbc.removeAbandoned}" /> 
+	    <property name="removeAbandonedTimeout" value="${jdbc.removeAbandonedTimeout}" /> 
+		<property name="logAbandoned" value="${jdbc.logAbandoned}" />
+	    <property name="filters" value="${jdbc.filters}" />
+		<property name="proxyFilters">
+	        <list>
+	            <ref bean="log-filter"/>
+	        </list>
+	    </property>
+	</bean>
+
+	<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
+		<property name="dataSource" ref="dataSource" />
+		<property name="configLocation" value="classpath:mybatis-config.xml"/>
+		<property name="mapperLocations"  >
+			<list>
+				<value>classpath:com/goafanti/common/mapper/*.xml</value>
+			</list>
+		</property>
+	</bean>
+	
+	<bean id="sqlSessionTemplate" class="org.mybatis.spring.SqlSessionTemplate">
+		<constructor-arg index="0" ref="sqlSessionFactory" />
+	</bean>
+	<bean id="baseMybatisDao" class="com.goafanti.core.mybatis.BaseMybatisDao" >
+		<property name="sqlSessionFactory" ref="sqlSessionFactory" />
+	</bean>	
+	<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
+		<property name="basePackage" value="com.goafanti.common.dao" />
+		<property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
+	</bean>
+	 <bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+	     <property name="dataSource" ref="dataSource" />
+	 </bean>
+	 
+	<tx:advice id="txAdvice" transaction-manager="transactionManager">
+		<tx:attributes>
+			<tx:method name="publish*"  rollback-for="Exception" />
+			<tx:method name="save*" rollback-for="Exception" />
+			<tx:method name="push*" rollback-for="Exception" />
+			<tx:method name="add*" rollback-for="Exception" />
+			<tx:method name="update*" rollback-for="Exception" />
+			<tx:method name="insert*" rollback-for="Exception" />
+			<tx:method name="create*" rollback-for="Exception" />
+			<tx:method name="batch*" rollback-for="Exception" />
+			<tx:method name="del*" rollback-for="Exception" />
+			<tx:method name="init*" rollback-for="Exception" />
+			<tx:method name="bind*" rollback-for="Exception" />
+			<tx:method name="*"  read-only="true" />
+		</tx:attributes>
+	</tx:advice>
+		
+	<aop:config proxy-target-class="true">
+		<aop:pointcut id="myPointcut" expression="execution(* com.goafanti.*.service..*.*(..))" />
+		<aop:advisor advice-ref="txAdvice" pointcut-ref="myPointcut" />
+	</aop:config>
+	
+ 	<cache:annotation-driven />
+	
 </beans>

+ 192 - 192
src/main/resources/spring/spring-shiro.xml

@@ -1,193 +1,193 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:util="http://www.springframework.org/schema/util"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-       http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
-       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd">
-
-	<bean id="jedisPoolConfig"
-		class="redis.clients.jedis.JedisPoolConfig">
-		<property name="maxIdle" value="100" />
-		<property name="minIdle" value="10" />
-		<property name="testOnBorrow" value="true" />
-	</bean>
-	  <bean id="poolConfig" class="org.apache.commons.pool2.impl.GenericObjectPoolConfig">
-        <property name="minIdle" value="5"/>
-        <property name="maxIdle" value="20"/>
-        <property name="maxWaitMillis" value="100000"/>
-        <property name="maxTotal" value="10000"/>
-    </bean>
-	
-	 <bean id="jedisPool" class="redis.clients.jedis.JedisPool">
-        <constructor-arg name="poolConfig" ref="poolConfig"/>
-        <constructor-arg name="host" value="${jedis.host}"/>
-        <constructor-arg name="port" value="${jedis.port}"/>
-        <constructor-arg name="password" value="${jedis.password}"/>
-        <constructor-arg name="timeout" value="1000000"/>
-    </bean>
-
-	<bean id="redisConnectionFactory"
-		class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory">
-		<property name="hostName" value="${jedis.host}" />
-		<property name="port" value="${jedis.port}" />
-		<property name="password" value="${jedis.password}" />
-		<property name="timeout" value="${jedis.timeout}" />
-		<property name="poolConfig" ref="jedisPoolConfig" />
-		<!-- <property name="database" value="${jedis.dbIndex}" /> -->
-	</bean>
-
-	<bean id="redisTemplate"
-		class="com.goafanti.core.cache.template.FastJsonRedisTemplate">
-		<constructor-arg index="0"
-			ref="redisConnectionFactory" />
-	</bean>
-	<bean id="sessionRedisTemplate"
-		class="com.goafanti.core.shiro.cache.template.SessionRedisTemplate">
-		<constructor-arg index="0"
-			ref="redisConnectionFactory" />
-	</bean>
-
-	<bean id="cacheManager"
-		class="org.springframework.data.redis.cache.RedisCacheManager">
-		<constructor-arg index="0" ref="redisTemplate" />
-		<property name="defaultExpiration" value="86400" />
-	</bean>
-
-	<bean id="shrioRedisCacheManager"
-		class="com.goafanti.core.shiro.cache.ShiroRedisCacheManager">
-		<property name="redisTemplate" ref="sessionRedisTemplate" />
-		<property name="expire" value="2592000" />
-	</bean>
-
-
-
-
-	<bean id="sessionIdGenerator"
-		class="org.apache.shiro.session.mgt.eis.JavaUuidSessionIdGenerator" />
-
-	<bean id="sessionIdCookie"
-		class="org.apache.shiro.web.servlet.SimpleCookie">
-		<constructor-arg value="AFT_SID" />
-		<property name="httpOnly" value="true" />
-		<property name="maxAge" value="2592000" />
-		<!-- <property name="domain" value=""/> -->
-	</bean>
-
-	<bean id="customSessionListener"
-		class="com.goafanti.core.shiro.listener.CustomSessionListener">
-		<property name="redisTemplate" ref="sessionRedisTemplate" />
-	</bean>
-
-	<bean id="enterpriseCacheSessionDAO"
-		class="org.apache.shiro.session.mgt.eis.EnterpriseCacheSessionDAO">
-		<property name="sessionIdGenerator" ref="sessionIdGenerator" />
-	</bean>
-
-	<!-- -->
-	<bean id="sessionValidationScheduler"
-		class="org.apache.shiro.session.mgt.ExecutorServiceSessionValidationScheduler">
-		<!-- -->
-		<property name="interval"
-			value="${session.validate.timespan}" />
-		<property name="sessionManager" ref="sessionManager" />
-	</bean>
-	<!-- -->
-	<bean id="securityManager"
-		class="org.apache.shiro.web.mgt.DefaultWebSecurityManager">
-		<property name="realm" ref="userRealm" />
-		<property name="sessionManager" ref="sessionManager" />
-		<property name="cacheManager" ref="shrioRedisCacheManager" />
-	</bean>
-
-	<bean id="authorizationAttributeSourceAdvisor"
-		class="org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor">
-		<property name="securityManager" ref="securityManager" />
-	</bean>
-
-	<!-- credential matcher -->
-	<bean id="credentialsMatcher"
-		class="org.apache.shiro.authc.credential.HashedCredentialsMatcher">
-		<property name="hashAlgorithmName"
-			value="${pwd.hash_algorithm_name}" />
-		<property name="hashIterations"
-			value="${pwd.hash_iterations}" />
-		<property name="storedCredentialsHexEncoded" value="true" />
-	</bean>
-	<!-- -->
-	<bean id="userRealm"
-		class="com.goafanti.core.shiro.token.UserRealm">
-		<property name="credentialsMatcher" ref="credentialsMatcher" />
-	</bean>
-
-	<!-- Session Manager -->
-	<bean id="sessionManager"
-		class="com.goafanti.core.shiro.session.CustomSessionManager">
-		<!-- class="org.apache.shiro.web.session.mgt.DefaultWebSessionManager"> -->
-		<property name="sessionIdUrlRewritingEnabled" value="false" />
-		<!-- -->
-		<property name="sessionValidationInterval" value="3600000" />
-		<!-- -->
-		<property name="globalSessionTimeout" value="3600000" />
-		<property name="sessionDAO" ref="enterpriseCacheSessionDAO" />
-		<property name="cacheManager" ref="shrioRedisCacheManager" />
-		<!-- session -->
-		<property name="sessionListeners">
-			<list>
-				<ref bean="customSessionListener" />
-			</list>
-		</property>
-		<!-- -->
-		<property name="sessionValidationScheduler"
-			ref="sessionValidationScheduler" />
-		<!-- -->
-		<property name="sessionValidationSchedulerEnabled"
-			value="true" />
-		<!-- -->
-		<property name="deleteInvalidSessions" value="true" />
-		<!-- -->
-		<property name="sessionIdCookie" ref="sessionIdCookie" />
-	</bean>
-
-	<bean id="shiroManager"
-		class="com.goafanti.core.shiro.service.impl.ShiroManagerImpl" />
-
-	<bean id="shiroFilter"
-		class="org.apache.shiro.spring.web.ShiroFilterFactoryBean">
-		<property name="securityManager" ref="securityManager" />
-		<property name="loginUrl" value="/user/login" />
-		<property name="successUrl" value="/" />
-		<property name="unauthorizedUrl" value="/user/login" />
-		<property name="filterChainDefinitions"
-			value="#{shiroManager.loadFilterChainDefinitions()}" />
-		<property name="filters">
-			<util:map>
-				<entry key="login">
-					<bean id="login"
-						class="com.goafanti.core.shiro.filter.LoginFilter" />
-				</entry>
-				<entry key="permission">
-					<bean id="permission"
-						class="com.goafanti.core.shiro.filter.PermissionFilter">
-						<property name="loginUrl" value="/admin/login" />
-					</bean>
-				</entry>
-				<entry key="admin">
-					<bean id="admin"
-						class="com.goafanti.core.shiro.filter.AdminFilter">
-						<property name="loginUrl" value="/admin/login" />
-					</bean>
-				</entry>
-			</util:map>
-		</property>
-	</bean>
-	<!-- -->
-	<bean id="lifecycleBeanPostProcessor"
-		class="org.apache.shiro.spring.LifecycleBeanPostProcessor" />
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:tx="http://www.springframework.org/schema/tx"
+	xmlns:util="http://www.springframework.org/schema/util"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
+       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+       http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd">
+
+	<bean id="jedisPoolConfig"
+		class="redis.clients.jedis.JedisPoolConfig">
+		<property name="maxIdle" value="100" />
+		<property name="minIdle" value="10" />
+		<property name="testOnBorrow" value="true" />
+	</bean>
+	  <bean id="poolConfig" class="org.apache.commons.pool2.impl.GenericObjectPoolConfig">
+        <property name="minIdle" value="5"/>
+        <property name="maxIdle" value="20"/>
+        <property name="maxWaitMillis" value="100000"/>
+        <property name="maxTotal" value="10000"/>
+    </bean>
+	
+	 <bean id="jedisPool" class="redis.clients.jedis.JedisPool">
+        <constructor-arg name="poolConfig" ref="poolConfig"/>
+        <constructor-arg name="host" value="${jedis.host}"/>
+        <constructor-arg name="port" value="${jedis.port}"/>
+        <constructor-arg name="password" value="${jedis.password}"/>
+        <constructor-arg name="timeout" value="1000000"/>
+    </bean>
+
+	<bean id="redisConnectionFactory"
+		class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory">
+		<property name="hostName" value="${jedis.host}" />
+		<property name="port" value="${jedis.port}" />
+		<property name="password" value="${jedis.password}" />
+		<property name="timeout" value="${jedis.timeout}" />
+		<property name="poolConfig" ref="jedisPoolConfig" />
+		<!-- <property name="database" value="${jedis.dbIndex}" /> -->
+	</bean>
+
+	<bean id="redisTemplate"
+		class="com.goafanti.core.cache.template.FastJsonRedisTemplate">
+		<constructor-arg index="0"
+			ref="redisConnectionFactory" />
+	</bean>
+	<bean id="sessionRedisTemplate"
+		class="com.goafanti.core.shiro.cache.template.SessionRedisTemplate">
+		<constructor-arg index="0"
+			ref="redisConnectionFactory" />
+	</bean>
+
+	<bean id="cacheManager"
+		class="org.springframework.data.redis.cache.RedisCacheManager">
+		<constructor-arg index="0" ref="redisTemplate" />
+		<property name="defaultExpiration" value="86400" />
+	</bean>
+
+	<bean id="shrioRedisCacheManager"
+		class="com.goafanti.core.shiro.cache.ShiroRedisCacheManager">
+		<property name="redisTemplate" ref="sessionRedisTemplate" />
+		<property name="expire" value="2592000" />
+	</bean>
+
+
+
+
+	<bean id="sessionIdGenerator"
+		class="org.apache.shiro.session.mgt.eis.JavaUuidSessionIdGenerator" />
+
+	<bean id="sessionIdCookie"
+		class="org.apache.shiro.web.servlet.SimpleCookie">
+		<constructor-arg value="AFT_SID" />
+		<property name="httpOnly" value="true" />
+		<property name="maxAge" value="2592000" />
+		<!-- <property name="domain" value=""/> -->
+	</bean>
+
+	<bean id="customSessionListener"
+		class="com.goafanti.core.shiro.listener.CustomSessionListener">
+		<property name="redisTemplate" ref="sessionRedisTemplate" />
+	</bean>
+
+	<bean id="enterpriseCacheSessionDAO"
+		class="org.apache.shiro.session.mgt.eis.EnterpriseCacheSessionDAO">
+		<property name="sessionIdGenerator" ref="sessionIdGenerator" />
+	</bean>
+
+	<!-- -->
+	<bean id="sessionValidationScheduler"
+		class="org.apache.shiro.session.mgt.ExecutorServiceSessionValidationScheduler">
+		<!-- -->
+		<property name="interval"
+			value="${session.validate.timespan}" />
+		<property name="sessionManager" ref="sessionManager" />
+	</bean>
+	<!-- -->
+	<bean id="securityManager"
+		class="org.apache.shiro.web.mgt.DefaultWebSecurityManager">
+		<property name="realm" ref="userRealm" />
+		<property name="sessionManager" ref="sessionManager" />
+		<property name="cacheManager" ref="shrioRedisCacheManager" />
+	</bean>
+
+	<bean id="authorizationAttributeSourceAdvisor"
+		class="org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor">
+		<property name="securityManager" ref="securityManager" />
+	</bean>
+
+	<!-- credential matcher -->
+	<bean id="credentialsMatcher"
+		class="org.apache.shiro.authc.credential.HashedCredentialsMatcher">
+		<property name="hashAlgorithmName"
+			value="${pwd.hash_algorithm_name}" />
+		<property name="hashIterations"
+			value="${pwd.hash_iterations}" />
+		<property name="storedCredentialsHexEncoded" value="true" />
+	</bean>
+	<!-- -->
+	<bean id="userRealm"
+		class="com.goafanti.core.shiro.token.UserRealm">
+		<property name="credentialsMatcher" ref="credentialsMatcher" />
+	</bean>
+
+	<!-- Session Manager -->
+	<bean id="sessionManager"
+		class="com.goafanti.core.shiro.session.CustomSessionManager">
+		<!-- class="org.apache.shiro.web.session.mgt.DefaultWebSessionManager"> -->
+		<property name="sessionIdUrlRewritingEnabled" value="false" />
+		<!-- -->
+		<property name="sessionValidationInterval" value="3600000" />
+		<!-- -->
+		<property name="globalSessionTimeout" value="3600000" />
+		<property name="sessionDAO" ref="enterpriseCacheSessionDAO" />
+		<property name="cacheManager" ref="shrioRedisCacheManager" />
+		<!-- session -->
+		<property name="sessionListeners">
+			<list>
+				<ref bean="customSessionListener" />
+			</list>
+		</property>
+		<!-- -->
+		<property name="sessionValidationScheduler"
+			ref="sessionValidationScheduler" />
+		<!-- -->
+		<property name="sessionValidationSchedulerEnabled"
+			value="true" />
+		<!-- -->
+		<property name="deleteInvalidSessions" value="true" />
+		<!-- -->
+		<property name="sessionIdCookie" ref="sessionIdCookie" />
+	</bean>
+
+	<bean id="shiroManager"
+		class="com.goafanti.core.shiro.service.impl.ShiroManagerImpl" />
+
+	<bean id="shiroFilter"
+		class="org.apache.shiro.spring.web.ShiroFilterFactoryBean">
+		<property name="securityManager" ref="securityManager" />
+		<property name="loginUrl" value="/user/login" />
+		<property name="successUrl" value="/" />
+		<property name="unauthorizedUrl" value="/user/login" />
+		<property name="filterChainDefinitions"
+			value="#{shiroManager.loadFilterChainDefinitions()}" />
+		<property name="filters">
+			<util:map>
+				<entry key="login">
+					<bean id="login"
+						class="com.goafanti.core.shiro.filter.LoginFilter" />
+				</entry>
+				<entry key="permission">
+					<bean id="permission"
+						class="com.goafanti.core.shiro.filter.PermissionFilter">
+						<property name="loginUrl" value="/admin/login" />
+					</bean>
+				</entry>
+				<entry key="admin">
+					<bean id="admin"
+						class="com.goafanti.core.shiro.filter.AdminFilter">
+						<property name="loginUrl" value="/admin/login" />
+					</bean>
+				</entry>
+			</util:map>
+		</property>
+	</bean>
+	<!-- -->
+	<bean id="lifecycleBeanPostProcessor"
+		class="org.apache.shiro.spring.LifecycleBeanPostProcessor" />
 </beans>

+ 0 - 58
src/resources/generatorConfig.xml

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE generatorConfiguration
-        PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
-        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
-<generatorConfiguration>
-   <classPathEntry location="C:\Users\Administrator.SC-202107051558\AppData\Roaming\DBeaverData\drivers\maven\maven-central\mysql\mysql-connector-java-8.0.17.jar" />
-   <!-- <classPathEntry location="C:\Users\Administrator.SC-202009251130\AppData\Roaming\DBeaverData\drivers\maven\maven-central\mysql\mysql-connector-java-8.0.17.jar" /> /> -->
-  <context  id="MysqlTables" targetRuntime="MyBatis3" defaultModelType="flat">
-  <!-- 自动识别数据库关键字,默认false,如果设置为true,根据SqlReservedWords中定义的关键字列表;一般保留默认值,遇到数据库关键字(Java关键字),使用columnOverride覆盖 -->
-        <property name="autoDelimitKeywords" value="true"/>	
-        <!-- 生成的Java文件的编码 -->
-        <property name="javaFileEncoding" value="utf-8"/>
-        <!-- beginningDelimiter和endingDelimiter:指明数据库的用于标记数据库对象名的符号,比如ORACLE就是双引号,MYSQL默认是`反引号; -->
-        <property name="beginningDelimiter" value="`"/>
-        <property name="endingDelimiter" value="`"/>
-        <property name="addRemarkComments" value="true"/>
-        <!-- 格式化XML代码 -->
-        <property name="xmlFormatter" value="org.mybatis.generator.api.dom.DefaultXmlFormatter"/>
-        <plugin type="org.mybatis.generator.plugins.SerializablePlugin"/>
-        <plugin type="org.mybatis.generator.plugins.ToStringPlugin"/>
-        <!-- 注释 -->
-        <commentGenerator>
-            <property name="suppressAllComments" value="false"/><!-- 是否取消注释 -->
-            <property name="suppressDate" value="false"/> <!-- 是否生成注释代时间戳-->
-            <property name="addRemarkComments" value="true"/> 
-        </commentGenerator>
-     <jdbcConnection connectionURL="jdbc:mysql://localhost:3306/aft?serverTimezone=UTC"  
-    	driverClass="com.mysql.jdbc.Driver" password="123456" userId="root" >
-    	 <!-- 防止生成其它库的表 -->
-            <property name="nullCatalogMeansCurrent" value="true"/>
-        </jdbcConnection>
-         <!-- 类型转换 -->
-        <javaTypeResolver>
-            <!-- 是否使用bigDecimal, false可自动转化以下类型(Long, Integer, Short, etc.) -->
-            <property name="forceBigDecimals" value="false"/>
-        </javaTypeResolver>
-    <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="kede-server" >
-    		<!-- 是否让schema作为包的后缀 -->
-            <property name="enableSubPackages" value="false"/>
-            <!-- 从数据库返回的值去掉前后空格 -->
-            <property name="trimStrings" value="true"/>
-    </javaModelGenerator>
-    <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="kede-server" >
-    	<property name="enableSubPackages" value="false"/>
-    </sqlMapGenerator>
-    <javaClientGenerator  targetPackage="com.goafanti.common.dao"  type="XMLMAPPER" targetProject="kede-server"  >
-    <property name="enableSubPackages" value="false"/>
-     <property name="nullCatalogMeansCurrent" value="true"/>
-    </javaClientGenerator>
-    <table schema="aft" tableName="user_follow"
-	enableCountByExample="false" enableUpdateByExample="false"
-	enableDeleteByExample="false" enableSelectByExample="false"
-	selectByExampleQueryId="false" enableSelectByPrimaryKey="true"
-	enableUpdateByPrimaryKey="true" enableDeleteByPrimaryKey="true">
-         <property name="useActualColumnNames" value="false"/>
-        </table>
-  </context>
-</generatorConfiguration>

+ 1 - 1
src/test/java/com/goafanti/test/TestValueEvaluation.java

@@ -14,7 +14,7 @@ import com.goafanti.common.model.ValueEvaluation;
 import com.goafanti.evaluation.service.ValueEvaluationService;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = "classpath:applicationContext-test.xml")
+@ContextConfiguration(locations = "classpath:applicationContext.xml")
 @Transactional
 public class TestValueEvaluation extends AbstractJUnit4SpringContextTests {
 	@Autowired