'增加匿名修改密码功能'

o2server/x_console/src/main/java/com/x/server/console/server/web/WebServerTools.java

@@ -12,6 +12,7 @@ import java.util.Objects;
 
 import javax.servlet.DispatcherType;
 
+import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -208,8 +209,10 @@ public class WebServerTools extends JettySeverTools {
 		    /*RSA*/
 			File publicKeyFile = new File(Config.base(), "config/public.key");
 			if (publicKeyFile.exists() && publicKeyFile.isFile()) {
-					String publicKey = FileUtils.readFileToString(publicKeyFile, "utf-8");
-					map.put("publicKey", publicKey);
+					 String publicKey = FileUtils.readFileToString(publicKeyFile, "utf-8");
+					 byte[] publicKeyB = Base64.decodeBase64(publicKey);
+					 publicKey = new String(Base64.encodeBase64(publicKeyB));
+					 map.put("publicKey", publicKey);
 			}
 			
 			FileUtils.writeStringToFile(file, gson.toJson(map), DefaultCharset.charset);

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/person/ActionSetPasswordAnonymous.java

@@ -0,0 +1,199 @@
+package com.x.organization.assemble.personal.jaxrs.person;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import com.google.gson.JsonElement;
+import com.x.base.core.container.EntityManagerContainer;
+import com.x.base.core.container.factory.EntityManagerContainerFactory;
+import com.x.base.core.project.annotation.FieldDescribe;
+import com.x.base.core.project.cache.ApplicationCache;
+import com.x.base.core.project.config.Config;
+import com.x.base.core.project.gson.GsonPropertyObject;
+import com.x.base.core.project.http.ActionResult;
+import com.x.base.core.project.http.EffectivePerson;
+import com.x.base.core.project.jaxrs.WrapBoolean;
+import com.x.base.core.project.logger.Logger;
+import com.x.base.core.project.logger.LoggerFactory;
+import com.x.base.core.project.tools.Crypto;
+import com.x.organization.assemble.personal.Business;
+import com.x.organization.assemble.personal.jaxrs.reset.ExceptionInvalidPassword;
+import com.x.organization.assemble.personal.jaxrs.reset.ExceptionPersonNotExisted;
+import com.x.organization.core.entity.Person;
+
+public class ActionSetPasswordAnonymous extends BaseAction {
+	private static Logger logger = LoggerFactory.getLogger(ActionSetPassword.class);
+
+	ActionResult<Wo> execute(EffectivePerson effectivePerson, JsonElement jsonElement) throws Exception {
+		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
+			ActionResult<Wo> result = new ActionResult<>();
+			Wi wi = this.convertToWrapIn(jsonElement, Wi.class);
+			Business business = new Business(emc);
+			
+			/** 排除xadmin */
+			if (Config.token().isInitialManager(wi.getUserName())) {
+				throw new ExceptionEditInitialManagerDeny();
+			} else {
+				if (StringUtils.isEmpty(wi.getUserName())) {
+					throw new ExceptionUserNameEmpty();
+				}
+				
+				Person o = business.person().getWithCredential(wi.getUserName());
+				if (null == o) {
+					throw new ExceptionPersonNotExist(wi.getUserName());
+				}
+				
+				Person person = emc.find(o.getId(), Person.class);
+				if (null == person) {
+					throw new ExceptionPersonNotExisted(wi.getUserName());
+				}
+				
+				if (StringUtils.isEmpty(wi.getOldPassword())) {
+					throw new ExceptionOldPasswordEmpty();
+				}
+				if (StringUtils.isEmpty(wi.getNewPassword())) {
+					throw new ExceptionNewPasswordEmpty();
+				}
+				
+				if (StringUtils.isEmpty(wi.getConfirmPassword())) {
+					throw new ExceptionConfirmPasswordEmpty();
+				}
+				
+				if (!StringUtils.equals(wi.getNewPassword(), wi.getConfirmPassword())) {
+					throw new ExceptionTwicePasswordNotMatch();
+				}
+				
+				if (StringUtils.equals(wi.getNewPassword(), wi.getOldPassword())) {
+					throw new ExceptionNewPasswordSameAsOldPassword();
+				}
+				
+				String oldPassword = wi.getOldPassword();
+				String newPassword = wi.getNewPassword();
+				String confirmPassword = wi.getConfirmPassword();
+				String isEncrypted = wi.getIsEncrypted();
+				
+				//RSA解秘
+				if (!StringUtils.isEmpty(isEncrypted)) {
+					if(isEncrypted.trim().equalsIgnoreCase("y")) {
+						oldPassword = this.decryptRSA(oldPassword);
+						newPassword = this.decryptRSA(newPassword);
+						confirmPassword = this.decryptRSA(confirmPassword);
+					}
+				}
+				
+				if (BooleanUtils.isTrue(Config.person().getSuperPermission())
+						&& StringUtils.equals(Config.token().getPassword(), oldPassword)) {
+					logger.info("user{name:" + person.getName() + "} use superPermission.");
+				} else {
+					if (!StringUtils.equals(Crypto.encrypt(oldPassword, Config.token().getKey()),
+							person.getPassword())) {
+						throw new ExceptionOldPasswordNotMatch();
+					}
+					if (!newPassword.matches(Config.person().getPasswordRegex())) {
+						throw new ExceptionInvalidPassword(Config.person().getPasswordRegexHint());
+					}
+				}
+				
+				emc.beginTransaction(Person.class);
+				business.person().setPassword(person, wi.getNewPassword());
+				emc.commit();
+				ApplicationCache.notify(Person.class);
+				Wo wo = new Wo();
+				wo.setValue(true);
+				result.setData(wo);
+			}
+
+			return result;
+		}
+	}
+	
+	
+		public  String decryptRSA(String strDecrypt) {
+			String privateKey;
+			String decrypt = null;
+			try {
+				privateKey = getPrivateKey();
+			    decrypt = Crypto.rsaDecrypt(strDecrypt, privateKey);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			return decrypt;
+		}
+	
+		public  String  getPrivateKey() {
+			 String privateKey = "";
+			 try {
+				 privateKey = Config.privateKey();
+				 byte[] privateKeyB = Base64.decodeBase64(privateKey);
+				 privateKey = new String(Base64.encodeBase64(privateKeyB));
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			return privateKey;
+		}
+
+	public static class Wi extends GsonPropertyObject {
+		
+		@FieldDescribe("用户名")
+		private String userName;
+		
+		@FieldDescribe("原密码")
+		private String oldPassword;
+		
+		@FieldDescribe("新密码")
+		private String newPassword;
+		
+		@FieldDescribe("确认新密码")
+		private String confirmPassword;	
+		
+		@FieldDescribe("是否启用加密,默认不加密,启用(y)。注意:使用加密先要在服务器运行 create encrypt key")
+		private String isEncrypted;
+		
+		
+		public String getUserName() {
+			return userName;
+		}
+
+		public void setUserName(String userName) {
+			this.userName = userName;
+		}
+
+		public String getOldPassword() {
+			return oldPassword;
+		}
+
+		public void setOldPassword(String oldPassword) {
+			this.oldPassword = oldPassword;
+		}
+
+		public String getConfirmPassword() {
+			return confirmPassword;
+		}
+
+		public void setConfirmPassword(String confirmPassword) {
+			this.confirmPassword = confirmPassword;
+		}
+
+		public String getNewPassword() {
+			return newPassword;
+		}
+
+		public void setNewPassword(String newPassword) {
+			this.newPassword = newPassword;
+		}
+
+		public String getIsEncrypted() {
+			return isEncrypted;
+		}
+
+		public void setIsEncrypted(String isEncrypted) {
+			this.isEncrypted = isEncrypted;
+		}
+	}
+
+	public static class Wo extends WrapBoolean {
+
+	}
+
+}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/person/ExceptionUserNameEmpty.java

@@ -0,0 +1,16 @@
+package com.x.organization.assemble.personal.jaxrs.person;
+
+import com.x.base.core.project.exception.PromptException;
+
+public class ExceptionUserNameEmpty  extends PromptException {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	ExceptionUserNameEmpty() {
+		super("用户名不能为空.");
+	}
+
+}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/person/PersonAction.java

@@ -137,4 +137,23 @@ public class PersonAction extends StandardJaxrsAction {
 		}
 		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
 	}
+	
+	@JaxrsMethodDescribe(value = "匿名更新个人的密码.", action = ActionSetPasswordAnonymous.class)
+	@POST
+	@Path("passwordAnonymous")
+	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+	@Consumes(MediaType.APPLICATION_JSON)
+	public void setPasswordAnonymous(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+			JsonElement jsonElement) {
+		ActionResult<ActionSetPasswordAnonymous.Wo> result = new ActionResult<>();
+		EffectivePerson effectivePerson = this.effectivePerson(request);
+		try {
+			result = new ActionSetPasswordAnonymous().execute(effectivePerson, jsonElement);
+		} catch (Exception e) {
+			logger.error(e, effectivePerson, request, jsonElement);
+			result.error(e);
+		}
+		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+	}
+	
 }