fix: fixed operator issue (#11)

Author: tacklequestions

apollo-openapi.yaml

@@ -59,18 +59,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/OpenAppDTO'
-              example:
-                dataChangeCreatedBy: 'apollo'
-                dataChangeLastModifiedBy: 'apollo'
-                dataChangeCreatedTime: '2024-01-15T10:30:00.000Z'
-                dataChangeLastModifiedTime: '2024-01-15T10:30:00.000Z'
-                name: 'Sample Application'
-                appId: 'sample-app'
-                orgId: 'default'
-                orgName: 'Default Organization'
-                ownerName: 'Apollo Admin'
-                ownerEmail: 'admin@apollo.com'
+                $ref: '#/components/schemas/SuccessEmptyResponse'
           headers: {}
         '400':
           description: '请求参数错误'
@@ -290,6 +279,12 @@ paths:
           required: true
           schema:
             type: string
+        - name: operator
+          in: query
+          description: '操作人用户名'
+          required: true
+          schema:
+            type: string
       requestBody:
         content:
           application/json:
@@ -345,6 +340,12 @@ paths:
           required: true
           schema:
             type: string
+        - name: operator
+          in: query
+          description: '操作人用户名'
+          required: true
+          schema:
+            type: string
       responses:
         '200':
           description: '应用删除成功'
@@ -454,9 +455,7 @@ paths:
           content:
             application/json:
               schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/OpenEnvClusterInfo'
+                $ref: '#/components/schemas/MultiResponseEntity'
               example:
                 - env: 'DEV'
                   clusters:
@@ -487,6 +486,12 @@ paths:
           required: true
           schema:
             type: string
+        - name: operator
+          in: query
+          description: '操作人用户名'
+          required: true
+          schema:
+            type: string
       requestBody:
         content:
           application/json:
@@ -540,9 +545,7 @@ paths:
           content:
             application/json:
               schema:
-                type: array
-                items:
-                  type: string
+                $ref: '#/components/schemas/MultiResponseEntity'
           headers: {}
         '404':
           description: '应用不存在'
@@ -743,7 +746,7 @@ paths:
         - name: operator
           in: query
           description: '操作人用户名'
-          required: false
+          required: true
           schema:
             type: string
       responses:
@@ -882,6 +885,12 @@ paths:
           required: true
           schema:
             type: string
+        - name: operator
+          in: query
+          description: '操作人用户名'
+          required: true
+          schema:
+            type: string
       requestBody:
         content:
           application/json:
@@ -1112,7 +1121,7 @@ paths:
         - name: operator
           in: query
           description: ''
-          required: false
+          required: true
           schema:
             type: string
       responses:
@@ -1160,6 +1169,12 @@ paths:
           required: true
           schema:
             type: string
+        - name: operator
+          in: query
+          description: '操作人用户名'
+          required: true
+          schema:
+            type: string
       requestBody:
         content:
           application/json:
@@ -1402,6 +1417,12 @@ paths:
           required: true
           schema:
             type: string
+        - name: operator
+          in: query
+          description: '操作人用户名'
+          required: true
+          schema:
+            type: string
       requestBody:
         content:
           application/json:
@@ -1528,6 +1549,12 @@ paths:
           required: true
           schema:
             type: string
+        - name: operator
+          in: query
+          description: '操作人用户名'
+          required: true
+          schema:
+            type: string
       responses:
         '200':
           description: '配置项更改撤销成功'
@@ -1630,6 +1657,12 @@ paths:
           required: true
           schema:
             type: string
+        - name: operator
+          in: query
+          description: '操作人用户名'
+          required: true
+          schema:
+            type: string
       responses:
         '200':
           description: '集群删除成功'
@@ -2113,7 +2146,7 @@ paths:
         - name: operator
           in: query
           description: '操作人用户名'
-          required: false
+          required: true
           schema:
             type: string
       responses:
@@ -2868,6 +2901,12 @@ paths:
           required: true
           schema:
             type: string
+        - name: operator
+          in: query
+          description: '操作人用户名'
+          required: true
+          schema:
+            type: string
       responses:
         '200':
           description: 'AppNamespace删除成功'
@@ -3105,6 +3144,12 @@ paths:
           required: true
           schema:
             type: string
+        - name: operator
+          in: query
+          description: '操作人用户名'
+          required: true
+          schema:
+            type: string
       responses:
         '200':
           description: '解除关联成功'
@@ -3261,7 +3306,7 @@ paths:
         - name: operator
           in: query
           description: '操作人用户名'
-          required: false
+          required: true
           schema:
             type: string
       responses:
@@ -3334,7 +3379,7 @@ paths:
         - name: operator
           in: query
           description: 操作人用户名
-          required: false
+          required: true
           schema:
             type: string
       responses:
@@ -3397,6 +3442,12 @@ paths:
           example: 'true'
           schema:
             type: boolean
+        - name: operator
+          in: query
+          description: '操作人用户名'
+          required: true
+          schema:
+            type: string
       requestBody:
         content:
           application/json:
@@ -3527,7 +3578,7 @@ paths:
         - name: operator
           in: query
           description: 操作人用户名
-          required: false
+          required: true
           schema:
             type: string
       requestBody:
@@ -4160,5 +4211,40 @@ components:
         projectB:
           darkMode: true
 
+    MultiResponseEntity:
+      type: object
+      description: A response container holding multiple RichResponseEntity objects
+      properties:
+        code:
+          type: integer
+          description: Overall HTTP status code
+          example: 200
+        entities:
+          type: array
+          description: List of rich response entities
+          items:
+            $ref: '#/components/schemas/RichResponseEntity'
+      required:
+        - code
+        - entities
+
+    RichResponseEntity:
+      type: object
+      description: A wrapper for a single response entity with code, message, and body
+      properties:
+        code:
+          type: integer
+          description: HTTP status code
+          example: 200
+        message:
+          type: object
+          description: Response message (can be string or object)
+          example: "OK"
+        body:
+          type: object
+          description: Response payload (generic type T)
+      required:
+        - code
+        - message
 
 servers: []

generate.sh

@@ -48,13 +48,6 @@ echo "📦 Adding Maven Wrapper to Spring Boot 2 project..."
 cd "$SPRING_BOOT2_DIR"
 mvn -N io.takari:maven:wrapper -Dmaven=3.8.6
 
-# this is for removing illegal symbols generated by a generator.
-echo "Cleaning files (trailing spaces, CRLF, EOF newlines)..."
-find . -type d \( -name .git -o -name .idea -o -name .mvn -o -name target -o -name build -o -name node_modules \) -prune -o \
-  -type f \( -name "*.java" -o -name "*.xml" -o -name "*.properties" -o -name "*.md" -o -name "*.yml" -o -name "*.yaml" -o -name "*.sh" -o -name ".editorconfig" -o -name ".gitignore" -o -name "mvnw" \) -print0 \
-| xargs -0 perl -i -0777 -pe 's/[ \t]+(?=\r?$)//mg; s/\r//g; s/\s*\z/\n/s'
-echo "Cleaning files (trailing spaces, CRLF, EOF newlines)... Done!"
-
 cd ..
 
 echo "💡 Spring Boot 2 project ready! To start the server, run:"
@@ -77,3 +70,10 @@ openapi-generator generate \
   --additional-properties=packageName=apollo-openapi,packageVersion=0.0.1
 
 echo "✅ SDK generation complete."
+
+# this is for removing illegal symbols generated by a generator.
+echo "Cleaning files (trailing spaces, CRLF, EOF newlines, wrong spellings)..."
+find . -type d \( -name .git -o -name .idea -o -name .mvn -o -name target -o -name build -o -name node_modules \) -prune -o \
+  -type f \( -name "*.java" -o -name "*.xml" -o -name "*.properties" -o -name "*.md" -o -name "*.yml" -o -name "*.yaml" -o -name "*.gradle" -o -name "*.sh" -o -name "*.py" -o -name "*.pyi" -o -name "*.ts" -o -name "*.rs" -o -name ".editorconfig" -o -name ".gitignore" -o -name ".npmignore" -o -name "mvnw" -o -name "VERSION" \) -print0 \
+| xargs -0 perl -i -0777 -pe 's/[ \t]+(?=\r?$)//mg; s/\r//g; s/filesystme/filesystem/g; s/\s*\z/\n/s'
+echo "Cleaning files (trailing spaces, CRLF, EOF newlines, wrong spellings)... Done!"

java-client/.github/workflows/maven.yml

@@ -17,11 +17,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 17, 21 ]
+        java: [ '8' ]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
     - name: Set up JDK
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v2
       with:
         java-version: ${{ matrix.java }}
         distribution: 'temurin'