'修改了服务器起动时config.json增加了publicKey,修改密码增加RSA功能'

o2server/x_base_core_project/src/main/java/com/x/base/core/project/tools/Crypto.java

@@ -118,58 +118,6 @@ public class Crypto {
 		}
 	}
 
-	//用户登入解密 转成Base64	
-	public static String decryptRSA(String strDecrypt) {
-		String privateKey;
-		String decrypt = null;
-		try {
-			privateKey = getPrivateKey();
-		    decrypt = Crypto.rsaDecrypt(strDecrypt, privateKey);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return decrypt;
-	}
-	//转成Base64	
-	public static String encryptRSA(String strEncrypt) {
-		String encrypt = null;
-		try {
-			 String publicKey = Config.publicKey();
-			 byte[] publicKeyB = Base64.decodeBase64(publicKey);
-			 
-			encrypt = Crypto.rsaEncrypt(strEncrypt,new String(Base64.encodeBase64(publicKeyB)));
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return encrypt;
-	}
-	
-	//转成Base64			
-	public static String  getPublicKey() {
-		String publicKey = "";
-		 try {
-			 publicKey = Config.publicKey();
-			 byte[] publicKeyB = Base64.decodeBase64(publicKey);
-			 publicKey = new String(Base64.encodeBase64(publicKeyB));
-			 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return publicKey;
-	}
-	
-	//转成Base64		
-	public static 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 final String TEST_PUBLIC_KEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCWcVZIS57VeOUzi8c01WKvwJK9uRe6hrGTUYmF6J/pI6/UvCbdBWCoErbzsBZOElOH8Sqal3vsNMVLjPYClfoDyYDaUlakP3ldfnXJzAFJVVubF53KadG+fwnh9ZMvxdh7VXVqRL3IQBDwGgzX4rmSK+qkUJjc3OkrNJPB7LLD8QIDAQAB";
 	public static final String TEST_PRIVATE_KEY = "MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAJZxVkhLntV45TOLxzTVYq/Akr25F7qGsZNRiYXon+kjr9S8Jt0FYKgStvOwFk4SU4fxKpqXe+w0xUuM9gKV+gPJgNpSVqQ/eV1+dcnMAUlVW5sXncpp0b5/CeH1ky/F2HtVdWpEvchAEPAaDNfiuZIr6qRQmNzc6Ss0k8HsssPxAgMBAAECgYAWtRy05NUgm5Lc6Og0jVDL/mEnydxPBy2ectwzHh2k7wIHNi8XhUxFki2TMqzrM9Dv3/LySpMl4AE3mhs34LNPy6F+MwyF5X7j+2Y6MflJyeb9HNyT++viysQneoOEiOk3ghxF2/GPjpiEF79wSp+1YKTxRAyq7ypV3t35fGOOEQJBANLDPWl8b5c3lrcz/dTamMjHbVamEyX43yzQOphzkhYsz4pruATzTxU+z8/zPdEqHcWWV39CP3xu3EYNcAhxJW8CQQC2u7PF5Xb1xYRCsmIPssFxil64vvdUadSxl7GLAgjQ9ULyYWB24KObCEzLnPcT8Pf2Q0YQOixxa/78FuzmgbyfAkA7ZFFV/H7lugB6t+f7p24OhkRFep9CwBMD6dnZRBgSr6X8d8ZvfrD2Z7DgBMeSva+OEoOtlNmXExZ3lynO9zN5AkAVczEmIMp3DSl6XtAuAZC9kD2QODJ2QToLYsAfjiyUwsWKCC43piTuVOoW2KUUPSwOR1VZIEsJQWEcHGDQqhgHAkAeZ7a6dVRZFdBwKA0ADjYCufAW2cIYiVDQBJpgB+kiLQflusNOCBK0FT3lg8BdUSy2D253Ih6l3lbaM/4M7DFQ";

o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ActionCaptchaLogin.java

@@ -42,7 +42,7 @@ class ActionCaptchaLogin extends BaseAction {
 			//RSA解秘
 			if (!StringUtils.isEmpty(isEncrypted)) {
 				if(isEncrypted.trim().equalsIgnoreCase("y")) {
-			    	password = Crypto.decryptRSA(password);
+			    	password = this.decryptRSA(password);
 				}
 			}
 			
@@ -115,6 +115,61 @@ class ActionCaptchaLogin extends BaseAction {
 		}
 	}
 
+	
+	
+	//用户登入解密 转成Base64	
+		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;
+		}
+		//转成Base64	
+		public  String encryptRSA(String strEncrypt) {
+			String encrypt = null;
+			try {
+				 String publicKey = Config.publicKey();
+				 byte[] publicKeyB = Base64.decodeBase64(publicKey);
+				 
+				encrypt = Crypto.rsaEncrypt(strEncrypt,new String(Base64.encodeBase64(publicKeyB)));
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			return encrypt;
+		}
+		
+		//转成Base64			
+		public  String  getPublicKey() {
+			String publicKey = "";
+			 try {
+				 publicKey = Config.publicKey();
+				 byte[] publicKeyB = Base64.decodeBase64(publicKey);
+				 publicKey = new String(Base64.encodeBase64(publicKeyB));
+				 
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			return publicKey;
+		}
+		
+		//转成Base64		
+		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("凭证")

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

@@ -2,6 +2,7 @@ package com.x.organization.assemble.personal.jaxrs.person;
 
 import java.util.Date;
 
+import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -69,9 +70,9 @@ class ActionSetPassword extends BaseAction {
 				//RSA解秘
 				if (!StringUtils.isEmpty(isEncrypted)) {
 					if(isEncrypted.trim().equalsIgnoreCase("y")) {
-						oldPassword = Crypto.decryptRSA(oldPassword);
-						newPassword = Crypto.decryptRSA(newPassword);
-						confirmPassword = Crypto.decryptRSA(confirmPassword);
+						oldPassword = this.decryptRSA(oldPassword);
+						newPassword = this.decryptRSA(newPassword);
+						confirmPassword = this.decryptRSA(confirmPassword);
 					}
 				}
 				
@@ -103,6 +104,31 @@ class ActionSetPassword extends BaseAction {
 			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 {