diff --git a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/pom.xml b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/pom.xml
index 560712b..ec392b8 100644
--- a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/pom.xml
+++ b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/pom.xml
@@ -34,7 +34,7 @@
-
+
diff --git a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/src/main/java/wu/framework/lazy/cloud/heartbeat/client/LazyCloudHeartbeatClient.java b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/src/main/java/wu/framework/lazy/cloud/heartbeat/client/LazyCloudHeartbeatClientSimple.java
similarity index 71%
rename from wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/src/main/java/wu/framework/lazy/cloud/heartbeat/client/LazyCloudHeartbeatClient.java
rename to wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/src/main/java/wu/framework/lazy/cloud/heartbeat/client/LazyCloudHeartbeatClientSimple.java
index 0d9368a..9c812d8 100644
--- a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/src/main/java/wu/framework/lazy/cloud/heartbeat/client/LazyCloudHeartbeatClient.java
+++ b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/src/main/java/wu/framework/lazy/cloud/heartbeat/client/LazyCloudHeartbeatClientSimple.java
@@ -8,8 +8,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
*/
@SpringBootApplication
-public class LazyCloudHeartbeatClient {
+public class LazyCloudHeartbeatClientSimple {
public static void main(String[] args) {
- SpringApplication.run(LazyCloudHeartbeatClient.class,args);
+ SpringApplication.run(LazyCloudHeartbeatClientSimple.class,args);
}
}
diff --git a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-server-sample/src/main/java/wu/framework/lazy/cloud/heartbeat/server/LazyCloudHeartbeatServer.java b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-server-sample/src/main/java/wu/framework/lazy/cloud/heartbeat/server/LazyCloudHeartbeatServerSimple.java
similarity index 73%
rename from wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-server-sample/src/main/java/wu/framework/lazy/cloud/heartbeat/server/LazyCloudHeartbeatServer.java
rename to wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-server-sample/src/main/java/wu/framework/lazy/cloud/heartbeat/server/LazyCloudHeartbeatServerSimple.java
index 623c352..00c0c71 100644
--- a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-server-sample/src/main/java/wu/framework/lazy/cloud/heartbeat/server/LazyCloudHeartbeatServer.java
+++ b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-server-sample/src/main/java/wu/framework/lazy/cloud/heartbeat/server/LazyCloudHeartbeatServerSimple.java
@@ -9,8 +9,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
*/
@Slf4j
@SpringBootApplication
-public class LazyCloudHeartbeatServer {
+public class LazyCloudHeartbeatServerSimple {
public static void main(String[] args) {
- SpringApplication.run(LazyCloudHeartbeatServer.class,args);
+ SpringApplication.run(LazyCloudHeartbeatServerSimple.class,args);
}
}
diff --git a/wu-lazy-cloud-heartbeat-server/pom.xml b/wu-lazy-cloud-heartbeat-server/pom.xml
index b4dbc39..f03068f 100644
--- a/wu-lazy-cloud-heartbeat-server/pom.xml
+++ b/wu-lazy-cloud-heartbeat-server/pom.xml
@@ -43,6 +43,10 @@
top.wu2020
wu-database-lazy-plus-starter
+
+ top.wu2020
+ wu-authorization-server-starter
+
com.alibaba
fastjson
diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/config/HeartbeatProperties.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/config/HeartbeatProperties.java
new file mode 100644
index 0000000..b54dedf
--- /dev/null
+++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/config/HeartbeatProperties.java
@@ -0,0 +1,23 @@
+package wu.framework.lazy.cloud.heartbeat.server.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 服务端配置信息
+ */
+@Configuration
+@ConfigurationProperties(prefix = HeartbeatProperties.prefix)
+@Data
+public class HeartbeatProperties {
+ public static final String prefix = "spring.lazy.cloud.heartbeat.server";
+ /**
+ * 账号
+ */
+ private String username;
+ /**
+ * 密码
+ */
+ private String password;
+}
diff --git a/wu-lazy-cloud-network-ui/.eslintignore b/wu-lazy-cloud-network-ui/.eslintignore
new file mode 100644
index 0000000..234d3f7
--- /dev/null
+++ b/wu-lazy-cloud-network-ui/.eslintignore
@@ -0,0 +1 @@
+# *
\ No newline at end of file
diff --git a/wu-lazy-cloud-network-ui/.eslintrc.js b/wu-lazy-cloud-network-ui/.eslintrc.js
new file mode 100644
index 0000000..cc717dc
--- /dev/null
+++ b/wu-lazy-cloud-network-ui/.eslintrc.js
@@ -0,0 +1,31 @@
+module.exports = {
+ root: true,
+
+ env: {
+ node: true,
+ },
+
+ extends: [
+ "plugin:vue/vue3-essential",
+ "eslint:recommended",
+ "@vue/prettier",
+ ],
+
+ parserOptions: {
+ parser: "@babel/eslint-parser",
+ },
+ // "writable" 以允许重写变量,或 "readonly" 不允许重写变量
+ globals: {
+ XE: "readonly",
+ VE_ENV: "readonly",
+ VE_API: "readonly",
+ },
+
+ rules: {
+ indent: [2, 4, { SwitchCase: 1 }],
+ "prettier/prettier": [2, { tabWidth: 4, endOfLine: "auto" }],
+ "no-console": "off",
+ "no-debugger": "off",
+ "vue/multi-word-component-names": 0,
+ },
+};
diff --git a/wu-lazy-cloud-network-ui/README.md b/wu-lazy-cloud-network-ui/README.md
index 538f549..244d51d 100644
--- a/wu-lazy-cloud-network-ui/README.md
+++ b/wu-lazy-cloud-network-ui/README.md
@@ -268,6 +268,11 @@ VE_API [ fileName ][ portName ] (params,{Global:false) //没有全局loading
## 声明
个人开发维护! 欢迎交流学习!
+
+设置阿里云镜像仓库
+```shell
+npm config set registry http://registry.npm.taobao.org/
+```
```shell
yarn run build
@@ -275,7 +280,7 @@ yarn run build
docker login --username=1207537021@qq.com registry.cn-hangzhou.aliyuncs.com
```shell
-docker build -t registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-smart-acw-server:ui-master .
-docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-smart-acw-server:ui-master
+docker build -t registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-ui:ui-master .
+docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-ui:ui-master
```
diff --git a/wu-lazy-cloud-network-ui/vue.config.js b/wu-lazy-cloud-network-ui/vue.config.js
index e53c2b2..9776b80 100644
--- a/wu-lazy-cloud-network-ui/vue.config.js
+++ b/wu-lazy-cloud-network-ui/vue.config.js
@@ -14,7 +14,7 @@ module.exports = {
"/acw-server/": {
// 'demo'是请求地址中,以demo开头都适用这个
// target: "http://47.92.27.215:520/", // 真实的服务器地址
- target: "http://127.0.0.1:18080", // 真实的服务器地址
+ target: "http://127.0.0.1:6001", // 真实的服务器地址
changeOrigin: true, //
secure: false, // 默认情况下,不接受运行在 HTTPS 上,且使用了无效证书的后端服务器。如果你想要接受设为false
ws: false, // 是否启用websockets
@@ -25,7 +25,7 @@ module.exports = {
},
"/": {
// 'demo'是请求地址中,以demo开头都适用这个
- target: "http://127.0.0.1:18080", // 真实的服务器地址
+ target: "http://127.0.0.1:6001", // 真实的服务器地址
changeOrigin: true, //
secure: false, // 默认情况下,不接受运行在 HTTPS 上,且使用了无效证书的后端服务器。如果你想要接受设为false
ws: false, // 是否启用websockets