update

xu756 · Oct 6, 2024 · cffa23a · cffa23a
1 parent 304f3d8
commit cffa23a
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 43 deletions.
diff --git a/.github/workflows/im-api.yml b/.github/workflows/im-api.yml
@@ -41,10 +41,10 @@ jobs:
           | # 使用 上一步写的 Dockerfile 构建镜像并发布到私有仓库； 发布完成可以去 https://github.com/MrGaoGang?tab=packages 查看
           docker build . --file ${{env.DOCKERFILE_PATH}} --tag xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}:${{env.PACKAGE_VERSION}}
           docker push xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}:${{env.PACKAGE_VERSION}}
-#      - name: 更新服务器 发送请求
-#        run: |
-#          curl -X PUT  \
-#          -H "content-type: application/json" \
-#          -H "Cookie: KuboardUsername=admin; KuboardAccessKey=emrcwdmbxijy.mbxn23tmz8hmmtnnx25wab3ist3nz7nx" \
-#          -d '{"kind":"deployments","namespace":"app","name":"iot","images":{"xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}":"xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}:${{env.PACKAGE_VERSION}}"}}' \
-#          "https://k3s.imlogic.cn/kuboard-api/cluster/default/kind/CICDApi/admin/resource/updateImageTag"
+      - name: 更新服务器 发送请求
+        run: |
+          curl -X PUT  \
+          -H "content-type: application/json" \
+          -H "Cookie: KuboardUsername=admin; KuboardAccessKey=emrcwdmbxijy.mbxn23tmz8hmmtnnx25wab3ist3nz7nx" \
+          -d '{"kind":"deployments","namespace":"imlogic","name":"${{env.PACKAGE_NAME}}","images":{"xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}":"xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}:${{env.PACKAGE_VERSION}}"}}' \
+          "https://k3s.imlogic.cn/kuboard-api/cluster/default/kind/CICDApi/admin/resource/updateImageTag"
diff --git a/.github/workflows/im-handler.yml b/.github/workflows/im-handler.yml
@@ -41,10 +41,10 @@ jobs:
           | # 使用 上一步写的 Dockerfile 构建镜像并发布到私有仓库； 发布完成可以去 https://github.com/MrGaoGang?tab=packages 查看
           docker build . --file ${{env.DOCKERFILE_PATH}} --tag xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}:${{env.PACKAGE_VERSION}}
           docker push xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}:${{env.PACKAGE_VERSION}}
-#      - name: 更新服务器 发送请求
-#        run: |
-#          curl -X PUT  \
-#          -H "content-type: application/json" \
-#          -H "Cookie: KuboardUsername=admin; KuboardAccessKey=emrcwdmbxijy.mbxn23tmz8hmmtnnx25wab3ist3nz7nx" \
-#          -d '{"kind":"deployments","namespace":"app","name":"iot","images":{"xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}":"xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}:${{env.PACKAGE_VERSION}}"}}' \
-#          "https://k3s.imlogic.cn/kuboard-api/cluster/default/kind/CICDApi/admin/resource/updateImageTag"
+      - name: 更新服务器 发送请求
+        run: |
+          curl -X PUT  \
+          -H "content-type: application/json" \
+          -H "Cookie: KuboardUsername=admin; KuboardAccessKey=emrcwdmbxijy.mbxn23tmz8hmmtnnx25wab3ist3nz7nx" \
+          -d '{"kind":"deployments","namespace":"imlogic","name":"${{env.PACKAGE_NAME}}","images":{"xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}":"xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}:${{env.PACKAGE_VERSION}}"}}' \
+          "https://k3s.imlogic.cn/kuboard-api/cluster/default/kind/CICDApi/admin/resource/updateImageTag"
diff --git a/.github/workflows/im-job.yml b/.github/workflows/im-job.yml
@@ -41,10 +41,10 @@ jobs:
           | # 使用 上一步写的 Dockerfile 构建镜像并发布到私有仓库； 发布完成可以去 https://github.com/MrGaoGang?tab=packages 查看
           docker build . --file ${{env.DOCKERFILE_PATH}} --tag xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}:${{env.PACKAGE_VERSION}}
           docker push xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}:${{env.PACKAGE_VERSION}}
-#      - name: 更新服务器 发送请求
-#        run: |
-#          curl -X PUT  \
-#          -H "content-type: application/json" \
-#          -H "Cookie: KuboardUsername=admin; KuboardAccessKey=emrcwdmbxijy.mbxn23tmz8hmmtnnx25wab3ist3nz7nx" \
-#          -d '{"kind":"deployments","namespace":"app","name":"iot","images":{"xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}":"xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}:${{env.PACKAGE_VERSION}}"}}' \
-#          "https://k3s.imlogic.cn/kuboard-api/cluster/default/kind/CICDApi/admin/resource/updateImageTag"
+      - name: 更新服务器 发送请求
+        run: |
+          curl -X PUT  \
+          -H "content-type: application/json" \
+          -H "Cookie: KuboardUsername=admin; KuboardAccessKey=emrcwdmbxijy.mbxn23tmz8hmmtnnx25wab3ist3nz7nx" \
+          -d '{"kind":"deployments","namespace":"imlogic","name":"${{env.PACKAGE_NAME}}","images":{"xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}":"xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}:${{env.PACKAGE_VERSION}}"}}' \
+          "https://k3s.imlogic.cn/kuboard-api/cluster/default/kind/CICDApi/admin/resource/updateImageTag"
diff --git a/.github/workflows/im-server.yml b/.github/workflows/im-server.yml
@@ -41,10 +41,10 @@ jobs:
           | # 使用 上一步写的 Dockerfile 构建镜像并发布到私有仓库； 发布完成可以去 https://github.com/MrGaoGang?tab=packages 查看
           docker build . --file ${{env.DOCKERFILE_PATH}} --tag xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}:${{env.PACKAGE_VERSION}}
           docker push xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}:${{env.PACKAGE_VERSION}}
-#      - name: 更新服务器 发送请求
-#        run: |
-#          curl -X PUT  \
-#          -H "content-type: application/json" \
-#          -H "Cookie: KuboardUsername=admin; KuboardAccessKey=emrcwdmbxijy.mbxn23tmz8hmmtnnx25wab3ist3nz7nx" \
-#          -d '{"kind":"deployments","namespace":"app","name":"iot","images":{"xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}":"xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}:${{env.PACKAGE_VERSION}}"}}' \
-#          "https://k3s.imlogic.cn/kuboard-api/cluster/default/kind/CICDApi/admin/resource/updateImageTag"
+      - name: 更新服务器 发送请求
+        run: |
+          curl -X PUT  \
+          -H "content-type: application/json" \
+          -H "Cookie: KuboardUsername=admin; KuboardAccessKey=emrcwdmbxijy.mbxn23tmz8hmmtnnx25wab3ist3nz7nx" \
+          -d '{"kind":"deployments","namespace":"imlogic","name":"${{env.PACKAGE_NAME}}","images":{"xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}":"xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}:${{env.PACKAGE_VERSION}}"}}' \
+          "https://k3s.imlogic.cn/kuboard-api/cluster/default/kind/CICDApi/admin/resource/updateImageTag"
diff --git a/.github/workflows/im-user.yml b/.github/workflows/im-user.yml
@@ -41,10 +41,10 @@ jobs:
           | # 使用 上一步写的 Dockerfile 构建镜像并发布到私有仓库； 发布完成可以去 https://github.com/MrGaoGang?tab=packages 查看
           docker build . --file ${{env.DOCKERFILE_PATH}} --tag xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}:${{env.PACKAGE_VERSION}}
           docker push xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}:${{env.PACKAGE_VERSION}}
-#      - name: 更新服务器 发送请求
-#        run: |
-#          curl -X PUT  \
-#          -H "content-type: application/json" \
-#          -H "Cookie: KuboardUsername=admin; KuboardAccessKey=emrcwdmbxijy.mbxn23tmz8hmmtnnx25wab3ist3nz7nx" \
-#          -d '{"kind":"deployments","namespace":"app","name":"iot","images":{"xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}":"xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}:${{env.PACKAGE_VERSION}}"}}' \
-#          "https://k3s.imlogic.cn/kuboard-api/cluster/default/kind/CICDApi/admin/resource/updateImageTag"
+      - name: 更新服务器 发送请求
+        run: |
+          curl -X PUT  \
+          -H "content-type: application/json" \
+          -H "Cookie: KuboardUsername=admin; KuboardAccessKey=emrcwdmbxijy.mbxn23tmz8hmmtnnx25wab3ist3nz7nx" \
+          -d '{"kind":"deployments","namespace":"imlogic","name":"${{env.PACKAGE_NAME}}","images":{"xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}":"xu756-docker.pkg.coding.net/me/xm/${{env.PACKAGE_NAME}}:${{env.PACKAGE_VERSION}}"}}' \
+          "https://k3s.imlogic.cn/kuboard-api/cluster/default/kind/CICDApi/admin/resource/updateImageTag"
diff --git a/app/im/server/handler/handler.go b/app/im/server/handler/handler.go
@@ -16,7 +16,7 @@ func InitRouter() {
 		server.WithReadBufferSize(1024*1024*100),
 		server.WithMaxRequestBodySize(1024*1024*100),
 	)
-	router := h.Group("/api/im")
+	router := h.Group("/api/ws")
 	router.GET("/connect", logic.Connect)
 	HttpServer = h
 }
diff --git a/common/config/config.go b/common/config/config.go
@@ -8,8 +8,8 @@ type Config struct {
 	JwtConfig   JwtConfig   `yaml:"JwtConfig"`
 	MqUrl       string      `yaml:"MqUrl"`
 	Version     string      `yaml:"Version"`
-	CosUrl      string      `yaml:"cosUrl"`
-	UploadPath  string      `yaml:"uploadPath"`
+	CosUrl      string      `yaml:"CosUrl"`
+	UploadPath  string      `yaml:"UploadPath"`
 	Minio       Minio       `yaml:"Minio"`
 	MongodbUrl  string      `yaml:"MongodbUrl"`
 }

diff --git a/configs/dev.yaml b/configs/dev.yaml
@@ -1,12 +1,12 @@
 Addr:
   ApiAddr: 0.0.0.0:7080
-  UserAddr: 0.0.0.0:8081
+  UserAddr: 0.0.0.0:7081
   ImAddr: 0.0.0.0:7082 # ws 地址
   ImServerAddr: 0.0.0.0:7083 # 调用ws rpc 地址
   ImHandlerAddr: 0.0.0.0:7084 # 处理ws消息的rpc地址
 
 Rpc:
-  UserRpc: 0.0.0.0:8081
+  UserRpc: 0.0.0.0:7081
   ImServerAddr: 0.0.0.0:7083
   ImHandlerAddr: 0.0.0.0:7084
 
@@ -24,16 +24,17 @@ RedisConfig:
   Db: 4
   Prefix: imlogic
 
-uploadPath: ./build/file
-cosUrl: https://cos.imlogic.cn/appserver
+UploadPath: ./build/file
+CosUrl: https://cos.imlogic.cn/appserver
 
 JwtConfig:
   SignKey: Tqede8rNvZvbKmjqYpQRvwLxsGR
   Expire: 3600000
 
 
-MqUrl: amqp://root:1mYa0PE6JLz8U5YJYMgj@192.168.0.105:5672/
+MqUrl: amqp://root:1mYa0PE6JLz8U5YJYMgj@110.40.208.122:5672/
 Version: v1
+
 Minio:
   Endpoint: cos.imlogic.cn
   AccessKeyID: nJQ8MGtvnWfgHJXu0pFS