Browse Source

upd

release_toaliyun_real
jinguo24@163.com 7 years ago
parent
commit
3faf6ad0e4
54 changed files with 203 additions and 83 deletions
  1. +51
    -3
      mallinkAdmin/src/main/java/com/simple/config/ShiroConfig.java
  2. +31
    -13
      mallinkAdmin/src/main/java/com/simple/controller/HomeController.java
  3. +3
    -0
      mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java
  4. +5
    -2
      mallinkAdmin/src/main/java/com/simple/shiro/MyShiroRealm.java
  5. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/SysPermission.java
  6. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/SysRole.java
  7. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/SysRolePermission.java
  8. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/SysUserRole.java
  9. +6
    -5
      mallinkService/src/main/java/com/simple/domain/po/UserInfo.java
  10. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxAppinfo.java
  11. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxBLog.java
  12. +2
    -3
      mallinkService/src/main/java/com/simple/domain/po/WxBUserMerchant.java
  13. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxBanners.java
  14. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxBusiness.java
  15. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxCLog.java
  16. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxCUser.java
  17. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxCUserCars.java
  18. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxCUserCloud.java
  19. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxCUserEtcpToken.java
  20. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxCUserTags.java
  21. +4
    -3
      mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java
  22. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxCouponActionLog.java
  23. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxCouponActivity.java
  24. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxCouponRecord.java
  25. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxCouponType.java
  26. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxEtcpCouponRecord.java
  27. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkDissolution.java
  28. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkIn.java
  29. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkMsgSuc.java
  30. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOrderunpay.java
  31. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOut.java
  32. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkTransaction.java
  33. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkUnbind.java
  34. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxFlashSale.java
  35. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxMall.java
  36. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxMallBuilding.java
  37. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxMallFloor.java
  38. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java
  39. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxMerchantShop.java
  40. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxMerchantTradeDays.java
  41. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxMsg.java
  42. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxMsgConfig.java
  43. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxMsgModel.java
  44. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxMsgSignature.java
  45. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxOrders.java
  46. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxPark.java
  47. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxScoreHistory.java
  48. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxScoreRules.java
  49. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxScoreValidityPeriod.java
  50. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxShop.java
  51. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxTags.java
  52. +2
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxWebLog.java
  53. +1
    -1
      mallinkService/src/main/java/com/simple/service/UserInfoService.java
  54. +10
    -8
      mallinkService/src/main/java/com/simple/service/impl/UserInfoServiceImpl.java

+ 51
- 3
mallinkAdmin/src/main/java/com/simple/config/ShiroConfig.java View File

@@ -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");
// //<!-- 记住我cookie生效时间30天 ,单位秒;-->
// 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;
// }

}

+ 31
- 13
mallinkAdmin/src/main/java/com/simple/controller/HomeController.java View File

@@ -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<SysRole> roleList = sysRoleService.findRoleByUserId(user.getId());
if (null != roleList && roleList.size() > 0) {
List<SysPermission> 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<SysRole> roleList = sysRoleService.findRoleByUserId(user.getId());
if (null != roleList && roleList.size() > 0) {
List<SysPermission> 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;

}


+ 3
- 0
mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java View File

@@ -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


+ 5
- 2
mallinkAdmin/src/main/java/com/simple/shiro/MyShiroRealm.java View File

@@ -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(), //密码


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/SysPermission.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/SysRole.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/SysRolePermission.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/SysUserRole.java View File

@@ -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


+ 6
- 5
mallinkService/src/main/java/com/simple/domain/po/UserInfo.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxAppinfo.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxBLog.java View File

@@ -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


+ 2
- 3
mallinkService/src/main/java/com/simple/domain/po/WxBUserMerchant.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxBanners.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxBusiness.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxCLog.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxCUser.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxCUserCars.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxCUserCloud.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxCUserEtcpToken.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxCUserTags.java View File

@@ -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


+ 4
- 3
mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxCouponActionLog.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxCouponActivity.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxCouponRecord.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxCouponType.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxEtcpCouponRecord.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkDissolution.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkIn.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkMsgSuc.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOrderunpay.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOut.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkTransaction.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkUnbind.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxFlashSale.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxMall.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxMallBuilding.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxMallFloor.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxMerchantShop.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxMerchantTradeDays.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxMsg.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxMsgConfig.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxMsgModel.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxMsgSignature.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxOrders.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxPark.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxScoreHistory.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxScoreRules.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxScoreValidityPeriod.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxShop.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxTags.java View File

@@ -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


+ 2
- 1
mallinkService/src/main/java/com/simple/domain/po/WxWebLog.java View File

@@ -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


+ 1
- 1
mallinkService/src/main/java/com/simple/service/UserInfoService.java View File

@@ -53,7 +53,7 @@ public interface UserInfoService {
* @param username
* @return
*/
UserInfo getByName(String username);
UserInfo getByUsername(String username);

/**
* 删除用户相关数据(用户记录,角色关联)


+ 10
- 8
mallinkService/src/main/java/com/simple/service/impl/UserInfoServiceImpl.java View File

@@ -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);
}


Loading…
Cancel
Save