diff --git a/sop-website/website-server/.gitignore b/sop-website/.gitignore similarity index 100% rename from sop-website/website-server/.gitignore rename to sop-website/.gitignore diff --git a/sop-website/pom.xml b/sop-website/pom.xml index 2d165a63..c2067ee7 100644 --- a/sop-website/pom.xml +++ b/sop-website/pom.xml @@ -1,14 +1,81 @@ - - 4.0.0 - com.gitee.sop - sop-website - 1.0.0-SNAPSHOT - pom - - - website-server - - \ No newline at end of file + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.1.4.RELEASE + + + com.gitee.sop + sop-website + 1.0.0-SNAPSHOT + sop-website + sop-website + + + 1.8 + + + + + org.springframework.cloud + spring-cloud-alibaba-nacos-discovery + 0.9.0.RELEASE + + + + org.springframework.boot + spring-boot-starter-web + + + + commons-lang + commons-lang + 2.6 + compile + + + com.squareup.okhttp3 + okhttp + 3.14.0 + compile + + + + com.alibaba + fastjson + 1.2.58 + compile + + + org.apache.httpcomponents + httpclient + 4.5.6 + + + + org.projectlombok + lombok + 1.18.4 + provided + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/sop-website/readme.md b/sop-website/readme.md index 5e67d6ff..d29bfa6a 100644 --- a/sop-website/readme.md +++ b/sop-website/readme.md @@ -1,14 +1,9 @@ # 开放平台网站 -包括文档功能，用户注册等，具体业务需要自己实现。 - -前后端分离 - -- website-front: 前端页面 -- website-server: 后台接口 +包括文档功能、沙箱环境。 ## 使用方式 - 确保注册中心、网关、微服务正常启动 -- 启动website-server(运行WebsiteServerApplication.java) -- 找到sop-website/website-front/pages/doc/doc.html，IDEA下右键--Debug \ No newline at end of file +- 运行WebsiteServerApplication.java +- 访问http://localhost:8083 \ No newline at end of file diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/WebsiteServerApplication.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/WebsiteServerApplication.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/WebsiteServerApplication.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/WebsiteServerApplication.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/bean/DocInfo.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/bean/DocInfo.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/bean/DocInfo.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/bean/DocInfo.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/bean/DocItem.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/bean/DocItem.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/bean/DocItem.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/bean/DocItem.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/bean/DocModule.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/bean/DocModule.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/bean/DocModule.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/bean/DocModule.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/bean/DocParameter.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/bean/DocParameter.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/bean/DocParameter.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/bean/DocParameter.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/bean/DocParserContext.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/bean/DocParserContext.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/bean/DocParserContext.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/bean/DocParserContext.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/bean/EurekaApplication.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/bean/EurekaApplication.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/bean/EurekaApplication.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/bean/EurekaApplication.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/bean/EurekaApplications.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/bean/EurekaApplications.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/bean/EurekaApplications.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/bean/EurekaApplications.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/bean/EurekaApps.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/bean/EurekaApps.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/bean/EurekaApps.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/bean/EurekaApps.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/bean/EurekaInstance.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/bean/EurekaInstance.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/bean/EurekaInstance.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/bean/EurekaInstance.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/bean/EurekaUri.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/bean/EurekaUri.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/bean/EurekaUri.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/bean/EurekaUri.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/bean/HttpTool.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/bean/HttpTool.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/bean/HttpTool.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/bean/HttpTool.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/config/CorsConfig.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/config/CorsConfig.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/config/CorsConfig.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/config/CorsConfig.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/config/WebsiteConfig.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/config/WebsiteConfig.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/config/WebsiteConfig.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/config/WebsiteConfig.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/controller/DocController.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/controller/DocController.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/controller/DocController.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/controller/DocController.java diff --git a/sop-website/src/main/java/com/gitee/sop/websiteserver/controller/IndexController.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/controller/IndexController.java new file mode 100644 index 00000000..05f85092 --- /dev/null +++ b/sop-website/src/main/java/com/gitee/sop/websiteserver/controller/IndexController.java @@ -0,0 +1,17 @@ +package com.gitee.sop.websiteserver.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * @author tanghc + */ +@Controller +public class IndexController { + + @RequestMapping("/") + public String index() { + return "redirect:index.html"; + } + +} diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/controller/SandboxController.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/controller/SandboxController.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/controller/SandboxController.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/controller/SandboxController.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/manager/DocDiscovery.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/manager/DocDiscovery.java similarity index 98% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/manager/DocDiscovery.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/manager/DocDiscovery.java index 63f5658b..778fca4a 100644 --- a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/manager/DocDiscovery.java +++ b/sop-website/src/main/java/com/gitee/sop/websiteserver/manager/DocDiscovery.java @@ -67,7 +67,6 @@ public class DocDiscovery { try { List allInstances = namingService.getAllInstances(serviceName); if (CollectionUtils.isEmpty(allInstances)) { - log.info("{}服务下线，删除文档信息", serviceName); // 如果没有服务列表，则删除所有路由信息 docManager.remove(serviceName); } else { diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/manager/DocManager.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/manager/DocManager.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/manager/DocManager.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/manager/DocManager.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/manager/DocManagerImpl.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/manager/DocManagerImpl.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/manager/DocManagerImpl.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/manager/DocManagerImpl.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/manager/DocParser.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/manager/DocParser.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/manager/DocParser.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/manager/DocParser.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/manager/EasyopenDocParser.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/manager/EasyopenDocParser.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/manager/EasyopenDocParser.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/manager/EasyopenDocParser.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/manager/SwaggerDocParser.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/manager/SwaggerDocParser.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/manager/SwaggerDocParser.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/manager/SwaggerDocParser.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/sign/AlipayApiException.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/sign/AlipayApiException.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/sign/AlipayApiException.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/sign/AlipayApiException.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/sign/AlipayConstants.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/sign/AlipayConstants.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/sign/AlipayConstants.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/sign/AlipayConstants.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/sign/AlipaySignature.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/sign/AlipaySignature.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/sign/AlipaySignature.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/sign/AlipaySignature.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/sign/StreamUtil.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/sign/StreamUtil.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/sign/StreamUtil.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/sign/StreamUtil.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/sign/StringUtils.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/sign/StringUtils.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/sign/StringUtils.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/sign/StringUtils.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/util/UploadUtil.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/util/UploadUtil.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/util/UploadUtil.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/util/UploadUtil.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/vo/DocBaseInfoVO.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/vo/DocBaseInfoVO.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/vo/DocBaseInfoVO.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/vo/DocBaseInfoVO.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/vo/DocInfoVO.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/vo/DocInfoVO.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/vo/DocInfoVO.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/vo/DocInfoVO.java diff --git a/sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/vo/ServiceInfoVO.java b/sop-website/src/main/java/com/gitee/sop/websiteserver/vo/ServiceInfoVO.java similarity index 100% rename from sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/vo/ServiceInfoVO.java rename to sop-website/src/main/java/com/gitee/sop/websiteserver/vo/ServiceInfoVO.java diff --git a/sop-website/website-server/src/main/resources/api.json b/sop-website/src/main/resources/api.json similarity index 100% rename from sop-website/website-server/src/main/resources/api.json rename to sop-website/src/main/resources/api.json diff --git a/sop-website/website-server/src/main/resources/application-dev.properties b/sop-website/src/main/resources/application-dev.properties similarity index 100% rename from sop-website/website-server/src/main/resources/application-dev.properties rename to sop-website/src/main/resources/application-dev.properties diff --git a/sop-website/website-server/src/main/resources/application.properties b/sop-website/src/main/resources/application.properties similarity index 100% rename from sop-website/website-server/src/main/resources/application.properties rename to sop-website/src/main/resources/application.properties diff --git a/sop-website/website-front/assets/css/global.css b/sop-website/src/main/resources/public/assets/css/global.css similarity index 100% rename from sop-website/website-front/assets/css/global.css rename to sop-website/src/main/resources/public/assets/css/global.css diff --git a/sop-website/website-front/assets/image/auth.png b/sop-website/src/main/resources/public/assets/image/auth.png similarity index 100% rename from sop-website/website-front/assets/image/auth.png rename to sop-website/src/main/resources/public/assets/image/auth.png diff --git a/sop-website/website-front/assets/js/format.js b/sop-website/src/main/resources/public/assets/js/format.js similarity index 100% rename from sop-website/website-front/assets/js/format.js rename to sop-website/src/main/resources/public/assets/js/format.js diff --git a/sop-website/website-front/assets/js/inputcache.js b/sop-website/src/main/resources/public/assets/js/inputcache.js similarity index 100% rename from sop-website/website-front/assets/js/inputcache.js rename to sop-website/src/main/resources/public/assets/js/inputcache.js diff --git a/sop-website/website-front/assets/lib/jquery/3.2.1/jquery.min.js b/sop-website/src/main/resources/public/assets/lib/jquery/3.2.1/jquery.min.js similarity index 100% rename from sop-website/website-front/assets/lib/jquery/3.2.1/jquery.min.js rename to sop-website/src/main/resources/public/assets/lib/jquery/3.2.1/jquery.min.js diff --git a/sop-website/website-front/assets/lib/layui/css/layui.css b/sop-website/src/main/resources/public/assets/lib/layui/css/layui.css similarity index 100% rename from sop-website/website-front/assets/lib/layui/css/layui.css rename to sop-website/src/main/resources/public/assets/lib/layui/css/layui.css diff --git a/sop-website/website-front/assets/lib/layui/css/layui.mobile.css b/sop-website/src/main/resources/public/assets/lib/layui/css/layui.mobile.css similarity index 100% rename from sop-website/website-front/assets/lib/layui/css/layui.mobile.css rename to sop-website/src/main/resources/public/assets/lib/layui/css/layui.mobile.css diff --git a/sop-website/website-front/assets/lib/layui/css/modules/code.css b/sop-website/src/main/resources/public/assets/lib/layui/css/modules/code.css similarity index 100% rename from sop-website/website-front/assets/lib/layui/css/modules/code.css rename to sop-website/src/main/resources/public/assets/lib/layui/css/modules/code.css diff --git a/sop-website/website-front/assets/lib/layui/css/modules/laydate/default/laydate.css b/sop-website/src/main/resources/public/assets/lib/layui/css/modules/laydate/default/laydate.css similarity index 100% rename from sop-website/website-front/assets/lib/layui/css/modules/laydate/default/laydate.css rename to sop-website/src/main/resources/public/assets/lib/layui/css/modules/laydate/default/laydate.css diff --git a/sop-website/website-front/assets/lib/layui/css/modules/layer/default/icon-ext.png b/sop-website/src/main/resources/public/assets/lib/layui/css/modules/layer/default/icon-ext.png similarity index 100% rename from sop-website/website-front/assets/lib/layui/css/modules/layer/default/icon-ext.png rename to sop-website/src/main/resources/public/assets/lib/layui/css/modules/layer/default/icon-ext.png diff --git a/sop-website/website-front/assets/lib/layui/css/modules/layer/default/icon.png b/sop-website/src/main/resources/public/assets/lib/layui/css/modules/layer/default/icon.png similarity index 100% rename from sop-website/website-front/assets/lib/layui/css/modules/layer/default/icon.png rename to sop-website/src/main/resources/public/assets/lib/layui/css/modules/layer/default/icon.png diff --git a/sop-website/website-front/assets/lib/layui/css/modules/layer/default/layer.css b/sop-website/src/main/resources/public/assets/lib/layui/css/modules/layer/default/layer.css similarity index 100% rename from sop-website/website-front/assets/lib/layui/css/modules/layer/default/layer.css rename to sop-website/src/main/resources/public/assets/lib/layui/css/modules/layer/default/layer.css diff --git a/sop-website/website-front/assets/lib/layui/css/modules/layer/default/loading-0.gif b/sop-website/src/main/resources/public/assets/lib/layui/css/modules/layer/default/loading-0.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/css/modules/layer/default/loading-0.gif rename to sop-website/src/main/resources/public/assets/lib/layui/css/modules/layer/default/loading-0.gif diff --git a/sop-website/website-front/assets/lib/layui/css/modules/layer/default/loading-1.gif b/sop-website/src/main/resources/public/assets/lib/layui/css/modules/layer/default/loading-1.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/css/modules/layer/default/loading-1.gif rename to sop-website/src/main/resources/public/assets/lib/layui/css/modules/layer/default/loading-1.gif diff --git a/sop-website/website-front/assets/lib/layui/css/modules/layer/default/loading-2.gif b/sop-website/src/main/resources/public/assets/lib/layui/css/modules/layer/default/loading-2.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/css/modules/layer/default/loading-2.gif rename to sop-website/src/main/resources/public/assets/lib/layui/css/modules/layer/default/loading-2.gif diff --git a/sop-website/website-front/assets/lib/layui/font/iconfont.eot b/sop-website/src/main/resources/public/assets/lib/layui/font/iconfont.eot similarity index 100% rename from sop-website/website-front/assets/lib/layui/font/iconfont.eot rename to sop-website/src/main/resources/public/assets/lib/layui/font/iconfont.eot diff --git a/sop-website/website-front/assets/lib/layui/font/iconfont.svg b/sop-website/src/main/resources/public/assets/lib/layui/font/iconfont.svg similarity index 100% rename from sop-website/website-front/assets/lib/layui/font/iconfont.svg rename to sop-website/src/main/resources/public/assets/lib/layui/font/iconfont.svg diff --git a/sop-website/website-front/assets/lib/layui/font/iconfont.ttf b/sop-website/src/main/resources/public/assets/lib/layui/font/iconfont.ttf similarity index 100% rename from sop-website/website-front/assets/lib/layui/font/iconfont.ttf rename to sop-website/src/main/resources/public/assets/lib/layui/font/iconfont.ttf diff --git a/sop-website/website-front/assets/lib/layui/font/iconfont.woff b/sop-website/src/main/resources/public/assets/lib/layui/font/iconfont.woff similarity index 100% rename from sop-website/website-front/assets/lib/layui/font/iconfont.woff rename to sop-website/src/main/resources/public/assets/lib/layui/font/iconfont.woff diff --git a/sop-website/website-front/assets/lib/layui/images/face/0.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/0.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/0.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/0.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/1.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/1.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/1.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/1.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/10.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/10.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/10.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/10.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/11.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/11.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/11.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/11.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/12.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/12.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/12.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/12.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/13.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/13.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/13.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/13.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/14.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/14.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/14.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/14.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/15.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/15.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/15.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/15.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/16.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/16.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/16.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/16.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/17.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/17.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/17.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/17.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/18.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/18.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/18.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/18.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/19.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/19.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/19.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/19.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/2.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/2.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/2.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/2.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/20.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/20.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/20.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/20.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/21.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/21.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/21.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/21.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/22.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/22.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/22.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/22.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/23.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/23.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/23.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/23.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/24.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/24.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/24.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/24.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/25.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/25.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/25.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/25.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/26.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/26.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/26.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/26.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/27.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/27.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/27.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/27.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/28.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/28.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/28.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/28.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/29.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/29.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/29.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/29.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/3.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/3.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/3.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/3.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/30.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/30.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/30.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/30.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/31.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/31.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/31.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/31.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/32.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/32.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/32.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/32.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/33.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/33.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/33.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/33.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/34.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/34.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/34.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/34.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/35.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/35.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/35.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/35.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/36.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/36.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/36.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/36.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/37.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/37.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/37.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/37.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/38.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/38.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/38.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/38.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/39.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/39.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/39.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/39.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/4.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/4.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/4.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/4.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/40.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/40.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/40.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/40.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/41.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/41.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/41.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/41.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/42.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/42.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/42.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/42.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/43.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/43.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/43.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/43.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/44.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/44.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/44.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/44.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/45.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/45.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/45.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/45.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/46.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/46.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/46.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/46.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/47.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/47.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/47.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/47.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/48.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/48.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/48.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/48.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/49.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/49.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/49.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/49.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/5.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/5.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/5.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/5.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/50.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/50.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/50.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/50.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/51.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/51.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/51.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/51.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/52.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/52.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/52.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/52.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/53.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/53.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/53.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/53.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/54.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/54.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/54.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/54.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/55.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/55.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/55.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/55.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/56.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/56.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/56.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/56.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/57.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/57.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/57.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/57.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/58.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/58.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/58.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/58.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/59.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/59.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/59.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/59.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/6.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/6.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/6.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/6.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/60.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/60.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/60.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/60.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/61.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/61.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/61.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/61.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/62.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/62.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/62.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/62.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/63.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/63.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/63.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/63.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/64.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/64.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/64.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/64.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/65.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/65.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/65.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/65.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/66.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/66.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/66.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/66.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/67.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/67.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/67.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/67.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/68.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/68.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/68.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/68.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/69.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/69.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/69.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/69.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/7.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/7.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/7.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/7.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/70.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/70.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/70.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/70.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/71.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/71.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/71.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/71.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/8.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/8.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/8.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/8.gif diff --git a/sop-website/website-front/assets/lib/layui/images/face/9.gif b/sop-website/src/main/resources/public/assets/lib/layui/images/face/9.gif similarity index 100% rename from sop-website/website-front/assets/lib/layui/images/face/9.gif rename to sop-website/src/main/resources/public/assets/lib/layui/images/face/9.gif diff --git a/sop-website/website-front/assets/lib/layui/lay/modules/carousel.js b/sop-website/src/main/resources/public/assets/lib/layui/lay/modules/carousel.js similarity index 100% rename from sop-website/website-front/assets/lib/layui/lay/modules/carousel.js rename to sop-website/src/main/resources/public/assets/lib/layui/lay/modules/carousel.js diff --git a/sop-website/website-front/assets/lib/layui/lay/modules/code.js b/sop-website/src/main/resources/public/assets/lib/layui/lay/modules/code.js similarity index 100% rename from sop-website/website-front/assets/lib/layui/lay/modules/code.js rename to sop-website/src/main/resources/public/assets/lib/layui/lay/modules/code.js diff --git a/sop-website/website-front/assets/lib/layui/lay/modules/colorpicker.js b/sop-website/src/main/resources/public/assets/lib/layui/lay/modules/colorpicker.js similarity index 100% rename from sop-website/website-front/assets/lib/layui/lay/modules/colorpicker.js rename to sop-website/src/main/resources/public/assets/lib/layui/lay/modules/colorpicker.js diff --git a/sop-website/website-front/assets/lib/layui/lay/modules/element.js b/sop-website/src/main/resources/public/assets/lib/layui/lay/modules/element.js similarity index 100% rename from sop-website/website-front/assets/lib/layui/lay/modules/element.js rename to sop-website/src/main/resources/public/assets/lib/layui/lay/modules/element.js diff --git a/sop-website/website-front/assets/lib/layui/lay/modules/flow.js b/sop-website/src/main/resources/public/assets/lib/layui/lay/modules/flow.js similarity index 100% rename from sop-website/website-front/assets/lib/layui/lay/modules/flow.js rename to sop-website/src/main/resources/public/assets/lib/layui/lay/modules/flow.js diff --git a/sop-website/website-front/assets/lib/layui/lay/modules/form.js b/sop-website/src/main/resources/public/assets/lib/layui/lay/modules/form.js similarity index 100% rename from sop-website/website-front/assets/lib/layui/lay/modules/form.js rename to sop-website/src/main/resources/public/assets/lib/layui/lay/modules/form.js diff --git a/sop-website/website-front/assets/lib/layui/lay/modules/jquery.js b/sop-website/src/main/resources/public/assets/lib/layui/lay/modules/jquery.js similarity index 100% rename from sop-website/website-front/assets/lib/layui/lay/modules/jquery.js rename to sop-website/src/main/resources/public/assets/lib/layui/lay/modules/jquery.js diff --git a/sop-website/website-front/assets/lib/layui/lay/modules/laydate.js b/sop-website/src/main/resources/public/assets/lib/layui/lay/modules/laydate.js similarity index 100% rename from sop-website/website-front/assets/lib/layui/lay/modules/laydate.js rename to sop-website/src/main/resources/public/assets/lib/layui/lay/modules/laydate.js diff --git a/sop-website/website-front/assets/lib/layui/lay/modules/layedit.js b/sop-website/src/main/resources/public/assets/lib/layui/lay/modules/layedit.js similarity index 100% rename from sop-website/website-front/assets/lib/layui/lay/modules/layedit.js rename to sop-website/src/main/resources/public/assets/lib/layui/lay/modules/layedit.js diff --git a/sop-website/website-front/assets/lib/layui/lay/modules/layer.js b/sop-website/src/main/resources/public/assets/lib/layui/lay/modules/layer.js similarity index 100% rename from sop-website/website-front/assets/lib/layui/lay/modules/layer.js rename to sop-website/src/main/resources/public/assets/lib/layui/lay/modules/layer.js diff --git a/sop-website/website-front/assets/lib/layui/lay/modules/laypage.js b/sop-website/src/main/resources/public/assets/lib/layui/lay/modules/laypage.js similarity index 100% rename from sop-website/website-front/assets/lib/layui/lay/modules/laypage.js rename to sop-website/src/main/resources/public/assets/lib/layui/lay/modules/laypage.js diff --git a/sop-website/website-front/assets/lib/layui/lay/modules/laytpl.js b/sop-website/src/main/resources/public/assets/lib/layui/lay/modules/laytpl.js similarity index 100% rename from sop-website/website-front/assets/lib/layui/lay/modules/laytpl.js rename to sop-website/src/main/resources/public/assets/lib/layui/lay/modules/laytpl.js diff --git a/sop-website/website-front/assets/lib/layui/lay/modules/mobile.js b/sop-website/src/main/resources/public/assets/lib/layui/lay/modules/mobile.js similarity index 100% rename from sop-website/website-front/assets/lib/layui/lay/modules/mobile.js rename to sop-website/src/main/resources/public/assets/lib/layui/lay/modules/mobile.js diff --git a/sop-website/website-front/assets/lib/layui/lay/modules/rate.js b/sop-website/src/main/resources/public/assets/lib/layui/lay/modules/rate.js similarity index 100% rename from sop-website/website-front/assets/lib/layui/lay/modules/rate.js rename to sop-website/src/main/resources/public/assets/lib/layui/lay/modules/rate.js diff --git a/sop-website/website-front/assets/lib/layui/lay/modules/slider.js b/sop-website/src/main/resources/public/assets/lib/layui/lay/modules/slider.js similarity index 100% rename from sop-website/website-front/assets/lib/layui/lay/modules/slider.js rename to sop-website/src/main/resources/public/assets/lib/layui/lay/modules/slider.js diff --git a/sop-website/website-front/assets/lib/layui/lay/modules/table.js b/sop-website/src/main/resources/public/assets/lib/layui/lay/modules/table.js similarity index 100% rename from sop-website/website-front/assets/lib/layui/lay/modules/table.js rename to sop-website/src/main/resources/public/assets/lib/layui/lay/modules/table.js diff --git a/sop-website/website-front/assets/lib/layui/lay/modules/tree.js b/sop-website/src/main/resources/public/assets/lib/layui/lay/modules/tree.js similarity index 100% rename from sop-website/website-front/assets/lib/layui/lay/modules/tree.js rename to sop-website/src/main/resources/public/assets/lib/layui/lay/modules/tree.js diff --git a/sop-website/website-front/assets/lib/layui/lay/modules/upload.js b/sop-website/src/main/resources/public/assets/lib/layui/lay/modules/upload.js similarity index 100% rename from sop-website/website-front/assets/lib/layui/lay/modules/upload.js rename to sop-website/src/main/resources/public/assets/lib/layui/lay/modules/upload.js diff --git a/sop-website/website-front/assets/lib/layui/lay/modules/util.js b/sop-website/src/main/resources/public/assets/lib/layui/lay/modules/util.js similarity index 100% rename from sop-website/website-front/assets/lib/layui/lay/modules/util.js rename to sop-website/src/main/resources/public/assets/lib/layui/lay/modules/util.js diff --git a/sop-website/website-front/assets/lib/layui/layui.all.js b/sop-website/src/main/resources/public/assets/lib/layui/layui.all.js similarity index 100% rename from sop-website/website-front/assets/lib/layui/layui.all.js rename to sop-website/src/main/resources/public/assets/lib/layui/layui.all.js diff --git a/sop-website/website-front/assets/lib/layui/layui.js b/sop-website/src/main/resources/public/assets/lib/layui/layui.js similarity index 100% rename from sop-website/website-front/assets/lib/layui/layui.js rename to sop-website/src/main/resources/public/assets/lib/layui/layui.js diff --git a/sop-website/website-front/assets/lib/layuiext/Form.js b/sop-website/src/main/resources/public/assets/lib/layuiext/Form.js similarity index 100% rename from sop-website/website-front/assets/lib/layuiext/Form.js rename to sop-website/src/main/resources/public/assets/lib/layuiext/Form.js diff --git a/sop-website/website-front/assets/lib/layuiext/module/treetable-lay/treetable.css b/sop-website/src/main/resources/public/assets/lib/layuiext/module/treetable-lay/treetable.css similarity index 100% rename from sop-website/website-front/assets/lib/layuiext/module/treetable-lay/treetable.css rename to sop-website/src/main/resources/public/assets/lib/layuiext/module/treetable-lay/treetable.css diff --git a/sop-website/website-front/assets/lib/layuiext/module/treetable-lay/treetable.js b/sop-website/src/main/resources/public/assets/lib/layuiext/module/treetable-lay/treetable.js similarity index 100% rename from sop-website/website-front/assets/lib/layuiext/module/treetable-lay/treetable.js rename to sop-website/src/main/resources/public/assets/lib/layuiext/module/treetable-lay/treetable.js diff --git a/sop-website/website-front/config/config.js b/sop-website/src/main/resources/public/config/config.js similarity index 64% rename from sop-website/website-front/config/config.js rename to sop-website/src/main/resources/public/config/config.js index 24913224..bfa62769 100644 --- a/sop-website/website-front/config/config.js +++ b/sop-website/src/main/resources/public/config/config.js @@ -6,5 +6,5 @@ var SopConfig = { /** * 后端接口url */ - url: 'http://localhost:8083' // 末尾没有斜杠 + url: '' // 末尾没有斜杠 } diff --git a/sop-website/src/main/resources/public/index.html b/sop-website/src/main/resources/public/index.html new file mode 100644 index 00000000..466fab10 --- /dev/null +++ b/sop-website/src/main/resources/public/index.html @@ -0,0 +1,12 @@ + + + + + + + + + + \ No newline at end of file diff --git a/sop-website/website-front/pages/doc/auth.html b/sop-website/src/main/resources/public/pages/doc/auth.html similarity index 100% rename from sop-website/website-front/pages/doc/auth.html rename to sop-website/src/main/resources/public/pages/doc/auth.html diff --git a/sop-website/website-front/pages/doc/code.html b/sop-website/src/main/resources/public/pages/doc/code.html similarity index 100% rename from sop-website/website-front/pages/doc/code.html rename to sop-website/src/main/resources/public/pages/doc/code.html diff --git a/sop-website/website-front/pages/doc/doc.html b/sop-website/src/main/resources/public/pages/doc/doc.html similarity index 100% rename from sop-website/website-front/pages/doc/doc.html rename to sop-website/src/main/resources/public/pages/doc/doc.html diff --git a/sop-website/website-front/pages/doc/doc.js b/sop-website/src/main/resources/public/pages/doc/doc.js similarity index 100% rename from sop-website/website-front/pages/doc/doc.js rename to sop-website/src/main/resources/public/pages/doc/doc.js diff --git a/sop-website/website-front/pages/doc/docEvent.js b/sop-website/src/main/resources/public/pages/doc/docEvent.js similarity index 100% rename from sop-website/website-front/pages/doc/docEvent.js rename to sop-website/src/main/resources/public/pages/doc/docEvent.js diff --git a/sop-website/website-front/pages/doc/sign.html b/sop-website/src/main/resources/public/pages/doc/sign.html similarity index 100% rename from sop-website/website-front/pages/doc/sign.html rename to sop-website/src/main/resources/public/pages/doc/sign.html diff --git a/sop-website/website-front/pages/sandbox/sandbox.html b/sop-website/src/main/resources/public/pages/sandbox/sandbox.html similarity index 100% rename from sop-website/website-front/pages/sandbox/sandbox.html rename to sop-website/src/main/resources/public/pages/sandbox/sandbox.html diff --git a/sop-website/website-front/pages/sandbox/sandbox.js b/sop-website/src/main/resources/public/pages/sandbox/sandbox.js similarity index 100% rename from sop-website/website-front/pages/sandbox/sandbox.js rename to sop-website/src/main/resources/public/pages/sandbox/sandbox.js diff --git a/sop-website/website-server/src/test/java/com/gitee/sop/websiteserver/WebsiteServerApplicationTests.java b/sop-website/src/test/java/com/gitee/sop/websiteserver/WebsiteServerApplicationTests.java similarity index 100% rename from sop-website/website-server/src/test/java/com/gitee/sop/websiteserver/WebsiteServerApplicationTests.java rename to sop-website/src/test/java/com/gitee/sop/websiteserver/WebsiteServerApplicationTests.java diff --git a/sop-website/website-server/pom.xml b/sop-website/website-server/pom.xml deleted file mode 100644 index ddeb9407..00000000 --- a/sop-website/website-server/pom.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.1.4.RELEASE - - - com.gitee.sop - website-server - 1.0.0-SNAPSHOT - website-server - website-server - - - 1.8 - - - - - org.springframework.cloud - spring-cloud-alibaba-nacos-discovery - 0.9.0.RELEASE - - - - org.springframework.boot - spring-boot-starter-web - - - - commons-lang - commons-lang - 2.6 - compile - - - com.squareup.okhttp3 - okhttp - 3.14.0 - compile - - - - com.alibaba - fastjson - 1.2.58 - compile - - - org.apache.httpcomponents - httpclient - 4.5.6 - - - - org.projectlombok - lombok - 1.18.4 - provided - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - -