Kaynağa Gözat

1.web.xml 打包修改

Antiloveg 8 yıl önce
ebeveyn
işleme
284a66820f

+ 48 - 0
pom.xml

@@ -20,6 +20,35 @@
 		<org.aspectj-version>1.6.10</org.aspectj-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
+	<profiles>  
+        <profile>  
+            <id>aft_local</id>  
+            <activation>  
+                <activeByDefault>true</activeByDefault>  
+            </activation>  
+            <properties>  
+                <profiles.activation>local</profiles.activation>  
+            </properties>  
+        </profile>  
+        <profile>  
+            <id>aft_dev</id>  
+            <properties>  
+                <profiles.activation>dev</profiles.activation>  
+            </properties>  
+        </profile>  
+        <profile>  
+            <id>aft_prod</id>  
+            <properties>  
+                <profiles.activation>prod</profiles.activation>  
+            </properties>  
+        </profile>  
+        <profile>  
+            <id>aft_test</id>  
+            <properties>  
+                <profiles.activation>test</profiles.activation>  
+            </properties>  
+        </profile>  
+	</profiles> 
 
 	<dependencies>
 		<!-- spring -->
@@ -332,6 +361,25 @@
 					<showDeprecation>true</showDeprecation>
 				</configuration>
 			</plugin>
+			<plugin>  
+                <groupId>org.apache.maven.plugins</groupId>  
+                <artifactId>maven-war-plugin</artifactId>  
+                <configuration>  
+                    <warName>${profiles.activation}</warName>  
+                    <!-- 激活spring profile -->  
+                    <webResources>  
+                        <resource>  
+                            <filtering>true</filtering>  
+                            <directory>src/main/webapp</directory>  
+                            <includes>  
+                                <include>**/web.xml</include>  
+                            </includes>  
+                        </resource>  
+                    </webResources>  
+                    <warSourceDirectory>src/main/webapp</warSourceDirectory>  
+                    <webXml>src/main/webapp/WEB-INF/web.xml</webXml>  
+                </configuration>  
+			</plugin>
 		</plugins>
 	</build>
 </project>

+ 128 - 0
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -0,0 +1,128 @@
+package com.goafanti.admin.controller;
+
+import java.text.ParseException;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.common.utils.StringUtils;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.user.bo.OrgListBo;
+import com.goafanti.user.bo.UserListBo;
+import com.goafanti.user.service.OrganizationIdentityService;
+import com.goafanti.user.service.UserIdentityService;
+import com.goafanti.user.service.UserService;
+
+@Controller
+@RequestMapping(value = "/api/admin")
+public class AdminApiController extends BaseApiController {
+	@Resource
+	private UserService			userService;
+	@Resource
+	private UserIdentityService	userIdentityService;
+	@Resource
+	private OrganizationIdentityService organizationIdentityService;
+
+	/**
+	 * 个人用户列表
+	 * 
+	 * @param mobile
+	 * @param email
+	 * @param createTime
+	 * @param number
+	 * @param auditStatus
+	 * @param pageNo
+	 * @param pageSize
+	 * @return
+	 * @throws ParseException
+	 */
+	@RequestMapping(value = "/userList", method = RequestMethod.GET)
+	public Result userList(String mobile, String email,
+			@RequestParam(name = "createTime[]", required = false) String[] createTime, Integer number,
+			Integer auditStatus, String pageNo, String pageSize) throws ParseException {
+		Result res = new Result();
+		Integer pNo = 1;
+		Integer pSize = 10;
+		if (StringUtils.isNumeric(pageSize)) {
+			pSize = Integer.parseInt(pageSize);
+		}
+		if (StringUtils.isNumeric(pageNo)) {
+			pNo = Integer.parseInt(pageNo);
+		}
+		res.setData(getUserList(mobile, email, createTime, number, auditStatus, pNo, pSize));
+		return res;
+	}
+    
+	/**
+	 * 个人用户信息明细
+	 * @param uid
+	 * @return
+	 */
+	@RequestMapping(value = "/userDetail", method = RequestMethod.POST)
+	public Result userDetail(String uid) {
+		Result res = new Result();
+		res.setData(userIdentityService.selectUserIdentityByUserId(uid));
+		return res;
+	}
+	
+    /**
+     * 团体用户列表
+     * @param mobile
+     * @param email
+     * @param createTime
+     * @param number
+     * @param auditStatus
+     * @param pageNo
+     * @param pageSize
+     * @return
+     * @throws ParseException
+     */
+	@RequestMapping(value = "/orgList", method = RequestMethod.GET)
+	public Result orgList(String mobile, String email,
+			@RequestParam(name = "createTime[]", required = false) String[] createTime, Integer number,
+			Integer auditStatus, String pageNo, String pageSize) throws ParseException {
+		Result res = new Result();
+		Integer pNo = 1;
+		Integer pSize = 10;
+		if (StringUtils.isNumeric(pageSize)) {
+			pSize = Integer.parseInt(pageSize);
+		}
+		if (StringUtils.isNumeric(pageNo)) {
+			pNo = Integer.parseInt(pageNo);
+		}
+		res.setData(getOrgList(mobile, email, createTime, number, auditStatus, pNo, pSize));
+		return res;
+	}
+	
+	/**
+	 * 团体用户明细
+	 * @param uid
+	 * @return
+	 */
+	@RequestMapping(value="/orgDetail", method = RequestMethod.POST)
+	public Result orgDetail(String uid){
+		Result res = new Result();
+		res.setData(organizationIdentityService.selectOrgIdentityByUserId(uid));
+		return res;
+	}
+    
+	// org团体列表
+	private Pagination<OrgListBo> getOrgList(String mobile, String email, String[] createTime, Integer number, Integer auditStatus,
+			Integer pNo, Integer pSize) throws ParseException {
+		return (Pagination<OrgListBo>) organizationIdentityService.listOrg(mobile, email, createTime, number, 
+				auditStatus, pNo, pSize);
+	}
+
+	// user个人列表
+	private Pagination<UserListBo> getUserList(String mobile, String email, String[] createTime, Integer number,
+			Integer auditStatus, Integer pNo, Integer pSize) throws ParseException {
+		return (Pagination<UserListBo>) userService.listUser(mobile, email, createTime, number, auditStatus, pNo,
+				pSize);
+	}
+}

+ 146 - 5
src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml

@@ -36,6 +36,13 @@
     <result column="process" property="process" jdbcType="INTEGER" />
     <result column="wrong_count" property="wrongCount" jdbcType="INTEGER" />
     <result column="payment_date" property="paymentDate" jdbcType="TIMESTAMP" />
+    
+    <result column="first_contacts" property="firstContacts" jdbcType="VARCHAR" />
+    <result column="first_mobile" property="firstMobile" jdbcType="VARCHAR" />
+    <result column="second_contacts" property="secondContacts" jdbcType="VARCHAR" />
+    <result column="second_mobile" property="secondMobile" jdbcType="VARCHAR" />
+    <result column="third_contacts" property="thirdContacts" jdbcType="VARCHAR" />
+    <result column="third_mobile" property="thirdMobile" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, uid, contacts, contact_mobile, fixed_tel, qq, postal_address, postcode, aft_username, 
@@ -43,7 +50,7 @@
     licence_scanning_url, org_code, org_code_url, bank_account, banks, bank_branch, bank_card_number, 
     validation_amount, identity_type, location_province, location_city, location_area, 
     legal_person, legal_person_id_card, last_year_tax_report_url, audit_status, process, wrong_count, 
-    payment_date
+    payment_date, first_contacts, first_mobile, second_contacts, second_mobile, third_contacts ,third_mobile
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -66,7 +73,10 @@
       bank_card_number, validation_amount, identity_type, 
       location_province, location_city, location_area, 
       legal_person, legal_person_id_card, last_year_tax_report_url, 
-      audit_status, process, wrong_count, payment_date)
+      audit_status, process, wrong_count, payment_date,
+      first_contacts, first_mobile, second_contacts, 
+      second_mobile, third_contacts ,third_mobile
+      )
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR}, 
       #{contactMobile,jdbcType=VARCHAR}, #{fixedTel,jdbcType=VARCHAR}, #{qq,jdbcType=VARCHAR}, 
       #{postalAddress,jdbcType=VARCHAR}, #{postcode,jdbcType=VARCHAR}, #{aftUsername,jdbcType=VARCHAR}, 
@@ -77,7 +87,10 @@
       #{bankCardNumber,jdbcType=VARCHAR}, #{validationAmount,jdbcType=DECIMAL}, #{identityType,jdbcType=INTEGER}, 
       #{locationProvince,jdbcType=VARCHAR}, #{locationCity,jdbcType=VARCHAR}, #{locationArea,jdbcType=VARCHAR}, 
       #{legalPerson,jdbcType=VARCHAR}, #{legalPersonIdCard,jdbcType=VARCHAR}, #{lastYearTaxReportUrl,jdbcType=VARCHAR}, 
-      #{auditStatus,jdbcType=INTEGER}, #{process,jdbcType=INTEGER}, #{wrongCount,jdbcType=INTEGER}, #{paymentDate,jdbcType=TIMESTAMP})
+      #{auditStatus,jdbcType=INTEGER}, #{process,jdbcType=INTEGER}, #{wrongCount,jdbcType=INTEGER}, #{paymentDate,jdbcType=TIMESTAMP},
+      #{firstContacts,jdbcType=VARCHAR}, #{firstMobile,jdbcType=VARCHAR}, #{secondContacts,jdbcType=VARCHAR}, 
+      #{secondMobile,jdbcType=VARCHAR}, #{thirdContacts,jdbcType=VARCHAR}, #{thirdMobile,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrganizationIdentity" >
     insert into organization_identity
@@ -184,6 +197,25 @@
       <if test="paymentDate != null" >
         payment_date,
       </if>
+      
+      <if test="firstContacts!= null">
+      	first_contacts,
+      </if>
+      <if test="firstMobile != null">
+      	first_mobile,
+      </if>
+      <if test="secondContacts != null">
+      	second_contacts,
+      </if>
+      <if test="secondMobile != null">
+      	second_mobile,
+      </if>
+      <if test="thirdContacts != null">
+      	third_contacts,
+      </if>
+      <if test="thirdMobile != null">
+      	third_mobile,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -288,6 +320,25 @@
        <if test="paymentDate != null" >
         #{paymentDate,jdbcType=TIMESTAMP},
       </if>
+      
+      <if test="firstContacts!= null">
+      	#{firstContacts,jdbcType=VARCHAR},
+      </if>
+      <if test="firstMobile != null">
+      	#{firstMobile,jdbcType=VARCHAR},
+      </if>
+      <if test="secondContacts != null">
+      	#{secondContacts,jdbcType=VARCHAR},
+      </if>
+      <if test="secondMobile != null">
+      	#{secondMobile,jdbcType=VARCHAR},
+      </if>
+      <if test="thirdContacts != null">
+      	#{thirdContacts,jdbcType=VARCHAR},
+      </if>
+      <if test="thirdMobile != null">
+      	#{thirdMobile,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.OrganizationIdentity" >
@@ -392,6 +443,25 @@
       <if test="paymentDate != null" >
         payment_date = #{paymentDate,jdbcType=TIMESTAMP},
       </if>
+      
+       <if test="firstContacts!= null">
+      	first_contacts = #{firstContacts,jdbcType=VARCHAR},
+      </if>
+      <if test="firstMobile != null">
+      	first_mobile = #{firstMobile,jdbcType=VARCHAR},
+      </if>
+      <if test="secondContacts != null">
+      	second_contacts = #{secondContacts,jdbcType=VARCHAR},
+      </if>
+      <if test="secondMobile != null">
+      	second_mobile = #{secondMobile,jdbcType=VARCHAR},
+      </if>
+      <if test="thirdContacts != null">
+      	third_contacts = #{thirdContacts,jdbcType=VARCHAR},
+      </if>
+      <if test="thirdMobile != null">
+      	third_mobile = #{thirdMobile,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -429,7 +499,14 @@
       audit_status = #{auditStatus,jdbcType=INTEGER},
       process = #{process,jdbcType=INTEGER},
       wrong_count = #{wrongCount,jdbcType=INTEGER},
-      payment_date = #{paymentDate,jdbcType=TIMESTAMP}
+      payment_date = #{paymentDate,jdbcType=TIMESTAMP},
+      first_contacts = #{firstContacts,jdbcType=VARCHAR},
+      first_mobile = #{firstMobile,jdbcType=VARCHAR},
+      second_contacts = #{secondContacts,jdbcType=VARCHAR},
+      second_mobile = #{secondMobile,jdbcType=VARCHAR},
+      third_contacts = #{thirdContacts,jdbcType=VARCHAR},
+      third_mobile = #{thirdMobile,jdbcType=VARCHAR}
+      }
     where id = #{id,jdbcType=VARCHAR}
   </update>
   
@@ -443,7 +520,11 @@
    
   <select id="selectOrgIdentityBoByUserId" parameterType="java.lang.String" resultType="com.goafanti.user.bo.OrgIdentityBo">
   	select t.id,t.uid,t.contacts,t.fixed_tel as fixedTel ,t.qq,t.postal_address as postalAddress ,t.postcode,
-    u.email ,t.legal_person as legalPerson from user u LEFT JOIN organization_identity t
+	  	t.first_contacts as firstContacts, t.first_mobile as firstMobile,
+	  	t.second_contacts as secondContacts, t.second_mobile as secondMobile,
+	  	t.third_contacts as thirdContacts, t.third_mobile as thirdMobile, 
+	    u.email ,t.legal_person as legalPerson 
+	from user u LEFT JOIN organization_identity t
     on t.uid = u.id 
      where t.uid=#{uid,jdbcType=VARCHAR} 
   </select>
@@ -453,4 +534,64 @@
    <include refid="Base_Column_List" />
     from organization_identity
   </select>
+  
+   <select id="findOrgListByPage" parameterType="String" resultType="com.goafanti.user.bo.OrgListBo">
+  	select u.id ,u.mobile, u.email, u.create_time as createTime, 
+  	       u.number , o.audit_status as auditStatus
+    from user u LEFT JOIN organization_identity o 
+    ON u.id = o.uid 
+    WHERE u.type = 1
+    <if test = "mobile != null">
+	    and u.mobile = #{mobile,jdbcType=INTEGER}
+	</if>
+	<if test = "email != null">
+	    and u.email = #{email,jdbcType=INTEGER}
+	</if>
+	<if test = "pStart != null" >
+		and u.create_time <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test = "pEnd != null">
+		and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
+	</if>
+	<if test=" number != null">
+		and u.number = #{number,jdbcType=Integer}
+	</if>
+	<if test="auditStatus != null">
+		and o.audit_status= #{auditStatus,jdbcType=Integer}
+	</if>
+	<if test="page_sql!=null">
+		${page_sql}
+	</if>
+  </select>
+  
+  <select id="findOrgCount" resultType="java.lang.Integer" parameterType="String">
+  	select count(1) from (
+  		select u.id ,u.mobile, u.email, u.create_time as createTime, 
+  	       u.number , o.audit_status as auditStatus
+    from user u LEFT JOIN organization_identity o
+    ON u.id = o.uid 
+    WHERE u.type = 1
+    <if test = "mobile != null">
+	    and u.mobile = #{mobile,jdbcType=INTEGER}
+	</if>
+	<if test = "email != null">
+	    and u.email = #{email,jdbcType=INTEGER}
+	</if>
+	<if test = "pStart != null" >
+		and u.create_time <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test = "pEnd != null">
+		and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
+	</if>
+	<if test=" number != null">
+		and u.number = #{number,jdbcType=Integer}
+	</if>
+	<if test="auditStatus != null">
+		and o.audit_status= #{auditStatus,jdbcType=Integer}
+	</if>
+	<if test="page_sql!=null">
+		${page_sql}
+	</if>
+	) as total
+  </select>  
 </mapper>

+ 3 - 3
src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml

@@ -299,9 +299,9 @@
   
    
   <select id="selectUserIdentityBoByUserId" parameterType="java.lang.String" resultType="com.goafanti.user.bo.UserIdentityBo">
-  	select t.id,t.uid,t.username,t.sex,t.date_of_birth_year,
-  		   date_of_birth_month,t.id_number,t.positive_id_url,t.opposite_id_url,
-		   u.mobile,u.number from user u left JOIN user_identity t
+  	select t.id, t.uid, t.username, t.sex, t.date_of_birth_year as dateOfBirthYear,
+  		   t.date_of_birth_month as dateOfBirthMonth, t.id_number as idNumber, t.audit_status as auditStatus,
+		   u.mobile, u.number from user u left JOIN user_identity t
 	on t.uid = u.id where t.uid=#{uid,jdbcType=VARCHAR}
   </select>
 </mapper>

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

@@ -184,4 +184,63 @@
 	where u.id =#{id,jdbcType=VARCHAR}
   </select>
   
+  <select id="findUserListByPage" parameterType="String" resultType="com.goafanti.user.bo.UserListBo">
+  	select u.id ,u.mobile, u.email, u.create_time as createTime, 
+  	       u.number , i.audit_status as auditStatus
+    from user u LEFT JOIN user_identity i 
+    ON u.id = i.uid 
+    WHERE u.type = 0
+    <if test = "mobile != null">
+	    and u.mobile = #{mobile,jdbcType=INTEGER}
+	</if>
+	<if test = "email != null">
+	    and u.email = #{email,jdbcType=INTEGER}
+	</if>
+	<if test = "pStart != null" >
+		and u.create_time <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test = "pEnd != null">
+		and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
+	</if>
+	<if test=" number != null">
+		and u.number = #{number,jdbcType=Integer}
+	</if>
+	<if test="auditStatus != null">
+		and i.audit_status= #{auditStatus,jdbcType=Integer}
+	</if>
+	<if test="page_sql!=null">
+		${page_sql}
+	</if>
+  </select>
+  
+  <select id="findUserCount" resultType="java.lang.Integer" parameterType="String">
+  	select count(1) from (
+  		select u.id ,u.mobile, u.email, u.create_time as createTime, 
+  	       u.number , i.audit_status as auditStatus
+    from user u LEFT JOIN user_identity i 
+    ON u.id = i.uid 
+    WHERE u.type = 0
+    <if test = "mobile != null">
+	    and u.mobile = #{mobile,jdbcType=INTEGER}
+	</if>
+	<if test = "email != null">
+	    and u.email = #{email,jdbcType=INTEGER}
+	</if>
+	<if test = "pStart != null" >
+		and u.create_time <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test = "pEnd != null">
+		and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
+	</if>
+	<if test=" number != null">
+		and u.number = #{number,jdbcType=Integer}
+	</if>
+	<if test="auditStatus != null">
+		and i.audit_status= #{auditStatus,jdbcType=Integer}
+	</if>
+	<if test="page_sql!=null">
+		${page_sql}
+	</if>
+	) as total
+  </select>  
 </mapper>

+ 81 - 0
src/main/java/com/goafanti/common/model/OrganizationIdentity.java

@@ -169,6 +169,37 @@ public class OrganizationIdentity {
      * 打款日期
      */
     private Date paymentDate;
+    
+    /**
+     * 第一联系人
+     */
+    private String firstContacts;
+    
+    /**
+     * 第一联系人电话
+     */
+    private String firstMobile;
+    
+    /**
+     * 第二联系人
+     */
+    private String secondContacts;
+    
+    /**
+     * 第二联系人电话
+     */
+    private String secondMobile;
+    
+    /**
+     * 第三联系人
+     */
+    private String thirdContacts;
+    
+    /**
+     * 第三联系人电话
+     */
+    private String thirdMobile;
+    
 
     public String getId() {
         return id;
@@ -442,6 +473,56 @@ public class OrganizationIdentity {
 		this.paymentDate = paymentDate;
 	}
 	
+	
+	
+	public String getFirstContacts() {
+		return firstContacts;
+	}
+
+	public void setFirstContacts(String firstContacts) {
+		this.firstContacts = firstContacts;
+	}
+
+	public String getFirstMobile() {
+		return firstMobile;
+	}
+
+	public void setFirstMobile(String firstMobile) {
+		this.firstMobile = firstMobile;
+	}
+
+	public String getSecondContacts() {
+		return secondContacts;
+	}
+
+	public void setSecondContacts(String secondContacts) {
+		this.secondContacts = secondContacts;
+	}
+
+	public String getSecondMobile() {
+		return secondMobile;
+	}
+
+	public void setSecondMobile(String secondMobile) {
+		this.secondMobile = secondMobile;
+	}
+
+	public String getThirdContacts() {
+		return thirdContacts;
+	}
+
+	public void setThirdContacts(String thirdContacts) {
+		this.thirdContacts = thirdContacts;
+	}
+
+	public String getThirdMobile() {
+		return thirdMobile;
+	}
+
+	public void setThirdMobile(String thirdMobile) {
+		this.thirdMobile = thirdMobile;
+	}
+
 	//打款日期
 	public String getPaymentDateFormattedDate(){
 		if (this.paymentDate == null) {

+ 2 - 2
src/main/java/com/goafanti/common/model/UserIdentity.java

@@ -91,7 +91,7 @@ public class UserIdentity {
     private BigDecimal amountMoney;
 
     /**
-    * 审核状态(0--未提交审核,1-提交审核,2-未通过,3-审核通过)
+    * 审核状态(审核状态(0--未提交审核,1-提交审核,2-审核未打款,3-审核已打款,4-审核未通过,5-审核通过))
     */
     private Integer auditStatus;
 
@@ -286,7 +286,7 @@ public class UserIdentity {
 		this.paymentDate = paymentDate;
 	}
 	
-	//打款金额
+	//打款日期
 	public String getPaymentDateFormattedDate(){
 		if (this.paymentDate == null) {
 			 return null;

+ 56 - 0
src/main/java/com/goafanti/techservice/patent/controller/PatentApiController.java

@@ -135,6 +135,62 @@ public class PatentApiController extends BaseApiController {
 		res.setData(getClientApplyList(res, patentNumber, patentName, patentCatagory, patentState, pNo, pSize));
 		return res;
 	}
+	
+	/**
+	 * 用户端录入知识产权信息(专利)
+	 * @return
+	 */
+	@RequestMapping(value="/clientInputPatent", method = RequestMethod.POST)
+	public Result clientInputPatent(String patentNumber, String patentName, Integer patentCatagory, Integer obtailWay,
+			Integer sortNumber,String authorizationNumber, String authorizationDate){
+		Result res = new Result();
+		PatentInfo patent = new PatentInfo();
+		patent.setId(UUID.randomUUID().toString());
+		patent.setUid(TokenManager.getUserId());
+		patent.setPatentName(patentName);
+		patent.setPatentNumber(patentNumber);;
+		patent.setPatentCatagory(patentCatagory);
+		try {
+			patent.setAuthorizedDate(DateUtils.parseDate(authorizationDate, "yyyy-MM-dd"));
+		} catch (ParseException e) {
+		    res.getError().add(buildError("", "日期格式不正确"));
+		}
+		res.setData(patentInfoService.insert(patent));
+		return res;
+	}
+	
+	/**
+	 * 管理端录入知识产权信息(专利)
+	 * @param patentNumber
+	 * @param patentName
+	 * @param patentCatagory
+	 * @param obtailWay
+	 * @param sortNumber
+	 * @param authorizationNumber
+	 * @param authorizationDate
+	 * @param uid
+	 * @return
+	 */
+	@RequestMapping(value="/managerInputPatent", method = RequestMethod.POST)
+	public Result managerInputPatent(String patentNumber, String patentName, Integer patentCatagory, Integer obtailWay,
+			Integer sortNumber,String authorizationNumber, String authorizationDate, String uid){
+		Result res = new Result();
+		PatentInfo patent = new PatentInfo();
+		patent.setId(UUID.randomUUID().toString());
+		patent.setUid(uid);
+		patent.setPatentName(patentName);
+		patent.setPatentNumber(patentNumber);;
+		patent.setPatentCatagory(patentCatagory);
+		try {
+			patent.setAuthorizedDate(DateUtils.parseDate(authorizationDate, "yyyy-MM-dd"));
+		} catch (ParseException e) {
+		    res.getError().add(buildError("", "日期格式不正确"));
+		}
+		res.setData(patentInfoService.insert(patent));
+		return res;
+	}
+	
+	
 
 	/**
 	 * 用户端申请专利当前流程/管理端专利详情-专利状态流转记录

+ 5 - 5
src/main/java/com/goafanti/techservice/patent/service/impl/PatentCostServiceImpl.java

@@ -33,22 +33,22 @@ public class PatentCostServiceImpl extends BaseMybatisDao<PatentCostMapper> impl
 		Date pStart = null;
 		Date pEnd = null;
 		
-		if(pDate != null ){
+		if (pDate != null ){
 			pStart = DateUtils.parseDate(pDate[0], "yyyy-MM-dd");
-			if(pDate.length == 2){
+			if (pDate.length == 2){
 				pEnd = DateUtils.addDays(DateUtils.parseDate(pDate[1], "yyyy-MM-dd"), 1);
 			}
 		}
 		
-		if(pStart != null){
+		if (pStart != null){
 			params.put("pStart", pStart);
 		}
 		
-		if(pEnd != null){
+		if (pEnd != null){
 			params.put("pEnd", pEnd);
 		}
 		
-		if(locationProvince != null && locationProvince != ""){
+		if (locationProvince != null && locationProvince != ""){
 			params.put("locationProvince", locationProvince);
 		}
 		

+ 57 - 0
src/main/java/com/goafanti/user/bo/OrgListBo.java

@@ -0,0 +1,57 @@
+package com.goafanti.user.bo;
+
+import java.util.Date;
+
+public class OrgListBo {
+    private String id;
+	
+    private	String mobile;
+    
+    private String email;
+    
+    private Date createTime;
+    
+    private Integer number;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getMobile() {
+		return mobile;
+	}
+
+	public void setMobile(String mobile) {
+		this.mobile = mobile;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Integer getNumber() {
+		return number;
+	}
+
+	public void setNumber(Integer number) {
+		this.number = number;
+	}
+    
+    
+}

+ 74 - 0
src/main/java/com/goafanti/user/bo/UserListBo.java

@@ -0,0 +1,74 @@
+package com.goafanti.user.bo;
+
+import java.util.Date;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import com.goafanti.common.model.UserIdentity;
+
+public class UserListBo {
+	
+	private String id;
+	
+    private	String mobile;
+    
+    private String email;
+    
+    private Date createTime;
+    
+    private Integer number;
+    
+    
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getMobile() {
+		return mobile;
+	}
+
+	public void setMobile(String mobile) {
+		this.mobile = mobile;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Integer getNumber() {
+		return number;
+	}
+
+	public void setNumber(Integer number) {
+		this.number = number;
+	}
+	
+	//注册时间
+	public String getCreateTimeFormattedDate(){
+		if (this.createTime == null) {
+			 return null;
+		   } else {
+			 return DateFormatUtils.format(this.getCreateTime(), "yyyy-MM-dd");
+		   }
+	}
+		
+	public void setCreateTimeFormattedDate(String createTimeFormattedDate){
+			
+	}
+}

+ 6 - 0
src/main/java/com/goafanti/user/service/OrganizationIdentityService.java

@@ -1,9 +1,12 @@
 package com.goafanti.user.service;
 
+import java.text.ParseException;
 import java.util.List;
 
 import com.goafanti.common.model.OrganizationIdentity;
+import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.user.bo.OrgIdentityBo;
+import com.goafanti.user.bo.OrgListBo;
 
 public interface OrganizationIdentityService {
 
@@ -19,4 +22,7 @@ public interface OrganizationIdentityService {
 
 	int updateByPrimaryKey(OrganizationIdentity org);
 
+	Pagination<OrgListBo> listOrg(String mobile, String email, String[] createTime, Integer number, Integer auditStatus,
+			Integer pNo, Integer pSize) throws ParseException;
+
 }

+ 8 - 0
src/main/java/com/goafanti/user/service/UserService.java

@@ -1,7 +1,11 @@
 package com.goafanti.user.service;
 
+import java.text.ParseException;
+
 import com.goafanti.common.model.User;
+import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.user.bo.UserDownLoadBo;
+import com.goafanti.user.bo.UserListBo;
 import com.goafanti.user.bo.UserPageHomeBo;
 
 
@@ -23,4 +27,8 @@ public interface UserService {
 
 	UserDownLoadBo selectUserDownLoadBoByUserId(String userId);
 
+	Pagination<UserListBo> listUser(String mobile, String email, String[] createTime, Integer number,
+			Integer auditStatus, Integer pNo, Integer pSize) throws ParseException;
+	
+
 }

+ 61 - 1
src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java

@@ -1,17 +1,27 @@
 package com.goafanti.user.service.impl;
 
+import java.text.ParseException;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.model.OrganizationIdentity;
+import com.goafanti.common.utils.DateUtils;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.user.bo.OrgIdentityBo;
+import com.goafanti.user.bo.OrgListBo;
+import com.goafanti.user.bo.UserListBo;
 import com.goafanti.user.service.OrganizationIdentityService;
 
 @Service
-public class OrganizationIdentityServiceImpl implements OrganizationIdentityService{
+public class OrganizationIdentityServiceImpl extends BaseMybatisDao<OrganizationIdentityMapper> implements OrganizationIdentityService{
     @Autowired
     OrganizationIdentityMapper organizationIdentityMapper;
     
@@ -46,4 +56,54 @@ public class OrganizationIdentityServiceImpl implements OrganizationIdentityServ
 		return organizationIdentityMapper.updateByPrimaryKey(org);
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<OrgListBo> listOrg(String mobile, String email, String[] pDate, Integer number,
+			Integer auditStatus, Integer pageNo, Integer pageSize) throws ParseException {
+		Map<String, Object> params = new HashMap<>();
+		Date pStart = null;
+		Date pEnd = null;
+		
+		if (null != pDate ){
+			pStart = DateUtils.parseDate(pDate[0], "yyyy-MM-dd");
+			if (pDate.length == 2){
+				pEnd = DateUtils.addDays(DateUtils.parseDate(pDate[1], "yyyy-MM-dd"), 1);
+			}
+		}
+		 
+		if (null != pStart){
+			params.put("pStart", pStart);
+		}
+		
+		if (null != pEnd){
+			params.put("pEnd", pEnd);
+		}
+		
+		if (!StringUtils.isBlank(mobile)){
+			params.put("mobile", mobile);
+		}
+		
+		if (!StringUtils.isBlank(email)){
+			params.put("email", email);
+		}
+		
+		if (null != number ){
+			params.put("number", number);
+		}
+		
+		if (null != auditStatus){
+			params.put("auditStatus", auditStatus);
+		}
+		
+		if (pageNo == null || pageNo < 0) {
+			pageNo = 1;
+		}
+
+		if (pageSize == null || pageSize < 0) {
+			pageSize = 10;
+		}
+		return (Pagination<OrgListBo>) findPage("findOrgListByPage","findOrgCount", params, pageNo,
+				pageSize);
+	}
+
 }

+ 60 - 1
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

@@ -1,5 +1,9 @@
 package com.goafanti.user.service.impl;
 
+import java.text.ParseException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
@@ -8,18 +12,23 @@ import org.springframework.stereotype.Service;
 
 import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.dao.OrganizationInfoMapper;
+import com.goafanti.common.dao.PatentCostMapper;
 import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.model.OrganizationIdentity;
 import com.goafanti.common.model.OrganizationInfo;
 import com.goafanti.common.model.User;
+import com.goafanti.common.utils.DateUtils;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.user.bo.UserDownLoadBo;
+import com.goafanti.user.bo.UserListBo;
 import com.goafanti.user.bo.UserPageHomeBo;
 import com.goafanti.user.service.UserService;
 
 
 
 @Service
-public class UserServiceImpl implements UserService {
+public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserService {
 	@Autowired
 	UserMapper userMapper;
 	@Autowired
@@ -87,6 +96,56 @@ public class UserServiceImpl implements UserService {
 		return userMapper.selectUserDownLoadBoByUserId(id);
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<UserListBo> listUser(String mobile, String email, String[] pDate, Integer number,
+			Integer auditStatus, Integer pageNo, Integer pageSize) throws ParseException {
+		Map<String, Object> params = new HashMap<>();
+		Date pStart = null;
+		Date pEnd = null;
+		
+		if (null != pDate ){
+			pStart = DateUtils.parseDate(pDate[0], "yyyy-MM-dd");
+			if (pDate.length == 2){
+				pEnd = DateUtils.addDays(DateUtils.parseDate(pDate[1], "yyyy-MM-dd"), 1);
+			}
+		}
+		 
+		if (null != pStart){
+			params.put("pStart", pStart);
+		}
+		
+		if (null != pEnd){
+			params.put("pEnd", pEnd);
+		}
+		
+		if (!StringUtils.isBlank(mobile)){
+			params.put("mobile", mobile);
+		}
+		
+		if (!StringUtils.isBlank(email)){
+			params.put("email", email);
+		}
+		
+		if (null != number ){
+			params.put("number", number);
+		}
+		
+		if (null != auditStatus){
+			params.put("auditStatus", auditStatus);
+		}
+		
+		if (pageNo == null || pageNo < 0) {
+			pageNo = 1;
+		}
+
+		if (pageSize == null || pageSize < 0) {
+			pageSize = 10;
+		}
+		return (Pagination<UserListBo>) findPage("findUserListByPage","findUserCount", params, pageNo,
+				pageSize);
+	}
+
 
 
 

+ 20 - 20
src/main/resources/props/config_local.properties

@@ -1,47 +1,47 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
-#\u6570\u636e\u5e93\u94fe\u63a5\uff0c
+#\u6570\u636E\u5E93\u94FE\u63A5\uFF0C
 jdbc.url=jdbc:mysql://localhost:3306/aft_dev?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true
-#\u5e10\u53f7
+#\u5E10\u53F7
 jdbc.username=root
-#\u5bc6\u7801
+#\u5BC6\u7801
 jdbc.password=123456
-#\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
+#\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
+#\u521D\u59CB\u8FDE\u63A5\u6570
 jdbc.initialSize=3
-#\u6700\u5927\u8fde\u63a5\u6c60\u6570\u91cf
+#\u6700\u5927\u8FDE\u63A5\u6C60\u6570\u91CF
 jdbc.maxActive=20
-#\u53bb\u6389\uff0c\u914d\u7f6e\u6587\u4ef6\u5bf9\u5e94\u53bb\u6389
+#\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
+#\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
+#\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
+#\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
+#\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
+#\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
+#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
+#\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
+#\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
+#\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
+#\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
+#\u7EDF\u8BA1\u76D1\u63A7
 jdbc.filters=stat
 
 jedis.host=127.0.0.1
 jedis.port=6379
 jedis.timeout=5000
-#jedis.password=
+jedis.password=
 
 pwd.hash_algorithm_name=md5
 pwd.hash_iterations=2

+ 59 - 0
src/main/resources/props/config_test.properties

@@ -0,0 +1,59 @@
+#Driver
+jdbc.driverClassName=com.mysql.jdbc.Driver
+#\u6570\u636E\u5E93\u94FE\u63A5\uFF0C
+jdbc.url=jdbc:mysql://localhost:3306/aft_test?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true
+#\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=//aftts.hnzhiming.com
+
+upload.path=/data/aft/upload/public
+upload.private.path=/data/aft/upload/private
+
+accessKey=LTAIqTgQLLwz252Z
+accessSecret=ICGuiUnqzaar7urw4zecVcJrJ1MHg9

+ 1 - 1
src/main/webapp/WEB-INF/web.xml

@@ -10,7 +10,7 @@
 		and Filters -->
 	<context-param>
 		<param-name>spring.profiles.active</param-name>
-		<param-value>dev</param-value>
+		<param-value>${profiles.activation}</param-value>
 	</context-param>
 
 	<!-- Creates the Spring Container shared by all Servlets and Filters -->