修改镜像拉取策略

.gitlab-ci.yml

@@ -0,0 +1,67 @@
+image: harbor.fjy8018.top:8883/library/docker:19.03
+
+variables:
+  MAVEN_CLI_OPTS: "-s .m2/settings.xml --batch-mode -Dmaven.test.skip=true"
+  MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"
+  DOCKER_DRIVER: overlay
+  DOCKER_HOST: tcp://localhost:2375
+  DOCKER_TLS_CERTDIR: ""
+  SPRING_PROFILES_ACTIVE: docker
+  IMAGE_VERSION: "V2.9.13"
+  DOCKER_REGISTRY_MIRROR: "https://clayphwh.mirror.aliyuncs.com"
+
+stages:
+  - test
+  - package
+  - deploy
+
+maven-build:
+  image: harbor.fjy8018.top:8883/library/maven:3-jdk-8
+  stage: test
+  retry: 2
+  script:
+    - mvn $MAVEN_CLI_OPTS clean package -U -B -T 2C
+  artifacts:
+    expire_in: 1 week
+    paths:
+      - target/*.jar
+
+maven-scan:
+  stage: test
+  retry: 2
+  image: harbor.fjy8018.top:8883/library/maven:3-jdk-8
+  script:
+    - mvn $MAVEN_CLI_OPTS verify sonar:sonar
+
+maven-deploy:
+  stage: deploy
+  retry: 2
+  image: harbor.fjy8018.top:8883/library/maven:3-jdk-8
+  script:
+    - mvn $MAVEN_CLI_OPTS deploy
+
+
+docker-harbor-build:
+  stage: package
+  retry: 2
+  image:
+    name: harbor.fjy8018.top:8883/google_container/kaniko-executor:debug
+    entrypoint: [""]
+  script:
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$IMAGE_VERSION
+
+deploy_live:
+  image: harbor.fjy8018.top:8883/offical/kubectl:v1.14.0
+  stage: deploy
+  retry: 2
+  environment:
+    name: prod
+    url: https://cms.fjy8018.xin
+  script:
+    - kubectl version
+    - kubectl get pods -n cms
+    - cd manifests/
+    - sed -i "s/__IMAGE_VERSION_SLUG__/${IMAGE_VERSION}/" deployment.yaml
+    - kubectl apply -f deployment.yaml
+    - kubectl get pods -n cms

.m2/settings.xml

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+    <pluginGroups>
+        <pluginGroup>org.sonarsource.scanner.maven</pluginGroup>
+    </pluginGroups>
+
+    <mirrors>
+        <mirror>
+            <id>fjy-nexus</id>
+            <!--*指的是访问任何仓库都使用我们的私服-->
+            <mirrorOf>central</mirrorOf>
+            <name>Nexus myself</name>
+            <url>http://192.168.1.30:8081/repository/maven-public/</url>
+        </mirror>
+    </mirrors>
+
+    <servers>
+        <server>
+            <id>maven-central</id>
+            <username>${env.MAVEN_USER}</username>
+            <password>${env.MAVEN_PASSWORD}</password>
+        </server>
+        <server>
+            <id>maven-public</id>
+            <username>${env.MAVEN_USER}</username>
+            <password>${env.MAVEN_PASSWORD}</password>
+        </server>
+        <server>
+            <id>maven-snapshots</id>
+            <username>${env.MAVEN_USER}</username>
+            <password>${env.MAVEN_PASSWORD}</password>
+        </server>
+    </servers>
+    <profiles>
+        <profile>
+            <id>sonar</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <sonar.host.url>
+                    http://192.168.1.27:19000
+                </sonar.host.url>
+            </properties>
+        </profile>
+        <profile>
+            <id>fjy-nexus</id>
+            <!-- 远程仓库列表 -->
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <repositories>
+                <repository>
+                    <id>maven-public</id>
+                    <name>maven-public</name>
+                    <url>http://192.168.1.30:8081/repository/maven-public/</url>
+                    <snapshots>
+                        <enabled>true</enabled>
+                    </snapshots>
+                    <releases>
+                        <enabled>true</enabled>
+                    </releases>
+                </repository>
+            </repositories>
+            <pluginRepositories>
+                <!--插件库地址-->
+                <pluginRepository>
+                    <id>maven-public</id>
+                    <url>http://192.168.1.30:8081/repository/maven-public/</url>
+                    <releases>
+                        <enabled>true</enabled>
+                    </releases>
+                    <snapshots>
+                        <enabled>true</enabled>
+                    </snapshots>
+                </pluginRepository>
+            </pluginRepositories>
+        </profile>
+    </profiles>
+
+</settings>

Dockerfile

@@ -1,7 +1,7 @@
 FROM harbor.fjy8018.top:8883/library/openjdk:8-jre
 MAINTAINER fjy8018 fjy8018@gmail.com
 
-COPY target/spring-V2.9.13.jar.jar /cms-springboot.jar
+COPY target/spring-V2.9.13.jar /cms-springboot.jar
 # 设置时区，默认为UTC
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone

README.md

@@ -1,14 +1,4 @@
-
-
-
 # 班级作业提交系统
-
-![license](https://img.shields.io/static/v1?label=license&message=MPL&color=blue)
-
-GitHub Account: [FJiayang](https://github.com/FJiayang)
-
-OpenSource Address: [cms](https://github.com/FJiayang/cms)
-
 [系统介绍和详细截图](https://www.fjy8018.xin/index.php/archives/100/)
 
 ## 起因 ##

manifests/deployment.yaml

@@ -0,0 +1,76 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: cms
+
+---
+
+apiVersion: v1
+kind: Secret
+metadata:
+  name: harbor-login
+  namespace: cms
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: ewoJImF1dGhzIjogewoJCSJoYXJib3IuZmp5ODAxOC50b3A6ODg4MyI6IHsKCQkJImF1dGgiOiAiYXpoek9rczRjMmhoY21KdmNnPT0iCgkJfQoJfQp9
+
+---
+
+#deploy
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: cms
+  namespace: cms
+  labels:
+    app: cms
+spec:
+  selector:
+    matchLabels:
+      app: cms
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: cms
+    spec:
+      imagePullSecrets:
+        - name: harbor-login
+      containers:
+        - name: cms
+          imagePullPolicy: Always
+          image: harbor.fjy8018.top:8883/fjy8018/cms:__IMAGE_VERSION_SLUG__
+          ports:
+            - containerPort: 8080
+---
+#service
+apiVersion: v1
+kind: Service
+metadata:
+  name: cms
+  namespace: cms
+spec:
+  ports:
+    - port: 80
+      protocol: TCP
+      targetPort: 8080
+  selector:
+    app: cms
+  type: ClusterIP
+
+---
+#ingress
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: cms
+  namespace: cms
+spec:
+  rules:
+    - host: cms.fjy8018.xin
+      http:
+        paths:
+          - path: /
+            backend:
+              serviceName: cms
+              servicePort: 80

manifests/gitlab-sa.yaml

@@ -0,0 +1,21 @@
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: cms-gitlab-ci
+  namespace: cms
+
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: RoleBinding
+metadata:
+  name: cms-gitlab-role
+  namespace: cms
+subjects:
+  - kind: ServiceAccount
+    name: cms-gitlab-ci
+    namespace: cms
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: admin

pom.xml

@@ -81,6 +81,19 @@
         </dependency>
     </dependencies>
 
+	<distributionManagement>
+		<repository>
+			<id>maven-public</id>
+			<name>Release Deploy</name>
+			<url>http://192.168.1.30:8081/repository/maven-releases/</url>
+		</repository>
+		<snapshotRepository>
+			<id>maven-snapshots</id>
+			<name>Snapshot Deploy</name>
+			<url>http://192.168.1.30:8081/repository/maven-snapshots/</url>
+		</snapshotRepository>
+	</distributionManagement>
+
 
 	<build>
 		<plugins>

sql.sql

@@ -1,4 +1,9 @@
-CREATE DATABASE db_imis2 
+DROP DATABASE IF EXISTS db_imis2;
+CREATE DATABASE db_imis2;
+use db_imis2;
+
+GRANT ALL ON db_imis2.* TO imis2@'%' IDENTIFIED BY '2015imis2';
+FLUSH PRIVILEGES;
 
 CREATE TABLE tb_user
 (
@@ -10,11 +15,13 @@ CREATE TABLE tb_user
     colrealname  VARCHAR(20)         NOT NULL
 )
     ENGINE = InnoDB
-  CHARSET = utf8
+    CHARSET = utf8mb4
-  COLLATE utf8_general_ci;
+    COLLATE utf8mb4_general_ci;
 CREATE UNIQUE INDEX tb_user_colname_uindex ON tb_user (colname);
-INSERT INTO tb_user (colname, colpassword, colemail, colstudentno, colrealname) VALUES ('root','-4e4hc3pvvu8n0rj1uena76948n37q23r','root@gmail.com','00001','FJY');
+INSERT INTO tb_user (colname, colpassword, colemail, colstudentno, colrealname)
-SELECT * FROM tb_user;
+VALUES ('root', '-4e4hc3pvvu8n0rj1uena76948n37q23r', 'root@gmail.com', '00001', 'FJY');
+SELECT *
+FROM tb_user;
 
 
 CREATE TABLE tb_file
@@ -27,9 +34,13 @@ CREATE TABLE tb_file
     colfilename VARCHAR(255),
     colfilesize VARCHAR(32),
     colfilepath VARCHAR(128)
-)ENGINE = InnoDB CHARSET=utf8 COLLATE utf8_general_ci;
+) ENGINE = InnoDB
-ALTER TABLE tb_file COMMENT = '文件表';
+  CHARSET = utf8mb4
-ALTER TABLE tb_file ADD CONSTRAINT FK_fileuser FOREIGN KEY (coluserid) REFERENCES tb_user (coluserid);
+  COLLATE utf8mb4_general_ci;
+ALTER TABLE tb_file
+    COMMENT = '文件表';
+ALTER TABLE tb_file
+    ADD CONSTRAINT FK_fileuser FOREIGN KEY (coluserid) REFERENCES tb_user (coluserid);
 
 CREATE TABLE tb_admin
 (
@@ -39,9 +50,10 @@ CREATE TABLE tb_admin
     CONSTRAINT FK_adminuser FOREIGN KEY (coluserid) REFERENCES tb_user (coluserid)
 )
     ENGINE = InnoDB
-  CHARSET = utf8
+    CHARSET = utf8mb4
-  COLLATE utf8_general_ci;
+    COLLATE utf8mb4_general_ci;
-ALTER TABLE tb_admin COMMENT = '管理员表';
+ALTER TABLE tb_admin
+    COMMENT = '管理员表';
 
 CREATE TABLE tb_student
 (
@@ -49,8 +61,11 @@ CREATE TABLE tb_student
     coluserid INT(10),
     coltime   VARCHAR(128) NOT NULL,
     CONSTRAINT FK_sutdentuser FOREIGN KEY (coluserid) REFERENCES tb_user (coluserid)
-)ENGINE = InnoDB CHARSET=utf8 COLLATE utf8_general_ci;
+) ENGINE = InnoDB
-ALTER TABLE tb_student COMMENT = '学生表';
+  CHARSET = utf8mb4
+  COLLATE utf8mb4_general_ci;
+ALTER TABLE tb_student
+    COMMENT = '学生表';
 
 CREATE TABLE tb_teacher
 (
@@ -58,8 +73,11 @@ CREATE TABLE tb_teacher
     coluserid INT(10),
     coltime   VARCHAR(128) NOT NULL,
     CONSTRAINT FK_teacheruser FOREIGN KEY (coluserid) REFERENCES tb_user (coluserid)
-)ENGINE = InnoDB CHARSET=utf8 COLLATE utf8_general_ci;
+) ENGINE = InnoDB
-ALTER TABLE tb_teacher COMMENT = '老师表';
+  CHARSET = utf8mb4
+  COLLATE utf8mb4_general_ci;
+ALTER TABLE tb_teacher
+    COMMENT = '老师表';
 
 CREATE TABLE tb_log
 (
@@ -71,8 +89,8 @@ CREATE TABLE tb_log
     CONSTRAINT FK_loguser FOREIGN KEY (coluserid) REFERENCES tb_user (coluserid)
 )
     ENGINE = InnoDB
-    CHARSET = utf8
+    CHARSET = utf8mb4
-    COLLATE utf8_general_ci;
+    COLLATE utf8mb4_general_ci;
 ALTER TABLE tb_log
     COMMENT = '日志表';
 
@@ -85,9 +103,10 @@ CREATE TABLE tb_course
     CONSTRAINT FK_teacherid FOREIGN KEY (teacherid) REFERENCES tb_teacher (teacherid)
 )
     ENGINE = InnoDB
-    CHARSET = utf8
+    CHARSET = utf8mb4
-    COLLATE utf8_general_ci;
+    COLLATE utf8mb4_general_ci;
-ALTER TABLE tb_course COMMENT = '课程表';
+ALTER TABLE tb_course
+    COMMENT = '课程表';
 
 CREATE TABLE tb_homework
 (
@@ -102,9 +121,10 @@ CREATE TABLE tb_homework
     CONSTRAINT FK_courseNo FOREIGN KEY (courseNo) REFERENCES tb_course (courseNo)
 )
     ENGINE = InnoDB
-  CHARSET = utf8
+    CHARSET = utf8mb4
-  COLLATE utf8_general_ci;
+    COLLATE utf8mb4_general_ci;
-ALTER TABLE tb_homework COMMENT = '作业表';
+ALTER TABLE tb_homework
+    COMMENT = '作业表';
 
 CREATE TABLE tb_workstatus
 (
@@ -116,9 +136,10 @@ CREATE TABLE tb_workstatus
     CONSTRAINT FK_workId FOREIGN KEY (workId) REFERENCES tb_homework (workId)
 )
     ENGINE = InnoDB
-  CHARSET = utf8
+    CHARSET = utf8mb4
-  COLLATE utf8_general_ci;
+    COLLATE utf8mb4_general_ci;
-ALTER TABLE tb_workstatus COMMENT = '作业提交状态表';
+ALTER TABLE tb_workstatus
+    COMMENT = '作业提交状态表';
 
 CREATE TABLE tb_feedback
 (
@@ -129,9 +150,10 @@ CREATE TABLE tb_feedback
     CONSTRAINT FK_feedbackuser FOREIGN KEY (coluserid) REFERENCES tb_user (coluserid)
 )
     ENGINE = InnoDB
-  CHARSET = utf8
+    CHARSET = utf8mb4
-  COLLATE utf8_general_ci;
+    COLLATE utf8mb4_general_ci;
-ALTER TABLE tb_workstatus COMMENT = '反馈信息表';
+ALTER TABLE tb_workstatus
+    COMMENT = '反馈信息表';
 
 CREATE TABLE tb_notice
 (
@@ -142,15 +164,27 @@ CREATE TABLE tb_notice
     CONSTRAINT FK_noticeuser FOREIGN KEY (adminid) REFERENCES tb_admin (adminid)
 )
     ENGINE = InnoDB
-  CHARSET = utf8
+    CHARSET = utf8mb4
-  COLLATE utf8_general_ci;
+    COLLATE utf8mb4_general_ci;
-ALTER TABLE tb_workstatus COMMENT = '公告表';
+ALTER TABLE tb_workstatus
+    COMMENT = '公告表';
+
+CREATE TABLE tb_userque
+(
+    coluserid   INT(10) PRIMARY KEY,
+    colquestion VARCHAR(64),
+    colanswer   VARCHAR(255)
+)
+    ENGINE = InnoDB
+    CHARSET = utf8mb4
+    COLLATE utf8mb4_general_ci;
+ALTER TABLE tb_userque
+    COMMENT = '用户问题表';
 
 
 CREATE VIEW v_workdetail
 AS
-    SELECT
+SELECT workId,
-      workId,
        workName,
        workTime,
        f.colfileid,
@@ -158,60 +192,64 @@ CREATE VIEW v_workdetail
        c.courseName,
        workRemark,
        h.workFolder
-    FROM tb_homework h, tb_course c, tb_file f
+FROM tb_homework h,
-    WHERE h.colfileid = f.colfileid AND h.courseNo = c.courseNo;
+     tb_course c,
+     tb_file f
+WHERE h.colfileid = f.colfileid
+  AND h.courseNo = c.courseNo;
 
 CREATE VIEW v_log
 AS
-    SELECT
+SELECT logid,
-    logid,
        colname,
        coltime,
        colip,
        colheader
-    FROM tb_log,tb_user
+FROM tb_log,
+     tb_user
 WHERE tb_user.coluserid = tb_log.coluserid;
 
 CREATE VIEW v_feedback
 AS
-    SELECT
+SELECT feedbackid,
-      feedbackid,
        colname,
        feedbackContent,
        issueTime
-    FROM tb_feedback, tb_user
+FROM tb_feedback,
+     tb_user
 WHERE tb_user.coluserid = tb_feedback.coluserid;
 
 
 CREATE VIEW v_course
 AS
-    SELECT
+SELECT courseNo,
-    courseNo,
        courseName,
        courseTime,
        colrealname,
        colname
-    FROM tb_course, tb_teacher,tb_user
+FROM tb_course,
-    WHERE tb_user.coluserid = tb_teacher.coluserid AND tb_teacher.teacherid=tb_course.teacherid;
+     tb_teacher,
+     tb_user
+WHERE tb_user.coluserid = tb_teacher.coluserid
+  AND tb_teacher.teacherid = tb_course.teacherid;
 
 CREATE VIEW v_homework
 AS
-    SELECT
+SELECT workId,
-      workId,
        workName,
        workTime,
        colfileid,
        workFolder,
        courseName,
        workRemark
-    FROM tb_homework, tb_course
+FROM tb_homework,
+     tb_course
 WHERE tb_homework.courseNo = tb_course.courseNo;
 
 
 CREATE VIEW v_userfile
 AS
-    SELECT
+SELECT tb_file.colfileid,
-      colfileid,
        coltime,
        colip,
        colfilename,
@@ -221,14 +259,16 @@ CREATE VIEW v_userfile
        workFolder,
        tb_user.colrealname,
        colstudentno
-    FROM tb_file, tb_user
+FROM tb_file,
+     tb_user,
+     tb_course,
+     tb_homework
 WHERE tb_user.coluserid = tb_file.coluserid;
 
 
 CREATE VIEW v_userinfo
 AS
-    SELECT
+SELECT coluserid,
-      coluserid,
        colname,
        colemail,
        colstudentno,
@@ -238,12 +278,12 @@ CREATE VIEW v_userinfo
 
 CREATE VIEW v_userque
 AS
-    SELECT
+SELECT tb_user.coluserid,
-      tb_user.coluserid,
        colname,
        colquestion,
        colanswer,
        colrealname
-    FROM tb_userque,tb_user
+FROM tb_userque,
+     tb_user
 WHERE tb_user.coluserid = tb_userque.coluserid;
 

src/main/resources/application-k8s.yml

@@ -11,7 +11,7 @@ server:
     port-header: X-Forwarded-Port
   use-forward-headers: true
 serverproperties:
-  port_num: 8080
+  port_num: 80
   filePath: /www/cmsfile/
 spring:
   thymeleaf: