diff --git a/mallinkAdmin/src/main/java/com/simple/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/simple/config/ShiroConfig.java index c5db6ea35..6883fdb37 100644 --- a/mallinkAdmin/src/main/java/com/simple/config/ShiroConfig.java +++ b/mallinkAdmin/src/main/java/com/simple/config/ShiroConfig.java @@ -9,6 +9,7 @@ import org.apache.shiro.spring.LifecycleBeanPostProcessor; import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor; import org.apache.shiro.spring.web.ShiroFilterFactoryBean; import org.apache.shiro.web.mgt.DefaultWebSecurityManager; +import org.apache.shiro.web.servlet.SimpleCookie; import org.apache.shiro.web.session.mgt.DefaultWebSessionManager; import org.crazycake.shiro.RedisCacheManager; import org.crazycake.shiro.RedisManager; @@ -41,8 +42,8 @@ public class ShiroConfig { @Value("${spring.redis.expire}") private int expire; - @Value("${spring.redis.password}") - private String password; + @Value("${spring.redis.password}") + private String password; @Bean public static LifecycleBeanPostProcessor getLifecycleBeanPostProcessor() { @@ -104,7 +105,12 @@ public class ShiroConfig { // filterChainDefinitionMap.put(resources.getUrl(),permission); // } // } + filterChainDefinitionMap.put("/swagger-ui.html","anon"); + filterChainDefinitionMap.put("/v2/**","anon"); + filterChainDefinitionMap.put("/swagger-resources/**","anon"); + filterChainDefinitionMap.put("/webjars/**","anon"); filterChainDefinitionMap.put("/**", "authc"); +// filterChainDefinitionMap.put("/**", "anon"); shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); @@ -130,6 +136,8 @@ public class ShiroConfig { myShiroRealm.setCredentialsMatcher(hashedCredentialsMatcher()); return myShiroRealm; } + + /** * 凭证匹配器 @@ -201,13 +209,53 @@ public class ShiroConfig { } /** - * shiro session的管理 + * shiro session的管理 */ @Bean public DefaultWebSessionManager sessionManager() { DefaultWebSessionManager sessionManager = new DefaultWebSessionManager(); sessionManager.setSessionDAO(redisSessionDAO()); + sessionManager.setSessionIdCookie(simpleCookie()); return sessionManager; } + + @Bean + public SimpleCookie simpleCookie() { + SimpleCookie simpleCookie = new SimpleCookie("SSIDS"); + simpleCookie.setDomain(""); + return simpleCookie; + } + +// @Bean +// public SimpleCookie rememberMeCookie(){ +// //System.out.println("ShiroConfiguration.rememberMeCookie()"); +// //这个参数是cookie的名称,对应前端的checkbox的name = rememberMe +// SimpleCookie simpleCookie = new SimpleCookie("rememberMe"); +// // +// simpleCookie.setMaxAge(60*30); +// return simpleCookie; +// } + +// @Bean +// public CookieRememberMeManager rememberMeManager(){ +// //System.out.println("ShiroConfiguration.rememberMeManager()"); +// CookieRememberMeManager cookieRememberMeManager = new CookieRememberMeManager(); +// cookieRememberMeManager.setCookie(rememberMeCookie()); +// //rememberMe cookie加密的密钥 建议每个项目都不一样 默认AES算法 密钥长度(128 256 512 位) +// cookieRememberMeManager.setCipherKey(Base64.decodeBytes("2AvVhdsgUs0FSA3SDFAdag==")); +// return cookieRememberMeManager; +// } + +// @Bean(name = "securityManager") +// public DefaultWebSecurityManager defaultWebSecurityManager(MyShiroRealm realm){ +// DefaultWebSecurityManager securityManager = new DefaultWebSecurityManager(); +// //设置realm +// securityManager.setRealm(realm); +// //用户授权/认证信息Cache, 采用EhCache缓存 +// securityManager.setCacheManager(cacheManager()); +// //注入记住我管理器 +// securityManager.setRememberMeManager(rememberMeManager()); +// return securityManager; +// } } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java b/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java index 76f1361c5..41af8e33c 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java @@ -10,6 +10,8 @@ import org.omg.CORBA.SystemException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import com.simple.common.ErrorCode; @@ -20,9 +22,14 @@ import com.simple.domain.po.SysRole; import com.simple.domain.po.UserInfo; import com.simple.service.SysPermissionService; import com.simple.service.SysRoleService; +import com.simple.shiro.UserSession; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; @RestController +@Api(description="登录相关接口") public class HomeController { @Autowired @@ -36,23 +43,34 @@ public class HomeController { return new ResultData(Result.UNLOGIN, "用户未登录"); } - @GetMapping("/doLogin") - public ResultData login(UserInfo user) { + @ApiOperation("登录") + @PostMapping("/doLogin") + public ResultData login(@RequestBody UserInfo user) { + ResultData data = new ResultData(); if (StringUtils.isEmpty(user.getUsername()) || StringUtils.isEmpty(user.getPassword())) { // throw new SystemException(ErrorCode.LOGIN_USER_OR_PWD_ERROR); - return new ResultData(ResultData.ERROR); + return new ResultData(ResultData.ERROR,"用户名或者密码错误"); } - Subject subject = SecurityUtils.getSubject(); - UsernamePasswordToken token = new UsernamePasswordToken(user.getUsername(), user.getPassword()); - subject.login(token); - List roleList = sysRoleService.findRoleByUserId(user.getId()); - if (null != roleList && roleList.size() > 0) { - List permissionList = sysPermissionService - .findPermissionByRoleIds(roleList.stream().map(SysRole::getId).collect(Collectors.toList())); - // user.setRole(roleList); - user.setPermission(permissionList); + try { + Subject subject = SecurityUtils.getSubject(); + UsernamePasswordToken token = new UsernamePasswordToken(user.getUsername(), user.getPassword()); + subject.login(token); + List roleList = sysRoleService.findRoleByUserId(user.getId()); + if (null != roleList && roleList.size() > 0) { + List permissionList = sysPermissionService + .findPermissionByRoleIds(roleList.stream().map(SysRole::getId).collect(Collectors.toList())); + user.setRole(roleList); + user.setPermission(permissionList); + } + UserInfo info =(UserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); + info.setPassword("保密"); + System.out.println("id:"+ SecurityUtils.getSubject().getSession().getId()); + data.data=info; + }catch(Exception e) { + return new ResultData(ResultData.ERROR,"用户名或者密码错误"); } - return new ResultData(); + + return data; } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java index d33f77fdf..26374e7e9 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java @@ -11,11 +11,14 @@ import com.simple.common.ResultData; import com.simple.domain.po.WxMerchant; import com.simple.service.WxMerchantService; + +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @RestController @RequestMapping("wxMerchant") +@Api(description="商户相关接口") public class WxMerchantController extends BaseController { @Autowired diff --git a/mallinkAdmin/src/main/java/com/simple/shiro/MyShiroRealm.java b/mallinkAdmin/src/main/java/com/simple/shiro/MyShiroRealm.java index 4d6a83db1..9895eeb85 100644 --- a/mallinkAdmin/src/main/java/com/simple/shiro/MyShiroRealm.java +++ b/mallinkAdmin/src/main/java/com/simple/shiro/MyShiroRealm.java @@ -50,11 +50,14 @@ public class MyShiroRealm extends AuthorizingRealm { protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException { //获取用户的输入的账号. String username = (String)token.getPrincipal(); - UserInfo user = userService.getByName(username); - if(user==null) throw new UnknownAccountException(); + UserInfo user = userService.getByUsername(username); + if(user==null) throw new UnknownAccountException("用户名不存在"); // if (0==user.getEnable()) { // throw new LockedAccountException(); // 帐号锁定 // } + if(user.getStatus()==null || 1!=user.getStatus()) {//用户被禁用 + throw new UnknownAccountException("用户被禁用"); + } SimpleAuthenticationInfo authenticationInfo = new SimpleAuthenticationInfo( user, //用户 user.getPassword(), //密码 diff --git a/mallinkService/src/main/java/com/simple/domain/po/SysPermission.java b/mallinkService/src/main/java/com/simple/domain/po/SysPermission.java index 79bcf7f87..41951351c 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/SysPermission.java +++ b/mallinkService/src/main/java/com/simple/domain/po/SysPermission.java @@ -2,13 +2,14 @@ package com.simple.domain.po; import javax.persistence.*; import java.util.*; +import java.io.Serializable; import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; @Table(name = "sys_permission") -public class SysPermission { +public class SysPermission implements Serializable{ private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/SysRole.java b/mallinkService/src/main/java/com/simple/domain/po/SysRole.java index 5fd7fa2fd..292f2e73a 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/SysRole.java +++ b/mallinkService/src/main/java/com/simple/domain/po/SysRole.java @@ -2,13 +2,14 @@ package com.simple.domain.po; import javax.persistence.*; import java.util.*; +import java.io.Serializable; import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; @Table(name = "sys_role") -public class SysRole { +public class SysRole implements Serializable{ private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/SysRolePermission.java b/mallinkService/src/main/java/com/simple/domain/po/SysRolePermission.java index 4563c411e..cba5d2d44 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/SysRolePermission.java +++ b/mallinkService/src/main/java/com/simple/domain/po/SysRolePermission.java @@ -2,13 +2,14 @@ package com.simple.domain.po; import javax.persistence.*; import java.util.*; +import java.io.Serializable; import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; @Table(name = "sys_role_permission") -public class SysRolePermission { +public class SysRolePermission implements Serializable{ private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/SysUserRole.java b/mallinkService/src/main/java/com/simple/domain/po/SysUserRole.java index 243e327ac..aaf889c63 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/SysUserRole.java +++ b/mallinkService/src/main/java/com/simple/domain/po/SysUserRole.java @@ -2,13 +2,14 @@ package com.simple.domain.po; import javax.persistence.*; import java.util.*; +import java.io.Serializable; import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; @Table(name = "sys_user_role") -public class SysUserRole { +public class SysUserRole implements Serializable{ private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/UserInfo.java b/mallinkService/src/main/java/com/simple/domain/po/UserInfo.java index 98f8688ec..9b1dfaa30 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/UserInfo.java +++ b/mallinkService/src/main/java/com/simple/domain/po/UserInfo.java @@ -1,14 +1,15 @@ package com.simple.domain.po; -import javax.persistence.*; -import java.util.*; -import java.math.*; -import javax.persistence.Transient; +import java.io.Serializable; +import java.util.Date; import java.util.List; + import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; @Table(name = "user_info") -public class UserInfo { +public class UserInfo implements Serializable{ private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxAppinfo.java b/mallinkService/src/main/java/com/simple/domain/po/WxAppinfo.java index 6289c27bf..c9f257413 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxAppinfo.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxAppinfo.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_appinfo") -public class WxAppinfo { +public class WxAppinfo implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxBLog.java b/mallinkService/src/main/java/com/simple/domain/po/WxBLog.java index 0878c4b54..3bf03b40c 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxBLog.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxBLog.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_b_log") -public class WxBLog { +public class WxBLog implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxBUserMerchant.java b/mallinkService/src/main/java/com/simple/domain/po/WxBUserMerchant.java index 1444a86f3..da04044ab 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxBUserMerchant.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxBUserMerchant.java @@ -1,14 +1,13 @@ package com.simple.domain.po; import javax.persistence.*; -import java.util.*; -import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_b_user_merchant") -public class WxBUserMerchant { +public class WxBUserMerchant implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxBanners.java b/mallinkService/src/main/java/com/simple/domain/po/WxBanners.java index f93df3344..5bd2e6e00 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxBanners.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxBanners.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_banners") -public class WxBanners { +public class WxBanners implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxBusiness.java b/mallinkService/src/main/java/com/simple/domain/po/WxBusiness.java index f9da58858..abf00ecc8 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxBusiness.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxBusiness.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_business") -public class WxBusiness { +public class WxBusiness implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCLog.java b/mallinkService/src/main/java/com/simple/domain/po/WxCLog.java index 860674f27..c6b4f10b8 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCLog.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCLog.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_c_log") -public class WxCLog { +public class WxCLog implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCUser.java b/mallinkService/src/main/java/com/simple/domain/po/WxCUser.java index a23f9354e..71d990318 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCUser.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUser.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_c_user") -public class WxCUser { +public class WxCUser implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCUserCars.java b/mallinkService/src/main/java/com/simple/domain/po/WxCUserCars.java index ea2fa9c46..ce122e654 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCUserCars.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUserCars.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_c_user_cars") -public class WxCUserCars { +public class WxCUserCars implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCUserCloud.java b/mallinkService/src/main/java/com/simple/domain/po/WxCUserCloud.java index 7ea1cba84..e3c4e700d 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCUserCloud.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUserCloud.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_c_user_cloud") -public class WxCUserCloud { +public class WxCUserCloud implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCUserEtcpToken.java b/mallinkService/src/main/java/com/simple/domain/po/WxCUserEtcpToken.java index 3599527e2..7a437f997 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCUserEtcpToken.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUserEtcpToken.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_c_user_etcp_token") -public class WxCUserEtcpToken { +public class WxCUserEtcpToken implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCUserTags.java b/mallinkService/src/main/java/com/simple/domain/po/WxCUserTags.java index 5e404bc92..8ab8dfc1f 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCUserTags.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUserTags.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_c_user_tags") -public class WxCUserTags { +public class WxCUserTags implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java index 4825d5381..a7dfde164 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java @@ -1,14 +1,15 @@ package com.simple.domain.po; import javax.persistence.*; -import java.util.*; -import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; +import java.util.*; +import java.math.*; @Table(name = "wx_coupon") -public class WxCoupon { +public class WxCoupon implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCouponActionLog.java b/mallinkService/src/main/java/com/simple/domain/po/WxCouponActionLog.java index 065d1ecdd..97c039764 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCouponActionLog.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCouponActionLog.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_coupon_action_log") -public class WxCouponActionLog { +public class WxCouponActionLog implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCouponActivity.java b/mallinkService/src/main/java/com/simple/domain/po/WxCouponActivity.java index 2a931186e..511f755a8 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCouponActivity.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCouponActivity.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_coupon_activity") -public class WxCouponActivity { +public class WxCouponActivity implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCouponRecord.java b/mallinkService/src/main/java/com/simple/domain/po/WxCouponRecord.java index d763637e3..ae47893f4 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCouponRecord.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCouponRecord.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_coupon_record") -public class WxCouponRecord { +public class WxCouponRecord implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCouponType.java b/mallinkService/src/main/java/com/simple/domain/po/WxCouponType.java index 35a3f741f..155d84ee5 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCouponType.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCouponType.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_coupon_type") -public class WxCouponType { +public class WxCouponType implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpCouponRecord.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpCouponRecord.java index 6e8eb01af..b99915db1 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpCouponRecord.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpCouponRecord.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_etcp_coupon_record") -public class WxEtcpCouponRecord { +public class WxEtcpCouponRecord implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkDissolution.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkDissolution.java index f90fc7901..6fea86fc5 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkDissolution.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkDissolution.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_etcp_park_dissolution") -public class WxEtcpParkDissolution { +public class WxEtcpParkDissolution implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkIn.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkIn.java index 6f6f5bb26..8ea36f786 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkIn.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkIn.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_etcp_park_in") -public class WxEtcpParkIn { +public class WxEtcpParkIn implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkMsgSuc.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkMsgSuc.java index 5d0d16efa..e5d7c7ecd 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkMsgSuc.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkMsgSuc.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_etcp_park_msg_suc") -public class WxEtcpParkMsgSuc { +public class WxEtcpParkMsgSuc implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOrderunpay.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOrderunpay.java index d0ef37f7b..c4fdb99f4 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOrderunpay.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOrderunpay.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_etcp_park_orderunpay") -public class WxEtcpParkOrderunpay { +public class WxEtcpParkOrderunpay implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOut.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOut.java index b8cd7e41b..d483efc58 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOut.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOut.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_etcp_park_out") -public class WxEtcpParkOut { +public class WxEtcpParkOut implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkTransaction.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkTransaction.java index 3256fff9e..801098827 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkTransaction.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkTransaction.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_etcp_park_transaction") -public class WxEtcpParkTransaction { +public class WxEtcpParkTransaction implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkUnbind.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkUnbind.java index a6d0fb33e..3abbd7067 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkUnbind.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkUnbind.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_etcp_park_unbind") -public class WxEtcpParkUnbind { +public class WxEtcpParkUnbind implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxFlashSale.java b/mallinkService/src/main/java/com/simple/domain/po/WxFlashSale.java index 381e8ac1b..b32554797 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxFlashSale.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxFlashSale.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_flash_sale") -public class WxFlashSale { +public class WxFlashSale implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMall.java b/mallinkService/src/main/java/com/simple/domain/po/WxMall.java index b8786617c..f6ca87cd1 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMall.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMall.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_mall") -public class WxMall { +public class WxMall implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMallBuilding.java b/mallinkService/src/main/java/com/simple/domain/po/WxMallBuilding.java index 261cd0243..544d28ac7 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMallBuilding.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMallBuilding.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_mall_building") -public class WxMallBuilding { +public class WxMallBuilding implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMallFloor.java b/mallinkService/src/main/java/com/simple/domain/po/WxMallFloor.java index 82ad115fe..377c9e84d 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMallFloor.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMallFloor.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_mall_floor") -public class WxMallFloor { +public class WxMallFloor implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java index fef0ee740..4a74fb646 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_merchant") -public class WxMerchant { +public class WxMerchant implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantShop.java b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantShop.java index c45d463fc..520dcd4ae 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantShop.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantShop.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_merchant_shop") -public class WxMerchantShop { +public class WxMerchantShop implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantTradeDays.java b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantTradeDays.java index 93a07833f..0445e202f 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantTradeDays.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantTradeDays.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_merchant_trade_days") -public class WxMerchantTradeDays { +public class WxMerchantTradeDays implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMsg.java b/mallinkService/src/main/java/com/simple/domain/po/WxMsg.java index 232588d50..967d0b879 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMsg.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMsg.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_msg") -public class WxMsg { +public class WxMsg implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMsgConfig.java b/mallinkService/src/main/java/com/simple/domain/po/WxMsgConfig.java index 5d093ecda..b83230cda 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMsgConfig.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMsgConfig.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_msg_config") -public class WxMsgConfig { +public class WxMsgConfig implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMsgModel.java b/mallinkService/src/main/java/com/simple/domain/po/WxMsgModel.java index 38403fbbc..78a2dcd42 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMsgModel.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMsgModel.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_msg_model") -public class WxMsgModel { +public class WxMsgModel implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMsgSignature.java b/mallinkService/src/main/java/com/simple/domain/po/WxMsgSignature.java index 78fcbef4d..e2053c6bf 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMsgSignature.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMsgSignature.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_msg_signature") -public class WxMsgSignature { +public class WxMsgSignature implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxOrders.java b/mallinkService/src/main/java/com/simple/domain/po/WxOrders.java index 6d91be3fc..bbc624f24 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxOrders.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxOrders.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_orders") -public class WxOrders { +public class WxOrders implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxPark.java b/mallinkService/src/main/java/com/simple/domain/po/WxPark.java index fbcea786c..52058a84f 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxPark.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxPark.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_park") -public class WxPark { +public class WxPark implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxScoreHistory.java b/mallinkService/src/main/java/com/simple/domain/po/WxScoreHistory.java index 6afd7942c..30c6021b3 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxScoreHistory.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxScoreHistory.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_score_history") -public class WxScoreHistory { +public class WxScoreHistory implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxScoreRules.java b/mallinkService/src/main/java/com/simple/domain/po/WxScoreRules.java index 1218ac77d..d511d1416 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxScoreRules.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxScoreRules.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_score_rules") -public class WxScoreRules { +public class WxScoreRules implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxScoreValidityPeriod.java b/mallinkService/src/main/java/com/simple/domain/po/WxScoreValidityPeriod.java index 87d35172d..34ed0ac2d 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxScoreValidityPeriod.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxScoreValidityPeriod.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_score_validity_period") -public class WxScoreValidityPeriod { +public class WxScoreValidityPeriod implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxShop.java b/mallinkService/src/main/java/com/simple/domain/po/WxShop.java index 543ebd6fd..2f37aeaa6 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxShop.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxShop.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_shop") -public class WxShop { +public class WxShop implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxTags.java b/mallinkService/src/main/java/com/simple/domain/po/WxTags.java index d84e16f68..5da94d453 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxTags.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxTags.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_tags") -public class WxTags { +public class WxTags implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxWebLog.java b/mallinkService/src/main/java/com/simple/domain/po/WxWebLog.java index 7b8e20d98..851662f5a 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxWebLog.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxWebLog.java @@ -6,9 +6,10 @@ import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_web_log") -public class WxWebLog { +public class WxWebLog implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/mallinkService/src/main/java/com/simple/service/UserInfoService.java b/mallinkService/src/main/java/com/simple/service/UserInfoService.java index 43c7592ef..88760edf9 100644 --- a/mallinkService/src/main/java/com/simple/service/UserInfoService.java +++ b/mallinkService/src/main/java/com/simple/service/UserInfoService.java @@ -53,7 +53,7 @@ public interface UserInfoService { * @param username * @return */ - UserInfo getByName(String username); + UserInfo getByUsername(String username); /** * 删除用户相关数据(用户记录,角色关联) diff --git a/mallinkService/src/main/java/com/simple/service/impl/UserInfoServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/UserInfoServiceImpl.java index 4d2c1a777..7fd9ed9e7 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/UserInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/UserInfoServiceImpl.java @@ -1,16 +1,18 @@ package com.simple.service.impl; -import java.util.*; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simple.domain.po.UserInfo; -import com.simple.mapper.UserInfoMapper; -import com.simple.service.UserInfoService; +import java.util.UUID; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.simple.domain.po.SysUserRole; +import com.simple.domain.po.UserInfo; import com.simple.mapper.SysUserRoleMapper; +import com.simple.mapper.UserInfoMapper; +import com.simple.service.UserInfoService; @Service public class UserInfoServiceImpl implements UserInfoService { @@ -51,9 +53,9 @@ public class UserInfoServiceImpl implements UserInfoService { @Override - public UserInfo getByName(String username) { + public UserInfo getByUsername(String username) { UserInfo userInfo = new UserInfo(); - userInfo.setName(username); + userInfo.setUsername(username); return userInfoMapper.selectOne(userInfo); }