Merge branch 'master' of luofaqiang/esb into master

hos-saas/pom.xml

@@ -34,6 +34,12 @@
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-configuration-processor</artifactId>
            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>mysql</groupId>
            <artifactId>mysql-connector-java</artifactId>
@@ -44,7 +50,7 @@
            <artifactId>commons-lang3</artifactId>
            <version>3.3.2</version>
        </dependency>
        
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-test</artifactId>

hos-saas/src/main/java/com/yihu/hos/saas/configurations/ServiceConfiguration.java

@@ -1,8 +1,11 @@
package com.yihu.hos.saas.configurations;
import com.yihu.hos.saas.services.AuthenticateService;
import com.yihu.hos.saas.services.HelloService;
import com.yihu.hos.saas.services.mockimpl.HelloServiceMockImpl;
import com.yihu.hos.saas.services.impl.AuthenticateServiceImpl;
import com.yihu.hos.saas.services.impl.HelloServiceImpl;
import com.yihu.hos.saas.services.mockimpl.AuthenticateServiceMockImpl;
import com.yihu.hos.saas.services.mockimpl.HelloServiceMockImpl;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -15,8 +18,16 @@ public class ServiceConfiguration {
    @Value("${services.HelloService}")
    private boolean helloService;
    @Value("${services.AuthenticateService}")
    private boolean authenticateService;
    @Bean
    public HelloService helloService() {
        return helloService ? new HelloServiceImpl() : new HelloServiceMockImpl();
    }
    @Bean
    AuthenticateService authenticateService() {
        return authenticateService ? new AuthenticateServiceImpl() : new AuthenticateServiceMockImpl();
    }
}

hos-saas/src/main/java/com/yihu/hos/saas/interceptors/AuthenticateInterceptor.java

@@ -1,18 +1,24 @@
package com.yihu.hos.saas.interceptors;
import com.yihu.hos.saas.constants.ContextAttributes;
import com.yihu.hos.saas.utils.LocalContext;
import com.yihu.hos.saas.services.AuthenticateService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
public class AuthenticateInterceptor extends HandlerInterceptorAdapter {
    private final AuthenticateService authenticateService;
    @Autowired
    public AuthenticateInterceptor(AuthenticateService authenticateService) {
        Assert.notNull(authenticateService, "AuthenticateService must be not null");
        this.authenticateService = authenticateService;
    }
    @Override
    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
        String name = request.getParameter("name");
        LocalContext.getContext().setAttachment(ContextAttributes.SCHEMA, name);
        return super.preHandle(request, response, handler);
        return authenticateService.isAuth(request, response);
    }
}

hos-saas/src/main/java/com/yihu/hos/saas/models/UserModel.java

@@ -2,55 +2,24 @@ package com.yihu.hos.saas.models;
import com.yihu.hos.saas.models.common.IdModel;
import org.apache.commons.lang3.StringUtils;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
import java.util.UUID;
/**
 * @created Airhead 2016/9/2.
 */
@Entity
@Table(name = "fd_user")
@Table(name = "user")
public class UserModel extends IdModel {
    private String code;
    private String name;
    private String mobile;
    private String password;
    private String salt;
    private Date createTime;
    private String photo;
    private String remark;
    private Integer gender;
    private String biography;
    private String personCode;
    private Integer points;
    private String openId;
    private Integer status;
    private String idCard;
    public UserModel() {
    }
    public UserModel(String openId) {
        this.code = UUID.randomUUID().toString().replace("-", "");
        this.name = "yichang_" + code.substring(0, 6);
        this.createTime = new Date();
        this.openId = openId;
        this.status = 1;
    }
    public UserModel(String name, String code) {
        this.code = code;
        generateName(name, code);
        this.createTime = new Date();
        this.status = 1;
    }
    private Date created;
    private Date updated;
    private Integer valid;
    @Column(name = "code")
    public String getCode() {
@@ -70,128 +39,39 @@ public class UserModel extends IdModel {
        this.name = name;
    }
    @Column(name = "mobile")
    public String getMobile() {
        return mobile;
    }
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
    @Column(name = "salt")
    public String getSalt() {
        return salt;
    }
    public void setSalt(String salt) {
        this.salt = salt;
    }
    @Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    @Column(name = "photo")
    public String getPhoto() {
        return photo;
    }
    public void setPhoto(String photo) {
        this.photo = photo;
    }
    @Column(name = "remark")
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    @Column(name = "gender")
    public Integer getGender() {
        return gender;
    }
    public void setGender(Integer gender) {
        this.gender = gender;
    }
    @Column(name = "biography")
    public String getBiography() {
        return biography;
    }
    public void setBiography(String biography) {
        this.biography = biography;
    }
    @Column(name = "person_code")
    public String getPersonCode() {
        return personCode;
    }
    public void setPersonCode(String personCode) {
        this.personCode = personCode;
    }
    @Column(name = "points")
    public Integer getPoints() {
        return points;
    }
    public void setPoints(Integer points) {
        this.points = points;
    }
    @Column(name = "wechat_open_id")
    public String getOpenId() {
        return openId;
    }
    public void setOpenId(String openId) {
        this.openId = openId;
    @Column(name = "password")
    public String getPassword() {
        return password;
    }
    @Column(name = "status")
    public Integer getStatus() {
        return status;
    public void setPassword(String password) {
        this.password = password;
    }
    public void setStatus(Integer status) {
        this.status = status;
    @Column(name = "created")
    public Date getCreated() {
        return created;
    }
    @Column(name = "password")
    public String getPassword() {
        return password;
    public void setCreated(Date created) {
        this.created = created;
    }
    public void setPassword(String password) {
        this.password = password;
    @Column(name = "updated")
    public Date getUpdated() {
        return updated;
    }
    @Column(name = "id_card")
    public String getIdCard() {
        return idCard;
    public void setUpdated(Date updated) {
        this.updated = updated;
    }
    public void setIdCard(String idCard) {
        this.idCard = idCard;
    @Column(name = "valid")
    public Integer getValid() {
        return valid;
    }
    private void generateName(String name, String code) {
        if (StringUtils.isEmpty(name)) {
            this.name = "yichang_" + code.substring(0, 6);
        } else {
            this.name = name;
        }
    public void setValid(Integer valid) {
        this.valid = valid;
    }
}

hos-saas/src/main/java/com/yihu/hos/saas/models/UserSession.java

@@ -0,0 +1,9 @@
package com.yihu.hos.saas.models;
/**
 * @created Airhead 2016/11/16.
 */
public class UserSession {
    private String userCode;
    private String token;
}

hos-saas/src/main/java/com/yihu/hos/saas/services/AuthenticateService.java

@@ -0,0 +1,17 @@
package com.yihu.hos.saas.services;
import com.yihu.hos.saas.models.UserSession;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
 * @created Airhead 2016/11/16.
 */
@Service
public interface AuthenticateService {
    boolean isAuth(HttpServletRequest request, HttpServletResponse response) throws Exception;
    UserSession auth(HttpServletRequest request, HttpServletResponse response);
}

hos-saas/src/main/java/com/yihu/hos/saas/services/impl/AuthenticateServiceImpl.java

@@ -0,0 +1,20 @@
package com.yihu.hos.saas.services.impl;
import com.yihu.hos.saas.models.UserSession;
import com.yihu.hos.saas.services.AuthenticateService;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
/**
 * @created Airhead 2016/11/16.
 */
public class AuthenticateServiceImpl implements AuthenticateService {
    @Override
    public boolean isAuth(HttpServletRequest request, HttpServletResponse response) throws Exception {
        HttpSession session = request.getSession();
        UserSession userSession = (UserSession) session.getAttribute("userSession");
        return userSession != null;
    }
}

hos-saas/src/main/java/com/yihu/hos/saas/services/mockimpl/AuthenticateServiceMockImpl.java

@@ -0,0 +1,20 @@
package com.yihu.hos.saas.services.mockimpl;
import com.yihu.hos.saas.constants.ContextAttributes;
import com.yihu.hos.saas.services.AuthenticateService;
import com.yihu.hos.saas.utils.LocalContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
 * @created Airhead 2016/11/16.
 */
public class AuthenticateServiceMockImpl implements AuthenticateService {
    @Override
    public boolean isAuth(HttpServletRequest request, HttpServletResponse response) throws Exception {
        String name = request.getParameter("name");
        LocalContext.getContext().setAttachment(ContextAttributes.SCHEMA, name);
        return true;
    }
}

hos-saas/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -0,0 +1,9 @@
{
  "properties": [
    {
      "name": "services.HelloService",
      "type": "java.lang.String",
      "description": "Description for services.HelloService."
    }
  ]
}

hos-saas/src/main/resources/application.yml

@@ -1,5 +1,6 @@
services:
  HelloService: false
  AuthenticateService : false
spring:
  datasource:

src/main/java/com/yihu/hos/datacollect/controller/DataCollectController.java

@@ -8,6 +8,7 @@ import com.yihu.hos.datacollect.model.RsJobConfig;
import com.yihu.hos.datacollect.service.intf.IDatacollectManager;
import com.yihu.hos.datacollect.service.intf.IDatacollectService;
import com.yihu.hos.resource.service.IStdService;
import com.yihu.hos.standard.service.adapter.AdapterSchemeService;
import com.yihu.hos.system.service.intf.IDatasourceManager;
import com.yihu.hos.web.framework.constrant.DateConvert;
import com.yihu.hos.web.framework.model.ActionResult;
@@ -46,6 +47,9 @@ public class DataCollectController extends BaseController {
    @Resource(name = Services.Datasource)
    IDatasourceManager datasource;
    @Resource(name = AdapterSchemeService.BEAN_ID)
    private AdapterSchemeService adapterSchemeService;
    @Autowired
    private ObjectMapper objectMapper;

src/test/java/com/yihu/hos/saas/services/ServiceFlowEventServiceTest.java

@@ -40,4 +40,4 @@ public class ServiceFlowEventServiceTest {
    public void routeDefineDelete() throws Exception {
        serviceFlowEventService.routeDefineDelete("hosServiceEventService", "services", "HosServiceEventService");
    }
}
}