Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT

wubb 8 years ago
parent
commit
86437c39de

+ 13 - 0
src/main/java/com/goafanti/activityUser/controller/UserActivityUserApiController.java

@@ -50,4 +50,17 @@ public class UserActivityUserApiController extends BaseApiController {
 		}
 		return res.data(activityUserService.batchDeleteByPrimaryKey(aid, TokenManager.getUserId()));
 	}
+
+	/**
+	 * 取消报名
+	 */
+	@RequestMapping(value = "/isSigned", method = RequestMethod.GET)
+	public Result isSigned(Long aid) {
+		Result res = new Result();
+		if (null == aid) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "活动ID"));
+			return res;
+		}
+		return res.data(activityUserService.selectByAidAndUid(aid, TokenManager.getUserId()) != null);
+	}
 }

+ 2 - 2
src/main/java/com/goafanti/cognizance/service/impl/OrgAnnualReportServiceImpl.java

@@ -109,8 +109,8 @@ public class OrgAnnualReportServiceImpl extends BaseMybatisDao<OrgAnnualReportMa
 			report.setSoftwareWorks(null == p.getSoftwareWorks() ? 0 : p.getSoftwareWorks());
 		}
 
-		BigDecimal t = orgAnnualReportMapper.selectAnnualReportTerritoryByYearAndUid(year, uid);
-		report.setTerritory(null == t ? new BigDecimal(0) : t);
+//		BigDecimal t = orgAnnualReportMapper.selectAnnualReportTerritoryByYearAndUid(year, uid);
+//		report.setTerritory(null == t ? new BigDecimal(0) : t);
 
 		AnnualReportMainBo m = orgAnnualReportMapper.selectAnnualReportMainBoByYearAndUid(year, uid);
 		if (null != m) {

+ 14 - 32
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -86,54 +86,36 @@ public class PortalController extends BaseController {
 				}
 			}
 			Integer industryCategoryA = demand.getIndustryCategoryA();
-			String industryCategory = "";
-			boolean a = Boolean.FALSE;
-			boolean b = Boolean.FALSE;
+			boolean hasCategoryA = false;
+			boolean hasCategoryB = false;
 			if (null != industryCategoryA) {
 				List<DemandPortalSimilarListBo> similarList = demandService.findByIndustryCategoryA(industryCategoryA,
 						demand.getId());
 				if (!similarList.isEmpty()) {
 					for (DemandPortalSimilarListBo s : similarList) {
-						a = Boolean.FALSE;
-						b = Boolean.FALSE;
-						industryCategory = "";
-						if (StringUtils.isNotBlank(s.getIndustryCategoryAS())) {
-							a = Boolean.TRUE;
-						}
-						if (StringUtils.isNotBlank(s.getIndustryCategoryBS())) {
-							b = Boolean.TRUE;
-						}
-						industryCategory += (a ? s.getIndustryCategoryAS() : "") + (a && b ? DELIMITER : "")
-								+ (b ? s.getIndustryCategoryBS() : "");
-						s.setIndustryCategory(industryCategory);
+						hasCategoryA = StringUtils.isNotBlank(s.getIndustryCategoryAS());
+						hasCategoryB = StringUtils.isNotBlank(s.getIndustryCategoryBS());
+						s.setIndustryCategory((hasCategoryA ? s.getIndustryCategoryAS() : "")
+								+ (hasCategoryA && hasCategoryB ? DELIMITER : "")
+								+ (hasCategoryB ? s.getIndustryCategoryBS() : ""));
 						if (null != s.getBudgetCost() || s.getBudgetCost().compareTo(BigDecimal.ZERO) > 0) {
 							s.setBudgetCostS(s.getBudgetCost() + UNIT);
 						} else {
 							s.setBudgetCostS(PRICE_NEGOTIABLE);
 						}
 					}
-
 				}
 				mv.addObject("similarList", similarList);
-				a = Boolean.FALSE;
-				if (StringUtils.isNotBlank(demand.getIndustryCategoryAS())) {
-					a = Boolean.TRUE;
-				}
-			}
-			b = Boolean.FALSE;
-			if (StringUtils.isNotBlank(demand.getIndustryCategoryBS())) {
-				b = Boolean.TRUE;
+				hasCategoryA = StringUtils.isNotBlank(demand.getIndustryCategoryAS());
 			}
+			hasCategoryB = StringUtils.isNotBlank(demand.getIndustryCategoryBS());
 
-			industryCategory += (a ? demand.getIndustryCategoryAS() : "") + (a && b ? DELIMITER : "")
-					+ (b ? demand.getIndustryCategoryBS() : "");
-			demand.setIndustryCategory(industryCategory);
+			demand.setIndustryCategory((hasCategoryA ? demand.getIndustryCategoryAS() : "")
+					+ (hasCategoryA && hasCategoryB ? DELIMITER : "")
+					+ (hasCategoryB ? demand.getIndustryCategoryBS() : ""));
 
-			String location = "";
-			String province = demand.getProvince();
-			String city = demand.getCity();
-			location += (StringUtils.isBlank(province) ? "" : province) + (StringUtils.isBlank(city) ? "" : city);
-			demand.setLocation(location);
+			demand.setLocation((StringUtils.isBlank(demand.getProvince()) ? "" : demand.getProvince())
+					+ (StringUtils.isBlank(demand.getCity()) ? "" : demand.getCity()));
 		}
 		mv.setViewName("/portal/detail/demandDetail");
 		mv.addObject("demand", demand);

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

@@ -682,6 +682,7 @@
   	where a.deleted_sign = 0 and a.owner_type = 0
   	<if test="ownerName != null">
   		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%')
+  		and  a.owner_id is null
   	</if>
   	<if test="username != null">
   		and  ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')
@@ -732,6 +733,7 @@
   	where deleted_sign = 0 and owner_type = 0
   	<if test="ownerName != null">
   		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%')
+  		and  a.owner_id is null
   	</if>
   	<if test="username != null">
   		and  ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')
@@ -1017,7 +1019,7 @@
 		    a.create_time as createTime, a.release_status as releaseStatus, 
 		    a.release_date as releaseDate, a.audit_status as auditStatus, a.tech_broker_id as techBrokerId,
 		    oi.unit_name as iOwnerName, oi.postal_address as iOwnerPostalAddress, u.email as iOwnerEmail,
-		    oi.org_code as iOwnerIdNumber
+		    oi.org_code as iOwnerIdNumber, u.mobile as iOwnerMobile
     from achievement a
     left join organization_identity oi on a.owner_id = oi.uid
     left join user u on u.id = a.owner_id

+ 10 - 4
src/main/java/com/goafanti/common/mapper/AchievementOrderMapper.xml

@@ -250,7 +250,8 @@
   		and ao.uid = #{uid,jdbcType=VARCHAR}
   	</if>
   	<if test="username != null">
-  		and ui.username = #{username,jdbcType=VARCHAR}
+  		and (oi.unit_name = #{username,jdbcType=VARCHAR}
+  		or ui.username = #{username,jdbcType=VARCHAR})
   	</if>
   	order by ao.serial_number desc
   	<if test="page_sql!=null">
@@ -264,6 +265,7 @@
   	from achievement_order ao
   	left join achievement a on a.id = ao.achievement_id
   	left join user_identity ui on ui.uid = ao.uid
+  	left join organization_identity oi on oi.uid = ao.uid
   	where ao.deleted_sign = 0 
   	and   a.deleted_sign = 0 
   	and   a.owner_type= 0
@@ -277,7 +279,8 @@
   		and ao.uid = #{uid,jdbcType=VARCHAR}
   	</if>
   	<if test="username != null">
-  		and ui.username = #{username,jdbcType=VARCHAR}
+  		and (oi.unit_name = #{username,jdbcType=VARCHAR}
+  		or ui.username = #{username,jdbcType=VARCHAR})
   	</if>
   </select>
   
@@ -307,7 +310,8 @@
   		and ao.uid = #{uid,jdbcType=VARCHAR}
   	</if>
   	<if test="unitName != null">
-  		and oi.unit_name = #{unitName,jdbcType=VARCHAR}
+  		and (oi.unit_name = #{unitName,jdbcType=VARCHAR}
+  		or ui.username = #{unitName,jdbcType=VARCHAR})
   	</if>
   	order by ao.serial_number desc
   	<if test="page_sql!=null">
@@ -320,6 +324,7 @@
   		count(1)
   	from achievement_order ao
   	left join achievement a on a.id = ao.achievement_id
+  	left join user_identity ui on ui.uid = ao.uid
   	left join organization_identity oi on oi.uid = ao.uid
   	where ao.deleted_sign = 0 
   	and   a.deleted_sign = 0 
@@ -334,7 +339,8 @@
   		and ao.uid = #{uid,jdbcType=VARCHAR}
   	</if>
   	<if test="unitName != null">
-  		and oi.unit_name = #{unitName,jdbcType=VARCHAR}
+  		and (oi.unit_name = #{unitName,jdbcType=VARCHAR}
+  		or ui.username = #{unitName,jdbcType=VARCHAR})
   	</if>
   </select>
 </mapper>

+ 8 - 12
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -487,11 +487,7 @@
 	where d.deleted_sign = 0 and d.data_category = 0 
 	<if test="adminId != null">
 		and (u.mid = #{adminId,jdbcType=VARCHAR}
-	</if>
-	<if test="adminId != null">
 		or  d.principal_id = #{adminId,jdbcType=VARCHAR}
-	</if>
-	<if test="adminId != null">
 		or  d.tech_broker_id = #{adminId,jdbcType=VARCHAR}
 		)
 	</if>
@@ -515,6 +511,7 @@
 	</if>
 	<if test="employerName != null">
 		and  d.employer_name like CONCAT('%',#{employerName,jdbcType=VARCHAR},'%')
+		and  d.employer_id is null
 	</if>
 	<if test="infoSources != null">
 		and  d.info_sources = #{infoSources,jdbcType=INTEGER}
@@ -558,11 +555,7 @@
 	where d.deleted_sign = 0 and d.data_category = 0 
 	<if test="adminId != null">
 		and (u.mid = #{adminId,jdbcType=VARCHAR}
-	</if>
-	<if test="adminId != null">
 		or  d.principal_id = #{adminId,jdbcType=VARCHAR}
-	</if>
-	<if test="adminId != null">
 		or  d.tech_broker_id = #{adminId,jdbcType=VARCHAR}
 		)
 	</if>
@@ -586,6 +579,7 @@
 	</if>
 	<if test="employerName != null">
 		and  d.employer_name like CONCAT('%',#{employerName,jdbcType=VARCHAR},'%')
+		and  d.employer_id is null
 	</if>
 	<if test="infoSources != null">
 		and  d.info_sources = #{infoSources,jdbcType=INTEGER}
@@ -659,6 +653,7 @@
 	</if>
 	<if test="employerName != null">
 		and  d.employer_name like CONCAT('%',#{employerName,jdbcType=VARCHAR},'%')
+		and  d.employer_id is null
 	</if>
 	<if test="infoSources != null">
 		and  d.info_sources = #{infoSources,jdbcType=INTEGER}
@@ -730,6 +725,7 @@
 	</if>
 	<if test="employerName != null">
 		and  d.employer_name like CONCAT('%',#{employerName,jdbcType=VARCHAR},'%')
+		and  d.employer_id is null
 	</if>
 	<if test="infoSources != null">
 		and  d.info_sources = #{infoSources,jdbcType=INTEGER}
@@ -1092,7 +1088,7 @@
 		u.lvl as level
 	FROM
 		demand d
-	LEFT JOIN <![CDATA[ user ]]> u on u.id = d.employer_id
+	LEFT JOIN `user` u on u.id = d.employer_id
 	LEFT JOIN user_identity ui on ui.uid = d.employer_id
 	LEFT JOIN district_glossory dg ON dg.id = ui.province
 	LEFT JOIN district_glossory dgg ON dgg.id = ui.city
@@ -1109,8 +1105,8 @@
 		d.name,
 		d.keyword,
 		d.industry_category_a AS industryCategoryA,
-		fg.name AS industryCategoryB,
-		fgg.name AS industryCategoryC,
+		fg.name AS industryCategoryAS,
+		fgg.name AS industryCategoryBS,
 		d.budget_cost AS budgetCost,
 		d.problem_des AS problemDes,
 		dg.name AS province,
@@ -1120,7 +1116,7 @@
 		u.lvl as level
 	FROM
 		demand d
-	LEFT JOIN <![CDATA[ user ]]> u on u.id = d.employer_id
+	LEFT JOIN `user` u on u.id = d.employer_id
 	LEFT JOIN organization_identity oi on oi.uid = d.employer_id
 	LEFT JOIN district_glossory dg ON dg.id = oi.licence_province
 	LEFT JOIN district_glossory dgg ON dgg.id = oi.licence_city

+ 19 - 13
src/main/java/com/goafanti/common/mapper/DemandOrderMapper.xml

@@ -244,10 +244,11 @@
   		do.intention_money as intentionMoney, do.contract_money as contractMoney, do.commission,
   		do.service_money as serviceMoney, d.name, d.serial_number as demandSerialNumber,
   		d.deleted_sign as deletedSign, d.audit_status as auditStatus,
-  		do.uid, ui.nickname as username
+  		do.uid, ui.username, oi.unit_name as unitName
   	from demand_order do
   	left join demand d on d.id = do.demand_id
-  	left join user ui on ui.id = do.uid
+  	left join user_identity ui on ui.uid = do.uid
+  	left join organization_identity oi on oi.uid = do.uid
   	where do.deleted_sign = 0 
   	and   d.deleted_sign = 0 
   	and   d.data_category = 0
@@ -261,7 +262,8 @@
   		and d.uid = #{uid,jdbcType=VARCHAR}
   	</if>
   	<if test="username != null">
-  		and ui.nickname = #{username,jdbcType=VARCHAR}
+  		and (oi.unit_name = #{username,jdbcType=VARCHAR}
+  		or ui.username = #{username,jdbcType=VARCHAR})
   	</if>
   	order by do.serial_number desc
   	<if test="page_sql!=null">
@@ -274,7 +276,8 @@
   		count(1)
   	from demand_order do
   	left join demand d on d.id = do.demand_id
-  	left join user ui on ui.id = do.uid
+  	left join user_identity ui on ui.uid = do.uid
+  	left join organization_identity oi on oi.uid = do.uid
   	where do.deleted_sign = 0 
   	and   d.deleted_sign = 0 
   	and   d.data_category = 0
@@ -288,7 +291,8 @@
   		and d.uid = #{uid,jdbcType=VARCHAR}
   	</if>
   	<if test="username != null">
-  		and ui.nickname = #{username,jdbcType=VARCHAR}
+  		and (oi.unit_name = #{username,jdbcType=VARCHAR}
+  		or ui.username = #{username,jdbcType=VARCHAR})
   	</if>
   </select>
   
@@ -300,10 +304,11 @@
   		do.intention_money as intentionMoney, do.contract_money as contractMoney, do.commission,
   		do.service_money as serviceMoney, d.name, d.serial_number as demandSerialNumber,
   		d.deleted_sign as deletedSign, d.audit_status as auditStatus,
-  		do.uid, oi.nickname as unitName
+  		do.uid, oi.unit_name as unitName, ui.username
   	from demand_order do
   	left join demand d on d.id = do.demand_id
-  	left join user oi on u.id = do.uid
+  	left join organization_identity oi on oi.uid = do.uid
+  	left join user_identity ui on ui.uid = do.uid
   	where do.deleted_sign = 0 
   	and   d.deleted_sign = 0 
   	and   d.data_category = 1
@@ -317,7 +322,8 @@
   		and d.uid = #{uid,jdbcType=VARCHAR}
   	</if>
   	<if test="unitName != null">
-  		and oi.nickname = #{unitName,jdbcType=VARCHAR}
+  		and (oi.unit_name = #{unitName,jdbcType=VARCHAR}
+  		or ui.username = #{unitName,jdbcType=VARCHAR})
   	</if>
   	order by do.serial_number desc
   	<if test="page_sql!=null">
@@ -330,7 +336,8 @@
   		count(1)
   	from demand_order do
   	left join demand d on d.id = do.demand_id
-  	left join user oi on oi.id = do.uid
+  	left join organization_identity oi on oi.uid = do.uid
+  	left join user_identity ui on ui.uid = do.uid
   	where do.deleted_sign = 0 
   	and   d.deleted_sign = 0 
   	and   d.data_category = 1
@@ -344,10 +351,9 @@
   		and d.uid = #{uid,jdbcType=VARCHAR}
   	</if>
     <if test="unitName != null">
-  		and oi.nickname = #{unitName,jdbcType=VARCHAR}
+  		and (oi.unit_name = #{unitName,jdbcType=VARCHAR}
+  		or ui.username = #{unitName,jdbcType=VARCHAR})
   	</if>
   </select>
-  
-  
-  
+
 </mapper>

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

@@ -33,7 +33,7 @@
   <insert id="insert" parameterType="com.goafanti.common.model.Lecture" >
     insert into lecture (id, uid, lecture_time, 
       create_time, last_update_time, name, 
-      summary, deleted_sign, lecture_url, hot, dynamic, end_time)
+      summary, deleted_sign, lecture_url, hot, dynamic, end_time,lecturer)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{lectureTime,jdbcType=TIMESTAMP}, 
       #{createTime,jdbcType=TIMESTAMP}, #{lastUpdateTime,jdbcType=TIMESTAMP}, #{name,jdbcType=VARCHAR}, 
       #{summary,jdbcType=VARCHAR}, #{deletedSign,jdbcType=INTEGER}, #{lectureUrl,jdbcType=VARCHAR},
@@ -79,7 +79,7 @@
         end_time,
       </if>
       <if test="lecturer != null" >
-        lecturer,
+        lecturer
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -120,7 +120,7 @@
         #{endTime,jdbcType=TIMESTAMP},
       </if>
       <if test="lecturer != null" >
-        #{lecturer,jdbcType=VARCHAR},
+        #{lecturer,jdbcType=VARCHAR}
       </if>
     </trim>
   </insert>
@@ -161,7 +161,7 @@
         end_time = #{endTime,jdbcType=TIMESTAMP},
       </if>
        <if test="lecturer != null" >
-        lecturer = #{lecturer,jdbcType=VARCHAR},
+        lecturer = #{lecturer,jdbcType=VARCHAR}
       </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}

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

@@ -332,7 +332,7 @@
 			on u.id = o.uid  AND o.audit_status = 5  
 			LEFT JOIN org_human_resource h on h.uid = u.id  AND h.year = #{0} AND h.deleted_sign = 0
 			LEFT JOIN org_finance f on f.uid = u.id  AND f.year = #{0}  AND f.deleted_sign = 0
-			LEFT JOIN org_cognizance c on c.uid = u.id  AND c.year = #{0} AND c.deleted_sign = 0
+			LEFT JOIN org_cognizance c on c.uid = u.id  AND c.year <![CDATA[ <= ]]> #{0} AND c.year <![CDATA[ > ]]> (#{0} - 3) AND c.deleted_sign = 0
 			LEFT JOIN org_ratepay r on r.uid = u.id  AND r.year = #{0} AND r.deleted_sign = 0
 			LEFT JOIN
 			     (SELECT uid,(operating_income + non_operating_income - non_taxable_income) as totalRevenue

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

@@ -367,12 +367,14 @@
     	u.create_time as createTime, 
   	    u.number , 
   	    a.name as adminName, 
+  	    ma.name as managerName, 
   	    u.type,
   	    i.username, 
   	    i.audit_status as userAuditStatus,
   	    i.aft_username as aftUsername
     from user u  
     LEFT JOIN admin a on a.id = u.aid 
+    LEFT JOIN admin ma on ma.id = u.mid 
 	LEFT JOIN user_identity i on u.id = i.uid
     where u.type = 0
     <if test="aid != null">
@@ -447,12 +449,14 @@
     	u.create_time as createTime, 
   	    u.number , 
   	    a.name as adminName, 
+  	    ma.name as managerName, 
   	    u.type,
   	    i.unit_name as unitName, 
   	    i.audit_status as orgAuditStatus,
   	    i.aft_username as aftUsername
     from user u  
     LEFT JOIN admin a on a.id = u.aid 
+    LEFT JOIN admin ma on ma.id = u.mid 
 	LEFT JOIN organization_identity i on u.id = i.uid
     where u.type = 1
     <if test="aid != null">

+ 10 - 0
src/main/java/com/goafanti/demand/bo/OrgDemandOrderListBo.java

@@ -4,6 +4,8 @@ public class OrgDemandOrderListBo extends DemandOrderListBo {
 	private String uid;
 	
 	private String unitName;
+	
+	private String username;
 
 	public String getUid() {
 		return uid;
@@ -20,6 +22,14 @@ public class OrgDemandOrderListBo extends DemandOrderListBo {
 	public void setUnitName(String unitName) {
 		this.unitName = unitName;
 	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
 	
 	
 

+ 10 - 0
src/main/java/com/goafanti/demand/bo/UserDemandOrderListBo.java

@@ -4,6 +4,8 @@ public class UserDemandOrderListBo extends DemandOrderListBo {
 	private String username;
 	
 	private String uid;
+	
+	private String unitName;
 
 	public String getUsername() {
 		return username;
@@ -20,6 +22,14 @@ public class UserDemandOrderListBo extends DemandOrderListBo {
 	public void setUid(String uid) {
 		this.uid = uid;
 	}
+
+	public String getUnitName() {
+		return unitName;
+	}
+
+	public void setUnitName(String unitName) {
+		this.unitName = unitName;
+	}
 	
 	
 

+ 0 - 6
src/main/java/com/goafanti/lecture/service/impl/LectureServiceImpl.java

@@ -171,10 +171,4 @@ public class LectureServiceImpl extends BaseMybatisDao<LectureMapper> implements
 		return lectureMapper.listDynamic();
 	}
 
-	
-
-	
-
-	
-
 }

+ 1 - 78
src/main/resources/props/config_local.properties

@@ -69,85 +69,8 @@ template.cacheable=false
 
 mobileCodeTemplate=SMS_37845022
 
-portal.host=//afts.hnzhiming.com/portal/1.0.5
+portal.host=//afts.hnzhiming.com/portal/1.0.7
 
 patentTemplate=SMS_72005286
 
-avatar.upload.host=//afts.hnzhiming.com/upload
-=======
-#Driver
-jdbc.driverClassName=com.mysql.jdbc.Driver
-#\u6570\u636e\u5e93\u94fe\u63a5\uff0c
-jdbc.url=jdbc:mysql://127.0.0.1:3306/aft_dev?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#\u5e10\u53f7
-jdbc.username=root
-#\u5bc6\u7801
-jdbc.password=123456
-#\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
-
-logging.level.com.goafanti=DEBUG
-
-jedis.host=127.0.0.1
-jedis.port=6379
-jedis.timeout=5000
-jedis.password=123456
-
-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.38
-
-upload.path=/Users/xiaolong/Sites/upload
-upload.private.path=/Users/xiaolong/Sites/doc
-
-accessKey=LTAIqTgQLLwz252Z
-accessSecret=ICGuiUnqzaar7urw4zecVcJrJ1MHg9
-
-avatar.host=//afts.hnzhiming.com
-
-aesSecretKey=aft1234567890123
-
-template.cacheable=false
-
-mobileCodeTemplate=SMS_37845022
-
-portal.host=//afts.hnzhiming.com/portal/1.0.6
-
-patentTemplate=SMS_72005286
-
 avatar.upload.host=//afts.hnzhiming.com/upload

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -53,7 +53,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//aftts.hnzhiming.com/1.0.38
+static.host=//aftts.hnzhiming.com/1.0.35
 
 upload.path=/data/aft/public/upload
 upload.private.path=/data/aft/private/upload

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/activity/details.html

@@ -87,7 +87,7 @@
 					</li>
 				</ul>
 				<div class="activity_apply">
-					<a href="#" class="apply customer-service">立即报名</a> 
+					<a href="#" id="signUp" class="apply customer-service">立即报名</a> 
 					<!-- <a href="#" class="recommend">邀请朋友报名</a> -->
 				</div>
 			</div>

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/scienceTechnology/bigShot.html

@@ -113,7 +113,7 @@
 					<div class="lecture_content_info">
 						<h5 th:text="${lecture.name}" th:title="${lecture.name}"></h5>
 						<p class="mt20" th:text="${lecture.lectureTimeFormattedDate}" th:title="${lecture.lectureTimeFormattedDate}"></p>
-						<a href="#" class="customer-service" th:text="${lecture.lectureStatus} == 0 ? '报名中' : '已结束'">报名中</a>
+						<a href="javascript:;" th:class="${lecture.lectureStatus} == 0 ?'customer-service':'disable'" th:text="${lecture.lectureStatus} == 0 ? '报名中' : '已结束'">报名中</a>
 					</div>
 				</li>
 			</ul>