Просмотр исходного кода

Merge branch 'test' of jishutao/jitao-server into prod

anderx лет назад: 5
Родитель
Сommit
890696a2d2

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

@@ -20,7 +20,6 @@ import org.springframework.web.servlet.ModelAndView;
 
 import com.goafanti.achievement.service.AchievementInterestService;
 import com.goafanti.achievement.service.AchievementService;
-import com.goafanti.admin.bo.AdminVideoBo;
 import com.goafanti.admin.service.AdminVideoService;
 import com.goafanti.app.bo.ExpertsListBo;
 import com.goafanti.banners.service.BannersService;
@@ -60,7 +59,6 @@ import com.goafanti.news.service.NewsService;
 import com.goafanti.news.service.PolicyService;
 import com.goafanti.portal.bo.AchievementObject;
 import com.goafanti.user.bo.OrgIdentityBo;
-import com.goafanti.user.bo.UserIdentityBo;
 import com.goafanti.user.service.OrganizationIdentityService;
 import com.goafanti.user.service.UserIdentityService;
 import com.goafanti.user.service.UserService;
@@ -354,7 +352,6 @@ public class WebpageController extends BaseController {
 	/**
 	 * 服务汇
 	 */
-	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/portal/service/serviceIndex", method = RequestMethod.GET)
 	public ModelAndView portalServiceServiceIndex(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/portal/service/services");

+ 4 - 5
src/main/java/com/goafanti/core/shiro/token/UserRealm.java

@@ -52,7 +52,6 @@ public class UserRealm extends AuthorizingRealm {
 	 */
 	protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authcToken)
 			throws AuthenticationException {
-		System.out.println("进入登陆授权");
 		ShiroToken token = (ShiroToken) authcToken;
 		if (null == token.getType()) {
 			Admin admin = adminService.selectByMobile(token.getUsername(),"超级管理员");
@@ -86,13 +85,13 @@ public class UserRealm extends AuthorizingRealm {
 	 */
 	@Override
 	protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
-		System.out.println("进入角色授权");
-		int type=TokenManager.getUserType();
-		System.out.println(type);
+		Integer type=TokenManager.getUserType();
+//		Admin a =TokenManager.getAdminToken();
+//		Integer type=a.getType();
 		String userId = TokenManager.getAdminId();
 		SimpleAuthorizationInfo info = new SimpleAuthorizationInfo();
 		// 根据用户ID查询角色(role),放入到Authorization里。
-		if (type==3) {
+		if (type!= null && type==3) {
 			Set<String> roles = skjtUserMapper.findRoleByUserId(userId);
 			info.setRoles(roles);
 			// 根据用户ID查询权限(permission),放入到Authorization里。

+ 6 - 6
src/main/java/com/goafanti/demandCollection/bo/OutDemandCollection.java

@@ -744,7 +744,7 @@ public class OutDemandCollection {
 	}
 
 	public String getNcqcgzyzhfszzzh() {
-		if (ncqcgzyzhfszzzh != null) {
+		if (ncqcgzyzhfszzzh != null  &&ncqcgzyzhfszzzh !="") {
 			String str = ncqcgzyzhfszzzh;
 			String str2 = "";
 			String s[] = str.split(",");
@@ -771,7 +771,7 @@ public class OutDemandCollection {
 	}
 
 	public String getNcqcgzyzhfshzkf() {
-		if (ncqcgzyzhfshzkf != null) {
+		if (ncqcgzyzhfshzkf != null &&ncqcgzyzhfshzkf !="") {
 			String str = ncqcgzyzhfshzkf;
 			String str2 = "";
 			String s[] = str.split(",");
@@ -796,7 +796,7 @@ public class OutDemandCollection {
 	}
 
 	public String getNcqcgzyzhfsjszr() {
-		if (ncqcgzyzhfsjszr != null) {
+		if (ncqcgzyzhfsjszr != null  &&ncqcgzyzhfsjszr !="") {
 			String str = ncqcgzyzhfsjszr;
 			String str2 = "";
 			String s[] = str.split(",");
@@ -1314,7 +1314,7 @@ public class OutDemandCollection {
 		this.yysjjysptValue = yysjjysptValue;
 	}
 	public String getSqskjzgbmxxdwgkfb() {
-		if (sqskjzgbmxxdwgkfb != null) {
+		if (sqskjzgbmxxdwgkfb != null &&sqskjzgbmxxdwgkfb !="") {
 			String str = sqskjzgbmxxdwgkfb;
 			String str2 = "";
 			String s[] = str.split(",");
@@ -1327,7 +1327,7 @@ public class OutDemandCollection {
 				else if (string.equals("2"))
 					str2 = str2 + "同意授权公开成果信息,";
 				else if (string.equals("3"))
-					str2 = str2 + "同意授权公开需求信息,";
+					str2 = str2 + "同意授权公开需求信息,";
 				else if (string.equals("4"))
 					str2 = str2 + "不同意授权,";
 				
@@ -1367,7 +1367,7 @@ public class OutDemandCollection {
 	}
 
 	public String getZyhzfs() {
-		if (zyhzfs != null) {
+		if (zyhzfs != null &&zyhzfs != "") {
 			String str = zyhzfs;
 			String str2 = "";
 			String s[] = str.split(",");

+ 3 - 2
src/main/java/com/goafanti/demandCollection/service/impl/DemandCollectionServiceImpl.java

@@ -262,8 +262,8 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
 			 out.flush();
 			 out.close();
 		} catch (Exception e) {
-			
-			throw new BusinessException(new Error("表格生成错误。"));
+			e.printStackTrace();
+			throw new BusinessException(new Error("表格生成错误。"),e);
 		}finally {
 			out.flush(); 
 			 out.close(); 
@@ -304,6 +304,7 @@ public class DemandCollectionServiceImpl extends BaseMybatisDao<DemandCollection
 				return 1;
 			}
 		}
+		
 		return 0;
 	}
 }

+ 3 - 4
src/main/resources/props/config_local.properties

@@ -3,7 +3,7 @@ jdbc.driverClassName=com.mysql.jdbc.Driver
 #jdbc.url=jdbc:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.username=dev
 #jdbc.password=123456
-jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft20200901?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 jdbc.username=root
 jdbc.password=aftdev
 jdbc.validationQuery=SELECT 'x'
@@ -40,9 +40,8 @@ template.cacheable=false
 
 static.host=//ss.jishutao.com/client/1.2.5
 portal.host=//ss.jishutao.com/portal/1.2.5
-skjt.host=//statics.jishutao.com/skjt
-skjt.userName=admin
-skjt.password=asd123..
+skjt.host=//statics.jishutao.com/skjt/1.3
+
 #本地
 #static.host=//sclient.jishutao.com:8088/client/1.0.2
 #portal.host=//sportal.jishutao.com:80/portal/1.0.2

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

@@ -1,7 +1,7 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #\u6570\u636e\u5e93\u94fe\u63a5\uff0c
-jdbc.url=jdbc:mysql://127.0.0.1:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.url=jdbc:mysql://127.0.0.1:3306/aft20200901?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #\u5e10\u53f7
 jdbc.username=root
 #\u5bc6\u7801

+ 19 - 18
src/main/webapp/WEB-INF/views/common.html

@@ -316,27 +316,28 @@
 					</div>
 					<div class="text_bottom">
 						<p>友情链接</p>
-						<a href="http://www.hnst.gov.cn/" target="_blank">湖南省科技厅/</a>
-						<a href="http://www.cssti.cn/" target="_blank">长沙市科技局/</a>
-						<a href="http://www.cast.org.cn/" target="_blank">中国科学技术协会/</a>
+						<a href="http://www.chinaconsult.org.cn/" target="_blank">中国科协/</a>
+						<a href="http://kjt.hunan.gov.cn/" target="_blank">湖南省科技厅/</a>
+						<a href="http://kjj.changsha.gov.cn/" target="_blank">长沙市科技局/</a>
+						<a href=" https://www.cast.org.cn/" target="_blank">中国科学技术协会/</a>
 						<a href="http://www.chinatorch.gov.cn/" target="_blank">科技部火炬中心/</a>
-						<a href="http://www.nosta.gov.cn/web/index.aspx" target="_blank">国家科技成果奖励办/</a>
-						<a href="http://www.nast.org.cn/" target="_blank">国家科技成果网/</a>
-						<a href="http://www.hnast.org.cn/portal/comm/index.action" target="_blank">湖南省科学技术协会/</a>
-						<a href="http://www.hncgw.gov.cn/" target="_blank">湖南省科技成果转化公共服务平台/</a>
-						<a href="http://www.hnjxw.gov.cn/" target="_blank">湖南省经济信息化委员会/</a>
-						<a href="http://kyy.hnu.cn/" target="_blank">湖南大学科学技术研究院/</a>
-						<a href="http://www.gxst.gov.cn/gxkjt/" target="_blank">广西省科技厅/</a>
-						<a href="http://www.nmkjt.gov.cn/" target="_blank">内蒙古自治区科技厅/</a>
-						<a href="http://www.cshtz.gov.cn/" target="_blank">长沙市高新区管委会/</a>
+						<a href="http://www.nosta.gov.cn/" target="_blank">国家科技成果奖励办/</a>
+						<a href="https://www.tech110.net/" target="_blank">国家科技成果网/</a>
+						<a href="http://www.hnast.org.cn/" target="_blank">湖南省科学技术协会/</a>
+						<!-- <a href="http://www.hncgw.gov.cn/" target="_blank">湖南省科技成果转化公共服务平台/</a> -->
+						<a href="http://gxt.hunan.gov.cn/" target="_blank">湖南工业和信息化厅/</a>
+						<a href="http://kyy.hnu.edu.cn/" target="_blank">湖南大学科学技术研究院/</a>
+						<a href="http://kjt.gxzf.gov.cn/" target="_blank">广西省科技厅/</a>
+						<a href="http://kjt.nmg.gov.cn/" target="_blank">内蒙古自治区科技厅/</a>
+						<!-- <a href="http://www.cshtz.gov.cn/" target="_blank">长沙市高新区管委会/</a> -->
 						<a href="http://www.jxas.ac.cn/" target="_blank">江西省科学院/</a>
-						<a href="http://www.cnic.cn/front/index.html#/cnicSite/home" target="_blank">中科院计算机网络信息中心/</a>
+						<a href="http://www.devent.cn/" target="_blank">中科院计算机网络信息中心/</a>
 						<!-- <a href="http://kxyjb.csu.edu.cn/" target="_blank">中南大学科学研究部/</a> -->
-						<a href="http://www.cast.org.cn/" target="_blank">中国科协创新创业服务中心/</a>
-						<a href="http://www.hbstd.gov.cn/" target="_blank">湖北省科技厅/</a>
-						<a href="http://www.gdstc.gov.cn/" target="_blank">广东省科技厅/</a>
-						<a href="http://www.hnkjt.gov.cn/" target="_blank">河南省科技厅/</a>
-						<a href="http://www.cbtm.gov.cn/" target="_blank">技术合同登记官网</a>
+						<a href="https://www.cast.org.cn/col/col404/" target="_blank">中国科协创新创业服务中心/</a>
+						<a href="http://kjt.hubei.gov.cn" target="_blank">湖北省科技厅/</a>
+						<a href="http://gdstc.gd.gov.cn/" target="_blank">广东省科技厅/</a>
+						<a href="http://kjt.henan.gov.cn/" target="_blank">河南省科技厅/</a>
+						<a href="http://www.ctmht.net.cn/" target="_blank">技术合同登记官网</a>
 					</div>
 				</div>
 			</div>