Merge remote-tracking branch 'origin/master'

README.md

@@ -16,5 +16,17 @@ userType=admin
 redirectHomeUrl=/share/     
 redirectLoginUrl=/open/account/login.htm     
 
-
-
+共享平台配置cas单点登陆
+
+cas.properties
+
+// 配置本项目中的cas
+casService=http://localhost:8081/cas
+// 配置外面cas项目的登陆
+casServerUrlPrefix=http://39.105.217.215:8080/cas
+// 问号前配置外部cas项目的登陆，后面是跳转页面，为了验证登陆，后面也配置本项目中的cas
+loginUrl=http://39.105.217.215:8080/cas/login?service=http://localhost:8081/cas
+// 配置同上就行
+failureUrl = http://39.105.217.215:8080/cas/login?service=http://localhost:8081/cas
+//  问号前配置外部cas项目的退出，后面是跳转到首页路径
+redirectUrl = http://39.105.217.215:8080/cas/logout?service=http://localhost:8081

src/main/resources/config.properties

@@ -64,7 +64,7 @@ redis.server=192.168.107.112
 #redirectLoginUrl=/open/account/login.htm
 userType=admin
 redirectHomeUrl=/share/
-redirectLoginUrl=/open/account/login.htm
+redirectLoginUrl=/share/account/login.htm
 imageContextPath=http://localhost:8080/hsdataimages/
 ##\u521B\u4E1A\u5DE5\u5382 \u70B9\u51FB\u8FDB\u5165
 devops=http://121.17.30.198:8097/devops-web/
@@ -105,3 +105,4 @@ uploadImageRootDir=D:/HSDataPlatform/Upload/Images/
 
 
 
+

src/main/resources/log4j.properties

@@ -1,6 +1,6 @@
 #mybatis log4j config
-#log4j.rootLogger=debug,stdout,D,E
-log4j.rootLogger=info,E
+log4j.rootLogger=debug,stdout,D,E
+#log4j.rootLogger=info,E
 
 ### \u8F93\u51FA\u4FE1\u606F\u5230\u63A7\u5236\u62AC ###
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
@@ -18,7 +18,7 @@ log4j.logger.java.sql.PreparedStatement=DEBUG
 log4j.appender.D=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.D.DatePattern = '-'yyyy-MM-dd
 log4j.appender.D.Encoding=UTF-8
-log4j.appender.D.File = D://logs/hsdataportal/debug.log
+log4j.appender.D.File = /Library/ideawork/gitwork/hsdataLog/logs/share/debug.log
 log4j.appender.D.Append = true
 log4j.appender.D.Threshold = DEBUG
 log4j.appender.D.layout = org.apache.log4j.PatternLayout
@@ -29,8 +29,8 @@ log4j.appender.E=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.E.DatePattern='-'yyyy-MM-dd
 log4j.appender.E.Encoding=UTF-8
 #log4j.appender.E.File=D://logs/hsdataportal/error.log
-log4j.appender.E.File=/home/log/hsdataportal-share/error.log
+log4j.appender.E.File=/Library/ideawork/gitwork/hsdataLog/logs/share/debug.log
 log4j.appender.E.Append=true
-log4j.appender.E.Threshold=ERROR
+log4j.appender.E.Threshold=DEBUG
 log4j.appender.E.layout=org.apache.log4j.PatternLayout
 log4j.appender.E.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss}  [ %t:%r ] - [ %p ]  %m%n

src/main/resources/sqlmaps/RequirementMapper.xml

@@ -418,7 +418,7 @@
       <if test="rqrmntName !=null and rqrmntName!=''">
         <bind name="rqrmntNameLike" value="'%'+rqrmntName+'%'"></bind>
       </if>
-      SELECT  DISTINCT(r.id) AS rqrmnt_id,r.platform_type,r.rqrmnt_name,r.rqrmnt_summary,r.publish_at,r.rqrmnt_state,r.view_times,
+      SELECT  r.id AS rqrmnt_id,r.platform_type,r.rqrmnt_name,r.rqrmnt_summary,r.publish_at,r.rqrmnt_state,r.view_times,
       (SELECT COUNT(*) FROM requirement_follow rfw WHERE rfw.rqrmnt_id=r.id) AS follow_times,a.id AS admin_id, a.username,s.id AS sector_id,s.sector_name,r.rqrmnt_state
        FROM requirement r
        LEFT JOIN requirement_follow rf ON rf.rqrmnt_id=r.id
@@ -451,7 +451,7 @@
     <if test="rqrmntName !=null and rqrmntName!=''">
       <bind name="rqrmntNameLike" value="'%'+rqrmntName+'%'"></bind>
     </if>
-    SELECT  count(*)
+    SELECT count(*)
     FROM requirement r
     LEFT JOIN requirement_follow rf ON rf.rqrmnt_id=r.id
     INNER JOIN requirement_data rd ON rd.id=r.id
@@ -464,7 +464,7 @@
   </select>
 
   <select id="getDataRequirementDetail" parameterType="com.lightinit.hsdataportal.model.DataRequirementSearchModel" resultType="com.lightinit.hsdataportal.model.DataRequirementDetailModel">
-      SELECT DISTINCT(r.id) AS rqrmnt_id,r.platform_type,r.rqrmnt_name,r.rqrmnt_summary,u.id AS userId,u.username AS publish_userName,r.publish_at,r.rqrmnt_state,r.view_times,
+      SELECT r.id AS rqrmnt_id,r.platform_type,r.rqrmnt_name,r.rqrmnt_summary,u.id AS userId,u.username AS publish_userName,r.publish_at,r.rqrmnt_state,r.view_times,
       (SELECT COUNT(*) FROM requirement_follow rfw WHERE rfw.rqrmnt_id=r.id) AS follow_times,a.id AS admin_id, a.username,s.id AS sector_id,s.sector_name,r.rqrmnt_state
       ,rd.data_uses,r.audit_opinion,r.audited_by,r.audited_at,a.id AS auditedBy,a.username AS auditeByName,rd.feedback_desc,rd.feedback_result,feedback_a.id AS feedback_by,feedback_a.username AS feedback_byName,rd.feedback_at
       ,feedback_s.id AS feedbackSectorId, feedback_s.sector_name AS feedback_sectorName FROM requirement r

src/main/webapp/pages/open/static/about.jsp

@@ -20,7 +20,7 @@
 
                     <ul>
                         <li style="text-indent: 2em">
-                                衡水大数据信息服务平台-资源开放平台是运用大数据、云计算、API
+                                衡水大数据信息服务平台-资源开放平台是运用大数据、云计算、API
                             等技术打造的资源集聚、资源开放、资源交易、应用创新综合服务平台，采
                             用互联网思维快速传递、放大数据资源的价值，在安全可控的前提下，集众
                             智汇众力，将大数据资源应用至市民、企业、城市管理等各个领域。平台汇

src/main/webapp/pages/share/data_requirement/index.jsp

@@ -28,7 +28,7 @@
                     </div>
                 </div>
 
-                <div class="shuju50">
+                <div class="shuju50" id="chakanId">
                     <c:if test="${outputModel !=null}">
                         <c:forEach items="${outputModel}" var="item">
                             <div class="xuqiu1">
@@ -63,7 +63,7 @@
                     <c:if test="${outputModel.size() <1}">
                         <div>暂无数据</div>
                     </c:if>
-                    <div class="chakan0">
+                    <div class="chakan0" id="viewMore">
                         <span class="chakan"></span>
                         &nbsp&nbsp <a class="chakanfont" onclick="lookMore1()">查看更多</a> &nbsp&nbsp
                         <span class="chakan"></span>
@@ -84,6 +84,7 @@
     //查看更多
     var flagMore=false;
     var count=1;
+    var allCount = ${pager.total} ;
     function lookMore1(){
         count++;
         if(flagMore){
@@ -94,8 +95,19 @@
                 flagMore=true;
                 $('.chakanfont').text('已经到底了');
             }else{
-                var connectPoint = $('#chakanId').parent().children('div:last').prev();
-                connectPoint.after(data);
+                // var connectPoint = $('#chakanId').parent().children('div:last').prev();
+                document.getElementById("viewMore").remove();
+                var html = document.getElementById("chakanId").innerHTML;
+                document.getElementById("chakanId").innerHTML = html + data
+                    + '  <div class="chakan0" id="viewMore">\n' +
+                    '                        <span class="chakan"></span>\n' +
+                    '                        &nbsp&nbsp <a class="chakanfont" onclick="lookMore1()">查看更多</a> &nbsp&nbsp\n' +
+                    '                        <span class="chakan"></span>\n' +
+                    '                    </div>';
+                if ($(".xuqiu1").length == allCount){
+                    flagMore=true;
+                    $('.chakanfont').text('已经到底了');
+                }
             }
         })
     }