Quellcode durchsuchen

upd

release_toaliyun_real
jinguo24@163.com vor 7 Jahren
Ursprung
Commit
400c737db4
100 geänderte Dateien mit 1380 neuen und 343 gelöschten Zeilen
  1. +1
    -1
      mallinkAdmin/pom.xml
  2. +46
    -0
      mallinkAdmin/src/main/java/com/simple/config/RedisConfig.java
  3. +210
    -0
      mallinkAdmin/src/main/java/com/simple/config/ShiroConfig.java
  4. +59
    -0
      mallinkAdmin/src/main/java/com/simple/controller/HomeController.java
  5. +74
    -0
      mallinkAdmin/src/main/java/com/simple/controller/RoleController.java
  6. +55
    -0
      mallinkAdmin/src/main/java/com/simple/controller/SysPermissionController.java
  7. +159
    -0
      mallinkAdmin/src/main/java/com/simple/controller/UserInfoController.java
  8. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxAppinfoController.java
  9. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxBLogController.java
  10. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxBUserMerchantController.java
  11. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxBannersController.java
  12. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxBusinessController.java
  13. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxCLogController.java
  14. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxCUserCarsController.java
  15. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxCUserCloudController.java
  16. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxCUserController.java
  17. +65
    -0
      mallinkAdmin/src/main/java/com/simple/controller/WxCUserEtcpTokenController.java
  18. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxCUserTagsController.java
  19. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxCouponActionLogController.java
  20. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxCouponActivityController.java
  21. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java
  22. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxCouponRecordController.java
  23. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxCouponTypeController.java
  24. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java
  25. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java
  26. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkInController.java
  27. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java
  28. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java
  29. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOutController.java
  30. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java
  31. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java
  32. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxFlashSaleController.java
  33. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxMallBuildingController.java
  34. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxMallController.java
  35. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxMallFloorController.java
  36. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java
  37. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxMerchantShopController.java
  38. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxMerchantTradeDaysController.java
  39. +65
    -0
      mallinkAdmin/src/main/java/com/simple/controller/WxMsgConfigController.java
  40. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java
  41. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java
  42. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxMsgSignatureController.java
  43. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxOrdersController.java
  44. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxParkController.java
  45. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxScoreHistoryController.java
  46. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxScoreRulesController.java
  47. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java
  48. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java
  49. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxTagsController.java
  50. +3
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxWebLogController.java
  51. +82
    -0
      mallinkAdmin/src/main/java/com/simple/shiro/MyShiroRealm.java
  52. +22
    -0
      mallinkAdmin/src/main/java/com/simple/shiro/PasswordHelper.java
  53. +132
    -0
      mallinkAdmin/src/main/java/com/simple/shiro/ShiroService.java
  54. +9
    -0
      mallinkAdmin/src/main/java/com/simple/shiro/UserSession.java
  55. +3
    -6
      mallinkAdmin/src/main/resources/application-dev.yml
  56. +9
    -8
      mallinkApi/pom.xml
  57. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxAppinfoController.java
  58. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxBLogController.java
  59. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxBUserMerchantController.java
  60. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxBannersController.java
  61. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxBusinessController.java
  62. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxCLogController.java
  63. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxCUserCarsController.java
  64. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxCUserCloudController.java
  65. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxCUserController.java
  66. +65
    -0
      mallinkApi/src/main/java/com/simple/controller/WxCUserEtcpTokenController.java
  67. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxCUserTagsController.java
  68. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxCouponActionLogController.java
  69. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxCouponActivityController.java
  70. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxCouponController.java
  71. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxCouponRecordController.java
  72. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxCouponTypeController.java
  73. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java
  74. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java
  75. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxEtcpParkInController.java
  76. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java
  77. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java
  78. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOutController.java
  79. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java
  80. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java
  81. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxFlashSaleController.java
  82. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxMallBuildingController.java
  83. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxMallController.java
  84. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxMallFloorController.java
  85. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxMerchantController.java
  86. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxMerchantShopController.java
  87. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxMerchantTradeDaysController.java
  88. +65
    -0
      mallinkApi/src/main/java/com/simple/controller/WxMsgConfigController.java
  89. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxMsgController.java
  90. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxMsgModelController.java
  91. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxMsgSignatureController.java
  92. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxOrdersController.java
  93. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxParkController.java
  94. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxScoreHistoryController.java
  95. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxScoreRulesController.java
  96. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java
  97. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxShopController.java
  98. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxTagsController.java
  99. +3
    -4
      mallinkApi/src/main/java/com/simple/controller/WxWebLogController.java
  100. +13
    -0
      mallinkService/pom.xml

+ 1
- 1
mallinkAdmin/pom.xml Datei anzeigen

@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<parent>
<artifactId>mallink</artifactId>
<groupId>com.simple</groupId>
<version>1.0</version>


+ 46
- 0
mallinkAdmin/src/main/java/com/simple/config/RedisConfig.java Datei anzeigen

@@ -0,0 +1,46 @@
package com.simple.config;

import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cache.annotation.CachingConfigurerSupport;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import redis.clients.jedis.JedisPool;
import redis.clients.jedis.JedisPoolConfig;

/**
* Created by yangqj on 2017/4/30.
*/
@Configuration
@EnableCaching
public class RedisConfig extends CachingConfigurerSupport {
@Value("${spring.redis.host}")
private String host;

@Value("${spring.redis.port}")
private int port;

@Value("${spring.redis.timeout}")
private int timeout;

@Value("${spring.redis.pool.max-idle}")
private int maxIdle;

@Value("${spring.redis.pool.max-wait}")
private long maxWaitMillis;

@Bean
public JedisPool redisPoolFactory() {
Logger.getLogger(getClass()).info("JedisPool注入成功!!");
Logger.getLogger(getClass()).info("redis地址:" + host + ":" + port);
JedisPoolConfig jedisPoolConfig = new JedisPoolConfig();
jedisPoolConfig.setMaxIdle(maxIdle);
jedisPoolConfig.setMaxWaitMillis(maxWaitMillis);

JedisPool jedisPool = new JedisPool(jedisPoolConfig, host, port, timeout);

return jedisPool;
}

}

+ 210
- 0
mallinkAdmin/src/main/java/com/simple/config/ShiroConfig.java Datei anzeigen

@@ -0,0 +1,210 @@
package com.simple.config;

import java.util.LinkedHashMap;
import java.util.Map;

import org.apache.shiro.authc.credential.HashedCredentialsMatcher;
import org.apache.shiro.mgt.SecurityManager;
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.session.mgt.DefaultWebSessionManager;
import org.crazycake.shiro.RedisCacheManager;
import org.crazycake.shiro.RedisManager;
import org.crazycake.shiro.RedisSessionDAO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

import com.simple.service.SysPermissionService;
import com.simple.shiro.MyShiroRealm;

/**
* Created by yangqj on 2017/4/23.
*/
@Configuration
public class ShiroConfig {
@Autowired(required = false)
private SysPermissionService resourcesService;

@Value("${spring.redis.host}")
private String host;

@Value("${spring.redis.port}")
private int port;

@Value("${spring.redis.timeout}")
private int timeout;
@Value("${spring.redis.expire}")
private int expire;

@Bean
public static LifecycleBeanPostProcessor getLifecycleBeanPostProcessor() {
return new LifecycleBeanPostProcessor();
}

/**
* ShiroDialect,为了在thymeleaf里使用shiro的标签的bean
* @return
*/
// @Bean
// public ShiroDialect shiroDialect() {
// return new ShiroDialect();
// }
/**
* ShiroFilterFactoryBean 处理拦截资源文件问题。
* 注意:单独一个ShiroFilterFactoryBean配置是或报错的,因为在
* 初始化ShiroFilterFactoryBean的时候需要注入:SecurityManager
*
Filter Chain定义说明
1、一个URL可以配置多个Filter,使用逗号分隔
2、当设置多个过滤器时,全部验证通过,才视为通过
3、部分过滤器可指定参数,如perms,roles
*
*/
@Bean
public ShiroFilterFactoryBean shirFilter(SecurityManager securityManager){
System.out.println("ShiroConfiguration.shirFilter()");
ShiroFilterFactoryBean shiroFilterFactoryBean = new ShiroFilterFactoryBean();

// 必须设置 SecurityManager
shiroFilterFactoryBean.setSecurityManager(securityManager);
// 如果不设置默认会自动寻找Web工程根目录下的"/login.jsp"页面
shiroFilterFactoryBean.setLoginUrl("/login");
// 登录成功后要跳转的链接
shiroFilterFactoryBean.setSuccessUrl("/usersPage");
//未授权界面;
shiroFilterFactoryBean.setUnauthorizedUrl("/403");
//拦截器.
Map<String,String> filterChainDefinitionMap = new LinkedHashMap<String,String>();

//配置退出 过滤器,其中的具体的退出代码Shiro已经替我们实现了
filterChainDefinitionMap.put("/logout", "logout");
filterChainDefinitionMap.put("/doLogin/**","anon");
filterChainDefinitionMap.put("/css/**","anon");
filterChainDefinitionMap.put("/js/**","anon");
filterChainDefinitionMap.put("/img/**","anon");
filterChainDefinitionMap.put("/font-awesome/**","anon");
//<!-- 过滤链定义,从上向下顺序执行,一般将 /**放在最为下边 -->:这是一个坑呢,一不小心代码就不好使了;
//<!-- authc:所有url都必须认证通过才可以访问; anon:所有url都都可以匿名访问-->
//自定义加载权限资源关系
// Map<String,Object> map = new HashMap<>();
// List<SysPermission> resourcesList = resourcesService.list(map);
// for(SysPermission resources:resourcesList){
//
// if (StringUtil.isNotEmpty(resources.getUrl())) {
// String permission = "perms[" + resources.getUrl()+ "]";
// filterChainDefinitionMap.put(resources.getUrl(),permission);
// }
// }
filterChainDefinitionMap.put("/**", "authc");


shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap);
return shiroFilterFactoryBean;
}


@Bean
public SecurityManager securityManager(){
DefaultWebSecurityManager securityManager = new DefaultWebSecurityManager();
//设置realm.
securityManager.setRealm(myShiroRealm());
// 自定义缓存实现 使用redis
//securityManager.setCacheManager(cacheManager());
// 自定义session管理 使用redis
securityManager.setSessionManager(sessionManager());
return securityManager;
}

@Bean
public MyShiroRealm myShiroRealm(){
MyShiroRealm myShiroRealm = new MyShiroRealm();
myShiroRealm.setCredentialsMatcher(hashedCredentialsMatcher());
return myShiroRealm;
}

/**
* 凭证匹配器
* (由于我们的密码校验交给Shiro的SimpleAuthenticationInfo进行处理了
* 所以我们需要修改下doGetAuthenticationInfo中的代码;
* )
* @return
*/
@Bean
public HashedCredentialsMatcher hashedCredentialsMatcher(){
HashedCredentialsMatcher hashedCredentialsMatcher = new HashedCredentialsMatcher();

hashedCredentialsMatcher.setHashAlgorithmName("md5");//散列算法:这里使用MD5算法;
hashedCredentialsMatcher.setHashIterations(2);//散列的次数,比如散列两次,相当于 md5(md5(""));

return hashedCredentialsMatcher;
}


/**
* 开启shiro aop注解支持.
* 使用代理方式;所以需要开启代码支持;
* @param securityManager
* @return
*/
@Bean
public AuthorizationAttributeSourceAdvisor authorizationAttributeSourceAdvisor(SecurityManager securityManager){
AuthorizationAttributeSourceAdvisor authorizationAttributeSourceAdvisor = new AuthorizationAttributeSourceAdvisor();
authorizationAttributeSourceAdvisor.setSecurityManager(securityManager);
return authorizationAttributeSourceAdvisor;
}

/**
* 配置shiro redisManager
* 使用的是shiro-redis开源插件
* @return
*/
public RedisManager redisManager() {
RedisManager redisManager = new RedisManager();
redisManager.setHost(host);
redisManager.setPort(port);
redisManager.setExpire(expire);// 配置缓存过期时间
redisManager.setTimeout(timeout);
// redisManager.setPassword(password);
return redisManager;
}

/**
* cacheManager 缓存 redis实现
* 使用的是shiro-redis开源插件
* @return
*/
public RedisCacheManager cacheManager() {
RedisCacheManager redisCacheManager = new RedisCacheManager();
redisCacheManager.setRedisManager(redisManager());
return redisCacheManager;
}


/**
* RedisSessionDAO shiro sessionDao层的实现 通过redis
* 使用的是shiro-redis开源插件
*/
@Bean
public RedisSessionDAO redisSessionDAO() {
RedisSessionDAO redisSessionDAO = new RedisSessionDAO();
redisSessionDAO.setRedisManager(redisManager());
return redisSessionDAO;
}

/**
* shiro session的管理
*/
@Bean
public DefaultWebSessionManager sessionManager() {
DefaultWebSessionManager sessionManager = new DefaultWebSessionManager();
sessionManager.setSessionDAO(redisSessionDAO());
return sessionManager;
}

}

+ 59
- 0
mallinkAdmin/src/main/java/com/simple/controller/HomeController.java Datei anzeigen

@@ -0,0 +1,59 @@
package com.simple.controller;

import java.util.List;
import java.util.stream.Collectors;

import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.subject.Subject;
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.RestController;

import com.simple.common.ErrorCode;
import com.simple.common.Result;
import com.simple.common.ResultData;
import com.simple.domain.po.SysPermission;
import com.simple.domain.po.SysRole;
import com.simple.domain.po.UserInfo;
import com.simple.service.SysPermissionService;
import com.simple.service.SysRoleService;


@RestController
public class HomeController {

@Autowired
private SysRoleService sysRoleService;

@Autowired
private SysPermissionService sysPermissionService;

@GetMapping("login")
public ResultData login() {
return new ResultData(Result.UNLOGIN, "用户未登录");
}

@GetMapping("/doLogin")
public ResultData login(UserInfo user) {
if (StringUtils.isEmpty(user.getUsername()) || StringUtils.isEmpty(user.getPassword())) {
// throw new SystemException(ErrorCode.LOGIN_USER_OR_PWD_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);
}
return new ResultData();

}

}

+ 74
- 0
mallinkAdmin/src/main/java/com/simple/controller/RoleController.java Datei anzeigen

@@ -0,0 +1,74 @@
package com.simple.controller;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.github.pagehelper.PageInfo;
import com.simple.common.Result;
import com.simple.common.ResultData;
import com.simple.domain.po.SysRole;
import com.simple.service.SysRolePermissionService;
import com.simple.service.SysRoleService;
@RestController
@RequestMapping("role")
public class RoleController {
@Autowired
private SysRoleService sysRoleService;
@Autowired
private SysRolePermissionService SysRolePermissionService;
private Logger logger = Logger.getLogger(RoleController.class);
@GetMapping("list")
public ResultData list(SysRole sysRole,Integer pageNum, Integer pageSize) {
final PageInfo<SysRole> page = sysRoleService.listAsPage(sysRole, pageNum, pageSize);
return new ResultData(page);
}
@PostMapping("add")
public ResultData add(SysRole sysRole) {
Assert.notNull(sysRole.getName(), "角色名不能为空");
Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名");
sysRoleService.saveOrUpdate(sysRole);
return new ResultData();
}
@PostMapping("update")
public ResultData update(SysRole sysRole) {
if (sysRole.getName() != null) {
System.out.println(checkUnique(sysRole.getName(), sysRole.getId()));
Assert.isTrue(!checkUnique(sysRole.getName(), sysRole.getId()), "角色名已存在");
}
sysRoleService.saveOrUpdate(sysRole);
// Assert.notNull(sysRole.getName(), "角色名不能为空");
return new ResultData();
}
@GetMapping("/del")
public ResultData delete(String id) {
sysRoleService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("setPermission")
public ResultData setPermission(String roleId, String perId) {
Assert.notNull(perId,"请选择权限");
String[] perIds = perId.split(",");
SysRolePermissionService.savePermissions(roleId, perIds);
return new ResultData(Result.SUCCESS, "设置角色权限成功", null);
}
private boolean checkUnique(String name, String id) {
return sysRoleService.countByName(name, id) > 0 ? true : false;
}
}

+ 55
- 0
mallinkAdmin/src/main/java/com/simple/controller/SysPermissionController.java Datei anzeigen

@@ -0,0 +1,55 @@
package com.simple.controller;

import org.apache.shiro.util.Assert;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import com.github.pagehelper.PageInfo;
import com.simple.common.Result;
import com.simple.common.ResultData;
import com.simple.domain.po.SysPermission;
import com.simple.service.SysPermissionService;

/**
* @author chenkx
* @date 2018-01-05.
*/
@RestController
@RequestMapping("permission")
public class SysPermissionController {

@Autowired
SysPermissionService sysPermissionService;

@GetMapping("alllist")
public ResultData alllist(String ava) {
SysPermission record = new SysPermission();
record.setAvailable(ava);
PageInfo<SysPermission> permissions= sysPermissionService.listAsPage(record, 1, 10000);
return new ResultData(Result.SUCCESS, "查询成功", permissions.getList());
}

@PostMapping("add")
public ResultData createPermission(SysPermission sysPermission) {
Assert.notNull(sysPermission.getName(), "用户名不能为空");
sysPermissionService.saveOrUpdate(sysPermission);
return new ResultData(sysPermission.getId());
}

@PostMapping("update")
public ResultData updatePermission(SysPermission sysPermission) {
sysPermissionService.saveOrUpdate(sysPermission);
return new ResultData();
}

@GetMapping("/del")
public ResultData delete(String id) {
sysPermissionService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}


}

+ 159
- 0
mallinkAdmin/src/main/java/com/simple/controller/UserInfoController.java Datei anzeigen

@@ -0,0 +1,159 @@
package com.simple.controller;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import com.github.pagehelper.PageInfo;
import com.simple.common.ResultData;
import com.simple.domain.po.SysUserRole;
import com.simple.domain.po.UserInfo;
import com.simple.service.SysUserRoleService;
import com.simple.service.UserInfoService;
import com.simple.shiro.PasswordHelper;
import com.simple.shiro.UserSession;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

/**
* @author chenkx
* @date 2018-01-05.
*/
@Api(value = "API - UserInfoController", description = "用户接口")
@RestController
@RequestMapping("user")
public class UserInfoController {

@Autowired
UserInfoService userInfoService;

@Autowired
SysUserRoleService userRoleService;

@ApiOperation(value = "用户分页接口", response = String.class)
@GetMapping("lists")
public ResultData listAsPage(UserInfo userInfo, Integer pageNum, Integer pageSize){
final PageInfo<UserInfo> page = userInfoService.listAsPage(userInfo, pageNum, pageSize);
return new ResultData(page);
}

@ApiOperation(value = "用户详情接口", response = String.class)
@GetMapping("detail")
public ResultData detail(String id){
final UserInfo user = userInfoService.getById(id);
return new ResultData(user);
}

@ApiOperation(value = "创建用户接口", response = String.class)
@PostMapping("add")
public ResultData createUser(UserInfo userInfo){
Assert.notNull(userInfo.getUsername(), "用户名不能为空");
Assert.isTrue(checkUnique(userInfo.getUsername(), 0), "重复的用户名");
Assert.notNull(userInfo.getPassword(), "密码不能为空");
PasswordHelper passwordHelper = new PasswordHelper();
passwordHelper.encryptPassword(userInfo);
userInfoService.saveOrUpdate(userInfo);
return new ResultData();
}

@ApiOperation(value = "修改用户接口", response = String.class)
@PostMapping("update")
public ResultData updateUser(UserInfo userInfo){
Assert.notNull(userInfo.getUsername(), "用户名不能为空");
Assert.isTrue(checkUnique(userInfo.getUsername(), 1), "重复的用户名");
Assert.notNull(userInfo.getPassword(), "密码不能为空");
PasswordHelper passwordHelper = new PasswordHelper();
passwordHelper.encryptPassword(userInfo);
userInfoService.saveOrUpdate(userInfo);
return new ResultData();
}

@ApiOperation(value = "删除用户接口", response = String.class)
@GetMapping("/del")
public ResultData deleteUser(String id) {
userInfoService.deleteUser(id);
return new ResultData();
}

/**
* 启用,停用用户
* @param userId
* @param status
* @return
*/
@ApiOperation(value = "起停用户接口", response = String.class)
@GetMapping("status")
public ResultData modifyStatus(String userId, Integer status) {
UserInfo userInfo = userInfoService.getById(userId);
userInfo.setStatus(status);
userInfoService.saveOrUpdate(userInfo);
return new ResultData(userInfo);
}

@ApiOperation(value = "用户添加角色接口", response = String.class)
@PostMapping("setRoles")
public ResultData setRoles(String userId,String roleIds) {
String[] roIds = roleIds.split(",");
List<SysUserRole> u2rs = new ArrayList<>(roIds.length);
for (String roleId : roIds) {
SysUserRole userRole = new SysUserRole();
userRole.setRoleId(roleId);
userRole.setUid(userId);
u2rs.add(userRole);
}
userRoleService.batchInsert(u2rs);
return new ResultData();
}

private boolean checkUnique(String username, Integer type) {
if (type == 0) {
if (userInfoService.cntByUserName(username) > 0) {
return false;
}
}
if (type == 1) {
if (userInfoService.cntByUserName(username) > 1) {
return false;
}
}
return true;
}
@GetMapping("hasButtonPermission")
public ResultData hasButtonPermission(String permissions){
Map<String,Boolean> map=new HashMap<>();
for(String name:permissions.split(",")){
String userId = (String)
SecurityUtils.getSubject().getSession().getAttribute(UserSession.userId);
boolean has =userInfoService.hasButtonPermission(userId, name);
map.put(name, has);
}
// StringBuffer buffer = new StringBuffer();
// for(Entry<String, Boolean> entrySet :map.entrySet()){
// buffer.append("var "+entrySet.getKey());
// buffer.append("="+entrySet.getValue());
// buffer.append(";");
// }
//return new ResultData(buffer.toString());
return new ResultData(map);
}
@GetMapping("getUser")
public ResultData getUserInfo(){
UserInfo info =(UserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo);
ResultData data = new ResultData();
data.data=info;
return data;
}
}

+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxAppinfoController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxAppinfo;
import com.simple.service.WxAppinfoService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxBLogController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxBLog;
import com.simple.service.WxBLogService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxBUserMerchantController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxBUserMerchant;
import com.simple.service.WxBUserMerchantService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxBannersController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxBanners;
import com.simple.service.WxBannersService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxBusinessController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxBusiness;
import com.simple.service.WxBusinessService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxCLogController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxCLog;
import com.simple.service.WxCLogService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxCUserCarsController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxCUserCars;
import com.simple.service.WxCUserCarsService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxCUserCloudController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxCUserCloud;
import com.simple.service.WxCUserCloudService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxCUserController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxCUser;
import com.simple.service.WxCUserService;
import io.swagger.annotations.ApiImplicitParam;


+ 65
- 0
mallinkAdmin/src/main/java/com/simple/controller/WxCUserEtcpTokenController.java Datei anzeigen

@@ -0,0 +1,65 @@
package com.simple.controller;

import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxCUserEtcpToken;
import com.simple.service.WxCUserEtcpTokenService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;

@RestController
@RequestMapping("wxCUserEtcpToken")
public class WxCUserEtcpTokenController extends BaseController
{
@Autowired
private WxCUserEtcpTokenService wxCUserEtcpTokenService;

private Logger logger = Logger.getLogger(WxCUserEtcpTokenController.class);

@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true),
@ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)})
public ResultData list(@ModelAttribute WxCUserEtcpToken wxCUserEtcpToken,Integer pageNum, Integer pageSize) {
if (null == wxCUserEtcpToken) wxCUserEtcpToken = new WxCUserEtcpToken();
final PageInfo<WxCUserEtcpToken> page = wxCUserEtcpTokenService.listAsPage(wxCUserEtcpToken, pageNum, pageSize);
return new ResultData(page);
}

@PostMapping("add")
public ResultData add(@RequestBody WxCUserEtcpToken wxCUserEtcpToken) {
//Assert.notNull(wxCUserEtcpToken.getName(), "角色名不能为空");
//Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名");
wxCUserEtcpTokenService.saveOrUpdate(wxCUserEtcpToken);
return new ResultData();
}

@PostMapping("update")
public ResultData update(@RequestBody WxCUserEtcpToken wxCUserEtcpToken) {
wxCUserEtcpTokenService.saveOrUpdate(wxCUserEtcpToken);
return new ResultData();
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
wxCUserEtcpTokenService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
return new ResultData(Result.SUCCESS,"查询成功",wxCUserEtcpTokenService.getById(id));
}
}

+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxCUserTagsController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxCUserTags;
import com.simple.service.WxCUserTagsService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxCouponActionLogController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxCouponActionLog;
import com.simple.service.WxCouponActionLogService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxCouponActivityController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxCouponActivity;
import com.simple.service.WxCouponActivityService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxCoupon;
import com.simple.service.WxCouponService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxCouponRecordController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxCouponRecord;
import com.simple.service.WxCouponRecordService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxCouponTypeController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxCouponType;
import com.simple.service.WxCouponTypeService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxEtcpCouponRecord;
import com.simple.service.WxEtcpCouponRecordService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxEtcpParkDissolution;
import com.simple.service.WxEtcpParkDissolutionService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkInController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxEtcpParkIn;
import com.simple.service.WxEtcpParkInService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxEtcpParkMsgSuc;
import com.simple.service.WxEtcpParkMsgSucService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxEtcpParkOrderunpay;
import com.simple.service.WxEtcpParkOrderunpayService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOutController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxEtcpParkOut;
import com.simple.service.WxEtcpParkOutService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxEtcpParkTransaction;
import com.simple.service.WxEtcpParkTransactionService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxEtcpParkUnbind;
import com.simple.service.WxEtcpParkUnbindService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxFlashSaleController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxFlashSale;
import com.simple.service.WxFlashSaleService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxMallBuildingController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxMallBuilding;
import com.simple.service.WxMallBuildingService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxMallController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxMall;
import com.simple.service.WxMallService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxMallFloorController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxMallFloor;
import com.simple.service.WxMallFloorService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxMerchant;
import com.simple.service.WxMerchantService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxMerchantShopController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxMerchantShop;
import com.simple.service.WxMerchantShopService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxMerchantTradeDaysController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxMerchantTradeDays;
import com.simple.service.WxMerchantTradeDaysService;
import io.swagger.annotations.ApiImplicitParam;


+ 65
- 0
mallinkAdmin/src/main/java/com/simple/controller/WxMsgConfigController.java Datei anzeigen

@@ -0,0 +1,65 @@
package com.simple.controller;

import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxMsgConfig;
import com.simple.service.WxMsgConfigService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;

@RestController
@RequestMapping("wxMsgConfig")
public class WxMsgConfigController extends BaseController
{
@Autowired
private WxMsgConfigService wxMsgConfigService;

private Logger logger = Logger.getLogger(WxMsgConfigController.class);

@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true),
@ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)})
public ResultData list(@ModelAttribute WxMsgConfig wxMsgConfig,Integer pageNum, Integer pageSize) {
if (null == wxMsgConfig) wxMsgConfig = new WxMsgConfig();
final PageInfo<WxMsgConfig> page = wxMsgConfigService.listAsPage(wxMsgConfig, pageNum, pageSize);
return new ResultData(page);
}

@PostMapping("add")
public ResultData add(@RequestBody WxMsgConfig wxMsgConfig) {
//Assert.notNull(wxMsgConfig.getName(), "角色名不能为空");
//Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名");
wxMsgConfigService.saveOrUpdate(wxMsgConfig);
return new ResultData();
}

@PostMapping("update")
public ResultData update(@RequestBody WxMsgConfig wxMsgConfig) {
wxMsgConfigService.saveOrUpdate(wxMsgConfig);
return new ResultData();
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
wxMsgConfigService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
return new ResultData(Result.SUCCESS,"查询成功",wxMsgConfigService.getById(id));
}
}

+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxMsg;
import com.simple.service.WxMsgService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxMsgModel;
import com.simple.service.WxMsgModelService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxMsgSignatureController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxMsgSignature;
import com.simple.service.WxMsgSignatureService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxOrdersController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxOrders;
import com.simple.service.WxOrdersService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxParkController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxPark;
import com.simple.service.WxParkService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxScoreHistoryController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxScoreHistory;
import com.simple.service.WxScoreHistoryService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxScoreRulesController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxScoreRules;
import com.simple.service.WxScoreRulesService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxScoreValidityPeriod;
import com.simple.service.WxScoreValidityPeriodService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxShop;
import com.simple.service.WxShopService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxTagsController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxTags;
import com.simple.service.WxTagsService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxWebLogController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxWebLog;
import com.simple.service.WxWebLogService;
import io.swagger.annotations.ApiImplicitParam;


+ 82
- 0
mallinkAdmin/src/main/java/com/simple/shiro/MyShiroRealm.java Datei anzeigen

@@ -0,0 +1,82 @@
package com.simple.shiro;

import javax.annotation.Resource;

import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationInfo;
import org.apache.shiro.authc.AuthenticationToken;
import org.apache.shiro.authc.SimpleAuthenticationInfo;
import org.apache.shiro.authc.UnknownAccountException;
import org.apache.shiro.authz.AuthorizationInfo;
import org.apache.shiro.authz.SimpleAuthorizationInfo;
import org.apache.shiro.realm.AuthorizingRealm;
import org.apache.shiro.session.Session;
import org.apache.shiro.subject.PrincipalCollection;
import org.apache.shiro.util.ByteSource;

import com.simple.domain.po.UserInfo;
import com.simple.service.SysPermissionService;
import com.simple.service.UserInfoService;

/**
* Created by yangqj on 2017/4/21.
*/
public class MyShiroRealm extends AuthorizingRealm {

@Resource
private UserInfoService userService;

@Resource
private SysPermissionService resourcesService;

//授权
@Override
protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principalCollection) {
UserInfo user= (UserInfo) SecurityUtils.getSubject().getPrincipal();//User{id=1, username='admin', password='3ef7164d1f6167cb9f2658c07d3c2f0a', enable=1}
// Map<String,Object> map = new HashMap<String,Object>();
// map.put("userid",user.getId());
// List<SysPermission> resourcesList = resourcesService.list(map);
// 权限信息对象info,用来存放查出的用户的所有的角色(role)及权限(permission)
SimpleAuthorizationInfo info = new SimpleAuthorizationInfo();
// for(SysPermission resources: resourcesList){
// info.addStringPermission(resources.getUrl());
// }
return info;
}

//认证
@Override
protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException {
//获取用户的输入的账号.
String username = (String)token.getPrincipal();
UserInfo user = userService.getByName(username);
if(user==null) throw new UnknownAccountException();
// if (0==user.getEnable()) {
// throw new LockedAccountException(); // 帐号锁定
// }
SimpleAuthenticationInfo authenticationInfo = new SimpleAuthenticationInfo(
user, //用户
user.getPassword(), //密码
ByteSource.Util.bytes(username),
getName() //realm name
);
// 当验证都通过后,把用户信息放在session里
Session session = SecurityUtils.getSubject().getSession();
session.setAttribute(UserSession.userInfo, user);
session.setAttribute(UserSession.userId, user.getId());
return authenticationInfo;
}


/**
* 指定principalCollection 清除
*/
/* public void clearCachedAuthorizationInfo(PrincipalCollection principalCollection) {

SimplePrincipalCollection principals = new SimplePrincipalCollection(
principalCollection, getName());
super.clearCachedAuthorizationInfo(principals);
}
*/
}

+ 22
- 0
mallinkAdmin/src/main/java/com/simple/shiro/PasswordHelper.java Datei anzeigen

@@ -0,0 +1,22 @@
package com.simple.shiro;


import org.apache.shiro.crypto.hash.SimpleHash;
import org.apache.shiro.util.ByteSource;

import com.simple.domain.po.UserInfo;

public class PasswordHelper {
//private RandomNumberGenerator randomNumberGenerator = new SecureRandomNumberGenerator();
private String algorithmName = "md5";
private int hashIterations = 2;

public void encryptPassword(UserInfo user) {
//String salt=randomNumberGenerator.nextBytes().toHex();
String newPassword = new SimpleHash(algorithmName, user.getPassword(), ByteSource.Util.bytes(user.getUsername()), hashIterations).toHex();
//String newPassword = new SimpleHash(algorithmName, user.getPassword()).toHex();
user.setPassword(newPassword);

}
}

+ 132
- 0
mallinkAdmin/src/main/java/com/simple/shiro/ShiroService.java Datei anzeigen

@@ -0,0 +1,132 @@
package com.simple.shiro;

import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;

import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
import org.apache.shiro.web.filter.mgt.DefaultFilterChainManager;
import org.apache.shiro.web.filter.mgt.PathMatchingFilterChainResolver;
import org.apache.shiro.web.servlet.AbstractShiroFilter;
import org.crazycake.shiro.RedisSessionDAO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import com.github.pagehelper.util.StringUtil;
import com.simple.domain.po.SysPermission;
import com.simple.service.SysPermissionService;

/**
* Created by yangqj on 2017/4/30.
*/
@Service
public class ShiroService {
@Autowired
private ShiroFilterFactoryBean shiroFilterFactoryBean;
@Autowired
private SysPermissionService resourcesService;
@Autowired
private RedisSessionDAO redisSessionDAO;
/**
* 初始化权限
*/
public Map<String, String> loadFilterChainDefinitions() {
// 权限控制map.从数据库获取
Map<String, String> filterChainDefinitionMap = new LinkedHashMap<String, String>();
filterChainDefinitionMap.put("/logout", "logout");
filterChainDefinitionMap.put("/css/**","anon");
filterChainDefinitionMap.put("/js/**","anon");
filterChainDefinitionMap.put("/img/**","anon");
filterChainDefinitionMap.put("/user/**","anon");
filterChainDefinitionMap.put("/font-awesome/**","anon");
// Map<String,Object> map = new HashMap<>();
// List<SysPermission> resourcesList = resourcesService.list(map);
// for(SysPermission resources:resourcesList){
//
// if (StringUtil.isNotEmpty(resources.getUrl())) {
// String permission = "perms[" + resources.getUrl()+ "]";
// filterChainDefinitionMap.put(resources.getUrl(),permission);
// }
// }
filterChainDefinitionMap.put("/**", "authc");
return filterChainDefinitionMap;
}

/**
* 重新加载权限
*/
public void updatePermission() {

synchronized (shiroFilterFactoryBean) {

AbstractShiroFilter shiroFilter = null;
try {
shiroFilter = (AbstractShiroFilter) shiroFilterFactoryBean
.getObject();
} catch (Exception e) {
throw new RuntimeException(
"get ShiroFilter from shiroFilterFactoryBean error!");
}

PathMatchingFilterChainResolver filterChainResolver = (PathMatchingFilterChainResolver) shiroFilter
.getFilterChainResolver();
DefaultFilterChainManager manager = (DefaultFilterChainManager) filterChainResolver
.getFilterChainManager();

// 清空老的权限控制
manager.getFilterChains().clear();

shiroFilterFactoryBean.getFilterChainDefinitionMap().clear();
shiroFilterFactoryBean
.setFilterChainDefinitionMap(loadFilterChainDefinitions());
// 重新构建生成
Map<String, String> chains = shiroFilterFactoryBean
.getFilterChainDefinitionMap();
for (Map.Entry<String, String> entry : chains.entrySet()) {
String url = entry.getKey();
String chainDefinition = entry.getValue().trim()
.replace(" ", "");
manager.createChain(url, chainDefinition);
}

System.out.println("更新权限成功!!");
}
}

/**
* 根据userId 清除当前session存在的用户的权限缓存
* @param userIds 已经修改了权限的userId
*/
/* public void clearUserAuthByUserId(List<Integer> userIds){
if(null == userIds || userIds.size() == 0) return ;
//获取所有session
Collection<Session> sessions = redisSessionDAO.getActiveSessions();
//定义返回
List<SimplePrincipalCollection> list = new ArrayList<SimplePrincipalCollection>();
for (Session session:sessions){
//获取session登录信息。
Object obj = session.getAttribute(DefaultSubjectContext.PRINCIPALS_SESSION_KEY);
if(null != obj && obj instanceof SimplePrincipalCollection){
//强转
SimplePrincipalCollection spc = (SimplePrincipalCollection)obj;
//判断用户,匹配用户ID。
obj = spc.getPrimaryPrincipal();
if(null != obj && obj instanceof User){
User user = (User) obj;
System.out.println("user:"+user);
//比较用户ID,符合即加入集合
if(null != user && userIds.contains(user.getId())){
list.add(spc);
}
}
}
}
RealmSecurityManager securityManager =
(RealmSecurityManager) SecurityUtils.getSecurityManager();
MyShiroRealm realm = (MyShiroRealm)securityManager.getRealms().iterator().next();
for (SimplePrincipalCollection simplePrincipalCollection : list) {
realm.clearCachedAuthorizationInfo(simplePrincipalCollection);
}
}*/
}

+ 9
- 0
mallinkAdmin/src/main/java/com/simple/shiro/UserSession.java Datei anzeigen

@@ -0,0 +1,9 @@
package com.simple.shiro;
public class UserSession {
public static String userInfo="userSession";
public static String userId ="userSessionId";
}

+ 3
- 6
mallinkAdmin/src/main/resources/application-dev.yml Datei anzeigen

@@ -1,12 +1,9 @@
spring:
# JDBC
datasource:
# url: jdbc:mysql://127.0.0.1:63306/mallink?characterEncoding=UTF-8&useSSL=false
# username: root
# password: root
url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&useSSL=false
username: mallone
password: m@1l0ne123@#
url: jdbc:mysql://127.0.0.1:63306/mallink?characterEncoding=UTF-8&useSSL=false
username: root
password: root
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.jdbc.Driver
filters: stat


+ 9
- 8
mallinkApi/pom.xml Datei anzeigen

@@ -3,8 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<parent>
<artifactId>mallink</artifactId>
<groupId>com.simple</groupId>
<version>1.0</version>
@@ -12,21 +11,23 @@

<artifactId>mallinkApi</artifactId>

<dependencies>
<dependencies>
<dependency>
<groupId>com.simple</groupId>
<artifactId>mallinkService</artifactId>
<version>1.0</version>
</dependency>
</dependencies>

<build>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<executable>true</executable>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxAppinfoController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxAppinfo;
import com.simple.service.WxAppinfoService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxBLogController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxBLog;
import com.simple.service.WxBLogService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxBUserMerchantController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxBUserMerchant;
import com.simple.service.WxBUserMerchantService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxBannersController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxBanners;
import com.simple.service.WxBannersService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxBusinessController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxBusiness;
import com.simple.service.WxBusinessService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxCLogController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxCLog;
import com.simple.service.WxCLogService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxCUserCarsController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxCUserCars;
import com.simple.service.WxCUserCarsService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxCUserCloudController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxCUserCloud;
import com.simple.service.WxCUserCloudService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxCUserController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxCUser;
import com.simple.service.WxCUserService;
import io.swagger.annotations.ApiImplicitParam;


+ 65
- 0
mallinkApi/src/main/java/com/simple/controller/WxCUserEtcpTokenController.java Datei anzeigen

@@ -0,0 +1,65 @@
package com.simple.controller;

import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxCUserEtcpToken;
import com.simple.service.WxCUserEtcpTokenService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;

@RestController
@RequestMapping("wxCUserEtcpToken")
public class WxCUserEtcpTokenController extends BaseController
{
@Autowired
private WxCUserEtcpTokenService wxCUserEtcpTokenService;

private Logger logger = Logger.getLogger(WxCUserEtcpTokenController.class);

@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true),
@ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)})
public ResultData list(@ModelAttribute WxCUserEtcpToken wxCUserEtcpToken,Integer pageNum, Integer pageSize) {
if (null == wxCUserEtcpToken) wxCUserEtcpToken = new WxCUserEtcpToken();
final PageInfo<WxCUserEtcpToken> page = wxCUserEtcpTokenService.listAsPage(wxCUserEtcpToken, pageNum, pageSize);
return new ResultData(page);
}

@PostMapping("add")
public ResultData add(@RequestBody WxCUserEtcpToken wxCUserEtcpToken) {
//Assert.notNull(wxCUserEtcpToken.getName(), "角色名不能为空");
//Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名");
wxCUserEtcpTokenService.saveOrUpdate(wxCUserEtcpToken);
return new ResultData();
}

@PostMapping("update")
public ResultData update(@RequestBody WxCUserEtcpToken wxCUserEtcpToken) {
wxCUserEtcpTokenService.saveOrUpdate(wxCUserEtcpToken);
return new ResultData();
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
wxCUserEtcpTokenService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
return new ResultData(Result.SUCCESS,"查询成功",wxCUserEtcpTokenService.getById(id));
}
}

+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxCUserTagsController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxCUserTags;
import com.simple.service.WxCUserTagsService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxCouponActionLogController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxCouponActionLog;
import com.simple.service.WxCouponActionLogService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxCouponActivityController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxCouponActivity;
import com.simple.service.WxCouponActivityService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxCouponController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxCoupon;
import com.simple.service.WxCouponService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxCouponRecordController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxCouponRecord;
import com.simple.service.WxCouponRecordService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxCouponTypeController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxCouponType;
import com.simple.service.WxCouponTypeService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxEtcpCouponRecord;
import com.simple.service.WxEtcpCouponRecordService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxEtcpParkDissolution;
import com.simple.service.WxEtcpParkDissolutionService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxEtcpParkInController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxEtcpParkIn;
import com.simple.service.WxEtcpParkInService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxEtcpParkMsgSuc;
import com.simple.service.WxEtcpParkMsgSucService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxEtcpParkOrderunpay;
import com.simple.service.WxEtcpParkOrderunpayService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOutController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxEtcpParkOut;
import com.simple.service.WxEtcpParkOutService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxEtcpParkTransaction;
import com.simple.service.WxEtcpParkTransactionService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxEtcpParkUnbind;
import com.simple.service.WxEtcpParkUnbindService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxFlashSaleController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxFlashSale;
import com.simple.service.WxFlashSaleService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxMallBuildingController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxMallBuilding;
import com.simple.service.WxMallBuildingService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxMallController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxMall;
import com.simple.service.WxMallService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxMallFloorController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxMallFloor;
import com.simple.service.WxMallFloorService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxMerchantController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxMerchant;
import com.simple.service.WxMerchantService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxMerchantShopController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxMerchantShop;
import com.simple.service.WxMerchantShopService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxMerchantTradeDaysController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxMerchantTradeDays;
import com.simple.service.WxMerchantTradeDaysService;
import io.swagger.annotations.ApiImplicitParam;


+ 65
- 0
mallinkApi/src/main/java/com/simple/controller/WxMsgConfigController.java Datei anzeigen

@@ -0,0 +1,65 @@
package com.simple.controller;

import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxMsgConfig;
import com.simple.service.WxMsgConfigService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;

@RestController
@RequestMapping("wxMsgConfig")
public class WxMsgConfigController extends BaseController
{
@Autowired
private WxMsgConfigService wxMsgConfigService;

private Logger logger = Logger.getLogger(WxMsgConfigController.class);

@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true),
@ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)})
public ResultData list(@ModelAttribute WxMsgConfig wxMsgConfig,Integer pageNum, Integer pageSize) {
if (null == wxMsgConfig) wxMsgConfig = new WxMsgConfig();
final PageInfo<WxMsgConfig> page = wxMsgConfigService.listAsPage(wxMsgConfig, pageNum, pageSize);
return new ResultData(page);
}

@PostMapping("add")
public ResultData add(@RequestBody WxMsgConfig wxMsgConfig) {
//Assert.notNull(wxMsgConfig.getName(), "角色名不能为空");
//Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名");
wxMsgConfigService.saveOrUpdate(wxMsgConfig);
return new ResultData();
}

@PostMapping("update")
public ResultData update(@RequestBody WxMsgConfig wxMsgConfig) {
wxMsgConfigService.saveOrUpdate(wxMsgConfig);
return new ResultData();
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
wxMsgConfigService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
return new ResultData(Result.SUCCESS,"查询成功",wxMsgConfigService.getById(id));
}
}

+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxMsgController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxMsg;
import com.simple.service.WxMsgService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxMsgModelController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxMsgModel;
import com.simple.service.WxMsgModelService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxMsgSignatureController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxMsgSignature;
import com.simple.service.WxMsgSignatureService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxOrdersController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxOrders;
import com.simple.service.WxOrdersService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxParkController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxPark;
import com.simple.service.WxParkService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxScoreHistoryController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxScoreHistory;
import com.simple.service.WxScoreHistoryService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxScoreRulesController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxScoreRules;
import com.simple.service.WxScoreRulesService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxScoreValidityPeriod;
import com.simple.service.WxScoreValidityPeriodService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxShopController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxShop;
import com.simple.service.WxShopService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxTagsController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxTags;
import com.simple.service.WxTagsService;
import io.swagger.annotations.ApiImplicitParam;


+ 3
- 4
mallinkApi/src/main/java/com/simple/controller/WxWebLogController.java Datei anzeigen

@@ -6,10 +6,9 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.rest.Result;
import com.simple.common.rest.ResultData;
import com.simple.annotation.HoldBegin;
import com.simple.annotation.HoldEnd;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxWebLog;
import com.simple.service.WxWebLogService;
import io.swagger.annotations.ApiImplicitParam;


+ 13
- 0
mallinkService/pom.xml Datei anzeigen

@@ -10,4 +10,17 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>mallinkService</artifactId>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>
</project>

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.

Laden…
Abbrechen
Speichern