pms-Sv.git - Gitblit

parent: 1f2e1776 | 补丁 | 提交 | ignore whitespace

刘小明

2024-06-18 f0924f311ed3b8381cf3bf230416c1685d8e0ed2

免登录模块

1个文件已修改

6个文件已添加

	pms-parent/pms-global/src/main/resources/application-global.yml	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pms-parent/pms-web-nologin/pom.xml	118 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pms-parent/pms-web-nologin/src/main/java/com/dy/pmsNoLogin/NoLoginApplication.java	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pms-parent/pms-web-nologin/src/main/java/com/dy/pmsNoLogin/claim/ClaimCtrl.java	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pms-parent/pms-web-nologin/src/main/java/com/dy/pmsNoLogin/tracking/TrackingCtrl.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pms-parent/pms-web-nologin/src/main/resources/application.yml	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pms-parent/pms-web-nologin/src/main/resources/log4j2.yml	73 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 pms-parent/pms-global/src/main/resources/application-global.yml

@@ -69,6 +69,9 @@
    other:
        webPort: 12348
        idSuffix: 5
    nologin:
        webPort: 12349
        idSuffix: 6
    file:
        idSuffix: 99
    file1:

 pms-parent/pms-web-nologin/pom.xml

New file
@@ -0,0 +1,118 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>

    <parent>
        <artifactId>pms-parent</artifactId>
        <groupId>com.dy</groupId>
        <version>1.0.0</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <packaging>jar</packaging>
    <groupId>com.dy</groupId>
    <artifactId>pms-web-nologin</artifactId>
    <version>1.0.0</version>
    <name>pms-web-noLogin</name>
    <description>免登录模块</description>


    <dependencies>
        <dependency>
            <groupId>com.dy</groupId>
            <artifactId>pms-common</artifactId>
            <version>1.0.0</version>
        </dependency>
        <dependency>
            <groupId>com.dy</groupId>
            <artifactId>pms-global</artifactId>
            <version>1.0.0</version>
        </dependency>

        <dependency>
            <groupId>net.coobird</groupId>
            <artifactId>thumbnailator</artifactId>
            <version>${thumbnailator.version}</version>
        </dependency>
    </dependencies>

    <build>
        <plugins>
            <!-- 拷贝依赖的jar包到lib目录-->
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <executions>
                    <execution>
                        <configuration>
                            <!-- 不加的话最终包名为: ${artifactId}-${version}.jar, 加了的话最终包名: ${artifactId}-${version}-${classifier}.jar
                            <classifier>execute</classifier>
                            -->
                            <!-- ${project.build.directory}是maven变量，内置的，表示target目录,如果不写，将在根目录下创建/lib -->
                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
                            <!-- excludeTransitive:是否不包含间接依赖包，比如我们依赖A，但是A又依赖了B，我们是否也要把B打进去 默认不打-->
                            <excludeTransitive>false</excludeTransitive>
                            <!-- 复制的jar文件去掉版本信息 -->
                            <stripVersion>false</stripVersion>
                            <finalName>${project.artifactId}-${project.version}</finalName>
                            <layout>ZIP</layout>
                            <mainClass>com.dy.pmsBase.PmsBaseApplication</mainClass>
                            <includes>
                                <include>
                                    <groupId>com.dy</groupId>
                                    <artifactId>pms-common</artifactId>
                                </include>
                                <include>
                                    <groupId>com.dy</groupId>
                                    <artifactId>pms-global</artifactId>
                                </include>
                            </includes>
                            <excludes>
                                <exclude>
                                    <groupId>org.projectlombok</groupId>
                                    <artifactId>lombok</artifactId>
                                </exclude>
                            </excludes>
                        </configuration>
                    </execution>
                </executions>
            </plugin>

            <plugin>
                <!-- 设置java编译版本，运行环境版本 -->
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
                <!-- source： 源代码编译版本；target： 目标平台编译版本；encoding： 字符集编码。 -->
                <configuration>
                    <source>${java.version}</source>
                    <target>${java.version}</target>
                    <encoding>${encoding}</encoding>
                </configuration>
            </plugin>
            <plugin>
                <!-- 解决资源文件的编码问题 -->
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-resources-plugin</artifactId>
                <configuration>
                    <encoding>${encoding}</encoding>
                </configuration>
            </plugin>
            <plugin>
                <!-- maven里执行测试用例的插件 -->
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-surefire-plugin</artifactId>
                <configuration>
                    <skipTests>true</skipTests>
                </configuration>
            </plugin>
            <plugin>
                <!-- 下面解决：当进行Maven Lifecycle package时报错：Could not find artifact org.apache.mina:mina-core:bundle:2.2.1 in maven (https://repo1.maven.org/maven2/)-->
                <groupId>org.apache.felix</groupId>
                <artifactId>maven-bundle-plugin</artifactId>
                <extensions>true</extensions>
            </plugin>
        </plugins>
    </build>
</project>


 pms-parent/pms-web-nologin/src/main/java/com/dy/pmsNoLogin/NoLoginApplication.java

New file
@@ -0,0 +1,17 @@
package com.dy.pmsNoLogin;

import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.EnableAspectJAutoProxy;

@SpringBootApplication
@EnableAspectJAutoProxy
@ComponentScan(basePackages = {"com.dy.common", "com.dy.pmsGlobal", "com.dy.pmsNoLogin"})
@MapperScan(basePackages={"com.dy.pmsGlobal.dao*"})
public class NoLoginApplication {
    public static void main(String[] args) {
        SpringApplication.run(NoLoginApplication.class, args);
    }
}

 pms-parent/pms-web-nologin/src/main/java/com/dy/pmsNoLogin/claim/ClaimCtrl.java

New file
@@ -0,0 +1,23 @@
package com.dy.pmsNoLogin.claim;

import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * 生产任务认领控制器
 */
@Slf4j
@RestController
@RequestMapping(path = "claim")
public class ClaimCtrl {

    @GetMapping(path = "test")
    public BaseResponse test() {
        log.info("test");
        return BaseResponseUtils.buildSuccess("test");
    }
}

 pms-parent/pms-web-nologin/src/main/java/com/dy/pmsNoLogin/tracking/TrackingCtrl.java

New file
@@ -0,0 +1,14 @@
package com.dy.pmsNoLogin.tracking;

import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 *
 */
@Slf4j
@RestController
@RequestMapping(path = "tracking")
public class TrackingCtrl {
}

 pms-parent/pms-web-nologin/src/main/resources/application.yml

New file
@@ -0,0 +1,14 @@
spring:
    profiles:
        include: global, database

#web服务端口，tomcat默认是8080
server:
    port: ${pms.nologin.webPort}
    servlet:
        context-path: /nologin #web访问上下文路径
        context-parameters:
            #GenerateIdSetSuffixListener中应用，取值范围是0-99
            idSuffix: ${pms.nologin.idSuffix}
            #ConfigListener中应用
            #configFileNames: config-global.xml,config-demo.xml

 pms-parent/pms-web-nologin/src/main/resources/log4j2.yml

New file
@@ -0,0 +1,73 @@
Configuration:
    #status，这个用于设置log4j2自身内部的信息输出，可以不设置，当设置成trace时，你会看到log4j2内部各种详细输出；可以设置成Off(关闭)或Error(只输出错误信息)
    status: Error

    Properties: # 定义全局变量
        Property:
            #日志文件存储的目录
            - name: log.path
              value: ./logs
            #日志文件存储名称
            - name: project.name
              value: pmsNologin

    #定义输出器，可以输出到控制台和文件.
    Appenders:
        #输出到控制台
        Console:
            #Appender命名
            name: CONSOLE
            target: SYSTEM_OUT
            ThresholdFilter:
                level: debug #输出日志级别，输出日志时，首先由Loggers.Root.level或Loggers.Logger.level判断是否输出，然后再由本level判断是否输出
                onMatch: ACCEPT #onMatch=ACCEPT 大于等于 "level" 配置的等级地日志输出
                onMismatch: DENY #onMismatch=DENY 小于 "level" 配置的等级地日志不输出
            #日志内容样式
            PatternLayout:
                #%n-换行
                #%m-日志内容，输出代码中指定的日志信息
                #%p-输出优先级，即DEBUG,INFO,WARN,ERROR,FATAL
                #%r-程序启动到现在的毫秒数
                #%%- 输出一个"%" 字符
                #%t-当前线程名
                #%d-日期和时间, 常用的格式有%d{DATE},%d{ABSOLUTE},%d{HH:mm:ss,SSS},%d{ddMMyyyyHH:mm:ss,SSS}
                #%l-同%F%L%C%M
                #%F-java源文件名
                #%L-java源码行数
                #%C-java类名,%C{1}输出最后一个元素
                #%M-java方法名
                pattern: "%d{yyyy-MM-dd HH:mm:ss,SSS}:%4p %t (%C.%M:%L) - %m%n"
        # 输出到文件，超过10MB归档
        RollingFile:
            - name: ROLLING_FILE
              ignoreExceptions: false
              fileName: ${log.path}/${project.name}.log
              filePattern: "${log.path}/$${date:yyyy-MM}/${project.name}-%d{yyyy-MM-dd}-%i.log.gz"
              ThresholdFilter:
                  level: error #输出日志级别，输出日志时，首先由Loggers.Root.level或Loggers.Logger.level判断是否输出，然后再由本level判断是否输出
                  onMatch: ACCEPT #onMatch=ACCEPT 大于等于 "level" 配置的等级地日志输出
                  onMismatch: DENY #onMismatch=DENY 小于 "level" 配置的等级地日志不输出
              #日志内容样式
              PatternLayout:
                  pattern: "%d{yyyy-MM-dd HH:mm:ss,SSS}:%4p %t (%C.%M:%L) - %m%n"
              Policies:
                  SizeBasedTriggeringPolicy:
                      size: "10 MB"
              DefaultRolloverStrategy:
                  max: 1000

    Loggers:
        Root:
            level: info #日志输出级别，共有8个级别，按照从低到高为：all < trace < debug < info < warn < error < fatal < off
            AppenderRef: #Root的子节点，用来指定该日志输出到哪个Appender.
                - ref: CONSOLE #输出日志时，首先由本level判断是否输出，然后再由上面的Appenders.Console.ThresholdFilter.level判断是否输出
                - ref: ROLLING_FILE  #输出日志时，首先由本level判断是否输出，然后再由上面的Appenders.RollingFile.ThresholdFilter.level判断是否输出
        # 为包配置特殊的Log级别，方便调试，
        # 不受Loggers.Root.level限制
        #Logger:
        #    - name: com.dy.pmsGlobal.daoBa
        #     additivity: false #去除重复的log
        #      level: debug #输出日志级别
        #      AppenderRef:
        #          - ref: CONSOLE #输出日志时，首先由本.level判断是否输出，然后再由上面的Appenders.Console.ThresholdFilter.level判断是否输出
        #          - ref: ROLLING_FILE #输出日志时，首先由本level判断是否输出，然后再由上面的Appenders.RollingFile.ThresholdFilter.level判断是否输出

			@@ -69,6 +69,9 @@
			other:
			webPort: 12348
			idSuffix: 5
			nologin:
			webPort: 12349
			idSuffix: 6
			file:
			idSuffix: 99
			file1:

New file
			@@ -0,0 +1,118 @@
			<?xml version="1.0" encoding="UTF-8"?>
			<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
			xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
			<modelVersion>4.0.0</modelVersion>

			<parent>
			<artifactId>pms-parent</artifactId>
			<groupId>com.dy</groupId>
			<version>1.0.0</version>
			<relativePath>../pom.xml</relativePath>
			</parent>

			<packaging>jar</packaging>
			<groupId>com.dy</groupId>
			<artifactId>pms-web-nologin</artifactId>
			<version>1.0.0</version>
			<name>pms-web-noLogin</name>
			<description>免登录模块</description>


			<dependencies>
			<dependency>
			<groupId>com.dy</groupId>
			<artifactId>pms-common</artifactId>
			<version>1.0.0</version>
			</dependency>
			<dependency>
			<groupId>com.dy</groupId>
			<artifactId>pms-global</artifactId>
			<version>1.0.0</version>
			</dependency>

			<dependency>
			<groupId>net.coobird</groupId>
			<artifactId>thumbnailator</artifactId>
			<version>${thumbnailator.version}</version>
			</dependency>
			</dependencies>

			<build>
			<plugins>
			<!-- 拷贝依赖的jar包到lib目录-->
			<plugin>
			<groupId>org.springframework.boot</groupId>
			<artifactId>spring-boot-maven-plugin</artifactId>
			<executions>
			<execution>
			<configuration>
			<!-- 不加的话最终包名为: ${artifactId}-${version}.jar, 加了的话最终包名: ${artifactId}-${version}-${classifier}.jar
			<classifier>execute</classifier>
			-->
			<!-- ${project.build.directory}是maven变量，内置的，表示target目录,如果不写，将在根目录下创建/lib -->
			<outputDirectory>${project.build.directory}/lib</outputDirectory>
			<!-- excludeTransitive:是否不包含间接依赖包，比如我们依赖A，但是A又依赖了B，我们是否也要把B打进去默认不打-->
			<excludeTransitive>false</excludeTransitive>
			<!-- 复制的jar文件去掉版本信息 -->
			<stripVersion>false</stripVersion>
			<finalName>${project.artifactId}-${project.version}</finalName>
			<layout>ZIP</layout>
			<mainClass>com.dy.pmsBase.PmsBaseApplication</mainClass>
			<includes>
			<include>
			<groupId>com.dy</groupId>
			<artifactId>pms-common</artifactId>
			</include>
			<include>
			<groupId>com.dy</groupId>
			<artifactId>pms-global</artifactId>
			</include>
			</includes>
			<excludes>
			<exclude>
			<groupId>org.projectlombok</groupId>
			<artifactId>lombok</artifactId>
			</exclude>
			</excludes>
			</configuration>
			</execution>
			</executions>
			</plugin>

			<plugin>
			<!-- 设置java编译版本，运行环境版本 -->
			<groupId>org.apache.maven.plugins</groupId>
			<artifactId>maven-compiler-plugin</artifactId>
			<!-- source：源代码编译版本；target：目标平台编译版本；encoding：字符集编码。 -->
			<configuration>
			<source>${java.version}</source>
			<target>${java.version}</target>
			<encoding>${encoding}</encoding>
			</configuration>
			</plugin>
			<plugin>
			<!-- 解决资源文件的编码问题 -->
			<groupId>org.apache.maven.plugins</groupId>
			<artifactId>maven-resources-plugin</artifactId>
			<configuration>
			<encoding>${encoding}</encoding>
			</configuration>
			</plugin>
			<plugin>
			<!-- maven里执行测试用例的插件 -->
			<groupId>org.apache.maven.plugins</groupId>
			<artifactId>maven-surefire-plugin</artifactId>
			<configuration>
			<skipTests>true</skipTests>
			</configuration>
			</plugin>
			<plugin>
			<!-- 下面解决：当进行Maven Lifecycle package时报错：Could not find artifact org.apache.mina:mina-core:bundle:2.2.1 in maven (https://repo1.maven.org/maven2/)-->
			<groupId>org.apache.felix</groupId>
			<artifactId>maven-bundle-plugin</artifactId>
			<extensions>true</extensions>
			</plugin>
			</plugins>
			</build>
			</project>

New file
			@@ -0,0 +1,17 @@
			package com.dy.pmsNoLogin;

			import org.mybatis.spring.annotation.MapperScan;
			import org.springframework.boot.SpringApplication;
			import org.springframework.boot.autoconfigure.SpringBootApplication;
			import org.springframework.context.annotation.ComponentScan;
			import org.springframework.context.annotation.EnableAspectJAutoProxy;

			@SpringBootApplication
			@EnableAspectJAutoProxy
			@ComponentScan(basePackages = {"com.dy.common", "com.dy.pmsGlobal", "com.dy.pmsNoLogin"})
			@MapperScan(basePackages={"com.dy.pmsGlobal.dao*"})
			public class NoLoginApplication {
			public static void main(String[] args) {
			SpringApplication.run(NoLoginApplication.class, args);
			}
			}

New file
			@@ -0,0 +1,23 @@
			package com.dy.pmsNoLogin.claim;

			import com.dy.common.webUtil.BaseResponse;
			import com.dy.common.webUtil.BaseResponseUtils;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.web.bind.annotation.GetMapping;
			import org.springframework.web.bind.annotation.RequestMapping;
			import org.springframework.web.bind.annotation.RestController;

			/**
			* 生产任务认领控制器
			*/
			@Slf4j
			@RestController
			@RequestMapping(path = "claim")
			public class ClaimCtrl {

			@GetMapping(path = "test")
			public BaseResponse test() {
			log.info("test");
			return BaseResponseUtils.buildSuccess("test");
			}
			}

New file
			@@ -0,0 +1,14 @@
			package com.dy.pmsNoLogin.tracking;

			import lombok.extern.slf4j.Slf4j;
			import org.springframework.web.bind.annotation.RequestMapping;
			import org.springframework.web.bind.annotation.RestController;

			/**
			*
			*/
			@Slf4j
			@RestController
			@RequestMapping(path = "tracking")
			public class TrackingCtrl {
			}

New file
			@@ -0,0 +1,14 @@
			spring:
			profiles:
			include: global, database

			#web服务端口，tomcat默认是8080
			server:
			port: ${pms.nologin.webPort}
			servlet:
			context-path: /nologin #web访问上下文路径
			context-parameters:
			#GenerateIdSetSuffixListener中应用，取值范围是0-99
			idSuffix: ${pms.nologin.idSuffix}
			#ConfigListener中应用
			#configFileNames: config-global.xml,config-demo.xml

New file
			@@ -0,0 +1,73 @@
			Configuration:
			#status，这个用于设置log4j2自身内部的信息输出，可以不设置，当设置成trace时，你会看到log4j2内部各种详细输出；可以设置成Off(关闭)或Error(只输出错误信息)
			status: Error

			Properties: # 定义全局变量
			Property:
			#日志文件存储的目录
			- name: log.path
			value: ./logs
			#日志文件存储名称
			- name: project.name
			value: pmsNologin

			#定义输出器，可以输出到控制台和文件.
			Appenders:
			#输出到控制台
			Console:
			#Appender命名
			name: CONSOLE
			target: SYSTEM_OUT
			ThresholdFilter:
			level: debug #输出日志级别，输出日志时，首先由Loggers.Root.level或Loggers.Logger.level判断是否输出，然后再由本level判断是否输出
			onMatch: ACCEPT #onMatch=ACCEPT 大于等于 "level" 配置的等级地日志输出
			onMismatch: DENY #onMismatch=DENY 小于 "level" 配置的等级地日志不输出
			#日志内容样式
			PatternLayout:
			#%n-换行
			#%m-日志内容，输出代码中指定的日志信息
			#%p-输出优先级，即DEBUG,INFO,WARN,ERROR,FATAL
			#%r-程序启动到现在的毫秒数
			#%%- 输出一个"%" 字符
			#%t-当前线程名
			#%d-日期和时间, 常用的格式有%d{DATE},%d{ABSOLUTE},%d{HH:mm:ss,SSS},%d{ddMMyyyyHH:mm:ss,SSS}
			#%l-同%F%L%C%M
			#%F-java源文件名
			#%L-java源码行数
			#%C-java类名,%C{1}输出最后一个元素
			#%M-java方法名
			pattern: "%d{yyyy-MM-dd HH:mm:ss,SSS}:%4p %t (%C.%M:%L) - %m%n"
			# 输出到文件，超过10MB归档
			RollingFile:
			- name: ROLLING_FILE
			ignoreExceptions: false
			fileName: ${log.path}/${project.name}.log
			filePattern: "${log.path}/$${date:yyyy-MM}/${project.name}-%d{yyyy-MM-dd}-%i.log.gz"
			ThresholdFilter:
			level: error #输出日志级别，输出日志时，首先由Loggers.Root.level或Loggers.Logger.level判断是否输出，然后再由本level判断是否输出
			onMatch: ACCEPT #onMatch=ACCEPT 大于等于 "level" 配置的等级地日志输出
			onMismatch: DENY #onMismatch=DENY 小于 "level" 配置的等级地日志不输出
			#日志内容样式
			PatternLayout:
			pattern: "%d{yyyy-MM-dd HH:mm:ss,SSS}:%4p %t (%C.%M:%L) - %m%n"
			Policies:
			SizeBasedTriggeringPolicy:
			size: "10 MB"
			DefaultRolloverStrategy:
			max: 1000

			Loggers:
			Root:
			level: info #日志输出级别，共有8个级别，按照从低到高为：all < trace < debug < info < warn < error < fatal < off
			AppenderRef: #Root的子节点，用来指定该日志输出到哪个Appender.
			- ref: CONSOLE #输出日志时，首先由本level判断是否输出，然后再由上面的Appenders.Console.ThresholdFilter.level判断是否输出
			- ref: ROLLING_FILE #输出日志时，首先由本level判断是否输出，然后再由上面的Appenders.RollingFile.ThresholdFilter.level判断是否输出
			# 为包配置特殊的Log级别，方便调试，
			# 不受Loggers.Root.level限制
			#Logger:
			# - name: com.dy.pmsGlobal.daoBa
			# additivity: false #去除重复的log
			# level: debug #输出日志级别
			# AppenderRef:
			# - ref: CONSOLE #输出日志时，首先由本.level判断是否输出，然后再由上面的Appenders.Console.ThresholdFilter.level判断是否输出
			# - ref: ROLLING_FILE #输出日志时，首先由本level判断是否输出，然后再由上面的Appenders.RollingFile.ThresholdFilter.level判断是否输出