diff --git a/pom.xml b/pom.xml index adc2526..17a488a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ linfeng-community 3.0.0 jar - 林风社交论坛项目 + 林风社交论坛项目开源版 org.springframework.boot @@ -272,14 +272,6 @@ com.spotify docker-maven-plugin 0.4.14 - - - - - - - - project/fast ${project.basedir} diff --git a/src/main/java/io/linfeng/Applications.java b/src/main/java/io/linfeng/Applications.java index ae39213..b7427cd 100644 --- a/src/main/java/io/linfeng/Applications.java +++ b/src/main/java/io/linfeng/Applications.java @@ -12,19 +12,36 @@ */ package io.linfeng; +import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.ConfigurableApplicationContext; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.transaction.annotation.EnableTransactionManagement; +import org.springframework.core.env.Environment; +import java.net.InetAddress; +import java.net.UnknownHostException; +@Slf4j @EnableAsync @EnableTransactionManagement @SpringBootApplication public class Applications { - public static void main(String[] args) { - SpringApplication.run(Applications.class, args); + public static void main(String[] args) throws UnknownHostException { + ConfigurableApplicationContext application = SpringApplication.run(Applications.class, args); + Environment env = application.getEnvironment(); + log.info("\n----------------------------------------------------------------\n\t" + + "林风社交论坛开源版 '{}' 运行成功! 访问连接:\n\t" + + "Swagger文档: \t\thttp://{}:{}/doc.html\n\t" + + "数据库监控: \t\thttp://{}:{}/druid\n" + + "----------------------------------------------------------------", + env.getProperty("spring.application.name"), + InetAddress.getLocalHost().getHostAddress(), + env.getProperty("server.port"), + "127.0.0.1", + env.getProperty("server.port")); } } \ No newline at end of file diff --git a/src/main/java/io/linfeng/config/SwaggerConfig.java b/src/main/java/io/linfeng/config/SwaggerConfig.java index 75a168e..ac6a99c 100644 --- a/src/main/java/io/linfeng/config/SwaggerConfig.java +++ b/src/main/java/io/linfeng/config/SwaggerConfig.java @@ -47,7 +47,7 @@ public class SwaggerConfig implements WebMvcConfigurer { return new ApiInfoBuilder() .title("林风社交论坛项目接口文档") .description("林风社交论坛项目开源版接口文档 演示地址 https://www.linfeng.tech") - .contact(new Contact("linfeng","http:localhost:8080/doc.html","3582996245@qq.com")) + .contact(new Contact("linfeng","http:localhost:8080/doc.html","linfengtech001@163.com")) .version("1.0") .build(); diff --git a/src/main/java/io/linfeng/modules/admin/controller/SensitiveController.java b/src/main/java/io/linfeng/modules/admin/controller/SensitiveController.java index e862358..a2e720a 100644 --- a/src/main/java/io/linfeng/modules/admin/controller/SensitiveController.java +++ b/src/main/java/io/linfeng/modules/admin/controller/SensitiveController.java @@ -66,16 +66,7 @@ public class SensitiveController { return R.ok().put("sensitive", sensitive); } - /** - * 保存 - */ - @RequestMapping("/save") - @RequiresPermissions("admin:sensitive:save") - public R save(@RequestBody SensitiveEntity sensitive){ - sensitiveService.save(sensitive); - return R.ok(); - } /** * 修改 @@ -88,15 +79,6 @@ public class SensitiveController { return R.ok(); } - /** - * 删除 - */ - @RequestMapping("/delete") - @RequiresPermissions("admin:sensitive:delete") - public R delete(@RequestBody Long[] ids){ - sensitiveService.removeByIds(Arrays.asList(ids)); - return R.ok(); - } } diff --git a/src/main/java/io/linfeng/modules/sys/controller/SysUserController.java b/src/main/java/io/linfeng/modules/sys/controller/SysUserController.java index 0c9bf2e..f575deb 100644 --- a/src/main/java/io/linfeng/modules/sys/controller/SysUserController.java +++ b/src/main/java/io/linfeng/modules/sys/controller/SysUserController.java @@ -69,6 +69,7 @@ public class SysUserController extends AbstractController { @ApiOperation("修改密码") @SysLog("修改密码") @PostMapping("/password") + @RequiresPermissions("sys:user:update") public R password(@RequestBody PasswordForm form){ Assert.isBlank(form.getNewPassword(), "新密码不为能空"); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index bf25b95..d5a13cc 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -9,6 +9,8 @@ server: context-path: spring: + application: + name: linfeng-community-ky # 环境 dev|test|prod profiles: active: dev diff --git a/src/main/resources/banner.txt b/src/main/resources/banner.txt index 1f6a9b6..0228f3e 100644 --- a/src/main/resources/banner.txt +++ b/src/main/resources/banner.txt @@ -1,6 +1,6 @@ =================================================================================================================================== - 欢迎使用林风社交论坛项目开源版后端api - https://www.linfeng.tech + 欢迎使用林风社交论坛项目开源版后端服务 + 演示站点: https://www.linfeng.tech =================================================================================================================================== \ No newline at end of file diff --git a/src/main/resources/static/linfeng-community-uniapp-ky/utils/config.js b/src/main/resources/static/linfeng-community-uniapp-ky/utils/config.js index 7e4a3e4..45d3b8e 100644 --- a/src/main/resources/static/linfeng-community-uniapp-ky/utils/config.js +++ b/src/main/resources/static/linfeng-community-uniapp-ky/utils/config.js @@ -3,12 +3,12 @@ const shareH5Url = "https://www.linfeng.tech/#/"; //H5分享路径 //本地环境配置 -const baseUrl = "localhost:8080"; -const domain = 'http://' + baseUrl + "/app/"; +// const baseUrl = "localhost:8080"; +// const domain = 'http://' + baseUrl + "/app/"; //线上环境配置 -// const baseUrl = "wxapi.linfeng.tech"; -// const domain = 'https://' + baseUrl + "/app/"; +const baseUrl = "wxapi.linfeng.tech"; +const domain = 'https://' + baseUrl + "/app/"; export default {