anderx 5 年之前
父节点
当前提交
bb591f2053

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

@@ -808,6 +808,12 @@ public class WebpageController extends BaseController {
 		return modelview;
 	}
 
+	
+	@RequestMapping(value = "/")
+	public ModelAndView defalt(HttpServletRequest request, ModelAndView modelview) {
+		return mainIndex(request,  modelview);
+	}
+	
 	/*
 	 * 首页
 	 * 

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

@@ -38,8 +38,8 @@ app.name=AFT
 app.mobile.website=http://m.jishutao.com/1.0/template/index.html
 template.cacheable=false
 
-static.host=//statics.jishutao.com/client/1.2.7
-portal.host=//statics.jishutao.com/portal/1.2.8
+static.host=//aft-js.jishutao.com/client/1.0.0
+portal.host=//aft-js.jishutao.com/portal/1.0.0
 skjt.host=//statics.jishutao.com/skjt/1.3
 
 #本地

+ 5 - 5
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/aft_aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #\u5e10\u53f7
 jdbc.username=root
 #\u5bc6\u7801
@@ -56,8 +56,8 @@ app.name=AFT
 app.mobile.website=http://muat.jishutao.com
 template.cacheable=false
 
-static.host=//statics.jishutao.com/client/1.2.7
-portal.host=//statics.jishutao.com/portal/1.2.8
+static.host=//aft-js.jishutao.com/client/1.0.0
+portal.host=//aft-js.jishutao.com/portal/1.0.0
 skjt.host=//statics.jishutao.com/skjt/1.3
 skjt.userName=admin
 skjt.password=asd123..
@@ -65,8 +65,8 @@ skjt.password=asd123..
 avatar.host=//statics.jishutao.com
 avatar.upload.host=//statics.jishutao.com/upload
 
-upload.path=/data/statics/public/upload
-upload.private.path=/data/statics/private/upload
+upload.path=/data/static-aft/public/upload
+upload.private.path=/data/static-aft/private/upload
 
 accessKey=LTAIqTgQLLwz252Z
 accessSecret=ICGuiUnqzaar7urw4zecVcJrJ1MHg9

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

@@ -1,6 +1,6 @@
 [base_auth]
-/=device
-/index=anon
+/=anon
+/portal/index=anon
 /login=anon
 /user/login.html=anon
 /user/login=anon

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

@@ -141,9 +141,9 @@
 
 	<bean id="shiroFilter" class="org.apache.shiro.spring.web.ShiroFilterFactoryBean">
 		<property name="securityManager" ref="securityManager" />
-		<property name="loginUrl" value="/user/login" />
+		<property name="loginUrl" value="/portal/index" />
 		<property name="successUrl" value="/" />
-		<property name="unauthorizedUrl" value="/user/login" />
+		<property name="unauthorizedUrl" value="/portal/index" />
 		<property name="filterChainDefinitions" value="#{shiroManager.loadFilterChainDefinitions()}" />
 		<property name="filters">
 			<util:map>

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

@@ -7,8 +7,8 @@
   <meta charset="UTF-8">
   <link rel="shortcut icon " type="images/x-icon" th:href="${portalHost+ '/img/ico_logo.png'}">
   <meta name="Keywords" content="高新技术企业认定_双软评估_军工认证_知识产权贯标_知识产权转移_科德"/>
-  <meta name="Description" content="科德信息咨询有限公司17年来专注于国家高新技术企业认定,知识产权贯标,知识产权转移,双软评估,
-	体系认证,专利申请,军工三证,工程技术研究中心,创新小巨人等湖南省市科技项目申报、成果转化的信息咨询旗舰企业,获得政府部门权威认证的咨询服务机构."/>
+  <meta name="Description" content="阿凡提信息科技(湖南)股份有限公司,创建于2008年,是一家专业从事企业知识产权竞争情报分析、战略策划和技术转移及交易的服务机构。
+  		公司与中国科技咨询协会、湖南省咨询业协会、中华全国工商业联合会、长江中游城市群科技成果转化促进联盟理事长(发起)单位等均建立了长期的战略合作关系。"/>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <th:block th:replace="${link}" />