Browse Source

Accept Merge Request #113 merge : (master -> test)

Merge Request: merge
Created By: @Antiloveg
Accepted By: @Antiloveg
URL: https://coding.net/t/aft/p/AFT/git/merge/113
Antiloveg 9 years ago
parent
commit
63b14064a0

+ 3 - 0
src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java

@@ -306,6 +306,9 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 		patentInfo.setDeletedSign(0);
 		patentInfo.setConfirmState(0);
 		patentInfo.setPatentState(PatentInfoStatus.CREATE.getCode());
+		Calendar now = Calendar.getInstance();
+		now.set(Calendar.MILLISECOND, 0);
+		patentInfo.setRecordTime(now.getTime());
 		if (TokenManager.getToken() instanceof Admin) {
 			patentInfo.setPrincipal(TokenManager.getAdminId());
 		} else {

+ 1 - 1
src/main/resources/shiro_base_auth.ini

@@ -8,4 +8,4 @@
 /static/**=anon
 /api/admin/**=login,permission
 /api/user/**=login
-/**=anon
+/**=permission