Merge remote-tracking branch 'origin/developer' into developer

byit-myth-admin/src/main/resources/application-dev.yml

@@ -6,13 +6,13 @@ spring:
     password: 123456
 
   mail:
-    host: smtp.163.com #���Լ���SMTP��������ַ
-    username: huangfusuper@163.com #��¼�û���
-    password: huangfu0110 #��Ȩ����
+    host: smtp.163.com
+    username: huangfusuper@163.com
+    password: huangfu0110
     default-encoding: UTF-8
-    protocol: smtp #��
+    protocol: smtp
     properties:
-      from: huangfusuper@163.com #��ʵ����
+      from: huangfusuper@163.com
 
 mybatis:
   mapper-locations: /mapper/*.xml
@@ -22,7 +22,6 @@ myth-rpc:
     address: http://localhost:8080/myth-register
     env: huangfu
     biz: byit-myth-job
-    #port: 6665
 logging:
   path: /data/mythjob
   file: myth_log_file

byit-myth-admin/src/main/resources/application-pro.yml

+spring:
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://${CM_IP}/myth-job?Unicode=true&characterEncoding=UTF-8&useSSL=true
+    username: ${CM_USER}
+    password: ${CM_PWD}
+
+  mail:
+    host: smtp.163.com
+    username: huangfusuper@163.com
+    password: huangfu0110
+    default-encoding: UTF-8
+    protocol: smtp
+    properties:
+      from: huangfusuper@163.com
+
+mybatis:
+  mapper-locations: /mapper/*.xml
+
+myth-rpc:
+  registry:
+    address: http://${Eureka_IP}/myth-register
+    env: huangfu
+    biz: byit-myth-job
+logging:
+  path: /data/mythjob
+  file: myth_log_file
+
+file:
+  system:
+    ip: 10.0.120.2
+    port: 88
+
+myth-job:
+  filestystem: FASTDFS
\ No newline at end of file

byit-myth-admin/src/main/resources/application-test.yml

+spring:
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://${CM_IP}/myth-job?Unicode=true&characterEncoding=UTF-8&useSSL=true
+    username: ${CM_USER}
+    password: ${CM_PWD}
+
+  mail:
+    host: smtp.163.com
+    username: huangfusuper@163.com
+    password: huangfu0110
+    default-encoding: UTF-8
+    protocol: smtp
+    properties:
+      from: huangfusuper@163.com
+
+mybatis:
+  mapper-locations: /mapper/*.xml
+
+myth-rpc:
+  registry:
+    address: http://${Eureka_IP}/myth-register
+    env: test
+    biz: byit-myth-job
+logging:
+  path: /data/mythjob
+  file: myth_log_file
+
+file:
+  system:
+    ip: ${FILE_IP}
+    port: ${FILW_PORT}
+
+myth-job:
+  filestystem: FASTDFS
\ No newline at end of file

byit-myth-executor/myth-executor-server/src/main/resources/application-dev.properties

-# myth-rpc
-myth-rpc.remoting.port=7776
-myth-rpc.registry.address=http://localhost:8080/myth-register
-myth-rpc.registry.env=huangfu
-myth-rpc.registry.biz=byit-myth-job
-
-myth-job.filestystem=FASTDFS
-
-
-myth-job.log.root.path=/mythjob/log/
-myth-job.script.root.path=/mythjob/script/
-
-logging.config=classpath:logback.xml

byit-myth-executor/myth-executor-server/src/main/resources/application-dev.yml

+# myth-rpc
+myth-rpc:
+  registry:
+    address: http://localhost:8080/myth-register
+    biz: byit-myth-job
+    env: test
+  remoting:
+    port: 7776
+logging:
+  config: classpath:logback.xml
+myth-job:
+  filestystem: FASTDFS
+  log:
+    root:
+      path: /mythjob/log/
+  script:
+    root:
+      path: /mythjob/script/

byit-myth-executor/myth-executor-server/src/main/resources/application-pro.yml

+# myth-rpc
+myth-rpc:
+  registry:
+    address: http://localhost:8080/myth-register
+    biz: byit-myth-job
+    env: test
+  remoting:
+    port: 7776
+logging:
+  config: classpath:logback.xml
+
+myth-job:
+  filestystem: FASTDFS
+  log:
+    root:
+      path: /mythjob/log/
+  script:
+    root:
+      path: /mythjob/script/

byit-myth-executor/myth-executor-server/src/main/resources/application-test.yml

+# myth-rpc
+myth-rpc:
+  registry:
+    address: http://${Eureka_IP}/myth-register
+    biz: byit-myth-job
+    env: test
+  remoting:
+    port: ${Remote_PORT}
+logging:
+  config: classpath:logback.xml
+
+myth-job:
+  filestystem: FASTDFS
+  log:
+    root:
+      path: /mythjob/log/
+  script:
+    root:
+      path: /mythjob/script/

byit-myth-executor/myth-executor-server/src/main/resources/application.properties

-server.port=7777
-spring.application.name=myth-executor-server
-
-spring.profiles.active=dev

byit-myth-executor/myth-executor-server/src/main/resources/application.yml

+server:
+  port: 7777
+spring:
+  application:
+    name: myth-executor-server
+  profiles:
+    active: dev
\ No newline at end of file

byit-myth-gateway/src/main/resources/application-dev.properties

-zuul.ignored-services=*
-
-#路由规则参考byit-myth-rpc中的LoadBalance枚举类中的类型 默认是轮询
-gateway.load.balance=ROUND
-
-
-#datasource
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.url=jdbc:mysql://10.0.120.30:3307/myth-registry?useUnicode=true&useSSL=true&characterEncoding=utf-8&mysqlEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=false&autoReconnect=true&failOverReadOnly=false
-spring.datasource.username=root
-spring.datasource.password=root
-spring.datasource.hikari.idle-timeout=60000
-spring.datasource.hikari.maximum-pool-size=5
-spring.datasource.hikari.minimum-idle=1
-
-logging.config=classpath:logback.xml
-logging.level.org.springframework=INFO
-logging.level.com.byit.gateway=DEBUG
-
-# myth-rpc
-myth-rpc.remoting.port=8082
-myth-rpc.registry.address=http://localhost:8080/myth-register
-myth-rpc.registry.env=liyuan
-myth-rpc.registry.biz=byit-myth-job
-
-spring.zuul.route.refreshCron:0/10 * * * * ?
-

byit-myth-gateway/src/main/resources/application-dev.yml

+#路由规则参考byit-myth-rpc中的LoadBalance枚举类中的类型 默认是轮询
+gateway:
+  load:
+    balance: ROUND
+logging:
+  config: classpath:logback.xml
+  level:
+    com:
+      byit:
+        gateway: DEBUG
+    org:
+      springframework: INFO
+myth-rpc:
+  registry:
+    address: http://localhost:8080/myth-register
+    biz: byit-myth-job
+    env: liyuan
+  remoting:
+    port: 8082
+
+spring:
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    hikari:
+      idle-timeout: 60000
+      maximum-pool-size: 5
+      minimum-idle: 1
+    password: root
+    url: jdbc:mysql://10.0.120.30:3307/myth-registry?useUnicode=true&useSSL=true&characterEncoding=utf-8&mysqlEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=false&autoReconnect=true&failOverReadOnly=false
+    username: root
+  zuul:
+    route:
+      refreshCron: 0/10 * * * * ?
+
+zuul:
+  ignored-services: '*'

byit-myth-gateway/src/main/resources/application-pre.properties

-zuul.ignored-services=*
-
-#路由规则参考byit-myth-rpc中的LoadBalance枚举类中的类型 默认是轮询
-gateway.load.balance=ROUND
-
-logging.config=classpath:logback.xml
-logging.level.org.springframework=INFO
-logging.level.com.byit.gateway=DEBUG
-
-#datasource
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.url=jdbc:mysql://10.0.10.118:3306/myth-registry?useUnicode=true&useSSL=true&characterEncoding=utf-8&mysqlEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=false&autoReconnect=true&failOverReadOnly=false
-spring.datasource.username=root
-spring.datasource.password=123456
-spring.datasource.hikari.idle-timeout=60000
-spring.datasource.hikari.maximum-pool-size=5
-spring.datasource.hikari.minimum-idle=1
-
-# myth-rpc
-myth-rpc.remoting.port=8082
-myth-rpc.registry.address=http://localhost:8080/myth-register
-myth-rpc.registry.env=pre
-myth-rpc.registry.biz=byit-myth-job
-
-spring.zuul.route.refreshCron:0/10 * * * * ?

byit-myth-gateway/src/main/resources/application-pro.yml

+#路由规则参考byit-myth-rpc中的LoadBalance枚举类中的类型 默认是轮询
+gateway:
+  load:
+    balance: ROUND
+logging:
+  config: classpath:logback.xml
+  level:
+    com:
+      byit:
+        gateway: DEBUG
+    org:
+      springframework: INFO
+myth-rpc:
+  registry:
+    address: http://localhost:8080/myth-register
+    biz: byit-myth-job
+    env: liyuan
+  remoting:
+    port: 8082
+
+spring:
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    hikari:
+      idle-timeout: 60000
+      maximum-pool-size: 5
+      minimum-idle: 1
+    password: root
+    url: jdbc:mysql://10.0.120.30:3307/myth-registry?useUnicode=true&useSSL=true&characterEncoding=utf-8&mysqlEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=false&autoReconnect=true&failOverReadOnly=false
+    username: root
+  zuul:
+    route:
+      refreshCron: 0/10 * * * * ?
+
+zuul:
+  ignored-services: '*'

byit-myth-gateway/src/main/resources/application-test.properties

-zuul.ignored-services=*
-
-#路由规则参考byit-myth-rpc中的LoadBalance枚举类中的类型 默认是轮询
-gateway.load.balance=ROUND
-
-logging.config=classpath:logback.xml
-logging.level.org.springframework=INFO
-logging.level.com.byit.gateway=DEBUG
-
-# myth-rpc
-myth-rpc.remoting.port=8082
-myth-rpc.registry.address=http://localhost:8080/myth-register
-myth-rpc.registry.env=test
-myth-rpc.registry.biz=byit-myth-job
-
-spring.zuul.route.refreshCron:0/10 * * * * ?
-
-# Druid
-#logging.level.druid.sql=ERROR
-#logging.level.druid.sql.DataSource=ERROR
-#logging.level.druid.sql.Connection=ERROR
-#logging.level.druid.sql.Statement=DEBUG
-#logging.level.druid.sql.ResultSet=ERROR
-
-#datasource
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.url=jdbc:mysql://10.0.10.118:3306/myth-registry?useUnicode=true&useSSL=true&characterEncoding=utf-8&mysqlEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=false&autoReconnect=true&failOverReadOnly=false
-spring.datasource.username=root
-spring.datasource.password=123456
-spring.datasource.hikari.idle-timeout=60000
-spring.datasource.hikari.maximum-pool-size=5
-spring.datasource.hikari.minimum-idle=1

byit-myth-gateway/src/main/resources/application-test.yml

+#路由规则参考byit-myth-rpc中的LoadBalance枚举类中的类型 默认是轮询
+gateway:
+  load:
+    balance: ROUND
+logging:
+  config: classpath:logback.xml
+  level:
+    com:
+      byit:
+        gateway: DEBUG
+    org:
+      springframework: INFO
+myth-rpc:
+  registry:
+    address: http://${Eureka_IP}/myth-register
+    biz: byit-myth-job
+    env: test
+  remoting:
+    port: ${Remote_PORT}
+
+spring:
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    hikari:
+      idle-timeout: 60000
+      maximum-pool-size: 5
+      minimum-idle: 1
+    password: ${CM_PWD}
+    url: jdbc:mysql://${CM_IP}/myth-registry?useUnicode=true&useSSL=true&characterEncoding=utf-8&mysqlEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=false&autoReconnect=true&failOverReadOnly=false
+    username: ${CM_USER}
+  zuul:
+    route:
+      refreshCron: 0/10 * * * * ?
+
+zuul:
+  ignored-services: '*'

byit-myth-gateway/src/main/resources/application.properties

-
-server.port=8081
-spring.profiles.active=dev
-spring.application.name=byit-myth-gateway
-

byit-myth-gateway/src/main/resources/application.yml

+server:
+  port: 8081
+spring:
+  application:
+    name: byit-myth-gateway
+  profiles:
+    active: dev

byit-myth-register/myth-register-server/src/main/resources/application-dev.yml

+byit:
+  registry:
+    accessToken: ''
+    data:
+      filepath: /Users/liyuan/codes/open/rpc/data/applogs/myth-registry/registrydata
+    login:
+      password: 123456
+      username: admin
+logging:
+  config: classpath:logback.xml
+mybatis:
+  mapper-locations: classpath:/mybatis-mapper/*Mapper.xml
+
+spring:
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    password: 123456
+    tomcat:
+      max-active: 30
+      max-wait: 10000
+      test-on-borrow: true
+    type: org.apache.tomcat.jdbc.pool.DataSource
+    url: jdbc:mysql://10.0.10.118:3306/myth-registry?Unicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+    username: root
+  freemarker:
+    charset: UTF-8
+    request-context-attribute: request
+    settings:
+      number_format: 0.##########
+    suffix: .ftl
+    templateLoaderPath: classpath:/templates/
+  mvc:
+    static-path-pattern: /static/**
+  resources:
+    static-locations: classpath:/static/

byit-myth-register/myth-register-server/src/main/resources/application-pro.yml

+byit:
+  registry:
+    accessToken: ''
+    data:
+      filepath: /Users/liyuan/codes/open/rpc/data/applogs/myth-registry/registrydata
+    login:
+      password: 123456
+      username: admin
+logging:
+  config: classpath:logback.xml
+mybatis:
+  mapper-locations: classpath:/mybatis-mapper/*Mapper.xml
+
+spring:
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    password: 123456
+    tomcat:
+      max-active: 30
+      max-wait: 10000
+      test-on-borrow: true
+    type: org.apache.tomcat.jdbc.pool.DataSource
+    url: jdbc:mysql://10.0.10.118:3306/myth-registry?Unicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+    username: root
+  freemarker:
+    charset: UTF-8
+    request-context-attribute: request
+    settings:
+      number_format: 0.##########
+    suffix: .ftl
+    templateLoaderPath: classpath:/templates/
+  mvc:
+    static-path-pattern: /static/**
+  resources:
+    static-locations: classpath:/static/

byit-myth-register/myth-register-server/src/main/resources/application-test.yml

+byit:
+  registry:
+    accessToken: ''
+    data:
+      filepath: /Users/liyuan/codes/open/rpc/data/applogs/myth-registry/registrydata
+    login:
+      password: 123456
+      username: admin
+logging:
+  config: classpath:logback.xml
+mybatis:
+  mapper-locations: classpath:/mybatis-mapper/*Mapper.xml
+
+spring:
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    type: org.apache.tomcat.jdbc.pool.DataSource
+    url: jdbc:mysql://${CM_IP}/myth-registry?Unicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+    username: ${CM_PWD}
+    password: ${CM_PWD}
+    tomcat:
+      max-active: 30
+      max-wait: 10000
+      test-on-borrow: true
+  freemarker:
+    charset: UTF-8
+    request-context-attribute: request
+    settings:
+      number_format: 0.##########
+    suffix: .ftl
+    templateLoaderPath: classpath:/templates/
+  mvc:
+    static-path-pattern: /static/**
+  resources:
+    static-locations: classpath:/static/

byit-myth-register/myth-register-server/src/main/resources/application.properties

-### web
-server.port=8080
-server.context-path=/myth-register
-logging.config=classpath:logback.xml
-
-### resources
-spring.mvc.static-path-pattern=/static/**
-spring.resources.static-locations=classpath:/static/
-
-### freemarker
-spring.freemarker.templateLoaderPath=classpath:/templates/
-spring.freemarker.suffix=.ftl
-spring.freemarker.charset=UTF-8
-spring.freemarker.request-context-attribute=request
-spring.freemarker.settings.number_format=0.##########
-
-### mybatis
-mybatis.mapper-locations=classpath:/mybatis-mapper/*Mapper.xml
-
-### myth-registry, datasource
-spring.datasource.url=jdbc:mysql://10.0.10.118:3306/myth-registry?Unicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-spring.datasource.username=root
-spring.datasource.password=123456
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-spring.datasource.type=org.apache.tomcat.jdbc.pool.DataSource
-spring.datasource.tomcat.max-wait=10000
-spring.datasource.tomcat.max-active=30
-spring.datasource.tomcat.test-on-borrow=true
-
-
-### myth-registry, registry data filepath
-byit.registry.data.filepath=/Users/liyuan/codes/open/rpc/data/applogs/myth-registry/registrydata
-### myth-registry, access token
-byit.registry.accessToken=
-
-
-### myth-registry, login conf
-byit.registry.login.username=admin
-byit.registry.login.password=123456
-

byit-myth-register/myth-register-server/src/main/resources/application.yml

+server:
+  context-path: /myth-register
+  port: 8080
+
+spring:
+  profiles:
+    active: dev
\ No newline at end of file