diff --git a/config/config.yaml b/config/config.yaml index f52d20840..871cc4e49 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -1,5 +1,4 @@ # The class cannot be named by Pascal or camel case. -# The class cannot be named by Pascal or camel case. # If it is not used, the corresponding structure will not be set, # and it will not be read naturally. serverversion: 2.3.7 @@ -155,15 +154,7 @@ rpcport: #rpc服务端口 默认即可 openImPushPort: [ 10170 ] openImConversationPort: [ 10230 ] openImRealTimeCommPort: [ 11300 ] - c2c: - callbackBeforeSendMsg: - switch: false - timeoutStrategy: 1 #1:send - callbackAfterSendMsg: - switch: false - state: - stateChange: - switch: false + rpcregistername: #rpc注册服务名,默认即可 openImUserName: User @@ -175,6 +166,7 @@ rpcregistername: #rpc注册服务名,默认即可 openImAuthName: Auth openImConversationName: Conversation openImRealTimeCommName: RealTimeComm + log: storageLocation: ../logs/ rotationTime: 24 @@ -263,15 +255,6 @@ tokenpolicy: messageverify: friendVerify: -# c2c: -# callbackBeforeSendMsg: -# switch: false -# timeoutStrategy: 1 #1:send -# callbackAfterSendMsg: -# switch: false -# state: -# stateChange: -# switch: false #ios系统推送声音以及标记计数 iospush: pushSound: "xxx" diff --git a/deployk8s/ingress.yaml b/deployk8s/ingress.yaml index e41cbe31b..fd01aec0e 100644 --- a/deployk8s/ingress.yaml +++ b/deployk8s/ingress.yaml @@ -1,28 +1,6 @@ --- apiVersion: networking.k8s.io/v1 kind: Ingress -metadata: - annotations: - kubernetes.io/ingress.class: "nginx" - nginx.ingress.kubernetes.io/proxy-http-version: "1.1" - nginx.ingress.kubernetes.io/proxy-read-timeout: "3600" - nginx.ingress.kubernetes.io/proxy-send-timeout: "3600" - name: sdk-server-ingress -spec: - rules: - - host: sdk-server.openim.xxx.com - http: - paths: - - backend: - service: - name: sdk-server - port: - number: 10003 - path: / - pathType: Prefix ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress metadata: annotations: kubernetes.io/ingress.class: "nginx" diff --git a/deployk8s/kubectl_stop_all.sh b/deployk8s/kubectl_stop_all.sh index 7c9ae2264..5afa3cfde 100644 --- a/deployk8s/kubectl_stop_all.sh +++ b/deployk8s/kubectl_stop_all.sh @@ -3,7 +3,6 @@ service=( #api service file api - cms-api #rpc service file user friend @@ -14,7 +13,6 @@ service=( msg-transfer msg push - sdk-server ) for i in ${service[*]} @@ -23,7 +21,6 @@ do done kubectl -n openim delete service api -kubectl -n openim delete service sdk-server kubectl -n openim delete service msg-gateway echo done \ No newline at end of file diff --git a/deployk8s/path_info.cfg b/deployk8s/path_info.cfg index cc55f6db2..cc7bf195e 100644 --- a/deployk8s/path_info.cfg +++ b/deployk8s/path_info.cfg @@ -2,7 +2,6 @@ service=( #api service file api - cmsapi #rpc service file user friend @@ -13,5 +12,4 @@ service=( msgtransfer msg push - sdkserver ) \ No newline at end of file diff --git a/deployk8s/sdkserver/deployment.yaml b/deployk8s/sdkserver/deployment.yaml deleted file mode 100644 index 1bc147f24..000000000 --- a/deployk8s/sdkserver/deployment.yaml +++ /dev/null @@ -1,57 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: sdk-server-deployment -spec: - selector: - matchLabels: - app: sdk-server # 选择这个指定标签执行 - replicas: 1 # 运行pod数量 - template: - metadata: - labels: - app: sdk-server # 标签 - spec: - containers: - - name: sdk-server - image: openim/sdk_server:v2.3.4 - # imagePullPolicy: Always - ports: - - containerPort: 10003 - volumeMounts: - - name: config - mountPath: /Open-IM-Server/config - readOnly: true - - name: local-db - mountPath: /db/sdk - env: - - name: CONFIG_NAME - value: "/Open-IM-Server" - command: ["/Open-IM-Server/main"] - args: ["-openIM_ws_address", "ws_addr", "-sdkws_port", "10003", "-openIM_api_address", "api_address", "-openIM_log_level", "6"] - volumes: - - name: config - configMap: - name: openim-config - - name: local-db - hostPath: - path: /db/sdk - strategy: #更新策略 - type: RollingUpdate # 滚动更新 ---- -apiVersion: v1 -kind: Service -metadata: - name: sdk-server -spec: - ports: - - name: sdk-server-port - protocol: TCP - port: 10003 - targetPort: 10003 - selector: - app: sdk-server - type: NodePort - - \ No newline at end of file diff --git a/deployk8s/sdkserver/sdk_server.Dockerfile b/deployk8s/sdkserver/sdk_server.Dockerfile deleted file mode 100644 index 6f13ac2df..000000000 --- a/deployk8s/sdkserver/sdk_server.Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM ubuntu - -# 设置固定的项目路径 -ENV WORKDIR /Open-IM-Server -ENV CMDDIR $WORKDIR/cmd -ENV CONFIG_NAME $WORKDIR/config/config.yaml - -# 将可执行文件复制到目标目录 -ADD ./sdkws_server $WORKDIR/main - -# 创建用于挂载的几个目录,添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ - chmod +x $WORKDIR/main - -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"] - -WORKDIR $CMDDIR -CMD ./main \ No newline at end of file