1

app/hdl/hdl_login.go

@@ -23,7 +23,7 @@ import (
 // @Produce      json
 // @Param        req 	body      md.RegisterReq          true   "注册参数"
 // @Success      200   {object}   md.LoginResponse			"登录成功返回"
-// @Failure      400   {object}   md.CustomerErrResponse              	"具体错误"
+// @Failure      400   {object}   md.Response              	"具体错误"
 // @Router       /v1/register [post]
 func Register(c *gin.Context) {
 	var req md.RegisterReq

build.sh

@@ -9,7 +9,7 @@ echo "GET the Commit ID for git -> $ZYOS_APP_COMMIT_ID"
 
 echo "Start build image "
 
-image_name=registry-vpc.cn-shenzhen.aliyuncs.com/fnuoos-prd/egg-admin:${ZYOS_APP_COMMIT_ID}
+image_name=registry-vpc.cn-shenzhen.aliyuncs.com/fnuoos-prd/egg-app:${ZYOS_APP_COMMIT_ID}
 #final_image_name=registry.cn-shenzhen.aliyuncs.com/fnuoos-prd/zyos:${ZYOS_APP_COMMIT_ID}
 docker build -t ${image_name} .
 

go.mod

@@ -2,17 +2,14 @@ module applet
 
 go 1.19
 
-replace code.fnuoos.com/EggPlanet/egg_models.git => E:/company/Egg/egg_models
-
-replace code.fnuoos.com/go_rely_warehouse/zyos_go_es.git => E:\company\go_rely_warehouse\zyos_go_es
-
-replace code.fnuoos.com/EggPlanet/egg_system_rules.git => E:/company/Egg/egg_system_rules
+//replace code.fnuoos.com/EggPlanet/egg_models.git => E:/company/Egg/egg_models
+//
+//replace code.fnuoos.com/EggPlanet/egg_system_rules.git => E:/company/Egg/egg_system_rules
 
 require (
 	github.com/boombuler/barcode v1.0.1
 	github.com/dchest/uniuri v0.0.0-20200228104902-7aecb25e1fe5
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
-	github.com/forgoer/openssl v0.0.0-20201023062029-c3112b0c8700
 	github.com/gin-contrib/sessions v0.0.3
 	github.com/gin-gonic/gin v1.9.0
 	github.com/go-playground/locales v0.14.1
@@ -36,9 +33,9 @@ require (
 )
 
 require (
-	code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241119093836-37be936b83fc
-	code.fnuoos.com/EggPlanet/egg_system_rules.git v0.0.3
-	code.fnuoos.com/go_rely_warehouse/zyos_go_es.git v1.0.1-0.20230707081910-52e70aa52998
+	code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241119114643-e5842e3aad32
+	code.fnuoos.com/EggPlanet/egg_system_rules.git v0.0.4-0.20241119120223-896224742c0d
+	code.fnuoos.com/go_rely_warehouse/zyos_go_es.git v1.0.1-0.20241118083738-0f22da9ba0be
 	code.fnuoos.com/go_rely_warehouse/zyos_go_mq.git v0.0.5
 	github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible
 	github.com/go-sql-driver/mysql v1.8.1

k8s/container.yaml

@@ -2,25 +2,25 @@ kind: Deployment
 apiVersion: apps/v1
 # 元数据
 metadata:
-  name: egg-admin
+  name: egg-app
   namespace: egg
   labels:
-    app: egg-admin
+    app: egg-app
   annotations:
     kubesphere.io/creator: dengbiao
-    kubesphere.io/description: egg-admin
+    kubesphere.io/description: egg-app
 # deployment主要部分
 spec:
   replicas: 1
   selector:
     matchLabels:
       # 名称与上面的labels对应
-      app: egg-admin
+      app: egg-app
   template:
     metadata:
       labels:
         # 名称与上面的matchLabels对应
-        app: egg-admin
+        app: egg-app
     spec:
       # 声明挂载卷（将外部已存在的pvc、config等挂载进来）
       volumes:
@@ -30,61 +30,31 @@ spec:
             path: /etc/localtime
             type: ''
         # 将前面创建的configMap也挂载进来
-        - name: egg-admin-cfg
+        - name: egg-app-cfg
           configMap:
             # 这里的名字就是前面创建的configMap的名字
-            name: egg-admin-cfg
+            name: egg-app-cfg
             defaultMode: 420
-        # pvc
-        - name: egg-admin  # 在该部署中的名称，后面使用改名称挂载
-          persistentVolumeClaim:
-            claimName: 	egg-admin    # pvc的名称
-        # Nginx配置
-        - name: egg-admin-nginx
-          configMap:
-            name: egg-admin-nginx  # 外部configMap的名称
-            items:
-              - key: go.conf
-                path: default.conf
       containers:
         # 主容器
-        - name: egg-admin-container
+        - name: egg-app-container
           # 镜像地址（提前打包好并推送的镜像仓库）
-          image: 'registry.cn-shenzhen.aliyuncs.com/fnuoos-prd/egg-admin:0.0.1'
+          image: 'registry.cn-shenzhen.aliyuncs.com/fnuoos-prd/egg-app:0.0.1'
           ports:
-            - name: egg-admin-4001
+            - name: egg-app-4011
               # 容器端口号（注意与golang web server启动的端口一致）
-              containerPort: 4001
+              containerPort: 4011
               protocol: TCP
           # 将前面volume声明的需要用到的pvc、config挂载上来
           volumeMounts:
             - name: host-time
               readOnly: true
               mountPath: /etc/localtime
-            - name: egg-admin-cfg # 该名字对应前面volumes声明的名字
+            - name: egg-app-cfg # 该名字对应前面volumes声明的名字
               readOnly: true
               # 挂载到容器的哪个路径
               mountPath: /var/egg
           imagePullPolicy: Always
-        # Nginx 容器
-        - name: nginx
-          image: 'registry.cn-shenzhen.aliyuncs.com/fnuoos-prd/nginx:latest'
-          ports:
-            - name: http-80
-              containerPort: 80
-              protocol: TCP
-          volumeMounts:
-            # 时区校正
-            - name: host-time
-              readOnly: true
-              mountPath: /etc/localtime
-            # 存储卷 用于存放前端代码
-            - name: egg-admin   # 前面volumes声明的名称
-              mountPath: /usr/share/nginx/html
-            - name: egg-admin-nginx   # Nginx 配置
-              readOnly: true
-              mountPath: /etc/nginx/conf.d/default.conf
-              subPath: default.conf
       restartPolicy: Always
       terminationGracePeriodSeconds: 30
       dnsPolicy: ClusterFirst