Merge branch 'master' of http://192.168.1.220:10080/esb/esb

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

@@ -47,11 +47,9 @@ arbiter:
  timer:
    period: 10000
  central:
    url:
    port: 15555
    store: ./store
    url: 172.17.110.202:15555
  terminal:
    url: 172.19.103.70:15555
    url: 172.17.110.202:15555
  tenant:
    name: jkzl
  mycat:

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

@@ -70,19 +70,19 @@ hos:
---
spring:
  profiles: test
  datasource:
    driverClassName: com.mysql.jdbc.Driver
    url: jdbc:mysql://mysql:3306/hos1?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
    username: hos
    password: 123456
    test-on-borrow: true
    validation-query: SELECT 1
    test-while-idle: true
    max-active: 30
    default-auto-commit: true
    max-idle: 30
    min-idle: 10
    initial-size: 10
#  datasource:
#    driverClassName: com.mysql.jdbc.Driver
#    url: jdbc:mysql://mysql:3306/hos1?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
#    username: hos
#    password: 123456
#    test-on-borrow: true
#    validation-query: SELECT 1
#    test-while-idle: true
#    max-active: 30
#    default-auto-commit: true
#    max-idle: 30
#    min-idle: 10
#    initial-size: 10
  activemq:
      broker-url: tcp://activemq:61616
      user: admin
@@ -112,7 +112,7 @@ hos:
  tenant:
    name: jkzl
  mycat:
    path: /usr/local/mycat/   ##mycat的安装目录
    path: /opt/mycat/   ##mycat的安装目录
  #jcraft shell操作
  jcraft:
    host: 172.19.103.67

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://activemq:61616
log4j.appender.jms.TopicBindingName=logTopic
log4j.appender.jms.TopicConnectionFactoryBindingName=ConnectionFactory
log4j.appender.jms.userName=admin

src/main/java/com/yihu/hos/ESBApplication.java

@@ -44,5 +44,6 @@ public class ESBApplication extends WebMvcConfigurerAdapter  implements CommandL
        config.storePath = configuration.getZbusStore();
        final MqServer server = new MqServer(config);
        server.start();
        System.out.println("zbus 启动成功！");
    }
}

src/main/java/com/yihu/hos/config/BeanConfig.java

@@ -136,7 +136,7 @@ public class BeanConfig {
        CookieLocaleResolver localeResolver = new CookieLocaleResolver();
        localeResolver.setCookieName("Language");
        localeResolver.setCookieMaxAge(604800);
        localeResolver.setDefaultLocale(new Locale("zh_CN"));
        localeResolver.setDefaultLocale(new Locale("zh_cn"));
        return localeResolver;
    }

src/main/java/com/yihu/hos/system/service/AppManager.java

@@ -16,6 +16,7 @@ import com.yihu.hos.web.framework.constant.EndPointConstant;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.GridFSUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.commons.CommonsMultipartFile;
@@ -40,6 +41,9 @@ public class AppManager {
    @Resource(name = AppDao.BEAN_ID)
    private AppDao appDao;
    @Value("${spring.data.mongodb.gridFsDatabase}")
    private String dbName;
    @Resource(name = AppServiceDao.BEAN_ID)
    private AppServiceDao appServiceDao;
@@ -170,7 +174,6 @@ public class AppManager {
    public Result readFile(OutputStream os, String fileName) {
        String dbName = "upload";
        try {
            fileName = DES.decrypt(fileName, DES.COMMON_PASSWORD);
            GridFSUtil.readFile(mongoConfig.mongoClient().getDatabase(dbName), os, fileName);

src/main/resources/application.yml

@@ -1,7 +1,7 @@
application:
  message: ESB
server:
  context-path: /esb
  context-path: /
  port: 8080
  session-timeout:  3000
security:
@@ -71,7 +71,7 @@ spring:
  #SAAS管理员账号,暂时配置在此处
  datasource:
      driverClassName: com.mysql.jdbc.Driver
      url: jdbc:mysql://mysql:3306/global_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
      url: jdbc:mysql://172.17.110.202:8066/global_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
      username: hos
      password: 123456
      test-on-borrow: true
@@ -96,6 +96,7 @@ spring:
      password: esb
      authenticationDatabase: admin
      gridFsDatabase: dfs
      database: runtime
  activemq:
    broker-url: tcp://activemq:61616?wireFormat.maxInactivityDuration=0
    user: admin
@@ -105,7 +106,7 @@ spring:
    proxy-target-class: true
hos:
  zbus:
    url: 172.19.103.67:15555
    url: 172.17.110.202:15555
    port: 15555
    store: ./store
  mysql: