Browse Source

1.login接口更改
2.delete企业标准制定情况记录接口

Antiloveg 9 years ago
parent
commit
840cb35ec7

+ 1 - 4
src/main/java/com/goafanti/common/controller/BaseController.java

@@ -90,11 +90,8 @@ public class BaseController {
 		model.addAttribute("basePath", request.getContextPath());
 		model.addAttribute("uploadPath",uploadPath);
 		model.addAttribute("uploadPrivatePath",uploadPrivatePath);
-		if(SecurityUtils.getSubject().getPrincipal()  instanceof User){
+		if (SecurityUtils.getSubject().getPrincipal()  instanceof User){
 			model.addAttribute("userData", TokenManager.getToken() );
 		}
-		
-		/*model.addAttribute("accessKey",accessKey);
-		model.addAttribute("accessSecret",accessSecret);*/
 	}
 }

+ 4 - 3
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -11,6 +11,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -28,12 +29,13 @@ import com.aliyuncs.sms.model.v20160927.SingleSendSmsRequest;
 import com.aliyuncs.sms.model.v20160927.SingleSendSmsResponse;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.model.Admin;
+import com.goafanti.common.model.User;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.PictureUtils;
 import com.goafanti.common.utils.TimeUtils;
 import com.goafanti.common.utils.VerifyCodeUtils;
 import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.user.bo.UserDownLoadBo;
 import com.goafanti.user.service.UserService;
 
 @Controller
@@ -253,8 +255,7 @@ public class PublicController extends BaseController {
 		} catch (IOException e) {
 			LoggerUtils.fmtError(getClass(), e, "获取图片异常:%s", e.getMessage());
 		}
-		
-		
 	}
+	
 
 }

+ 1 - 1
src/main/java/com/goafanti/common/model/Admin.java

@@ -4,7 +4,7 @@ import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
-public class Admin extends BaseModel{
+public class Admin extends BaseModel implements AftUser{
 	private static final long serialVersionUID = 1L;
 	
     private String id;

+ 11 - 0
src/main/java/com/goafanti/common/model/AftUser.java

@@ -0,0 +1,11 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public interface AftUser {
+	 String getId();
+	 
+	 String getPassword();
+	 
+	 Date getCreateTime();
+}

+ 1 - 1
src/main/java/com/goafanti/common/model/User.java

@@ -10,7 +10,7 @@ import com.goafanti.common.constant.ErrorConstants;
 
 
 
-public class User extends BaseModel{
+public class User extends BaseModel implements AftUser{
     /**
 	 * 
 	 */

+ 5 - 0
src/main/java/com/goafanti/common/utils/PasswordUtil.java

@@ -6,6 +6,7 @@ import org.apache.shiro.crypto.hash.SimpleHash;
 import org.apache.shiro.util.ByteSource;
 
 import com.goafanti.common.model.Admin;
+import com.goafanti.common.model.AftUser;
 import com.goafanti.common.model.User;
 
 public class PasswordUtil {
@@ -39,6 +40,10 @@ public class PasswordUtil {
 	public ByteSource getManageSalt(Admin admin) {
 		return ByteSource.Util.bytes(String.valueOf(admin.getCreateTime().getTime()));
 	}
+	
+	public ByteSource getAftSalt(AftUser aftUser) {
+		return ByteSource.Util.bytes(String.valueOf(aftUser.getCreateTime().getTime()));
+	}
 
 	public ByteSource getSalt(Date date) {
 		return ByteSource.Util.bytes(String.valueOf(date.getTime()));

+ 5 - 2
src/main/java/com/goafanti/core/shiro/token/UserRealm.java

@@ -15,6 +15,7 @@ import org.apache.shiro.subject.SimplePrincipalCollection;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.goafanti.common.model.Admin;
+import com.goafanti.common.model.AftUser;
 import com.goafanti.common.model.User;
 import com.goafanti.common.utils.PasswordUtil;
 import com.goafanti.techservice.patent.service.AdminService;
@@ -44,7 +45,8 @@ public class UserRealm extends AuthorizingRealm {
 			if (null == admin) {
 				throw new UnknownAccountException();
 			}
-			return new SimpleAuthenticationInfo(admin, admin.getPassword(), passwordUtil.getManageSalt(admin),
+			AftUser aftUser = admin;
+			return new SimpleAuthenticationInfo(aftUser, aftUser.getPassword(), passwordUtil.getAftSalt(aftUser),
 					getName());
 		} else {
 			User user = userService.selectByMobieAndType(token.getUsername(), token.getType());
@@ -52,7 +54,8 @@ public class UserRealm extends AuthorizingRealm {
 
 				throw new UnknownAccountException();
 			}
-			return new SimpleAuthenticationInfo(user, user.getPassword(), passwordUtil.getSalt(user), getName());
+			AftUser aftUser = user;
+			return new SimpleAuthenticationInfo(aftUser, aftUser.getPassword(), passwordUtil.getAftSalt(aftUser), getName());
 		}
 		// User user = userService.findUserByEmail(token.getUsername());
 		// if (null == user) {

+ 12 - 0
src/main/java/com/goafanti/techservice/cognizance/controller/CognizanceApiController.java

@@ -120,4 +120,16 @@ public class CognizanceApiController extends BaseApiController {
 		res.setData(orgStandard);
 		return res;
 	}
+	
+	/**
+	 * 删除选中标准制定情况记录
+	 * @param id 记录id
+	 * @return
+	 */
+	@RequestMapping(value = "/deleteStandard", method = RequestMethod.POST)
+	public Result deleteStandard(String id){
+		Result res = new Result();
+		res.setData(orgStandardService.delete(id));
+		return res;
+	}
 }

+ 2 - 0
src/main/java/com/goafanti/techservice/cognizance/service/OrgStandardService.java

@@ -12,4 +12,6 @@ public interface OrgStandardService {
 	Pagination<OrgStandard> listOrgStandard(String standardName, String standardNumber, Integer standardLevel,
 			Integer participateWay, Integer pNo, Integer pSize, String userId);
 
+	int delete(String id);
+
 }

+ 7 - 2
src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgStandardServiceImpl.java

@@ -47,11 +47,11 @@ public class OrgStandardServiceImpl extends BaseMybatisDao<OrgStandardMapper> im
 			params.put("standardNumber", standardNumber);
 		}
 		
-		if (null == standardLevel){
+		if (null != standardLevel){
 			params.put("standardLevel", standardLevel);
 		}
 		
-		if (null == participateWay){
+		if (null != participateWay){
 			params.put("participateWay", participateWay);
 		}
 		
@@ -65,4 +65,9 @@ public class OrgStandardServiceImpl extends BaseMybatisDao<OrgStandardMapper> im
 		return (Pagination<OrgStandard>) findPage("findOrgStandardListByPage", "findOrgStandardCount", params, pageNo,
 				pageSize);
 	}
+
+	@Override
+	public int delete(String id) {
+		return orgStandardMapper.deleteByPrimaryKey(id);
+	}
 }

+ 19 - 19
src/main/resources/props/config_local.properties

@@ -1,41 +1,41 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
-#\u6570\u636E\u5E93\u94FE\u63A5\uFF0C
+#\u6570\u636e\u5e93\u94fe\u63a5\uff0c
 jdbc.url=jdbc:mysql://localhost:3306/aft_dev?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true
-#\u5E10\u53F7
+#\u5e10\u53f7
 jdbc.username=root
-#\u5BC6\u7801
+#\u5bc6\u7801
 jdbc.password=123456
-#\u68C0\u6D4B\u6570\u636E\u5E93\u94FE\u63A5\u662F\u5426\u6709\u6548\uFF0C\u5FC5\u987B\u914D\u7F6E
+#\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
 jdbc.validationQuery=SELECT 'x'
-#\u521D\u59CB\u8FDE\u63A5\u6570
+#\u521d\u59cb\u8fde\u63a5\u6570
 jdbc.initialSize=3
-#\u6700\u5927\u8FDE\u63A5\u6C60\u6570\u91CF
+#\u6700\u5927\u8fde\u63a5\u6c60\u6570\u91cf
 jdbc.maxActive=20
-#\u53BB\u6389\uFF0C\u914D\u7F6E\u6587\u4EF6\u5BF9\u5E94\u53BB\u6389
+#\u53bb\u6389\uff0c\u914d\u7f6e\u6587\u4ef6\u5bf9\u5e94\u53bb\u6389
 #jdbc.maxIdle=20
-#\u914D\u7F6E0,\u5F53\u7EBF\u7A0B\u6C60\u6570\u91CF\u4E0D\u8DB3\uFF0C\u81EA\u52A8\u8865\u5145\u3002
+#\u914d\u7f6e0,\u5f53\u7ebf\u7a0b\u6c60\u6570\u91cf\u4e0d\u8db3\uff0c\u81ea\u52a8\u8865\u5145\u3002
 jdbc.minIdle=0
-#\u83B7\u53D6\u94FE\u63A5\u8D85\u65F6\u65F6\u95F4\u4E3A1\u5206\u949F\uFF0C\u5355\u4F4D\u4E3A\u6BEB\u79D2\u3002
+#\u83b7\u53d6\u94fe\u63a5\u8d85\u65f6\u65f6\u95f4\u4e3a1\u5206\u949f\uff0c\u5355\u4f4d\u4e3a\u6beb\u79d2\u3002
 jdbc.maxWait=120000
-#\u83B7\u53D6\u94FE\u63A5\u7684\u65F6\u5019\uFF0C\u4E0D\u6821\u9A8C\u662F\u5426\u53EF\u7528\uFF0C\u5F00\u542F\u4F1A\u6709\u635F\u6027\u80FD\u3002
+#\u83b7\u53d6\u94fe\u63a5\u7684\u65f6\u5019\uff0c\u4e0d\u6821\u9a8c\u662f\u5426\u53ef\u7528\uff0c\u5f00\u542f\u4f1a\u6709\u635f\u6027\u80fd\u3002
 jdbc.testOnBorrow=false
-#\u5F52\u8FD8\u94FE\u63A5\u5230\u8FDE\u63A5\u6C60\u7684\u65F6\u5019\u6821\u9A8C\u94FE\u63A5\u662F\u5426\u53EF\u7528\u3002
+#\u5f52\u8fd8\u94fe\u63a5\u5230\u8fde\u63a5\u6c60\u7684\u65f6\u5019\u6821\u9a8c\u94fe\u63a5\u662f\u5426\u53ef\u7528\u3002
 jdbc.testOnReturn=false
-#\u6B64\u9879\u914D\u7F6E\u4E3Atrue\u5373\u53EF\uFF0C\u4E0D\u5F71\u54CD\u6027\u80FD\uFF0C\u5E76\u4E14\u4FDD\u8BC1\u5B89\u5168\u6027\u3002\u610F\u4E49\u4E3A\uFF1A\u7533\u8BF7\u8FDE\u63A5\u7684\u65F6\u5019\u68C0\u6D4B\uFF0C\u5982\u679C\u7A7A\u95F2\u65F6\u95F4\u5927\u4E8EtimeBetweenEvictionRunsMillis\uFF0C\u6267\u884CvalidationQuery\u68C0\u6D4B\u8FDE\u63A5\u662F\u5426\u6709\u6548\u3002
+#\u6b64\u9879\u914d\u7f6e\u4e3atrue\u5373\u53ef\uff0c\u4e0d\u5f71\u54cd\u6027\u80fd\uff0c\u5e76\u4e14\u4fdd\u8bc1\u5b89\u5168\u6027\u3002\u610f\u4e49\u4e3a\uff1a\u7533\u8bf7\u8fde\u63a5\u7684\u65f6\u5019\u68c0\u6d4b\uff0c\u5982\u679c\u7a7a\u95f2\u65f6\u95f4\u5927\u4e8etimeBetweenEvictionRunsMillis\uff0c\u6267\u884cvalidationQuery\u68c0\u6d4b\u8fde\u63a5\u662f\u5426\u6709\u6548\u3002
 jdbc.testWhileIdle=true
-#1.Destroy\u7EBF\u7A0B\u4F1A\u68C0\u6D4B\u8FDE\u63A5\u7684\u95F4\u9694\u65F6\u95F4
-#2.testWhileIdle\u7684\u5224\u65AD\u4F9D\u636E
+#1.Destroy\u7ebf\u7a0b\u4f1a\u68c0\u6d4b\u8fde\u63a5\u7684\u95f4\u9694\u65f6\u95f4
+#2.testWhileIdle\u7684\u5224\u65ad\u4f9d\u636e
 jdbc.timeBetweenEvictionRunsMillis=60000
-#\u4E00\u4E2A\u94FE\u63A5\u751F\u5B58\u7684\u65F6\u95F4\uFF08\u4E4B\u524D\u7684\u503C\uFF1A25200000\uFF0C\u8FD9\u4E2A\u65F6\u95F4\u6709\u70B9BT\uFF0C\u8FD9\u4E2A\u7ED3\u679C\u4E0D\u77E5\u9053\u662F\u600E\u4E48\u6765\u7684\uFF0C\u6362\u7B97\u540E\u7684\u7ED3\u679C\u662F\uFF1A25200000/1000/60/60 = 7\u4E2A\u5C0F\u65F6\uFF09
+#\u4e00\u4e2a\u94fe\u63a5\u751f\u5b58\u7684\u65f6\u95f4\uff08\u4e4b\u524d\u7684\u503c\uff1a25200000\uff0c\u8fd9\u4e2a\u65f6\u95f4\u6709\u70b9BT\uff0c\u8fd9\u4e2a\u7ed3\u679c\u4e0d\u77e5\u9053\u662f\u600e\u4e48\u6765\u7684\uff0c\u6362\u7b97\u540e\u7684\u7ed3\u679c\u662f\uff1a25200000/1000/60/60 = 7\u4e2a\u5c0f\u65f6\uff09
 jdbc.minEvictableIdleTimeMillis=300000
-#\u94FE\u63A5\u4F7F\u7528\u8D85\u8FC7\u65F6\u95F4\u9650\u5236\u662F\u5426\u56DE\u6536
+#\u94fe\u63a5\u4f7f\u7528\u8d85\u8fc7\u65f6\u95f4\u9650\u5236\u662f\u5426\u56de\u6536
 jdbc.removeAbandoned=true
-#\u8D85\u8FC7\u65F6\u95F4\u9650\u5236\u65F6\u95F4\uFF08\u5355\u4F4D\u79D2\uFF09\uFF0C\u76EE\u524D\u4E3A5\u5206\u949F\uFF0C\u5982\u679C\u6709\u4E1A\u52A1\u5904\u7406\u65F6\u95F4\u8D85\u8FC75\u5206\u949F\uFF0C\u53EF\u4EE5\u9002\u5F53\u8C03\u6574\u3002
+#\u8d85\u8fc7\u65f6\u95f4\u9650\u5236\u65f6\u95f4\uff08\u5355\u4f4d\u79d2\uff09\uff0c\u76ee\u524d\u4e3a5\u5206\u949f\uff0c\u5982\u679c\u6709\u4e1a\u52a1\u5904\u7406\u65f6\u95f4\u8d85\u8fc75\u5206\u949f\uff0c\u53ef\u4ee5\u9002\u5f53\u8c03\u6574\u3002
 jdbc.removeAbandonedTimeout=300
-#\u94FE\u63A5\u56DE\u6536\u7684\u65F6\u5019\u63A7\u5236\u53F0\u6253\u5370\u4FE1\u606F\uFF0C\u6D4B\u8BD5\u73AF\u5883\u53EF\u4EE5\u52A0\u4E0Atrue\uFF0C\u7EBF\u4E0A\u73AF\u5883false\u3002\u4F1A\u5F71\u54CD\u6027\u80FD\u3002
+#\u94fe\u63a5\u56de\u6536\u7684\u65f6\u5019\u63a7\u5236\u53f0\u6253\u5370\u4fe1\u606f\uff0c\u6d4b\u8bd5\u73af\u5883\u53ef\u4ee5\u52a0\u4e0atrue\uff0c\u7ebf\u4e0a\u73af\u5883false\u3002\u4f1a\u5f71\u54cd\u6027\u80fd\u3002
 jdbc.logAbandoned=true
-#\u7EDF\u8BA1\u76D1\u63A7
+#\u7edf\u8ba1\u76d1\u63a7
 jdbc.filters=stat
 
 logging.level.com.goafanti=DEBUG

+ 1 - 1
src/main/resources/spring/spring-shiro.xml

@@ -21,7 +21,7 @@
 	    <constructor-arg index="1" value="${jedis.host}" name="host" type="java.lang.String"/>
 	    <constructor-arg index="2" value="${jedis.port}"  name="port" type="int"/>
 	    <constructor-arg index="3" value="${jedis.timeout}"  name="timeout" type="int"/>
-	    <!-- <constructor-arg index="4" value="${jedis.password}"  name="password" type="java.lang.String"/> -->
+	    <constructor-arg index="4" value="${jedis.password}"  name="password" type="java.lang.String"/>
 	  
 	</bean>