Quellcode durchsuchen

Accept Merge Request #266 更新生产 : (test -> prod)

Merge Request: 更新生产
Created By: @浅川
Accepted By: @浅川
URL: https://coding.net/t/aft/p/AFT/git/merge/266
浅川 vor 8 Jahren
Ursprung
Commit
55b7c1e94f

+ 0 - 2
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -16,7 +16,6 @@ import com.goafanti.achievement.bo.AchievementPartnerListBo;
 import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.banners.enums.BannersType;
 import com.goafanti.banners.service.BannersService;
-import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.enums.AchievementMaturity;
 import com.goafanti.common.enums.MarketingPage;
 import com.goafanti.common.enums.UserType;
@@ -26,7 +25,6 @@ import com.goafanti.dataGlossory.service.DistrictGlossoryService;
 import com.goafanti.demand.service.DemandService;
 import com.goafanti.marketing.bo.MarketingManagementBo;
 import com.goafanti.marketing.service.MarketingManagementService;
-import com.goafanti.portal.bo.InternationalListBo;
 import com.goafanti.user.bo.UserPartnerDetailBo;
 import com.goafanti.user.service.OrganizationIdentityService;
 import com.goafanti.user.service.UserIdentityService;

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

@@ -17,7 +17,6 @@ import com.goafanti.customer.bo.CustomerOrganizationDetailBo;
 import com.goafanti.customer.bo.CustomerPersonalDetailBo;
 import com.goafanti.customer.bo.CustomerSimpleBo;
 import com.goafanti.customer.bo.FollowBusinessBo;
-import com.goafanti.customer.bo.StatisticBo;
 
 public interface UserMapper {
 	/**

+ 88 - 81
src/main/java/com/goafanti/common/error/SystemExceptionResolver.java

@@ -1,81 +1,88 @@
-package com.goafanti.common.error;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.support.ResourcePropertySource;
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.handler.SimpleMappingExceptionResolver;
-
-import com.goafanti.common.bo.Error;
-import com.goafanti.common.bo.Result;
-import com.goafanti.common.utils.LoggerUtils;
-import com.goafanti.common.utils.StringUtils;
-import com.goafanti.core.shiro.filter.ShiroFilterUtils;
-
-public class SystemExceptionResolver extends SimpleMappingExceptionResolver {
-	@Resource(name = "errorResource")
-	private ResourcePropertySource	errorResource;
-
-	@Autowired
-	private ShiroFilterUtils		shiroFilterUtils;
-
-	@Override
-	protected ModelAndView doResolveException(HttpServletRequest request, HttpServletResponse response, Object handler,
-			Exception ex) {
-		// Expose ModelAndView for chosen error view.
-		String viewName = determineViewName(ex, request);
-
-		ex = handleErrorMessage(ex);
-
-		if (viewName != null) {
-			if (!shiroFilterUtils.isAjax(request)) {// JSP
-				// Apply HTTP status code for error views, if specified.
-				// Only apply it if we're processing a top-level request.
-				Integer statusCode = determineStatusCode(request, viewName);
-				if (statusCode != null) {
-					applyStatusCodeIfPossible(request, response, statusCode);
-				}
-				return getModelAndView(viewName, ex, request);
-			} else {// JSON
-				Result res = new Result();
-				res.getError().add(new Error(viewName, ex.getMessage()));
-				shiroFilterUtils.out(response, res);
-				return null;
-			}
-		} else {
-			return null;
-		}
-	}
-
-	private Exception handleErrorMessage(Exception ex) {
-		Error error = null;
-		if (ex instanceof BusinessException) {
-			BusinessException bex = (BusinessException) ex;
-			error = new Error(bex.getCode(), bex.getField(), (String) errorResource.getProperty(bex.getCode()));
-		} else if (ex instanceof IllegalArgumentException) {
-			Object message = errorResource.getProperty(ex.getMessage());
-			if (message == null) {
-				message = errorResource.getProperty(ex.getClass().getName());
-			}
-			error = new Error((String) message);
-		} else {
-			error = new Error((String) errorResource.getProperty(ex.getClass().getName()));
-			LoggerUtils.fmtError(getClass(), ex, "系统异常。");
-		}
-		if (StringUtils.isEmpty(error.getMessage())) {
-			error.setMessage("系统异常,请联系管理员。");
-		}
-		return new BusinessException(error, ex.getCause());
-	}
-
-	/**
-	 * @param errorResource
-	 *            the errorResource to set
-	 */
-	public void setErrorResource(ResourcePropertySource errorResource) {
-		this.errorResource = errorResource;
-	}
-}
+package com.goafanti.common.error;
+
+import java.text.MessageFormat;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.support.ResourcePropertySource;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.handler.SimpleMappingExceptionResolver;
+
+import com.goafanti.common.bo.Error;
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.utils.LoggerUtils;
+import com.goafanti.common.utils.StringUtils;
+import com.goafanti.core.shiro.filter.ShiroFilterUtils;
+
+public class SystemExceptionResolver extends SimpleMappingExceptionResolver {
+	@Resource(name = "errorResource")
+	private ResourcePropertySource	errorResource;
+
+	@Autowired
+	private ShiroFilterUtils		shiroFilterUtils;
+
+	@Override
+	protected ModelAndView doResolveException(HttpServletRequest request, HttpServletResponse response, Object handler,
+			Exception ex) {
+		// Expose ModelAndView for chosen error view.
+		String viewName = determineViewName(ex, request);
+
+		ex = handleErrorMessage(ex);
+
+		if (viewName != null) {
+			if (!shiroFilterUtils.isAjax(request)) {// JSP
+				// Apply HTTP status code for error views, if specified.
+				// Only apply it if we're processing a top-level request.
+				Integer statusCode = determineStatusCode(request, viewName);
+				if (statusCode != null) {
+					applyStatusCodeIfPossible(request, response, statusCode);
+				}
+				return getModelAndView(viewName, ex, request);
+			} else {// JSON
+				Result res = new Result();
+				res.getError().add(new Error(viewName,ex.getMessage())); 
+				shiroFilterUtils.out(response, res);
+				return null;
+			}
+		} else {
+			return null;
+		}
+	}
+
+	private Exception handleErrorMessage(Exception ex) {
+		Error error = null;
+		if (ex instanceof BusinessException) {
+			BusinessException bex = (BusinessException) ex;
+			String message = (String)errorResource.getProperty(bex.getCode());
+			if(StringUtils.isEmpty(message)){
+				error = new Error(bex.getCode(),bex.getMessage());
+			}else{
+				error = new Error(bex.getCode(), MessageFormat.format(message, bex.getField()));
+			}
+		} else if (ex instanceof IllegalArgumentException) {
+			Object message = errorResource.getProperty(ex.getMessage());
+			if (message == null) {
+				message = errorResource.getProperty(ex.getClass().getName());
+			}
+			error = new Error((String) message);
+		} else {
+			error = new Error((String) errorResource.getProperty(ex.getClass().getName()));
+			LoggerUtils.fmtError(getClass(), ex, "系统异常。");
+		}
+		if (StringUtils.isEmpty(error.getMessage())) {
+			error.setMessage("系统异常,请联系管理员。");
+		}
+		return new BusinessException(error, ex.getCause());
+	}
+
+	/**
+	 * @param errorResource
+	 *            the errorResource to set
+	 */
+	public void setErrorResource(ResourcePropertySource errorResource) {
+		this.errorResource = errorResource;
+	}
+}

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

@@ -32,7 +32,7 @@
   <insert id="insert" parameterType="com.goafanti.common.model.Admin" >
     insert into admin (id, mobile, name, 
       password, email, create_time, 
-      number, province, position, superior_id, city)
+      number, province, position, superior_id, city,department_id)
     values (#{id,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
       #{password,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{number,jdbcType=INTEGER}, #{province,jdbcType=INTEGER}, #{position,jdbcType=VARCHAR},
@@ -169,7 +169,7 @@
       position = #{position,jdbcType=VARCHAR},
       superior_id = #{superiorId,jdbcType=VARCHAR},
       city = #{city,jdbcType=INTEGER},
-      department_id = #{departmentId,jdbcType=VARCHAR},
+      department_id = #{departmentId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   

+ 10 - 0
src/main/java/com/goafanti/common/model/MemberOrder.java

@@ -464,4 +464,14 @@ public class MemberOrder {
     public void setPayState(Integer payState) {
         this.payState = payState;
     }
+    
+    private String gradeName;
+
+	public String getGradeName() {
+		return gradeName;
+	}
+
+	public void setGradeName(String gradeName) {
+		this.gradeName = gradeName;
+	}
 }

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

@@ -1,6 +1,5 @@
 package com.goafanti.user.service;
 
-import java.text.ParseException;
 import java.util.List;
 import java.util.Map;
 
@@ -11,7 +10,6 @@ import com.goafanti.user.bo.OrgUnitNames;
 import com.goafanti.user.bo.StarAndExpertListBo;
 import com.goafanti.user.bo.StarListBo;
 import com.goafanti.user.bo.UserDownLoadBo;
-import com.goafanti.user.bo.UserListBo;
 import com.goafanti.user.bo.UserNames;
 import com.goafanti.user.bo.UserPageHomeBo;
 import com.goafanti.user.bo.UserPartnerDetailBo;

+ 0 - 5
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

@@ -1,7 +1,6 @@
 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;
@@ -13,7 +12,6 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.AdminLocationMapper;
 import com.goafanti.common.dao.CopyrightInfoMapper;
 import com.goafanti.common.dao.OrgIntellectualPropertyMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
@@ -35,7 +33,6 @@ import com.goafanti.user.bo.OrgUnitNames;
 import com.goafanti.user.bo.StarAndExpertListBo;
 import com.goafanti.user.bo.StarListBo;
 import com.goafanti.user.bo.UserDownLoadBo;
-import com.goafanti.user.bo.UserListBo;
 import com.goafanti.user.bo.UserNames;
 import com.goafanti.user.bo.UserPageHomeBo;
 import com.goafanti.user.bo.UserPartnerDetailBo;
@@ -50,8 +47,6 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 	@Autowired
 	private UserIdentityMapper				userIdentityMapper;
 	@Autowired
-	private AdminLocationMapper				adminLocationMapper;
-	@Autowired
 	private PatentInfoMapper				patentInfoMapper;
 	@Autowired
 	private CopyrightInfoMapper				copyrightInfoMapper;

+ 3 - 3
src/main/webapp/WEB-INF/views/portal/financial/index.html

@@ -125,21 +125,21 @@
 		<div id="info">
 			<div class="info">
 				<div>
-					<img th:src="${avatarUploadHost + '/default/inverDatails1.jpg'}" alt="" />
+					<img th:src="${portalHost + '/img/inverDatails1.jpg'}" alt="" />
 					<h3>高新创投</h3>
 					<p>湖南高新创业投资集团有限公司(简称:高新创投)成立于2007年9月,系省委、省政府批准设立的全省唯一的省级国有创投机构,
 					是为创新财政投入方式、推进战略新兴产业和高新技术产业发展而打造的政府性投融资平台。</p>
 					<div><a th:href="${basePath + '/portal/financial/investmentDetail.html?organizationId=bc1c9b64-a285-47ca-b783-db7dfdde4b93'}">MORE+</a></div>
 				</div>
 				<div>
-					<img th:src="${avatarUploadHost + '/default/inverDatails2.jpg'}" alt="" />
+					<img th:src="${portalHost + '/img/inverDatails2.jpg'}" alt="" />
 					<h3>北极光</h3>
 					<p>北极光创投基金成立于2004年,资本来源于公益金、基金会、养老基金、联合基金,以及美国、欧洲和亚洲的个体投资人。
 					基金将集中投资于与TMT领域(通讯、新媒体、高科技)相关的、具有中国战略的企业。</p>
 					<div><a th:href="${basePath + '/portal/financial/investmentDetail.html?organizationId=3443f6eb-c077-453e-b542-9215f97b61ea'}">MORE+</a></div>
 				</div>
 				<div>
-					<img th:src="${avatarUploadHost + '/default/inverDatails3.jpg'}" alt="" />
+					<img th:src="${portalHost + '/img/inverDatails3.jpg'}" alt="" />
 					<h3>华兴资本</h3>
 					<p>华兴资本于2004年在北京成立,是中国领先的专注于为快速成长的中国创业型企业家提供顶级财务顾问服务的投资银行。
 					公司关注的行业包括:高科技、媒体、电信、医疗和消费品等行业。</p>

+ 2 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/assessMent.html

@@ -136,8 +136,9 @@
   				</div>
   			</div>
   		</div>
+  		<input type="hidden" th:isLogin="${!isLogin}" id="isLogin" />
   		<div class="process_btn">
-  			<a href="javascript:;" onclick="_MEIQIA('showPanel')">立即评估</a>
+  			<a>立即评估</a>
   			<a href="javascript:;" onclick="_MEIQIA('showPanel')">在线咨询</a>
   		</div>
   	</div>