修改镜像拉取策略

.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

@@ -0,0 +1,11 @@
+FROM harbor.fjy8018.top:8883/library/openjdk:8-jre
+MAINTAINER fjy8018 fjy8018@gmail.com
+
+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
+
+ENTRYPOINT ["java","-jar","/cms-springboot.jar","--spring.profiles.active=k8s"]
+
+EXPOSE 8080

LICENSE

@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.

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

@@ -5,7 +5,7 @@
 
 	<groupId>com.fjy</groupId>
 	<artifactId>spring</artifactId>
-	<version>V2.9.9</version>
+	<version>V2.9.13</version>
 	<packaging>jar</packaging>
 
 	<name>spring</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.RC2</version>
+		<version>2.0.0.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -22,6 +22,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
+        <skipTests>true</skipTests>
 	</properties>
 
 	<dependencies>
@@ -44,7 +45,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
-
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
@@ -73,8 +73,27 @@
 			<artifactId>commons-io</artifactId>
             <version>2.6</version>
 		</dependency>
+        <!--https://github.com/osiegmar/logback-gelf-->
+        <dependency>
+            <groupId>de.siegmar</groupId>
+            <artifactId>logback-gelf</artifactId>
+            <version>2.1.0</version>
+        </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>
@@ -84,44 +103,4 @@
 			</plugin>
 		</plugins>
 	</build>
-
-	<repositories>
-		<repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-	</pluginRepositories>
-
-
 </project>

sql.sql

@@ -1,20 +1,27 @@
-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
 (
-  coluserid    INT(10) PRIMARY KEY NOT NULL AUTO_INCREMENT,
+    coluserid    INT(10) PRIMARY KEY NOT NULL AUTO_INCREMENT,
-  colname      VARCHAR(30)         NOT NULL,
+    colname      VARCHAR(30)         NOT NULL,
-  colpassword  VARCHAR(255)        NOT NULL,
+    colpassword  VARCHAR(255)        NOT NULL,
-  colemail     VARCHAR(30)         NOT NULL,
+    colemail     VARCHAR(30)         NOT NULL,
-  colstudentno VARCHAR(50)         NOT NULL,
+    colstudentno VARCHAR(50)         NOT NULL,
-  colrealname  VARCHAR(20)         NOT NULL
+    colrealname  VARCHAR(20)         NOT NULL
 )
-  ENGINE = InnoDB
+    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,39 +34,50 @@ 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
 (
-  adminid   INT(10) PRIMARY KEY AUTO_INCREMENT,
+    adminid   INT(10) PRIMARY KEY AUTO_INCREMENT,
-  coluserid INT(10),
+    coluserid INT(10),
-  coltime   VARCHAR(128) NOT NULL,
+    coltime   VARCHAR(128) NOT NULL,
-  CONSTRAINT FK_adminuser FOREIGN KEY (coluserid) REFERENCES tb_user (coluserid)
+    CONSTRAINT FK_adminuser FOREIGN KEY (coluserid) REFERENCES tb_user (coluserid)
 )
-  ENGINE = InnoDB
+    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
 (
-    studentid   INT(10) PRIMARY KEY AUTO_INCREMENT,
+    studentid INT(10) PRIMARY KEY AUTO_INCREMENT,
-    coluserid   INT(10),
+    coluserid INT(10),
-    coltime     VARCHAR(128) NOT NULL,
+    coltime   VARCHAR(128) NOT NULL,
-  CONSTRAINT FK_sutdentuser FOREIGN KEY (coluserid) REFERENCES tb_user (coluserid)
+    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
 (
-    teacherid   INT(10) PRIMARY KEY AUTO_INCREMENT,
+    teacherid INT(10) PRIMARY KEY AUTO_INCREMENT,
-    coluserid   INT(10),
+    coluserid INT(10),
-    coltime    VARCHAR(128) NOT NULL,
+    coltime   VARCHAR(128) NOT NULL,
-  CONSTRAINT FK_teacheruser FOREIGN KEY (coluserid) REFERENCES tb_user (coluserid)
+    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
 (
@@ -68,182 +86,204 @@ CREATE TABLE tb_log
     coltime   VARCHAR(128) NOT NULL,
     colip     VARCHAR(128),
     colheader VARCHAR(255),
-  CONSTRAINT FK_loguser FOREIGN KEY (coluserid) REFERENCES tb_user (coluserid)
+    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 = '日志表';
 
 CREATE TABLE tb_course
 (
-    courseNo   INT(10) PRIMARY KEY    AUTO_INCREMENT,
+    courseNo   INT(10) PRIMARY KEY AUTO_INCREMENT,
     courseName VARCHAR(128) NOT NULL,
-    courseTime VARCHAR(128)    NOT NULL,
+    courseTime VARCHAR(128) NOT NULL,
     teacherid  INT(10),
-  CONSTRAINT FK_teacherid FOREIGN KEY (teacherid) REFERENCES tb_teacher (teacherid)
+    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
 (
-  workId     INT(10) PRIMARY KEY    AUTO_INCREMENT,
+    workId     INT(10) PRIMARY KEY AUTO_INCREMENT,
-  workName   VARCHAR(128) NOT NULL,
+    workName   VARCHAR(128) NOT NULL,
-  workTime   VARCHAR(128) NOT NULL ,
+    workTime   VARCHAR(128) NOT NULL,
-  colfileid  INT(10),
+    colfileid  INT(10),
-  workFolder VARCHAR(255) NOT NULL,
+    workFolder VARCHAR(255) NOT NULL,
-  courseNo   INT(10),
+    courseNo   INT(10),
-  workRemark VARCHAR(255),
+    workRemark VARCHAR(255),
-  CONSTRAINT FK_colfileid FOREIGN KEY (colfileid) REFERENCES tb_file (colfileid),
+    CONSTRAINT FK_colfileid FOREIGN KEY (colfileid) REFERENCES tb_file (colfileid),
-  CONSTRAINT FK_courseNo FOREIGN KEY (courseNo) REFERENCES tb_course (courseNo)
+    CONSTRAINT FK_courseNo FOREIGN KEY (courseNo) REFERENCES tb_course (courseNo)
 )
-  ENGINE = InnoDB
+    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
 (
-  statusid  INT(10) PRIMARY KEY    AUTO_INCREMENT,
+    statusid  INT(10) PRIMARY KEY AUTO_INCREMENT,
-  coluserid INT(10),
+    coluserid INT(10),
-  workId    INT(10),
+    workId    INT(10),
-  colstatus INT(10),
+    colstatus INT(10),
-  CONSTRAINT FK_statususer FOREIGN KEY (coluserid) REFERENCES tb_user (coluserid),
+    CONSTRAINT FK_statususer FOREIGN KEY (coluserid) REFERENCES tb_user (coluserid),
-  CONSTRAINT FK_workId FOREIGN KEY (workId) REFERENCES tb_homework (workId)
+    CONSTRAINT FK_workId FOREIGN KEY (workId) REFERENCES tb_homework (workId)
 )
-  ENGINE = InnoDB
+    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
 (
-  feedbackid  INT(10) PRIMARY KEY    AUTO_INCREMENT,
+    feedbackid      INT(10) PRIMARY KEY AUTO_INCREMENT,
-  coluserid INT(10),
+    coluserid       INT(10),
-  feedbackContent    VARCHAR(255),
+    feedbackContent VARCHAR(255),
-  issueTime VARCHAR(128),
+    issueTime       VARCHAR(128),
-  CONSTRAINT FK_feedbackuser FOREIGN KEY (coluserid) REFERENCES tb_user (coluserid)
+    CONSTRAINT FK_feedbackuser FOREIGN KEY (coluserid) REFERENCES tb_user (coluserid)
 )
-  ENGINE = InnoDB
+    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
 (
-  noticeid  INT(10) PRIMARY KEY    AUTO_INCREMENT,
+    noticeid      INT(10) PRIMARY KEY AUTO_INCREMENT,
-  adminid INT(10),
+    adminid       INT(10),
-  noticeContent    VARCHAR(255),
+    noticeContent VARCHAR(255),
-  issueTime VARCHAR(128),
+    issueTime     VARCHAR(128),
-  CONSTRAINT FK_noticeuser FOREIGN KEY (adminid) REFERENCES tb_admin (adminid)
+    CONSTRAINT FK_noticeuser FOREIGN KEY (adminid) REFERENCES tb_admin (adminid)
 )
-  ENGINE = InnoDB
+    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
+AS
-    SELECT
+SELECT workId,
-      workId,
+       workName,
-      workName,
+       workTime,
-      workTime,
+       f.colfileid,
-      f.colfileid,
+       colfilename,
-      colfilename,
+       c.courseName,
-      c.courseName,
+       workRemark,
-      workRemark,
+       h.workFolder
-      h.workFolder
+FROM tb_homework h,
-    FROM tb_homework h, tb_course c, tb_file f
+     tb_course c,
-    WHERE h.colfileid = f.colfileid AND h.courseNo = c.courseNo;
+     tb_file f
+WHERE h.colfileid = f.colfileid
+  AND h.courseNo = c.courseNo;
 
 CREATE VIEW v_log
-  AS
+AS
-    SELECT
+SELECT logid,
-    logid,
+       colname,
-    colname,
+       coltime,
-    coltime   ,
+       colip,
-    colip     ,
+       colheader
-    colheader
+FROM tb_log,
-    FROM tb_log,tb_user
+     tb_user
-    WHERE tb_user.coluserid = tb_log.coluserid;
+WHERE tb_user.coluserid = tb_log.coluserid;
 
 CREATE VIEW v_feedback
-  AS
+AS
-    SELECT
+SELECT feedbackid,
-      feedbackid,
+       colname,
-      colname,
+       feedbackContent,
-      feedbackContent,
+       issueTime
-      issueTime
+FROM tb_feedback,
-    FROM tb_feedback, tb_user
+     tb_user
-    WHERE tb_user.coluserid = tb_feedback.coluserid;
+WHERE tb_user.coluserid = tb_feedback.coluserid;
 
 
 CREATE VIEW v_course
-  AS
+AS
-    SELECT
+SELECT courseNo,
-    courseNo,
+       courseName,
-    courseName,
+       courseTime,
-    courseTime,
+       colrealname,
-    colrealname,
+       colname
-    colname
+FROM tb_course,
-    FROM tb_course, tb_teacher,tb_user
+     tb_teacher,
-    WHERE tb_user.coluserid = tb_teacher.coluserid AND tb_teacher.teacherid=tb_course.teacherid;
+     tb_user
+WHERE tb_user.coluserid = tb_teacher.coluserid
+  AND tb_teacher.teacherid = tb_course.teacherid;
 
 CREATE VIEW v_homework
-  AS
+AS
-    SELECT
+SELECT workId,
-      workId,
+       workName,
-      workName,
+       workTime,
-      workTime,
+       colfileid,
-      colfileid,
+       workFolder,
-      workFolder,
+       courseName,
-      courseName,
+       workRemark
-      workRemark
+FROM tb_homework,
-    FROM tb_homework, tb_course
+     tb_course
-    WHERE tb_homework.courseNo = tb_course.courseNo;
+WHERE tb_homework.courseNo = tb_course.courseNo;
 
 
 CREATE VIEW v_userfile
-  AS
+AS
-    SELECT
+SELECT tb_file.colfileid,
-      colfileid,
+       coltime,
-      coltime,
+       colip,
-      colip,
+       colfilename,
-      colfilename,
+       colfilesize,
-      colfilesize,
+       colfilepath,
-      colfilepath,
+       courseName,
-      courseName,
+       workFolder,
-      workFolder,
+       tb_user.colrealname,
-      tb_user.colrealname,
+       colstudentno
-      colstudentno
+FROM tb_file,
-    FROM tb_file, tb_user
+     tb_user,
-    WHERE tb_user.coluserid = tb_file.coluserid;
+     tb_course,
+     tb_homework
+WHERE tb_user.coluserid = tb_file.coluserid;
 
 
 CREATE VIEW v_userinfo
-  AS
+AS
-    SELECT
+SELECT coluserid,
-      coluserid,
+       colname,
-      colname,
+       colemail,
-      colemail,
+       colstudentno,
-      colstudentno,
+       colrealname
-      colrealname
+FROM tb_user;
-    FROM tb_user;
 
 
 CREATE VIEW v_userque
-  AS
+AS
-    SELECT
+SELECT tb_user.coluserid,
-      tb_user.coluserid,
+       colname,
-      colname,
+       colquestion,
-      colquestion,
+       colanswer,
-      colanswer,
+       colrealname
-      colrealname
+FROM tb_userque,
-    FROM tb_userque,tb_user
+     tb_user
-    WHERE tb_user.coluserid=tb_userque.coluserid;
+WHERE tb_user.coluserid = tb_userque.coluserid;
 

src/main/java/com/fjy/spring/controller/DataController.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigInteger;
+import java.text.Format;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -54,7 +55,17 @@ public class DataController {
 
     @GetMapping("/home/findAllHomework")
     public List<VWorkDetail> findAllHomework() {
-        List<VWorkDetail> homeworks = workDetailService.findAll();
+        Format f = new SimpleDateFormat("yyyy-MM-dd");
+        Date today = new Date();
+
+        Calendar c = Calendar.getInstance();
+        c.setTime(today);
+        // 今天-2天，因为数据库比较是">"号，即不包含当天
+        c.add(Calendar.DAY_OF_MONTH, -2);
+
+        Date yesterday = c.getTime();
+
+        List<VWorkDetail> homeworks = workDetailService.findAllVWorkDetailAfterTime(f.format(yesterday));
         if (homeworks != null) {
             return homeworks;
         }
@@ -99,7 +110,17 @@ public class DataController {
 
     @GetMapping("/home/findallvhomework")
     public List<VHomework> findAllVHomework() {
-        List<VHomework> vHomeworks = homeworkService.findAllVHomework();
+        Format f = new SimpleDateFormat("yyyy-MM-dd");
+        Date today = new Date();
+
+        Calendar c = Calendar.getInstance();
+        c.setTime(today);
+        // 今天-2天，因为数据库比较是">"号，即不包含当天
+        c.add(Calendar.DAY_OF_MONTH, -5);
+
+        Date yesterday = c.getTime();
+
+        List<VHomework> vHomeworks = homeworkService.findAllVHomeworkAfterTime(f.format(yesterday));
         if (vHomeworks != null) {
             return vHomeworks;
         }

src/main/java/com/fjy/spring/domain/VHomework.java

@@ -13,24 +13,24 @@ import javax.persistence.*;
 public class VHomework {
     @Id
     @Column(name = "workid")
-    private Integer Id;
+    private Integer id;
 
     @Column(name = "workname")
-    private String Name;
+    private String name;
 
     @Column(name = "worktime")
-    private String Time;
+    private String time;
 
     @Column(name = "colfileid")
     private Integer fileid;
 
     @Column(name = "workfolder")
-    private String Folder;
+    private String folder;
 
     @Column(name = "coursename")
     private String courseName;
 
     @Column(name = "workremark")
-    private String Remark;
+    private String remark;
 
 }

src/main/java/com/fjy/spring/repository/VHomeworkRepository.java

@@ -3,6 +3,14 @@ package com.fjy.spring.repository;
 import com.fjy.spring.domain.VHomework;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 
 public interface VHomeworkRepository extends JpaRepository<VHomework,Integer> {
+    /**
+     * 找出指定时间之前的所有作业
+     * @param destime
+     * @return
+     */
+    List<VHomework> findAllByTimeAfter(String destime);
 }

src/main/java/com/fjy/spring/repository/WorkDetailRepository.java

@@ -3,5 +3,13 @@ package com.fjy.spring.repository;
 import com.fjy.spring.domain.VWorkDetail;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 public interface WorkDetailRepository extends JpaRepository<VWorkDetail,Integer> {
+    /**
+     * 找出指定时间之前的所有作业详情
+     * @param worktime
+     * @return
+     */
+    List<VWorkDetail> findAllByWorktimeAfter(String worktime);
 }

src/main/java/com/fjy/spring/service/HomeworkService.java

@@ -33,4 +33,8 @@ public class HomeworkService {
         }
         return null;
     }
+
+    public List<VHomework> findAllVHomeworkAfterTime(String time){
+        return vHomeworkRepository.findAllByTimeAfter(time);
+    }
 }

src/main/java/com/fjy/spring/service/WorkDetailService.java

@@ -15,4 +15,8 @@ public class WorkDetailService {
     public List<VWorkDetail> findAll(){
         return workDetailRepository.findAll();
     }
+
+    public List<VWorkDetail> findAllVWorkDetailAfterTime(String time){
+        return workDetailRepository.findAllByWorktimeAfter(time);
+    }
 }

src/main/resources/application-k8s.yml

@@ -0,0 +1,39 @@
+#运行环境配置文件
+server:
+  servlet:
+    context-path: /cms
+    session:
+      timeout: 1440s
+  port: 8080
+  tomcat:
+    remote-ip-header: x-forwarded-for
+    protocol-header: x-forwarded-proto
+    port-header: X-Forwarded-Port
+  use-forward-headers: true
+serverproperties:
+  port_num: 80
+  filePath: /www/cmsfile/
+spring:
+  thymeleaf:
+    prefix: classpath:/templates/
+    cache: true
+    check-template: true
+
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://192.168.1.25/db_imis2?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+    username: imis2
+    password: 2015imis2
+
+  servlet:
+    multipart:
+      max-file-size: 100Mb
+      max-request-size: 100Mb
+
+  jpa:
+    hibernate:
+      ddl-auto: update
+    show-sql: false
+  #resources:
+  #  static-locations: classpath:/templates/
+debug: false

src/main/resources/application.yml

@@ -1,4 +1,4 @@
 #控制配置文件调用
 spring:
   profiles:
-    active: prod
+    active: dev

src/main/resources/logback-spring.xml

@@ -1,60 +1,54 @@
-<?xml version="1.0" encoding="UTF-8" ?>
 <configuration>
 
-    <appender name="consoleLog" class="ch.qos.logback.core.ConsoleAppender">
+    <appender name="GELF" class="de.siegmar.logbackgelf.GelfUdpAppender">
-        <layout class="ch.qos.logback.classic.PatternLayout">
+        <graylogHost>192.168.1.27</graylogHost>
-            <pattern>
+        <graylogPort>12201</graylogPort>
-                %d - %msg%n
+        <maxChunkSize>508</maxChunkSize>
-            </pattern>
+        <useCompression>true</useCompression>
-        </layout>
+        <encoder class="de.siegmar.logbackgelf.GelfEncoder">
+            <includeRawMessage>false</includeRawMessage>
+            <includeMarker>true</includeMarker>
+            <includeMdcData>true</includeMdcData>
+            <includeCallerData>false</includeCallerData>
+            <includeRootCauseData>false</includeRootCauseData>
+            <!--显示日志级别名称，默认为数字-->
+            <includeLevelName>true</includeLevelName>
+            <shortPatternLayout class="ch.qos.logback.classic.PatternLayout">
+                <pattern>%m%nopex</pattern>
+            </shortPatternLayout>
+            <fullPatternLayout class="ch.qos.logback.classic.PatternLayout">
+                <pattern>%m%n</pattern>
+            </fullPatternLayout>
+            <!--配置应用名称-->
+            <staticField>app_name:cms</staticField>
+            <staticField>os_arch:${os.arch}</staticField>
+            <staticField>os_name:${os.name}</staticField>
+            <staticField>os_version:${os.version}</staticField>
+        </encoder>
     </appender>
-    <!--每天输出一个文件，使用RollingFileAppender滚动输出策略-->
-    <appender name="fileInfoLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!--根据范围仅保留info的日志-->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>DENY</onMatch>
-            <onMismatch>ACCEPT</onMismatch>
-        </filter>
-        <encoder>
-            <pattern>
-                %d - %msg%n
-            </pattern>
-            <charset>utf8</charset>
-        </encoder>
-        <!--滚动策略-->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!--路径文件名，文件名包含时间-->
-            <!--<fileNamePattern>F:\JAVA Workspace\Temp\log\%d\info.%d.log</fileNamePattern>-->
-        <fileNamePattern>/www/cmsfile/%d/info.%d.log</fileNamePattern>
-    </rollingPolicy>
-</appender>
 
-<appender name="fileErrorLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <!-- 彩色日志 -->
-    <!--根据范围过滤ERROR等级以下的日志-->
+    <!-- 彩色日志依赖的渲染类 -->
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
-            <level>ERROR</level>
+    <conversionRule conversionWord="wex"
-        </filter>
+                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+    <conversionRule conversionWord="wEx"
+                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+    <!-- Console 输出设置 -->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
-                %d - %msg%n
-            </pattern>
             <charset>utf8</charset>
         </encoder>
-        <!--滚动策略-->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!--路径文件名，文件名包含时间-->
-            <!--<fileNamePattern>F:\JAVA Workspace\Temp\log\error.%d.log</fileNamePattern>-->
-             <fileNamePattern>/www/cmsfile/%d/error.%d.log</fileNamePattern>
-        </rollingPolicy>
     </appender>
 
     <root level="info">
-        <appender-ref ref="consoleLog"/>
+        <!-- 控制台输出 -->
-        <appender-ref ref="fileInfoLog"/>
+        <appender-ref ref="CONSOLE"/>
-        <appender-ref ref="fileErrorLog"/>
+        <appender-ref ref="GELF"/>
     </root>
 
-
-
 </configuration>

src/main/resources/logback-spring.xml.bak

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration>
+
+    <appender name="consoleLog" class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <pattern>
+                %d - %msg%n
+            </pattern>
+        </layout>
+    </appender>
+    <!--每天输出一个文件，使用RollingFileAppender滚动输出策略-->
+    <appender name="fileInfoLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!--根据范围仅保留info的日志-->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>DENY</onMatch>
+            <onMismatch>ACCEPT</onMismatch>
+        </filter>
+        <encoder>
+            <pattern>
+                %d - %msg%n
+            </pattern>
+            <charset>utf8</charset>
+        </encoder>
+        <!--滚动策略-->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--路径文件名，文件名包含时间-->
+            <fileNamePattern>F:\JAVA Workspace\Temp\log\%d\info.%d.log</fileNamePattern>
+        <!--<fileNamePattern>/www/cmsfile/%d/info.%d.log</fileNamePattern>-->
+    </rollingPolicy>
+</appender>
+
+<appender name="fileErrorLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <!--根据范围过滤ERROR等级以下的日志-->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+        <encoder>
+            <pattern>
+                %d - %msg%n
+            </pattern>
+            <charset>utf8</charset>
+        </encoder>
+        <!--滚动策略-->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--路径文件名，文件名包含时间-->
+            <fileNamePattern>F:\JAVA Workspace\Temp\log\error.%d.log</fileNamePattern>
+            <!--<fileNamePattern>/www/cmsfile/%d/error.%d.log</fileNamePattern>-->
+       </rollingPolicy>
+   </appender>
+
+   <root level="info">
+       <appender-ref ref="consoleLog"/>
+       <appender-ref ref="fileInfoLog"/>
+       <appender-ref ref="fileErrorLog"/>
+   </root>
+
+
+
+</configuration>

src/test/java/com/fjy/spring/service/HomeworkServiceTest.java

@@ -0,0 +1,49 @@
+package com.fjy.spring.service;
+
+import com.fjy.spring.domain.VHomework;
+import org.junit.Test;
+
+import java.text.Format;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+public class HomeworkServiceTest {
+
+    @Test
+    public void findAll() {
+    }
+
+    @Test
+    public void findAllVHomework() {
+    }
+
+    @Test
+    public void findById() {
+        Format f = new SimpleDateFormat("yyyy-MM-dd");
+
+        Date today = new Date();
+        System.out.println("今天是:" + f.format(today));
+
+        Calendar c = Calendar.getInstance();
+        c.setTime(today);
+        c.add(Calendar.DAY_OF_MONTH, -1);// 今天+1天
+
+        Date tomorrow = c.getTime();
+        System.out.println("昨天是:" + f.format(tomorrow));
+    }
+
+    @Test
+    public void findAllVHomeworkAfterTime() {
+        HomeworkService homeworkService = new HomeworkService();
+        List<VHomework> homeworkList = homeworkService.findAllVHomeworkAfterTime("2018-05-28");
+        if (homeworkList!=null){
+            for (VHomework vHomework : homeworkList){
+                System.out.println(vHomework.toString());
+            }
+        }
+    }
+}