深圳服务器版本

pom.xml

@@ -9,7 +9,7 @@
   <url>http://maven.apache.org</url>
   <properties>
     <spring.version>4.2.6.RELEASE</spring.version>
-    <mysql.version>5.1.21</mysql.version>
+    <mysql.version>8.0.11</mysql.version>
     <mybatis.version>3.4.2</mybatis.version>
     <shiro.version>1.3.2</shiro.version>
     <druid.version>1.0.29</druid.version>

src/main/java/com/lightinit/hsdataplatform/controller/admin/DataPublishMgrController.java

@@ -141,7 +141,7 @@ public class DataPublishMgrController extends BaseController{
                 return buildInvalidResultState(ResultStateCode.UNKNOWN_ERROR, "数据文件保存失败");
             }
         }
-        ResultState resultState=dataPublishMgrService.updatePublishDataDetial(inputModel);
+        ResultState resultState=null;//dataPublishMgrService.updatePublishDataDetial(inputModel);
         return resultState;
     }
 

src/main/java/com/lightinit/hsdataplatform/controller/admin/DataSupplyApiController.java

@@ -12,7 +12,6 @@ import com.lightinit.hsdataplatform.model.ResultState;
 import com.lightinit.hsdataplatform.model.ResultStateCode;
 import com.lightinit.hsdataplatform.model.admin.*;
 import com.lightinit.hsdataplatform.service.admin.IDataSupplyApiService;
-import com.lightinit.hsdataplatform.service.admin.IRequirementService;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -43,9 +42,6 @@ public class DataSupplyApiController {
     @Autowired
     private PermissionUtilsPro permissionUtilsPro;
 
-    @Autowired
-    private IRequirementService requirementService;
-
     @RequestMapping(value = "index.htm")
     public ModelAndView requirement_api(){
         ModelAndView modelAndView=new ModelAndView("admin/data_api/index");
@@ -201,13 +197,5 @@ public class DataSupplyApiController {
         return iDataSupplyApiService.release(releaseModel,loginUser.getId());
     }
 
-    @RequestMapping(value = "toReceive.action")
-    @ResponseBody
-    public ResultState receive(HttpSession session, RequirementReceiveModel inputModel) {
-        LoginUser loginUser = (LoginUser) session.getAttribute(LoginUser.SESSION_KEY_LOGIN_USER);
-        inputModel.setReceivedBy(loginUser.getId());
-        ResultState   resultState = requirementService.receive(inputModel);
-        return resultState;
-    }
 
 }

src/main/java/com/lightinit/hsdataplatform/impl/admin/RequirementServiceImpl.java

@@ -122,9 +122,9 @@ public class RequirementServiceImpl implements IRequirementService {
 
         BeanUtils.copyProperties(inputModel,entity);
         entity.setRqrmntState(DicRequirmentAuditState.AUDITING);
-        entity.setPlatformType(DicPlatformType.BACKSTAGE);
+        entity.setPlatformType(DicPlatformType.OPEN);
         entity.setRqrmntType(DicRqrmntType.MICROAPP);
-        entity.setRqrmntSource(DicRqrmntSourceType.BACKSTAGE);
+        entity.setRqrmntSource(DicRqrmntSourceType.OPEN);
         entity.setCreatedAt(new Date());
         int sqlResult1 = requirementMapper.insert(entity);
         RequirementMicroapp entity1 = new RequirementMicroapp();

src/main/resources/cas.properties

@@ -4,3 +4,8 @@ casServerUrlPrefix=http://39.105.217.215:8080/cas
 loginUrl=http://39.105.217.215:8080/cas/login?service=http://localhost:8089/cas
 failureUrl = http://39.105.217.215:8080/cas/login?service=http://localhost:8089/cas
 redirectUrl = http://39.105.217.215:8080/cas/logout?service=http://localhost:8089/cas
+#casService=http://comdata.tslsmart.com/HSDataPlatform/cas
+#casServerUrlPrefix=http://192.168.2.78:8080/cas
+#loginUrl=http://comdata.tslsmart.com/cas/login?service=http://comdata.tslsmart.com/HSDataPlatform/cas
+#failureUrl = http://comdata.tslsmart.com/cas/login?service=http://comdata.tslsmart.com/HSDataPlatform/cas
+#redirectUrl = http://comdata.tslsmart.com/cas/logout?service=http://comdata.tslsmart.com/HSDataPlatform/

src/main/resources/config.properties

@@ -1,11 +1,11 @@
 #JDBC configuration information
-#jdbc.sentry.url=jdbc:mysql://115.29.47.155:3306/hsdataplatform?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
-#jdbc.sentry.username=hsdataplatform
-#jdbc.sentry.password=lightinit1
-jdbc.sentry.url=jdbc:mysql://rm-2zea3p7q7lrvjs8s4.mysql.rds.aliyuncs.com/hsdataplatform?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
+#jdbc.sentry.url=jdbc:mysql://47.94.133.127:3306/hsdataplatform?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&autoReconnect=true&useSSL=false
+#jdbc.sentry.username=root
+#jdbc.sentry.password=iuGoto8#@20w
+jdbc.sentry.url=jdbc:mysql://39.105.217.215:3306/hsdataplatform?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
 jdbc.sentry.username=hsdataplatform
 jdbc.sentry.password=Lightinit@1
-jdbc.sentry.driverClassName=com.mysql.jdbc.Driver
+jdbc.sentry.driverClassName=com.mysql.cj.jdbc.Driver
 jdbc.sentry.maxWait=60000
 jdbc.sentry.maxActive=20
 jdbc.sentry.initialSize=1

src/main/resources/spring.xml

@@ -24,7 +24,7 @@
     <context:annotation-config></context:annotation-config>
     <import resource="classpath:spring-shiro.xml"/>
     <!--<import resource="classpath:spring-mongodb.xml"/>-->
-    <import resource="classpath:spring-task.xml"/>
+    <!--<import resource="classpath:spring-task.xml"/>-->
     <!--<import resource="classpath:spring-solr.xml"/>-->
     <!--<import resource="spring-activemq.xml"/>-->
 

src/main/resources/text/cas

@@ -0,0 +1,6 @@
+// 阿里线上配置cas
+casService=http://citysdk.dgtis.com:8080/hsdataplatform/cas
+casServerUrlPrefix=http://39.105.217.215:8080/cas
+loginUrl=http://39.105.217.215:8080/cas/login?service=http://citysdk.dgtis.com:8080/hsdataplatform/cas
+failureUrl = http://39.105.217.215:8080/cas/login?service=http://citysdk.dgtis.com:8080/hsdataplatform/cas
+redirectUrl = http://39.105.217.215:8080/cas/logout?service=http://citysdk.dgtis.com:8080/hsdataplatform/cas

src/main/webapp/pages/admin/dataRecommendation/move.jsp

@@ -12,7 +12,7 @@
     <input type="hidden" name="sortCategory" value="${model.sortCategory}" />
     <div class="form-group">
         <label for="sortValue">排序值</label>
-        <input type="text" id="sortValue" name="sortValue" value="${model.sortValue}" class="form-control" />
+        <input type="text" id="sortValue" name="sortValue"  class="form-control" />
         <span class="help-block"></span>
     </div>
 

src/main/webapp/pages/admin/data_api/list.jsp

@@ -50,7 +50,6 @@
                             </c:if>
                             <c:if test="${item.rqrmntState == '进行中'}">
                                 <button name="btnUnshelve" class="btn btn-sm btn-primary m-r-sm"><i class="fa fa-edit"></i>下架</button>
-                                <button name="btnReceive" class="btn btn-sm btn-primary m-r-sm"><i class="fa fa-edit"></i>接单</button>
                             </c:if>
                         </td>
                     </tr>
@@ -85,8 +84,4 @@
             $.popBsPartial({ url: "<%=basePath%>/admin/data_supply_api/unshelve/"+ id });
         })
 
-        .on("click", "button[name='btnReceive']", function() {
-            var id = $(this).parent().children("input[type='hidden'][name='id']").val();
-            $.popBsPartial({url:"<%=basePath%>/admin/microapp/receive.htm/"+id});
-        });
 </script>

src/main/webapp/pages/admin/data_api/publishApiAdd.jsp

@@ -257,6 +257,20 @@
         var msg = "您真的确定要发布吗？";
         if (confirm(msg)){
             $('.tishi4').text('');//清空验证
+            <%--$.post("<%=basePath%>/admin/data_supply_api/release.action",$('#settingFrom').serialize(),function(result){--%>
+                <%--if(result.stateCode==200){--%>
+                    <%--window.location.href="<%=basePath%>/admin/data_supply_api/index.htm" ;--%>
+                <%--}else{--%>
+                    <%--if(result.data ==null){--%>
+                        <%--alert(result.msg);//弹出发布失败提示--%>
+                    <%--}else{--%>
+                        <%--for(var item in result.data){--%>
+                            <%--$("[name='"+item+"']").next().text("! "+result.data[item]);--%>
+                            <%--$("[name='"+item+"']").next().show();--%>
+                        <%--}--%>
+                    <%--}--%>
+                <%--}--%>
+            <%--})--%>
             $('#settingFrom').ajaxValSubmit({
                 ajaxSubmitOptions: {
                     onSuccess: function () {

src/main/webapp/pages/admin/microapp/add.jsp

@@ -4,7 +4,7 @@
 <%
     String basePath = request.getContextPath();
 %>
-<jsp:include page="../../../common/admin/modal_content_pre.jsp"><jsp:param name="modal_title" value="发布"/></jsp:include>
+<jsp:include page="../../../common/admin/modal_content_pre.jsp"><jsp:param name="modal_title" value="新增"/></jsp:include>
 <form id="formAdd" action="<%=basePath%>/admin/microapp/toAdd.action" method="post" role="form">
 
     <div class="form-group">

src/main/webapp/pages/admin/microapp/list.jsp

@@ -33,10 +33,9 @@
                             <c:if test="${item.rqrmntState!=null&&item.rqrmntState.length()>0&&(item.rqrmntState.trim().equals('审核不通过')||item.rqrmntState.trim().equals('已下架'))}">
                             </c:if>
                             <c:if test="${item.rqrmntState!=null&&item.rqrmntState.length()>0&&(item.rqrmntState.trim().equals('已关闭')||item.rqrmntState.trim().equals('进行中'))}">
-                                <button name="btnReceive" class="btn btn-sm btn-primary m-r-sm"><i class="fa fa-edit"></i>接单</button>
                                 <button name="btnUnShelve" class="btn btn-sm btn-primary m-r-sm"><i class="fa fa-edit"></i>下架</button>
                             </c:if>
-
+                            <button name="btnReceive" class="btn btn-sm btn-primary m-r-sm"><i class="fa fa-edit"></i>接单</button>
                         </td>
                     </tr>
                 </c:forEach>