用户管理编辑时数据不致问题， 二维码加上logo图标

src/main/java/com/key/common/utils/twodimension/TwoDimensionCode.java

@@ -1,19 +1,19 @@
 package com.key.common.utils.twodimension;
 
-import java.awt.Color;
-import java.awt.Graphics2D;
+import java.awt.*;
 import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
+import java.net.URL;
 
 import javax.imageio.ImageIO;
 
+import com.key.common.plugs.ipaddr.IPSeeker;
 import jp.sourceforge.qrcode.QRCodeDecoder;
 import jp.sourceforge.qrcode.exception.DecodingFailedException;
 
 import com.swetake.util.Qrcode;
+import sun.misc.BASE64Decoder;
+import sun.misc.BASE64Encoder;
 
 public class TwoDimensionCode {
 	
@@ -134,6 +134,12 @@ public class TwoDimensionCode {
 			} else {
 				throw new Exception("QRCode content bytes length = " + contentBytes.length + " not in [0, 800].");
 			}
+			Image logo = ImageIO.read(new URL("http://www.diaowen.net/images/logo/200-200.png"));
+			int widthLogo = logo.getWidth(null)>bufImg.getWidth()*2/10?(bufImg.getWidth()*2/10):logo.getWidth(null),
+					heightLogo = logo.getHeight(null)>bufImg.getHeight()*2/10?(bufImg.getHeight()*2/10):logo.getWidth(null);
+			int x = (bufImg.getWidth() - widthLogo) / 2;
+			int y = (bufImg.getHeight() - heightLogo) / 2;
+			gs.drawImage(logo, x, y, widthLogo, heightLogo, null);
 			gs.dispose();
 			bufImg.flush();
 		} catch (Exception e) {
@@ -188,6 +194,7 @@ public class TwoDimensionCode {
 		return content;
 	}
 
+
 	public static void main(String[] args) {
 	/*
 		String imgPath = "G:/twoDim/Michael_QRCode.png";
@@ -206,7 +213,7 @@ public class TwoDimensionCode {
 		String decoderContent = handler.decoderQRCode(imgPath);
 		System.out.println("解析结果如下：");
 		System.out.println(decoderContent);
-		System.out.println("========decoder success!!!");
+		System.out.println("========decoder success!!!");/Users/keyuan/Documents/GIT/my-gitlab/dw/dwsurvey/src/main/webapp/images/logo/200-200.png
 		*/
 	}
 }

src/main/java/com/key/dwsurvey/action/UserAdminAction.java

@@ -54,7 +54,6 @@ public class UserAdminAction extends CrudActionSupport<User, String> {
 	@Override
 	public String save() throws Exception {
 		HttpServletRequest request= Struts2Utils.getRequest();
-		entity.setStatus(1);
 		userManager.adminSave(entity,null);
 		return RELOAD;
 	}

src/main/webapp/WEB-INF/page/content/diaowen-design/survey.jsp

@@ -2527,26 +2527,6 @@
 					<li><label>输入框高：</label>
 					<input type="text" name="qu_inputRow" value="1"><span>&nbsp;行</span>
 					</li>
-					<li><label>数据类型：</label>
-					<select class="option_range" name="quFill_checkType"  style="width:120px;">
-					<option value="NO">无验证</option>
-					<option value="EMAIL">Email</option>
-					<!-- <option value="STRLEN">字符长度</option> -->
-					<option value="UNSTRCN">禁止中文</option>
-					<option value="STRCN">仅许中文</option>
-					<option value="NUM">数值</option>
-					<option value="TELENUM">电话号码</option>
-					<option value="PHONENUM">手机号码</option>
-					<option value="DATE">日期</option>
-					<option value="IDENTCODE">身份证号</option>
-					<option value="ZIPCODE">邮政编码</option>
-					<option value="URL">网址</option>
-					<!-- <option value="4">下拉显示</option> -->
-					</select>
-					<span class="option_range_3" style="display:none;">&nbsp;列</span>
-					</li>
-					<!-- <li>最少选&nbsp;<input type="text" size="3">&nbsp;项 </li>
-					<li>最多选&nbsp;<input type="text" size="3">&nbsp;项 </li> -->
 				</ul>
 				<div class="dwQuDialogBtnCon" ><input type="button" value="保存" class="quDialogBtn" id="dwDialogQuFillOptionSave"/></div>
 			</div>
@@ -2555,26 +2535,6 @@
 				<ul>
 					<li><label>选项设置</label></li>
 					<li class="quOptionAddFill"><label><input type="checkbox" name="quOption_isNote" >选项后添加填空</label> </li>
-					<li class="quOptionFillContentLi"><label style="padding-left:16px;">填空内容：</label>
-					<select class="option_range" name="quOption_checkType"  style="width:120px;">
-					<option value="NO">无限制</option>
-					<option value="EMAIL">Email</option>
-					<!-- <option value="STRLEN">字符长度</option> -->
-					<option value="UNSTRCN">禁止中文</option>
-					<option value="STRCN">仅许中文</option>
-					<option value="NUM">数值</option>
-					<option value="TELENUM">电话号码</option>
-					<option value="PHONENUM">手机号码</option>
-					<option value="DATE">日期</option>
-					<option value="IDENTCODE">身份证号</option>
-					<option value="ZIPCODE">邮政编码</option>
-					<option value="URL">网址</option>
-					<!-- <option value="4">下拉显示</option> -->
-					</select>
-					<span class="option_range_3" style="display:none;">&nbsp;列</span>
-					</li>
-					<li class="quOptionFillRequiredLi"><label style="padding-left:15px;"><input type="checkbox" name="quOption_isRequiredFill" checked="checked" >&nbsp;该空可不填</label>&nbsp;</li>
-					<!-- <li>最多选&nbsp;<input type="text" size="3">&nbsp;项 </li> -->
 				</ul>
 				<div class="dwQuDialogBtnCon" ><input type="button" value="保存" class="quDialogBtn" id="dwDialogQuOptionSetSave"/></div>
 		</div>

src/main/webapp/WEB-INF/page/content/diaowen-useradmin/input.jsp

@@ -92,12 +92,12 @@ $(document).ready(function(){
 										<td valign="top" align="left" >
 											<table class="ac-form-table">
 												<tr>
-													<td width="80" align="right"><span class="red-color">*&nbsp;</span>昵称</td>
-													<td class="ac-input-td"><input type="text"  name="name" value="${loginName }"  > </td>
+													<td width="80" align="right"><span class="red-color">*&nbsp;</span>登录名</td>
+													<td class="ac-input-td"><input type="text"  name="loginName" value="${loginName }" disabled style="background: #cecad2;"  > </td>
 												</tr>
 												<tr>
-													<td width="80" align="right"><span class="red-color">*&nbsp;</span>登录名</td>
-													<td class="ac-input-td"><input type="text"  name="loginName" value="${loginName }"  > </td>
+													<td width="80" align="right"><span class="red-color">*&nbsp;</span>昵称</td>
+													<td class="ac-input-td"><input type="text"  name="name" value="${name }"  > </td>
 												</tr>
 												<tr>
 													<td width="80" align="right"><span class="red-color">*&nbsp;</span>邮箱</td>

src/main/webapp/js/dw/dw-design-init.js

@@ -647,9 +647,7 @@ $(document).ready(function(){
 		var quOptionParent=$(dwDialogObj).parent();
 		//设置回显值 isNote checkType
 		var quOption_isNote=$("#modelUIDialog input[name='quOption_isNote']");
-		var quOption_checkType=$("#modelUIDialog select[name='quOption_checkType']");
-		var quOption_isRequiredFill=$("#modelUIDialog input[name='quOption_isRequiredFill']");
-		
+
 		var isNote=quOptionParent.find("input[name='isNote']");
 		var checkType=quOptionParent.find("input[name='checkType']");
 		var isRequiredFill=quOptionParent.find("input[name='isRequiredFill']");
@@ -658,30 +656,15 @@ $(document).ready(function(){
 			quItemBody.find("input[name='saveTag']").val(0);
 			quOptionParent.find("input[name='quItemSaveTag']").val(0);
 		}
-		if(quOption_checkType.val()!=checkType.val()){
-			quItemBody.find("input[name='saveTag']").val(0);
-			quOptionParent.find("input[name='quItemSaveTag']").val(0);
-		}
-		if(quOption_isRequiredFill.val()!=isRequiredFill.val()){
-			quItemBody.find("input[name='saveTag']").val(0);
-			quOptionParent.find("input[name='quItemSaveTag']").val(0);
-		}
+
 		//alert(isNote.attr("name"));
 		if(quOption_isNote.prop("checked")){
 			isNote.val(1);	
 		}else{
 			isNote.val(0);
 		}
-		var checkTypeVal=quOption_checkType.val();
-		if(checkTypeVal==""){
-			checkTypeVal="NO";
-		}
-		checkType.val(checkTypeVal);
-		if(quOption_isRequiredFill.prop("checked")){
-			isRequiredFill.val(1);
-		}else{
-			isRequiredFill.val(0);
-		}
+		checkType.val("NO");
+		isRequiredFill.val(0);
 		//显示填空框
 		//$(dwDialogObj).after("<input type='text' class='optionInpText' />");
 		quOptionParent.find(".optionInpText").show();
@@ -694,35 +677,19 @@ $(document).ready(function(){
 	
 	//填空题--填空框设置
 	$("#dwDialogQuFillOptionSave").click(function(){
-		//alert("..dwDialogObj:"+$(dwDialogObj).attr("class"));
 		var quItemBody=$(dwDialogObj).parents(".surveyQuItemBody");
-		//设置回显值 isNote checkType
-		var quFill_checkType=$("#modelUIDialog select[name='quFill_checkType']");
 		var qu_inputWidth=$("#modelUIDialog input[name='qu_inputWidth']");
 		var qu_inputRow=$("#modelUIDialog input[name='qu_inputRow']");
-		//var quFill_checkType=$("#dwCommonDialog select[name='quFill_checkType']");
-		//var quOption_isRequiredFill=$("#dwCommonDialog input[name='quOption_isRequiredFill']");
-		
 		var checkType=quItemBody.find("input[name='checkType']");
-		//输入框 input 大小调整 quFillblankAnswerInput  quFillblankAnswerTextarea
 		var answerInputWidth=quItemBody.find("input[name='answerInputWidth']");
 		var answerInputRow=quItemBody.find("input[name='answerInputRow']");
-		
-		//	var saveTag=quItemBody.find("input[name='saveTag']").val();
-		if(checkType.val()!=quFill_checkType.val() || answerInputWidth.val()!=qu_inputWidth.val() || answerInputRow.val()!=qu_inputRow.val()){
+
+		if(answerInputWidth.val()!=qu_inputWidth.val() || answerInputRow.val()!=qu_inputRow.val()){
 			quItemBody.find("input[name='saveTag']").val(0);
 		}
-		
-		var checkTypeVal=quFill_checkType.val();
-		if(checkTypeVal==""){
-			checkTypeVal="NO";
-		}
-		checkType.val(checkTypeVal);
-	
+		checkType.val("NO");
 		answerInputWidth.val(qu_inputWidth.val());
 		answerInputRow.val(qu_inputRow.val());
-		
-		//alert(qu_inputRow);
 		if(qu_inputRow.val()>1){
 			quItemBody.find(".quFillblankAnswerTextarea").show();
 			quItemBody.find(".quFillblankAnswerInput").hide();
@@ -733,8 +700,6 @@ $(document).ready(function(){
 			quItemBody.find(".quFillblankAnswerInput").show();
 			quItemBody.find(".quFillblankAnswerInput").width(qu_inputWidth.val());
 		}
-		
-		//quItemBody.find(".quCoItemUlLi").removeClass("menuBtnClick");
 		quItemBody.find(".quCoItemUlLi").removeClass("hover");
 		$("#modelUIDialog").dialog("close");
 		resetQuItemHover(null);
@@ -1133,18 +1098,6 @@ function bindQuHoverItem(){
 		return false;
 	});
 	
-	$("input[name='quOption_isNote']").unbind();
-	$("input[name='quOption_isNote']").click(function(){
-		var optionCk=$(this).prop("checked");
-		if(optionCk){
-			$(".quOptionFillContentLi,.quOptionFillRequiredLi").show();
-			//$("#modelUIDialog").dialog("open");
-			$("#modelUIDialog").dialog("option","height",230);
-		}else{
-			$(".quOptionFillContentLi,.quOptionFillRequiredLi").hide();
-		}
-	});
-	
 	$("#dwSurveyQuContent .surveyQuItemBody").unbind();
 	$("#dwSurveyQuContent .surveyQuItemBody").hover(function(){
 		//显示
@@ -1683,8 +1636,6 @@ function showUIDialog(thDialogObj){
 		if(checkType_val==""){
 			checkType_val="NO";
 		}
-		var checkType=$("#modelUIDialog select[name='quFill_checkType']");
-		checkType.val(checkType_val);
 		var qu_inputWidth=$("#modelUIDialog input[name='qu_inputWidth']");
 		var qu_inputRow=$("#modelUIDialog input[name='qu_inputRow']");
 		if(answerInputWidth_val==""){
@@ -1813,12 +1764,6 @@ function showDialog(thDialogObj){
 		$("#dwCommonDialog .dwQuDialogLoad").show();
 	}else if(thObjClass.indexOf("dwFbMenuBtn")>=0){
 		$("#dwCommonDialog .dwQuFillDataTypeOption").show();
-		var checkType_val=quItemBody.find("input[name='checkType']").val();
-		if(checkType_val==""){
-			checkType_val="NO";
-		}
-		var checkType=$("#dwCommonDialog select[name='quFill_checkType']");
-		checkType.val(checkType_val);
 	}else if(thObjClass.indexOf("quCoOptionEdit")>=0){
 		$("#dwCommonDialog .dwQuRadioCheckboxOption").show();
 		//设置回显值 isNote checkType