Merge remote-tracking branch 'origin/master'

README.md

@@ -5,17 +5,38 @@
 衡水大数据开放与共享平台代码  HSDataPortal
 
 config.properties  line:58
+db服务
+jdbc.sentry.url=jdbc:mysql://39.105.217.215:3306/hsdataplatform?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&autoReconnect=true&useSSL=false
+jdbc.sentry.username=hsdataplatform
+jdbc.sentry.password=Lightinit@1
+jdbc.sentry.driverClassName=com.mysql.cj.jdbc.Driver
 
 资源开放平台    
  userType=user   
  redirectHomeUrl=/open/    
  redirectLoginUrl=/open/account/login.htm    
-
 资源共享平台   
 userType=admin      
 redirectHomeUrl=/share/     
 redirectLoginUrl=/open/account/login.htm     
 
+图片服务
+imageContextPath=http://39.105.217.215:8080/hsdataimages/
+devops（不详）
+devops=http://121.17.30.198:8097/devops-web/
+devops-web页面（开放平台-创客工厂-服务开发环境）
+devopsService=http://39.105.210.5:5151/devops-web/
+大数据可视化与分析（开放平台-创客工厂-数据可视化开发）
+devopsDate=http://citysdk.dgtis.com:8088/login/
+大数据可视化与分析（开放平台-创客工厂-大数据分析建模）
+devopsAnalysis=http://citysdk.dgtis.com:8088/login/
+
+上传图片路径
+uploadImageRootDir=D:/HSDataPlatform/Upload/Images/
+
+
+============================================================================
+============================================================================
 共享平台配置cas单点登陆
 
 cas.properties

src/main/webapp/pages/open/common/head_script.jsp

@@ -4,6 +4,7 @@
     String basePath = request.getContextPath();
 %>
 <script type="text/javascript" src="<%=basePath %>/resource/plugins/jquery/jquery-2.1.4.min.js"></script>
+<script type="text/javascript" src="<%=basePath %>/resource/plugins/sweetalert.min.js"></script>
 <script type="text/javascript">
     function checkAuthentication(){
         var isAuthenticated = false;

src/main/webapp/pages/open/innovationActivity/addActivity.jsp

@@ -189,7 +189,7 @@
             contentType : false,
             success : function(ret) {
                 if(ret.stateCode==200) {
-                    alert("发布成功");
+                    swal("发布成功");
                     location.href="<%=basePath%>/open/innovationActivity/index.htm";
                 }else{
                     for(var item in ret.data){
@@ -226,7 +226,7 @@
             contentType : false,
             success : function(ret) {
                 if(ret.stateCode==200) {
-                    alert("发布成功");
+                    // alert("发布成功");
                     location.href="";
                 }
             }

src/main/webapp/pages/open/makerspace/index.jsp

@@ -20,13 +20,13 @@
     <div class="line"></div>
     <div class="box1">
         <div class="xuanxiang01">
-            <a href="javascript:void(0);" onclick="goView('1')" class="xuanxiangfont">服务开发环境</a>
+            <a href="javascript:void(0);" class="xuanxiangfont"><span onclick="goView('1')">服务开发环境</span></a>
         </div>
         <div class="xuanxiang02">
-            <a href="javascript:void(0);" onclick="goView('2')" target="_blank" class="xuanxiangfont">数据可视化开发</a>
+            <a href="javascript:void(0);"   class="xuanxiangfont"><span onclick="goView('2')">数据可视化开发</span></a>
         </div>
         <div class="xuanxiang02">
-            <a href="javascript:void(0);" onclick="goView('3')" target="_blank" class="xuanxiangfont">大数据分析建模</a>
+            <a href="javascript:void(0);"   class="xuanxiangfont"><span onclick="goView('3')">大数据分析建模</span></a>
         </div>
 
         <div class="mid-maker1 clearfix" id="div1">
@@ -110,6 +110,7 @@
            $('#div2').attr("style","display: none");
            $('#div3').attr("style","");
        }
+       return false;
    }
    if(${id != null}){
        goView(${id})

src/main/webapp/pages/open/user_verify/baseInformation.jsp

@@ -368,11 +368,11 @@
         $('.tishi4').text('');//清空验证
         $.post("<%=basePath%>/open/userverify/verifyPersonal.action",$('#personalverifyId').serialize(),function(result){
             if(result.stateCode==200){
-                alert(result.msg)
+                swal(result.msg)
                 window.location.href="<%=basePath%>/open/userverify/detail.htm";
             }else{
                 if(result.data ==null){
-                    alert(result.msg);//弹出发布失败提示
+                    swal(result.msg);//弹出发布失败提示
                 }else{
                     for(var item in result.data){
                         $("[name='"+item+"']").next().text("! "+result.data[item]);
@@ -395,11 +395,11 @@
             success:function(result){
                 $('.tishi4').text('');//清空验证
                 if(result.stateCode==200){
-                    alert(result.msg);
+                    swal(result.msg);
                     window.location.href="<%=basePath%>/open/userverify/detail.htm";
                 }else{
                     if(result.data ==null){
-                        alert(result.msg);//弹出发布失败提示
+                        swal(result.msg);//弹出发布失败提示
                     }else{
                         for(var item in result.data){
                             $("[name='"+item+"']").next().text("! "+result.data[item]);
@@ -415,11 +415,11 @@
         $('.tishi4').text('');//清空验证验证
         $.get("<%=basePath%>/open/userverify/changePassword.action",$('#changePasswordId').serialize(),function(result){
             if(result.stateCode==200){
-                alert(result.msg);
+                swal(result.msg);
                 $("#changePasswordId input[type='password']").val("");
             }else{
                 if(result.data ==null){
-                    alert(result.msg);//弹出修改失败提示
+                    swal(result.msg);//弹出修改失败提示
                 }else{
                     for(var item in result.data){
                         $("[name='"+item+"']").next().text("! "+result.data[item]);