Merge branch 'master' into csf-master

Dockerfile

-FROM node:18-alpine
+FROM node:18-alpine as builder
 WORKDIR /app
 COPY package.json .
 COPY package-lock.json .
 RUN npm ci
 COPY . .
-EXPOSE 5173
-CMD ["npm", "run", "dev"]
\ No newline at end of file
+#EXPOSE 5173
+#CMD ["npm", "run", "dev"]
+RUN npm run build
+
+# nginx
+FROM nginx:alpine as production
+ENV NODE_ENV production
+# Set working directory to nginx asset directory
+COPY --from=builder /app/dist /usr/share/nginx/html
+#COPY nginx.conf /etc/nginx/conf.d/default.conf
+COPY nginx.conf /etc/nginx/nginx.conf
+EXPOSE 80
+# Containers run nginx with global directives and daemon off
+ENTRYPOINT ["nginx", "-g", "daemon off;"]
\ No newline at end of file

env/.env.production

 #请求接口地址
-VITE_REQUEST_BASE_URL='https://www.iuav.shop'
-#VITE_REQUEST_BASE_URL='https://test.iuav.shop'
+#VITE_REQUEST_BASE_URL='https://www.iuav.shop'
+VITE_REQUEST_BASE_URL='https://test.iuav.shop'
+#VITE_REQUEST_BASE_URL='/api'
 #旧版接口地址
 #VITE_REQUEST_BASE_URL='https://iuav.mmcuav.cn'
 #VITE_REQUEST_BASE_URL='https://test.iuav.mmcuav.cn'

kustomization/base/deployment.yaml

@@ -23,4 +23,4 @@ spec:
               memory: 512Mi
               cpu: 100m
           ports:
-            - containerPort: 5173
\ No newline at end of file
+            - containerPort: 80
\ No newline at end of file

kustomization/base/service.yaml

@@ -6,7 +6,6 @@ metadata:
 spec:
   selector:
     app: admin
-  type: NodePort
   ports:
     - protocol: TCP
-      port: 5173
+      port: 80

kustomization/overlays/dev/kustomization.yaml

 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../../base
+  - ../../base
 #namePrefix: dev-
 namespace: dev
 commonLabels:
@@ -9,5 +9,9 @@ commonLabels:
 commonAnnotations:
   note: This is dev!
 patches:
-- path: ./increase_replicas.yaml
-- path: ./configMap.yaml
\ No newline at end of file
+  - path: ./increase_replicas.yaml
+  - path: ./configMap.yaml
+images:
+  - name: REGISTRY/NAMESPACE/IMAGE:TAG
+    newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
+    newTag: 555a2cf5fdf0e37e5c054be3cd3070c2f963be2d

nginx.conf

+user  nginx;
+worker_processes  1;
+error_log  /var/log/nginx/error.log warn;
+pid        /var/run/nginx.pid;
+events {
+  worker_connections  1024;
+}
+http {
+  include       /etc/nginx/mime.types;
+  default_type  application/octet-stream;
+  log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                    '$status $body_bytes_sent "$http_referer" '
+                    '"$http_user_agent" "$http_x_forwarded_for"';
+  access_log  /var/log/nginx/access.log  main;
+  sendfile        on;
+  keepalive_timeout  65;
+  client_max_body_size 100M;
+  server {
+    listen       80;
+    server_name  _;
+
+    add_header 'Access-Control-Allow-Origin' '*';
+    add_header 'Access-Control-Allow-Credentials' 'true';
+    add_header 'Access-Control-Allow-Methods' '*';
+    add_header 'Access-Control-Allow-Headers' '*';
+    
+    location / {
+      root   /usr/share/nginx/html;
+      include /etc/nginx/mime.types;
+      try_files $uri $uri/ /index.html;
+    }
+
+    error_page   500 502 503 504  /50x.html;
+    
+    location = /50x.html {
+      root   /usr/share/nginx/html;
+    }
+  }
+}
\ No newline at end of file

src/api/request.ts

@@ -13,7 +13,7 @@ const service = axios.create({
 });
 service.interceptors.request.use(
   (config: any) => {
-    const token = Cookies.get('SHAREFLY_TOKEN');
+    const token = Cookies.get('SHAREFLY-TOKEN');
     // console.log('token --->', token);
     if (token) {
       config.headers.token = token;

src/pages/orderManage/equipmentOrder/comp/orderConfirm/index.tsx

@@ -95,6 +95,7 @@ const OrderConfirm: React.FC<propType> = (props) => {
         labelAlign='right'
         labelCol={{ span: 8 }}
         wrapperCol={{ span: 16 }}
+        autoComplete='new-password'
       >
         <Form.Item label='收货方式' labelCol={{ span: 4 }}>
           物流归还

src/pages/orderManage/equipmentOrder/comp/orderDeliver/index.tsx

@@ -91,6 +91,7 @@ const OrderDeliver: React.FC<propType> = (props) => {
         labelAlign='right'
         labelCol={{ span: 8 }}
         wrapperCol={{ span: 16 }}
+        autoComplete='new-password'
       >
         <Form.Item label='收货地址' labelCol={{ span: 4 }}>
           {data?.receipt?.takeName} {data?.receipt?.takePhone} {data?.receipt?.detailAddress}