Skip to content

Commit fa0d663

Browse files
zlt2000zlt2000
authored
Merge pull request #52 from zlt2000/react-dev
React dev
2 parents f8b5856 + 40c1ecf commit fa0d663

File tree

345 files changed

+21619
-13593
lines changed

Some content is hidden

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

345 files changed

+21619
-13593
lines changed

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@
483483
<!-- 业务 -->
484484
<module>zlt-business</module>
485485
<!-- 前端 -->
486-
<module>zlt-web</module>
486+
<!--<module>zlt-web</module>-->
487487
<!-- 任务 -->
488488
<module>zlt-job</module>
489489
<!-- 监控 -->

‎zlt-config/src/main/resources/application-dev.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
########################## 统一变量配置 ##########################
22
##### 数据库配置
3-
zlt.datasource.ip=192.168.28.130
3+
zlt.datasource.ip=127.0.0.1
44
zlt.datasource.username=root
5-
zlt.datasource.password=1q2w3e4r
5+
zlt.datasource.password=123456
66

77
##### redis配置
8-
spring.redis.host=192.168.28.130
8+
spring.redis.host=127.0.0.1
99
spring.redis.port=6379
1010
spring.redis.timeout=5000
1111

‎zlt-config/src/main/resources/application-prod.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ zlt.datasource.password=1q2w3e4r
66

77
##### redis配置
88
spring.redis.sentinel.master=mymaster
9-
spring.redis.sentinel.nodes=192.168.28.130:26380,192.168.28.131:26381
10-
spring.redis.password=1q2w3e4r
9+
spring.redis.sentinel.nodes=172.17.0.1
10+
spring.redis.password=
1111

1212
##### elasticsearch配置
1313
zlt.elasticsearch.uris=192.168.28.130:9200

‎zlt-config/src/main/resources/bootstrap.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
spring.profiles.active=dev
44

55
##### nacos(注册中心和配置中心)地址
6-
spring.cloud.nacos.server-addr=192.168.28.130:8848
7-
#spring.cloud.nacos.username=nacos
8-
#spring.cloud.nacos.password=nacos
6+
spring.cloud.nacos.server-addr=127.0.0.1:8848
7+
spring.cloud.nacos.username=nacos
8+
spring.cloud.nacos.password=nacos
99
spring.cloud.nacos.config.file-extension=yml
1010
spring.cloud.nacos.config.shared-configs[0].data-id=common.yml
1111
spring.cloud.nacos.config.shared-configs[0].refresh=true

‎zlt-web/.gitignore

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
2+
3+
# dependencies
4+
**/node
5+
**/node_modules
6+
# roadhog-api-doc ignore
7+
/src/utils/request-temp.js
8+
_roadhog-api-doc
9+
10+
# production
11+
**/dist
12+
13+
14+
# misc
15+
.DS_Store
16+
npm-debug.log*
17+
yarn-error.log
18+
19+
/coverage
20+
.idea
21+
yarn.lock
22+
package-lock.json
23+
pnpm-lock.yaml
24+
*bak
25+
26+
27+
# visual studio code
28+
.vscode
29+
.history
30+
*.log
31+
functions/*
32+
.temp/**
33+
34+
# umi
35+
.umi
36+
.umi-production
37+
38+
# screenshot
39+
screenshot
40+
.firebase
41+
.eslintcache
42+
43+
# maven
44+
target
45+
build

‎zlt-web/back-web/pom.xml

-67
This file was deleted.

‎zlt-web/back-web/Dockerfile renamed to ‎zlt-web/layui-web/Dockerfile

File renamed without changes.

‎zlt-web/layui-web/pom.xml

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
6+
<parent>
7+
<groupId>com.zlt</groupId>
8+
<artifactId>zlt-web</artifactId>
9+
<version>5.4.0</version>
10+
</parent>
11+
<artifactId>layui-web</artifactId>
12+
<description>Layui开发的前端</description>
13+
<dependencies>
14+
<dependency>
15+
<groupId>org.springframework.boot</groupId>
16+
<artifactId>spring-boot-starter-web</artifactId>
17+
<version>2.5.14</version>
18+
</dependency>
19+
20+
<!--<dependency>
21+
<groupId>org.springframework.boot</groupId>
22+
<artifactId>spring-boot-devtools</artifactId>
23+
<optional>true</optional>
24+
</dependency>-->
25+
</dependencies>
26+
27+
<build>
28+
<plugins>
29+
<plugin>
30+
<groupId>org.springframework.boot</groupId>
31+
<artifactId>spring-boot-maven-plugin</artifactId>
32+
<executions>
33+
<execution>
34+
<goals>
35+
<goal>repackage</goal>
36+
</goals>
37+
</execution>
38+
</executions>
39+
</plugin>
40+
</plugins>
41+
<finalName>${project.artifactId}</finalName>
42+
</build>
43+
</project>

‎zlt-web/back-web/src/main/java/com/central/web/BackWebApplication.java renamed to ‎zlt-web/layui-web/src/main/java/com/central/web/BackWebApplication.java

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package com.central.web;
2-
3-
import org.springframework.boot.SpringApplication;
4-
import org.springframework.boot.autoconfigure.SpringBootApplication;
5-
6-
/**
7-
* @author zlt
8-
*/
9-
@SpringBootApplication
10-
public class BackWebApplication {
11-
public static void main(String[] args) {
12-
SpringApplication.run(BackWebApplication.class, args);
13-
}
14-
}
1+
package com.central.web;
2+
3+
import org.springframework.boot.SpringApplication;
4+
import org.springframework.boot.autoconfigure.SpringBootApplication;
5+
6+
/**
7+
* @author zlt
8+
*/
9+
@SpringBootApplication
10+
public class BackWebApplication {
11+
public static void main(String[] args) {
12+
SpringApplication.run(BackWebApplication.class, args);
13+
}
14+
}

‎zlt-web/back-web/src/main/resources/application.yml renamed to ‎zlt-web/layui-web/src/main/resources/application.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
server:
1+
server:
22
port: 8066

0 commit comments

Comments
 (0)