Skip to content

Commit 749f0c2

Browse files
Merge pull request alldatacenter#315 from alldatacenter/develop
[master] ElAdmin 认证问题修复 && 支持3节点分布式部署微服务 && 新增README部署文档、初始化数据库脚本
2 parents ad006a8 + e543034 commit 749f0c2

File tree

652 files changed

+43256
-63595
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

652 files changed

+43256
-63595
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,4 @@ jars
5656
system_logs
5757
.env.development
5858
.env.production
59+
ignore_config.git

oneHub/eladmin-versions/eladmin-2.6/README.md

+19-11
Original file line numberDiff line numberDiff line change
@@ -157,27 +157,33 @@
157157
>
158158
> 上传服务器解压
159159
>
160-
#### 5、部署微服务:install/datax/startDatax.sh
160+
#### 5、部署微服务: 进入不同的目录启动相关服务
161161
>
162-
> sh install/datax/startDatax.sh
162+
> 5.1 必须启动、并且顺序启动
163163
>
164-
> 部署可选:多服务器部署不同的服务
164+
> eureka->config->gateway
165165
>
166-
> 启动:startDatax.sh start
166+
> 5.2 按需启动`cd install/16gmaster`
167167
>
168-
> 关闭:startDatax.sh stop
168+
> 譬如启动元数据管理
169169
>
170-
> 重启:startDatax.sh restart
170+
> sh `install/16gmaster/data-metadata-service.sh`
171171
>
172-
> 用户名:admin 密码:123456
172+
> tail -100f `install/16gmaster/data-metadata-service.log`
173173
>
174-
#### 6、部署`Eladmin`:
174+
> 5.2 按需启动`cd install/16gdata`
175175
>
176-
> 6.1 启动`Eladmin`后端
176+
> 按需启动相关服务
177177
>
178-
> nohup java -jar -Xms128m -Xmx2048m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+UseG1GC -XX:MaxGCPauseMillis=20
178+
> 5.3 按需启动`cd install/16gslave`
179+
>
180+
> 按需启动相关服务
179181
>
180-
> -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -XX:MaxInlineLevel=15 /mnt/poc/eladmin/deploy/eladmin-system-2.6.jar &
182+
>
183+
184+
#### 6、部署`Eladmin`:
185+
>
186+
> 6.1 启动`sh install/16gmaster/eladmin-system.sh`
181187
>
182188
> 6.2 部署`Eladmin`前端
183189
>
@@ -192,3 +198,5 @@
192198
> 6.3 访问`Eladmin`页面
193199
>
194200
> curl http://localhost:8013
201+
>
202+
> 用户名:admin 密码:jCH4D!Peaz3MQs7D

0 commit comments

Comments
 (0)