Merge pull request #27 from yinjihuan/encrypt1.1

fix context-path bug

Author: yinjihuan

encrypt-core/src/main/java/com/cxytiandi/encrypt/springboot/init/ApiEncryptDataInit.java

@@ -42,8 +42,11 @@ public class ApiEncryptDataInit implements ApplicationContextAware {
 	 */
 	public static List<String> requestDecyptUriList = new ArrayList<String>();
 
+	private String contextPath;
+	
     @Override
     public void setApplicationContext(ApplicationContext ctx) throws BeansException {
+    	this.contextPath = ctx.getEnvironment().getProperty("server.servlet.context-path");
         Map<String, Object> beanMap = ctx.getBeansWithAnnotation(RestController.class);
         initData(beanMap);
         beanMap = ctx.getBeansWithAnnotation(Controller.class);
@@ -115,6 +118,9 @@ private String getApiUri(Class<?> clz, Method method) {
 
         }
 
+        if (StringUtils.hasText(this.contextPath)) {
+        	 return methodType + this.contextPath + uri.toString();
+		}
         return methodType + uri.toString();
     }
 

encrypt-core/src/main/java/com/cxytiandi/encrypt/util/AesEncryptUtils.java

@@ -35,7 +35,7 @@ public static String aesDecryptByBytes(byte[] encryptBytes, String decryptKey) t
 		Cipher cipher = Cipher.getInstance(ALGORITHMSTR);
 		cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(decryptKey.getBytes(), "AES"));
 		byte[] decryptBytes = cipher.doFinal(encryptBytes);
-		return new String(decryptBytes);
+		return new String(decryptBytes, "utf-8");
 	}
 
 	public static String aesDecrypt(String encryptStr, String decryptKey) throws Exception {

encrypt-springboot-example/src/main/resources/application.properties

@@ -1,4 +1,5 @@
 server.port=8011
+#server.servlet.context-path=/example
 logging.level.com.cxytiandi.encrypt=DEBUG
 
 spring.freemarker.cache=true