bug修改

base/common-security/src/main/java/com.yihu.base.security/properties/AccessTokenPorperties.java

@@ -18,6 +18,8 @@ public class AccessTokenPorperties {
    @Value("${security.oauth2.token.tokenType:accessToken}")
    private String tokenType;
    public Integer getAccessTokenValidityHours() {
        return accessTokenValidityHours;
    }
@@ -41,4 +43,7 @@ public class AccessTokenPorperties {
    public void setTokenType(String tokenType) {
        this.tokenType = tokenType;
    }
}

common/common-entity/src/main/java/com/yihu/jw/base/version/BaseUserVersionDO.java

@@ -22,8 +22,8 @@ public class BaseUserVersionDO  extends IdEntity implements java.io.Serializable
	// Fields
	private String employeeId;
	private String version;
	private String employeeId; //用户id
	private String version; //版本
	// Constructors

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

@@ -2,6 +2,7 @@ spring:
  application:
    name: svr-logServer
---
spring:
  profiles: jwdev

svr/svr-base/src/main/java/com/yihu/jw/business/sms/controller/SmsController.java

@@ -30,15 +30,15 @@ public class SmsController extends EnvelopRestController {
    private SmsService smsService;
    @PostMapping(value = BaseSmsRequestMapping.Sms.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
            @ApiOperation(value = "创建短信", notes = "创建单个短信")
            public Envelop createSms(
                    @ApiParam(name = "json_data", value = "", defaultValue = "")
                    @RequestBody String jsonData) {
                try {
                    BaseSmsDO sms = toEntity(jsonData, BaseSmsDO.class);
                    return Envelop.getSuccess(BaseSmsRequestMapping.Sms.message_success_create, smsService.createSms(sms));
                } catch (ApiException e) {
                    return Envelop.getError(e.getMessage(), e.getErrorCode());
    @ApiOperation(value = "创建短信", notes = "创建单个短信")
    public Envelop createSms(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            BaseSmsDO sms = toEntity(jsonData, BaseSmsDO.class);
            return Envelop.getSuccess(BaseSmsRequestMapping.Sms.message_success_create, smsService.createSms(sms));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
@@ -75,13 +75,13 @@ public class SmsController extends EnvelopRestController {
        //得到list数据
        List<BaseSmsDO> list = smsService.search(fields, filters, sorts, page, size);
        //获取总数
        long count=smsService.getCount(filters);
        long count = smsService.getCount(filters);
        //封装头信息
        pagedResponse(request, response, count, page, size);
        //封装返回格式
        List<SmsVO> mSmss = convertToModels(list, new ArrayList<>(list.size()), SmsVO.class, fields);
        return Envelop.getSuccessListWithPage(BaseSmsRequestMapping.Sms.message_success_find_smss,mSmss, page, size,count);
        return Envelop.getSuccessListWithPage(BaseSmsRequestMapping.Sms.message_success_find_smss, mSmss, page, size, count);
    }
@@ -95,9 +95,9 @@ public class SmsController extends EnvelopRestController {
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "+name,+createTime")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        //得到list数据
        List<BaseSmsDO> list = smsService.search(fields,filters,sorts);
        List<BaseSmsDO> list = smsService.search(fields, filters, sorts);
        //封装返回格式
        List<SmsVO> mSmss = convertToModels(list, new ArrayList<>(list.size()), SmsVO.class, fields);
        return Envelop.getSuccessList(BaseSmsRequestMapping.Sms.message_success_find_smss,mSmss);
        return Envelop.getSuccessList(BaseSmsRequestMapping.Sms.message_success_find_smss, mSmss);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/business/sms/service/SmsService.java

@@ -18,6 +18,7 @@ public class SmsService  extends BaseJpaService<BaseSmsDO, SmsDao> {
    @Transactional
    public BaseSmsDO createSms(BaseSmsDO sms) throws ApiException {
        return smsDao.save(sms);
    }

svr/svr-base/src/main/java/com/yihu/jw/business/user/contorller/EmployController.java

@@ -78,4 +78,6 @@ public class EmployController extends EnvelopRestController {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
}

svr/svr-demo/src/main/java/com/yihu/jw/model/SaasDO.java

@@ -106,6 +106,80 @@ public class SaasDO implements Serializable, ClientDetails {
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    public String getCreateUser() {
        return createUser;
    }
    public void setCreateUser(String createUser) {
        this.createUser = createUser;
    }
    public String getCreateUserName() {
        return createUserName;
    }
    public void setCreateUserName(String createUserName) {
        this.createUserName = createUserName;
    }
    public Date getUpdateTime() {
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
    public String getUpdateUser() {
        return updateUser;
    }
    public void setUpdateUser(String updateUser) {
        this.updateUser = updateUser;
    }
    public String getUpdateUserName() {
        return updateUserName;
    }
    public void setUpdateUserName(String updateUserName) {
        this.updateUserName = updateUserName;
    }
    public String getAppId() {
        return appId;
    }
    public void setAppId(String appId) {
        this.appId = appId;
    }
    public String getAppSecret() {
        return appSecret;
    }
    public void setAppSecret(String appSecret) {
        this.appSecret = appSecret;
    }
    public String getUrl() {
        return url;
    }
    public void setUrl(String url) {
        this.url = url;
    }
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    //================================oauth2========================================
    @Override
    public String getClientId() {
@@ -181,14 +255,22 @@ public class SaasDO implements Serializable, ClientDetails {
        return new ArrayList<>();
    }
    /**
     * 过期时间
     * @return
     */
    @Override
    public Integer getAccessTokenValiditySeconds() {
        return 0;
        return 7200;
    }
    /**
     * 过期时间
     * @return
     */
    @Override
    public Integer getRefreshTokenValiditySeconds() {
        return 0;
        return 7200;
    }
    /**
@@ -206,75 +288,4 @@ public class SaasDO implements Serializable, ClientDetails {
        return new HashMap<>();
    }
    public String getCreateUser() {
        return createUser;
    }
    public void setCreateUser(String createUser) {
        this.createUser = createUser;
    }
    public String getCreateUserName() {
        return createUserName;
    }
    public void setCreateUserName(String createUserName) {
        this.createUserName = createUserName;
    }
    public Date getUpdateTime() {
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
    public String getUpdateUser() {
        return updateUser;
    }
    public void setUpdateUser(String updateUser) {
        this.updateUser = updateUser;
    }
    public String getUpdateUserName() {
        return updateUserName;
    }
    public void setUpdateUserName(String updateUserName) {
        this.updateUserName = updateUserName;
    }
    public String getAppId() {
        return appId;
    }
    public void setAppId(String appId) {
        this.appId = appId;
    }
    public String getAppSecret() {
        return appSecret;
    }
    public void setAppSecret(String appSecret) {
        this.appSecret = appSecret;
    }
    public String getUrl() {
        return url;
    }
    public void setUrl(String url) {
        this.url = url;
    }
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
}

svr/svr-demo/src/main/java/com/yihu/jw/service/ClientService.java

@@ -1,5 +1,6 @@
package com.yihu.jw.service;
import com.yihu.base.security.properties.AccessTokenPorperties;
import com.yihu.base.security.rbas.ClientServiceProvider;
import com.yihu.jw.model.SaasDO;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,7 +36,6 @@ public class ClientService implements ClientServiceProvider {
        SaasDO baseClientDetails = new SaasDO();
        baseClientDetails.setAppId("cwd");
        baseClientDetails.setAppSecret( passwordEncoder.encode("cwd"));
        baseClientDetails.getAuthorizedGrantTypes();
        return baseClientDetails;
    }

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

@@ -47,7 +47,6 @@ public class UserService implements UserDetailsService {
    @Override
    public UserDetails loadUserByUsername(String userName) throws UsernameNotFoundException {
        if ("admin".equals(userName)) {
            System.out.printf("password:" + passwordEncoder.encode("123456"));
            return new User("admin",
                    passwordEncoder.encode("123456"),
                    true,
@@ -57,7 +56,6 @@ public class UserService implements UserDetailsService {
                    , AuthorityUtils.commaSeparatedStringToAuthorityList("admin,ROLE_USER") //权限
            );
        } else if ((!StringUtils.isEmpty(userName))&&userName.length() == 11) {
            System.out.printf("password:" + passwordEncoder.encode("123456"));
            return new User("admin",
                    passwordEncoder.encode("123456"),
                    true,

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

@@ -28,9 +28,9 @@ spring:
  redis:
    host: 127.0.0.1 # Redis server host.
    host: 172.19.103.88 # Redis server host.
    port: 6379 # Redis server port.
    database: 6
    database: 3
  aop:
    proxy-target-class: true

web-gateway/src/main/java/com/yihu/jw/commnon/base/base/VersionContants.java

@@ -2,6 +2,7 @@ package com.yihu.jw.commnon.base.base;
/**
 * Created by chenweida on 2017/11/13.
 * 版本发布相关
 */
public class VersionContants {
}

web-gateway/src/main/java/com/yihu/jw/config/security/UserService.java

@@ -1,6 +1,7 @@
package com.yihu.jw.config.security;
import com.yihu.jw.feign.base.user.EmployFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.authority.AuthorityUtils;
import org.springframework.security.core.userdetails.User;
@@ -20,6 +21,8 @@ public class UserService implements UserDetailsService {
    @Autowired
    private PasswordEncoder passwordEncoder;
    @Autowired
    private EmployFeign employFeign;
    /**
     * 我们只需要把用户返回给spring-security 密码框架自己帮我们校验

web-gateway/src/main/java/com/yihu/jw/controller/base/version/UserVersionController.java

@@ -1,7 +1,9 @@
package com.yihu.jw.controller.base.version;
import com.yihu.jw.commnon.base.base.BaseContants;
import com.yihu.jw.feign.base.version.UserVersionFeign;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -13,5 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping(BaseContants.api_common)
@Api(description = "灰度发布相关")
public class UserVersionController {
    @Autowired
    private UserVersionFeign userVersionFeign;
}

web-gateway/src/main/java/com/yihu/jw/feign/base/version/UserVersionFeign.java

@@ -15,4 +15,5 @@ import org.springframework.web.bind.annotation.RequestMapping;
)
@RequestMapping(value = BaseRequestMapping.api_base_common)
public interface UserVersionFeign {
}