From a1ce00064acc4b524cf01144c910dad755e30ae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=A6?= <吴æ武慧娟> Date: Mon, 9 Dec 2019 09:42:59 +0800 Subject: [PATCH] port --- .gitignore | 32 +++ admin/admin.iml | 236 ----------------- admin/src/main/resources/application-dev.yml | 4 +- eureka/eureka.iml | 237 ------------------ .../src/main/resources/application-dev1.yml | 4 +- eureka/target/classes/application-dev1.yml | 51 ---- eureka/target/classes/application-dev2.yml | 38 --- eureka/target/classes/application.yml | 3 - .../com/ccsens/eureka/EurekaApplication.class | Bin 910 -> 0 bytes .../eureka/config/WebSecurityConfig.class | Bin 2078 -> 0 bytes histrixmonitor/histrixmonitor.iml | 218 ---------------- .../target/classes/application-dev.yml | 34 --- histrixmonitor/target/classes/application.yml | 3 - .../HistrixMonitorApplication.class | Bin 1022 -> 0 bytes 14 files changed, 37 insertions(+), 823 deletions(-) create mode 100644 .gitignore delete mode 100644 admin/admin.iml delete mode 100644 eureka/eureka.iml delete mode 100644 eureka/target/classes/application-dev1.yml delete mode 100644 eureka/target/classes/application-dev2.yml delete mode 100644 eureka/target/classes/application.yml delete mode 100644 eureka/target/classes/com/ccsens/eureka/EurekaApplication.class delete mode 100644 eureka/target/classes/com/ccsens/eureka/config/WebSecurityConfig.class delete mode 100644 histrixmonitor/histrixmonitor.iml delete mode 100644 histrixmonitor/target/classes/application-dev.yml delete mode 100644 histrixmonitor/target/classes/application.yml delete mode 100644 histrixmonitor/target/classes/com/ccsens/histrixmonitor/HistrixMonitorApplication.class diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..25abe6e --- /dev/null +++ b/.gitignore @@ -0,0 +1,32 @@ +# Created by .ignore support plugin (hsz.mobi) +### Java template +# Compiled class file +*.class +target +target/ +target/* +.idea +.idea/ + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar +*.iml + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + diff --git a/admin/admin.iml b/admin/admin.iml deleted file mode 100644 index a8aa127..0000000 --- a/admin/admin.iml +++ /dev/null @@ -1,236 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/admin/src/main/resources/application-dev.yml b/admin/src/main/resources/application-dev.yml index 5782569..e2c6793 100644 --- a/admin/src/main/resources/application-dev.yml +++ b/admin/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 1000 + port: 7000 # 使用在服务代理器之后 # use-forward-headers: true spring: @@ -56,7 +56,7 @@ eureka: service-url: # 指定eureka server通信地址，注意/eureka/小尾巴不能少 # defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/ - defaultZone: http://admin:admin@127.0.0.1:8761/eureka/ + defaultZone: http://admin:admin@127.0.0.1:7010/eureka/ registry-fetch-interval-seconds: 5 logging: file: /home/admin/log/admin.log diff --git a/eureka/eureka.iml b/eureka/eureka.iml deleted file mode 100644 index 4180b3e..0000000 --- a/eureka/eureka.iml +++ /dev/null @@ -1,237 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/eureka/src/main/resources/application-dev1.yml b/eureka/src/main/resources/application-dev1.yml index 6a2d249..43846dd 100644 --- a/eureka/src/main/resources/application-dev1.yml +++ b/eureka/src/main/resources/application-dev1.yml @@ -1,5 +1,5 @@ server: - port: 8761 + port: 7010 spring: application: name: eureka @@ -19,6 +19,8 @@ eureka: register-with-eureka: false #是否要从其他Eureka Server实例获取数据 fetch-registry: false + server: + enable-self-preservation: false # 集群 #eureka: # instance: diff --git a/eureka/target/classes/application-dev1.yml b/eureka/target/classes/application-dev1.yml deleted file mode 100644 index 307a19f..0000000 --- a/eureka/target/classes/application-dev1.yml +++ /dev/null @@ -1,51 +0,0 @@ -server: - port: 8761 -spring: - application: - name: eureka - #配置登录账号密码 - security: - user: - name: admin - password: admin -# 单台 -#eureka: -# instance: -# #Eureka Server对端口是不敏感的，这意味着，如果直接用IP的形式（例如地址写成http://127.0.0.1:8761/eureka/）相互注册，Eureka Server误认为两个Eureka Server实例是一个实例——这会造成Eureka Server首页显示不正常等一系列问题！！ -# hostname: 127.0.0.1 -# # eureka既是服务端，也是客户端 -# client: -# #是否要注册到其他Eureka Server实例（eureka集群需要，单台不需要） -# register-with-eureka: false -# #是否要从其他Eureka Server实例获取数据 -# fetch-registry: false -# 集群 -eureka: - instance: - #Eureka Server对端口是不敏感的，这意味着，如果直接用IP的形式（例如地址写成http://127.0.0.1:8761/eureka/）相互注册，Eureka Server误认为两个Eureka Server实例是一个实例——这会造成Eureka Server首页显示不正常等一系列问题！！ - hostname: peer1 - # eureka既是服务端，也是客户端 - client: - #是否要注册到其他Eureka Server实例（eureka集群需要，单台不需要） - register-with-eureka: true - #是否要从其他Eureka Server实例获取数据 - fetch-registry: true - #注册Eureka Server - service-url: - defaultZone: http://admin:admin@peer2:8762/eureka/ - -management: - health: - redis: - enabled: false - endpoint: - health: - # 为health端点配置显示详情 - show-details: always - endpoints: - web: - exposure: - # 暴露metrics端点，如需暴露多个，用,分隔；如需暴露所有端点，用'*' - include: "*" - # 不暴露哪些端点 - exclude: env,beans,configprops diff --git a/eureka/target/classes/application-dev2.yml b/eureka/target/classes/application-dev2.yml deleted file mode 100644 index 2c76d0e..0000000 --- a/eureka/target/classes/application-dev2.yml +++ /dev/null @@ -1,38 +0,0 @@ -server: - port: 8762 -spring: - application: - name: eureka - #配置登录账号密码 - security: - user: - name: admin - password: admin -eureka: - instance: - #Eureka Server对端口是不敏感的，这意味着，如果直接用IP的形式（例如地址写成http://127.0.0.1:8761/eureka/）相互注册，Eureka Server误认为两个Eureka Server实例是一个实例——这会造成Eureka Server首页显示不正常等一系列问题！！ - hostname: peer2 - # eureka既是服务端，也是客户端 - client: - #是否要注册到其他Eureka Server实例（eureka集群需要，单台不需要） - register-with-eureka: true - #是否要从其他Eureka Server实例获取数据 - fetch-registry: true - #注册Eureka Server - service-url: - defaultZone: http://admin:admin@peer2:8761/eureka/ -management: - health: - redis: - enabled: false - endpoint: - health: - # 为health端点配置显示详情 - show-details: always - endpoints: - web: - exposure: - # 暴露metrics端点，如需暴露多个，用,分隔；如需暴露所有端点，用'*' - include: "*" - # 不暴露哪些端点 - exclude: env,beans,configprops diff --git a/eureka/target/classes/application.yml b/eureka/target/classes/application.yml deleted file mode 100644 index 01c59b4..0000000 --- a/eureka/target/classes/application.yml +++ /dev/null @@ -1,3 +0,0 @@ -spring: - profiles: - active: dev1 \ No newline at end of file diff --git a/eureka/target/classes/com/ccsens/eureka/EurekaApplication.class b/eureka/target/classes/com/ccsens/eureka/EurekaApplication.class deleted file mode 100644 index d476f17726f2474a4ff8bcd2b98a6133340a0ac3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 910 zcma)4%We}f6g^IpCJlkMDFn)^AcT}=QEw2NL6t&UB&6^VL1EFA$8l1p6Fc&FN`8wK zhy@?OM9ciw0A3pcqbNuty_a6YB;ZYSu+$m$Xio3X1#(jqM7usll$gtMj z?=uuTcAywGyV|I?*(6r(qlgoV)Vo%Sq%WKf{zb6pPj$-hv@7j|OPMN@a+NuCCiroF zw5QWVOX0OO5rI#HHVlpCNp~#H1y6(-@t$|ujH0}`a3g}-S&?SgdZYZQ9lRG#Oq5rS z3adSvIjLUhFks`Kjt8L$!|sR7cs)^looX7rZH)E#M1*kIwQj`IX&7M`fInMz#$#(e z7n!%xnxP)iCcKxIyrjh6E0xtuCRw2D^;Mz9gIMw-;l+IVHudRT^tmMJXeE|RY&PIV z`C+1GmprG+oh!$WO^{_yK`#$QHI%T<@Z<{Gl<}a3hu9;Q7s9-Y$4YvJ)_*CQld?nz zy&{*9!f|s+;7%gaG+LqQ{^~8Q@oMJzA5Ma1i)TdPkdE*e1$xZkD}aSn$(G6EbTT?i zt*>BT@^po4NCTVLAX}Rkpo(kcZIFMRK*HtcIT%o>7h2!2_GxjyN*SO|RXa-<72F_9 eV2l0|BPUF=o!dGUh6@GUq;|JXz$6;D4g3bg_xuO| diff --git a/eureka/target/classes/com/ccsens/eureka/config/WebSecurityConfig.class b/eureka/target/classes/com/ccsens/eureka/config/WebSecurityConfig.class deleted file mode 100644 index 31768c1d11ad3676e5e19db4757ba26f61814a4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2078 zcmcgtTTc@~7(D}pLRsXdc*h$`Dad-kYZ0vt22Ak+2r2@ds?QEHy74Xpq|Bo+_ zm}q?VM;X7}wk#?!rVyKSXXl%l^PM^8o1O1JK7R!;j>idf;(P)Za50WcZ5T}8GOh&u zp*AEF7)C0N(FEFI2Q#n5aXpS346PGVNi)gNoE%e36)jb9S@W{kaP^w))z;KuxKgg+M!L%05P3WA%ThsT&z?4>QpZn+{8uQ# z@bvId84^>Qj;I95y*O?%bk7R2;uc=;fUY4LG-clPwIiO$K&t*fHa)h=-*JYMbG|aN zEEc6FNyN3m|(DM?iimNSKGnZ0}GRQ7{?=q^#&ZPGYw3e+N@~dd8FqnUCQ{RrIzo* zEmTW{3PTUp}@`AmUV zs4f`#BEffSh+(>ctov3x9aqQG%M34*!v`s!z?3WjMLVEVI@NLt9EBBNC? zqs%Nf&PsT23duLQNTh02rVoEJJ-k+CVot34!ZUQ@2BJEgQDj$e#;MlkL{WN1Z!vs4 zxT;Z#zm$43X+Iuh#fJl05hZAt1w#kl>)X)&zC~6(&#wx{5P9c6kf%GPB6L}rOsPaS zo<$d2@M{7KK7jP>rk+hLqqZfr1NJE#?xAOE80dnwwE5rSoO+m9d(_7hYd Bk%IsL diff --git a/histrixmonitor/histrixmonitor.iml b/histrixmonitor/histrixmonitor.iml deleted file mode 100644 index a9cf170..0000000 --- a/histrixmonitor/histrixmonitor.iml +++ /dev/null @@ -1,218 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/histrixmonitor/target/classes/application-dev.yml b/histrixmonitor/target/classes/application-dev.yml deleted file mode 100644 index 4951111..0000000 --- a/histrixmonitor/target/classes/application-dev.yml +++ /dev/null @@ -1,34 +0,0 @@ -server: - port: 2000 -spring: - application: - name: histrixmonitor -#服务端点暴露 -management: - endpoints: - web: - exposure: - # 暴露xxx端点，如需暴露多个，用,分隔；如需暴露所有端点，用'*' - include: auditevents,caches,conditions,flyway,health,heapdump,httptrace,info,integrationgraph,jolokia,logfile,loggers,liquibase,metrics,mappings,prometheus,scheduledtasks,sessions,shutdown,threaddump,hystrix.stream - # 不暴露哪些端点 - exclude: env,beans,configprops - endpoint: - health: - # 是否展示健康检查详情 - show-details: always - health: - redis: - enabled: false -#eureka注册 -eureka: - client: - service-url: - # 指定eureka server通信地址，注意/eureka/小尾巴不能少 - defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/ - instance: - # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server - prefer-ip-address: true -turbine: - # 要监控的微服务列表，多个用,分割 - app-config: ht - cluster-name-expression: "'default'" \ No newline at end of file diff --git a/histrixmonitor/target/classes/application.yml b/histrixmonitor/target/classes/application.yml deleted file mode 100644 index caf4dfc..0000000 --- a/histrixmonitor/target/classes/application.yml +++ /dev/null @@ -1,3 +0,0 @@ -spring: - profiles: - active: dev \ No newline at end of file diff --git a/histrixmonitor/target/classes/com/ccsens/histrixmonitor/HistrixMonitorApplication.class b/histrixmonitor/target/classes/com/ccsens/histrixmonitor/HistrixMonitorApplication.class deleted file mode 100644 index 962a0805e0a41a274f3963809da5a1bc6e471959..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1022 zcmbVLTW=CU6#j-wp@_DnTCJCA-zX2xgO|i$njqEGgsPDSANn-A3^2INkl9(qpXHOr z2Y-M+%6Mj%3MMpZ++@$@JD2ZV_t)Fq4BI}|>dD`?21%j(>7szIBo%LY%&gzQx8ju&=4POwyZyEv%EQW)7&}3ZZqv zSBb<2KTXMiaxK^Rj{Jv3e1$B)HhEoN;wa-9Hb}ooZ;=u3)oi7*M$W(v@)W>u;|we$ Jbdz+qfIsq+C)@x4