diff --git a/TODOs.md b/TODOs.md
index 962f8b9..0f837a0 100644
--- a/TODOs.md
+++ b/TODOs.md
@@ -5,6 +5,11 @@ startup.cmd -m standalone
-----
+Nacos CPU 跑满问题 我提的 GitHub issue
+https://github.com/alibaba/nacos/issues/10080
+
+-----
+
Nacos 2.2.0.1 需要配置
nacos.core.auth.plugin.nacos.token.secret.key=VGhpc0lzTXlDdXN0b21TZWNyZXRLZXkwMTIzNDU2Nzg=
参考:
diff --git a/backend/microservice-provider-access-8002/src/main/resources/application-remote.yml b/backend/microservice-provider-access-8002/src/main/resources/application-remote.yml
index 1b0b2e0..531fe22 100644
--- a/backend/microservice-provider-access-8002/src/main/resources/application-remote.yml
+++ b/backend/microservice-provider-access-8002/src/main/resources/application-remote.yml
@@ -2,7 +2,7 @@ spring:
datasource:
url: jdbc:mysql://192.168.2.29:3306/epp?useUnicode=true&characterEncoding=utf8&useSSL=false
username: root
- password: root
+ password: 123456
cloud:
nacos:
discovery:
diff --git a/backend/microservice-provider-user-8001/src/main/resources/application-remote.yml b/backend/microservice-provider-user-8001/src/main/resources/application-remote.yml
index 1b0b2e0..531fe22 100644
--- a/backend/microservice-provider-user-8001/src/main/resources/application-remote.yml
+++ b/backend/microservice-provider-user-8001/src/main/resources/application-remote.yml
@@ -2,7 +2,7 @@ spring:
datasource:
url: jdbc:mysql://192.168.2.29:3306/epp?useUnicode=true&characterEncoding=utf8&useSSL=false
username: root
- password: root
+ password: 123456
cloud:
nacos:
discovery:
diff --git a/mini-program/app.json b/mini-program/app.json
index b55e23c..316deb0 100644
--- a/mini-program/app.json
+++ b/mini-program/app.json
@@ -28,7 +28,8 @@
"pages/order/fill-tracking-no/index",
"pages/order/delivery-detail/index",
"pages/order/invoice/index",
- "pages/usercenter/name-edit/index"
+ "pages/usercenter/name-edit/index",
+ "pages/home/index"
],
"tabBar": {
"custom": true,
@@ -37,6 +38,10 @@
"backgroundColor": "#ffffff",
"borderStyle": "black",
"list": [
+ {
+ "pagePath": "pages/home/index",
+ "text": "首页"
+ },
{
"pagePath": "pages/home/home",
"text": "首页"
@@ -55,7 +60,9 @@
}
]
},
- "requiredPrivateInfos": ["chooseAddress"],
+ "requiredPrivateInfos": [
+ "chooseAddress"
+ ],
"lazyCodeLoading": "requiredComponents",
"usingComponents": {},
"window": {
@@ -70,4 +77,4 @@
"desc": "你的位置信息将用于小程序位置接口的效果展示"
}
}
-}
+}
\ No newline at end of file
diff --git a/mini-program/custom-tab-bar/data.js b/mini-program/custom-tab-bar/data.js
index ff11d64..409dfe6 100644
--- a/mini-program/custom-tab-bar/data.js
+++ b/mini-program/custom-tab-bar/data.js
@@ -2,6 +2,11 @@ export default [
{
icon: 'home',
text: '首页',
+ url: 'pages/home/index',
+ },
+ {
+ icon: 'home',
+ text: '首页2',
url: 'pages/home/home',
},
{
diff --git a/mini-program/pages/home/index.js b/mini-program/pages/home/index.js
new file mode 100644
index 0000000..852dd92
--- /dev/null
+++ b/mini-program/pages/home/index.js
@@ -0,0 +1,71 @@
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ pageLoading: true,
+
+ userInfo: null,
+ displayUsername: "",
+ userGroup: "unknown",
+ menuItemDict: "",
+ debugObject: {},
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/mini-program/pages/home/index.json b/mini-program/pages/home/index.json
new file mode 100644
index 0000000..655e190
--- /dev/null
+++ b/mini-program/pages/home/index.json
@@ -0,0 +1,4 @@
+{
+ "navigationBarTitleText": "首页",
+ "______navigationStyle": "custom"
+}
\ No newline at end of file
diff --git a/mini-program/pages/home/index.wxml b/mini-program/pages/home/index.wxml
new file mode 100644
index 0000000..476ea08
--- /dev/null
+++ b/mini-program/pages/home/index.wxml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+ 欢迎你,{{ displayUsername }}!
+
+
+
\ No newline at end of file
diff --git a/mini-program/pages/home/index.wxss b/mini-program/pages/home/index.wxss
new file mode 100644
index 0000000..2835a6d
--- /dev/null
+++ b/mini-program/pages/home/index.wxss
@@ -0,0 +1,15 @@
+#menu-view {
+ display: flex;
+ text-align: center;
+ flex-wrap: wrap;
+}
+
+.menu-item {
+ width: 25%;
+ margin-top: 50px;
+}
+
+.item-image {
+ width: 70px;
+ height: 70px;
+}