1 1 месяц назад
Родитель
Сommit
3992fcfb2b

+ 1 - 1
imwork-commons/imwork-commons-core/src/main/resources/application.properties

@@ -1 +1 @@
-core.xss.filter=true
+core.xss.filter=true

+ 24 - 0
imwork-commons/imwork-commons-core/src/main/resources/log4j.properties

@@ -0,0 +1,24 @@
+### 配置根 设置日志级别###
+log4j.rootLogger = DEBUG,console,file
+
+### 设置输出sql的级别,其中logger后面的内容全部为jar包中所包含的包名 ###
+log4j.logger.org.apache=DEBUG
+log4j.logger.java.sql.Connection=DEBUG
+log4j.logger.java.sql.Statement=DEBUG
+log4j.logger.java.sql.PreparedStatement=DEBUG
+log4j.logger.java.sql.ResultSet=DEBUG
+### 配置输出到控制台 ###
+log4j.appender.console = org.apache.log4j.ConsoleAppender
+log4j.appender.console.Target = System.out
+Log4j.appender.console.Threshold=DEBUG
+log4j.appender.console.layout = org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern =  [%p][%d{yy-MM-dd}][%c]%m%n
+
+### 配置输出到文件 ###
+log4j.appender.file = org.apache.log4j.RollingFileAppender
+log4j.appender.file.File = /app/logs/log.log
+log4j.appender.file.MaxFileSize = 10mb
+log4j.appender.file.Append = true
+log4j.appender.file.Threshold = DEBUG
+log4j.appender.file.layout = org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss}  [ %t:%r ] - [ %p ]  %m%n

+ 48 - 0
imwork-windows/imwork-silos/pom.xml

@@ -10,6 +10,8 @@
     </parent>
 
     <artifactId>imwork-silos</artifactId>
+    <packaging>jar</packaging>
+    <description>WEB-粮仓系统</description>
 
     <properties>
         <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -17,5 +19,51 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
+    <dependencies>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>top.imwork</groupId>
+            <artifactId>imwork-commons-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>nz.net.ultraq.thymeleaf</groupId>
+            <artifactId>thymeleaf-layout-dialect</artifactId>
+        </dependency>
+    </dependencies>
 
+    <build>
+        <!-- 产生的构件的文件名,默认值是${artifactId}-${version}。 -->
+        <finalName>${project.artifactId}-${version}</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                    <include>**/*.properties</include>
+                    <include>**/*.yml</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <excludes>
+                    <exclude>static/**/*</exclude>
+                </excludes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>false</filtering>
+                <includes>
+                    <include>static/**/*</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
 </project>

+ 6 - 2
imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/SilosStart.java

@@ -1,5 +1,8 @@
 package top.imwork.window.silos;
 
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.Random;
@@ -14,8 +17,9 @@ import java.util.Random;
  * History<历史描述>:
  * Since<版本号>: 1.0.0
  */
+@SpringBootApplication
 public class SilosStart {
-    static void main() {
-
+    public static void main(String[] args) {
+        SpringApplication.run(SilosStart.class,args);
     }
 }

+ 29 - 0
imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/config/WebMvcConfig.java

@@ -0,0 +1,29 @@
+package top.imwork.window.silos.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * 〈功能简述〉
+ * 〈mvc配置类〉
+ * 使用WebMvcConfigurerAdapter可以来扩展SpringMVC的功能
+ * @EnableWebMvc 不要接管SpringMVC
+ * FileName: WebMvcConfig
+ *
+ * @author e-jiangxiaowei
+ * @create 2020/7/11 10:27
+ * @since 1.0.0.0
+ */
+@Configuration
+public class WebMvcConfig implements WebMvcConfigurer {
+    /**
+     *
+     * 登录页视图控制
+     * */
+    @Override
+    public void addViewControllers(ViewControllerRegistry registry) {
+        registry.addViewController("/login.html").setViewName("/login/login");
+        registry.addViewController("/").setViewName("/login/login");
+    }
+}

+ 37 - 0
imwork-windows/imwork-silos/src/main/java/top/imwork/window/silos/controller/MainController.java

@@ -0,0 +1,37 @@
+package top.imwork.window.silos.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+public class MainController {
+
+    @ResponseBody
+    @GetMapping("/hello")
+    public String hello(){
+        return "hello silos!";
+    }
+
+    @GetMapping("/index.html")
+    public String index() {
+        return "/main/index";
+    }
+
+    @GetMapping("/welcome.html")
+    public String welcome() {
+        return "/main/welcome";
+    }
+
+    @PostMapping("/authentication/form")
+    public String authentication() {
+        return "/main/index";
+    }
+
+
+    @GetMapping("/cms/article/article-detail.html")
+    public String article() {
+        return "/cms/article/article-detail.html";
+    }
+}

+ 61 - 0
imwork-windows/imwork-silos/src/main/resources/application.yml

@@ -0,0 +1,61 @@
+server:
+  port: 80
+spring:
+  application:
+    name: imwork-silos
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
+    static-path-pattern: /**
+    resources:
+      static-locations: classpath:/static/,classpath:/business/
+  thymeleaf:
+    cache: false
+    encoding: UTF-8
+    mode: HTML5
+    prefix: classpath:/templates
+    suffix: .html
+#日志配置
+logging:
+  charset:
+    # 输出控制台编码
+    console: UTF-8
+    # 输出文件编码
+    file: UTF-8
+  logback:
+    rollingpolicy:
+      # 日志保存的天数
+      max-history: 15
+      # 单文件的大小,默认10M, 超过之后打包成一个日志文件
+      max-file-size: 10MB
+      # 打包文件格式,默认: ${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz,书写格式为:文件路径/文件名.%i.文件后缀,其中%i不可省去,否则无日志显示
+      # 例如: 日期为:2021/11/5 ,则打包文件之后为: log/ota.2021-11-05.0.gz,0表示日志的第一部分,后续就是,1,2,3...
+      # 如果是压缩包,里面会多一个名log/ota.2021-11-05.0的日志文件
+      # 如下面的例子,打包之后为: log/2021-11/ota.2020-11-5.0.log,这是一个日志文件
+      # file-name-pattern: /app/yssk/@artifactId@/%d{yyyy-MM-dd}/@artifactId@.%d{yyyy-MM-dd}.%i.log
+      file-name-pattern: "@base.logs.home@/%d{yyyy-MM-dd}/@artifactId@.%d{yyyy-MM-dd}.%i.log"
+  level:
+    root: INFO
+    org.springframework.web: error
+    # security 日志
+    org.springframework.security: error
+    org.hibernate: error
+    # mybatis日志
+    org.mybatis: error
+    javax.activation: info
+    org.apache.catalina: INFO
+    org.apache.commons.beanutils.converters: INFO
+    org.apache.coyote.http11.Http11Processor: INFO
+    org.apache.http: INFO
+    org.apache.tomcat: INFO
+    org.springframework: INFO
+    # 开启调试模式,打印sql
+    com.example.onecli.product.mapper: DEBUG
+    # 这里是自己的mapper包路径
+    top.imwork: info
+  pattern:
+    console: "%d{yyyy-mm-dd hh:mm:ss.sss} --> [%thread] %-5level %logger{50} - %msg%n"
+    file: "%d{yyyy-mm-dd hh:mm:ss.sss} --> [%thread] %-5level %logger{50} - %msg%n"
+  # 输出文件名及路径,不配置则不输出文件
+  file:
+    name: "@base.logs.home@/@artifactId@/@artifactId@.log"

+ 24 - 0
imwork-windows/imwork-silos/src/main/resources/log4j.properties

@@ -0,0 +1,24 @@
+### 配置根 设置日志级别###
+log4j.rootLogger = DEBUG,console,file
+
+### 设置输出sql的级别,其中logger后面的内容全部为jar包中所包含的包名 ###
+log4j.logger.org.apache=DEBUG
+log4j.logger.java.sql.Connection=DEBUG
+log4j.logger.java.sql.Statement=DEBUG
+log4j.logger.java.sql.PreparedStatement=DEBUG
+log4j.logger.java.sql.ResultSet=DEBUG
+### 配置输出到控制台 ###
+log4j.appender.console = org.apache.log4j.ConsoleAppender
+log4j.appender.console.Target = System.out
+Log4j.appender.console.Threshold=DEBUG
+log4j.appender.console.layout = org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern =  [%p][%d{yy-MM-dd}][%c]%m%n
+
+### 配置输出到文件 ###
+log4j.appender.file = org.apache.log4j.RollingFileAppender
+log4j.appender.file.File = /app/logs/log.log
+log4j.appender.file.MaxFileSize = 10mb
+log4j.appender.file.Append = true
+log4j.appender.file.Threshold = DEBUG
+log4j.appender.file.layout = org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss}  [ %t:%r ] - [ %p ]  %m%n