规范代码

common/src/main/java/com/jeesite/common/codec/AesUtils.java

@@ -1,7 +1,7 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
  */
-package com.jeesite.common.security;
+package com.jeesite.common.codec;
 
 import java.io.UnsupportedEncodingException;
 import java.security.GeneralSecurityException;
@@ -13,7 +13,6 @@ import javax.crypto.SecretKey;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
-import com.jeesite.common.codec.EncodeUtils;
 import com.jeesite.common.lang.ExceptionUtils;
 
 /**

common/src/main/java/com/jeesite/common/codec/DesUtils.java

@@ -1,7 +1,7 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
  */
-package com.jeesite.common.security;
+package com.jeesite.common.codec;
 
 import java.util.ArrayList;
 import java.util.List;

common/src/main/java/com/jeesite/common/codec/DigestUtils.java

@@ -1,7 +1,7 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
  */
-package com.jeesite.common.security;
+package com.jeesite.common.codec;
 
 import java.io.IOException;
 import java.io.InputStream;

common/src/main/java/com/jeesite/common/codec/Md5Utils.java

@@ -1,7 +1,7 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
  */
-package com.jeesite.common.security;
+package com.jeesite.common.codec;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -9,8 +9,6 @@ import java.io.UnsupportedEncodingException;
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.jeesite.common.codec.EncodeUtils;
-
 /**
  * MD5不可逆加密工具类
  * @author ThinkGem

common/src/main/java/com/jeesite/common/codec/Sha1Utils.java

@@ -1,7 +1,7 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
  */
-package com.jeesite.common.security;
+package com.jeesite.common.codec;
 
 import java.io.IOException;
 import java.io.InputStream;

modules/core/src/main/java/com/jeesite/common/shiro/filter/FormAuthenticationFilter.java

@@ -22,11 +22,11 @@ import org.apache.shiro.web.util.WebUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.jeesite.common.codec.DesUtils;
 import com.jeesite.common.config.Global;
 import com.jeesite.common.lang.ObjectUtils;
 import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.network.IpUtils;
-import com.jeesite.common.security.DesUtils;
 import com.jeesite.common.shiro.authc.FormToken;
 import com.jeesite.common.shiro.realm.BaseAuthorizingRealm;
 import com.jeesite.common.web.http.ServletUtils;

modules/core/src/test/java/com/jeesite/test/MobileAppTest.java

@@ -3,10 +3,10 @@ package com.jeesite.test;
 import java.util.List;
 import java.util.Map;
 
+import com.jeesite.common.codec.DesUtils;
 import com.jeesite.common.collect.ListUtils;
 import com.jeesite.common.collect.MapUtils;
 import com.jeesite.common.mapper.JsonMapper;
-import com.jeesite.common.security.DesUtils;
 import com.jeesite.common.web.http.HttpClientUtils;
 
 /**

web/src/main/java/com/jeesite/modules/test/entity/TestTree.java

@@ -38,10 +38,12 @@ public class TestTree extends TreeEntity<TestTree> {
 		super(id);
 	}
 	
+	@Override
 	public TestTree getParent() {
 		return parent;
 	}
 
+	@Override
 	public void setParent(TestTree parent) {
 		this.parent = parent;
 	}

web/src/main/java/com/jeesite/modules/test/service/TestDataService.java

@@ -34,6 +34,7 @@ public class TestDataService extends CrudService<TestDataDao, TestData> {
 	 * @param testData
 	 * @return
 	 */
+	@Override
 	public TestData get(TestData testData) {
 		TestData entity = super.get(testData);
 		if (entity != null){
@@ -50,6 +51,7 @@ public class TestDataService extends CrudService<TestDataDao, TestData> {
 	 * @param testData
 	 * @return
 	 */
+	@Override
 	public Page<TestData> findPage(Page<TestData> page, TestData testData) {
 		return super.findPage(page, testData);
 	}
@@ -58,6 +60,7 @@ public class TestDataService extends CrudService<TestDataDao, TestData> {
 	 * 保存数据（插入或更新）
 	 * @param testData
 	 */
+	@Override
 	@Transactional(readOnly=false)
 	public void save(TestData testData) {
 		super.save(testData);
@@ -86,6 +89,7 @@ public class TestDataService extends CrudService<TestDataDao, TestData> {
 	 * 更新状态
 	 * @param testData
 	 */
+	@Override
 	@Transactional(readOnly=false)
 	public void updateStatus(TestData testData) {
 		super.updateStatus(testData);
@@ -95,6 +99,7 @@ public class TestDataService extends CrudService<TestDataDao, TestData> {
 	 * 删除数据
 	 * @param testData
 	 */
+	@Override
 	@Transactional(readOnly=false)
 	public void delete(TestData testData) {
 		super.delete(testData);

web/src/main/java/com/jeesite/modules/test/service/TestTreeService.java

@@ -28,6 +28,7 @@ public class TestTreeService extends TreeService<TestTreeDao, TestTree> {
 	 * @param testTree
 	 * @return
 	 */
+	@Override
 	public TestTree get(TestTree testTree) {
 		return super.get(testTree);
 	}
@@ -37,6 +38,7 @@ public class TestTreeService extends TreeService<TestTreeDao, TestTree> {
 	 * @param testTree
 	 * @return
 	 */
+	@Override
 	public List<TestTree> findList(TestTree testTree) {
 		return super.findList(testTree);
 	}
@@ -45,6 +47,7 @@ public class TestTreeService extends TreeService<TestTreeDao, TestTree> {
 	 * 保存数据（插入或更新）
 	 * @param testTree
 	 */
+	@Override
 	@Transactional(readOnly=false)
 	public void save(TestTree testTree) {
 		super.save(testTree);
@@ -58,6 +61,7 @@ public class TestTreeService extends TreeService<TestTreeDao, TestTree> {
 	 * 更新状态
 	 * @param testTree
 	 */
+	@Override
 	@Transactional(readOnly=false)
 	public void updateStatus(TestTree testTree) {
 		super.updateStatus(testTree);
@@ -67,6 +71,7 @@ public class TestTreeService extends TreeService<TestTreeDao, TestTree> {
 	 * 删除数据
 	 * @param testTree
 	 */
+	@Override
 	@Transactional(readOnly=false)
 	public void delete(TestTree testTree) {
 		super.delete(testTree);