Kaynağa Gözat

新闻显示发布时间调整

anderx 3 yıl önce
ebeveyn
işleme
0209552b98

+ 2 - 2
.idea/artifacts/jitao_server_war.xml

@@ -1,6 +1,6 @@
 <component name="ArtifactManager">
-  <artifact type="war" name="jitao-server:war">
-    <output-path>$PROJECT_DIR$/target</output-path>
+  <artifact type="war" build-on-make="true" name="jitao-server:war">
+    <output-path>$PROJECT_DIR$/out</output-path>
     <properties id="maven-jee-properties">
       <options>
         <module>jitao-server</module>

+ 3 - 1
.idea/misc.xml

@@ -11,5 +11,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
 </project>

+ 10 - 0
.idea/webContexts.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="WebContextManager">
+    <option name="state">
+      <map>
+        <entry key="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/portal/service/services.html" value="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/portal/service" />
+      </map>
+    </option>
+  </component>
+</project>

+ 1 - 3
jitao-server.iml

@@ -19,9 +19,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />

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

@@ -1424,6 +1424,12 @@ public class WebpageController extends BaseController {
 		return modelview;
 	}
 
+	@RequestMapping(value = "/portal/service/eventPlanning", method = RequestMethod.GET)
+	public ModelAndView portalServiceEventPlanning(HttpServletRequest request, ModelAndView modelview){
+		modelview.setViewName("/portal/service/eventPlanning");
+		return modelview;
+	}
+
 	/**
 	 * 高企自评
 	 * @param request

+ 15 - 11
src/main/resources/props/config_local.properties

@@ -1,11 +1,11 @@
 
 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://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 jdbc.username=root
-jdbc.password=aftdev
+jdbc.password=123456
+#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.username=root
+#jdbc.password=aftdev
 jdbc.validationQuery=SELECT 'x'
 jdbc.initialSize=3
 jdbc.maxActive=20
@@ -38,16 +38,20 @@ app.name=AFT
 app.mobile.website=http://m.jishutao.com/1.0/template/index.html
 template.cacheable=false
 
-static.host=//ss.jishutao.com/client/1.2.8
-portal.host=//ss.jishutao.com/portal/1.2.11
+#static.host=//ss.jishutao.com/client/1.2.8
+#portal.host=//ss.jishutao.com/portal/1.2.11
 skjt.host=//ss.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
+static.host=//172.16.0.255:3000/jitao/client/1.2.8
+portal.host=//172.16.0.255:3000/jitao/portal/1.2.11
+
+#avatar.host=//ss.jishutao.com
+#avatar.upload.host=//ss.jishutao.com/upload
 
-avatar.host=//ss.jishutao.com
-avatar.upload.host=//ss.jishutao.com/upload
+avatar.host=//172.16.0.255:3000
+avatar.upload.host=//172.16.0.255:3000/upload
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload

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

@@ -67,7 +67,7 @@
 		<div class="navWrapper webkitHover">
 			<ol>
 				<li>
-					<div>知识产权申请</div>
+					<div>技术交易</div>
 					<span>
 						<img th:src="${portalHost+'/img/index/index_webkit1.png'}" alt="">
 					</span>
@@ -89,7 +89,7 @@
 
 				</li>
 				<li>
-					<div>知识产权运用</div>
+					<div>科技传播</div>
 					<span>
 						<img th:src="${portalHost+'/img/index/index_webkit2.png'}" alt="">
 					</span>
@@ -112,7 +112,7 @@
 					</p>
 				</li>
 				<li>
-					<div>知识产权交易</div>
+					<div>科技咨询</div>
 					<span>
 						<img th:src="${portalHost+'/img/index/index_webkit3.png'}" alt="">
 					</span>
@@ -207,24 +207,24 @@
                     </li>
                     <li th:class="${subM}=='apply'?active:''" >
                     <div>
-                        <a th:href="@{/portal/service/patent}">申请</a>
+                        <a th:href="@{/portal/service/patent}">技术交易</a>
 
                        </div>
                     </li>
                     <li th:class="${subM}=='serviceIndex'?active:''" >
                     <div>
-                        <a th:href="@{/portal/service/serviceIndex}">运用</a>
+                        <a th:href="@{/portal/service/serviceIndex}">科技传播</a>
 
                        </div>
                     </li>
                     <li th:class="${subM}=='adviser'?active:''" >
                        <div>
-                         <a th:href="@{/portal/adviser}">顾问</a>
+                         <a th:href="@{/portal/adviser}">科技咨询</a>
                        </div>
                     </li>
                     <li th:class="${subM}=='trading'?active:''" >
                    		 <div>
-	                        <a th:href="@{/portal/technologyTrading/tradingIndex}">交易</a>
+	                        <a th:href="@{/portal/technologyTrading/tradingIndex}">绿色金融</a>
 	 						<!-- <ol class="subnavigation">
 	                            <li>
 	                                 <a th:href="@{/portal/technologyTrading/achievement}">技术成果</a>
@@ -235,11 +235,16 @@
 	                        </ol> -->
                         </div>
                     </li>
-                     <li th:class="${subM}=='safeguarding'?active:''" >
-                     	<div>
-                         <a th:href="@{/portal/service/safeguarding}">维权</a>
-                        </div>
-                     </li>
+					<li th:class="${subM}=='safeguarding'?active:''" >
+						<div>
+							<a th:href="@{/portal/service/safeguarding}">维权</a>
+						</div>
+					</li>
+					<li th:class="${subM}=='eventPlanning'?active:''" >
+						<div>
+							<a href="javascript:;" >活动策划</a>
+						</div>
+					</li>
                      <!-- <li th:class="${subM}=='special'?active:''" >
                      	<div>
                          <a th:href="@{/portal/special}">社区</a>

+ 30 - 0
src/main/webapp/WEB-INF/views/portal/service/eventPlanning.html

@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org"
+	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+
+<head th:replace="common::header(~{::title},~{::link})">
+    <title>技淘网-知识产权维权首页</title>
+    <link th:href="${portalHost+'/dll/dll.css'}" rel="stylesheet">
+    <link th:href="${portalHost+'/vendors.css'}" rel="stylesheet">
+	<link th:href="${portalHost+'/newMenu/services.css'}" rel="stylesheet"></head>
+<body>
+<div th:replace="common::nav('','eventPlanning')"></div>
+     <!-- 上面是公共头部 -->
+<div style="height:1000px;width: 100%">
+	<h1>内容开发中...</h1>
+</div>
+
+    <!-- 下面是公共底部 -->
+    <footer>
+		<div th:replace="common::copyright"></div>
+		<div th:replace="common::login"></div>
+	</footer>
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
+		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${portalHost+'/newMenu/services.js'}"></script>
+
+	</div>
+</body>
+</html>

+ 13 - 13
src/main/webapp/WEB-INF/views/portal/service/services.html

@@ -77,7 +77,7 @@
                     <li>
                     	<a th:href="@{/portal/evaluation/evaluate}">
                         <img th:src="${portalHost+'/img/newMenu/serves_1.png'}" alt="">
-                        <span>高企在线评测</span>
+                        <span>技术评估</span>
                         </a>
                     </li>
                     <li class="reldemand">
@@ -87,7 +87,7 @@
                     <li>
                     	<a onclick="openZoosUrl('chatwin');">
                         <img th:src="${portalHost+'/img/newMenu/serves_3.png'}" alt="">
-                        <span>入驻为服务商</span>
+                        <span>技术创业</span>
                         </a>
                     </li>
                 </ul>
@@ -97,7 +97,7 @@
                     <input type="text" class="form-control demandSearch" placeholder="输入你感兴趣的内容">
                     <span class="input-group-btn">
                         <button class="btn btn-default searchBtn" type="button">
-                            <img th:src="${portalHost+'/img/newMenu/search-icon.jpg'}" alt=""> 
+                            <img th:src="${portalHost+'/img/newMenu/search-icon.jpg'}" alt="">
                         </button>
                     </span>
                 </div>
@@ -112,11 +112,11 @@
              <div class="jsLeft">
                  <div>
                      <a onclick="openZoosUrl('chatwin');">立即申请</a>
-                 </div>   
+                 </div>
                  <div>
                      <a onclick="openZoosUrl('chatwin');">立即申请</a>
-                 </div> 
-             </div>  
+                 </div>
+             </div>
              <div class="jsRight">
                  <div>
                      <h3>高新技术企业</h3>
@@ -137,7 +137,7 @@
                     <a onclick="openZoosUrl('chatwin');" class="blur">立即办理贯标业务</a>
                     <a href="/portal/practicalPatent">了解更多贯标知识</a>
                  </div>
-             </div> 
+             </div>
         </div>
     </div>
     <div class="applicationSC">
@@ -166,7 +166,7 @@
                  <div class="Wtitle">
                      <h2>军工市场采购</h2>
                      <span>军队不会选择知识产权有争议的企业产品</span>
-                 </div>  
+                 </div>
                  <div class="applicationShop">
                      <div class="shopLeft">
                          <h3>民参军</h3>
@@ -209,7 +209,7 @@
                             </li>
                         </ul>
                      </div>
-                 </div> 
+                 </div>
             </div>
         </div>
         <div class="applicationGj">
@@ -220,7 +220,7 @@
                     <p th:text="${#strings.abbreviate(i.advertisement,30)}">国际市场开发</p>
                     <a th:href="@{/portal/service/serviceDetail(id=${i.id})}">立即办理</a>
                 </li>
-               
+
             </ul>
         </div>
     </div>
@@ -301,7 +301,7 @@
                     </div>
                     <div class="gfLeftBox">
                         <div th:each="d:${prolist.defenseWeapon}">
-                             <h3 th:text="${d.name}">攻防利器</h3>   
+                             <h3 th:text="${d.name}">攻防利器</h3>
                              <p th:text="${#strings.abbreviate(d.advertisement,40)}">知名大所</p>
                              <a th:href="@{/portal/service/serviceDetail(id=${d.id})}" class="lJ">立即办理</a><br />
                              <a th:href="@{/portal/service/serviceList}" >了解更多</a>
@@ -316,7 +316,7 @@
                 <div class="gfRightList">
                     <ul>
                         <li th:each="o,useStat :${prolist.ownUse}">
-                            <h3 th:text="${o.name}">他山己用</h3>   
+                            <h3 th:text="${o.name}">他山己用</h3>
                             <p th:text="${#strings.abbreviate(o.advertisement,40)}">专利转让</p>
                             <div>
                                 <a th:href="@{/portal/service/serviceDetail(id=${o.id})}" class="ljB">立即办理</a>
@@ -338,4 +338,4 @@
 		<script type="text/javascript" th:src="${portalHost + '/newMenu/services.js'}"></script>
 	</div>
 </body>
-</html>
+</html>