Browse Source

1.【测试】抽奖

高伟民 1 year ago
parent
commit
ca05f35426

+ 5 - 5
src/main/resources/application-dev.yml

@@ -7,9 +7,9 @@ dwsurvey:
     # 使用哪种部署模式,后期可能会去掉,可以先保持默认
     static-type: static
     # 站点访问地址,如果配置有域名则为域名地址
-    site-url: http://localhost:8080
+    site-url: http://localhost:8888
     # 资源访问地址,便于存储模式的切换,目前可以保持与site-url一样
-    resource-url: http://localhost:8080
+    resource-url: http://localhost:8888
     # 站点信息配置,会出现在底部footer区
     info:
       # 站点名称
@@ -36,7 +36,7 @@ dwsurvey:
     built: 2022/03/17
 # 服务占用的端口号
 server:
-  port: 8080
+  port: 8888
 
 # Spring相关配置
 spring:
@@ -56,9 +56,9 @@ spring:
     # 连接URL
     url: jdbc:mysql://localhost:3306/dwsurvey?useUnicode=true&characterEncoding=utf8
     # 连接账号
-    username: ude
+    username: root
     # 连接密码
-    password: Ude1@3
+    password:
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       initial-size: 5

+ 3 - 3
src/main/resources/application-prod.yml

@@ -3,8 +3,8 @@ dwsurvey:
   web:
     file-path: diaowen/file/
     static-type: static
-    site-url: http://localhost:8080
-    resource-url: http://localhost:8080
+    site-url: http://localhost:8888/
+    resource-url: http://localhost:8888/
     #    site-url: http://ent82.surveyform.cn
     info:
       site-name: 调问网
@@ -38,7 +38,7 @@ spring:
     #type: com.alibaba.druid.pool.DruidDataSource
     url: jdbc:mysql://localhost:3306/dwsurvey_21test?useUnicode=true&characterEncoding=utf8
     username: root
-    password: 123456,.
+    password: root
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       initial-size: 5

+ 2 - 2
src/main/resources/application-test.yml

@@ -3,8 +3,8 @@ dwsurvey:
   web:
     file-path: diaowen/file/
     static-type: static
-    site-url: http://localhost:8080
-    resource-url: http://localhost:8080
+    site-url: http://localhost:8888
+    resource-url: http://localhost:8888
     #    site-url: http://ent82.surveyform.cn
     info:
       site-name: 调问网

File diff suppressed because it is too large
+ 1 - 1
src/main/resources/static/index.html


File diff suppressed because it is too large
+ 2 - 2
src/main/resources/static/static/css/app.da456c084291c9c1810a655eb70494aa.css


File diff suppressed because it is too large
+ 1 - 0
src/main/resources/static/static/css/app.ccd4c1ee46eb83e0b0fb5628496be6e7.css.map


File diff suppressed because it is too large
+ 0 - 1
src/main/resources/static/static/css/app.da456c084291c9c1810a655eb70494aa.css.map


+ 58 - 58
src/main/resources/static/static/diaowen/answer-m.html

@@ -1,9 +1,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-  <title>答卷</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+<title>答卷</title>
   <link rel="stylesheet" type="text/css" href="js/plugs/jquery.mobile-1.4.5/jquery.mobile-1.4.5.min.css">
   <link rel="stylesheet" type="text/css" href="js/plugs/jquery-ui-1.10.3.custom/css/mycss/jquery-ui-1.10.3.custom.css" />
   <link rel="stylesheet" type="text/css" href="js/plugs/font-awesome-4.2.0/css/font-awesome.css" >
@@ -23,12 +23,12 @@
   <script type="text/javascript" src="js/dw/an/an-pcm-common.js"></script>
   <script type="text/javascript" src="js/dw/an/ans-m-data.js"></script>
   <script type="text/javascript" src="js/dw/an/ans-m.js"></script>
-  <script type="text/javascript">
-    $(document).click(function(){
-      $(".tabbarDialog",parent.document).hide();
-      $(".js-tabselected",parent.document).removeClass("js-tabselected");
-    });
-  </script>
+<script type="text/javascript">
+  $(document).click(function(){
+    $(".tabbarDialog",parent.document).hide();
+    $(".js-tabselected",parent.document).removeClass("js-tabselected");
+  });
+</script>
 </head>
 <body>
 <div id="wrap2" style="position: absolute; height: 100%; width: 100%; z-index: 1; background-color: white;">
@@ -65,7 +65,7 @@
           <div class="errorItem" hidden><label for="" class="error"></label></div>
         </td>
       </tr>
-      </tbody></table>
+    </tbody></table>
   </div>
   <div class="surveyQuItemContent" style="margin-bottom: 0px;min-height:20px; padding:20px 60px; ">
     <input type="button" id="submitUserInfo" value="继续" data-theme="b" style="background: -webkit-gradient(linear, 0 0, 0 bottom, from(dodgerblue), to(dodgerblue));idth: 100%;
@@ -112,28 +112,28 @@
     <input type="hidden" id="sUserName" name="answerName" value="">
     <input type="hidden" id="sUserPhone" name="answerPhone" value="">
     <div id="dw_body_content">
-      <div id="diaowen-m-content" class="diaowen-m-content" >
-        <div id="dwSurveyHeader" >
-          <div id="answer-m-head" style="text-align: center;margin: 0px 16px;">
-            <div id="dwSurveyTitle" class="noLogoImg" style="padding-top: 5px;">
-              <div id="dwSurveyName" class="dwSvyName" >加载中</div>
-            </div>
-            <div id="dwSurveyNote" style="text-align: left;">
-              <div id="dwSurveyNoteEdit"  style="font-weight: normal;line-height: 20px;">加载中</div>
-            </div>
+    <div id="diaowen-m-content" class="diaowen-m-content" >
+      <div id="dwSurveyHeader" >
+        <div id="answer-m-head" style="text-align: center;margin: 0px 16px;">
+          <div id="dwSurveyTitle" class="noLogoImg" style="padding-top: 5px;">
+            <div id="dwSurveyName" class="dwSvyName" >加载中</div>
+          </div>
+          <div id="dwSurveyNote" style="text-align: left;">
+            <div id="dwSurveyNoteEdit"  style="font-weight: normal;line-height: 20px;">加载中</div>
           </div>
         </div>
-        <div id="m-errorMsg"></div>
-        <div  id="dwSurveyQuContent" >
-          <div>
-            <div id="dwSurveyQuContentBg">
-              <ul id="dwSurveyQuContentAppUl">
-              </ul>
-            </div>
+      </div>
+      <div id="m-errorMsg"></div>
+      <div  id="dwSurveyQuContent" >
+        <div>
+          <div id="dwSurveyQuContentBg">
+            <ul id="dwSurveyQuContentAppUl">
+            </ul>
           </div>
         </div>
       </div>
     </div>
+    </div>
   </form>
   <div class="dw-footer" >
     <div><a href="http://diaowen.net/index-m.jsp" style="text-decoration: none;" rel="external" title="开源的调查问卷系统" >调问网&nbsp;DWSurvey&nbsp;</a>提供技术支持</div>
@@ -339,7 +339,7 @@
             <input type="hidden" class="orderById" value="${en.orderById }"/>
             <input type="hidden" class="isRequired" value="${en.isRequired }">
             <input type="hidden" class="pageNo" value="${pageNo}" >
-            <!--            <input type="hidden" class="answerTag" value="0" >-->
+<!--            <input type="hidden" class="answerTag" value="0" >-->
             <div class="quLogicInputCase"></div>
             <input type="hidden" class="hidden_input_tag" name="qu_${en.quType }_${en.id }" value="text_qu_${en.quType }_${en.id }_" />
           </div>
@@ -455,17 +455,17 @@
   </div>
   <ul id="quRadioItem_default">
     <li class="quCoItemUlLi">
-      <div class="dwQuOptionItemContent">
-        <label class="dwRedioStyle dwQuInputLabel" ></label>
-        <input id="qu_${en.quType }_${en.id }_${item.id}" type="radio" name="qu_${en.quType }_${en.id }" value="${item.id }">
-        <label class="editAble" >${item.optionName }</label>
-        <input type='text' class='inputSytle_1 dwQuOptionItemNote'  style="display: none;"   name="text_qu_${en.quType }_${en.id }_${item.id }"  />
-        <div class="quItemInputCase">
-          <input type="hidden" class="isNote" value="${item.isNote }">
-          <input type="hidden" class="checkType" value="${item.checkType }">
-          <input type="hidden" class="isRequiredFill" value="${item.isRequiredFill }">
-        </div>
+    <div class="dwQuOptionItemContent">
+      <label class="dwRedioStyle dwQuInputLabel" ></label>
+      <input id="qu_${en.quType }_${en.id }_${item.id}" type="radio" name="qu_${en.quType }_${en.id }" value="${item.id }">
+      <label class="editAble" >${item.optionName }</label>
+      <input type='text' class='inputSytle_1 dwQuOptionItemNote'  style="display: none;"   name="text_qu_${en.quType }_${en.id }_${item.id }"  />
+      <div class="quItemInputCase">
+        <input type="hidden" class="isNote" value="${item.isNote }">
+        <input type="hidden" class="checkType" value="${item.checkType }">
+        <input type="hidden" class="isRequiredFill" value="${item.isRequiredFill }">
       </div>
+    </div>
     </li>
   </ul>
   <div id="radioSelect_content" >
@@ -505,15 +505,15 @@
     </li>
   </ul>
   <div id="quScoreItemModel">
-    <div class="scoreRow quScoreOptionTr quOptionItemRow">
-      <input class="dwScoreOptionId" value="${item.id }" disabled="disabled" type="hidden"/>
-      <input type="hidden" class="answerTag" value="0" >
-      <div class="dwsurvey-controlgroup starRating" >
-        <div class="starOptionTitle" ><label class="editAble">${item.optionName }</label></div>
-        <div class="starOptionContent" >  </div>
+      <div class="scoreRow quScoreOptionTr quOptionItemRow">
+        <input class="dwScoreOptionId" value="${item.id }" disabled="disabled" type="hidden"/>
+        <input type="hidden" class="answerTag" value="0" >
+        <div class="dwsurvey-controlgroup starRating" >
+          <div class="starOptionTitle" ><label class="editAble">${item.optionName }</label></div>
+          <div class="starOptionContent" >  </div>
+        </div>
+        <input name="item_qu_${en.quType }_${en.id }_${item.id }" value=""  type="hidden" class="scoreNumInput" >
       </div>
-      <input name="item_qu_${en.quType }_${en.id }_${item.id }" value=""  type="hidden" class="scoreNumInput" >
-    </div>
   </div>
   <div id="quOrderItemLeftModel">
     <div class="ui-checkbox m_clickQuOrderItem">
@@ -525,22 +525,22 @@
     </div>
   </div>
   <div id="mFillblankTableModel" >
-    <div class="mFillblankTableTr">
-      <label  class="editAble" >${item.optionName }</label>
-      <input id="text_qu_${en.quType }_${en.id }_${item.id }" name="text_qu_${en.quType }_${en.id }_${item.id }"  type="text" class="dwMFillblankInput inputSytle_1 " >
-      <input class="dwMFillblankOptionId" value="${item.id }" disabled="disabled" type="hidden"/>
-      <input type="hidden" class="answerTag" value="0" >
-    </div>
+      <div class="mFillblankTableTr">
+        <label  class="editAble" >${item.optionName }</label>
+        <input id="text_qu_${en.quType }_${en.id }_${item.id }" name="text_qu_${en.quType }_${en.id }_${item.id }"  type="text" class="dwMFillblankInput inputSytle_1 " >
+        <input class="dwMFillblankOptionId" value="${item.id }" disabled="disabled" type="hidden"/>
+        <input type="hidden" class="answerTag" value="0" >
+      </div>
   </div>
 </div>
 <script type="text/javascript">
-  var bfbFloat=0;
-  $("#resultProgress").progressbar({value: bfbFloat,orientation: "vertical"});
-  var errorcode="${param['errorcode']}";
-  if(errorcode=="3"){
-    var errorHtml="<div class=\"errorItem\" style=\"padding-left:30px;padding-top:10px;\" ><label for=\"\" class=\"error\">验证码不正确,请重新回答!</label></div>";
-    $("#m-errorMsg").append(errorHtml);
-  }
+	var bfbFloat=0;
+	$("#resultProgress").progressbar({value: bfbFloat,orientation: "vertical"});
+var errorcode="${param['errorcode']}";
+if(errorcode=="3"){
+	var errorHtml="<div class=\"errorItem\" style=\"padding-left:30px;padding-top:10px;\" ><label for=\"\" class=\"error\">验证码不正确,请重新回答!</label></div>";
+	$("#m-errorMsg").append(errorHtml);
+}
 </script>
 </body>
 </html>

+ 3 - 3
src/main/resources/static/static/diaowen/answer-p.html

@@ -481,9 +481,9 @@
               <div class="frmItem" >
                 <label class="frm_label">验证码</label>
                 <div class="frm_controls">
-                                            <span class="auth-code" id="verifycodeImgArea">
-                                            <input name="jcaptchaInput" type="text" class="" style="width:100px;" autocomplete="off">
-                                            <img id="register-jcaptchaImg" onclick="refreshAutoCode('register-jcaptchaImg')" src="/api/dwsurvey/anon/jcap/jcaptcha.do" alt="验证码" height="40"></span>
+											<span class="auth-code" id="verifycodeImgArea">
+											<input name="jcaptchaInput" type="text" class="" style="width:100px;" autocomplete="off">
+											<img id="register-jcaptchaImg" onclick="refreshAutoCode('register-jcaptchaImg')" src="/api/dwsurvey/anon/jcap/jcaptcha.do" alt="验证码" height="40"></span>
                   <a href="javascript:refreshAutoCode('register-jcaptchaImg');" style="margin-left: 5px;" hidefocus="true">换一张</a>
                   <span class="frm_desc">输入下面图片的字符,区分大小写</span>
                   <p class="valid-msg fail" style="display: none;"><i>●</i><span class="msg_content">验证码错误,请重新输入</span></p>

File diff suppressed because it is too large
+ 0 - 2
src/main/resources/static/static/js/app.320bf4947ac20d65bc7a.js


File diff suppressed because it is too large
+ 0 - 1
src/main/resources/static/static/js/app.320bf4947ac20d65bc7a.js.map


File diff suppressed because it is too large
+ 2 - 0
src/main/resources/static/static/js/app.b3b61ca637f6ff24a786.js


File diff suppressed because it is too large
+ 1 - 0
src/main/resources/static/static/js/app.b3b61ca637f6ff24a786.js.map


File diff suppressed because it is too large
+ 1 - 1
src/main/resources/static/static/js/manifest.2ae2e69a05c33dfc65f8.js.map


File diff suppressed because it is too large
+ 4 - 4
src/main/resources/static/static/js/vendor.dc78b2c0581da8fd64c0.js


File diff suppressed because it is too large
+ 1 - 1
src/main/resources/static/static/js/vendor.dc78b2c0581da8fd64c0.js.map