diff --git a/mallinkAdmin/pom.xml b/mallinkAdmin/pom.xml
index 13278b661..bf44f1930 100644
--- a/mallinkAdmin/pom.xml
+++ b/mallinkAdmin/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
-
+
mallink
com.simple
1.0
diff --git a/mallinkAdmin/src/main/java/com/simple/config/RedisConfig.java b/mallinkAdmin/src/main/java/com/simple/config/RedisConfig.java
new file mode 100644
index 000000000..b4187b35c
--- /dev/null
+++ b/mallinkAdmin/src/main/java/com/simple/config/RedisConfig.java
@@ -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;
+ }
+
+}
diff --git a/mallinkAdmin/src/main/java/com/simple/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/simple/config/ShiroConfig.java
new file mode 100644
index 000000000..8a23c2ce1
--- /dev/null
+++ b/mallinkAdmin/src/main/java/com/simple/config/ShiroConfig.java
@@ -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 filterChainDefinitionMap = new LinkedHashMap();
+
+ //配置退出 过滤器,其中的具体的退出代码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");
+ //:这是一个坑呢,一不小心代码就不好使了;
+ //
+ //自定义加载权限资源关系
+// Map map = new HashMap<>();
+// List 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;
+ }
+
+}
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java b/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java
new file mode 100644
index 000000000..76f1361c5
--- /dev/null
+++ b/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java
@@ -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 roleList = sysRoleService.findRoleByUserId(user.getId());
+ if (null != roleList && roleList.size() > 0) {
+ List permissionList = sysPermissionService
+ .findPermissionByRoleIds(roleList.stream().map(SysRole::getId).collect(Collectors.toList()));
+ // user.setRole(roleList);
+ user.setPermission(permissionList);
+ }
+ return new ResultData();
+
+ }
+
+}
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/RoleController.java b/mallinkAdmin/src/main/java/com/simple/controller/RoleController.java
new file mode 100644
index 000000000..5cf3bac3f
--- /dev/null
+++ b/mallinkAdmin/src/main/java/com/simple/controller/RoleController.java
@@ -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 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;
+ }
+
+}
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/SysPermissionController.java b/mallinkAdmin/src/main/java/com/simple/controller/SysPermissionController.java
new file mode 100644
index 000000000..620fc7ea1
--- /dev/null
+++ b/mallinkAdmin/src/main/java/com/simple/controller/SysPermissionController.java
@@ -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 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);
+ }
+
+
+}
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/UserInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/UserInfoController.java
new file mode 100644
index 000000000..e34c48c6c
--- /dev/null
+++ b/mallinkAdmin/src/main/java/com/simple/controller/UserInfoController.java
@@ -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 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 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 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 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;
+ }
+}
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxAppinfoController.java
index d1761a031..8a56deb4b 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxAppinfoController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxAppinfoController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxBLogController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxBLogController.java
index 38566ee27..886b4c811 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxBLogController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxBLogController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxBUserMerchantController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxBUserMerchantController.java
index 3433eff7d..635190014 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxBUserMerchantController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxBUserMerchantController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxBannersController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxBannersController.java
index a426eec58..16132ec9c 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxBannersController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxBannersController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxBusinessController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxBusinessController.java
index ce29f52e9..540f30180 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxBusinessController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxBusinessController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCLogController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCLogController.java
index 103c9484c..3f84bc3a9 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxCLogController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCLogController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserCarsController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserCarsController.java
index 23510bced..071125a90 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserCarsController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserCarsController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserCloudController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserCloudController.java
index 2a865c2de..98a740796 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserCloudController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserCloudController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserController.java
index eda908358..37984ac2b 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserEtcpTokenController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserEtcpTokenController.java
new file mode 100644
index 000000000..a3eb086d5
--- /dev/null
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserEtcpTokenController.java
@@ -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 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));
+ }
+
+
+
+}
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserTagsController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserTagsController.java
index 379d21002..baf43284c 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserTagsController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserTagsController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponActionLogController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponActionLogController.java
index bff51d202..756f5cb82 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponActionLogController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponActionLogController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponActivityController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponActivityController.java
index f54ab5606..8befb34d5 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponActivityController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponActivityController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java
index 65428a3e7..58467ed03 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponRecordController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponRecordController.java
index 0bdc3c03b..21f1f1fea 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponRecordController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponRecordController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponTypeController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponTypeController.java
index fcc8d7f29..fbf11c730 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponTypeController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponTypeController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java
index 8b62627cf..9f09e5b43 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java
index 84fdfe97f..fd198087d 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkInController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkInController.java
index fe370ad44..65cddd04b 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkInController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkInController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java
index a051cade7..ef8f594bd 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java
index 86768578a..3938e280d 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOutController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOutController.java
index f514fdb09..de04cf11b 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOutController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOutController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java
index 72d505014..a3f12be50 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java
index 5240a6532..b0b2ee725 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxFlashSaleController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxFlashSaleController.java
index 454e1ffe0..0defb49e1 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxFlashSaleController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxFlashSaleController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMallBuildingController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMallBuildingController.java
index e09199a9a..1d0a17624 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxMallBuildingController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMallBuildingController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMallController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMallController.java
index 4f62dc142..c64cbb591 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxMallController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMallController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMallFloorController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMallFloorController.java
index d2c900c0b..6145bf6aa 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxMallFloorController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMallFloorController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java
index 1c47bd7ad..d33f77fdf 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantShopController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantShopController.java
index 0c3c21691..73b885b16 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantShopController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantShopController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantTradeDaysController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantTradeDaysController.java
index 5ab8ba092..1d5804c60 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantTradeDaysController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantTradeDaysController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgConfigController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgConfigController.java
new file mode 100644
index 000000000..1b6abefe0
--- /dev/null
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgConfigController.java
@@ -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 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));
+ }
+
+
+
+}
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java
index e150f16f3..80a5e3637 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java
index df8f6fd9d..2ad3f25a7 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgSignatureController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgSignatureController.java
index 4c3df57e2..d170c1551 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgSignatureController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgSignatureController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxOrdersController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxOrdersController.java
index fd4c34300..3bc2ada0d 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxOrdersController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxOrdersController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxParkController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxParkController.java
index 3df5879ba..b5886d0f0 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxParkController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxParkController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxScoreHistoryController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxScoreHistoryController.java
index f826ce76b..1ee827a6a 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxScoreHistoryController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxScoreHistoryController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxScoreRulesController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxScoreRulesController.java
index 570a1607e..5e610ac85 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxScoreRulesController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxScoreRulesController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java
index 136aa6a39..a9fc09025 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java
index 0fe0f8686..e648b392a 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxTagsController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxTagsController.java
index 5e245ebf3..2ddced75c 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxTagsController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxTagsController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxWebLogController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxWebLogController.java
index c1fa57afb..16b67ecd7 100644
--- a/mallinkAdmin/src/main/java/com/simple/controller/WxWebLogController.java
+++ b/mallinkAdmin/src/main/java/com/simple/controller/WxWebLogController.java
@@ -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;
diff --git a/mallinkAdmin/src/main/java/com/simple/shiro/MyShiroRealm.java b/mallinkAdmin/src/main/java/com/simple/shiro/MyShiroRealm.java
new file mode 100644
index 000000000..4d6a83db1
--- /dev/null
+++ b/mallinkAdmin/src/main/java/com/simple/shiro/MyShiroRealm.java
@@ -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 map = new HashMap();
+// map.put("userid",user.getId());
+// List 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);
+ }
+*/
+}
diff --git a/mallinkAdmin/src/main/java/com/simple/shiro/PasswordHelper.java b/mallinkAdmin/src/main/java/com/simple/shiro/PasswordHelper.java
new file mode 100644
index 000000000..ea042a67e
--- /dev/null
+++ b/mallinkAdmin/src/main/java/com/simple/shiro/PasswordHelper.java
@@ -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);
+
+ }
+
+}
diff --git a/mallinkAdmin/src/main/java/com/simple/shiro/ShiroService.java b/mallinkAdmin/src/main/java/com/simple/shiro/ShiroService.java
new file mode 100644
index 000000000..606c72797
--- /dev/null
+++ b/mallinkAdmin/src/main/java/com/simple/shiro/ShiroService.java
@@ -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 loadFilterChainDefinitions() {
+ // 权限控制map.从数据库获取
+ Map filterChainDefinitionMap = new LinkedHashMap();
+ 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 map = new HashMap<>();
+// List 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 chains = shiroFilterFactoryBean
+ .getFilterChainDefinitionMap();
+ for (Map.Entry 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 userIds){
+ if(null == userIds || userIds.size() == 0) return ;
+ //获取所有session
+ Collection sessions = redisSessionDAO.getActiveSessions();
+ //定义返回
+ List list = new ArrayList();
+ 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);
+ }
+ }*/
+}
diff --git a/mallinkAdmin/src/main/java/com/simple/shiro/UserSession.java b/mallinkAdmin/src/main/java/com/simple/shiro/UserSession.java
new file mode 100644
index 000000000..1afa3a2f2
--- /dev/null
+++ b/mallinkAdmin/src/main/java/com/simple/shiro/UserSession.java
@@ -0,0 +1,9 @@
+package com.simple.shiro;
+
+public class UserSession {
+
+ public static String userInfo="userSession";
+
+ public static String userId ="userSessionId";
+
+}
diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml
index f77289b69..8bcd356f3 100644
--- a/mallinkAdmin/src/main/resources/application-dev.yml
+++ b/mallinkAdmin/src/main/resources/application-dev.yml
@@ -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
diff --git a/mallinkApi/pom.xml b/mallinkApi/pom.xml
index c3a43acc1..3a5f279f1 100644
--- a/mallinkApi/pom.xml
+++ b/mallinkApi/pom.xml
@@ -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">
4.0.0
-
-
+
mallink
com.simple
1.0
@@ -12,21 +11,23 @@
mallinkApi
-
+
com.simple
mallinkService
1.0
-
-
+
+
- org.springframework.boot
- spring-boot-maven-plugin
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.1
- true
+ 1.8
+ 1.8
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxAppinfoController.java b/mallinkApi/src/main/java/com/simple/controller/WxAppinfoController.java
index d1761a031..8a56deb4b 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxAppinfoController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxAppinfoController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxBLogController.java b/mallinkApi/src/main/java/com/simple/controller/WxBLogController.java
index 38566ee27..886b4c811 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxBLogController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxBLogController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxBUserMerchantController.java b/mallinkApi/src/main/java/com/simple/controller/WxBUserMerchantController.java
index 3433eff7d..635190014 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxBUserMerchantController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxBUserMerchantController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxBannersController.java b/mallinkApi/src/main/java/com/simple/controller/WxBannersController.java
index a426eec58..16132ec9c 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxBannersController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxBannersController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxBusinessController.java b/mallinkApi/src/main/java/com/simple/controller/WxBusinessController.java
index ce29f52e9..540f30180 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxBusinessController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxBusinessController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCLogController.java b/mallinkApi/src/main/java/com/simple/controller/WxCLogController.java
index 103c9484c..3f84bc3a9 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxCLogController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxCLogController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCUserCarsController.java b/mallinkApi/src/main/java/com/simple/controller/WxCUserCarsController.java
index 23510bced..071125a90 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxCUserCarsController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxCUserCarsController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCUserCloudController.java b/mallinkApi/src/main/java/com/simple/controller/WxCUserCloudController.java
index 2a865c2de..98a740796 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxCUserCloudController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxCUserCloudController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCUserController.java b/mallinkApi/src/main/java/com/simple/controller/WxCUserController.java
index eda908358..37984ac2b 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxCUserController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxCUserController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCUserEtcpTokenController.java b/mallinkApi/src/main/java/com/simple/controller/WxCUserEtcpTokenController.java
new file mode 100644
index 000000000..a3eb086d5
--- /dev/null
+++ b/mallinkApi/src/main/java/com/simple/controller/WxCUserEtcpTokenController.java
@@ -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 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));
+ }
+
+
+
+}
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCUserTagsController.java b/mallinkApi/src/main/java/com/simple/controller/WxCUserTagsController.java
index 379d21002..baf43284c 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxCUserTagsController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxCUserTagsController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCouponActionLogController.java b/mallinkApi/src/main/java/com/simple/controller/WxCouponActionLogController.java
index bff51d202..756f5cb82 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxCouponActionLogController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxCouponActionLogController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCouponActivityController.java b/mallinkApi/src/main/java/com/simple/controller/WxCouponActivityController.java
index f54ab5606..8befb34d5 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxCouponActivityController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxCouponActivityController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCouponController.java b/mallinkApi/src/main/java/com/simple/controller/WxCouponController.java
index 65428a3e7..58467ed03 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxCouponController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxCouponController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCouponRecordController.java b/mallinkApi/src/main/java/com/simple/controller/WxCouponRecordController.java
index 0bdc3c03b..21f1f1fea 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxCouponRecordController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxCouponRecordController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCouponTypeController.java b/mallinkApi/src/main/java/com/simple/controller/WxCouponTypeController.java
index fcc8d7f29..fbf11c730 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxCouponTypeController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxCouponTypeController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java b/mallinkApi/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java
index 8b62627cf..9f09e5b43 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java
index 84fdfe97f..fd198087d 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkInController.java b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkInController.java
index fe370ad44..65cddd04b 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkInController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkInController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java
index a051cade7..ef8f594bd 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java
index 86768578a..3938e280d 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOutController.java b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOutController.java
index f514fdb09..de04cf11b 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOutController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOutController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java
index 72d505014..a3f12be50 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java
index 5240a6532..b0b2ee725 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxFlashSaleController.java b/mallinkApi/src/main/java/com/simple/controller/WxFlashSaleController.java
index 454e1ffe0..0defb49e1 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxFlashSaleController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxFlashSaleController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMallBuildingController.java b/mallinkApi/src/main/java/com/simple/controller/WxMallBuildingController.java
index e09199a9a..1d0a17624 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxMallBuildingController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxMallBuildingController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMallController.java b/mallinkApi/src/main/java/com/simple/controller/WxMallController.java
index 4f62dc142..c64cbb591 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxMallController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxMallController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMallFloorController.java b/mallinkApi/src/main/java/com/simple/controller/WxMallFloorController.java
index d2c900c0b..6145bf6aa 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxMallFloorController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxMallFloorController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMerchantController.java b/mallinkApi/src/main/java/com/simple/controller/WxMerchantController.java
index 1c47bd7ad..d33f77fdf 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxMerchantController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxMerchantController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMerchantShopController.java b/mallinkApi/src/main/java/com/simple/controller/WxMerchantShopController.java
index 0c3c21691..73b885b16 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxMerchantShopController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxMerchantShopController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMerchantTradeDaysController.java b/mallinkApi/src/main/java/com/simple/controller/WxMerchantTradeDaysController.java
index 5ab8ba092..1d5804c60 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxMerchantTradeDaysController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxMerchantTradeDaysController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMsgConfigController.java b/mallinkApi/src/main/java/com/simple/controller/WxMsgConfigController.java
new file mode 100644
index 000000000..1b6abefe0
--- /dev/null
+++ b/mallinkApi/src/main/java/com/simple/controller/WxMsgConfigController.java
@@ -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 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));
+ }
+
+
+
+}
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMsgController.java b/mallinkApi/src/main/java/com/simple/controller/WxMsgController.java
index e150f16f3..80a5e3637 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxMsgController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxMsgController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMsgModelController.java b/mallinkApi/src/main/java/com/simple/controller/WxMsgModelController.java
index df8f6fd9d..2ad3f25a7 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxMsgModelController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxMsgModelController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMsgSignatureController.java b/mallinkApi/src/main/java/com/simple/controller/WxMsgSignatureController.java
index 4c3df57e2..d170c1551 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxMsgSignatureController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxMsgSignatureController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxOrdersController.java b/mallinkApi/src/main/java/com/simple/controller/WxOrdersController.java
index fd4c34300..3bc2ada0d 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxOrdersController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxOrdersController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxParkController.java b/mallinkApi/src/main/java/com/simple/controller/WxParkController.java
index 3df5879ba..b5886d0f0 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxParkController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxParkController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxScoreHistoryController.java b/mallinkApi/src/main/java/com/simple/controller/WxScoreHistoryController.java
index f826ce76b..1ee827a6a 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxScoreHistoryController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxScoreHistoryController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxScoreRulesController.java b/mallinkApi/src/main/java/com/simple/controller/WxScoreRulesController.java
index 570a1607e..5e610ac85 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxScoreRulesController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxScoreRulesController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java b/mallinkApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java
index 136aa6a39..a9fc09025 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxShopController.java b/mallinkApi/src/main/java/com/simple/controller/WxShopController.java
index 0fe0f8686..e648b392a 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxShopController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxShopController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxTagsController.java b/mallinkApi/src/main/java/com/simple/controller/WxTagsController.java
index 5e245ebf3..2ddced75c 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxTagsController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxTagsController.java
@@ -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;
diff --git a/mallinkApi/src/main/java/com/simple/controller/WxWebLogController.java b/mallinkApi/src/main/java/com/simple/controller/WxWebLogController.java
index c1fa57afb..16b67ecd7 100644
--- a/mallinkApi/src/main/java/com/simple/controller/WxWebLogController.java
+++ b/mallinkApi/src/main/java/com/simple/controller/WxWebLogController.java
@@ -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;
diff --git a/mallinkService/pom.xml b/mallinkService/pom.xml
index 47ddf2151..f0a2d8a70 100644
--- a/mallinkService/pom.xml
+++ b/mallinkService/pom.xml
@@ -10,4 +10,17 @@
4.0.0
mallinkService
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.1
+
+ 1.8
+ 1.8
+
+
+
+
\ No newline at end of file
diff --git a/mallinkService/src/main/java/com/simple/common/CommonMapper.java b/mallinkService/src/main/java/com/simple/common/CommonMapper.java
new file mode 100644
index 000000000..d054250d6
--- /dev/null
+++ b/mallinkService/src/main/java/com/simple/common/CommonMapper.java
@@ -0,0 +1,16 @@
+package com.simple.common;
+
+import tk.mybatis.mapper.common.BaseMapper;
+import tk.mybatis.mapper.common.IdsMapper;
+import tk.mybatis.mapper.common.Marker;
+import tk.mybatis.mapper.common.special.InsertListMapper;
+
+import java.io.Serializable;
+
+/**
+ * @author chenkx
+ * @date 2017-12-27
+ */
+
+public interface CommonMapper extends BaseMapper, IdsMapper, InsertListMapper, Marker {
+}
diff --git a/mallinkService/src/main/java/com/simple/common/ErrorCode.java b/mallinkService/src/main/java/com/simple/common/ErrorCode.java
new file mode 100644
index 000000000..0c10fe3af
--- /dev/null
+++ b/mallinkService/src/main/java/com/simple/common/ErrorCode.java
@@ -0,0 +1,76 @@
+package com.simple.common;
+
+import java.text.MessageFormat;
+
+/**
+ * @author chenkx
+ * @date 2017-12-28.
+ */
+public enum ErrorCode{
+
+ /**
+ * 系统级别
+ * 1000-1999
+ */
+ SERVER_ERROR(1000, "服务器请求异常"),
+ PARAMETER_ERROR(1001, "参数不合法"),
+ PARAMETER_NOT_NULL(1002, "参数不能为空"),
+ PARAMETER_TYPE_ERROR(1003, "参数类型异常"),
+ PARAMETER_CAST_ERROR(1004, "参数转换异常"),
+ PARAMETER_EMPTY_ERROR(1005, "参数转换异常"),
+ BEAN_EMPTY_PROPERTY_ERROR(1006, "实体转换异常"),
+ MEDIATYPE_NOT_SUPPORT(1007, "不支持的媒体类型"),
+ NULLPOINTER_ERROR(1008, "空指针异常"),
+ METHOD_NOT_SUPPORT(1009, "不支持的请求类型"),
+ CLASSCAST_ERROR(1010, "类型转换异常"),
+ NUMBER_FORMAT_ERROR(1011, "数字转化异常"),
+ EXTEND_JSON_ERROR(1012, "JSON格式异常"),
+ REPEAT_SUBMIT_EXCEPTION(1013, "请勿重复操作"),
+
+ LOGIN_DENIED(1013, "登录失败"),
+ TOKEN_INVALID(1014, "TOKEN无效"),
+
+
+ /**
+ * 业务级别
+ */
+ /**
+ * 用户2000-2099
+ */
+ USER_IS_EMPTY(2000, "用户不存在"),
+ PASSWORD_ERROR(2001, "密码错误"),
+ LOGIN_USER_OR_PWD_ERROR(2002, "用户名或密码错误"),
+ USER_IS_LOCKED(2003, "用户已经被锁定不能登录,请与管理员联系");
+
+
+
+ private int code;
+ private String message;
+
+ ErrorCode(int code, String message) {
+ this.code = code;
+ this.message = message;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public String getMessage(Object... param) {
+ if (param.length == 0) {
+ return message;
+ }
+ return MessageFormat.format(message, param);
+ }
+
+ public static ErrorCode getByCode(int code) {
+ ErrorCode[] values = ErrorCode.values();
+ for (ErrorCode value : values) {
+ if (value.getCode() == code) {
+ return value;
+ }
+
+ }
+ return null;
+ }
+}
diff --git a/mallinkService/src/main/java/com/simple/common/Result.java b/mallinkService/src/main/java/com/simple/common/Result.java
new file mode 100644
index 000000000..8a9b4e0bd
--- /dev/null
+++ b/mallinkService/src/main/java/com/simple/common/Result.java
@@ -0,0 +1,27 @@
+package com.simple.common;
+
+
+
+/**
+ * @author chenkx
+ * @date 2018-01-05.
+ */
+public class Result {
+
+ public int code;
+ public String message;
+ public static final int SUCCESS = 200;
+ public static final int ERROR = 500;
+ public static final int UNLOGIN = 701;
+
+ public Result() {
+ this.code = 200;
+ this.message = "success";
+ }
+
+ public Result(int code, String message) {
+ this.code = code;
+ this.message = message;
+ }
+
+}
diff --git a/mallinkService/src/main/java/com/simple/common/ResultData.java b/mallinkService/src/main/java/com/simple/common/ResultData.java
new file mode 100644
index 000000000..3590caff0
--- /dev/null
+++ b/mallinkService/src/main/java/com/simple/common/ResultData.java
@@ -0,0 +1,87 @@
+package com.simple.common;
+
+import java.beans.BeanInfo;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author chenkx
+ * @date 2018-01-05.
+ */
+public class ResultData extends Result {
+
+ public Object data;
+
+ public ResultData() {
+ super();
+ }
+
+ public ResultData(Object data) {
+ this();
+ this.data = data;
+ }
+
+
+ public static ResultData returnResultObject(int code) {
+ String value = ErrorCode.getByCode(code).getMessage();
+ return new ResultData(code, value);
+ }
+
+
+ public ResultData(Enum>[] ens) {
+ List