--
Gitee
From 92aad17c2acf7e7db040ca15d78e5097ca518d18 Mon Sep 17 00:00:00 2001
From: ab <672943942@qq.com>
Date: Wed, 24 Apr 2019 18:22:13 +0800
Subject: [PATCH 13/52] =?UTF-8?q?=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/com/fstack/service/impl/StorageServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/com/fstack/service/impl/StorageServiceImpl.java b/src/main/java/com/fstack/service/impl/StorageServiceImpl.java
index 8abded0..8a11e87 100644
--- a/src/main/java/com/fstack/service/impl/StorageServiceImpl.java
+++ b/src/main/java/com/fstack/service/impl/StorageServiceImpl.java
@@ -72,7 +72,7 @@ public class StorageServiceImpl implements StorageService {
Path resolve = path.resolve(filename);
Files.copy(file.getInputStream(), resolve, StandardCopyOption.REPLACE_EXISTING);
logger.info("Saved file to >> " + resolve);
- return dirname + File.separator + filename;
+ return File.separator + dirname + File.separator + filename;
} catch (IOException e) {
throw new StorageException("Failed to store file " + filename, e);
}
--
Gitee
From 748fc3f8bdddb2ef1003a4111518a0e7eadcbeb0 Mon Sep 17 00:00:00 2001
From: ab <672943942@qq.com>
Date: Wed, 24 Apr 2019 18:49:24 +0800
Subject: [PATCH 14/52] =?UTF-8?q?=E9=9B=86=E6=88=90swagger?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 11 +++++
.../java/com/fstack/config/SwaggerConfig.java | 43 +++++++++++++++++++
src/main/resources/application-dev.properties | 4 +-
src/main/resources/application-pro.properties | 4 +-
4 files changed, 60 insertions(+), 2 deletions(-)
create mode 100644 src/main/java/com/fstack/config/SwaggerConfig.java
diff --git a/pom.xml b/pom.xml
index 88ef2a7..f028a9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,6 +31,7 @@
4.5.8
1.2.57
27.1-jre
+
2.9.2
@@ -126,6 +127,16 @@
guava
${guava.version}
+
+ io.springfox
+ springfox-swagger2
+ ${swagger.version}
+
+
+ io.springfox
+ springfox-swagger-ui
+ ${swagger.version}
+
diff --git a/src/main/java/com/fstack/config/SwaggerConfig.java b/src/main/java/com/fstack/config/SwaggerConfig.java
new file mode 100644
index 0000000..bf23ac5
--- /dev/null
+++ b/src/main/java/com/fstack/config/SwaggerConfig.java
@@ -0,0 +1,43 @@
+package com.fstack.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig {
+
+ @Value("${enable.swagger}")
+ private Boolean enable;
+
+ @Bean
+ public Docket createRestApi() {
+ return new Docket(DocumentationType.SWAGGER_2)
+ .enable(enable)
+ .apiInfo(apiInfo())
+ .select()
+ .apis(RequestHandlerSelectors.basePackage("com.fstack"))
+ .paths(PathSelectors.any())
+ .build();
+ }
+
+ private ApiInfo apiInfo() {
+ return new ApiInfoBuilder()
+ .title("Spring Boot中使用Swagger2构建RESTful API")
+ .description("rest api 文档")
+ .termsOfServiceUrl("https://gitee.com/abj01")
+ .contact(new Contact("ab", "https://gitee.com/abj01", "672943942@qq.com"))
+ .version("1.0.0")
+ .build();
+ }
+}
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index 5c51037..cf23669 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -49,4 +49,6 @@ service.url=http://localhost:8080
# File upload configuration
# ==============================
spring.servlet.multipart.max-file-size=500KB
-spring.servlet.multipart.max-request-size =500KB
\ No newline at end of file
+spring.servlet.multipart.max-request-size =500KB
+
+enable.swagger=true
\ No newline at end of file
diff --git a/src/main/resources/application-pro.properties b/src/main/resources/application-pro.properties
index 032f544..2450a74 100644
--- a/src/main/resources/application-pro.properties
+++ b/src/main/resources/application-pro.properties
@@ -49,4 +49,6 @@ service.url=http://localhost:8080
# File upload configuration
# ==============================
spring.servlet.multipart.max-file-size=500KB
-spring.servlet.multipart.max-request-size =500KB
\ No newline at end of file
+spring.servlet.multipart.max-request-size =500KB
+
+enable.swagger=false
\ No newline at end of file
--
Gitee
From 2ede950db79e7196dbcfdba1fa3dd98637891707 Mon Sep 17 00:00:00 2001
From: ab <672943942@qq.com>
Date: Wed, 24 Apr 2019 18:54:06 +0800
Subject: [PATCH 15/52] =?UTF-8?q?=E9=9B=86=E6=88=90swagger?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/com/fstack/config/StaticResourceConfig.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/main/java/com/fstack/config/StaticResourceConfig.java b/src/main/java/com/fstack/config/StaticResourceConfig.java
index 5996059..ed1f62e 100644
--- a/src/main/java/com/fstack/config/StaticResourceConfig.java
+++ b/src/main/java/com/fstack/config/StaticResourceConfig.java
@@ -20,6 +20,11 @@ public class StaticResourceConfig implements WebMvcConfigurer {
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
+ registry.addResourceHandler("swagger-ui.html")
+ .addResourceLocations("classpath:/META-INF/resources/");
+ registry.addResourceHandler("/webjars/**")
+ .addResourceLocations("classpath:/META-INF/resources/webjars/");
+
String avatarLocation = forumConfigProperties.getDataDirectory() + File.separator;
avatarLocation += (StorageConstant.AVATAR_DIRECTORY_NAME + File.separator);
registry.addResourceHandler("/avatar/**")
--
Gitee
From 0a6dc0ff5d43c60da4b0cc48878e2ee300105144 Mon Sep 17 00:00:00 2001
From: ab <672943942@qq.com>
Date: Wed, 24 Apr 2019 19:50:15 +0800
Subject: [PATCH 16/52] =?UTF-8?q?=E9=9B=86=E6=88=90swagger?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/fstack/config/StaticResourceConfig.java | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/fstack/config/StaticResourceConfig.java b/src/main/java/com/fstack/config/StaticResourceConfig.java
index ed1f62e..ad77987 100644
--- a/src/main/java/com/fstack/config/StaticResourceConfig.java
+++ b/src/main/java/com/fstack/config/StaticResourceConfig.java
@@ -2,6 +2,7 @@ package com.fstack.config;
import com.fstack.constant.StorageConstant;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
@@ -18,12 +19,17 @@ public class StaticResourceConfig implements WebMvcConfigurer {
@Autowired
private FsForumConfigProperties forumConfigProperties;
+ @Value("${enable.swagger}")
+ private Boolean enable;
+
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
- registry.addResourceHandler("swagger-ui.html")
- .addResourceLocations("classpath:/META-INF/resources/");
- registry.addResourceHandler("/webjars/**")
- .addResourceLocations("classpath:/META-INF/resources/webjars/");
+ if (enable) {
+ registry.addResourceHandler("swagger-ui.html")
+ .addResourceLocations("classpath:/META-INF/resources/");
+ registry.addResourceHandler("/webjars/**")
+ .addResourceLocations("classpath:/META-INF/resources/webjars/");
+ }
String avatarLocation = forumConfigProperties.getDataDirectory() + File.separator;
avatarLocation += (StorageConstant.AVATAR_DIRECTORY_NAME + File.separator);
--
Gitee
From 7e75f034079d0678fcfe314767d6b00e1c9ce5cb Mon Sep 17 00:00:00 2001
From: ab <672943942@qq.com>
Date: Wed, 24 Apr 2019 20:20:19 +0800
Subject: [PATCH 17/52] =?UTF-8?q?=E9=9B=86=E6=88=90swagger?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/fstack/config/StaticResourceConfig.java | 13 ++++++++-----
.../com/fstack/constant/StorageConstant.java | 16 ++++++++--------
.../fstack/service/impl/StorageServiceImpl.java | 10 +++++-----
src/main/resources/application.properties | 2 +-
4 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/fstack/config/StaticResourceConfig.java b/src/main/java/com/fstack/config/StaticResourceConfig.java
index ad77987..022c3a7 100644
--- a/src/main/java/com/fstack/config/StaticResourceConfig.java
+++ b/src/main/java/com/fstack/config/StaticResourceConfig.java
@@ -1,6 +1,5 @@
package com.fstack.config;
-import com.fstack.constant.StorageConstant;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
@@ -10,6 +9,8 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import java.io.File;
+import static com.fstack.constant.StorageConstant.*;
+
/**
* @author ab
*/
@@ -31,10 +32,12 @@ public class StaticResourceConfig implements WebMvcConfigurer {
.addResourceLocations("classpath:/META-INF/resources/webjars/");
}
- String avatarLocation = forumConfigProperties.getDataDirectory() + File.separator;
- avatarLocation += (StorageConstant.AVATAR_DIRECTORY_NAME + File.separator);
- registry.addResourceHandler("/avatar/**")
- .addResourceLocations("file:" + avatarLocation);
+ registry.addResourceHandler(AVATAR_DIRECTORY_NAME + "/**")
+ .addResourceLocations("file:"
+ + forumConfigProperties.getDataDirectory() + File.separator
+ + BASE_DIRECTORY_NAME
+ + AVATAR_DIRECTORY_NAME + File.separator
+ );
}
@Override
diff --git a/src/main/java/com/fstack/constant/StorageConstant.java b/src/main/java/com/fstack/constant/StorageConstant.java
index fbfad57..95762f6 100644
--- a/src/main/java/com/fstack/constant/StorageConstant.java
+++ b/src/main/java/com/fstack/constant/StorageConstant.java
@@ -1,22 +1,22 @@
package com.fstack.constant;
-import java.io.File;
/**
* @author Hu Jie
* @date 2019/04/24 1:52 PM
*/
public class StorageConstant {
+ private StorageConstant() {}
+ //default avatar
+ public static final String DEFAULT_AVATAR_FILENAME = "default.jpg";
+ //base path define
+ public static final String BASE_DIRECTORY_NAME = "FsForumData";
- public static final String STORAGE_BASE_DIRECTORY_NAME = "FsForumData";
-
- public static final String IAMGE_DIRECTORY_NAME = STORAGE_BASE_DIRECTORY_NAME + File.separator + "images";
- public static final String AVATAR_DIRECTORY_NAME = STORAGE_BASE_DIRECTORY_NAME + File.separator + "avatar";
+ // some directory define
+ public static final String IAMGE_DIRECTORY_NAME = "/images";
+ public static final String AVATAR_DIRECTORY_NAME = "/avatar";
- public static final String DEFAULT_AVATAR_FILENAME = "default.jpg";
- private StorageConstant() {
- }
}
diff --git a/src/main/java/com/fstack/service/impl/StorageServiceImpl.java b/src/main/java/com/fstack/service/impl/StorageServiceImpl.java
index 8a11e87..17ec046 100644
--- a/src/main/java/com/fstack/service/impl/StorageServiceImpl.java
+++ b/src/main/java/com/fstack/service/impl/StorageServiceImpl.java
@@ -22,7 +22,7 @@ import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
import java.util.Objects;
-import static com.fstack.constant.StorageConstant.STORAGE_BASE_DIRECTORY_NAME;
+import static com.fstack.constant.StorageConstant.*;
@Service("storageService")
public class StorageServiceImpl implements StorageService {
@@ -41,7 +41,7 @@ public class StorageServiceImpl implements StorageService {
* 初始化创建数据目录，配置默认头像
*/
private void init() {
- String avatarDir = forumConfigProperties.getDataDirectory() + File.separator + StorageConstant.AVATAR_DIRECTORY_NAME + File.separator;
+ String avatarDir = forumConfigProperties.getDataDirectory() + File.separator + BASE_DIRECTORY_NAME + AVATAR_DIRECTORY_NAME + File.separator;
Path avatarDirectoryLocation = Paths.get(avatarDir);
try {
if (!Files.exists(avatarDirectoryLocation)) {
@@ -63,7 +63,7 @@ public class StorageServiceImpl implements StorageService {
}
String filename = StringUtils.cleanPath(Objects.requireNonNull(file.getOriginalFilename()));
String basePath = forumConfigProperties.getDataDirectory();
- basePath += File.separator + STORAGE_BASE_DIRECTORY_NAME + File.separator + dirname;
+ basePath += File.separator + BASE_DIRECTORY_NAME + File.separator + dirname;
Path path = Paths.get(basePath);
try {
if (!Files.exists(path)) {
@@ -86,7 +86,7 @@ public class StorageServiceImpl implements StorageService {
String filename = StringUtils.cleanPath(Objects.requireNonNull(file.getOriginalFilename()));
String basePath = forumConfigProperties.getDataDirectory();
- basePath += File.separator + StorageConstant.AVATAR_DIRECTORY_NAME;
+ basePath += File.separator + BASE_DIRECTORY_NAME + AVATAR_DIRECTORY_NAME;
Path avatarLocation = Paths.get(basePath + File.separator + username);
try {
@@ -98,7 +98,7 @@ public class StorageServiceImpl implements StorageService {
Files.copy(file.getInputStream(), resolve, StandardCopyOption.REPLACE_EXISTING);
logger.info("Saved file to >> " + resolve);
- return "/avatar/" + username + "/" + filename;
+ return AVATAR_DIRECTORY_NAME + "/" + username + "/" + filename;
} catch (IOException e) {
throw new StorageException("Failed to store file " + filename, e);
}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 3d78eed..829c07b 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-server.port=8080
+server.port=8081
spring.profiles.active=pro
server.servlet.context-path= /
spring.aop.proxy-target-class=true
--
Gitee
From 2324bce7d0683da4bf3fd3c5f45ad1158fbee499 Mon Sep 17 00:00:00 2001
From: ab <672943942@qq.com>
Date: Wed, 24 Apr 2019 20:26:03 +0800
Subject: [PATCH 18/52] =?UTF-8?q?=E9=9B=86=E6=88=90swagger?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/fstack/service/impl/StorageServiceImpl.java | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/fstack/service/impl/StorageServiceImpl.java b/src/main/java/com/fstack/service/impl/StorageServiceImpl.java
index 17ec046..b0b22be 100644
--- a/src/main/java/com/fstack/service/impl/StorageServiceImpl.java
+++ b/src/main/java/com/fstack/service/impl/StorageServiceImpl.java
@@ -62,8 +62,7 @@ public class StorageServiceImpl implements StorageService {
return null;
}
String filename = StringUtils.cleanPath(Objects.requireNonNull(file.getOriginalFilename()));
- String basePath = forumConfigProperties.getDataDirectory();
- basePath += File.separator + BASE_DIRECTORY_NAME + File.separator + dirname;
+ String basePath = forumConfigProperties.getDataDirectory() + File.separator + BASE_DIRECTORY_NAME + File.separator + dirname;
Path path = Paths.get(basePath);
try {
if (!Files.exists(path)) {
@@ -83,21 +82,16 @@ public class StorageServiceImpl implements StorageService {
if (Objects.isNull(file) || file.isEmpty() || StringUtils.isEmpty(username)) {
return null;
}
-
String filename = StringUtils.cleanPath(Objects.requireNonNull(file.getOriginalFilename()));
- String basePath = forumConfigProperties.getDataDirectory();
- basePath += File.separator + BASE_DIRECTORY_NAME + AVATAR_DIRECTORY_NAME;
+ String basePath = forumConfigProperties.getDataDirectory() + File.separator + BASE_DIRECTORY_NAME + AVATAR_DIRECTORY_NAME;
Path avatarLocation = Paths.get(basePath + File.separator + username);
-
try {
if (!Files.exists(avatarLocation)) {
Files.createDirectories(avatarLocation);
}
-
Path resolve = avatarLocation.resolve(filename);
Files.copy(file.getInputStream(), resolve, StandardCopyOption.REPLACE_EXISTING);
logger.info("Saved file to >> " + resolve);
-
return AVATAR_DIRECTORY_NAME + "/" + username + "/" + filename;
} catch (IOException e) {
throw new StorageException("Failed to store file " + filename, e);
--
Gitee
From f6aeaae795e47d2970baab12dab188f6892edc98 Mon Sep 17 00:00:00 2001
From: ab <672943942@qq.com>
Date: Wed, 24 Apr 2019 20:28:24 +0800
Subject: [PATCH 19/52] =?UTF-8?q?=E8=B7=AF=E5=BE=84=E6=A0=BC=E5=BC=8F?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/application.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 829c07b..3d78eed 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-server.port=8081
+server.port=8080
spring.profiles.active=pro
server.servlet.context-path= /
spring.aop.proxy-target-class=true
--
Gitee
From 2624c1fab038f396be5b5f131bf33c4cf3f378f4 Mon Sep 17 00:00:00 2001
From: Miles <1010933988@qq.com>
Date: Wed, 24 Apr 2019 21:04:24 +0800
Subject: [PATCH 20/52] =?UTF-8?q?=E6=B7=BB=E5=8A=A0vue=E7=9A=84build?=
=?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 1 -
fstackforum-vue/build/build.js | 41 ++++++
fstackforum-vue/build/check-versions.js | 54 ++++++++
fstackforum-vue/build/logo.png | Bin 0 -> 6849 bytes
fstackforum-vue/build/utils.js | 101 ++++++++++++++
fstackforum-vue/build/vue-loader.conf.js | 22 ++++
fstackforum-vue/build/webpack.base.conf.js | 82 ++++++++++++
fstackforum-vue/build/webpack.dev.conf.js | 95 ++++++++++++++
fstackforum-vue/build/webpack.prod.conf.js | 145 +++++++++++++++++++++
9 files changed, 540 insertions(+), 1 deletion(-)
create mode 100644 fstackforum-vue/build/build.js
create mode 100644 fstackforum-vue/build/check-versions.js
create mode 100644 fstackforum-vue/build/logo.png
create mode 100644 fstackforum-vue/build/utils.js
create mode 100644 fstackforum-vue/build/vue-loader.conf.js
create mode 100644 fstackforum-vue/build/webpack.base.conf.js
create mode 100755 fstackforum-vue/build/webpack.dev.conf.js
create mode 100644 fstackforum-vue/build/webpack.prod.conf.js
diff --git a/.gitignore b/.gitignore
index 73d39e4..4e6fd26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,6 @@ target/
### NetBeans ###
nbproject/private/
-build/
nbbuild/
dist/
nbdist/
diff --git a/fstackforum-vue/build/build.js b/fstackforum-vue/build/build.js
new file mode 100644
index 0000000..8f2ad8a
--- /dev/null
+++ b/fstackforum-vue/build/build.js
@@ -0,0 +1,41 @@
+'use strict'
+require('./check-versions')()
+
+process.env.NODE_ENV = 'production'
+
+const ora = require('ora')
+const rm = require('rimraf')
+const path = require('path')
+const chalk = require('chalk')
+const webpack = require('webpack')
+const config = require('../config')
+const webpackConfig = require('./webpack.prod.conf')
+
+const spinner = ora('building for production...')
+spinner.start()
+
+rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
+ if (err) throw err
+ webpack(webpackConfig, (err, stats) => {
+ spinner.stop()
+ if (err) throw err
+ process.stdout.write(stats.toString({
+ colors: true,
+ modules: false,
+ children: false, // If you are using ts-loader, setting this to true will make TypeScript errors show up during build.
+ chunks: false,
+ chunkModules: false
+ }) + '\n\n')
+
+ if (stats.hasErrors()) {
+ console.log(chalk.red(' Build failed with errors.\n'))
+ process.exit(1)
+ }
+
+ console.log(chalk.cyan(' Build complete.\n'))
+ console.log(chalk.yellow(
+ ' Tip: built files are meant to be served over an HTTP server.\n' +
+ ' Opening index.html over file:// won\'t work.\n'
+ ))
+ })
+})
diff --git a/fstackforum-vue/build/check-versions.js b/fstackforum-vue/build/check-versions.js
new file mode 100644
index 0000000..3ef972a
--- /dev/null
+++ b/fstackforum-vue/build/check-versions.js
@@ -0,0 +1,54 @@
+'use strict'
+const chalk = require('chalk')
+const semver = require('semver')
+const packageConfig = require('../package.json')
+const shell = require('shelljs')
+
+function exec (cmd) {
+ return require('child_process').execSync(cmd).toString().trim()
+}
+
+const versionRequirements = [
+ {
+ name: 'node',
+ currentVersion: semver.clean(process.version),
+ versionRequirement: packageConfig.engines.node
+ }
+]
+
+if (shell.which('npm')) {
+ versionRequirements.push({
+ name: 'npm',
+ currentVersion: exec('npm --version'),
+ versionRequirement: packageConfig.engines.npm
+ })
+}
+
+module.exports = function () {
+ const warnings = []
+
+ for (let i = 0; i < versionRequirements.length; i++) {
+ const mod = versionRequirements[i]
+
+ if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) {
+ warnings.push(mod.name + ': ' +
+ chalk.red(mod.currentVersion) + ' should be ' +
+ chalk.green(mod.versionRequirement)
+ )
+ }
+ }
+
+ if (warnings.length) {
+ console.log('')
+ console.log(chalk.yellow('To use this template, you must update following to modules:'))
+ console.log()
+
+ for (let i = 0; i < warnings.length; i++) {
+ const warning = warnings[i]
+ console.log(' ' + warning)
+ }
+
+ console.log()
+ process.exit(1)
+ }
+}
diff --git a/fstackforum-vue/build/logo.png b/fstackforum-vue/build/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3d2503fc2a44b5053b0837ebea6e87a2d339a43
GIT binary patch
literal 6849
zcmaKRcUV(fvo}bjDT-7nLI_nlK}sT_69H+`qzVWDA|yaU?}j417wLi^B1KB1SLsC&
zL0ag7$U(XW5YR7p&Ux?s
P$d4lvMt8C^+TcQu4F
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 {
+ const notifier = require('node-notifier')
+
+ return (severity, errors) => {
+ if (severity !== 'error') return
+
+ const error = errors[0]
+ const filename = error.file && error.file.split('!').pop()
+
+ notifier.notify({
+ title: packageConfig.name,
+ message: severity + ': ' + error.name,
+ subtitle: filename || '',
+ icon: path.join(__dirname, 'logo.png')
+ })
+ }
+}
diff --git a/fstackforum-vue/build/vue-loader.conf.js b/fstackforum-vue/build/vue-loader.conf.js
new file mode 100644
index 0000000..33ed58b
--- /dev/null
+++ b/fstackforum-vue/build/vue-loader.conf.js
@@ -0,0 +1,22 @@
+'use strict'
+const utils = require('./utils')
+const config = require('../config')
+const isProduction = process.env.NODE_ENV === 'production'
+const sourceMapEnabled = isProduction
+ ? config.build.productionSourceMap
+ : config.dev.cssSourceMap
+
+module.exports = {
+ loaders: utils.cssLoaders({
+ sourceMap: sourceMapEnabled,
+ extract: isProduction
+ }),
+ cssSourceMap: sourceMapEnabled,
+ cacheBusting: config.dev.cacheBusting,
+ transformToRequire: {
+ video: ['src', 'poster'],
+ source: 'src',
+ img: 'src',
+ image: 'xlink:href'
+ }
+}
diff --git a/fstackforum-vue/build/webpack.base.conf.js b/fstackforum-vue/build/webpack.base.conf.js
new file mode 100644
index 0000000..a07e683
--- /dev/null
+++ b/fstackforum-vue/build/webpack.base.conf.js
@@ -0,0 +1,82 @@
+'use strict'
+const path = require('path')
+const utils = require('./utils')
+const config = require('../config')
+const vueLoaderConfig = require('./vue-loader.conf')
+
+function resolve (dir) {
+ return path.join(__dirname, '..', dir)
+}
+
+
+
+module.exports = {
+ context: path.resolve(__dirname, '../'),
+ entry: {
+ app: './src/main.js'
+ },
+ output: {
+ path: config.build.assetsRoot,
+ filename: '[name].js',
+ publicPath: process.env.NODE_ENV === 'production'
+ ? config.build.assetsPublicPath
+ : config.dev.assetsPublicPath
+ },
+ resolve: {
+ extensions: ['.js', '.vue', '.json'],
+ alias: {
+ 'vue$': 'vue/dist/vue.esm.js',
+ '@': resolve('src'),
+ }
+ },
+ module: {
+ rules: [
+ {
+ test: /\.vue$/,
+ loader: 'vue-loader',
+ options: vueLoaderConfig
+ },
+ {
+ test: /\.js$/,
+ loader: 'babel-loader',
+ include: [resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client')]
+ },
+ {
+ test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
+ loader: 'url-loader',
+ options: {
+ limit: 10000,
+ name: utils.assetsPath('img/[name].[hash:7].[ext]')
+ }
+ },
+ {
+ test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
+ loader: 'url-loader',
+ options: {
+ limit: 10000,
+ name: utils.assetsPath('media/[name].[hash:7].[ext]')
+ }
+ },
+ {
+ test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
+ loader: 'url-loader',
+ options: {
+ limit: 10000,
+ name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
+ }
+ }
+ ]
+ },
+ node: {
+ // prevent webpack from injecting useless setImmediate polyfill because Vue
+ // source contains it (although only uses it if it's native).
+ setImmediate: false,
+ // prevent webpack from injecting mocks to Node native modules
+ // that does not make sense for the client
+ dgram: 'empty',
+ fs: 'empty',
+ net: 'empty',
+ tls: 'empty',
+ child_process: 'empty'
+ }
+}
diff --git a/fstackforum-vue/build/webpack.dev.conf.js b/fstackforum-vue/build/webpack.dev.conf.js
new file mode 100755
index 0000000..070ae22
--- /dev/null
+++ b/fstackforum-vue/build/webpack.dev.conf.js
@@ -0,0 +1,95 @@
+'use strict'
+const utils = require('./utils')
+const webpack = require('webpack')
+const config = require('../config')
+const merge = require('webpack-merge')
+const path = require('path')
+const baseWebpackConfig = require('./webpack.base.conf')
+const CopyWebpackPlugin = require('copy-webpack-plugin')
+const HtmlWebpackPlugin = require('html-webpack-plugin')
+const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
+const portfinder = require('portfinder')
+
+const HOST = process.env.HOST
+const PORT = process.env.PORT && Number(process.env.PORT)
+
+const devWebpackConfig = merge(baseWebpackConfig, {
+ module: {
+ rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true })
+ },
+ // cheap-module-eval-source-map is faster for development
+ devtool: config.dev.devtool,
+
+ // these devServer options should be customized in /config/index.js
+ devServer: {
+ clientLogLevel: 'warning',
+ historyApiFallback: {
+ rewrites: [
+ { from: /.*/, to: path.posix.join(config.dev.assetsPublicPath, 'index.html') },
+ ],
+ },
+ hot: true,
+ contentBase: false, // since we use CopyWebpackPlugin.
+ compress: true,
+ host: HOST || config.dev.host,
+ port: PORT || config.dev.port,
+ open: config.dev.autoOpenBrowser,
+ overlay: config.dev.errorOverlay
+ ? { warnings: false, errors: true }
+ : false,
+ publicPath: config.dev.assetsPublicPath,
+ proxy: config.dev.proxyTable,
+ quiet: true, // necessary for FriendlyErrorsPlugin
+ watchOptions: {
+ poll: config.dev.poll,
+ }
+ },
+ plugins: [
+ new webpack.DefinePlugin({
+ 'process.env': require('../config/dev.env')
+ }),
+ new webpack.HotModuleReplacementPlugin(),
+ new webpack.NamedModulesPlugin(), // HMR shows correct file names in console on update.
+ new webpack.NoEmitOnErrorsPlugin(),
+ // https://github.com/ampedandwired/html-webpack-plugin
+ new HtmlWebpackPlugin({
+ filename: 'index.html',
+ template: 'index.html',
+ inject: true
+ }),
+ // copy custom static assets
+ new CopyWebpackPlugin([
+ {
+ from: path.resolve(__dirname, '../static'),
+ to: config.dev.assetsSubDirectory,
+ ignore: ['.*']
+ }
+ ])
+ ]
+})
+
+module.exports = new Promise((resolve, reject) => {
+ portfinder.basePort = process.env.PORT || config.dev.port
+ portfinder.getPort((err, port) => {
+ if (err) {
+ reject(err)
+ } else {
+ // publish the new Port, necessary for e2e tests
+ process.env.PORT = port
+ // add port to devServer config
+ devWebpackConfig.devServer.port = port
+
+ // Add FriendlyErrorsPlugin
+ devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({
+ compilationSuccessInfo: {
+ messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`],
+ },
+ onErrors: config.dev.notifyOnErrors
+ ? utils.createNotifierCallback()
+ : undefined
+ }))
+
+ resolve(devWebpackConfig)
+ }
+ })
+})
diff --git a/fstackforum-vue/build/webpack.prod.conf.js b/fstackforum-vue/build/webpack.prod.conf.js
new file mode 100644
index 0000000..d9f99f6
--- /dev/null
+++ b/fstackforum-vue/build/webpack.prod.conf.js
@@ -0,0 +1,145 @@
+'use strict'
+const path = require('path')
+const utils = require('./utils')
+const webpack = require('webpack')
+const config = require('../config')
+const merge = require('webpack-merge')
+const baseWebpackConfig = require('./webpack.base.conf')
+const CopyWebpackPlugin = require('copy-webpack-plugin')
+const HtmlWebpackPlugin = require('html-webpack-plugin')
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
+const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
+const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
+
+const env = require('../config/prod.env')
+
+const webpackConfig = merge(baseWebpackConfig, {
+ module: {
+ rules: utils.styleLoaders({
+ sourceMap: config.build.productionSourceMap,
+ extract: true,
+ usePostCSS: true
+ })
+ },
+ devtool: config.build.productionSourceMap ? config.build.devtool : false,
+ output: {
+ path: config.build.assetsRoot,
+ filename: utils.assetsPath('js/[name].[chunkhash].js'),
+ chunkFilename: utils.assetsPath('js/[id].[chunkhash].js')
+ },
+ plugins: [
+ // http://vuejs.github.io/vue-loader/en/workflow/production.html
+ new webpack.DefinePlugin({
+ 'process.env': env
+ }),
+ new UglifyJsPlugin({
+ uglifyOptions: {
+ compress: {
+ warnings: false
+ }
+ },
+ sourceMap: config.build.productionSourceMap,
+ parallel: true
+ }),
+ // extract css into its own file
+ new ExtractTextPlugin({
+ filename: utils.assetsPath('css/[name].[contenthash].css'),
+ // Setting the following option to `false` will not extract CSS from codesplit chunks.
+ // Their CSS will instead be inserted dynamically with style-loader when the codesplit chunk has been loaded by webpack.
+ // It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`,
+ // increasing file size: https://github.com/vuejs-templates/webpack/issues/1110
+ allChunks: true,
+ }),
+ // Compress extracted CSS. We are using this plugin so that possible
+ // duplicated CSS from different components can be deduped.
+ new OptimizeCSSPlugin({
+ cssProcessorOptions: config.build.productionSourceMap
+ ? { safe: true, map: { inline: false } }
+ : { safe: true }
+ }),
+ // generate dist index.html with correct asset hash for caching.
+ // you can customize output by editing /index.html
+ // see https://github.com/ampedandwired/html-webpack-plugin
+ new HtmlWebpackPlugin({
+ filename: config.build.index,
+ template: 'index.html',
+ inject: true,
+ minify: {
+ removeComments: true,
+ collapseWhitespace: true,
+ removeAttributeQuotes: true
+ // more options:
+ // https://github.com/kangax/html-minifier#options-quick-reference
+ },
+ // necessary to consistently work with multiple chunks via CommonsChunkPlugin
+ chunksSortMode: 'dependency'
+ }),
+ // keep module.id stable when vendor modules does not change
+ new webpack.HashedModuleIdsPlugin(),
+ // enable scope hoisting
+ new webpack.optimize.ModuleConcatenationPlugin(),
+ // split vendor js into its own file
+ new webpack.optimize.CommonsChunkPlugin({
+ name: 'vendor',
+ minChunks (module) {
+ // any required modules inside node_modules are extracted to vendor
+ return (
+ module.resource &&
+ /\.js$/.test(module.resource) &&
+ module.resource.indexOf(
+ path.join(__dirname, '../node_modules')
+ ) === 0
+ )
+ }
+ }),
+ // extract webpack runtime and module manifest to its own file in order to
+ // prevent vendor hash from being updated whenever app bundle is updated
+ new webpack.optimize.CommonsChunkPlugin({
+ name: 'manifest',
+ minChunks: Infinity
+ }),
+ // This instance extracts shared chunks from code splitted chunks and bundles them
+ // in a separate chunk, similar to the vendor chunk
+ // see: https://webpack.js.org/plugins/commons-chunk-plugin/#extra-async-commons-chunk
+ new webpack.optimize.CommonsChunkPlugin({
+ name: 'app',
+ async: 'vendor-async',
+ children: true,
+ minChunks: 3
+ }),
+
+ // copy custom static assets
+ new CopyWebpackPlugin([
+ {
+ from: path.resolve(__dirname, '../static'),
+ to: config.build.assetsSubDirectory,
+ ignore: ['.*']
+ }
+ ])
+ ]
+})
+
+if (config.build.productionGzip) {
+ const CompressionWebpackPlugin = require('compression-webpack-plugin')
+
+ webpackConfig.plugins.push(
+ new CompressionWebpackPlugin({
+ asset: '[path].gz[query]',
+ algorithm: 'gzip',
+ test: new RegExp(
+ '\\.(' +
+ config.build.productionGzipExtensions.join('|') +
+ ')$'
+ ),
+ threshold: 10240,
+ minRatio: 0.8
+ })
+ )
+}
+
+if (config.build.bundleAnalyzerReport) {
+ const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
+ webpackConfig.plugins.push(new BundleAnalyzerPlugin())
+}
+
+module.exports = webpackConfig
--
Gitee
From 53242bf88a8f77726d3a6881e73a739378e3f52f Mon Sep 17 00:00:00 2001
From: Miles <1010933988@qq.com>
Date: Wed, 24 Apr 2019 21:55:29 +0800
Subject: [PATCH 21/52] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=90=8E=E7=AB=AF?=
=?UTF-8?q?=E5=90=AF=E5=8A=A8=E7=AB=AF=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/application-dev.properties | 2 +-
src/main/resources/application.properties | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index cf23669..dab59dd 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -43,7 +43,7 @@ spring.mail.properties.mail.smtp.starttls.required=true
# ==============================
# service base URL for confirmation link
# ==============================
-service.url=http://localhost:8080
+service.url=http://localhost:8090
# ==============================
# File upload configuration
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 3d78eed..3304f4a 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-server.port=8080
+server.port=8090
spring.profiles.active=pro
server.servlet.context-path= /
spring.aop.proxy-target-class=true
--
Gitee
From c59fc5603a4206bd0d9790025bcae6b5618df0a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Thu, 25 Apr 2019 08:34:29 +0800
Subject: [PATCH 22/52] file normal
---
src/main/java/com/fstack/service/impl/StorageServiceImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/fstack/service/impl/StorageServiceImpl.java b/src/main/java/com/fstack/service/impl/StorageServiceImpl.java
index b0b22be..0505102 100644
--- a/src/main/java/com/fstack/service/impl/StorageServiceImpl.java
+++ b/src/main/java/com/fstack/service/impl/StorageServiceImpl.java
@@ -71,7 +71,7 @@ public class StorageServiceImpl implements StorageService {
Path resolve = path.resolve(filename);
Files.copy(file.getInputStream(), resolve, StandardCopyOption.REPLACE_EXISTING);
logger.info("Saved file to >> " + resolve);
- return File.separator + dirname + File.separator + filename;
+ return "/" + dirname + "/" + filename;
} catch (IOException e) {
throw new StorageException("Failed to store file " + filename, e);
}
@@ -91,7 +91,7 @@ public class StorageServiceImpl implements StorageService {
}
Path resolve = avatarLocation.resolve(filename);
Files.copy(file.getInputStream(), resolve, StandardCopyOption.REPLACE_EXISTING);
- logger.info("Saved file to >> " + resolve);
+ logger.info("Saved avatar to >> " + resolve);
return AVATAR_DIRECTORY_NAME + "/" + username + "/" + filename;
} catch (IOException e) {
throw new StorageException("Failed to store file " + filename, e);
--
Gitee
From de86942dffece0f7e642d769a3c6b9660a3bed0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Thu, 25 Apr 2019 08:57:20 +0800
Subject: [PATCH 23/52] hikari cp
---
src/main/resources/application-pro.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/resources/application-pro.properties b/src/main/resources/application-pro.properties
index 2450a74..69dbc5c 100644
--- a/src/main/resources/application-pro.properties
+++ b/src/main/resources/application-pro.properties
@@ -9,7 +9,7 @@ spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.minimum-idle=5
spring.datasource.hikari.maximum-pool-size=15
spring.datasource.hikari.auto-commit=true
-spring.datasource.hikari.idle-timeout=60000
+spring.datasource.hikari.idle-timeout=600000
spring.datasource.hikari.pool-name=fang
spring.datasource.hikari.max-lifetime=1800000
spring.datasource.hikari.connection-timeout=30000
--
Gitee
From 3a903748eb56a7fad406ad0e55fc9ba3bbb40239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Thu, 25 Apr 2019 09:09:23 +0800
Subject: [PATCH 24/52] hikari cp bug fixed
---
src/main/resources/application-pro.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/application-pro.properties b/src/main/resources/application-pro.properties
index 69dbc5c..45e7c05 100644
--- a/src/main/resources/application-pro.properties
+++ b/src/main/resources/application-pro.properties
@@ -10,8 +10,8 @@ spring.datasource.hikari.minimum-idle=5
spring.datasource.hikari.maximum-pool-size=15
spring.datasource.hikari.auto-commit=true
spring.datasource.hikari.idle-timeout=600000
-spring.datasource.hikari.pool-name=fang
-spring.datasource.hikari.max-lifetime=1800000
+spring.datasource.hikari.pool-name=ab01
+spring.datasource.hikari.max-lifetime=700000
spring.datasource.hikari.connection-timeout=30000
spring.datasource.hikari.connection-test-query=SELECT 1
--
Gitee
From 8a72571156ebe93df121a01acdd1bae955f61b0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Fri, 26 Apr 2019 08:45:56 +0800
Subject: [PATCH 25/52] swagger permit
---
.../java/com/fstack/config/security/WebSecurityConfig.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/main/java/com/fstack/config/security/WebSecurityConfig.java b/src/main/java/com/fstack/config/security/WebSecurityConfig.java
index 740afad..b3ede4b 100644
--- a/src/main/java/com/fstack/config/security/WebSecurityConfig.java
+++ b/src/main/java/com/fstack/config/security/WebSecurityConfig.java
@@ -48,6 +48,9 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
@Override
protected void configure(HttpSecurity http) throws Exception {
http.csrf().disable().authorizeRequests()
+ // swagger be allowed to be viewed without authentication
+ .antMatchers("/swagger-ui.html", "/swagger-resources/**",
+ "/v2/api-docs", "/webjars/**" ).permitAll()
// all static resource and home page
.antMatchers("/", "/avatar/**", "/", "/js/**", "/css/**", "/images/**", "/fonts/**", "/bootstrap-select/**",
"/bootstrap-datetimepicker/**", "/custom/**", "/daterangepicker/**", "/chartjs/**").permitAll()
--
Gitee
From 7c7fe7d4167b1cf20351b5a21fa02ca32350c71d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Fri, 26 Apr 2019 08:50:19 +0800
Subject: [PATCH 26/52] registration permit
---
.../config/security/WebSecurityConfig.java | 2 ++
.../fstack/web/controller/UserController.java | 17 +++++++++--------
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/fstack/config/security/WebSecurityConfig.java b/src/main/java/com/fstack/config/security/WebSecurityConfig.java
index b3ede4b..3eda8e2 100644
--- a/src/main/java/com/fstack/config/security/WebSecurityConfig.java
+++ b/src/main/java/com/fstack/config/security/WebSecurityConfig.java
@@ -58,6 +58,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
.antMatchers("/post/**").permitAll()
// all categories are allowed to be viewed without authentication
.antMatchers("/category/**").permitAll()
+ // user registration be allowed to be viewed without authentication
+ .antMatchers("/user/registration").permitAll()
.anyRequest().authenticated()
// login URL can be accessed by anyone
.and()
diff --git a/src/main/java/com/fstack/web/controller/UserController.java b/src/main/java/com/fstack/web/controller/UserController.java
index 21f08a7..362c9d5 100644
--- a/src/main/java/com/fstack/web/controller/UserController.java
+++ b/src/main/java/com/fstack/web/controller/UserController.java
@@ -25,6 +25,7 @@ import com.fstack.web.dto.UserRegistrationDto;
import com.fstack.web.dto.UserSettingsDto;
@Controller
+@RequestMapping("/user")
public class UserController {
private static final Logger logger = LoggerFactory.getLogger(UserController.class);
@@ -35,7 +36,7 @@ public class UserController {
@Autowired
private NewUserFormValidator userValidator;
- @RequestMapping(value = "/user/{userId}", method = RequestMethod.GET)
+ @RequestMapping(value = "/{userId}", method = RequestMethod.GET)
public String showUserProfilePage(@RequestParam(value = "tab", required = false) String tabType,
@PathVariable Long userId, Model model) {
if (null == userId) {
@@ -49,13 +50,13 @@ public class UserController {
return "forum/user-profile";
}
- @RequestMapping(value = "/user/registration", method = RequestMethod.GET)
+ @RequestMapping(value = "/registration", method = RequestMethod.GET)
public String showRegistrationPage(Model model) {
model.addAttribute("userDto", new UserRegistrationDto());
return "forum/user-registration";
}
- @RequestMapping(value = "/user/registration", method = RequestMethod.POST)
+ @RequestMapping(value = "/registration", method = RequestMethod.POST)
public String registerNewUser(@Valid @ModelAttribute("userDto") UserRegistrationDto userDto,
BindingResult bindingResult, Model model, HttpServletRequest request) {
/*
@@ -74,18 +75,18 @@ public class UserController {
return "forum/user-registration-result";
}
- @RequestMapping(value = "/user/login", method = RequestMethod.GET)
+ @RequestMapping(value = "/login", method = RequestMethod.GET)
public String displayLoginPage(Model model) {
model.addAttribute("title", "用户登录");
return "forum/user-login";
}
- @RequestMapping(value = "/user/login-success", method = RequestMethod.GET)
+ @RequestMapping(value = "/login-success", method = RequestMethod.GET)
public String showAdminPage() {
return "forum/user-login";
}
- @RequestMapping(value = "/user/registration-confirm", method = RequestMethod.GET)
+ @RequestMapping(value = "/registration-confirm", method = RequestMethod.GET)
public String confirmRegistration(@RequestParam("token") String token, Model model) {
if (null == token || token.equals("")) {
throw new BadRequestException("Invalid user registration confirmation token.");
@@ -98,7 +99,7 @@ public class UserController {
return "forum/user-registration-confirm";
}
- @RequestMapping(value = "/user/settings", method = RequestMethod.GET)
+ @RequestMapping(value = "/settings", method = RequestMethod.GET)
public String showUserSettingsPage(Model model) {
Map attributes = this.userService.getUserSettingPage();
if (null == attributes) {
@@ -108,7 +109,7 @@ public class UserController {
return "forum/user-settings";
}
- @RequestMapping(value = "/user/settings", method = RequestMethod.POST)
+ @RequestMapping(value = "/settings", method = RequestMethod.POST)
public String handleFileUpload(@ModelAttribute("userSettingsDto") UserSettingsDto userSettingsDto, Model model) {
if (null == userSettingsDto) {
throw new BadRequestException("UserSettingsDto cound not be null.");
--
Gitee
From 8a7bb7d58ab67910492cbd7b9be411cd2a97c79c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Fri, 26 Apr 2019 09:01:01 +0800
Subject: [PATCH 27/52] pro swagger enabled true
---
.../fstack/web/controller/UserController.java | 188 +++++++++---------
src/main/resources/application-pro.properties | 2 +-
2 files changed, 96 insertions(+), 94 deletions(-)
diff --git a/src/main/java/com/fstack/web/controller/UserController.java b/src/main/java/com/fstack/web/controller/UserController.java
index 362c9d5..ab3af45 100644
--- a/src/main/java/com/fstack/web/controller/UserController.java
+++ b/src/main/java/com/fstack/web/controller/UserController.java
@@ -5,6 +5,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
+import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,98 +29,99 @@ import com.fstack.web.dto.UserSettingsDto;
@RequestMapping("/user")
public class UserController {
- private static final Logger logger = LoggerFactory.getLogger(UserController.class);
-
- @Autowired
- private UserService userService;
-
- @Autowired
- private NewUserFormValidator userValidator;
-
- @RequestMapping(value = "/{userId}", method = RequestMethod.GET)
- public String showUserProfilePage(@RequestParam(value = "tab", required = false) String tabType,
- @PathVariable Long userId, Model model) {
- if (null == userId) {
- throw new BadRequestException("Path variable userId cound not be null.");
- }
- Map attributes = this.userService.getUserProfileAndPostsByUserIdByTabType(userId, tabType);
- if (null == attributes) {
- throw new ResourceNotFoundException("attributes not found.");
- }
- model.addAllAttributes(attributes);
- return "forum/user-profile";
- }
-
- @RequestMapping(value = "/registration", method = RequestMethod.GET)
- public String showRegistrationPage(Model model) {
- model.addAttribute("userDto", new UserRegistrationDto());
- return "forum/user-registration";
- }
-
- @RequestMapping(value = "/registration", method = RequestMethod.POST)
- public String registerNewUser(@Valid @ModelAttribute("userDto") UserRegistrationDto userDto,
- BindingResult bindingResult, Model model, HttpServletRequest request) {
- /*
- * form validation, check username and email uniqueness
- */
- this.userValidator.validate(userDto, bindingResult);
- if (bindingResult.hasErrors()) {
- logger.info("BindingResult has errors >> " + bindingResult.getFieldError());
- return "forum/user-registration";
- }
- Map attributes = this.userService.registerUserAccount(userDto, request);
- if (null == attributes) {
- throw new ResourceNotFoundException("attributes not found.");
- }
- model.addAllAttributes(attributes);
- return "forum/user-registration-result";
- }
-
- @RequestMapping(value = "/login", method = RequestMethod.GET)
- public String displayLoginPage(Model model) {
- model.addAttribute("title", "用户登录");
- return "forum/user-login";
- }
-
- @RequestMapping(value = "/login-success", method = RequestMethod.GET)
- public String showAdminPage() {
- return "forum/user-login";
- }
-
- @RequestMapping(value = "/registration-confirm", method = RequestMethod.GET)
- public String confirmRegistration(@RequestParam("token") String token, Model model) {
- if (null == token || token.equals("")) {
- throw new BadRequestException("Invalid user registration confirmation token.");
- }
- Map attributes = this.userService.confirmUserRegistrationWithToken(token);
- if (null == attributes) {
- throw new ResourceNotFoundException("attributes not found.");
- }
- model.addAllAttributes(attributes);
- return "forum/user-registration-confirm";
- }
-
- @RequestMapping(value = "/settings", method = RequestMethod.GET)
- public String showUserSettingsPage(Model model) {
- Map attributes = this.userService.getUserSettingPage();
- if (null == attributes) {
- throw new ResourceNotFoundException("attributes not found.");
- }
- model.addAllAttributes(attributes);
- return "forum/user-settings";
- }
-
- @RequestMapping(value = "/settings", method = RequestMethod.POST)
- public String handleFileUpload(@ModelAttribute("userSettingsDto") UserSettingsDto userSettingsDto, Model model) {
- if (null == userSettingsDto) {
- throw new BadRequestException("UserSettingsDto cound not be null.");
- }
- Map attributes = this.userService.updateUserProfile(userSettingsDto);
- if (null == attributes) {
- throw new ResourceNotFoundException("attributes not found.");
- }
- model.addAllAttributes(attributes);
- return "forum/user-settings";
- }
+ private static final Logger logger = LoggerFactory.getLogger(UserController.class);
+
+ @Autowired
+ private UserService userService;
+
+ @Autowired
+ private NewUserFormValidator userValidator;
+
+ @ApiOperation("获取用户信息")
+ @RequestMapping(value = "/{userId}", method = RequestMethod.GET)
+ public String showUserProfilePage(@RequestParam(value = "tab", required = false) String tabType,
+ @PathVariable Long userId, Model model) {
+ if (null == userId) {
+ throw new BadRequestException("Path variable userId cound not be null.");
+ }
+ Map attributes = this.userService.getUserProfileAndPostsByUserIdByTabType(userId, tabType);
+ if (null == attributes) {
+ throw new ResourceNotFoundException("attributes not found.");
+ }
+ model.addAllAttributes(attributes);
+ return "forum/user-profile";
+ }
+
+ @RequestMapping(value = "/registration", method = RequestMethod.GET)
+ public String showRegistrationPage(Model model) {
+ model.addAttribute("userDto", new UserRegistrationDto());
+ return "forum/user-registration";
+ }
+
+ @RequestMapping(value = "/registration", method = RequestMethod.POST)
+ public String registerNewUser(@Valid @ModelAttribute("userDto") UserRegistrationDto userDto,
+ BindingResult bindingResult, Model model, HttpServletRequest request) {
+ /*
+ * form validation, check username and email uniqueness
+ */
+ this.userValidator.validate(userDto, bindingResult);
+ if (bindingResult.hasErrors()) {
+ logger.info("BindingResult has errors >> " + bindingResult.getFieldError());
+ return "forum/user-registration";
+ }
+ Map attributes = this.userService.registerUserAccount(userDto, request);
+ if (null == attributes) {
+ throw new ResourceNotFoundException("attributes not found.");
+ }
+ model.addAllAttributes(attributes);
+ return "forum/user-registration-result";
+ }
+
+ @RequestMapping(value = "/login", method = RequestMethod.GET)
+ public String displayLoginPage(Model model) {
+ model.addAttribute("title", "用户登录");
+ return "forum/user-login";
+ }
+
+ @RequestMapping(value = "/login-success", method = RequestMethod.GET)
+ public String showAdminPage() {
+ return "forum/user-login";
+ }
+
+ @RequestMapping(value = "/registration-confirm", method = RequestMethod.GET)
+ public String confirmRegistration(@RequestParam("token") String token, Model model) {
+ if (null == token || token.equals("")) {
+ throw new BadRequestException("Invalid user registration confirmation token.");
+ }
+ Map attributes = this.userService.confirmUserRegistrationWithToken(token);
+ if (null == attributes) {
+ throw new ResourceNotFoundException("attributes not found.");
+ }
+ model.addAllAttributes(attributes);
+ return "forum/user-registration-confirm";
+ }
+
+ @RequestMapping(value = "/settings", method = RequestMethod.GET)
+ public String showUserSettingsPage(Model model) {
+ Map attributes = this.userService.getUserSettingPage();
+ if (null == attributes) {
+ throw new ResourceNotFoundException("attributes not found.");
+ }
+ model.addAllAttributes(attributes);
+ return "forum/user-settings";
+ }
+
+ @RequestMapping(value = "/settings", method = RequestMethod.POST)
+ public String handleFileUpload(@ModelAttribute("userSettingsDto") UserSettingsDto userSettingsDto, Model model) {
+ if (null == userSettingsDto) {
+ throw new BadRequestException("UserSettingsDto cound not be null.");
+ }
+ Map attributes = this.userService.updateUserProfile(userSettingsDto);
+ if (null == attributes) {
+ throw new ResourceNotFoundException("attributes not found.");
+ }
+ model.addAllAttributes(attributes);
+ return "forum/user-settings";
+ }
}
diff --git a/src/main/resources/application-pro.properties b/src/main/resources/application-pro.properties
index 45e7c05..39077dd 100644
--- a/src/main/resources/application-pro.properties
+++ b/src/main/resources/application-pro.properties
@@ -51,4 +51,4 @@ service.url=http://localhost:8080
spring.servlet.multipart.max-file-size=500KB
spring.servlet.multipart.max-request-size =500KB
-enable.swagger=false
\ No newline at end of file
+enable.swagger=true
\ No newline at end of file
--
Gitee
From 4fa5460e7b3005a2987564c291e2b71fd1c644da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Fri, 26 Apr 2019 09:02:58 +0800
Subject: [PATCH 28/52] description
---
src/main/java/com/fstack/config/SwaggerConfig.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/fstack/config/SwaggerConfig.java b/src/main/java/com/fstack/config/SwaggerConfig.java
index bf23ac5..031ad8a 100644
--- a/src/main/java/com/fstack/config/SwaggerConfig.java
+++ b/src/main/java/com/fstack/config/SwaggerConfig.java
@@ -33,8 +33,8 @@ public class SwaggerConfig {
private ApiInfo apiInfo() {
return new ApiInfoBuilder()
- .title("Spring Boot中使用Swagger2构建RESTful API")
- .description("rest api 文档")
+ .title("给菜鸡看的文档")
+ .description("金太阳幼儿园三班专属")
.termsOfServiceUrl("https://gitee.com/abj01")
.contact(new Contact("ab", "https://gitee.com/abj01", "672943942@qq.com"))
.version("1.0.0")
--
Gitee
From b4025f15c1e6846711dfb41ca045633f780d1d6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Fri, 26 Apr 2019 09:04:07 +0800
Subject: [PATCH 29/52] swagger description
---
src/main/java/com/fstack/config/SwaggerConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/com/fstack/config/SwaggerConfig.java b/src/main/java/com/fstack/config/SwaggerConfig.java
index 031ad8a..c2a46f2 100644
--- a/src/main/java/com/fstack/config/SwaggerConfig.java
+++ b/src/main/java/com/fstack/config/SwaggerConfig.java
@@ -37,7 +37,7 @@ public class SwaggerConfig {
.description("金太阳幼儿园三班专属")
.termsOfServiceUrl("https://gitee.com/abj01")
.contact(new Contact("ab", "https://gitee.com/abj01", "672943942@qq.com"))
- .version("1.0.0")
+ .version("6.6.6")
.build();
}
}
--
Gitee
From fae3cba49caa870ee300f8908a4bdf641faf1e24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Fri, 26 Apr 2019 09:06:03 +0800
Subject: [PATCH 30/52] swagger description
---
src/main/java/com/fstack/web/controller/UserController.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/main/java/com/fstack/web/controller/UserController.java b/src/main/java/com/fstack/web/controller/UserController.java
index ab3af45..fafd63d 100644
--- a/src/main/java/com/fstack/web/controller/UserController.java
+++ b/src/main/java/com/fstack/web/controller/UserController.java
@@ -5,6 +5,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -25,6 +26,7 @@ import com.fstack.validator.NewUserFormValidator;
import com.fstack.web.dto.UserRegistrationDto;
import com.fstack.web.dto.UserSettingsDto;
+@Api(value = "UserController", description = "用户管理")
@Controller
@RequestMapping("/user")
public class UserController {
--
Gitee
From 0853ab9f9e5068344b47e732ee72288b3f1530ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Mon, 1 Jul 2019 15:44:49 +0800
Subject: [PATCH 31/52] swagger description
---
src/main/resources/application-dev.properties | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index dab59dd..f595da9 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -2,9 +2,9 @@
# MySQL connection config
# ==============================
spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://localhost:3306/forum?serverTimezone=GMT&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+spring.datasource.url = jdbc:mysql://192.168.1.130:3306/forum?serverTimezone=GMT&useSSL=false&useUnicode=true&characterEncoding=UTF-8
spring.datasource.username = root
-spring.datasource.password = root
+spring.datasource.password = 902db98ee7f45aae
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.minimum-idle=5
spring.datasource.hikari.maximum-pool-size=15
@@ -19,7 +19,7 @@ spring.datasource.hikari.connection-test-query=SELECT 1
# Redis configuration
# ==============================
spring.redis.database=0
-spring.redis.host=192.168.1.129
+spring.redis.host=192.168.1.130
spring.redis.port=6379
spring.redis.password=kaixin
spring.redis.timeout=5000ms
--
Gitee
From 4f1da2f01e5721812c1e8178cd33aeca3249e6db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Mon, 1 Jul 2019 15:48:58 +0800
Subject: [PATCH 32/52] swagger description
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index f819a0f..cccc480 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# 菜鸡论坛
+# 私人论坛
### Backend 后端
- Spring Boot 2.1.4
--
Gitee
From 57d1d38798bd54331e96af527f6b9d9cb2498b9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Mon, 1 Jul 2019 15:50:29 +0800
Subject: [PATCH 33/52] =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/application-pro.properties | 54 -------------------
1 file changed, 54 deletions(-)
diff --git a/src/main/resources/application-pro.properties b/src/main/resources/application-pro.properties
index 39077dd..e69de29 100644
--- a/src/main/resources/application-pro.properties
+++ b/src/main/resources/application-pro.properties
@@ -1,54 +0,0 @@
-# ==============================
-# MySQL connection config
-# ==============================
-spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://www.polysys.cn:13306/fs_forum?serverTimezone=GMT&useSSL=false&useUnicode=true&characterEncoding=UTF-8
-spring.datasource.username = fstack
-spring.datasource.password = fstack
-spring.datasource.type=com.zaxxer.hikari.HikariDataSource
-spring.datasource.hikari.minimum-idle=5
-spring.datasource.hikari.maximum-pool-size=15
-spring.datasource.hikari.auto-commit=true
-spring.datasource.hikari.idle-timeout=600000
-spring.datasource.hikari.pool-name=ab01
-spring.datasource.hikari.max-lifetime=700000
-spring.datasource.hikari.connection-timeout=30000
-spring.datasource.hikari.connection-test-query=SELECT 1
-
-# ==============================
-# Redis configuration
-# ==============================
-spring.redis.database=0
-spring.redis.host=www.polysys.cn
-spring.redis.port=16161
-spring.redis.password=fstack
-spring.redis.timeout=5000ms
-spring.redis.lettuce.pool.max-idle=10
-spring.redis.lettuce.pool.min-idle=5
-spring.redis.lettuce.pool.max-active=20
-spring.redis.lettuce.pool.max-wait=-1ms
-
-# ==============================
-# SMTP Email
-# ==============================
-spring.mail.default-encoding=UTF-8
-spring.mail.host = smtp.qq.com
-spring.mail.username = 672943942@qq.com
-# \u6388\u6743\u7801\u4E0D\u662F\u771F\u5B9E\u5BC6\u7801
-spring.mail.password = 123456
-spring.mail.properties.mail.smtp.auth=true
-spring.mail.properties.mail.smtp.starttls.enable=true
-spring.mail.properties.mail.smtp.starttls.required=true
-
-# ==============================
-# service base URL for confirmation link
-# ==============================
-service.url=http://localhost:8080
-
-# ==============================
-# File upload configuration
-# ==============================
-spring.servlet.multipart.max-file-size=500KB
-spring.servlet.multipart.max-request-size =500KB
-
-enable.swagger=true
\ No newline at end of file
--
Gitee
From 503f4e08bf3eed0bc8d66ae0ac2e194b8a181ee8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Mon, 1 Jul 2019 15:51:40 +0800
Subject: [PATCH 34/52] =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/com/fstack/service/impl/PostServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/com/fstack/service/impl/PostServiceImpl.java b/src/main/java/com/fstack/service/impl/PostServiceImpl.java
index d9f260d..582ae7f 100644
--- a/src/main/java/com/fstack/service/impl/PostServiceImpl.java
+++ b/src/main/java/com/fstack/service/impl/PostServiceImpl.java
@@ -27,7 +27,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-@Service("postService")
+@Service
@Transactional
public class PostServiceImpl implements PostService {
--
Gitee
From 9635dce2e9689770551555ccb1e5663f505f4e92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Mon, 1 Jul 2019 15:58:35 +0800
Subject: [PATCH 35/52] =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/application-dev.properties | 6 +++---
src/main/resources/application.properties | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index f595da9..62b872d 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -2,9 +2,9 @@
# MySQL connection config
# ==============================
spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://192.168.1.130:3306/forum?serverTimezone=GMT&useSSL=false&useUnicode=true&characterEncoding=UTF-8
-spring.datasource.username = root
-spring.datasource.password = 902db98ee7f45aae
+spring.datasource.url = jdbc:mysql://192.168.1.130:3306/fangrong?serverTimezone=GMT&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+spring.datasource.username = fangrong
+spring.datasource.password = GsWJAHJtNc2R85xx
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.minimum-idle=5
spring.datasource.hikari.maximum-pool-size=15
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 3304f4a..6562132 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,5 +1,5 @@
-server.port=8090
-spring.profiles.active=pro
+server.port=9999
+spring.profiles.active=dev
server.servlet.context-path= /
spring.aop.proxy-target-class=true
# ==============================
--
Gitee
From 4fedcb8728a499f200d2a85250b9b9db71dca6d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Mon, 1 Jul 2019 16:21:51 +0800
Subject: [PATCH 36/52] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E4=BB=A5IT?=
=?UTF-8?q?=E5=BC=80=E5=A4=B4=E7=9A=84=E8=87=AA=E5=8A=A8=E6=BF=80=E6=B4=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/com/fstack/service/impl/UserServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/com/fstack/service/impl/UserServiceImpl.java b/src/main/java/com/fstack/service/impl/UserServiceImpl.java
index 42ca29e..7587345 100644
--- a/src/main/java/com/fstack/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/fstack/service/impl/UserServiceImpl.java
@@ -161,7 +161,7 @@ public class UserServiceImpl implements UserService {
user.setDateCreated(new Timestamp(System.currentTimeMillis()));
user.activated(false);
user.setRoles(User.USER);
-
+ if (userDto.getUsername().startsWith("IT")) user.setActivated(1L);
// save new user and get number of affected row
int affectedRow = userMapper.save(user);
--
Gitee
From c8768696e081ccd518f0118aa1129c2b49fc24c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Mon, 1 Jul 2019 16:23:19 +0800
Subject: [PATCH 37/52] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E4=BB=A5IT?=
=?UTF-8?q?=E5=BC=80=E5=A4=B4=E7=9A=84=E8=87=AA=E5=8A=A8=E6=BF=80=E6=B4=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/com/fstack/service/impl/UserServiceImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/fstack/service/impl/UserServiceImpl.java b/src/main/java/com/fstack/service/impl/UserServiceImpl.java
index 7587345..0d9a84f 100644
--- a/src/main/java/com/fstack/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/fstack/service/impl/UserServiceImpl.java
@@ -159,9 +159,9 @@ public class UserServiceImpl implements UserService {
user.setUsername(userDto.getUsername());
user.setEmail(userDto.getEmail());
user.setDateCreated(new Timestamp(System.currentTimeMillis()));
- user.activated(false);
user.setRoles(User.USER);
- if (userDto.getUsername().startsWith("IT")) user.setActivated(1L);
+ if (userDto.getUsername().startsWith("IT")) user.activated(true);
+ else user.activated(false);
// save new user and get number of affected row
int affectedRow = userMapper.save(user);
--
Gitee
From 893316350bef2cea06d811ddc8e33ee223f41054 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Mon, 1 Jul 2019 17:28:26 +0800
Subject: [PATCH 38/52] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=88=9D=E5=A7=8B?=
=?UTF-8?q?=E5=8C=96=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/com/fstack/service/impl/PostServiceImpl.java | 2 +-
.../java/com/fstack/service/impl/StorageServiceImpl.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/fstack/service/impl/PostServiceImpl.java b/src/main/java/com/fstack/service/impl/PostServiceImpl.java
index 582ae7f..d9f260d 100644
--- a/src/main/java/com/fstack/service/impl/PostServiceImpl.java
+++ b/src/main/java/com/fstack/service/impl/PostServiceImpl.java
@@ -27,7 +27,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-@Service
+@Service("postService")
@Transactional
public class PostServiceImpl implements PostService {
diff --git a/src/main/java/com/fstack/service/impl/StorageServiceImpl.java b/src/main/java/com/fstack/service/impl/StorageServiceImpl.java
index 0505102..d2499ef 100644
--- a/src/main/java/com/fstack/service/impl/StorageServiceImpl.java
+++ b/src/main/java/com/fstack/service/impl/StorageServiceImpl.java
@@ -47,10 +47,10 @@ public class StorageServiceImpl implements StorageService {
if (!Files.exists(avatarDirectoryLocation)) {
Files.createDirectories(avatarDirectoryLocation);
}
- Path resolve = avatarDirectoryLocation.resolve(StorageConstant.DEFAULT_AVATAR_FILENAME);
+ /*Path resolve = avatarDirectoryLocation.resolve(StorageConstant.DEFAULT_AVATAR_FILENAME);
URL defaultAvatarUrl = ResourceUtils.getURL("classpath:static/" + StorageConstant.DEFAULT_AVATAR_FILENAME);
- Files.copy(Paths.get(defaultAvatarUrl.toURI()), resolve, StandardCopyOption.REPLACE_EXISTING);
- } catch (IOException | URISyntaxException e) {
+ Files.copy(Paths.get(defaultAvatarUrl.toURI()), resolve, StandardCopyOption.REPLACE_EXISTING);*/
+ } catch (IOException e) {
e.printStackTrace();
}
--
Gitee
From af005563137a13b075bafec068c53ae7e5cb446e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Mon, 1 Jul 2019 17:32:36 +0800
Subject: [PATCH 39/52] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=88=9D=E5=A7=8B?=
=?UTF-8?q?=E5=8C=96=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/application-dev.properties | 2 +-
src/main/resources/application.properties | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index 62b872d..ab138b4 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -2,7 +2,7 @@
# MySQL connection config
# ==============================
spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://192.168.1.130:3306/fangrong?serverTimezone=GMT&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+spring.datasource.url = jdbc:mysql://127.0.0.1:3306/fangrong?serverTimezone=GMT&useSSL=false&useUnicode=true&characterEncoding=UTF-8
spring.datasource.username = fangrong
spring.datasource.password = GsWJAHJtNc2R85xx
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 6562132..3673d60 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,6 +1,6 @@
server.port=9999
spring.profiles.active=dev
-server.servlet.context-path= /
+server.servlet.context-path= /forum
spring.aop.proxy-target-class=true
# ==============================
# MyBatis configuration
--
Gitee
From 6583d5cdacc683c35a9ad55f624d00c601b11498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Mon, 1 Jul 2019 17:37:35 +0800
Subject: [PATCH 40/52] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=A0=B9=E8=B7=AF?=
=?UTF-8?q?=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/application.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 3673d60..6562132 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,6 +1,6 @@
server.port=9999
spring.profiles.active=dev
-server.servlet.context-path= /forum
+server.servlet.context-path= /
spring.aop.proxy-target-class=true
# ==============================
# MyBatis configuration
--
Gitee
From ca3ec506c50f7c5e3e71b18c63959f659ea16db3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Mon, 1 Jul 2019 17:47:25 +0800
Subject: [PATCH 41/52] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=AC=E5=9C=B0?=
=?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/application-dev.properties | 2 +-
.../resources/application-local.properties | 54 +++++++++++++++++++
src/main/resources/application-pro.properties | 0
3 files changed, 55 insertions(+), 1 deletion(-)
create mode 100644 src/main/resources/application-local.properties
delete mode 100644 src/main/resources/application-pro.properties
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index ab138b4..62b872d 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -2,7 +2,7 @@
# MySQL connection config
# ==============================
spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://127.0.0.1:3306/fangrong?serverTimezone=GMT&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+spring.datasource.url = jdbc:mysql://192.168.1.130:3306/fangrong?serverTimezone=GMT&useSSL=false&useUnicode=true&characterEncoding=UTF-8
spring.datasource.username = fangrong
spring.datasource.password = GsWJAHJtNc2R85xx
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties
new file mode 100644
index 0000000..ab138b4
--- /dev/null
+++ b/src/main/resources/application-local.properties
@@ -0,0 +1,54 @@
+# ==============================
+# MySQL connection config
+# ==============================
+spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
+spring.datasource.url = jdbc:mysql://127.0.0.1:3306/fangrong?serverTimezone=GMT&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+spring.datasource.username = fangrong
+spring.datasource.password = GsWJAHJtNc2R85xx
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.hikari.minimum-idle=5
+spring.datasource.hikari.maximum-pool-size=15
+spring.datasource.hikari.auto-commit=true
+spring.datasource.hikari.idle-timeout=60000
+spring.datasource.hikari.pool-name=fang
+spring.datasource.hikari.max-lifetime=1800000
+spring.datasource.hikari.connection-timeout=30000
+spring.datasource.hikari.connection-test-query=SELECT 1
+
+# ==============================
+# Redis configuration
+# ==============================
+spring.redis.database=0
+spring.redis.host=192.168.1.130
+spring.redis.port=6379
+spring.redis.password=kaixin
+spring.redis.timeout=5000ms
+spring.redis.lettuce.pool.max-idle=10
+spring.redis.lettuce.pool.min-idle=5
+spring.redis.lettuce.pool.max-active=20
+spring.redis.lettuce.pool.max-wait=-1ms
+
+# ==============================
+# SMTP Email
+# ==============================
+spring.mail.default-encoding=UTF-8
+spring.mail.host = smtp.qq.com
+spring.mail.username = 672943942@qq.com
+# \u6388\u6743\u7801\u4E0D\u662F\u771F\u5B9E\u5BC6\u7801
+spring.mail.password = 123456
+spring.mail.properties.mail.smtp.auth=true
+spring.mail.properties.mail.smtp.starttls.enable=true
+spring.mail.properties.mail.smtp.starttls.required=true
+
+# ==============================
+# service base URL for confirmation link
+# ==============================
+service.url=http://localhost:8090
+
+# ==============================
+# File upload configuration
+# ==============================
+spring.servlet.multipart.max-file-size=500KB
+spring.servlet.multipart.max-request-size =500KB
+
+enable.swagger=true
\ No newline at end of file
diff --git a/src/main/resources/application-pro.properties b/src/main/resources/application-pro.properties
deleted file mode 100644
index e69de29..0000000
--
Gitee
From 9ffd8dd8a7320273a8cea365245472dfed1ab30c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Wed, 3 Jul 2019 08:02:48 +0800
Subject: [PATCH 42/52] =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/application-dev.properties | 2 +-
src/main/resources/application-local.properties | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index 62b872d..ab138b4 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -2,7 +2,7 @@
# MySQL connection config
# ==============================
spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://192.168.1.130:3306/fangrong?serverTimezone=GMT&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+spring.datasource.url = jdbc:mysql://127.0.0.1:3306/fangrong?serverTimezone=GMT&useSSL=false&useUnicode=true&characterEncoding=UTF-8
spring.datasource.username = fangrong
spring.datasource.password = GsWJAHJtNc2R85xx
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties
index ab138b4..24af4b5 100644
--- a/src/main/resources/application-local.properties
+++ b/src/main/resources/application-local.properties
@@ -3,8 +3,8 @@
# ==============================
spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://127.0.0.1:3306/fangrong?serverTimezone=GMT&useSSL=false&useUnicode=true&characterEncoding=UTF-8
-spring.datasource.username = fangrong
-spring.datasource.password = GsWJAHJtNc2R85xx
+spring.datasource.username = root
+spring.datasource.password = root
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.minimum-idle=5
spring.datasource.hikari.maximum-pool-size=15
--
Gitee
From 2179eb310d1a4bb52268013aab560005b7b09d58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Wed, 3 Jul 2019 08:04:53 +0800
Subject: [PATCH 43/52] =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f028a9d..6f5bf70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
com.fstack
FStackForum
- 0.0.1-SNAPSHOT
+ 1.0.0
jar
FStackForum
--
Gitee
From 00fdeca2e09cf8772738cd00a43b58f829740ebe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Wed, 3 Jul 2019 08:39:01 +0800
Subject: [PATCH 44/52] =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/application-local.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties
index 24af4b5..a35c7d6 100644
--- a/src/main/resources/application-local.properties
+++ b/src/main/resources/application-local.properties
@@ -2,7 +2,7 @@
# MySQL connection config
# ==============================
spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://127.0.0.1:3306/fangrong?serverTimezone=GMT&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+spring.datasource.url = jdbc:mysql://192.168.1.204:3306/forum?serverTimezone=GMT&useSSL=false&useUnicode=true&characterEncoding=UTF-8
spring.datasource.username = root
spring.datasource.password = root
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
--
Gitee
From bbe896f0ee9cb1cbdb843c13ca4cacac75da3979 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Wed, 3 Jul 2019 08:40:14 +0800
Subject: [PATCH 45/52] =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/application.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 6562132..3c1d377 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,5 +1,5 @@
server.port=9999
-spring.profiles.active=dev
+spring.profiles.active=local
server.servlet.context-path= /
spring.aop.proxy-target-class=true
# ==============================
--
Gitee
From 068058c2750a4613cd46a190d0aa9070e32f7496 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Wed, 3 Jul 2019 09:18:58 +0800
Subject: [PATCH 46/52] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/com/fstack/event/RegistrationListener.java | 4 ++--
src/main/resources/application-dev.properties | 9 ++++-----
src/main/resources/application-local.properties | 9 ++++-----
3 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/fstack/event/RegistrationListener.java b/src/main/java/com/fstack/event/RegistrationListener.java
index b5e3918..9c61c67 100644
--- a/src/main/java/com/fstack/event/RegistrationListener.java
+++ b/src/main/java/com/fstack/event/RegistrationListener.java
@@ -21,9 +21,9 @@ import java.util.UUID;
@Component
public class RegistrationListener implements ApplicationListener {
- private static final String VERIFICATION_EMAIL_FROM_ADDR = "672943942@qq.com";
+ private static final String VERIFICATION_EMAIL_FROM_ADDR = "look7788ab@163.com";
- private static final String VERIFICATION_EMAIL_SUBJECT = "用户注册确认";
+ private static final String VERIFICATION_EMAIL_SUBJECT = "私人论坛用户注册确认";
private static final String CONFIRM_ENDPOINT = "registration-confirm";
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index ab138b4..3035dff 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -32,10 +32,9 @@ spring.redis.lettuce.pool.max-wait=-1ms
# SMTP Email
# ==============================
spring.mail.default-encoding=UTF-8
-spring.mail.host = smtp.qq.com
-spring.mail.username = 672943942@qq.com
-# \u6388\u6743\u7801\u4E0D\u662F\u771F\u5B9E\u5BC6\u7801
-spring.mail.password = 123456
+spring.mail.host = smtp.163.com
+spring.mail.username = look7788ab@163.com
+spring.mail.password = ab7788look
spring.mail.properties.mail.smtp.auth=true
spring.mail.properties.mail.smtp.starttls.enable=true
spring.mail.properties.mail.smtp.starttls.required=true
@@ -43,7 +42,7 @@ spring.mail.properties.mail.smtp.starttls.required=true
# ==============================
# service base URL for confirmation link
# ==============================
-service.url=http://localhost:8090
+service.url=http://192.168.1.130:9999
# ==============================
# File upload configuration
diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties
index a35c7d6..99bca4e 100644
--- a/src/main/resources/application-local.properties
+++ b/src/main/resources/application-local.properties
@@ -32,10 +32,9 @@ spring.redis.lettuce.pool.max-wait=-1ms
# SMTP Email
# ==============================
spring.mail.default-encoding=UTF-8
-spring.mail.host = smtp.qq.com
-spring.mail.username = 672943942@qq.com
-# \u6388\u6743\u7801\u4E0D\u662F\u771F\u5B9E\u5BC6\u7801
-spring.mail.password = 123456
+spring.mail.host = smtp.163.com
+spring.mail.username = look7788ab@163.com
+spring.mail.password = ab7788look
spring.mail.properties.mail.smtp.auth=true
spring.mail.properties.mail.smtp.starttls.enable=true
spring.mail.properties.mail.smtp.starttls.required=true
@@ -43,7 +42,7 @@ spring.mail.properties.mail.smtp.starttls.required=true
# ==============================
# service base URL for confirmation link
# ==============================
-service.url=http://localhost:8090
+service.url=http://192.168.1.204:9999
# ==============================
# File upload configuration
--
Gitee
From 793cf011b061e3fa1a9b31c551598dab082c6d6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Wed, 3 Jul 2019 09:33:08 +0800
Subject: [PATCH 47/52] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E9=AA=8C=E8=AF=81?=
=?UTF-8?q?=E6=BF=80=E6=B4=BB=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/com/fstack/config/security/WebSecurityConfig.java | 1 +
src/main/resources/application-dev.properties | 2 +-
src/main/resources/application-local.properties | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/fstack/config/security/WebSecurityConfig.java b/src/main/java/com/fstack/config/security/WebSecurityConfig.java
index 3eda8e2..723c955 100644
--- a/src/main/java/com/fstack/config/security/WebSecurityConfig.java
+++ b/src/main/java/com/fstack/config/security/WebSecurityConfig.java
@@ -60,6 +60,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
.antMatchers("/category/**").permitAll()
// user registration be allowed to be viewed without authentication
.antMatchers("/user/registration").permitAll()
+ .antMatchers("/user/registration-confirm").permitAll()
.anyRequest().authenticated()
// login URL can be accessed by anyone
.and()
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index 3035dff..cf0bb0b 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -34,7 +34,7 @@ spring.redis.lettuce.pool.max-wait=-1ms
spring.mail.default-encoding=UTF-8
spring.mail.host = smtp.163.com
spring.mail.username = look7788ab@163.com
-spring.mail.password = ab7788look
+spring.mail.password = look7788ab
spring.mail.properties.mail.smtp.auth=true
spring.mail.properties.mail.smtp.starttls.enable=true
spring.mail.properties.mail.smtp.starttls.required=true
diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties
index 99bca4e..7c9960f 100644
--- a/src/main/resources/application-local.properties
+++ b/src/main/resources/application-local.properties
@@ -34,7 +34,7 @@ spring.redis.lettuce.pool.max-wait=-1ms
spring.mail.default-encoding=UTF-8
spring.mail.host = smtp.163.com
spring.mail.username = look7788ab@163.com
-spring.mail.password = ab7788look
+spring.mail.password = look7788ab
spring.mail.properties.mail.smtp.auth=true
spring.mail.properties.mail.smtp.starttls.enable=true
spring.mail.properties.mail.smtp.starttls.required=true
--
Gitee
From 0eb931b5b604ceca0e29f0a380591959c222a9d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Wed, 3 Jul 2019 09:50:53 +0800
Subject: [PATCH 48/52] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E9=AA=8C=E8=AF=81?=
=?UTF-8?q?=E6=BF=80=E6=B4=BB=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resources/templates/forum/user-registration-result.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/resources/templates/forum/user-registration-result.html b/src/main/resources/templates/forum/user-registration-result.html
index e103e96..9dd9712 100644
--- a/src/main/resources/templates/forum/user-registration-result.html
+++ b/src/main/resources/templates/forum/user-registration-result.html
@@ -15,7 +15,7 @@
- 注册成功。
+ 注册成功,请及时去邮箱激活您的账号。
--
Gitee
From ab58b8b5785ff2c6baf4590ace43bd63508eabe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Wed, 3 Jul 2019 09:54:06 +0800
Subject: [PATCH 49/52] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E9=AA=8C=E8=AF=81?=
=?UTF-8?q?=E6=BF=80=E6=B4=BB=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/com/fstack/event/RegistrationListener.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/main/java/com/fstack/event/RegistrationListener.java b/src/main/java/com/fstack/event/RegistrationListener.java
index 9c61c67..b21b80f 100644
--- a/src/main/java/com/fstack/event/RegistrationListener.java
+++ b/src/main/java/com/fstack/event/RegistrationListener.java
@@ -66,10 +66,8 @@ public class RegistrationListener implements ApplicationListener
> " + confirmationLink);
email.setFrom(VERIFICATION_EMAIL_FROM_ADDR);
email.setSubject(VERIFICATION_EMAIL_SUBJECT);
- email.setText(confirmationLink);
+ email.setText("请及时激活您的账号，该链接24小时内有效===> " + confirmationLink);
email.setTo(user.getEmail());
- // TODO: 2019/4/18
- // send email asynchronously
this.emailService.sendEmail(email);
}
}
--
Gitee
From cfde694aa1f938401c854d8125fe08defb839653 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com>
Date: Wed, 3 Jul 2019 10:20:48 +0800
Subject: [PATCH 50/52] =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/templates/forum/home.html | 8 ++++----
src/main/resources/templates/forum/new-post.html | 4 ++--
src/main/resources/templates/forum/post.html | 8 ++++----
src/main/resources/templates/forum/user-login.html | 8 ++++----
src/main/resources/templates/forum/user-profile.html | 4 ++--
.../templates/forum/user-registration-confirm.html | 8 ++++----
.../templates/forum/user-registration-result.html | 8 ++++----
src/main/resources/templates/forum/user-registration.html | 8 ++++----
src/main/resources/templates/forum/user-settings.html | 4 ++--
src/main/resources/templates/fragments/footer.html | 2 +-
10 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/src/main/resources/templates/forum/home.html b/src/main/resources/templates/forum/home.html
index e0b9333..033c0c6 100644
--- a/src/main/resources/templates/forum/home.html
+++ b/src/main/resources/templates/forum/home.html
@@ -22,12 +22,12 @@
快速发帖
-
消息1
-
消息内容1
+
广告位1
+
详情请联系管理员:)
-
消息2
-
消息内容2
+
广告位2
+
672943942@qq.com
diff --git a/src/main/resources/templates/forum/new-post.html b/src/main/resources/templates/forum/new-post.html
index 9d2465f..76fa8fd 100644
--- a/src/main/resources/templates/forum/new-post.html
+++ b/src/main/resources/templates/forum/new-post.html
@@ -45,8 +45,8 @@
+