Merge branch 'dev' of trick9191/wlyy2.0 into dev

gateway/ag-basic/src/main/resources/application.yml

@@ -69,12 +69,12 @@ spring:
spring:
  profiles: jwtest
  datasource:
    url: jdbc:mysql://172.19.103.77/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: 123456
#  zipkin:
#    base-url: http://localhost:9411 #日志追踪的地址
     url: jdbc:mysql://172.17.110.160/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
     username: ssgg
     password: ssgg
  redis:
    host: 172.19.103.88 # Redis server host.
    port: 6379 # Redis server port.
---
spring:
  profiles: jwprod
@@ -82,5 +82,8 @@ spring:
    url: jdbc:mysql://172.19.103.77/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: 123456
  redis:
    host: 172.19.103.88 # Redis server host.
    port: 6379 # Redis server port.
#  zipkin:
#    base-url: http://localhost:9411 #日志追踪的地址

server/svr-authentication/src/main/resources/application.yml

@@ -39,9 +39,12 @@ spring:
spring:
  profiles: jwtest
  datasource:
    url: jdbc:mysql://172.17.110.160/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    username: ssgg
    password: ssgg
#    url: jdbc:mysql://172.17.110.160/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
#    username: ssgg
#    password: ssgg
    url: jdbc:mysql://172.19.103.77/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: 123456
  redis:
    host: 172.19.103.88 # Redis server host.
    port: 6379 # Redis server port.

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/wx/WechatCoreController.java

@@ -187,7 +187,7 @@ public class WechatCoreController extends EnvelopRestEndpoint {
        return strDigest;
    }
    @RequestMapping(value ="test", method = RequestMethod.POST)
    @RequestMapping(value ="test", method = RequestMethod.GET)
    @ResponseBody
    public String  testProcess() throws Exception{
        return wechatCoreService.testProcess();

svr/svr-base/src/main/java/com/yihu/jw/base/service/user/UserService.java

@@ -162,16 +162,14 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        Map<String, Object> userinfo = new HashedMap();
        UserDO user = userDao.findOne(id);
        RoleDO role = roleDao.findByCode(user.getRoleCode());
        RoleDO role = null;
        userinfo.put("id", user.getId());
        userinfo.put("name", user.getName());
        userinfo.put("role", role.getName());
        userinfo.put("roleCode", role.getCode());
        userinfo.put("system", role.getSystem());
        if (user != null) {
            userinfo.put("id", user.getId());
            userinfo.put("name", user.getName());
            if(org.apache.commons.lang3.StringUtils.isNotBlank(user.getRoleCode())){
                role = roleDao.findOne(user.getRoleCode());
            }
        }
        //获取角色

svr/svr-base/src/main/java/com/yihu/jw/base/service/wx/WechatService.java

@@ -27,7 +27,7 @@ import java.util.Map;
import java.util.UUID;
/**
 * Created by trick on 2017/5/20 0020
 * Created by trick on 2017/5/20
 */
@Service
@Transactional
@@ -65,21 +65,21 @@ public class WechatService {
                " w.type, " +
                " w.public_type AS publicType," +
                " w.token," +
                " w.encType," +
                " w.enc_type AS encType," +
                " w.type," +
                " w.appId," +
                " w.appSecret," +
                " w.appOriginId," +
                " w.baseUrl," +
                " w.userName," +
                " w.app_id AS appId," +
                " w.app_secret AS appSecret," +
                " w.app_origin_id AS appOriginId," +
                " w.base_url AS baseUrl," +
                " w.user_name AS userName," +
                " w.password," +
                " w.remark," +
                " w.createTime," +
                " w.createUser," +
                " w.createUserName," +
                " w.updateTime," +
                " w.updateUser," +
                " w.updateUserName" +
                " w.create_time AS createTime," +
                " w.create_user AS createUser," +
                " w.create_user_name AS createUserName," +
                " w.update_time AS updateTime," +
                " w.update_user AS updateUser," +
                " w.update_user_name AS updateUserName" +
                " FROM " +
                " wx_wechat w ";
        if (StringUtils.isNotBlank(saasName)) {

svr/svr-base/src/main/resources/application.yml

@@ -72,6 +72,9 @@ configDefault: # 默认配置
spring:
  profiles: jwdev
  datasource:
#    url: jdbc:mysql://172.17.110.160/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
#    username: ssgg
#    password: ssgg
    url: jdbc:mysql://172.19.103.77/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: 123456
@@ -103,6 +106,9 @@ jw:
spring:
  profiles: jwtest
  datasource:
#    url: jdbc:mysql://172.17.110.160/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
#    username: ssgg
#    password: ssgg
    url: jdbc:mysql://172.19.103.77/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: 123456