diff --git a/tamguo/src/main/java/com/tamguo/web/PaperController.java b/tamguo/src/main/java/com/tamguo/web/PaperController.java
index 8460d93..a27afc0 100644
--- a/tamguo/src/main/java/com/tamguo/web/PaperController.java
+++ b/tamguo/src/main/java/com/tamguo/web/PaperController.java
@@ -63,7 +63,7 @@ public class PaperController {
     	model.addObject("areaList", areaList);
     	model.addObject("paperPage" , page);
     	model.addObject("total" , total);
-    	model.addObject("courseId", courseId);
+    	model.addObject("courseId", course.getUid());
     	model.addObject("paperType", paperType);
     	model.addObject("year", year);
     	model.addObject("area", area);
diff --git a/tamguo/src/main/resources/templates/chapter.html b/tamguo/src/main/resources/templates/chapter.html
index e25c50c..c2442a0 100644
--- a/tamguo/src/main/resources/templates/chapter.html
+++ b/tamguo/src/main/resources/templates/chapter.html
@@ -96,7 +96,7 @@
         <div class="detail-chapter-title dct-0" id="dct-0">
             <h3 th:text="${c.name}">第一章 集合与常用逻辑用语</h3>
             
-            <a target="_blank" class="fifteen" th:href="${setting.domain + 'question/' + subjectId +'/'+ course.uid + '/' +c.uid +'/'+c.uid+'-1-15.html'}">随机来
+            <a target="_blank" class="fifteen" th:href="${setting.domain + 'questionlist/' + c.uid+'-1-15.html'}">随机来
                 
                     15
                 
@@ -113,7 +113,7 @@
                 <h4 th:text="${cc.name}">1 集合的概念及运算</h4>
                 <span>1181 试题</span>
                 
-                    <a target="_blank" class="ten" th:href="${setting.domain + 'question/' + subjectId +'/'+ course.uid + '/' +c.uid +'/'+cc.uid+'-1-15.html'}">随机来
+                    <a target="_blank" class="ten" th:href="${setting.domain + 'questionlist/' + cc.uid+'-1-15.html'}">随机来
                         
                             10
                         
diff --git a/tamguo/src/main/resources/templates/subject.html b/tamguo/src/main/resources/templates/subject.html
index 02e7387..86bb86f 100644
--- a/tamguo/src/main/resources/templates/subject.html
+++ b/tamguo/src/main/resources/templates/subject.html
@@ -86,7 +86,7 @@
 				        		</div>
 				        		<p class="box-content">串考点<span class="box-content-icon iconfont icon-right"></span></p>
 				        	</a>
-				        	<a class="withyou-box withyou-box-paper log-withyou-box " th:href="${setting.domain + 'paperlist/' + subject.uid + '/'+course.uid+'-'+setting.PAPER_TYPE_ZHENTI+'-0-0-1.html'}" data-info="zhenti">
+				        	<a class="withyou-box withyou-box-paper log-withyou-box " th:href="${setting.domain + 'paperlist/' + subject.uid + '-'+course.uid+'-'+setting.PAPER_TYPE_ZHENTI+'-0-0-1.html'}" data-info="zhenti">
 				        		<div class="withyou-box-mod-triangle">
 				        			<div class="triangle-border"></div>
 				        			<div class="triangle-inset"></div>
@@ -98,7 +98,7 @@
 				        		</div>
 				        		<p class="box-content">练重点<span class="box-content-icon iconfont icon-right"></span></p>
 				        	</a> 
-				        	<a class="withyou-box withyou-box-score log-withyou-box " th:href="${setting.domain + 'paperlist/' + subject.uid + '/'+course.uid+'-'+setting.PAPER_TYPE_YATI+'-0-0-1.html'}" data-info="yuce">
+				        	<a class="withyou-box withyou-box-score log-withyou-box " th:href="${setting.domain + 'paperlist/' + subject.uid + '-'+course.uid+'-'+setting.PAPER_TYPE_YATI+'-0-0-1.html'}" data-info="yuce">
 				        		<div class="withyou-box-mod-triangle">
 				        			<div class="triangle-border"></div>
 				        			<div class="triangle-inset"></div>
@@ -185,12 +185,12 @@
 						<div class="paper-box zhenti-box homepage-zhenti-box">
 							<div class="paper-list-wrap">
 								<h3 class="paper-title">历年真题
-									<a class="list-more-link" th:href="${setting.domain + 'paperlist/' + subject.uid + '/'+course.uid+'-'+setting.PAPER_TYPE_ZHENTI+'-0-0-1.html'}">更多真题试卷 &gt;</a>
+									<a class="list-more-link" th:href="${setting.domain + 'paperlist/' + subject.uid + '-' + course.uid+'-' + setting.PAPER_TYPE_ZHENTI+'-0-0-1.html'}">更多真题试卷 &gt;</a>
 								</h3>
 								<ul class="paper-list paper-list-zhenti">
 									<li class="list-item" th:each="h,hStat:${historyPaperList}">
 										<p class="list-item-name">
-											<a class="list-item-name-link" data-paperid="d08fb966f5335a8102d220a5" th:href="${setting.domain + 'paper/'+h.uid+'.html'}" th:text="${h.name}">2017年高考真题 语文 (北京卷)</a>
+											<a class="list-item-name-link" th:href="${setting.domain + 'paper/'+h.uid+'.html'}" th:text="${h.name}">2017年高考真题 语文 (北京卷)</a>
 										</p>
 										<p class="list-item-detail">
 											<a class="list-item-link list-item-link-jiexi" th:href="${setting.domain + 'paper/'+h.uid+'.html'}" data-paperid="d08fb966f5335a8102d220a5" target="_blank">解析</a><span class="item-separate">|</span>
@@ -202,7 +202,7 @@
 						<div class="paper-box moni-box homepage-moni-box">
 							<div class="paper-list-wrap">
 								<h3 class="paper-title">模拟试卷
-									<a class="list-more-link" th:href="${setting.domain + 'paperlist/' + subject.uid + '/'+course.uid+'-'+setting.PAPER_TYPE_MONI+'-0-0-1.html'}">更多模拟试卷 &gt;</a>
+									<a class="list-more-link" th:href="${setting.domain + 'paperlist/' + subject.uid + '-'+course.uid+'-'+setting.PAPER_TYPE_MONI+'-0-0-1.html'}">更多模拟试卷 &gt;</a>
 								</h3>
 								<ul class="paper-list paper-list-moni">
 									<li class="list-item" th:each="s,sStat:${simulationPaperList}">
@@ -218,7 +218,7 @@
 						</div>
 						<div class="homepage-paper-box shiti-box">
 							<div class="hotpaper-list-wrap">
-								<h3 class="hotpaper-title">热门试卷<a class="list-more-link" th:href="${setting.domain + 'paperlist/' + subject.uid + '/0-0-0-0-0.html'}">更多热门试卷 &gt; </a>
+								<h3 class="hotpaper-title">热门试卷<a class="list-more-link" th:href="${setting.domain + 'paperlist/' + subject.uid + '-0-0-0-0-0.html'}">更多热门试卷 &gt; </a>
 								</h3>
 								<ul class="hotpaper-list">
 									<li class="hotpaper-list-item" th:each="h,hStat:${hotPaperList}">
@@ -233,12 +233,12 @@
 					<div class="school-paper-main">
 						<div class="school-paper-container homepage-school-container">
 							<h3 class="school-container-title">名校精品试卷
-								<a class="school-paper-more-link" th:href="${setting.domain + 'paperlist/'+subject.uid+'/0-4-0-0-1.html'}">更多名校精品卷 &gt; </a>
+								<a class="school-paper-more-link" th:href="${setting.domain + 'paperlist/'+subject.uid+'-0-4-0-0-1.html'}">更多名校精品卷 &gt; </a>
 							</h3>
 							<div class="school-list">
 								<div th:class="${sStat.index == 2} ? 'school-list-item school-list-item-lastchild':'school-list-item'" th:each="s,sStat:${eliteSchoolPaperList}">
 									<div class="school-wrap school-wrap-bg1">
-										<a class="famous-school-link" th:href="${setting.domain + 'paperlist/'+subject.uid+'/0-4-0-0-1.html'}">
+										<a class="famous-school-link" th:href="${setting.domain + 'paperlist/'+subject.uid+'-0-4-0-0-1.html'}">
 											<div class="school-info">
 												<p class="name" th:text="${s.name}">北京大学附属中学</p>
 												<p class="info">
@@ -261,7 +261,7 @@
 							</div>
 						</div>
 						<div class="more-school-list">
-							<a class="more-school-name" th:each="s,sStat:${eliteSchoolList}" th:text="${s.name}" th:href="${setting.domain + 'paperlist/'+subject.uid+'/0-4-0-0-1.html'}">
+							<a class="more-school-name" th:each="s,sStat:${eliteSchoolList}" th:text="${s.name}" th:href="${setting.domain + 'paperlist/'+subject.uid+'-0-4-0-0-1.html'}">
 								北京市八一学校
 							</a>
 						</div>