Browse Source

Accept Merge Request #189 mg : (test -> master)

Merge Request: mg
Created By: @Antiloveg
Accepted By: @Antiloveg
URL: https://coding.net/t/aft/p/AFT/git/merge/189
Antiloveg 8 years ago
parent
commit
b7432bf6d5

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

@@ -89,8 +89,8 @@ public class WebpageController extends BaseController {
 	}
 
 	@RequestMapping(value = "/user/subscriberDetail", method = RequestMethod.GET)
-	public ModelAndView userSubscriberDetail(HttpServletRequest request, ModelAndView modelview) {
-		return userLogin(request, modelview, "/user/subscriberDetail");
+	public String userSubscriberDetail(HttpServletRequest request, ModelAndView modelview) {
+		return "/user/subscriberDetail";
 	}
 
 	@RequestMapping(value = "/user/account/services", method = RequestMethod.GET)

+ 3 - 0
src/main/resources/shiro_base_auth.ini

@@ -2,6 +2,8 @@
 /=anon
 /index=anon
 /login=anon
+/user/subscriberDetail=anon
+/user/subscriberDetail.html=anon
 /user/login.html=anon
 /user/login=anon
 /user/signIn.html=anon
@@ -16,6 +18,7 @@
 /static/**=anon
 /portal/**=anon
 /api/admin/**=admin,permission
+/api/user/partner/**=anon
 /api/user/**=login
 /admin/servicesManage/**=admin
 /admin/**=admin,permission

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

@@ -49,7 +49,7 @@
 			<li class="home"><a th:href="${basePath + '/portal/index.html'}">首页</a></li>
 			<li th:classappend="${mainM=='tech'}? 'active'">
 				<!-- <a th:href="${basePath + '/portal/technologyTrading/index.html'}">技术交易</a> -->
-				<a th:href="${basePath + '/portal/search/achievement.html'}">技术交易</a>
+				<a th:href="${basePath + '/portal/technologyTrading/index.html'}">技术交易</a>
 				<ul class="secondary_navigation_nav" th:style="${'width:'+(4*75)+'px;left:-'+(4*75/2-74.25/2)+'px;'}">
 					<li th:classappend="${subM=='demand'}? 'active'"><a th:href="${basePath + '/portal/search/demand.html'}">需求谷</a></li>
 					<li th:classappend="${subM=='tech'}? 'active'"><a th:href="${basePath + '/portal/search/achievement.html'}">技术海</a></li>

File diff suppressed because it is too large
+ 2 - 2
src/main/webapp/WEB-INF/views/portal/index.html


File diff suppressed because it is too large
+ 0 - 248
src/main/webapp/WEB-INF/views/portal/technologyTrading/index.html