2019.03.25附件路径修改

beansprouts-common/src/main/resources/db.properties

@@ -11,7 +11,7 @@ jdbc.password=Hmit@2018
 
 jdbc.url=jdbc:mysql://127.0.0.1:3306/zhgh_portalsite?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true
 
-#jdbc.url=jdbc:mysql://127.0.0.1:3306/zhgh?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true
+#jdbc.url=jdbc:mysql://127.0.0.1:3306/zhgh?asllowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true
 
 
 

beansprouts-web/src/main/java/com/hmit/kernes/controller/JgSubjectController.java

@@ -218,8 +218,8 @@ public class JgSubjectController extends  AbstractController {
 	@RequestMapping("/uploadpho")
 	public R uploadpho(@RequestParam("file") MultipartFile file, HttpServletRequest request) throws Exception {
 
-		String url = request.getSession().getServletContext().getRealPath("doc/");
-
+		//String url = request.getSession().getServletContext().getRealPath("doc/");
+		String url ="C:/document/doc";
 		if (file.isEmpty()) {
 			throw new RRException("上传文件不能为空");
 		}
@@ -256,8 +256,8 @@ public class JgSubjectController extends  AbstractController {
 	@RequestMapping("/uploadfile")
 	public R uploadfile(@RequestParam("file") MultipartFile file, HttpServletRequest request) throws Exception {
 
-		String url = request.getSession().getServletContext().getRealPath("file/");
-
+		//String url = request.getSession().getServletContext().getRealPath("file/");
+		String url ="C:/document/file";
 		if (file.isEmpty()) {
 			throw new RRException("上传文件不能为空");
 		}

beansprouts-web/src/main/java/com/hmit/kernes/controller/SysOssController.java

@@ -26,7 +26,8 @@ public class SysOssController {
 	public R ToLeadImg(String editorid, @RequestParam("upfile") MultipartFile file, HttpServletRequest request, HttpServletResponse response) throws IOException {
 	  String path = "";
 	  try {
-	    path = request.getSession().getServletContext().getRealPath("statics/plugins/umeditor/docroot/attachments/article/");
+	    //path = request.getSession().getServletContext().getRealPath("statics/plugins/umeditor/docroot/attachments/article/");
+		  path ="C:/document/attachments/";
 	    path = path.replaceAll("/", "\\\\");
 	    String fileName = file.getOriginalFilename();
 	    File file3 = new File(path);

beansprouts-web/src/main/resources/spring-mvc.xml

@@ -43,7 +43,11 @@
             </bean>
         </mvc:message-converters>
 	</mvc:annotation-driven>
-	
+
+	<mvc:resources mapping="/doc/**" location="file:C:/document/doc/" cache-period="3155926"/>
+	<mvc:resources mapping="/file/**" location="file:C:/document/file/" cache-period="3155926"/>
+	<mvc:resources mapping="/statics/plugins/umeditor/docroot/attachments/article/**" location="file:C:/document/attachments/" cache-period="3155926"/>
+
 	<!-- Velocity视图解析器    默认视图  -->
 	<bean id="velocityViewResolver" class="org.springframework.web.servlet.view.velocity.VelocityViewResolver">
 		<property name="contentType" value="text/html;charset=UTF-8" />
@@ -55,7 +59,9 @@
         <property name="requestContextAttribute" value="rc"/>
         <property name="order" value="0"/>
 	</bean>
-	
+
+
+
 	<bean id="velocityConfigurer" class="org.springframework.web.servlet.view.velocity.VelocityConfigurer">
         <property name="resourceLoaderPath" value="/WEB-INF/page/" />
         <property name="velocityProperties">

beansprouts-web/src/main/webapp/index.html

@@ -68,7 +68,7 @@
 					<a href="./qt/secondaryList.html?menuId=30201" class="zgh-more">更多>></a>
 				</li>
 				<li class="news-content" v-for="(n,index) in announcements">
-					<a :href="'./qt/third-level.html?id='+n.id+'&sortId='+n.menuId" :title="n.title" class="zgh-ellipsis" target="_blank">{{n.title}}</a>
+					<a :href="'./qt/third-level.html?id='+n.id+'&sortId='+n.menuId" :title="n.title" class="" target="_blank">{{n.title}}</a>
 					<!--<span>{{n.time}}</span>-->
 				</li>
 			</ul>

beansprouts-web/src/main/webapp/qt/css/index.css

@@ -74,8 +74,13 @@
 }
 
 .main .announcement ul {
+<<<<<<< Updated upstream
 	width: 254px;
 	height: 215px;
+=======
+	width: 185px;
+	height: 249px;
+>>>>>>> Stashed changes
 	border: 1px solid #CCCCCC;
 	box-sizing: border-box;
 	overflow: hidden;
@@ -83,12 +88,19 @@
 }
 
 .main .announcement ul li {
-	height: 34px;
-	line-height: 34px;
+	min-height: 34px;
+	line-height: 1.2;
 	border-bottom: 1px dashed #CCCCCC;
 	font-size: 13px;
+	display: flex;
+	align-items: center;
+}
+.main .announcement ul li.news-content{
+	min-height: 24px;
+	height: auto;
+	text-indent: 0;
+	padding: 5px 4px;
 }
-
 .main .announcement ul li:first-child {
 	height: 40px;
 	line-height: 40px;
@@ -102,12 +114,24 @@
 .main .announcement .news-content a{width: 244px;}
 
 .main .announcement .icon-gonggao{font-size: 24px;color: #d81e06;vertical-align: middle;}
+<<<<<<< Updated upstream
 .main .announcement div{width: 254px;}
 .main .announcement img{
 	width: 254px;
 	height: 60px;
 	display: block;
 }
+=======
+.main .announcement div{width: 185px;margin-right: 5px;height: 165px;}
+.main .announcement img{width: 185px;height: 74px;}
+
+.secondaryListImg a{
+	display: block;
+}
+.secondaryListImg a:last-child{
+	transform: translateY(-10px);
+}
+>>>>>>> Stashed changes
 
 .announcementImg a{
 	display: block;