update

README.MD

@@ -0,0 +1,41 @@
+# Cloud Diary
+
+### 简介
+简洁的日记网站，内容在前端加密，保证了私密性。
+
+### 基本功能
++ 用户注册、登录、找回密码以及邮件确认
++ 查看、新增、修改日记以及日记加密
++ 修改昵称、签名、性别、密码
++ 上传头像、背景图片
+
+### 技术栈
++ 前台：Angular 4
++ 后台：Java 7、Spring Boot、Spring Data、Spring Mail、JJWT、Lombok
++ 数据库：MySQL
++ CI: git、maven、jenkins、nginx、tomcat
+
+### HOW-TO RUN
++ 导入cloud-diary文件夹下面的*.sql初始化数据库
++ 在里J2EE容器配置data source jndi和mail jndi，如果容器没有javax.mail.jar，如tomcat,请下载。
+需要配置的三个JNDI： jdbc/sso jdbc/diary mail/session
+同时还需要修改sso项目配置文件的adminemail值
++ 建立/var/minidiary/文件夹,并创建子文件夹log/和image/，并开放权限是使应用能够访问，作为日志和图片存储路径
++ 在cloud-diary件文件夹下执行
+ ```sh
+        mvn clean install
+```
++ 将SSO和Diary子项目的war包部署到J2EE容器，默认的url请配置为/sso和/diary。
+如需修改，请修改ui项目的配置文件
++ 在Cloud-diary-web-ui/ui 文件夹下执行 （以下命令需要nodejs和angular-cli，如果没有，请先安装）
+```sh
+        npm install
+        ng build --prod
+``` 
+
+
++ 将在Cloud-diary-web-ui/ui/dist文件夹下的所有内容部署到具有http服务器功能的server即可
+### License
+---
+MIT
+

cloud-diary-sso/pom.xml

@@ -69,7 +69,7 @@
    	<dependency>
 		<groupId>com.sun.mail</groupId>
 		<artifactId>javax.mail</artifactId>
-		<scope>provided</scope>
+		<!-- <scope>provided</scope> -->
 	</dependency>
      <dependency>
             <groupId>org.projectlombok</groupId>

cloud-diary-sso/src/main/resources/application-prod.yml

@@ -4,7 +4,7 @@ spring:
   datasource:
     jndi-name: java:/comp/env/jdbc/sso
   mail:
-    jndi-name: java:comp/env/mail/session
+      jndi-name: java:comp/env/mail/session
   jpa:
       hibernate:
         ddl-auto: validate

cloud-diary-web-ui/ui/src/assets/js/air-datepicker/dist/css/datepicker.css

@@ -177,7 +177,7 @@
   font-family: Tahoma, sans-serif;
   font-size: 14px;
   color: #4a4a4a;
-  width: 250px;
+ /*  width: 250px; */
   position: absolute;
   left: -100000px;
   opacity: 0;

diary_ddl.sql

@@ -0,0 +1,78 @@
+-- MySQL dump 10.13  Distrib 5.7.20, for Linux (x86_64)
+--
+-- Host: localhost    Database: diary
+-- ------------------------------------------------------
+-- Server version	5.7.20
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `content`
+--
+
+DROP TABLE IF EXISTS `content`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `content` (
+  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `data` text,
+  `createddate` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=107 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `diary`
+--
+
+DROP TABLE IF EXISTS `diary`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `diary` (
+  `accountid` bigint(20) unsigned NOT NULL,
+  `contentid` bigint(20) unsigned DEFAULT NULL,
+  `year` smallint(5) unsigned NOT NULL,
+  `month` tinyint(3) unsigned NOT NULL,
+  `day` tinyint(3) unsigned NOT NULL,
+  PRIMARY KEY (`day`,`month`,`year`,`accountid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `user`
+--
+
+DROP TABLE IF EXISTS `user`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `user` (
+  `id` bigint(20) NOT NULL,
+  `nickname` varchar(45) NOT NULL,
+  `signature` varchar(1024) DEFAULT NULL,
+  `gender` char(1) DEFAULT NULL,
+  `keycode` varchar(1024) DEFAULT NULL,
+  `image_cover` varchar(50) DEFAULT NULL,
+  `image_headportrait` varchar(512) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2017-12-25 10:39:30

sso_ddl.sql

@@ -0,0 +1,64 @@
+-- MySQL dump 10.13  Distrib 5.7.20, for Linux (x86_64)
+--
+-- Host: localhost    Database: authentication
+-- ------------------------------------------------------
+-- Server version	5.7.20
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `account`
+--
+
+DROP TABLE IF EXISTS `account`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `account` (
+  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `email` varchar(45) DEFAULT NULL,
+  `password` varchar(512) DEFAULT NULL,
+  `salt` varchar(512) DEFAULT NULL,
+  `state` varchar(45) DEFAULT NULL,
+  `createddate` datetime DEFAULT NULL,
+  `lastmodifieddate` datetime(6) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=42 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `audit`
+--
+
+DROP TABLE IF EXISTS `audit`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `audit` (
+  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `accountid` bigint(20) unsigned DEFAULT NULL,
+  `operation` varchar(45) DEFAULT NULL,
+  `verifycode` varchar(128) DEFAULT NULL,
+  `operationdate` datetime(6) DEFAULT NULL,
+  `ip` varchar(45) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=399 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2017-12-25 10:39:51