删除CI

readme修复
2019-11-27 23:09:57 +08:00 · 2019-11-27 23:08:26 +08:00
10 changed files with 178 additions and 12862 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,67 +0,0 @@
-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
--- a/.m2/settings.xml
+++ b/.m2/settings.xml
@@ -1,83 +0,0 @@
-<?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>
--- a/2
+++ b/2
@@ -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 /cms-springboot.jar
+COPY target/spring-V2.9.13.jar.jar /cms-springboot.jar
 # 设置时区，默认为UTC
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone
--- a/README.md
+++ b/README.md
@@ -1,6 +1,13 @@
+
+
+
 # 班级作业提交系统

-[![pipeline status](https://gitlab.fjy8018.top/fjy8018/cms/badges/master/pipeline.svg)](http://gitlab.fjy8018.top:8099/fjy8018/gcb-invest/commits/master)
+![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/)

@@ -10,6 +17,8 @@
 ## 系统成品 ##
 [作业提交系统正式版（点击访问正式版网站本体）][1]

+[作业提交系统测试服务器版本（点击访问测试服务器网站本体）][2]
+
 [系统使用说明（点击访问）][3]

 ## 系统优点 ##
@@ -31,4 +40,4 @@

  [1]: https://cms.fjy8018.xin/cms/index
  [2]: http://s2.fjy8018.top:8085/cms/index
-  [3]: https://blog.fjy8018.top/index.php/archives/99/
+  [3]: http://home.fjy8018.top:8090/blog/index.php/archives/99/
--- a/db_imis2.bak.sql
+++ b/db_imis2.bak.sql
--- a/manifests/deployment.yaml
+++ b/manifests/deployment.yaml
@@ -1,76 +0,0 @@
-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
--- a/manifests/gitlab-sa.yaml
+++ b/manifests/gitlab-sa.yaml
@@ -1,21 +0,0 @@
---
-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
--- a/pom.xml
+++ b/pom.xml
@@ -81,19 +81,6 @@
        </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>
--- a/sql.sql
+++ b/sql.sql
@@ -1,9 +1,4 @@
-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 DATABASE db_imis2 

 CREATE TABLE tb_user
 (
@@ -15,13 +10,11 @@ CREATE TABLE tb_user
  colrealname  VARCHAR(20)         NOT NULL
 )
  ENGINE = InnoDB
-    CHARSET = utf8mb4
-    COLLATE utf8mb4_general_ci;
+  CHARSET = utf8
+  COLLATE utf8_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');
-SELECT *
-FROM tb_user;
+INSERT INTO tb_user (colname, colpassword, colemail, colstudentno, colrealname) VALUES ('root','-4e4hc3pvvu8n0rj1uena76948n37q23r','root@gmail.com','00001','FJY');
+SELECT * FROM tb_user;


 CREATE TABLE tb_file
@@ -34,13 +27,9 @@ CREATE TABLE tb_file
    colfilename VARCHAR(255),
    colfilesize VARCHAR(32),
    colfilepath VARCHAR(128)
-) ENGINE = InnoDB
-  CHARSET = utf8mb4
-  COLLATE utf8mb4_general_ci;
-ALTER TABLE tb_file
-    COMMENT = '文件表';
-ALTER TABLE tb_file
-    ADD CONSTRAINT FK_fileuser FOREIGN KEY (coluserid) REFERENCES tb_user (coluserid);
+)ENGINE = InnoDB CHARSET=utf8 COLLATE utf8_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
 (
@@ -50,10 +39,9 @@ CREATE TABLE tb_admin
  CONSTRAINT FK_adminuser FOREIGN KEY (coluserid) REFERENCES tb_user (coluserid)
 )
  ENGINE = InnoDB
-    CHARSET = utf8mb4
-    COLLATE utf8mb4_general_ci;
-ALTER TABLE tb_admin
-    COMMENT = '管理员表';
+  CHARSET = utf8
+  COLLATE utf8_general_ci;
+ALTER TABLE tb_admin COMMENT = '管理员表';

 CREATE TABLE tb_student
 (
@@ -61,11 +49,8 @@ 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 = utf8mb4
-  COLLATE utf8mb4_general_ci;
-ALTER TABLE tb_student
-    COMMENT = '学生表';
+)ENGINE = InnoDB CHARSET=utf8 COLLATE utf8_general_ci;
+ALTER TABLE tb_student COMMENT = '学生表';

 CREATE TABLE tb_teacher
 (
@@ -73,11 +58,8 @@ 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 = utf8mb4
-  COLLATE utf8mb4_general_ci;
-ALTER TABLE tb_teacher
-    COMMENT = '老师表';
+)ENGINE = InnoDB CHARSET=utf8 COLLATE utf8_general_ci;
+ALTER TABLE tb_teacher COMMENT = '老师表';

 CREATE TABLE tb_log
 (
@@ -89,8 +71,8 @@ CREATE TABLE tb_log
  CONSTRAINT FK_loguser FOREIGN KEY (coluserid) REFERENCES tb_user (coluserid)
 )
    ENGINE = InnoDB
-    CHARSET = utf8mb4
-    COLLATE utf8mb4_general_ci;
+    CHARSET = utf8
+    COLLATE utf8_general_ci;
 ALTER TABLE tb_log
    COMMENT = '日志表';

@@ -103,16 +85,15 @@ CREATE TABLE tb_course
  CONSTRAINT FK_teacherid FOREIGN KEY (teacherid) REFERENCES tb_teacher (teacherid)
 )
    ENGINE = InnoDB
-    CHARSET = utf8mb4
-    COLLATE utf8mb4_general_ci;
-ALTER TABLE tb_course
-    COMMENT = '课程表';
+    CHARSET = utf8
+    COLLATE utf8_general_ci;
+ALTER TABLE tb_course COMMENT = '课程表';

 CREATE TABLE tb_homework
 (
  workId     INT(10) PRIMARY KEY    AUTO_INCREMENT,
  workName   VARCHAR(128) NOT NULL,
-    workTime   VARCHAR(128) NOT NULL,
+  workTime   VARCHAR(128) NOT NULL ,
  colfileid  INT(10),
  workFolder VARCHAR(255) NOT NULL,
  courseNo   INT(10),
@@ -121,10 +102,9 @@ CREATE TABLE tb_homework
  CONSTRAINT FK_courseNo FOREIGN KEY (courseNo) REFERENCES tb_course (courseNo)
 )
  ENGINE = InnoDB
-    CHARSET = utf8mb4
-    COLLATE utf8mb4_general_ci;
-ALTER TABLE tb_homework
-    COMMENT = '作业表';
+  CHARSET = utf8
+  COLLATE utf8_general_ci;
+ALTER TABLE tb_homework COMMENT = '作业表';

 CREATE TABLE tb_workstatus
 (
@@ -136,10 +116,9 @@ CREATE TABLE tb_workstatus
  CONSTRAINT FK_workId FOREIGN KEY (workId) REFERENCES tb_homework (workId)
 )
  ENGINE = InnoDB
-    CHARSET = utf8mb4
-    COLLATE utf8mb4_general_ci;
-ALTER TABLE tb_workstatus
-    COMMENT = '作业提交状态表';
+  CHARSET = utf8
+  COLLATE utf8_general_ci;
+ALTER TABLE tb_workstatus COMMENT = '作业提交状态表';

 CREATE TABLE tb_feedback
 (
@@ -150,10 +129,9 @@ CREATE TABLE tb_feedback
  CONSTRAINT FK_feedbackuser FOREIGN KEY (coluserid) REFERENCES tb_user (coluserid)
 )
  ENGINE = InnoDB
-    CHARSET = utf8mb4
-    COLLATE utf8mb4_general_ci;
-ALTER TABLE tb_workstatus
-    COMMENT = '反馈信息表';
+  CHARSET = utf8
+  COLLATE utf8_general_ci;
+ALTER TABLE tb_workstatus COMMENT = '反馈信息表';

 CREATE TABLE tb_notice
 (
@@ -164,27 +142,15 @@ CREATE TABLE tb_notice
  CONSTRAINT FK_noticeuser FOREIGN KEY (adminid) REFERENCES tb_admin (adminid)
 )
  ENGINE = InnoDB
-    CHARSET = utf8mb4
-    COLLATE utf8mb4_general_ci;
-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 = '用户问题表';
+  CHARSET = utf8
+  COLLATE utf8_general_ci;
+ALTER TABLE tb_workstatus COMMENT = '公告表';


 CREATE VIEW v_workdetail
-AS
-SELECT workId,
+  AS
+    SELECT
+      workId,
      workName,
      workTime,
      f.colfileid,
@@ -192,64 +158,60 @@ SELECT workId,
      c.courseName,
      workRemark,
      h.workFolder
-FROM tb_homework h,
-     tb_course c,
-     tb_file f
-WHERE h.colfileid = f.colfileid
-  AND h.courseNo = c.courseNo;
+    FROM tb_homework h, tb_course c, tb_file f
+    WHERE h.colfileid = f.colfileid AND h.courseNo = c.courseNo;

 CREATE VIEW v_log
-AS
-SELECT logid,
+  AS
+    SELECT
+    logid,
    colname,
-       coltime,
-       colip,
+    coltime   ,
+    colip     ,
    colheader
-FROM tb_log,
-     tb_user
-WHERE tb_user.coluserid = tb_log.coluserid;
+    FROM tb_log,tb_user
+    WHERE tb_user.coluserid = tb_log.coluserid;

 CREATE VIEW v_feedback
-AS
-SELECT feedbackid,
+  AS
+    SELECT
+      feedbackid,
      colname,
      feedbackContent,
      issueTime
-FROM tb_feedback,
-     tb_user
-WHERE tb_user.coluserid = tb_feedback.coluserid;
+    FROM tb_feedback, tb_user
+    WHERE tb_user.coluserid = tb_feedback.coluserid;


 CREATE VIEW v_course
-AS
-SELECT courseNo,
+  AS
+    SELECT
+    courseNo,
    courseName,
    courseTime,
    colrealname,
    colname
-FROM tb_course,
-     tb_teacher,
-     tb_user
-WHERE tb_user.coluserid = tb_teacher.coluserid
-  AND tb_teacher.teacherid = tb_course.teacherid;
+    FROM tb_course, tb_teacher,tb_user
+    WHERE tb_user.coluserid = tb_teacher.coluserid AND tb_teacher.teacherid=tb_course.teacherid;

 CREATE VIEW v_homework
-AS
-SELECT workId,
+  AS
+    SELECT
+      workId,
      workName,
      workTime,
      colfileid,
      workFolder,
      courseName,
      workRemark
-FROM tb_homework,
-     tb_course
-WHERE tb_homework.courseNo = tb_course.courseNo;
+    FROM tb_homework, tb_course
+    WHERE tb_homework.courseNo = tb_course.courseNo;


 CREATE VIEW v_userfile
-AS
-SELECT tb_file.colfileid,
+  AS
+    SELECT
+      colfileid,
      coltime,
      colip,
      colfilename,
@@ -259,31 +221,29 @@ SELECT tb_file.colfileid,
      workFolder,
      tb_user.colrealname,
      colstudentno
-FROM tb_file,
-     tb_user,
-     tb_course,
-     tb_homework
-WHERE tb_user.coluserid = tb_file.coluserid;
+    FROM tb_file, tb_user
+    WHERE tb_user.coluserid = tb_file.coluserid;


 CREATE VIEW v_userinfo
-AS
-SELECT coluserid,
+  AS
+    SELECT
+      coluserid,
      colname,
      colemail,
      colstudentno,
      colrealname
-FROM tb_user;
+    FROM tb_user;


 CREATE VIEW v_userque
-AS
-SELECT tb_user.coluserid,
+  AS
+    SELECT
+      tb_user.coluserid,
      colname,
      colquestion,
      colanswer,
      colrealname
-FROM tb_userque,
-     tb_user
-WHERE tb_user.coluserid = tb_userque.coluserid;
+    FROM tb_userque,tb_user
+    WHERE tb_user.coluserid=tb_userque.coluserid;

--- a/src/main/resources/application-k8s.yml
+++ b/src/main/resources/application-k8s.yml
@@ -11,7 +11,7 @@ server:
    port-header: X-Forwarded-Port
  use-forward-headers: true
 serverproperties:
-  port_num: 80
+  port_num: 8080
  filePath: /www/cmsfile/
 spring:
  thymeleaf:
Author	SHA1	Message	Date
F嘉阳	1d42b06ecb	删除CI	2019-11-27 23:09:57 +08:00
F嘉阳	f57aa21934	readme修复	2019-11-27 23:08:26 +08:00