add yarn

.drone.yml

@@ -7,10 +7,6 @@ platform:
   os: linux
   arch: amd64
 
-
-
-
-
 clone:
   image: reg.int.it2000.com.cn/devops/git
   tags: true
@@ -19,42 +15,54 @@ clone:
 steps:
   - name: restore-cache
     image: drillster/drone-volume-cache
-    volumes:
-      - name: cache
-        path: /cache
     settings:
       restore: true
       mount:
         - ./node_modules
-
-  - name: rebuild-cache
-    image: drillster/drone-volume-cache
     volumes:
       - name: cache
         path: /cache
-    settings:
-      rebuild: true
-      mount:
-        - ./node_modules
 
   - name: build
     image: reg.int.it2000.com.cn/library/node:14.20-bullseye
     commands:
-      - node -v
+      - yarn
-      - npm -v
+      - yarn build
-      - yarn --version
+
-      - yarn install
+  - name: publish
+    image: plugins/docker
+    volumes:
+      - name: certs
+        path: /etc/ssl/certs
+      - name: docker
+        path: /var/run/docker.sock
+    settings:
+      repo: reg.int.it2000.com.cn/cdia/admin-web
+      registry: reg.int.it2000.com.cn
+      insecure: true
+      tags: [ "1.2.2" ]
+      username:
+        from_secret: registry_user
+      password:
+        from_secret: registry_pass
+
+  - name: rebuild-cache
+    image: drillster/drone-volume-cache
+    settings:
+      rebuild: true
+      mount:
+        - ./node_modules
+    volumes:
+      - name: cache
+        path: /cache
 
 volumes:
   - name: cache
     host:
-      path: /opt/node/cache
+      path: /opt/node/cache/node_modules
   - name: certs
     host:
       path: /etc/ssl/certs
   - name: docker
     host:
       path: /var/run/docker.sock
-
-      volumes:
-  

.gitignore

@@ -38,5 +38,5 @@ testem.log
 .DS_Store
 Thumbs.db
 
-yarn.lock
+# yarn.lock
-package-lock.json
+# package-lock.json

package.json

@@ -28,6 +28,7 @@
     "ng-zorro-antd": "^1.8.0",
     "ngx-color-picker": "^7.0.1",
     "rxjs": "6.0.0",
+    "yarn": "^1.22.19",
     "zone.js": "^0.8.26",
     "ztree": "^3.5.24"
   },

src/app/login/login.component.ts

@@ -57,19 +57,11 @@ export class LoginComponent implements OnInit {
     }
 
     checkPattern(pw: string): boolean {
-        if (pw.length < 8) {
+        if (pw.length < 8 ||
-            return false;
+            !/\d/.test(pw) ||
-        }
+            !/[A-Z]/.test(pw) ||
-        if  (!/\d/.test(pw)) {
+            !/[a-z]/.test(pw) || 
-            return false;
+            !/[ !@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/.test(pw)) {
-        } 
-        if (!/[A-Z]/.test(pw)) {
-            return false;
-        }
-        if (!/[a-z]/.test(pw)) {
-            return false;
-        }
-        if (!/[ !@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/.test(pw)) {
             return false;
         }
         return true;