bug修改

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

@@ -27,7 +27,7 @@ arbiter:
  central:
    url:
  terminal:
    url: http://172.19.103.57:10135
    url: http://192.168.131.119:10135
  tenant:
    name: jkzl
---

src/main/java/com/yihu/hos/common/constants/ContextAttributes.java

@@ -5,6 +5,7 @@ package com.yihu.hos.common.constants;
 */
public interface ContextAttributes {
    String SCHEMA = "schema";
    String TENANT_NAME = "tenant_name";
    String USER_INFO = "userInfo";
    String TENANT_SESSION = "tenantSession";
    String GLOBAL_DB = "global_db";//平台管理中心库

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

@@ -172,6 +172,7 @@ public class DataCollectController extends BaseController {
            String jobDataset = request.getParameter("jobDataset");
            return datacollect.addJob(obj, cron, jobDataset);
        } catch (Exception ex) {
            ex.printStackTrace();
            return Result.error("新增任务失败！");
        }
    }

src/main/java/com/yihu/hos/services/ServiceFlowEventService.java

@@ -2,8 +2,10 @@ package com.yihu.hos.services;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.common.constants.ContextAttributes;
import com.yihu.hos.core.log.Logger;
import com.yihu.hos.core.log.LoggerFactory;
import com.yihu.hos.interceptor.LocalContext;
import com.yihu.hos.web.framework.constant.ServiceFlowConstant;
import com.yihu.hos.web.framework.model.bo.ServiceFlow;
import org.springframework.beans.factory.annotation.Autowired;
@@ -73,6 +75,8 @@ public class ServiceFlowEventService {
        try {
            String msg = objectMapper.writeValueAsString(serviceFlow);
            Map<String, Object> header = new HashMap<>();
            String attachment = LocalContext.getContext().getAttachment(ContextAttributes.TENANT_NAME);
            header.put("tenant", attachment);
            header.put("event", event);
            this.jmsMessagingTemplate.convertAndSend(this.queue, msg, header);
        } catch (JsonProcessingException e) {

src/main/java/com/yihu/hos/system/controller/SystemController.java

@@ -1,6 +1,7 @@
package com.yihu.hos.system.controller;
import com.yihu.hos.common.constants.ContextAttributes;
import com.yihu.hos.interceptor.LocalContext;
import com.yihu.hos.system.service.intf.ISystemManager;
import com.yihu.hos.tenant.model.TenantSession;
import com.yihu.hos.tenant.service.AuthenticateService;
@@ -88,6 +89,7 @@ public class SystemController {
                authenticateService.logout(session);
            }
            session.removeAttribute("userInfo");
            LocalContext.getContext().removeAttachment(ContextAttributes.TENANT_NAME);
            ActionResult re = new ActionResult(true, "登出成功！");
            re.setData(userCode);
            return re;

src/main/java/com/yihu/hos/tenant/model/TenantModel.java

@@ -65,7 +65,7 @@ public class TenantModel extends IdModel {
        this.password = password;
    }
    @Column(name="schema")
    @Column(name="schema_name")
    public String getSchema() {
        return schema;
    }

src/main/java/com/yihu/hos/tenant/service/AuthenticateService.java

@@ -58,6 +58,7 @@ public class AuthenticateService {
//        if (userModel == null || !password.equals(userModel.getPassword())) {
//            return "User Auth Failed";
//        }
        LocalContext.getContext().setAttachment(ContextAttributes.TENANT_NAME,tenantModel.getName());
        httpSession.setAttribute(ContextAttributes.TENANT_SESSION, new TenantSession(tenantModel.getLoginName(), tenantModel.getSchema()));
        return true;
    }

src/main/webapp/WEB-INF/ehr/jsp/tenant/editorTenantJs.jsp

@@ -82,7 +82,7 @@
                    cache:false,
                    success :function(data){
                        if(data.successFlg) {
                            parent.app.dialogSuccess(data.message);
                            parent.tenant.dialogSuccess(data.message);
                        }
                        else{
                            $.ligerDialog.error(data.message);