Merge pull request #52 from zlt2000/react-dev

React dev

Author: zlt2000

pom.xml

@@ -483,7 +483,7 @@
         <!-- 业务 -->
         <module>zlt-business</module>
         <!-- 前端 -->
-        <module>zlt-web</module>
+        <!--<module>zlt-web</module>-->
         <!-- 任务 -->
         <module>zlt-job</module>
         <!-- 监控 -->

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

@@ -1,11 +1,11 @@
 ########################## 统一变量配置 ##########################
 ##### 数据库配置
-zlt.datasource.ip=192.168.28.130
+zlt.datasource.ip=127.0.0.1
 zlt.datasource.username=root
-zlt.datasource.password=1q2w3e4r
+zlt.datasource.password=123456
 
 ##### redis配置
-spring.redis.host=192.168.28.130
+spring.redis.host=127.0.0.1
 spring.redis.port=6379
 spring.redis.timeout=5000
 

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

@@ -6,8 +6,8 @@ zlt.datasource.password=1q2w3e4r
 
 ##### redis配置
 spring.redis.sentinel.master=mymaster
-spring.redis.sentinel.nodes=192.168.28.130:26380,192.168.28.131:26381
-spring.redis.password=1q2w3e4r
+spring.redis.sentinel.nodes=172.17.0.1
+spring.redis.password=
 
 ##### elasticsearch配置
 zlt.elasticsearch.uris=192.168.28.130:9200

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

@@ -3,9 +3,9 @@
 spring.profiles.active=dev
 
 ##### nacos(注册中心和配置中心)地址
-spring.cloud.nacos.server-addr=192.168.28.130:8848
-#spring.cloud.nacos.username=nacos
-#spring.cloud.nacos.password=nacos
+spring.cloud.nacos.server-addr=127.0.0.1:8848
+spring.cloud.nacos.username=nacos
+spring.cloud.nacos.password=nacos
 spring.cloud.nacos.config.file-extension=yml
 spring.cloud.nacos.config.shared-configs[0].data-id=common.yml
 spring.cloud.nacos.config.shared-configs[0].refresh=true

zlt-web/.gitignore

@@ -0,0 +1,45 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+**/node
+**/node_modules
+# roadhog-api-doc ignore
+/src/utils/request-temp.js
+_roadhog-api-doc
+
+# production
+**/dist
+
+
+# misc
+.DS_Store
+npm-debug.log*
+yarn-error.log
+
+/coverage
+.idea
+yarn.lock
+package-lock.json
+pnpm-lock.yaml
+*bak
+
+
+# visual studio code
+.vscode
+.history
+*.log
+functions/*
+.temp/**
+
+# umi
+.umi
+.umi-production
+
+# screenshot
+screenshot
+.firebase
+.eslintcache
+
+# maven
+target
+build

zlt-web/back-web/pom.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.zlt</groupId>
+        <artifactId>zlt-web</artifactId>
+        <version>5.4.0</version>
+    </parent>
+    <artifactId>layui-web</artifactId>
+    <description>Layui开发的前端</description>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>2.5.14</version>
+        </dependency>
+
+        <!--<dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional>
+        </dependency>-->
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <finalName>${project.artifactId}</finalName>
+    </build>
+</project>

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

@@ -1,14 +1,14 @@
-package com.central.web;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-/**
- * @author zlt
- */
-@SpringBootApplication
-public class BackWebApplication {
-	public static void main(String[] args) {
-		SpringApplication.run(BackWebApplication.class, args);
-	}
-}
+package com.central.web;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * @author zlt
+ */
+@SpringBootApplication
+public class BackWebApplication {
+	public static void main(String[] args) {
+		SpringApplication.run(BackWebApplication.class, args);
+	}
+}

zlt-web/layui-web/pom.xml

@@ -1,2 +1,2 @@
-server:
+server:
   port: 8066