Pārlūkot izejas kodu

GridFS 初始化bug添加

demon 8 gadi atpakaļ
vecāks
revīzija
69162d798d

+ 2 - 2
hos-arbiter/src/main/java/com/yihu/hos/arbiter/HosArbiterApplication.java

@ -29,9 +29,9 @@ public class HosArbiterApplication implements CommandLineRunner {
            config.storePath = configuration.getCentralStore();
            final MqServer server = new MqServer(config);
            server.start();
        } else {
            proxyService.start();
        }
        proxyService.start();
    }
    @Autowired

+ 1 - 1
hos-arbiter/src/main/java/com/yihu/hos/arbiter/services/ServiceFlowService.java

@ -364,7 +364,7 @@ public class ServiceFlowService {
            message.setBody(msg);
            message = producer.sendSync(message);
            logger.debug(message);
//            System.out.println("test");
        } catch (IOException | InterruptedException e) {
            logger.error(e.getMessage());
            e.printStackTrace();

+ 5 - 0
hos-broker/src/main/java/com/yihu/hos/broker/HosBrokerApplication.java

@ -1,6 +1,8 @@
package com.yihu.hos.broker;
import com.yihu.hos.broker.services.camel.CamelStartBoot;
import com.yihu.hos.web.framework.util.GridFSUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@ -12,6 +14,9 @@ import org.springframework.scheduling.annotation.EnableScheduling;
@EnableScheduling
public class HosBrokerApplication extends SpringBootServletInitializer implements CommandLineRunner {
    @Autowired
    private GridFSUtil gridFSUtil;
    public static void main(String[] args) {
        SpringApplication app = new SpringApplication(HosBrokerApplication.class);
        app.run(args);

+ 1 - 1
hos-broker/src/main/java/com/yihu/hos/broker/controllers/ESBCamelController.java

@ -22,7 +22,7 @@ public class ESBCamelController {
    @RequestMapping(value = "/heartbeat", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
    @ApiOperation(value = "测试服务器可以正常连接", produces = "application/json", notes = "测试服务器可以正常连接")
    public void heartbeat() {
        System.out.println("test");
//        System.out.println("test");
    }
    @RequestMapping(value = "/serviceFlow", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)

+ 4 - 1
src/main/java/com/yihu/hos/filter/SessionOutTimeFilter.java

@ -1,5 +1,7 @@
package com.yihu.hos.filter;
import com.yihu.hos.common.constants.ContextAttributes;
import com.yihu.hos.interceptor.LocalContext;
import org.springframework.stereotype.Component;
import org.springframework.web.filter.OncePerRequestFilter;
@ -41,13 +43,14 @@ public class SessionOutTimeFilter extends OncePerRequestFilter {
                || httpServletRequest.getSession().getAttribute("userInfo")==null) {
            // AJAX REQUEST PROCESS
            String attachment = LocalContext.getContext().getAttachment(ContextAttributes.TENANT_NAME);
            if ("XMLHttpRequest".equalsIgnoreCase(httpServletRequest.getHeader("X-Requested-With"))) {
                httpServletResponse.setHeader("sessionStatus", "timeOut");
                httpServletResponse.getWriter().print("{}");
                httpServletResponse.sendRedirect(httpServletRequest.getContextPath() + "/logoutAction");
                return;
            }
            httpServletResponse.sendRedirect(httpServletRequest.getContextPath() + "/loginPage");
            httpServletResponse.sendRedirect(httpServletRequest.getContextPath() + "/" +attachment+  "/loginPage");
            return;
        }
        filterChain.doFilter(httpServletRequest, httpServletResponse);

+ 3 - 2
src/main/java/com/yihu/hos/interceptor/LocalContext.java

@ -8,6 +8,7 @@ import java.util.Map;
 */
public class LocalContext {
    private static final ThreadLocal<LocalContext> LOCAL = new ThreadLocal<LocalContext>() {
        @Override
        protected LocalContext initialValue() {
            return new LocalContext();
        }
@ -23,7 +24,7 @@ public class LocalContext {
    }
    public String getAttachment(String key) {
        return (String) this.attachments.get(key);
        return this.attachments.get(key);
    }
    public LocalContext setAttachment(String key, String value) {
@ -37,7 +38,7 @@ public class LocalContext {
    }
    public LocalContext removeAttachment(String key) {
        this.attachments.remove(key);
    this.attachments.remove(key);
        return this;
    }

+ 4 - 0
src/main/java/com/yihu/hos/system/service/SystemManager.java

@ -1,6 +1,7 @@
package com.yihu.hos.system.service;
import com.yihu.hos.common.constants.ContextAttributes;
import com.yihu.hos.interceptor.LocalContext;
import com.yihu.hos.system.model.SystemUser;
import com.yihu.hos.tenant.model.TenantSession;
import com.yihu.hos.web.framework.model.ActionResult;
@ -43,6 +44,9 @@ public class SystemManager {
            tenantSession.setUserCode("admin");//设置租户code
            tenantSession.setRole("admin");//标识为管理员账号
            session.setAttribute(ContextAttributes.TENANT_SESSION, tenantSession);
            LocalContext.getContext().setAttachment(ContextAttributes.TENANT_NAME,tenantSession.getUserCode());
            LocalContext.getContext().setAttachment(ContextAttributes.SCHEMA, tenantSession.getSchema());
            result = new ActionResult(true,"登录成功!");
            result.setData(tenantSession);
            return result;