diff --git a/.gitignore b/.gitignore index b8e74e6..10bdfb6 100644 --- a/.gitignore +++ b/.gitignore @@ -22,4 +22,5 @@ /Ylt/ms-wallet/target/class/ /Ylt/ms-websocket-ocpp/target/class/ /Ylt/rough-dependencies/target/class/ -/MiniProgram/rzyc-weapp-ylt-main/yltDist \ No newline at end of file +/MiniProgram/rzyc-weapp-ylt-main/yltDist +/YltProject/ZhuQue/lib/ \ No newline at end of file diff --git a/MiniProgram/rzyc-weapp-ylt-main/project.config.json b/MiniProgram/rzyc-weapp-ylt-main/project.config.json index eaebadc..fe13771 100644 --- a/MiniProgram/rzyc-weapp-ylt-main/project.config.json +++ b/MiniProgram/rzyc-weapp-ylt-main/project.config.json @@ -147,8 +147,15 @@ }, { "id": -1, - "name": "pages/llabor-union-login/labor-union-login", - "pathName": "pages/llabor-union-login/labor-union-login", + "name": "pages/labor-union-login/labor-union-login", + "pathName": "pages/labor-union-login/labor-union-login", + "query": "", + "scene": null + }, + { + "id": -1, + "name": "pages/test/test", + "pathName": "pages/test/test", "query": "", "scene": null }, diff --git a/MiniProgram/rzyc-weapp-ylt-main/project.private.config.json b/MiniProgram/rzyc-weapp-ylt-main/project.private.config.json index 155e99b..d5d8b67 100644 --- a/MiniProgram/rzyc-weapp-ylt-main/project.private.config.json +++ b/MiniProgram/rzyc-weapp-ylt-main/project.private.config.json @@ -86,6 +86,12 @@ "query": "", "scene": null }, + { + "name": "pages/test/test", + "pathName": "pages/test/test", + "query": "", + "scene": null + }, { "name": "pages/order-list/order-list", "pathName": "pages/order-list/order-list", diff --git a/MiniProgram/rzyc-weapp-ylt-main/src/app.tsx b/MiniProgram/rzyc-weapp-ylt-main/src/app.tsx index 7fdf522..8a2f9f0 100644 --- a/MiniProgram/rzyc-weapp-ylt-main/src/app.tsx +++ b/MiniProgram/rzyc-weapp-ylt-main/src/app.tsx @@ -110,6 +110,7 @@ class App extends Component { 'pages/enterprise-order/index', 'pages/labor-union/labor-union', 'pages/labor-union-login/labor-union-login', + 'pages/test/test', ], subPackages: [ { diff --git a/MiniProgram/rzyc-weapp-ylt-main/src/pages/index/index.tsx b/MiniProgram/rzyc-weapp-ylt-main/src/pages/index/index.tsx index 38773ce..82e4555 100644 --- a/MiniProgram/rzyc-weapp-ylt-main/src/pages/index/index.tsx +++ b/MiniProgram/rzyc-weapp-ylt-main/src/pages/index/index.tsx @@ -63,7 +63,7 @@ export default function Index() { // const res = await huangHaiTest(); // console.log(res.data[0].columns.dictValue); - Taro.navigateTo({ url: `/pages/labor-union/labor-union?id=333` }); + Taro.navigateTo({ url: `/pages/test/test` }); // Taro.navigateTo({ // url: `/pages/labor-union/labor-union`, @@ -197,7 +197,7 @@ export default function Index() { onScrollToLower={handleScrollToLower}> {currentTabElement} */} - {/* */} + {currentTabElement} { - 已阅读并同意1 + 已阅读并同意 diff --git a/MiniProgram/rzyc-weapp-ylt-main/src/pages/test/test.tsx b/MiniProgram/rzyc-weapp-ylt-main/src/pages/test/test.tsx new file mode 100644 index 0000000..4b649eb --- /dev/null +++ b/MiniProgram/rzyc-weapp-ylt-main/src/pages/test/test.tsx @@ -0,0 +1,24 @@ +import { View, Button } from '@tarojs/components'; + +import { test } from '@/services/labor-union'; + + +export const LaborUnion: Taro.FC = () => { + + const bindMemberHandle = async () => { + + const res = await test( + { xm: '张三', xb: '男', yw_id: 1 } + ); + console.log(res); + }; + return ( + + + + ); +}; + +LaborUnion.config = { + navigationBarTitleText: '工会会员绑定', +}; diff --git a/MiniProgram/rzyc-weapp-ylt-main/src/services/labor-union.ts b/MiniProgram/rzyc-weapp-ylt-main/src/services/labor-union.ts index 1e225a9..a81e855 100644 --- a/MiniProgram/rzyc-weapp-ylt-main/src/services/labor-union.ts +++ b/MiniProgram/rzyc-weapp-ylt-main/src/services/labor-union.ts @@ -15,7 +15,20 @@ export const batchSaasAddCompanyUser = async (params: batchSaasAddCompanyUserReq const res = await RzRequest.postNew( '/stationapi/saas/company/batchSaasAddCompanyUser', params - ); - console.log(res) + ); + return res; +}; + +export type testPostWithAuth = { + xm: string; + xb: string; + yw_id: number; +}; + +export const test = async (params: testPostWithAuth) => { + const res = await RzRequest.postNew( + '/ZhuQue/Ylt/testPostWithAuth', + params + ); return res; }; \ No newline at end of file diff --git a/ZhuQue/生成依赖jar.bat b/ZhuQue/生成依赖jar.bat new file mode 100644 index 0000000..1ef4abc --- /dev/null +++ b/ZhuQue/生成依赖jar.bat @@ -0,0 +1,7 @@ +mkdir lib +cd lib +del *.jar /q +cd .. +mvn -f pom.xml dependency:copy-dependencies -DoutputDirectory=lib + +@echo 黄海完成了！ diff --git a/操作文档/9、Dockert使用办法.md b/操作文档/9、Dockert使用办法.md index 9462601..1e7d042 100644 --- a/操作文档/9、Dockert使用办法.md +++ b/操作文档/9、Dockert使用办法.md @@ -337,6 +337,66 @@ root@b30008f6e67d:~# echo $JAVA_OPTS -#### 六、待实验内容 +#### 六、安装$OpenJDK 21$ + +``` +docker pull openjdk:21 +``` + +![](https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/BlogImages/202408071459496.png) + +![](https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/BlogImages/202408071459474.png) + +删除镜像 + +``` +docker rmi -f 079114de2be1 +``` + +![](https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/BlogImages/202408071500628.png) + + + +#### 六、实测阿里云容器服务 + +> **参考文档**：[使用个人版实例推送拉取Docker镜像_容器镜像服务(ACR)](https://help.aliyun.com/zh/acr/user-guide/use-a-container-registry-personal-edition-instance-to-push-and-pull-images?spm=a2c4g.11186623.0.0.631a1ecdldRK92) + +```shell +docker login --username=东师黄海 registry.cn-hangzhou.aliyuncs.com +Password: DsideaL4r5t6y7u +``` + +```shell +WARNING! Your password will be stored unencrypted in /root/.docker/config.json. +Configure a credential helper to remove this warning. See +https://docs.docker.com/engine/reference/commandline/login/#credential-stores +Login Succeeded +``` + + + +```[root@Docker ~]# docker images +REPOSITORY TAG IMAGE ID CREATED SIZE +ms-manager-sass-ui-ylt-main latest 15dfab4dc6ce 5 hours ago 207MB +gw-charge latest 45fdc8de8e89 7 hours ago 234MB +[root@Docker ~]# docker tag 45fdc8de8e89 registry.cn-hangzhou.aliyuncs.com/yltproject/yltproject:1.0 +[root@Docker ~]# docker push registry.cn-hangzhou.aliyuncs.com/yltproject/yltproject:1.0 +The push refers to repository [registry.cn-hangzhou.aliyuncs.com/yltproject/yltproject] +6ad13f10ba81: Pushed +5f70bf18a086: Pushed +602b7d6108d1: Pushed +d279e3a2f938: Pushed +771f5a5313b8: Pushed +43b3c4e3001c: Pushed +1.0: digest: sha256:d4d017f42400a68867bb4a12b0bc64d04a4ec6ffb40fe2f75c6949632f3d618d size: 1577 +[root@Docker ~]# +``` + + + +![](https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/BlogImages/202408071648698.png) + +![](https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/BlogImages/202408071648987.png) + + -[阿里云容器服务springboot版本回退_以及平滑更新蓝绿发布 ](https://www.cnblogs.com/HealerJean/p/11829917.html)