oauth2 登录代码修改

hos-arbiter/src/main/resources/log4j2.xml

@@ -22,7 +22,6 @@
            <AppenderRef ref="Console"/>
            <AppenderRef ref="RollingFile" />
        </Root>
        <Logger name="org.hibernate" level="warn" additivity="false">
        </Logger>
    </Loggers>
</configuration>

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

@@ -58,12 +58,12 @@ hos:
spring:
  profiles: test
  activemq:
      broker-url: tcp://activemq:61616
      broker-url: tcp://172.19.103.67:61616
      user: admin
      password: admin
  data:
    mongodb:
      host: mongodb
      host: 172.19.103.67
      port: 27017
      username: esb
      password: esb
@@ -78,7 +78,7 @@ hos:
    rest-url: http://172.19.103.67:8080/esb
  arbiter:
    enable: true
    url: http://arbiter:10135
    url: http://172.19.103.67:10135
  rest:
    url: http://rest:8088
  timer:

hos-broker/src/main/resources/log4j.properties

@@ -31,7 +31,7 @@ log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
log4j.appender.jms=com.yihu.hos.broker.common.log.JMSAppender
log4j.appender.jms.InitialContextFactoryName=org.apache.activemq.jndi.ActiveMQInitialContextFactory
log4j.appender.jms.ProviderURL=tcp://172.19.103.57:61616
log4j.appender.jms.ProviderURL=tcp://172.19.103.67:61616
log4j.appender.jms.TopicBindingName=logTopic
log4j.appender.jms.TopicConnectionFactoryBindingName=ConnectionFactory
log4j.appender.jms.userName=admin

hos-camel2/src/main/java/camel/gateway/processor/GatewayProcessor.java

@@ -22,6 +22,7 @@ import java.util.stream.Stream;
public class GatewayProcessor implements Processor {
    static Map<String, AppApi> apiMap = new HashMap<>();
    static final String agUrl = "http://192.168.1.221:10000";
    public void process(Exchange exchange) throws Exception {
        Message inMessage = exchange.getIn();
@@ -34,7 +35,7 @@ public class GatewayProcessor implements Processor {
    public String secret(@Body String body, Exchange exchange) throws IOException, ParseException {
        System.out.println(body);
        String appKey = exchange.getIn().getHeaders().get("appKey").toString();
        return "restlet:http://192.168.1.221:10000/api/v1.0/admin/apps/" + appKey;
        return "restlet:"+ agUrl + "/api/v1.0/admin/apps/" + appKey;
    }
    public String route(Exchange exchange) throws IOException, ParseException {
@@ -127,7 +128,7 @@ public class GatewayProcessor implements Processor {
    private boolean checkAuthorized(Map<String, Object> params) {
        ObjectMapper objectMapper = new ObjectMapper();
        //TODO 设置固定的验证入口地址
        HTTPResponse response = HttpClientKit.get("http://192.168.1.221:10000/api/v1.0/admin/appApiAuth?appId=" + params.get("appKey") + "&apiName=" + params.get("api"));
        HTTPResponse response = HttpClientKit.get(agUrl + "/api/v1.0/admin/appApiAuth?appId=" + params.get("appKey") + "&apiName=" + params.get("api"));
        if (response.getStatusCode() != 200) {
            System.out.println("验证API权限，请求失败！");
            return false;
@@ -206,7 +207,7 @@ public class GatewayProcessor implements Processor {
            return appApi;
        }
        HTTPResponse response = HttpClientKit.get("http://192.168.1.221:10000/api/v1.0/admin/appApi/search?filters=methodName%3D" + api + "&size=15&page=1");
        HTTPResponse response = HttpClientKit.get(agUrl + "/api/v1.0/admin/appApi/search?filters=methodName%3D" + api + "&size=15&page=1");
        if (response.getStatusCode() != 200) {
            return null;
        }
@@ -226,7 +227,7 @@ public class GatewayProcessor implements Processor {
    private String getSecret(String appKey) {
        ObjectMapper objectMapper = new ObjectMapper();
        //TODO 设置固定的验证入口地址
        HTTPResponse response = HttpClientKit.get("http://192.168.1.221:10000/api/v1.0/admin/apps/" + appKey);
        HTTPResponse response = HttpClientKit.get(agUrl + "/api/v1.0/admin/apps/" + appKey);
        if (response.getStatusCode() != 200) {
            System.out.println("获取app的secret请求失败！");
            return "";

hos-camel2/src/main/java/camel/gateway/route/GatewayRouterBuilder.java

@@ -32,6 +32,10 @@ public class GatewayRouterBuilder extends RouteBuilder {
                .when(header(Exchange.HTTP_URI).contains("signValidError")).bean(new ErrorHandle(), "signValidError")
                .when(header(Exchange.HTTP_URI).contains("unauthorizedError")).bean(new ErrorHandle(), "unauthorizedError")
                .endChoice();
        from("jetty:http://0.0.0.0:9999/healthy").routeId("healthy")
                .log("=========================心跳测试=====================");
    }
}

src/main/java/com/yihu/hos/common/CommonPageController.java

@@ -198,11 +198,8 @@ public class CommonPageController extends BaseController {
        HttpSession session = request.getSession();
        boolean auth = false;
        String clientId = request.getParameter(ContextAttributes.CLIENTID);
        String token = request.getParameter(ContextAttributes.ACCESSTOKEN);
        String loginName = request.getParameter(ContextAttributes.LOGIN_NAME);
        //TODO　根据token和clientId 获取用户信息
        SystemUser userInfo = new SystemUser();
        userInfo.setLoginCode(loginName);
        userInfo.setUserName("管理员");
@@ -217,7 +214,7 @@ public class CommonPageController extends BaseController {
            e.printStackTrace();
        }
        model.addAttribute("userName", "admin");
        model.addAttribute("userName", loginName);
        model.addAttribute("tenant", tenantName);
        //获取菜单
        String menu = "[{id: 1, text: '任务管理',icon:'${staticRoot}/images/index/menu2_icon.png'},\n" +
@@ -281,7 +278,6 @@ public class CommonPageController extends BaseController {
                             HttpServletRequest request,
                             @ApiParam(name = "token")
                             @RequestParam String token) throws Exception {
        Envelop result = new Envelop();
        try {
            Map<String, String> params = new HashMap<>();
            params.put("clientId", clientId);
@@ -300,7 +296,7 @@ public class CommonPageController extends BaseController {
                //验证通过。赋值session中的用户信息
                HTTPResponse userResponse = HttpClientKit.get(adminUrl + "/users/" + loginName, params);
                result = (Envelop) this.objectMapper.readValue(userResponse.getBody(), Envelop.class);
                Envelop result =  this.objectMapper.readValue(userResponse.getBody(), Envelop.class);
                Collection<GrantedAuthority> gas = new ArrayList<>();
                if (result.isSuccessFlg()) {
                    String ex = this.objectMapper.writeValueAsString(result.getObj());

src/main/webapp/WEB-INF/ehr/jsp/common/signinJs.jsp

@@ -22,7 +22,8 @@
                    },
                    success: function (data) {
                        if(data.successFlg){
                            location.href = '${contextRoot}/'+tenantName + '/oauth2/index#signin';
                            debugger
                            location.href = '${contextRoot}/'+tenantName + '/oauth2/index?loginName='+data.obj.user;
                        }else{
                            location.href = '${contextRoot}/common/tokenValidFail';
                        }