diff --git a/.gitignore b/.gitignore index 549e00a2a..da2d35fc1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ target/ !.mvn/wrapper/maven-wrapper.jar !**/src/main/**/target/ !**/src/test/**/target/ +src/main/resources/static/ ### STS ### .apt_generated diff --git a/Dockerfile-prd b/Dockerfile-prd index fcdeb03e2..0e0db1546 100644 --- a/Dockerfile-prd +++ b/Dockerfile-prd @@ -1,12 +1,12 @@ -from centos:7 +FROM openjdk:11 -ADD jre-11 jre-11 +#ADD jre-11 jre-11 ADD target/rtss-0.0.1-SNAPSHOT.jar app.jar -ENV JAVA_HOME=/jre-11 -ENV PATH=$JAVA_HOME/bin:$PATH +#ENV JAVA_HOME=/jre-11 +#ENV PATH=$JAVA_HOME/bin:$PATH -ENV LANG=C.UTF-8 +#ENV LANG=C.UTF-8 EXPOSE 9000 19000/tcp diff --git a/Dockerfile-test b/Dockerfile-test index 58813577a..db4e63040 100644 --- a/Dockerfile-test +++ b/Dockerfile-test @@ -1,12 +1,13 @@ -from centos:7 +FROM openjdk:11 +#from centos:7 -ADD jre-11 jre-11 +#ADD jre-11 jre-11 ADD target/rtss-0.0.1-SNAPSHOT.jar app.jar -ENV JAVA_HOME=/jre-11 -ENV PATH=$JAVA_HOME/bin:$PATH +#ENV JAVA_HOME=/jre-11 +#ENV PATH=$JAVA_HOME/bin:$PATH -ENV LANG=C.UTF-8 +#ENV LANG=C.UTF-8 EXPOSE 9000 19000/tcp diff --git a/jre-11/bin/java b/jre-11/bin/java deleted file mode 100644 index f31f29e9f..000000000 Binary files a/jre-11/bin/java and /dev/null differ diff --git a/jre-11/bin/keytool b/jre-11/bin/keytool deleted file mode 100644 index 219847c57..000000000 Binary files a/jre-11/bin/keytool and /dev/null differ diff --git a/jre-11/conf/logging.properties b/jre-11/conf/logging.properties deleted file mode 100644 index 58997e5ff..000000000 --- a/jre-11/conf/logging.properties +++ /dev/null @@ -1,63 +0,0 @@ -############################################################ -# Default Logging Configuration File -# -# You can use a different file by specifying a filename -# with the java.util.logging.config.file system property. -# For example java -Djava.util.logging.config.file=myfile -############################################################ - -############################################################ -# Global properties -############################################################ - -# "handlers" specifies a comma separated list of log Handler -# classes. These handlers will be installed during VM startup. -# Note that these classes must be on the system classpath. -# By default we only configure a ConsoleHandler, which will only -# show messages at the INFO and above levels. -handlers= java.util.logging.ConsoleHandler - -# To also add the FileHandler, use the following line instead. -#handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler - -# Default global logging level. -# This specifies which kinds of events are logged across -# all loggers. For any given facility this global level -# can be overriden by a facility specific level -# Note that the ConsoleHandler also has a separate level -# setting to limit messages printed to the console. -.level= INFO - -############################################################ -# Handler specific properties. -# Describes specific configuration info for Handlers. -############################################################ - -# default file output is in user's home directory. -java.util.logging.FileHandler.pattern = %h/java%u.log -java.util.logging.FileHandler.limit = 50000 -java.util.logging.FileHandler.count = 1 -# Default number of locks FileHandler can obtain synchronously. -# This specifies maximum number of attempts to obtain lock file by FileHandler -# implemented by incrementing the unique field %u as per FileHandler API documentation. -java.util.logging.FileHandler.maxLocks = 100 -java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter - -# Limit the message that are printed on the console to INFO and above. -java.util.logging.ConsoleHandler.level = INFO -java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter - -# Example to customize the SimpleFormatter output format -# to print one-line log message like this: -# : [] -# -# java.util.logging.SimpleFormatter.format=%4$s: %5$s [%1$tc]%n - -############################################################ -# Facility specific properties. -# Provides extra control for each logger. -############################################################ - -# For example, set the com.xyz.foo logger to only log SEVERE -# messages: -com.xyz.foo.level = SEVERE diff --git a/jre-11/conf/net.properties b/jre-11/conf/net.properties deleted file mode 100644 index ac94b30f1..000000000 --- a/jre-11/conf/net.properties +++ /dev/null @@ -1,101 +0,0 @@ -############################################################ -# Default Networking Configuration File -# -# This file may contain default values for the networking system properties. -# These values are only used when the system properties are not specified -# on the command line or set programmatically. -# For now, only the various proxy settings can be configured here. -############################################################ - -# Whether or not the DefaultProxySelector will default to System Proxy -# settings when they do exist. -# Set it to 'true' to enable this feature and check for platform -# specific proxy settings -# Note that the system properties that do explicitly set proxies -# (like http.proxyHost) do take precedence over the system settings -# even if java.net.useSystemProxies is set to true. - -java.net.useSystemProxies=false - -#------------------------------------------------------------------------ -# Proxy configuration for the various protocol handlers. -# DO NOT uncomment these lines if you have set java.net.useSystemProxies -# to true as the protocol specific properties will take precedence over -# system settings. -#------------------------------------------------------------------------ - -# HTTP Proxy settings. proxyHost is the name of the proxy server -# (e.g. proxy.mydomain.com), proxyPort is the port number to use (default -# value is 80) and nonProxyHosts is a '|' separated list of hostnames which -# should be accessed directly, ignoring the proxy server (default value is -# localhost & 127.0.0.1). -# -# http.proxyHost= -# http.proxyPort=80 -http.nonProxyHosts=localhost|127.*|[::1] -# -# HTTPS Proxy Settings. proxyHost is the name of the proxy server -# (e.g. proxy.mydomain.com), proxyPort is the port number to use (default -# value is 443). The HTTPS protocol handlers uses the http nonProxyHosts list. -# -# https.proxyHost= -# https.proxyPort=443 -# -# FTP Proxy settings. proxyHost is the name of the proxy server -# (e.g. proxy.mydomain.com), proxyPort is the port number to use (default -# value is 80) and nonProxyHosts is a '|' separated list of hostnames which -# should be accessed directly, ignoring the proxy server (default value is -# localhost & 127.0.0.1). -# -# ftp.proxyHost= -# ftp.proxyPort=80 -ftp.nonProxyHosts=localhost|127.*|[::1] -# -# Gopher Proxy settings. proxyHost is the name of the proxy server -# (e.g. proxy.mydomain.com), proxyPort is the port number to use (default -# value is 80) -# -# gopher.proxyHost= -# gopher.proxyPort=80 -# -# Socks proxy settings. socksProxyHost is the name of the proxy server -# (e.g. socks.domain.com), socksProxyPort is the port number to use -# (default value is 1080) -# -# socksProxyHost= -# socksProxyPort=1080 -# -# HTTP Keep Alive settings. remainingData is the maximum amount of data -# in kilobytes that will be cleaned off the underlying socket so that it -# can be reused (default value is 512K), queuedConnections is the maximum -# number of Keep Alive connections to be on the queue for clean up (default -# value is 10). -# http.KeepAlive.remainingData=512 -# http.KeepAlive.queuedConnections=10 - -# Authentication Scheme restrictions for HTTP and HTTPS. -# -# In some environments certain authentication schemes may be undesirable -# when proxying HTTP or HTTPS. For example, "Basic" results in effectively the -# cleartext transmission of the user's password over the physical network. -# This section describes the mechanism for disabling authentication schemes -# based on the scheme name. Disabled schemes will be treated as if they are not -# supported by the implementation. -# -# The 'jdk.http.auth.tunneling.disabledSchemes' property lists the authentication -# schemes that will be disabled when tunneling HTTPS over a proxy, HTTP CONNECT. -# The 'jdk.http.auth.proxying.disabledSchemes' property lists the authentication -# schemes that will be disabled when proxying HTTP. -# -# In both cases the property is a comma-separated list of, case-insensitive, -# authentication scheme names, as defined by their relevant RFCs. An -# implementation may, but is not required to, support common schemes whose names -# include: 'Basic', 'Digest', 'NTLM', 'Kerberos', 'Negotiate'. A scheme that -# is not known, or not supported, by the implementation is ignored. -# -# Note: This property is currently used by the JDK Reference implementation. It -# is not guaranteed to be examined and used by other implementations. -# -#jdk.http.auth.proxying.disabledSchemes= -jdk.http.auth.tunneling.disabledSchemes=Basic - diff --git a/jre-11/conf/security/java.policy b/jre-11/conf/security/java.policy deleted file mode 100644 index 1554541d1..000000000 --- a/jre-11/conf/security/java.policy +++ /dev/null @@ -1,44 +0,0 @@ -// -// This system policy file grants a set of default permissions to all domains -// and can be configured to grant additional permissions to modules and other -// code sources. The code source URL scheme for modules linked into a -// run-time image is "jrt". -// -// For example, to grant permission to read the "foo" property to the module -// "com.greetings", the grant entry is: -// -// grant codeBase "jrt:/com.greetings" { -// permission java.util.PropertyPermission "foo", "read"; -// }; -// - -// default permissions granted to all domains -grant { - // allows anyone to listen on dynamic ports - permission java.net.SocketPermission "localhost:0", "listen"; - - // "standard" properies that can be read by anyone - permission java.util.PropertyPermission "java.version", "read"; - permission java.util.PropertyPermission "java.vendor", "read"; - permission java.util.PropertyPermission "java.vendor.url", "read"; - permission java.util.PropertyPermission "java.class.version", "read"; - permission java.util.PropertyPermission "os.name", "read"; - permission java.util.PropertyPermission "os.version", "read"; - permission java.util.PropertyPermission "os.arch", "read"; - permission java.util.PropertyPermission "file.separator", "read"; - permission java.util.PropertyPermission "path.separator", "read"; - permission java.util.PropertyPermission "line.separator", "read"; - permission java.util.PropertyPermission - "java.specification.version", "read"; - permission java.util.PropertyPermission "java.specification.vendor", "read"; - permission java.util.PropertyPermission "java.specification.name", "read"; - permission java.util.PropertyPermission - "java.vm.specification.version", "read"; - permission java.util.PropertyPermission - "java.vm.specification.vendor", "read"; - permission java.util.PropertyPermission - "java.vm.specification.name", "read"; - permission java.util.PropertyPermission "java.vm.version", "read"; - permission java.util.PropertyPermission "java.vm.vendor", "read"; - permission java.util.PropertyPermission "java.vm.name", "read"; -}; diff --git a/jre-11/conf/security/java.security b/jre-11/conf/security/java.security deleted file mode 100644 index f37b9a87a..000000000 --- a/jre-11/conf/security/java.security +++ /dev/null @@ -1,1064 +0,0 @@ -# -# This is the "master security properties file". -# -# An alternate java.security properties file may be specified -# from the command line via the system property -# -# -Djava.security.properties= -# -# This properties file appends to the master security properties file. -# If both properties files specify values for the same key, the value -# from the command-line properties file is selected, as it is the last -# one loaded. -# -# Also, if you specify -# -# -Djava.security.properties== (2 equals), -# -# then that properties file completely overrides the master security -# properties file. -# -# To disable the ability to specify an additional properties file from -# the command line, set the key security.overridePropertiesFile -# to false in the master security properties file. It is set to true -# by default. - -# In this file, various security properties are set for use by -# java.security classes. This is where users can statically register -# Cryptography Package Providers ("providers" for short). The term -# "provider" refers to a package or set of packages that supply a -# concrete implementation of a subset of the cryptography aspects of -# the Java Security API. A provider may, for example, implement one or -# more digital signature algorithms or message digest algorithms. -# -# Each provider must implement a subclass of the Provider class. -# To register a provider in this master security properties file, -# specify the provider and priority in the format -# -# security.provider.= -# -# This declares a provider, and specifies its preference -# order n. The preference order is the order in which providers are -# searched for requested algorithms (when no specific provider is -# requested). The order is 1-based; 1 is the most preferred, followed -# by 2, and so on. -# -# must specify the name of the Provider as passed to its super -# class java.security.Provider constructor. This is for providers loaded -# through the ServiceLoader mechanism. -# -# must specify the subclass of the Provider class whose -# constructor sets the values of various properties that are required -# for the Java Security API to look up the algorithms or other -# facilities implemented by the provider. This is for providers loaded -# through classpath. -# -# Note: Providers can be dynamically registered instead by calls to -# either the addProvider or insertProviderAt method in the Security -# class. - -# -# List of providers and their preference orders (see above): -# -security.provider.1=SUN -security.provider.2=SunRsaSign -security.provider.3=SunEC -security.provider.4=SunJSSE -security.provider.5=SunJCE -security.provider.6=SunJGSS -security.provider.7=SunSASL -security.provider.8=XMLDSig -security.provider.9=SunPCSC -security.provider.10=JdkLDAP -security.provider.11=JdkSASL -security.provider.12=SunPKCS11 - -# -# A list of preferred providers for specific algorithms. These providers will -# be searched for matching algorithms before the list of registered providers. -# Entries containing errors (parsing, etc) will be ignored. Use the -# -Djava.security.debug=jca property to debug these errors. -# -# The property is a comma-separated list of serviceType.algorithm:provider -# entries. The serviceType (example: "MessageDigest") is optional, and if -# not specified, the algorithm applies to all service types that support it. -# The algorithm is the standard algorithm name or transformation. -# Transformations can be specified in their full standard name -# (ex: AES/CBC/PKCS5Padding), or as partial matches (ex: AES, AES/CBC). -# The provider is the name of the provider. Any provider that does not -# also appear in the registered list will be ignored. -# -# There is a special serviceType for this property only to group a set of -# algorithms together. The type is "Group" and is followed by an algorithm -# keyword. Groups are to simplify and lessen the entries on the property -# line. Current groups are: -# Group.SHA2 = SHA-224, SHA-256, SHA-384, SHA-512, SHA-512/224, SHA-512/256 -# Group.HmacSHA2 = HmacSHA224, HmacSHA256, HmacSHA384, HmacSHA512 -# Group.SHA2RSA = SHA224withRSA, SHA256withRSA, SHA384withRSA, SHA512withRSA -# Group.SHA2DSA = SHA224withDSA, SHA256withDSA, SHA384withDSA, SHA512withDSA -# Group.SHA2ECDSA = SHA224withECDSA, SHA256withECDSA, SHA384withECDSA, \ -# SHA512withECDSA -# Group.SHA3 = SHA3-224, SHA3-256, SHA3-384, SHA3-512 -# Group.HmacSHA3 = HmacSHA3-224, HmacSHA3-256, HmacSHA3-384, HmacSHA3-512 -# -# Example: -# jdk.security.provider.preferred=AES/GCM/NoPadding:SunJCE, \ -# MessageDigest.SHA-256:SUN, Group.HmacSHA2:SunJCE -# -#jdk.security.provider.preferred= - - -# -# Sun Provider SecureRandom seed source. -# -# Select the primary source of seed data for the "NativePRNG", "SHA1PRNG" -# and "DRBG" SecureRandom implementations in the "Sun" provider. -# (Other SecureRandom implementations might also use this property.) -# -# On Unix-like systems (for example, Solaris/Linux/MacOS), the -# "NativePRNG", "SHA1PRNG" and "DRBG" implementations obtains seed data from -# special device files such as file:/dev/random. -# -# On Windows systems, specifying the URLs "file:/dev/random" or -# "file:/dev/urandom" will enable the native Microsoft CryptoAPI seeding -# mechanism for SHA1PRNG and DRBG. -# -# By default, an attempt is made to use the entropy gathering device -# specified by the "securerandom.source" Security property. If an -# exception occurs while accessing the specified URL: -# -# NativePRNG: -# a default value of /dev/random will be used. If neither -# are available, the implementation will be disabled. -# "file" is the only currently supported protocol type. -# -# SHA1PRNG and DRBG: -# the traditional system/thread activity algorithm will be used. -# -# The entropy gathering device can also be specified with the System -# property "java.security.egd". For example: -# -# % java -Djava.security.egd=file:/dev/random MainClass -# -# Specifying this System property will override the -# "securerandom.source" Security property. -# -# In addition, if "file:/dev/random" or "file:/dev/urandom" is -# specified, the "NativePRNG" implementation will be more preferred than -# DRBG and SHA1PRNG in the Sun provider. -# -securerandom.source=file:/dev/random - -# -# A list of known strong SecureRandom implementations. -# -# To help guide applications in selecting a suitable strong -# java.security.SecureRandom implementation, Java distributions should -# indicate a list of known strong implementations using the property. -# -# This is a comma-separated list of algorithm and/or algorithm:provider -# entries. -# -securerandom.strongAlgorithms=NativePRNGBlocking:SUN,DRBG:SUN - -# -# Sun provider DRBG configuration and default instantiation request. -# -# NIST SP 800-90Ar1 lists several DRBG mechanisms. Each can be configured -# with a DRBG algorithm name, and can be instantiated with a security strength, -# prediction resistance support, etc. This property defines the configuration -# and the default instantiation request of "DRBG" SecureRandom implementations -# in the SUN provider. (Other DRBG implementations can also use this property.) -# Applications can request different instantiation parameters like security -# strength, capability, personalization string using one of the -# getInstance(...,SecureRandomParameters,...) methods with a -# DrbgParameters.Instantiation argument, but other settings such as the -# mechanism and DRBG algorithm names are not currently configurable by any API. -# -# Please note that the SUN implementation of DRBG always supports reseeding. -# -# The value of this property is a comma-separated list of all configurable -# aspects. The aspects can appear in any order but the same aspect can only -# appear at most once. Its BNF-style definition is: -# -# Value: -# aspect { "," aspect } -# -# aspect: -# mech_name | algorithm_name | strength | capability | df -# -# // The DRBG mechanism to use. Default "Hash_DRBG" -# mech_name: -# "Hash_DRBG" | "HMAC_DRBG" | "CTR_DRBG" -# -# // The DRBG algorithm name. The "SHA-***" names are for Hash_DRBG and -# // HMAC_DRBG, default "SHA-256". The "AES-***" names are for CTR_DRBG, -# // default "AES-128" when using the limited cryptographic or "AES-256" -# // when using the unlimited. -# algorithm_name: -# "SHA-224" | "SHA-512/224" | "SHA-256" | -# "SHA-512/256" | "SHA-384" | "SHA-512" | -# "AES-128" | "AES-192" | "AES-256" -# -# // Security strength requested. Default "128" -# strength: -# "112" | "128" | "192" | "256" -# -# // Prediction resistance and reseeding request. Default "none" -# // "pr_and_reseed" - Both prediction resistance and reseeding -# // support requested -# // "reseed_only" - Only reseeding support requested -# // "none" - Neither prediction resistance not reseeding -# // support requested -# pr: -# "pr_and_reseed" | "reseed_only" | "none" -# -# // Whether a derivation function should be used. only applicable -# // to CTR_DRBG. Default "use_df" -# df: -# "use_df" | "no_df" -# -# Examples, -# securerandom.drbg.config=Hash_DRBG,SHA-224,112,none -# securerandom.drbg.config=CTR_DRBG,AES-256,192,pr_and_reseed,use_df -# -# The default value is an empty string, which is equivalent to -# securerandom.drbg.config=Hash_DRBG,SHA-256,128,none -# -securerandom.drbg.config= - -# -# Class to instantiate as the javax.security.auth.login.Configuration -# provider. -# -login.configuration.provider=sun.security.provider.ConfigFile - -# -# Default login configuration file -# -#login.config.url.1=file:${user.home}/.java.login.config - -# -# Class to instantiate as the system Policy. This is the name of the class -# that will be used as the Policy object. The system class loader is used to -# locate this class. -# -policy.provider=sun.security.provider.PolicyFile - -# The default is to have a single system-wide policy file, -# and a policy file in the user's home directory. -# -policy.url.1=file:${java.home}/conf/security/java.policy -policy.url.2=file:${user.home}/.java.policy - -# whether or not we expand properties in the policy file -# if this is set to false, properties (${...}) will not be expanded in policy -# files. -# -policy.expandProperties=true - -# whether or not we allow an extra policy to be passed on the command line -# with -Djava.security.policy=somefile. Comment out this line to disable -# this feature. -# -policy.allowSystemProperty=true - -# whether or not we look into the IdentityScope for trusted Identities -# when encountering a 1.1 signed JAR file. If the identity is found -# and is trusted, we grant it AllPermission. Note: the default policy -# provider (sun.security.provider.PolicyFile) does not support this property. -# -policy.ignoreIdentityScope=false - -# -# Default keystore type. -# -keystore.type=pkcs12 - -# -# Controls compatibility mode for JKS and PKCS12 keystore types. -# -# When set to 'true', both JKS and PKCS12 keystore types support loading -# keystore files in either JKS or PKCS12 format. When set to 'false' the -# JKS keystore type supports loading only JKS keystore files and the PKCS12 -# keystore type supports loading only PKCS12 keystore files. -# -keystore.type.compat=true - -# -# List of comma-separated packages that start with or equal this string -# will cause a security exception to be thrown when passed to the -# SecurityManager::checkPackageAccess method unless the corresponding -# RuntimePermission("accessClassInPackage."+package) has been granted. -# -package.access=sun.misc.,\ - sun.reflect. - -# -# List of comma-separated packages that start with or equal this string -# will cause a security exception to be thrown when passed to the -# SecurityManager::checkPackageDefinition method unless the corresponding -# RuntimePermission("defineClassInPackage."+package) has been granted. -# -# By default, none of the class loaders supplied with the JDK call -# checkPackageDefinition. -# -package.definition=sun.misc.,\ - sun.reflect. - -# -# Determines whether this properties file can be appended to -# or overridden on the command line via -Djava.security.properties -# -security.overridePropertiesFile=true - -# -# Determines the default key and trust manager factory algorithms for -# the javax.net.ssl package. -# -ssl.KeyManagerFactory.algorithm=SunX509 -ssl.TrustManagerFactory.algorithm=PKIX - -# -# The Java-level namelookup cache policy for successful lookups: -# -# any negative value: caching forever -# any positive value: the number of seconds to cache an address for -# zero: do not cache -# -# default value is forever (FOREVER). For security reasons, this -# caching is made forever when a security manager is set. When a security -# manager is not set, the default behavior in this implementation -# is to cache for 30 seconds. -# -# NOTE: setting this to anything other than the default value can have -# serious security implications. Do not set it unless -# you are sure you are not exposed to DNS spoofing attack. -# -#networkaddress.cache.ttl=-1 - -# The Java-level namelookup cache policy for failed lookups: -# -# any negative value: cache forever -# any positive value: the number of seconds to cache negative lookup results -# zero: do not cache -# -# In some Microsoft Windows networking environments that employ -# the WINS name service in addition to DNS, name service lookups -# that fail may take a noticeably long time to return (approx. 5 seconds). -# For this reason the default caching policy is to maintain these -# results for 10 seconds. -# -networkaddress.cache.negative.ttl=10 - -# -# Properties to configure OCSP for certificate revocation checking -# - -# Enable OCSP -# -# By default, OCSP is not used for certificate revocation checking. -# This property enables the use of OCSP when set to the value "true". -# -# NOTE: SocketPermission is required to connect to an OCSP responder. -# -# Example, -# ocsp.enable=true - -# -# Location of the OCSP responder -# -# By default, the location of the OCSP responder is determined implicitly -# from the certificate being validated. This property explicitly specifies -# the location of the OCSP responder. The property is used when the -# Authority Information Access extension (defined in RFC 5280) is absent -# from the certificate or when it requires overriding. -# -# Example, -# ocsp.responderURL=http://ocsp.example.net:80 - -# -# Subject name of the OCSP responder's certificate -# -# By default, the certificate of the OCSP responder is that of the issuer -# of the certificate being validated. This property identifies the certificate -# of the OCSP responder when the default does not apply. Its value is a string -# distinguished name (defined in RFC 2253) which identifies a certificate in -# the set of certificates supplied during cert path validation. In cases where -# the subject name alone is not sufficient to uniquely identify the certificate -# then both the "ocsp.responderCertIssuerName" and -# "ocsp.responderCertSerialNumber" properties must be used instead. When this -# property is set then those two properties are ignored. -# -# Example, -# ocsp.responderCertSubjectName=CN=OCSP Responder, O=XYZ Corp - -# -# Issuer name of the OCSP responder's certificate -# -# By default, the certificate of the OCSP responder is that of the issuer -# of the certificate being validated. This property identifies the certificate -# of the OCSP responder when the default does not apply. Its value is a string -# distinguished name (defined in RFC 2253) which identifies a certificate in -# the set of certificates supplied during cert path validation. When this -# property is set then the "ocsp.responderCertSerialNumber" property must also -# be set. When the "ocsp.responderCertSubjectName" property is set then this -# property is ignored. -# -# Example, -# ocsp.responderCertIssuerName=CN=Enterprise CA, O=XYZ Corp - -# -# Serial number of the OCSP responder's certificate -# -# By default, the certificate of the OCSP responder is that of the issuer -# of the certificate being validated. This property identifies the certificate -# of the OCSP responder when the default does not apply. Its value is a string -# of hexadecimal digits (colon or space separators may be present) which -# identifies a certificate in the set of certificates supplied during cert path -# validation. When this property is set then the "ocsp.responderCertIssuerName" -# property must also be set. When the "ocsp.responderCertSubjectName" property -# is set then this property is ignored. -# -# Example, -# ocsp.responderCertSerialNumber=2A:FF:00 - -# -# Policy for failed Kerberos KDC lookups: -# -# When a KDC is unavailable (network error, service failure, etc), it is -# put inside a blacklist and accessed less often for future requests. The -# value (case-insensitive) for this policy can be: -# -# tryLast -# KDCs in the blacklist are always tried after those not on the list. -# -# tryLess[:max_retries,timeout] -# KDCs in the blacklist are still tried by their order in the configuration, -# but with smaller max_retries and timeout values. max_retries and timeout -# are optional numerical parameters (default 1 and 5000, which means once -# and 5 seconds). Please notes that if any of the values defined here is -# more than what is defined in krb5.conf, it will be ignored. -# -# Whenever a KDC is detected as available, it is removed from the blacklist. -# The blacklist is reset when krb5.conf is reloaded. You can add -# refreshKrb5Config=true to a JAAS configuration file so that krb5.conf is -# reloaded whenever a JAAS authentication is attempted. -# -# Example, -# krb5.kdc.bad.policy = tryLast -# krb5.kdc.bad.policy = tryLess:2,2000 -# -krb5.kdc.bad.policy = tryLast - -# -# Algorithm restrictions for certification path (CertPath) processing -# -# In some environments, certain algorithms or key lengths may be undesirable -# for certification path building and validation. For example, "MD2" is -# generally no longer considered to be a secure hash algorithm. This section -# describes the mechanism for disabling algorithms based on algorithm name -# and/or key length. This includes algorithms used in certificates, as well -# as revocation information such as CRLs and signed OCSP Responses. -# The syntax of the disabled algorithm string is described as follows: -# DisabledAlgorithms: -# " DisabledAlgorithm { , DisabledAlgorithm } " -# -# DisabledAlgorithm: -# AlgorithmName [Constraint] { '&' Constraint } -# -# AlgorithmName: -# (see below) -# -# Constraint: -# KeySizeConstraint | CAConstraint | DenyAfterConstraint | -# UsageConstraint -# -# KeySizeConstraint: -# keySize Operator KeyLength -# -# Operator: -# <= | < | == | != | >= | > -# -# KeyLength: -# Integer value of the algorithm's key length in bits -# -# CAConstraint: -# jdkCA -# -# DenyAfterConstraint: -# denyAfter YYYY-MM-DD -# -# UsageConstraint: -# usage [TLSServer] [TLSClient] [SignedJAR] -# -# The "AlgorithmName" is the standard algorithm name of the disabled -# algorithm. See "Java Cryptography Architecture Standard Algorithm Name -# Documentation" for information about Standard Algorithm Names. Matching -# is performed using a case-insensitive sub-element matching rule. (For -# example, in "SHA1withECDSA" the sub-elements are "SHA1" for hashing and -# "ECDSA" for signatures.) If the assertion "AlgorithmName" is a -# sub-element of the certificate algorithm name, the algorithm will be -# rejected during certification path building and validation. For example, -# the assertion algorithm name "DSA" will disable all certificate algorithms -# that rely on DSA, such as NONEwithDSA, SHA1withDSA. However, the assertion -# will not disable algorithms related to "ECDSA". -# -# A "Constraint" defines restrictions on the keys and/or certificates for -# a specified AlgorithmName: -# -# KeySizeConstraint: -# keySize Operator KeyLength -# The constraint requires a key of a valid size range if the -# "AlgorithmName" is of a key algorithm. The "KeyLength" indicates -# the key size specified in number of bits. For example, -# "RSA keySize <= 1024" indicates that any RSA key with key size less -# than or equal to 1024 bits should be disabled, and -# "RSA keySize < 1024, RSA keySize > 2048" indicates that any RSA key -# with key size less than 1024 or greater than 2048 should be disabled. -# This constraint is only used on algorithms that have a key size. -# -# CAConstraint: -# jdkCA -# This constraint prohibits the specified algorithm only if the -# algorithm is used in a certificate chain that terminates at a marked -# trust anchor in the lib/security/cacerts keystore. If the jdkCA -# constraint is not set, then all chains using the specified algorithm -# are restricted. jdkCA may only be used once in a DisabledAlgorithm -# expression. -# Example: To apply this constraint to SHA-1 certificates, include -# the following: "SHA1 jdkCA" -# -# DenyAfterConstraint: -# denyAfter YYYY-MM-DD -# This constraint prohibits a certificate with the specified algorithm -# from being used after the date regardless of the certificate's -# validity. JAR files that are signed and timestamped before the -# constraint date with certificates containing the disabled algorithm -# will not be restricted. The date is processed in the UTC timezone. -# This constraint can only be used once in a DisabledAlgorithm -# expression. -# Example: To deny usage of RSA 2048 bit certificates after Feb 3 2020, -# use the following: "RSA keySize == 2048 & denyAfter 2020-02-03" -# -# UsageConstraint: -# usage [TLSServer] [TLSClient] [SignedJAR] -# This constraint prohibits the specified algorithm for -# a specified usage. This should be used when disabling an algorithm -# for all usages is not practical. 'TLSServer' restricts the algorithm -# in TLS server certificate chains when server authentication is -# performed. 'TLSClient' restricts the algorithm in TLS client -# certificate chains when client authentication is performed. -# 'SignedJAR' constrains use of certificates in signed jar files. -# The usage type follows the keyword and more than one usage type can -# be specified with a whitespace delimiter. -# Example: "SHA1 usage TLSServer TLSClient" -# -# When an algorithm must satisfy more than one constraint, it must be -# delimited by an ampersand '&'. For example, to restrict certificates in a -# chain that terminate at a distribution provided trust anchor and contain -# RSA keys that are less than or equal to 1024 bits, add the following -# constraint: "RSA keySize <= 1024 & jdkCA". -# -# All DisabledAlgorithms expressions are processed in the order defined in the -# property. This requires lower keysize constraints to be specified -# before larger keysize constraints of the same algorithm. For example: -# "RSA keySize < 1024 & jdkCA, RSA keySize < 2048". -# -# Note: The algorithm restrictions do not apply to trust anchors or -# self-signed certificates. -# -# Note: This property is currently used by Oracle's PKIX implementation. It -# is not guaranteed to be examined and used by other implementations. -# -# Example: -# jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048 -# -# -jdk.certpath.disabledAlgorithms=MD2, MD5, SHA1 jdkCA & usage TLSServer, \ - RSA keySize < 1024, DSA keySize < 1024, EC keySize < 224 - -# -# Algorithm restrictions for signed JAR files -# -# In some environments, certain algorithms or key lengths may be undesirable -# for signed JAR validation. For example, "MD2" is generally no longer -# considered to be a secure hash algorithm. This section describes the -# mechanism for disabling algorithms based on algorithm name and/or key length. -# JARs signed with any of the disabled algorithms or key sizes will be treated -# as unsigned. -# -# The syntax of the disabled algorithm string is described as follows: -# DisabledAlgorithms: -# " DisabledAlgorithm { , DisabledAlgorithm } " -# -# DisabledAlgorithm: -# AlgorithmName [Constraint] { '&' Constraint } -# -# AlgorithmName: -# (see below) -# -# Constraint: -# KeySizeConstraint | DenyAfterConstraint -# -# KeySizeConstraint: -# keySize Operator KeyLength -# -# DenyAfterConstraint: -# denyAfter YYYY-MM-DD -# -# Operator: -# <= | < | == | != | >= | > -# -# KeyLength: -# Integer value of the algorithm's key length in bits -# -# Note: This property is currently used by the JDK Reference -# implementation. It is not guaranteed to be examined and used by other -# implementations. -# -# See "jdk.certpath.disabledAlgorithms" for syntax descriptions. -# -jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, \ - DSA keySize < 1024 - -# -# Algorithm restrictions for Secure Socket Layer/Transport Layer Security -# (SSL/TLS/DTLS) processing -# -# In some environments, certain algorithms or key lengths may be undesirable -# when using SSL/TLS/DTLS. This section describes the mechanism for disabling -# algorithms during SSL/TLS/DTLS security parameters negotiation, including -# protocol version negotiation, cipher suites selection, peer authentication -# and key exchange mechanisms. -# -# Disabled algorithms will not be negotiated for SSL/TLS connections, even -# if they are enabled explicitly in an application. -# -# For PKI-based peer authentication and key exchange mechanisms, this list -# of disabled algorithms will also be checked during certification path -# building and validation, including algorithms used in certificates, as -# well as revocation information such as CRLs and signed OCSP Responses. -# This is in addition to the jdk.certpath.disabledAlgorithms property above. -# -# See the specification of "jdk.certpath.disabledAlgorithms" for the -# syntax of the disabled algorithm string. -# -# Note: The algorithm restrictions do not apply to trust anchors or -# self-signed certificates. -# -# Note: This property is currently used by the JDK Reference implementation. -# It is not guaranteed to be examined and used by other implementations. -# -# Example: -# jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048 -jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 1024, \ - EC keySize < 224, DES40_CBC, RC4_40, 3DES_EDE_CBC - -# -# Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS) -# processing in JSSE implementation. -# -# In some environments, a certain algorithm may be undesirable but it -# cannot be disabled because of its use in legacy applications. Legacy -# algorithms may still be supported, but applications should not use them -# as the security strength of legacy algorithms are usually not strong enough -# in practice. -# -# During SSL/TLS security parameters negotiation, legacy algorithms will -# not be negotiated unless there are no other candidates. -# -# The syntax of the legacy algorithms string is described as this Java -# BNF-style: -# LegacyAlgorithms: -# " LegacyAlgorithm { , LegacyAlgorithm } " -# -# LegacyAlgorithm: -# AlgorithmName (standard JSSE algorithm name) -# -# See the specification of security property "jdk.certpath.disabledAlgorithms" -# for the syntax and description of the "AlgorithmName" notation. -# -# Per SSL/TLS specifications, cipher suites have the form: -# SSL_KeyExchangeAlg_WITH_CipherAlg_MacAlg -# or -# TLS_KeyExchangeAlg_WITH_CipherAlg_MacAlg -# -# For example, the cipher suite TLS_RSA_WITH_AES_128_CBC_SHA uses RSA as the -# key exchange algorithm, AES_128_CBC (128 bits AES cipher algorithm in CBC -# mode) as the cipher (encryption) algorithm, and SHA-1 as the message digest -# algorithm for HMAC. -# -# The LegacyAlgorithm can be one of the following standard algorithm names: -# 1. JSSE cipher suite name, e.g., TLS_RSA_WITH_AES_128_CBC_SHA -# 2. JSSE key exchange algorithm name, e.g., RSA -# 3. JSSE cipher (encryption) algorithm name, e.g., AES_128_CBC -# 4. JSSE message digest algorithm name, e.g., SHA -# -# See SSL/TLS specifications and "Java Cryptography Architecture Standard -# Algorithm Name Documentation" for information about the algorithm names. -# -# Note: If a legacy algorithm is also restricted through the -# jdk.tls.disabledAlgorithms property or the -# java.security.AlgorithmConstraints API (See -# javax.net.ssl.SSLParameters.setAlgorithmConstraints()), -# then the algorithm is completely disabled and will not be negotiated. -# -# Note: This property is currently used by the JDK Reference implementation. -# It is not guaranteed to be examined and used by other implementations. -# There is no guarantee the property will continue to exist or be of the -# same syntax in future releases. -# -# Example: -# jdk.tls.legacyAlgorithms=DH_anon, DES_CBC, SSL_RSA_WITH_RC4_128_MD5 -# -jdk.tls.legacyAlgorithms= \ - K_NULL, C_NULL, M_NULL, \ - DH_anon, ECDH_anon, \ - RC4_128, RC4_40, DES_CBC, DES40_CBC, \ - 3DES_EDE_CBC - -# -# The pre-defined default finite field Diffie-Hellman ephemeral (DHE) -# parameters for Transport Layer Security (SSL/TLS/DTLS) processing. -# -# In traditional SSL/TLS/DTLS connections where finite field DHE parameters -# negotiation mechanism is not used, the server offers the client group -# parameters, base generator g and prime modulus p, for DHE key exchange. -# It is recommended to use dynamic group parameters. This property defines -# a mechanism that allows you to specify custom group parameters. -# -# The syntax of this property string is described as this Java BNF-style: -# DefaultDHEParameters: -# DefinedDHEParameters { , DefinedDHEParameters } -# -# DefinedDHEParameters: -# "{" DHEPrimeModulus , DHEBaseGenerator "}" -# -# DHEPrimeModulus: -# HexadecimalDigits -# -# DHEBaseGenerator: -# HexadecimalDigits -# -# HexadecimalDigits: -# HexadecimalDigit { HexadecimalDigit } -# -# HexadecimalDigit: one of -# 0 1 2 3 4 5 6 7 8 9 A B C D E F a b c d e f -# -# Whitespace characters are ignored. -# -# The "DefinedDHEParameters" defines the custom group parameters, prime -# modulus p and base generator g, for a particular size of prime modulus p. -# The "DHEPrimeModulus" defines the hexadecimal prime modulus p, and the -# "DHEBaseGenerator" defines the hexadecimal base generator g of a group -# parameter. It is recommended to use safe primes for the custom group -# parameters. -# -# If this property is not defined or the value is empty, the underlying JSSE -# provider's default group parameter is used for each connection. -# -# If the property value does not follow the grammar, or a particular group -# parameter is not valid, the connection will fall back and use the -# underlying JSSE provider's default group parameter. -# -# Note: This property is currently used by OpenJDK's JSSE implementation. It -# is not guaranteed to be examined and used by other implementations. -# -# Example: -# jdk.tls.server.defaultDHEParameters= -# { \ -# FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1 \ -# 29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD \ -# EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245 \ -# E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED \ -# EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE65381 \ -# FFFFFFFF FFFFFFFF, 2} - -# -# TLS key limits on symmetric cryptographic algorithms -# -# This security property sets limits on algorithms key usage in TLS 1.3. -# When the amount of data encrypted exceeds the algorithm value listed below, -# a KeyUpdate message will trigger a key change. This is for symmetric ciphers -# with TLS 1.3 only. -# -# The syntax for the property is described below: -# KeyLimits: -# " KeyLimit { , KeyLimit } " -# -# WeakKeyLimit: -# AlgorithmName Action Length -# -# AlgorithmName: -# A full algorithm transformation. -# -# Action: -# KeyUpdate -# -# Length: -# The amount of encrypted data in a session before the Action occurs -# This value may be an integer value in bytes, or as a power of two, 2^29. -# -# KeyUpdate: -# The TLS 1.3 KeyUpdate handshake process begins when the Length amount -# is fulfilled. -# -# Note: This property is currently used by OpenJDK's JSSE implementation. It -# is not guaranteed to be examined and used by other implementations. -# -jdk.tls.keyLimits=AES/GCM/NoPadding KeyUpdate 2^37 - -# -# Cryptographic Jurisdiction Policy defaults -# -# Import and export control rules on cryptographic software vary from -# country to country. By default, Java provides two different sets of -# cryptographic policy files[1]: -# -# unlimited: These policy files contain no restrictions on cryptographic -# strengths or algorithms -# -# limited: These policy files contain more restricted cryptographic -# strengths -# -# The default setting is determined by the value of the "crypto.policy" -# Security property below. If your country or usage requires the -# traditional restrictive policy, the "limited" Java cryptographic -# policy is still available and may be appropriate for your environment. -# -# If you have restrictions that do not fit either use case mentioned -# above, Java provides the capability to customize these policy files. -# The "crypto.policy" security property points to a subdirectory -# within /conf/security/policy/ which can be customized. -# Please see the /conf/security/policy/README.txt file or consult -# the Java Security Guide/JCA documentation for more information. -# -# YOU ARE ADVISED TO CONSULT YOUR EXPORT/IMPORT CONTROL COUNSEL OR ATTORNEY -# TO DETERMINE THE EXACT REQUIREMENTS. -# -# [1] Please note that the JCE for Java SE, including the JCE framework, -# cryptographic policy files, and standard JCE providers provided with -# the Java SE, have been reviewed and approved for export as mass market -# encryption item by the US Bureau of Industry and Security. -# -# Note: This property is currently used by the JDK Reference implementation. -# It is not guaranteed to be examined and used by other implementations. -# -crypto.policy=unlimited - -# -# The policy for the XML Signature secure validation mode. The mode is -# enabled by setting the property "org.jcp.xml.dsig.secureValidation" to -# true with the javax.xml.crypto.XMLCryptoContext.setProperty() method, -# or by running the code with a SecurityManager. -# -# Policy: -# Constraint {"," Constraint } -# Constraint: -# AlgConstraint | MaxTransformsConstraint | MaxReferencesConstraint | -# ReferenceUriSchemeConstraint | KeySizeConstraint | OtherConstraint -# AlgConstraint -# "disallowAlg" Uri -# MaxTransformsConstraint: -# "maxTransforms" Integer -# MaxReferencesConstraint: -# "maxReferences" Integer -# ReferenceUriSchemeConstraint: -# "disallowReferenceUriSchemes" String { String } -# KeySizeConstraint: -# "minKeySize" KeyAlg Integer -# OtherConstraint: -# "noDuplicateIds" | "noRetrievalMethodLoops" -# -# For AlgConstraint, Uri is the algorithm URI String that is not allowed. -# See the XML Signature Recommendation for more information on algorithm -# URI Identifiers. For KeySizeConstraint, KeyAlg is the standard algorithm -# name of the key type (ex: "RSA"). If the MaxTransformsConstraint, -# MaxReferencesConstraint or KeySizeConstraint (for the same key type) is -# specified more than once, only the last entry is enforced. -# -# Note: This property is currently used by the JDK Reference implementation. It -# is not guaranteed to be examined and used by other implementations. -# -jdk.xml.dsig.secureValidationPolicy=\ - disallowAlg http://www.w3.org/TR/1999/REC-xslt-19991116,\ - disallowAlg http://www.w3.org/2001/04/xmldsig-more#rsa-md5,\ - disallowAlg http://www.w3.org/2001/04/xmldsig-more#hmac-md5,\ - disallowAlg http://www.w3.org/2001/04/xmldsig-more#md5,\ - maxTransforms 5,\ - maxReferences 30,\ - disallowReferenceUriSchemes file http https,\ - minKeySize RSA 1024,\ - minKeySize DSA 1024,\ - minKeySize EC 224,\ - noDuplicateIds,\ - noRetrievalMethodLoops - -# -# Serialization process-wide filter -# -# A filter, if configured, is used by java.io.ObjectInputStream during -# deserialization to check the contents of the stream. -# A filter is configured as a sequence of patterns, each pattern is either -# matched against the name of a class in the stream or defines a limit. -# Patterns are separated by ";" (semicolon). -# Whitespace is significant and is considered part of the pattern. -# -# If the system property jdk.serialFilter is also specified, it supersedes -# the security property value defined here. -# -# If a pattern includes a "=", it sets a limit. -# If a limit appears more than once the last value is used. -# Limits are checked before classes regardless of the order in the -# sequence of patterns. -# If any of the limits are exceeded, the filter status is REJECTED. -# -# maxdepth=value - the maximum depth of a graph -# maxrefs=value - the maximum number of internal references -# maxbytes=value - the maximum number of bytes in the input stream -# maxarray=value - the maximum array length allowed -# -# Other patterns, from left to right, match the class or package name as -# returned from Class.getName. -# If the class is an array type, the class or package to be matched is the -# element type. -# Arrays of any number of dimensions are treated the same as the element type. -# For example, a pattern of "!example.Foo", rejects creation of any instance or -# array of example.Foo. -# -# If the pattern starts with "!", the status is REJECTED if the remaining -# pattern is matched; otherwise the status is ALLOWED if the pattern matches. -# If the pattern contains "/", the non-empty prefix up to the "/" is the -# module name; -# if the module name matches the module name of the class then -# the remaining pattern is matched with the class name. -# If there is no "/", the module name is not compared. -# If the pattern ends with ".**" it matches any class in the package and all -# subpackages. -# If the pattern ends with ".*" it matches any class in the package. -# If the pattern ends with "*", it matches any class with the pattern as a -# prefix. -# If the pattern is equal to the class name, it matches. -# Otherwise, the status is UNDECIDED. -# -#jdk.serialFilter=pattern;pattern - -# -# RMI Registry Serial Filter -# -# The filter pattern uses the same format as jdk.serialFilter. -# This filter can override the builtin filter if additional types need to be -# allowed or rejected from the RMI Registry or to decrease limits but not -# to increase limits. -# If the limits (maxdepth, maxrefs, or maxbytes) are exceeded, the object is rejected. -# -# Each non-array type is allowed or rejected if it matches one of the patterns, -# evaluated from left to right, and is otherwise allowed. Arrays of any -# component type, including subarrays and arrays of primitives, are allowed. -# -# Array construction of any component type, including subarrays and arrays of -# primitives, are allowed unless the length is greater than the maxarray limit. -# The filter is applied to each array element. -# -# Note: This property is currently used by the JDK Reference implementation. -# It is not guaranteed to be examined and used by other implementations. -# -# The built-in filter allows subclasses of allowed classes and -# can approximately be represented as the pattern: -# -#sun.rmi.registry.registryFilter=\ -# maxarray=1000000;\ -# maxdepth=20;\ -# java.lang.String;\ -# java.lang.Number;\ -# java.lang.reflect.Proxy;\ -# java.rmi.Remote;\ -# sun.rmi.server.UnicastRef;\ -# sun.rmi.server.RMIClientSocketFactory;\ -# sun.rmi.server.RMIServerSocketFactory;\ -# java.rmi.activation.ActivationID;\ -# java.rmi.server.UID -# -# RMI Distributed Garbage Collector (DGC) Serial Filter -# -# The filter pattern uses the same format as jdk.serialFilter. -# This filter can override the builtin filter if additional types need to be -# allowed or rejected from the RMI DGC. -# -# Note: This property is currently used by the JDK Reference implementation. -# It is not guaranteed to be examined and used by other implementations. -# -# The builtin DGC filter can approximately be represented as the filter pattern: -# -#sun.rmi.transport.dgcFilter=\ -# java.rmi.server.ObjID;\ -# java.rmi.server.UID;\ -# java.rmi.dgc.VMID;\ -# java.rmi.dgc.Lease;\ -# maxdepth=5;maxarray=10000 - -# CORBA ORBIorTypeCheckRegistryFilter -# Type check enhancement for ORB::string_to_object processing -# -# An IOR type check filter, if configured, is used by an ORB during -# an ORB::string_to_object invocation to check the veracity of the type encoded -# in the ior string. -# -# The filter pattern consists of a semi-colon separated list of class names. -# The configured list contains the binary class names of the IDL interface types -# corresponding to the IDL stub class to be instantiated. -# As such, a filter specifies a list of IDL stub classes that will be -# allowed by an ORB when an ORB::string_to_object is invoked. -# It is used to specify a white list configuration of acceptable -# IDL stub types which may be contained in a stringified IOR -# parameter passed as input to an ORB::string_to_object method. -# -# Note: This property is currently used by the JDK Reference implementation. -# It is not guaranteed to be examined and used by other implementations. -# -#com.sun.CORBA.ORBIorTypeCheckRegistryFilter=binary_class_name;binary_class_name - -# -# JCEKS Encrypted Key Serial Filter -# -# This filter, if configured, is used by the JCEKS KeyStore during the -# deserialization of the encrypted Key object stored inside a key entry. -# If not configured or the filter result is UNDECIDED (i.e. none of the patterns -# matches), the filter configured by jdk.serialFilter will be consulted. -# -# If the system property jceks.key.serialFilter is also specified, it supersedes -# the security property value defined here. -# -# The filter pattern uses the same format as jdk.serialFilter. The default -# pattern allows java.lang.Enum, java.security.KeyRep, java.security.KeyRep$Type, -# and javax.crypto.spec.SecretKeySpec and rejects all the others. -jceks.key.serialFilter = java.base/java.lang.Enum;java.base/java.security.KeyRep;\ - java.base/java.security.KeyRep$Type;java.base/javax.crypto.spec.SecretKeySpec;!* - -# -# Enhanced exception message information -# -# By default, exception messages should not include potentially sensitive -# information such as file names, host names, or port numbers. This property -# accepts one or more comma separated values, each of which represents a -# category of enhanced exception message information to enable. Values are -# case-insensitive. Leading and trailing whitespaces, surrounding each value, -# are ignored. Unknown values are ignored. -# -# NOTE: Use caution before setting this property. Setting this property -# exposes sensitive information in Exceptions, which could, for example, -# propagate to untrusted code or be emitted in stack traces that are -# inadvertently disclosed and made accessible over a public network. -# -# The categories are: -# -# hostInfo - IOExceptions thrown by java.net.Socket and the socket types in the -# java.nio.channels package will contain enhanced exception -# message information -# -# The property setting in this file can be overridden by a system property of -# the same name, with the same syntax and possible values. -# -#jdk.includeInExceptions=hostInfo diff --git a/jre-11/conf/security/policy/README.txt b/jre-11/conf/security/policy/README.txt deleted file mode 100644 index fdf77d3e3..000000000 --- a/jre-11/conf/security/policy/README.txt +++ /dev/null @@ -1,54 +0,0 @@ - - Java(TM) Cryptography Extension Policy Files - for the Java(TM) Platform, Standard Edition Runtime Environment - - README ------------------------------------------------------------------------- - -Import and export control rules on cryptographic software vary from -country to country. The Java Cryptography Extension (JCE) architecture -allows flexible cryptographic key strength to be configured via the -jurisdiction policy files which are referenced by the "crypto.policy" -security property in the /conf/security/java.security file. - -By default, Java provides two different sets of cryptographic policy -files: - - unlimited: These policy files contain no restrictions on cryptographic - strengths or algorithms - - limited: These policy files contain more restricted cryptographic - strengths - -These files reside in /conf/security/policy in the "unlimited" -or "limited" subdirectories respectively. - -Each subdirectory contains a complete policy configuration, -and subdirectories can be added/edited/removed to reflect your -import or export control product requirements. - -Within a subdirectory, the effective policy is the combined minimum -permissions of the grant statements in the file(s) matching the filename -pattern "default_*.policy". At least one grant is required. For example: - - limited = Export (all) + Import (limited) = Limited - unlimited = Export (all) + Import (all) = Unlimited - -The effective exemption policy is the combined minimum permissions -of the grant statements in the file(s) matching the filename pattern -"exempt_*.policy". Exemption grants are optional. For example: - - limited = grants exemption permissions, by which the - effective policy can be circumvented. - e.g. KeyRecovery/KeyEscrow/KeyWeakening. - -Please see the Java Cryptography Architecture (JCA) documentation for -additional information on these files and formats. - -YOU ARE ADVISED TO CONSULT YOUR EXPORT/IMPORT CONTROL COUNSEL OR ATTORNEY -TO DETERMINE THE EXACT REQUIREMENTS. - -Please note that the JCE for Java SE, including the JCE framework, -cryptographic policy files, and standard JCE providers provided with -the Java SE, have been reviewed and approved for export as mass market -encryption item by the US Bureau of Industry and Security. diff --git a/jre-11/conf/security/policy/limited/default_US_export.policy b/jre-11/conf/security/policy/limited/default_US_export.policy deleted file mode 100644 index 1f3893405..000000000 --- a/jre-11/conf/security/policy/limited/default_US_export.policy +++ /dev/null @@ -1,6 +0,0 @@ -// Default US Export policy file. - -grant { - // There is no restriction to any algorithms. - permission javax.crypto.CryptoAllPermission; -}; diff --git a/jre-11/conf/security/policy/limited/default_local.policy b/jre-11/conf/security/policy/limited/default_local.policy deleted file mode 100644 index 2a6d51340..000000000 --- a/jre-11/conf/security/policy/limited/default_local.policy +++ /dev/null @@ -1,14 +0,0 @@ -// Some countries have import limits on crypto strength. This policy file -// is worldwide importable. - -grant { - permission javax.crypto.CryptoPermission "DES", 64; - permission javax.crypto.CryptoPermission "DESede", *; - permission javax.crypto.CryptoPermission "RC2", 128, - "javax.crypto.spec.RC2ParameterSpec", 128; - permission javax.crypto.CryptoPermission "RC4", 128; - permission javax.crypto.CryptoPermission "RC5", 128, - "javax.crypto.spec.RC5ParameterSpec", *, 12, *; - permission javax.crypto.CryptoPermission "RSA", *; - permission javax.crypto.CryptoPermission *, 128; -}; diff --git a/jre-11/conf/security/policy/limited/exempt_local.policy b/jre-11/conf/security/policy/limited/exempt_local.policy deleted file mode 100644 index 9dd5b91b0..000000000 --- a/jre-11/conf/security/policy/limited/exempt_local.policy +++ /dev/null @@ -1,13 +0,0 @@ -// Some countries have import limits on crypto strength, but may allow for -// these exemptions if the exemption mechanism is used. - -grant { - // There is no restriction to any algorithms if KeyRecovery is enforced. - permission javax.crypto.CryptoPermission *, "KeyRecovery"; - - // There is no restriction to any algorithms if KeyEscrow is enforced. - permission javax.crypto.CryptoPermission *, "KeyEscrow"; - - // There is no restriction to any algorithms if KeyWeakening is enforced. - permission javax.crypto.CryptoPermission *, "KeyWeakening"; -}; diff --git a/jre-11/conf/security/policy/unlimited/default_US_export.policy b/jre-11/conf/security/policy/unlimited/default_US_export.policy deleted file mode 100644 index 1f3893405..000000000 --- a/jre-11/conf/security/policy/unlimited/default_US_export.policy +++ /dev/null @@ -1,6 +0,0 @@ -// Default US Export policy file. - -grant { - // There is no restriction to any algorithms. - permission javax.crypto.CryptoAllPermission; -}; diff --git a/jre-11/conf/security/policy/unlimited/default_local.policy b/jre-11/conf/security/policy/unlimited/default_local.policy deleted file mode 100644 index 2b907e258..000000000 --- a/jre-11/conf/security/policy/unlimited/default_local.policy +++ /dev/null @@ -1,6 +0,0 @@ -// Country-specific policy file for countries with no limits on crypto strength. - -grant { - // There is no restriction to any algorithms. - permission javax.crypto.CryptoAllPermission; -}; diff --git a/jre-11/conf/sound.properties b/jre-11/conf/sound.properties deleted file mode 100644 index 68309d111..000000000 --- a/jre-11/conf/sound.properties +++ /dev/null @@ -1,39 +0,0 @@ -############################################################ -# Sound Configuration File -############################################################ -# -# This properties file is used to specify default service -# providers for javax.sound.midi.MidiSystem and -# javax.sound.sampled.AudioSystem. -# -# The following keys are recognized by MidiSystem methods: -# -# javax.sound.midi.Receiver -# javax.sound.midi.Sequencer -# javax.sound.midi.Synthesizer -# javax.sound.midi.Transmitter -# -# The following keys are recognized by AudioSystem methods: -# -# javax.sound.sampled.Clip -# javax.sound.sampled.Port -# javax.sound.sampled.SourceDataLine -# javax.sound.sampled.TargetDataLine -# -# The values specify the full class name of the service -# provider, or the device name. -# -# See the class descriptions for details. -# -# Example 1: -# Use MyDeviceProvider as default for SourceDataLines: -# javax.sound.sampled.SourceDataLine=com.xyz.MyDeviceProvider -# -# Example 2: -# Specify the default Synthesizer by its name "InternalSynth". -# javax.sound.midi.Synthesizer=#InternalSynth -# -# Example 3: -# Specify the default Receiver by provider and name: -# javax.sound.midi.Receiver=com.sun.media.sound.MidiProvider#SunMIDI1 -# diff --git a/jre-11/legal/java.base/ADDITIONAL_LICENSE_INFO b/jre-11/legal/java.base/ADDITIONAL_LICENSE_INFO deleted file mode 100644 index ff700cd09..000000000 --- a/jre-11/legal/java.base/ADDITIONAL_LICENSE_INFO +++ /dev/null @@ -1,37 +0,0 @@ - ADDITIONAL INFORMATION ABOUT LICENSING - -Certain files distributed by Oracle America, Inc. and/or its affiliates are -subject to the following clarification and special exception to the GPLv2, -based on the GNU Project exception for its Classpath libraries, known as the -GNU Classpath Exception. - -Note that Oracle includes multiple, independent programs in this software -package. Some of those programs are provided under licenses deemed -incompatible with the GPLv2 by the Free Software Foundation and others. -For example, the package includes programs licensed under the Apache -License, Version 2.0 and may include FreeType. Such programs are licensed -to you under their original licenses. - -Oracle facilitates your further distribution of this package by adding the -Classpath Exception to the necessary parts of its GPLv2 code, which permits -you to use that code in combination with other independent modules not -licensed under the GPLv2. However, note that this would not permit you to -commingle code under an incompatible license with Oracle's GPLv2 licensed -code by, for example, cutting and pasting such code into a file also -containing Oracle's GPLv2 licensed code and then distributing the result. - -Additionally, if you were to remove the Classpath Exception from any of the -files to which it applies and distribute the result, you would likely be -required to license some or all of the other code in that distribution under -the GPLv2 as well, and since the GPLv2 is incompatible with the license terms -of some items included in the distribution by Oracle, removing the Classpath -Exception could therefore effectively compromise your ability to further -distribute the package. - -Failing to distribute notices associated with some files may also create -unexpected legal consequences. - -Proceed with caution and we recommend that you obtain the advice of a lawyer -skilled in open source matters before removing the Classpath Exception or -making modifications to this package which may subsequently be redistributed -and/or involve the use of third party software. diff --git a/jre-11/legal/java.base/ASSEMBLY_EXCEPTION b/jre-11/legal/java.base/ASSEMBLY_EXCEPTION deleted file mode 100644 index 065b8d902..000000000 --- a/jre-11/legal/java.base/ASSEMBLY_EXCEPTION +++ /dev/null @@ -1,27 +0,0 @@ - -OPENJDK ASSEMBLY EXCEPTION - -The OpenJDK source code made available by Oracle America, Inc. (Oracle) at -openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU -General Public License version 2 -only ("GPL2"), with the following clarification and special exception. - - Linking this OpenJDK Code statically or dynamically with other code - is making a combined work based on this library. Thus, the terms - and conditions of GPL2 cover the whole combination. - - As a special exception, Oracle gives you permission to link this - OpenJDK Code with certain code licensed by Oracle as indicated at - http://openjdk.java.net/legal/exception-modules-2007-05-08.html - ("Designated Exception Modules") to produce an executable, - regardless of the license terms of the Designated Exception Modules, - and to copy and distribute the resulting executable under GPL2, - provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Oracle. - -As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code -to build an executable that includes those portions of necessary code that -Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 -with the Classpath exception). If you modify or add to the OpenJDK code, -that new GPL2 code may still be combined with Designated Exception Modules -if the new code is made subject to this exception by its copyright holder. diff --git a/jre-11/legal/java.base/LICENSE b/jre-11/legal/java.base/LICENSE deleted file mode 100644 index 8b400c7ab..000000000 --- a/jre-11/legal/java.base/LICENSE +++ /dev/null @@ -1,347 +0,0 @@ -The GNU General Public License (GPL) - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to -most of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you -can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for -a fee, you must give the recipients all the rights that you have. You must -make sure that they, too, receive or can get the source code. And you must -show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced -by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program proprietary. -To prevent this, we have made it clear that any patent must be licensed for -everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included -without limitation in the term "modification".) Each licensee is addressed as -"you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is -not restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and give any other recipients of the -Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or - in part contains or is derived from the Program or any part thereof, to be - licensed as a whole at no charge to all third parties under the terms of - this License. - - c) If the modified program normally reads commands interactively when run, - you must cause it, when started running for such interactive use in the - most ordinary way, to print or display an announcement including an - appropriate copyright notice and a notice that there is no warranty (or - else, saying that you provide a warranty) and that users may redistribute - the program under these conditions, and telling the user how to view a copy - of this License. (Exception: if the Program itself is interactive but does - not normally print such an announcement, your work based on the Program is - not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms -of this License, whose permissions for other licensees extend to the entire -whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and -2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 above - on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to - give any third party, for a charge no more than your cost of physically - performing source distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only - for noncommercial distribution and only if you received the program in - object code or executable form with such an offer, in accord with - Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code -distributed need not include anything that is normally distributed (in either -source or binary form) with the major components (compiler, kernel, and so on) -of the operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or -any work based on the Program), you indicate your acceptance of this License to -do so, and all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to -copy, distribute or modify the Program subject to these terms and conditions. -You may not impose any further restrictions on the recipients' exercise of the -rights granted herein. You are not responsible for enforcing compliance by -third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Program at all. -For example, if a patent license would not permit royalty-free redistribution -of the Program by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In -such case, this License incorporates the limitation as if written in the body -of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software Foundation. -If the Program does not specify a version number of this License, you may -choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR -INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA -BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER -OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - - Copyright (C) - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author Gnomovision comes - with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free - software, and you are welcome to redistribute it under certain conditions; - type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than 'show w' and 'show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here -is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - 'Gnomovision' (which makes passes at compilers) written by James Hacker. - - signature of Ty Coon, 1 April 1989 - - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. - - -"CLASSPATH" EXCEPTION TO THE GPL - -Certain source files distributed by Oracle America and/or its affiliates are -subject to the following clarification and special exception to the GPL, but -only where Oracle has expressly included in the particular source file's header -the words "Oracle designates this particular file as subject to the "Classpath" -exception as provided by Oracle in the LICENSE file that accompanied this code." - - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. diff --git a/jre-11/legal/java.base/aes.md b/jre-11/legal/java.base/aes.md deleted file mode 100644 index 6d0ee2e2b..000000000 --- a/jre-11/legal/java.base/aes.md +++ /dev/null @@ -1,36 +0,0 @@ -## Cryptix AES v3.2.0 - -### Cryptix General License -
-
-Cryptix General License
-
-Copyright (c) 1995-2005 The Cryptix Foundation Limited.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-  1. Redistributions of source code must retain the copyright notice,
-     this list of conditions and the following disclaimer.
-
-  2. Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in
-     the documentation and/or other materials provided with the
-     distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE CRYPTIX FOUNDATION LIMITED AND
-CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE CRYPTIX FOUNDATION LIMITED OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
diff --git a/jre-11/legal/java.base/asm.md b/jre-11/legal/java.base/asm.md deleted file mode 100644 index 351e45a2c..000000000 --- a/jre-11/legal/java.base/asm.md +++ /dev/null @@ -1,36 +0,0 @@ -## ASM Bytecode Manipulation Framework v6.0 - -### ASM License -
-
-Copyright (c) 2000-2011 France Télécom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holders nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
-
-
diff --git a/jre-11/legal/java.base/c-libutl.md b/jre-11/legal/java.base/c-libutl.md deleted file mode 100644 index 8bc988068..000000000 --- a/jre-11/legal/java.base/c-libutl.md +++ /dev/null @@ -1,35 +0,0 @@ -## c-libutl 20160225 - -### c-libutl License -``` - -This software is distributed under the terms of the BSD license. - -== BSD LICENSE =============================================================== - - (C) 2009 by Remo Dentato (rdentato@gmail.com) - - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -http://opensource.org/licenses/bsd-license.php - -``` diff --git a/jre-11/legal/java.base/cldr.md b/jre-11/legal/java.base/cldr.md deleted file mode 100644 index f6141ee68..000000000 --- a/jre-11/legal/java.base/cldr.md +++ /dev/null @@ -1,66 +0,0 @@ -## Unicode Common Local Data Repository (CLDR) v33 - -### CLDR License - -``` - -UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE -Unicode Data Files include all data files under the directories -http://www.unicode.org/Public/, http://www.unicode.org/reports/, -http://www.unicode.org/cldr/data/, -http://source.icu-project.org/repos/icu/, and -http://www.unicode.org/utility/trac/browser/. - -Unicode Data Files do not include PDF online code charts under the -directory http://www.unicode.org/Public/. - -Software includes any source code published in the Unicode Standard -or under the directories -http://www.unicode.org/Public/, http://www.unicode.org/reports/, -http://www.unicode.org/cldr/data/, -http://source.icu-project.org/repos/icu/, and -http://www.unicode.org/utility/trac/browser/. - -NOTICE TO USER: Carefully read the following legal agreement. -BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S -DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), -YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE -TERMS AND CONDITIONS OF THIS AGREEMENT. -IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE -THE DATA FILES OR SOFTWARE. - -COPYRIGHT AND PERMISSION NOTICE - -Copyright © 1991-2018 Unicode, Inc. All rights reserved. -Distributed under the Terms of Use in http://www.unicode.org/copyright.html. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Unicode data files and any associated documentation -(the "Data Files") or Unicode software and any associated documentation -(the "Software") to deal in the Data Files or Software -without restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, and/or sell copies of -the Data Files or Software, and to permit persons to whom the Data Files -or Software are furnished to do so, provided that either -(a) this copyright and permission notice appear with all copies -of the Data Files or Software, or -(b) this copyright and permission notice appear in associated -Documentation. - -THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF -ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT OF THIRD PARTY RIGHTS. -IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS -NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL -DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THE DATA FILES OR SOFTWARE. - -Except as contained in this notice, the name of a copyright holder -shall not be used in advertising or otherwise to promote the sale, -use or other dealings in these Data Files or Software without prior -written authorization of the copyright holder. - -``` diff --git a/jre-11/legal/java.base/icu.md b/jre-11/legal/java.base/icu.md deleted file mode 100644 index 9bf02a637..000000000 --- a/jre-11/legal/java.base/icu.md +++ /dev/null @@ -1,66 +0,0 @@ -## International Components for Unicode (ICU4J) v60.2 - -### ICU4J License - -``` - -UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE -Unicode Data Files include all data files under the directories -http://www.unicode.org/Public/, http://www.unicode.org/reports/, -http://www.unicode.org/cldr/data/, -http://source.icu-project.org/repos/icu/, and -http://www.unicode.org/utility/trac/browser/. - -Unicode Data Files do not include PDF online code charts under the -directory http://www.unicode.org/Public/. - -Software includes any source code published in the Unicode Standard -or under the directories -http://www.unicode.org/Public/, http://www.unicode.org/reports/, -http://www.unicode.org/cldr/data/, -http://source.icu-project.org/repos/icu/, and -http://www.unicode.org/utility/trac/browser/. - -NOTICE TO USER: Carefully read the following legal agreement. -BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S -DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), -YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE -TERMS AND CONDITIONS OF THIS AGREEMENT. -IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE -THE DATA FILES OR SOFTWARE. - -COPYRIGHT AND PERMISSION NOTICE - -Copyright © 1991-2018 Unicode, Inc. All rights reserved. -Distributed under the Terms of Use in http://www.unicode.org/copyright.html. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Unicode data files and any associated documentation -(the "Data Files") or Unicode software and any associated documentation -(the "Software") to deal in the Data Files or Software -without restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, and/or sell copies of -the Data Files or Software, and to permit persons to whom the Data Files -or Software are furnished to do so, provided that either -(a) this copyright and permission notice appear with all copies -of the Data Files or Software, or -(b) this copyright and permission notice appear in associated -Documentation. - -THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF -ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT OF THIRD PARTY RIGHTS. -IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS -NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL -DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THE DATA FILES OR SOFTWARE. - -Except as contained in this notice, the name of a copyright holder -shall not be used in advertising or otherwise to promote the sale, -use or other dealings in these Data Files or Software without prior -written authorization of the copyright holder. - -``` diff --git a/jre-11/legal/java.base/public_suffix.md b/jre-11/legal/java.base/public_suffix.md deleted file mode 100644 index 5f7cd5a30..000000000 --- a/jre-11/legal/java.base/public_suffix.md +++ /dev/null @@ -1,399 +0,0 @@ -## Mozilla Public Suffix List - -### Public Suffix Notice -``` -You are receiving a copy of the Mozilla Public Suffix List in the following -file: /lib/security/public_suffix_list.dat. The terms of the -Oracle license do NOT apply to this file; it is licensed under the -Mozilla Public License 2.0, separately from the Oracle programs you receive. -If you do not wish to use the Public Suffix List, you may remove the -/lib/security/public_suffix_list.dat file. - -The Source Code of this file is available under the -Mozilla Public License, v. 2.0 and is located at -https://raw.githubusercontent.com/publicsuffix/list/2225db8d9f4a2a27ec697c883360632fa0c16261/public_suffix_list.dat. -If a copy of the MPL was not distributed with this file, you can obtain one -at https://mozilla.org/MPL/2.0/. - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the License. -``` - -### MPL v2.0 -``` -Mozilla Public License Version 2.0 -================================== - -1. Definitions --------------- - -1.1. "Contributor" - means each individual or legal entity that creates, contributes to - the creation of, or owns Covered Software. - -1.2. "Contributor Version" - means the combination of the Contributions of others (if any) used - by a Contributor and that particular Contributor's Contribution. - -1.3. "Contribution" - means Covered Software of a particular Contributor. - -1.4. "Covered Software" - means Source Code Form to which the initial Contributor has attached - the notice in Exhibit A, the Executable Form of such Source Code - Form, and Modifications of such Source Code Form, in each case - including portions thereof. - -1.5. "Incompatible With Secondary Licenses" - means - - (a) that the initial Contributor has attached the notice described - in Exhibit B to the Covered Software; or - - (b) that the Covered Software was made available under the terms of - version 1.1 or earlier of the License, but not also under the - terms of a Secondary License. - -1.6. "Executable Form" - means any form of the work other than Source Code Form. - -1.7. "Larger Work" - means a work that combines Covered Software with other material, in - a separate file or files, that is not Covered Software. - -1.8. "License" - means this document. - -1.9. "Licensable" - means having the right to grant, to the maximum extent possible, - whether at the time of the initial grant or subsequently, any and - all of the rights conveyed by this License. - -1.10. "Modifications" - means any of the following: - - (a) any file in Source Code Form that results from an addition to, - deletion from, or modification of the contents of Covered - Software; or - - (b) any new file in Source Code Form that contains any Covered - Software. - -1.11. "Patent Claims" of a Contributor - means any patent claim(s), including without limitation, method, - process, and apparatus claims, in any patent Licensable by such - Contributor that would be infringed, but for the grant of the - License, by the making, using, selling, offering for sale, having - made, import, or transfer of either its Contributions or its - Contributor Version. - -1.12. "Secondary License" - means either the GNU General Public License, Version 2.0, the GNU - Lesser General Public License, Version 2.1, the GNU Affero General - Public License, Version 3.0, or any later versions of those - licenses. - -1.13. "Source Code Form" - means the form of the work preferred for making modifications. - -1.14. "You" (or "Your") - means an individual or a legal entity exercising rights under this - License. For legal entities, "You" includes any entity that - controls, is controlled by, or is under common control with You. For - purposes of this definition, "control" means (a) the power, direct - or indirect, to cause the direction or management of such entity, - whether by contract or otherwise, or (b) ownership of more than - fifty percent (50%) of the outstanding shares or beneficial - ownership of such entity. - -2. License Grants and Conditions --------------------------------- - -2.1. Grants - -Each Contributor hereby grants You a world-wide, royalty-free, -non-exclusive license: - -(a) under intellectual property rights (other than patent or trademark) - Licensable by such Contributor to use, reproduce, make available, - modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or - as part of a Larger Work; and - -(b) under Patent Claims of such Contributor to make, use, sell, offer - for sale, have made, import, and otherwise transfer either its - Contributions or its Contributor Version. - -2.2. Effective Date - -The licenses granted in Section 2.1 with respect to any Contribution -become effective for each Contribution on the date the Contributor first -distributes such Contribution. - -2.3. Limitations on Grant Scope - -The licenses granted in this Section 2 are the only rights granted under -this License. No additional rights or licenses will be implied from the -distribution or licensing of Covered Software under this License. -Notwithstanding Section 2.1(b) above, no patent license is granted by a -Contributor: - -(a) for any code that a Contributor has removed from Covered Software; - or - -(b) for infringements caused by: (i) Your and any other third party's - modifications of Covered Software, or (ii) the combination of its - Contributions with other software (except as part of its Contributor - Version); or - -(c) under Patent Claims infringed by Covered Software in the absence of - its Contributions. - -This License does not grant any rights in the trademarks, service marks, -or logos of any Contributor (except as may be necessary to comply with -the notice requirements in Section 3.4). - -2.4. Subsequent Licenses - -No Contributor makes additional grants as a result of Your choice to -distribute the Covered Software under a subsequent version of this -License (see Section 10.2) or under the terms of a Secondary License (if -permitted under the terms of Section 3.3). - -2.5. Representation - -Each Contributor represents that the Contributor believes its -Contributions are its original creation(s) or it has sufficient rights -to grant the rights to its Contributions conveyed by this License. - -2.6. Fair Use - -This License is not intended to limit any rights You have under -applicable copyright doctrines of fair use, fair dealing, or other -equivalents. - -2.7. Conditions - -Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted -in Section 2.1. - -3. Responsibilities -------------------- - -3.1. Distribution of Source Form - -All distribution of Covered Software in Source Code Form, including any -Modifications that You create or to which You contribute, must be under -the terms of this License. You must inform recipients that the Source -Code Form of the Covered Software is governed by the terms of this -License, and how they can obtain a copy of this License. You may not -attempt to alter or restrict the recipients' rights in the Source Code -Form. - -3.2. Distribution of Executable Form - -If You distribute Covered Software in Executable Form then: - -(a) such Covered Software must also be made available in Source Code - Form, as described in Section 3.1, and You must inform recipients of - the Executable Form how they can obtain a copy of such Source Code - Form by reasonable means in a timely manner, at a charge no more - than the cost of distribution to the recipient; and - -(b) You may distribute such Executable Form under the terms of this - License, or sublicense it under different terms, provided that the - license for the Executable Form does not attempt to limit or alter - the recipients' rights in the Source Code Form under this License. - -3.3. Distribution of a Larger Work - -You may create and distribute a Larger Work under terms of Your choice, -provided that You also comply with the requirements of this License for -the Covered Software. If the Larger Work is a combination of Covered -Software with a work governed by one or more Secondary Licenses, and the -Covered Software is not Incompatible With Secondary Licenses, this -License permits You to additionally distribute such Covered Software -under the terms of such Secondary License(s), so that the recipient of -the Larger Work may, at their option, further distribute the Covered -Software under the terms of either this License or such Secondary -License(s). - -3.4. Notices - -You may not remove or alter the substance of any license notices -(including copyright notices, patent notices, disclaimers of warranty, -or limitations of liability) contained within the Source Code Form of -the Covered Software, except that You may alter any license notices to -the extent required to remedy known factual inaccuracies. - -3.5. Application of Additional Terms - -You may choose to offer, and to charge a fee for, warranty, support, -indemnity or liability obligations to one or more recipients of Covered -Software. However, You may do so only on Your own behalf, and not on -behalf of any Contributor. You must make it absolutely clear that any -such warranty, support, indemnity, or liability obligation is offered by -You alone, and You hereby agree to indemnify every Contributor for any -liability incurred by such Contributor as a result of warranty, support, -indemnity or liability terms You offer. You may include additional -disclaimers of warranty and limitations of liability specific to any -jurisdiction. - -4. Inability to Comply Due to Statute or Regulation ---------------------------------------------------- - -If it is impossible for You to comply with any of the terms of this -License with respect to some or all of the Covered Software due to -statute, judicial order, or regulation then You must: (a) comply with -the terms of this License to the maximum extent possible; and (b) -describe the limitations and the code they affect. Such description must -be placed in a text file included with all distributions of the Covered -Software under this License. Except to the extent prohibited by statute -or regulation, such description must be sufficiently detailed for a -recipient of ordinary skill to be able to understand it. - -5. Termination --------------- - -5.1. The rights granted under this License will terminate automatically -if You fail to comply with any of its terms. However, if You become -compliant, then the rights granted under this License from a particular -Contributor are reinstated (a) provisionally, unless and until such -Contributor explicitly and finally terminates Your grants, and (b) on an -ongoing basis, if such Contributor fails to notify You of the -non-compliance by some reasonable means prior to 60 days after You have -come back into compliance. Moreover, Your grants from a particular -Contributor are reinstated on an ongoing basis if such Contributor -notifies You of the non-compliance by some reasonable means, this is the -first time You have received notice of non-compliance with this License -from such Contributor, and You become compliant prior to 30 days after -Your receipt of the notice. - -5.2. If You initiate litigation against any entity by asserting a patent -infringement claim (excluding declaratory judgment actions, -counter-claims, and cross-claims) alleging that a Contributor Version -directly or indirectly infringes any patent, then the rights granted to -You by any and all Contributors for the Covered Software under Section -2.1 of this License shall terminate. - -5.3. In the event of termination under Sections 5.1 or 5.2 above, all -end user license agreements (excluding distributors and resellers) which -have been validly granted by You or Your distributors under this License -prior to termination shall survive termination. - -************************************************************************ -* * -* 6. Disclaimer of Warranty * -* ------------------------- * -* * -* Covered Software is provided under this License on an "as is" * -* basis, without warranty of any kind, either expressed, implied, or * -* statutory, including, without limitation, warranties that the * -* Covered Software is free of defects, merchantable, fit for a * -* particular purpose or non-infringing. The entire risk as to the * -* quality and performance of the Covered Software is with You. * -* Should any Covered Software prove defective in any respect, You * -* (not any Contributor) assume the cost of any necessary servicing, * -* repair, or correction. This disclaimer of warranty constitutes an * -* essential part of this License. No use of any Covered Software is * -* authorized under this License except under this disclaimer. * -* * -************************************************************************ - -************************************************************************ -* * -* 7. Limitation of Liability * -* -------------------------- * -* * -* Under no circumstances and under no legal theory, whether tort * -* (including negligence), contract, or otherwise, shall any * -* Contributor, or anyone who distributes Covered Software as * -* permitted above, be liable to You for any direct, indirect, * -* special, incidental, or consequential damages of any character * -* including, without limitation, damages for lost profits, loss of * -* goodwill, work stoppage, computer failure or malfunction, or any * -* and all other commercial damages or losses, even if such party * -* shall have been informed of the possibility of such damages. This * -* limitation of liability shall not apply to liability for death or * -* personal injury resulting from such party's negligence to the * -* extent applicable law prohibits such limitation. Some * -* jurisdictions do not allow the exclusion or limitation of * -* incidental or consequential damages, so this exclusion and * -* limitation may not apply to You. * -* * -************************************************************************ - -8. Litigation -------------- - -Any litigation relating to this License may be brought only in the -courts of a jurisdiction where the defendant maintains its principal -place of business and such litigation shall be governed by laws of that -jurisdiction, without reference to its conflict-of-law provisions. -Nothing in this Section shall prevent a party's ability to bring -cross-claims or counter-claims. - -9. Miscellaneous ----------------- - -This License represents the complete agreement concerning the subject -matter hereof. If any provision of this License is held to be -unenforceable, such provision shall be reformed only to the extent -necessary to make it enforceable. Any law or regulation which provides -that the language of a contract shall be construed against the drafter -shall not be used to construe this License against a Contributor. - -10. Versions of the License ---------------------------- - -10.1. New Versions - -Mozilla Foundation is the license steward. Except as provided in Section -10.3, no one other than the license steward has the right to modify or -publish new versions of this License. Each version will be given a -distinguishing version number. - -10.2. Effect of New Versions - -You may distribute the Covered Software under the terms of the version -of the License under which You originally received the Covered Software, -or under the terms of any subsequent version published by the license -steward. - -10.3. Modified Versions - -If you create software not governed by this License, and you want to -create a new license for such software, you may create and use a -modified version of this License if you rename the license and remove -any references to the name of the license steward (except to note that -such modified license differs from this License). - -10.4. Distributing Source Code Form that is Incompatible With Secondary -Licenses - -If You choose to distribute Source Code Form that is Incompatible With -Secondary Licenses under the terms of this version of the License, the -notice described in Exhibit B of this License must be attached. - -Exhibit A - Source Code Form License Notice -------------------------------------------- - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at https://mozilla.org/MPL/2.0/. - -If it is not possible or desirable to put the notice in a particular -file, then You may include the notice in a location (such as a LICENSE -file in a relevant directory) where a recipient would be likely to look -for such a notice. - -You may add additional accurate notices of copyright ownership. - -Exhibit B - "Incompatible With Secondary Licenses" Notice ---------------------------------------------------------- - - This Source Code Form is "Incompatible With Secondary Licenses", as - defined by the Mozilla Public License, v. 2.0. - -``` diff --git a/jre-11/legal/java.base/unicode.md b/jre-11/legal/java.base/unicode.md deleted file mode 100644 index 87ee4fa51..000000000 --- a/jre-11/legal/java.base/unicode.md +++ /dev/null @@ -1,66 +0,0 @@ -## The Unicode Standard, Unicode Character Database, Version 10.0.0 - -### Unicode Character Database - -``` - -UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE -Unicode Data Files include all data files under the directories -http://www.unicode.org/Public/, http://www.unicode.org/reports/, -http://www.unicode.org/cldr/data/, -http://source.icu-project.org/repos/icu/, and -http://www.unicode.org/utility/trac/browser/. - -Unicode Data Files do not include PDF online code charts under the -directory http://www.unicode.org/Public/. - -Software includes any source code published in the Unicode Standard -or under the directories -http://www.unicode.org/Public/, http://www.unicode.org/reports/, -http://www.unicode.org/cldr/data/, -http://source.icu-project.org/repos/icu/, and -http://www.unicode.org/utility/trac/browser/. - -NOTICE TO USER: Carefully read the following legal agreement. -BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S -DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), -YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE -TERMS AND CONDITIONS OF THIS AGREEMENT. -IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE -THE DATA FILES OR SOFTWARE. - -COPYRIGHT AND PERMISSION NOTICE - -Copyright © 1991-2018 Unicode, Inc. All rights reserved. -Distributed under the Terms of Use in http://www.unicode.org/copyright.html. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Unicode data files and any associated documentation -(the "Data Files") or Unicode software and any associated documentation -(the "Software") to deal in the Data Files or Software -without restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, and/or sell copies of -the Data Files or Software, and to permit persons to whom the Data Files -or Software are furnished to do so, provided that either -(a) this copyright and permission notice appear with all copies -of the Data Files or Software, or -(b) this copyright and permission notice appear in associated -Documentation. - -THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF -ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT OF THIRD PARTY RIGHTS. -IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS -NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL -DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THE DATA FILES OR SOFTWARE. - -Except as contained in this notice, the name of a copyright holder -shall not be used in advertising or otherwise to promote the sale, -use or other dealings in these Data Files or Software without prior -written authorization of the copyright holder. - -``` diff --git a/jre-11/legal/java.datatransfer/ADDITIONAL_LICENSE_INFO b/jre-11/legal/java.datatransfer/ADDITIONAL_LICENSE_INFO deleted file mode 100644 index ff700cd09..000000000 --- a/jre-11/legal/java.datatransfer/ADDITIONAL_LICENSE_INFO +++ /dev/null @@ -1,37 +0,0 @@ - ADDITIONAL INFORMATION ABOUT LICENSING - -Certain files distributed by Oracle America, Inc. and/or its affiliates are -subject to the following clarification and special exception to the GPLv2, -based on the GNU Project exception for its Classpath libraries, known as the -GNU Classpath Exception. - -Note that Oracle includes multiple, independent programs in this software -package. Some of those programs are provided under licenses deemed -incompatible with the GPLv2 by the Free Software Foundation and others. -For example, the package includes programs licensed under the Apache -License, Version 2.0 and may include FreeType. Such programs are licensed -to you under their original licenses. - -Oracle facilitates your further distribution of this package by adding the -Classpath Exception to the necessary parts of its GPLv2 code, which permits -you to use that code in combination with other independent modules not -licensed under the GPLv2. However, note that this would not permit you to -commingle code under an incompatible license with Oracle's GPLv2 licensed -code by, for example, cutting and pasting such code into a file also -containing Oracle's GPLv2 licensed code and then distributing the result. - -Additionally, if you were to remove the Classpath Exception from any of the -files to which it applies and distribute the result, you would likely be -required to license some or all of the other code in that distribution under -the GPLv2 as well, and since the GPLv2 is incompatible with the license terms -of some items included in the distribution by Oracle, removing the Classpath -Exception could therefore effectively compromise your ability to further -distribute the package. - -Failing to distribute notices associated with some files may also create -unexpected legal consequences. - -Proceed with caution and we recommend that you obtain the advice of a lawyer -skilled in open source matters before removing the Classpath Exception or -making modifications to this package which may subsequently be redistributed -and/or involve the use of third party software. diff --git a/jre-11/legal/java.datatransfer/ASSEMBLY_EXCEPTION b/jre-11/legal/java.datatransfer/ASSEMBLY_EXCEPTION deleted file mode 100644 index 065b8d902..000000000 --- a/jre-11/legal/java.datatransfer/ASSEMBLY_EXCEPTION +++ /dev/null @@ -1,27 +0,0 @@ - -OPENJDK ASSEMBLY EXCEPTION - -The OpenJDK source code made available by Oracle America, Inc. (Oracle) at -openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU -General Public License version 2 -only ("GPL2"), with the following clarification and special exception. - - Linking this OpenJDK Code statically or dynamically with other code - is making a combined work based on this library. Thus, the terms - and conditions of GPL2 cover the whole combination. - - As a special exception, Oracle gives you permission to link this - OpenJDK Code with certain code licensed by Oracle as indicated at - http://openjdk.java.net/legal/exception-modules-2007-05-08.html - ("Designated Exception Modules") to produce an executable, - regardless of the license terms of the Designated Exception Modules, - and to copy and distribute the resulting executable under GPL2, - provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Oracle. - -As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code -to build an executable that includes those portions of necessary code that -Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 -with the Classpath exception). If you modify or add to the OpenJDK code, -that new GPL2 code may still be combined with Designated Exception Modules -if the new code is made subject to this exception by its copyright holder. diff --git a/jre-11/legal/java.datatransfer/LICENSE b/jre-11/legal/java.datatransfer/LICENSE deleted file mode 100644 index 8b400c7ab..000000000 --- a/jre-11/legal/java.datatransfer/LICENSE +++ /dev/null @@ -1,347 +0,0 @@ -The GNU General Public License (GPL) - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to -most of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you -can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for -a fee, you must give the recipients all the rights that you have. You must -make sure that they, too, receive or can get the source code. And you must -show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced -by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program proprietary. -To prevent this, we have made it clear that any patent must be licensed for -everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included -without limitation in the term "modification".) Each licensee is addressed as -"you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is -not restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and give any other recipients of the -Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or - in part contains or is derived from the Program or any part thereof, to be - licensed as a whole at no charge to all third parties under the terms of - this License. - - c) If the modified program normally reads commands interactively when run, - you must cause it, when started running for such interactive use in the - most ordinary way, to print or display an announcement including an - appropriate copyright notice and a notice that there is no warranty (or - else, saying that you provide a warranty) and that users may redistribute - the program under these conditions, and telling the user how to view a copy - of this License. (Exception: if the Program itself is interactive but does - not normally print such an announcement, your work based on the Program is - not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms -of this License, whose permissions for other licensees extend to the entire -whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and -2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 above - on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to - give any third party, for a charge no more than your cost of physically - performing source distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only - for noncommercial distribution and only if you received the program in - object code or executable form with such an offer, in accord with - Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code -distributed need not include anything that is normally distributed (in either -source or binary form) with the major components (compiler, kernel, and so on) -of the operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or -any work based on the Program), you indicate your acceptance of this License to -do so, and all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to -copy, distribute or modify the Program subject to these terms and conditions. -You may not impose any further restrictions on the recipients' exercise of the -rights granted herein. You are not responsible for enforcing compliance by -third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Program at all. -For example, if a patent license would not permit royalty-free redistribution -of the Program by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In -such case, this License incorporates the limitation as if written in the body -of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software Foundation. -If the Program does not specify a version number of this License, you may -choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR -INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA -BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER -OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - - Copyright (C) - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author Gnomovision comes - with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free - software, and you are welcome to redistribute it under certain conditions; - type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than 'show w' and 'show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here -is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - 'Gnomovision' (which makes passes at compilers) written by James Hacker. - - signature of Ty Coon, 1 April 1989 - - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. - - -"CLASSPATH" EXCEPTION TO THE GPL - -Certain source files distributed by Oracle America and/or its affiliates are -subject to the following clarification and special exception to the GPL, but -only where Oracle has expressly included in the particular source file's header -the words "Oracle designates this particular file as subject to the "Classpath" -exception as provided by Oracle in the LICENSE file that accompanied this code." - - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. diff --git a/jre-11/legal/java.desktop/ADDITIONAL_LICENSE_INFO b/jre-11/legal/java.desktop/ADDITIONAL_LICENSE_INFO deleted file mode 100644 index ff700cd09..000000000 --- a/jre-11/legal/java.desktop/ADDITIONAL_LICENSE_INFO +++ /dev/null @@ -1,37 +0,0 @@ - ADDITIONAL INFORMATION ABOUT LICENSING - -Certain files distributed by Oracle America, Inc. and/or its affiliates are -subject to the following clarification and special exception to the GPLv2, -based on the GNU Project exception for its Classpath libraries, known as the -GNU Classpath Exception. - -Note that Oracle includes multiple, independent programs in this software -package. Some of those programs are provided under licenses deemed -incompatible with the GPLv2 by the Free Software Foundation and others. -For example, the package includes programs licensed under the Apache -License, Version 2.0 and may include FreeType. Such programs are licensed -to you under their original licenses. - -Oracle facilitates your further distribution of this package by adding the -Classpath Exception to the necessary parts of its GPLv2 code, which permits -you to use that code in combination with other independent modules not -licensed under the GPLv2. However, note that this would not permit you to -commingle code under an incompatible license with Oracle's GPLv2 licensed -code by, for example, cutting and pasting such code into a file also -containing Oracle's GPLv2 licensed code and then distributing the result. - -Additionally, if you were to remove the Classpath Exception from any of the -files to which it applies and distribute the result, you would likely be -required to license some or all of the other code in that distribution under -the GPLv2 as well, and since the GPLv2 is incompatible with the license terms -of some items included in the distribution by Oracle, removing the Classpath -Exception could therefore effectively compromise your ability to further -distribute the package. - -Failing to distribute notices associated with some files may also create -unexpected legal consequences. - -Proceed with caution and we recommend that you obtain the advice of a lawyer -skilled in open source matters before removing the Classpath Exception or -making modifications to this package which may subsequently be redistributed -and/or involve the use of third party software. diff --git a/jre-11/legal/java.desktop/ASSEMBLY_EXCEPTION b/jre-11/legal/java.desktop/ASSEMBLY_EXCEPTION deleted file mode 100644 index 065b8d902..000000000 --- a/jre-11/legal/java.desktop/ASSEMBLY_EXCEPTION +++ /dev/null @@ -1,27 +0,0 @@ - -OPENJDK ASSEMBLY EXCEPTION - -The OpenJDK source code made available by Oracle America, Inc. (Oracle) at -openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU -General Public License version 2 -only ("GPL2"), with the following clarification and special exception. - - Linking this OpenJDK Code statically or dynamically with other code - is making a combined work based on this library. Thus, the terms - and conditions of GPL2 cover the whole combination. - - As a special exception, Oracle gives you permission to link this - OpenJDK Code with certain code licensed by Oracle as indicated at - http://openjdk.java.net/legal/exception-modules-2007-05-08.html - ("Designated Exception Modules") to produce an executable, - regardless of the license terms of the Designated Exception Modules, - and to copy and distribute the resulting executable under GPL2, - provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Oracle. - -As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code -to build an executable that includes those portions of necessary code that -Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 -with the Classpath exception). If you modify or add to the OpenJDK code, -that new GPL2 code may still be combined with Designated Exception Modules -if the new code is made subject to this exception by its copyright holder. diff --git a/jre-11/legal/java.desktop/LICENSE b/jre-11/legal/java.desktop/LICENSE deleted file mode 100644 index 8b400c7ab..000000000 --- a/jre-11/legal/java.desktop/LICENSE +++ /dev/null @@ -1,347 +0,0 @@ -The GNU General Public License (GPL) - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to -most of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you -can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for -a fee, you must give the recipients all the rights that you have. You must -make sure that they, too, receive or can get the source code. And you must -show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced -by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program proprietary. -To prevent this, we have made it clear that any patent must be licensed for -everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included -without limitation in the term "modification".) Each licensee is addressed as -"you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is -not restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and give any other recipients of the -Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or - in part contains or is derived from the Program or any part thereof, to be - licensed as a whole at no charge to all third parties under the terms of - this License. - - c) If the modified program normally reads commands interactively when run, - you must cause it, when started running for such interactive use in the - most ordinary way, to print or display an announcement including an - appropriate copyright notice and a notice that there is no warranty (or - else, saying that you provide a warranty) and that users may redistribute - the program under these conditions, and telling the user how to view a copy - of this License. (Exception: if the Program itself is interactive but does - not normally print such an announcement, your work based on the Program is - not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms -of this License, whose permissions for other licensees extend to the entire -whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and -2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 above - on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to - give any third party, for a charge no more than your cost of physically - performing source distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only - for noncommercial distribution and only if you received the program in - object code or executable form with such an offer, in accord with - Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code -distributed need not include anything that is normally distributed (in either -source or binary form) with the major components (compiler, kernel, and so on) -of the operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or -any work based on the Program), you indicate your acceptance of this License to -do so, and all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to -copy, distribute or modify the Program subject to these terms and conditions. -You may not impose any further restrictions on the recipients' exercise of the -rights granted herein. You are not responsible for enforcing compliance by -third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Program at all. -For example, if a patent license would not permit royalty-free redistribution -of the Program by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In -such case, this License incorporates the limitation as if written in the body -of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software Foundation. -If the Program does not specify a version number of this License, you may -choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR -INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA -BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER -OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - - Copyright (C) - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author Gnomovision comes - with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free - software, and you are welcome to redistribute it under certain conditions; - type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than 'show w' and 'show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here -is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - 'Gnomovision' (which makes passes at compilers) written by James Hacker. - - signature of Ty Coon, 1 April 1989 - - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. - - -"CLASSPATH" EXCEPTION TO THE GPL - -Certain source files distributed by Oracle America and/or its affiliates are -subject to the following clarification and special exception to the GPL, but -only where Oracle has expressly included in the particular source file's header -the words "Oracle designates this particular file as subject to the "Classpath" -exception as provided by Oracle in the LICENSE file that accompanied this code." - - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. diff --git a/jre-11/legal/java.desktop/colorimaging.md b/jre-11/legal/java.desktop/colorimaging.md deleted file mode 100644 index eeb9932e1..000000000 --- a/jre-11/legal/java.desktop/colorimaging.md +++ /dev/null @@ -1,7 +0,0 @@ -## Eastman Kodak Company: Portions of color management and imaging software - -### Eastman Kodak Notice -
-Portions Copyright Eastman Kodak Company 1991-2003
-
- diff --git a/jre-11/legal/java.desktop/giflib.md b/jre-11/legal/java.desktop/giflib.md deleted file mode 100644 index a2c1e7ed7..000000000 --- a/jre-11/legal/java.desktop/giflib.md +++ /dev/null @@ -1,26 +0,0 @@ -## GIFLIB v5.1.4 - -### GIFLIB License -
-
-The GIFLIB distribution is Copyright (c) 1997 Eric S. Raymond
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
diff --git a/jre-11/legal/java.desktop/harfbuzz.md b/jre-11/legal/java.desktop/harfbuzz.md deleted file mode 100644 index b8625f22f..000000000 --- a/jre-11/legal/java.desktop/harfbuzz.md +++ /dev/null @@ -1,64 +0,0 @@ -## Harfbuzz v1.8.2 - -### Harfbuzz License - -http://cgit.freedesktop.org/harfbuzz/tree/COPYING - -
-
-HarfBuzz is licensed under the so-called "Old MIT" license. Details follow.
-For parts of HarfBuzz that are licensed under different licenses see individual
-files names COPYING in subdirectories where applicable.
-
-Copyright © 2010,2011,2012  Google, Inc.
-Copyright © 2012  Mozilla Foundation
-Copyright © 2011  Codethink Limited
-Copyright © 2008,2010  Nokia Corporation and/or its subsidiary(-ies)
-Copyright © 2009  Keith Stribley
-Copyright © 2009  Martin Hosken and SIL International
-Copyright © 2007  Chris Wilson
-Copyright © 2006  Behdad Esfahbod
-Copyright © 2005  David Turner
-Copyright © 2004,2007,2008,2009,2010  Red Hat, Inc.
-Copyright © 1998-2004  David Turner and Werner Lemberg
-
-For full copyright notices consult the individual files in the package.
-
-
-Permission is hereby granted, without written agreement and without
-license or royalty fees, to use, copy, modify, and distribute this
-software and its documentation for any purpose, provided that the
-above copyright notice and the following two paragraphs appear in
-all copies of this software.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-
-All source code, except for one section, is licensed as above. The one
-exception is licensed with a slightly different MIT variant:
-The contents of this directory are licensed under the following terms:
-
-Copyright (C) 2012 Grigori Goronzy 
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
diff --git a/jre-11/legal/java.desktop/jpeg.md b/jre-11/legal/java.desktop/jpeg.md deleted file mode 100644 index da64b2f76..000000000 --- a/jre-11/legal/java.desktop/jpeg.md +++ /dev/null @@ -1,83 +0,0 @@ -## Independent JPEG Group: JPEG release 6b - -### JPEG License -
-
-Must reproduce following license in documentation and/or other materials
-provided with distribution:
-
-The authors make NO WARRANTY or representation, either express or implied,
-with respect to this software, its quality, accuracy, merchantability, or
-fitness for a particular purpose.  This software is provided "AS IS",
-and you, its user, assume the entire risk as to its quality and accuracy.
-
-This software is copyright (C) 1991-1998, Thomas G. Lane.
-All Rights Reserved except as specified below.
-
-Permission is hereby granted to use, copy, modify, and distribute
-this software (or portions thereof) for any purpose, without fee,
-subject to these conditions:
-
-(1) If any part of the source code for this software is distributed,
-then this README file must be included, with this copyright and no-warranty
-notice unaltered; and any additions, deletions, or changes to the original
-files must be clearly indicated in accompanying documentation.
-
-(2) If only executable code is distributed, then the accompanying documentation
-must state that "this software is based in part on the work of the
-Independent JPEG Group".
-
-(3) Permission for use of this software is granted only if the user accepts
-full responsibility for any undesirable consequences; the authors accept
-NO LIABILITY for damages of any kind.
-
-These conditions apply to any software derived from or based on the IJG code,
-not just to the unmodified library.  If you use our work, you ought to
-acknowledge us.
-
-Permission is NOT granted for the use of any IJG author's name or company name
-in advertising or publicity relating to this software or products derived
-from it.  This software may be referred to only as "the Independent JPEG
-Group's software".
-
-We specifically permit and encourage the use of this software as the basis
-of commercial products, provided that all warranty or liability claims are
-assumed by the product vendor.
-
-
-ansi2knr.c is included in this distribution by permission of L. Peter Deutsch,
-sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA.
-ansi2knr.c is NOT covered by the above copyright and conditions, but instead
-by the usual distribution terms of the Free Software Foundation; principally,
-that you must include source code if you redistribute it.
-(See the file ansi2knr.c for full details.)  However, since ansi2knr.c is
-not needed as part of any program generated from the IJG code, this does not
-limit you more than the foregoing paragraphs do.
-
-The Unix configuration script "configure" was produced with GNU Autoconf.
-It is copyright by the Free Software Foundation but is freely distributable.
-The same holds for its supporting scripts (config.guess, config.sub,
-ltconfig, ltmain.sh).  Another support script, install-sh, is copyright
-by M.I.T. but is also freely distributable.
-
-It appears that the arithmetic coding option of the JPEG spec is covered
-by patents owned by IBM, AT&T, and Mitsubishi.  Hence arithmetic coding
-cannot legally be used without obtaining one or more licenses.  For this
-reason, support for arithmetic coding has been removed from the free
-JPEG software. (Since arithmetic coding provides only a marginal gain
-over the unpatented Huffman mode, it is unlikely that very many
-implementations will support it.) So far as we are aware, there are
-no patent restrictions on the remaining code.
-
-The IJG distribution formerly included code to read and write GIF files.
-To avoid entanglement with the Unisys LZW patent, GIF reading support
-has been removed altogether, and the GIF writer has been simplified to
-produce "uncompressed GIFs".  This technique does not use the LZW algorithm;
-the resulting GIF files are larger than usual, but are readable by all
-standard GIF decoders.
-
-We are required to state that "The Graphics Interchange Format(c) is
-the Copyright property of CompuServe Incorporated.  GIF(sm) is a
-Service Mark property of CompuServe Incorporated."
-
-
diff --git a/jre-11/legal/java.desktop/lcms.md b/jre-11/legal/java.desktop/lcms.md deleted file mode 100644 index a8a06325c..000000000 --- a/jre-11/legal/java.desktop/lcms.md +++ /dev/null @@ -1,27 +0,0 @@ -## Little Color Management System (LCMS) v2.9 - -### LCMS License -
-
-Little Color Management System
-Copyright (c) 1998-2011 Marti Maria Saguer
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
diff --git a/jre-11/legal/java.desktop/libpng.md b/jre-11/legal/java.desktop/libpng.md deleted file mode 100644 index 746946c99..000000000 --- a/jre-11/legal/java.desktop/libpng.md +++ /dev/null @@ -1,112 +0,0 @@ -## libpng v1.6.35 - -### libpng License -
-
-This copy of the libpng notices is provided for your convenience.  In case of
-any discrepancy between this copy and the notices in the file png.h that is
-included in the libpng distribution, the latter shall prevail.
-
-COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
-
-If you modify libpng you may insert additional notices immediately following
-this sentence.
-
-This code is released under the libpng license.
-
-libpng versions 1.0.7, July 1, 2000 through 1.6.35, September 29, 2017 are
-Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
-derived from libpng-1.0.6, and are distributed according to the same
-disclaimer and license as libpng-1.0.6 with the following individuals
-added to the list of Contributing Authors:
-
-   Simon-Pierre Cadieux
-   Eric S. Raymond
-   Mans Rullgard
-   Cosmin Truta
-   Gilles Vollant
-   James Yu
-   Mandar Sahastrabuddhe
-   Google Inc.
-   Vadim Barkov
-
-and with the following additions to the disclaimer:
-
-   There is no warranty against interference with your enjoyment of the
-   library or against infringement.  There is no warranty that our
-   efforts or the library will fulfill any of your particular purposes
-   or needs.  This library is provided with all faults, and the entire
-   risk of satisfactory quality, performance, accuracy, and effort is with
-   the user.
-
-Some files in the "contrib" directory and some configure-generated
-files that are distributed with libpng have other copyright owners and
-are released under other open source licenses.
-
-libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
-Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
-libpng-0.96, and are distributed according to the same disclaimer and
-license as libpng-0.96, with the following individuals added to the list
-of Contributing Authors:
-
-   Tom Lane
-   Glenn Randers-Pehrson
-   Willem van Schaik
-
-libpng versions 0.89, June 1996, through 0.96, May 1997, are
-Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
-and are distributed according to the same disclaimer and license as
-libpng-0.88, with the following individuals added to the list of
-Contributing Authors:
-
-   John Bowler
-   Kevin Bracey
-   Sam Bushell
-   Magnus Holmgren
-   Greg Roelofs
-   Tom Tanner
-
-Some files in the "scripts" directory have other copyright owners
-but are released under this license.
-
-libpng versions 0.5, May 1995, through 0.88, January 1996, are
-Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
-
-For the purposes of this copyright and license, "Contributing Authors"
-is defined as the following set of individuals:
-
-   Andreas Dilger
-   Dave Martindale
-   Guy Eric Schalnat
-   Paul Schmidt
-   Tim Wegner
-
-The PNG Reference Library is supplied "AS IS".  The Contributing Authors
-and Group 42, Inc. disclaim all warranties, expressed or implied,
-including, without limitation, the warranties of merchantability and of
-fitness for any purpose.  The Contributing Authors and Group 42, Inc.
-assume no liability for direct, indirect, incidental, special, exemplary,
-or consequential damages, which may result from the use of the PNG
-Reference Library, even if advised of the possibility of such damage.
-
-Permission is hereby granted to use, copy, modify, and distribute this
-source code, or portions hereof, for any purpose, without fee, subject
-to the following restrictions:
-
-  1. The origin of this source code must not be misrepresented.
-
-  2. Altered versions must be plainly marked as such and must not
-     be misrepresented as being the original source.
-
-  3. This Copyright notice may not be removed or altered from any
-     source or altered source distribution.
-
-The Contributing Authors and Group 42, Inc. specifically permit, without
-fee, and encourage the use of this source code as a component to
-supporting the PNG file format in commercial products.  If you use this
-source code in a product, acknowledgment is not required but would be
-appreciated.
-
-END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.
-
-
diff --git a/jre-11/legal/java.desktop/mesa3d.md b/jre-11/legal/java.desktop/mesa3d.md deleted file mode 100644 index 3d2168e32..000000000 --- a/jre-11/legal/java.desktop/mesa3d.md +++ /dev/null @@ -1,28 +0,0 @@ -## Mesa 3-D Graphics Library v4.1 - -### Mesa License -
-
-Mesa 3-D graphics library
-Version:  4.1
-
-Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
diff --git a/jre-11/legal/java.desktop/opengl.md b/jre-11/legal/java.desktop/opengl.md deleted file mode 100644 index 41c811b1c..000000000 --- a/jre-11/legal/java.desktop/opengl.md +++ /dev/null @@ -1,27 +0,0 @@ -## Khronos Group OpenGL Headers v2.1 - -### Khronos Group License -
-
-Copyright (c) 2007 The Khronos Group Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and/or associated documentation files (the
-"Materials"), to deal in the Materials without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Materials, and to
-permit persons to whom the Materials are furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Materials.
-
-THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-
-
diff --git a/jre-11/legal/java.desktop/xwindows.md b/jre-11/legal/java.desktop/xwindows.md deleted file mode 100644 index 42b2841a3..000000000 --- a/jre-11/legal/java.desktop/xwindows.md +++ /dev/null @@ -1,232 +0,0 @@ -## X Windows System v6.8.2 - -### X Windows System License -
-
-This is the copyright for the files in src/java.desktop/unix/native/libawt_xawt:
-list.h, multiVis.h, wsutils.h, list.c, multiVis.c
-
-Copyright (c) 1994 Hewlett-Packard Co.
-Copyright (c) 1996 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from the X Consortium.
-
-___________________________
-
-
-The files in motif/lib/Xm/util included this copyright:
-mkdirhier.man,xmkmf.man, chownxterm.c, makeg.man, mergelib.cpp,
- lndir.man, makestrs.man, checktree.c, lndir.c, makestrs.c
-
-Copyright (c) 1993, 1994 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not
-be used in advertising or otherwise to promote the sale, use or other
-dealing in this Software without prior written authorization from the
-X Consortium.
-
-_____________________________
-
-Xmos_r.h:
-/*
-Copyright (c) 1996 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-*/
-
-_____________________________
-
-Copyright notice for extutil.h:
-Copyright 1989, 1998 The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-*
-* Author: Jim Fulton, MIT The Open Group
-*
-* Xlib Extension-Writing Utilities
-*
-* This package contains utilities for writing the client API for various
-* protocol extensions. THESE INTERFACES ARE NOT PART OF THE X STANDARD AND
-* ARE SUBJECT TO CHANGE!
-*/
-
-_____________________________
-
-Copyright notice for HPkeysym.h:
-/*
-
-Copyright 1987, 1998 The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
-
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the names of Hewlett Packard
-or Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-HEWLETT-PACKARD MAKES NO WARRANTY OF ANY KIND WITH REGARD
-TO THIS SOFWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. Hewlett-Packard shall not be liable for errors
-contained herein or direct, indirect, special, incidental or
-consequential damages in connection with the furnishing,
-performance, or use of this material.
-
-*/
-_____________________________________
-
-Copyright notice in keysym2ucs.h:
-
-Copyright 1987, 1994, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts
-
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-
diff --git a/jre-11/legal/java.instrument/ADDITIONAL_LICENSE_INFO b/jre-11/legal/java.instrument/ADDITIONAL_LICENSE_INFO deleted file mode 100644 index ff700cd09..000000000 --- a/jre-11/legal/java.instrument/ADDITIONAL_LICENSE_INFO +++ /dev/null @@ -1,37 +0,0 @@ - ADDITIONAL INFORMATION ABOUT LICENSING - -Certain files distributed by Oracle America, Inc. and/or its affiliates are -subject to the following clarification and special exception to the GPLv2, -based on the GNU Project exception for its Classpath libraries, known as the -GNU Classpath Exception. - -Note that Oracle includes multiple, independent programs in this software -package. Some of those programs are provided under licenses deemed -incompatible with the GPLv2 by the Free Software Foundation and others. -For example, the package includes programs licensed under the Apache -License, Version 2.0 and may include FreeType. Such programs are licensed -to you under their original licenses. - -Oracle facilitates your further distribution of this package by adding the -Classpath Exception to the necessary parts of its GPLv2 code, which permits -you to use that code in combination with other independent modules not -licensed under the GPLv2. However, note that this would not permit you to -commingle code under an incompatible license with Oracle's GPLv2 licensed -code by, for example, cutting and pasting such code into a file also -containing Oracle's GPLv2 licensed code and then distributing the result. - -Additionally, if you were to remove the Classpath Exception from any of the -files to which it applies and distribute the result, you would likely be -required to license some or all of the other code in that distribution under -the GPLv2 as well, and since the GPLv2 is incompatible with the license terms -of some items included in the distribution by Oracle, removing the Classpath -Exception could therefore effectively compromise your ability to further -distribute the package. - -Failing to distribute notices associated with some files may also create -unexpected legal consequences. - -Proceed with caution and we recommend that you obtain the advice of a lawyer -skilled in open source matters before removing the Classpath Exception or -making modifications to this package which may subsequently be redistributed -and/or involve the use of third party software. diff --git a/jre-11/legal/java.instrument/ASSEMBLY_EXCEPTION b/jre-11/legal/java.instrument/ASSEMBLY_EXCEPTION deleted file mode 100644 index 065b8d902..000000000 --- a/jre-11/legal/java.instrument/ASSEMBLY_EXCEPTION +++ /dev/null @@ -1,27 +0,0 @@ - -OPENJDK ASSEMBLY EXCEPTION - -The OpenJDK source code made available by Oracle America, Inc. (Oracle) at -openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU -General Public License version 2 -only ("GPL2"), with the following clarification and special exception. - - Linking this OpenJDK Code statically or dynamically with other code - is making a combined work based on this library. Thus, the terms - and conditions of GPL2 cover the whole combination. - - As a special exception, Oracle gives you permission to link this - OpenJDK Code with certain code licensed by Oracle as indicated at - http://openjdk.java.net/legal/exception-modules-2007-05-08.html - ("Designated Exception Modules") to produce an executable, - regardless of the license terms of the Designated Exception Modules, - and to copy and distribute the resulting executable under GPL2, - provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Oracle. - -As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code -to build an executable that includes those portions of necessary code that -Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 -with the Classpath exception). If you modify or add to the OpenJDK code, -that new GPL2 code may still be combined with Designated Exception Modules -if the new code is made subject to this exception by its copyright holder. diff --git a/jre-11/legal/java.instrument/LICENSE b/jre-11/legal/java.instrument/LICENSE deleted file mode 100644 index 8b400c7ab..000000000 --- a/jre-11/legal/java.instrument/LICENSE +++ /dev/null @@ -1,347 +0,0 @@ -The GNU General Public License (GPL) - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to -most of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you -can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for -a fee, you must give the recipients all the rights that you have. You must -make sure that they, too, receive or can get the source code. And you must -show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced -by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program proprietary. -To prevent this, we have made it clear that any patent must be licensed for -everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included -without limitation in the term "modification".) Each licensee is addressed as -"you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is -not restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and give any other recipients of the -Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or - in part contains or is derived from the Program or any part thereof, to be - licensed as a whole at no charge to all third parties under the terms of - this License. - - c) If the modified program normally reads commands interactively when run, - you must cause it, when started running for such interactive use in the - most ordinary way, to print or display an announcement including an - appropriate copyright notice and a notice that there is no warranty (or - else, saying that you provide a warranty) and that users may redistribute - the program under these conditions, and telling the user how to view a copy - of this License. (Exception: if the Program itself is interactive but does - not normally print such an announcement, your work based on the Program is - not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms -of this License, whose permissions for other licensees extend to the entire -whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and -2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 above - on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to - give any third party, for a charge no more than your cost of physically - performing source distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only - for noncommercial distribution and only if you received the program in - object code or executable form with such an offer, in accord with - Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code -distributed need not include anything that is normally distributed (in either -source or binary form) with the major components (compiler, kernel, and so on) -of the operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or -any work based on the Program), you indicate your acceptance of this License to -do so, and all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to -copy, distribute or modify the Program subject to these terms and conditions. -You may not impose any further restrictions on the recipients' exercise of the -rights granted herein. You are not responsible for enforcing compliance by -third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Program at all. -For example, if a patent license would not permit royalty-free redistribution -of the Program by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In -such case, this License incorporates the limitation as if written in the body -of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software Foundation. -If the Program does not specify a version number of this License, you may -choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR -INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA -BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER -OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - - Copyright (C) - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author Gnomovision comes - with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free - software, and you are welcome to redistribute it under certain conditions; - type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than 'show w' and 'show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here -is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - 'Gnomovision' (which makes passes at compilers) written by James Hacker. - - signature of Ty Coon, 1 April 1989 - - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. - - -"CLASSPATH" EXCEPTION TO THE GPL - -Certain source files distributed by Oracle America and/or its affiliates are -subject to the following clarification and special exception to the GPL, but -only where Oracle has expressly included in the particular source file's header -the words "Oracle designates this particular file as subject to the "Classpath" -exception as provided by Oracle in the LICENSE file that accompanied this code." - - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. diff --git a/jre-11/legal/java.logging/ADDITIONAL_LICENSE_INFO b/jre-11/legal/java.logging/ADDITIONAL_LICENSE_INFO deleted file mode 100644 index ff700cd09..000000000 --- a/jre-11/legal/java.logging/ADDITIONAL_LICENSE_INFO +++ /dev/null @@ -1,37 +0,0 @@ - ADDITIONAL INFORMATION ABOUT LICENSING - -Certain files distributed by Oracle America, Inc. and/or its affiliates are -subject to the following clarification and special exception to the GPLv2, -based on the GNU Project exception for its Classpath libraries, known as the -GNU Classpath Exception. - -Note that Oracle includes multiple, independent programs in this software -package. Some of those programs are provided under licenses deemed -incompatible with the GPLv2 by the Free Software Foundation and others. -For example, the package includes programs licensed under the Apache -License, Version 2.0 and may include FreeType. Such programs are licensed -to you under their original licenses. - -Oracle facilitates your further distribution of this package by adding the -Classpath Exception to the necessary parts of its GPLv2 code, which permits -you to use that code in combination with other independent modules not -licensed under the GPLv2. However, note that this would not permit you to -commingle code under an incompatible license with Oracle's GPLv2 licensed -code by, for example, cutting and pasting such code into a file also -containing Oracle's GPLv2 licensed code and then distributing the result. - -Additionally, if you were to remove the Classpath Exception from any of the -files to which it applies and distribute the result, you would likely be -required to license some or all of the other code in that distribution under -the GPLv2 as well, and since the GPLv2 is incompatible with the license terms -of some items included in the distribution by Oracle, removing the Classpath -Exception could therefore effectively compromise your ability to further -distribute the package. - -Failing to distribute notices associated with some files may also create -unexpected legal consequences. - -Proceed with caution and we recommend that you obtain the advice of a lawyer -skilled in open source matters before removing the Classpath Exception or -making modifications to this package which may subsequently be redistributed -and/or involve the use of third party software. diff --git a/jre-11/legal/java.logging/ASSEMBLY_EXCEPTION b/jre-11/legal/java.logging/ASSEMBLY_EXCEPTION deleted file mode 100644 index 065b8d902..000000000 --- a/jre-11/legal/java.logging/ASSEMBLY_EXCEPTION +++ /dev/null @@ -1,27 +0,0 @@ - -OPENJDK ASSEMBLY EXCEPTION - -The OpenJDK source code made available by Oracle America, Inc. (Oracle) at -openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU -General Public License version 2 -only ("GPL2"), with the following clarification and special exception. - - Linking this OpenJDK Code statically or dynamically with other code - is making a combined work based on this library. Thus, the terms - and conditions of GPL2 cover the whole combination. - - As a special exception, Oracle gives you permission to link this - OpenJDK Code with certain code licensed by Oracle as indicated at - http://openjdk.java.net/legal/exception-modules-2007-05-08.html - ("Designated Exception Modules") to produce an executable, - regardless of the license terms of the Designated Exception Modules, - and to copy and distribute the resulting executable under GPL2, - provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Oracle. - -As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code -to build an executable that includes those portions of necessary code that -Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 -with the Classpath exception). If you modify or add to the OpenJDK code, -that new GPL2 code may still be combined with Designated Exception Modules -if the new code is made subject to this exception by its copyright holder. diff --git a/jre-11/legal/java.logging/LICENSE b/jre-11/legal/java.logging/LICENSE deleted file mode 100644 index 8b400c7ab..000000000 --- a/jre-11/legal/java.logging/LICENSE +++ /dev/null @@ -1,347 +0,0 @@ -The GNU General Public License (GPL) - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to -most of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you -can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for -a fee, you must give the recipients all the rights that you have. You must -make sure that they, too, receive or can get the source code. And you must -show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced -by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program proprietary. -To prevent this, we have made it clear that any patent must be licensed for -everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included -without limitation in the term "modification".) Each licensee is addressed as -"you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is -not restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and give any other recipients of the -Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or - in part contains or is derived from the Program or any part thereof, to be - licensed as a whole at no charge to all third parties under the terms of - this License. - - c) If the modified program normally reads commands interactively when run, - you must cause it, when started running for such interactive use in the - most ordinary way, to print or display an announcement including an - appropriate copyright notice and a notice that there is no warranty (or - else, saying that you provide a warranty) and that users may redistribute - the program under these conditions, and telling the user how to view a copy - of this License. (Exception: if the Program itself is interactive but does - not normally print such an announcement, your work based on the Program is - not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms -of this License, whose permissions for other licensees extend to the entire -whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and -2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 above - on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to - give any third party, for a charge no more than your cost of physically - performing source distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only - for noncommercial distribution and only if you received the program in - object code or executable form with such an offer, in accord with - Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code -distributed need not include anything that is normally distributed (in either -source or binary form) with the major components (compiler, kernel, and so on) -of the operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or -any work based on the Program), you indicate your acceptance of this License to -do so, and all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to -copy, distribute or modify the Program subject to these terms and conditions. -You may not impose any further restrictions on the recipients' exercise of the -rights granted herein. You are not responsible for enforcing compliance by -third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Program at all. -For example, if a patent license would not permit royalty-free redistribution -of the Program by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In -such case, this License incorporates the limitation as if written in the body -of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software Foundation. -If the Program does not specify a version number of this License, you may -choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR -INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA -BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER -OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - - Copyright (C) - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author Gnomovision comes - with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free - software, and you are welcome to redistribute it under certain conditions; - type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than 'show w' and 'show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here -is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - 'Gnomovision' (which makes passes at compilers) written by James Hacker. - - signature of Ty Coon, 1 April 1989 - - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. - - -"CLASSPATH" EXCEPTION TO THE GPL - -Certain source files distributed by Oracle America and/or its affiliates are -subject to the following clarification and special exception to the GPL, but -only where Oracle has expressly included in the particular source file's header -the words "Oracle designates this particular file as subject to the "Classpath" -exception as provided by Oracle in the LICENSE file that accompanied this code." - - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. diff --git a/jre-11/legal/java.management/ADDITIONAL_LICENSE_INFO b/jre-11/legal/java.management/ADDITIONAL_LICENSE_INFO deleted file mode 100644 index ff700cd09..000000000 --- a/jre-11/legal/java.management/ADDITIONAL_LICENSE_INFO +++ /dev/null @@ -1,37 +0,0 @@ - ADDITIONAL INFORMATION ABOUT LICENSING - -Certain files distributed by Oracle America, Inc. and/or its affiliates are -subject to the following clarification and special exception to the GPLv2, -based on the GNU Project exception for its Classpath libraries, known as the -GNU Classpath Exception. - -Note that Oracle includes multiple, independent programs in this software -package. Some of those programs are provided under licenses deemed -incompatible with the GPLv2 by the Free Software Foundation and others. -For example, the package includes programs licensed under the Apache -License, Version 2.0 and may include FreeType. Such programs are licensed -to you under their original licenses. - -Oracle facilitates your further distribution of this package by adding the -Classpath Exception to the necessary parts of its GPLv2 code, which permits -you to use that code in combination with other independent modules not -licensed under the GPLv2. However, note that this would not permit you to -commingle code under an incompatible license with Oracle's GPLv2 licensed -code by, for example, cutting and pasting such code into a file also -containing Oracle's GPLv2 licensed code and then distributing the result. - -Additionally, if you were to remove the Classpath Exception from any of the -files to which it applies and distribute the result, you would likely be -required to license some or all of the other code in that distribution under -the GPLv2 as well, and since the GPLv2 is incompatible with the license terms -of some items included in the distribution by Oracle, removing the Classpath -Exception could therefore effectively compromise your ability to further -distribute the package. - -Failing to distribute notices associated with some files may also create -unexpected legal consequences. - -Proceed with caution and we recommend that you obtain the advice of a lawyer -skilled in open source matters before removing the Classpath Exception or -making modifications to this package which may subsequently be redistributed -and/or involve the use of third party software. diff --git a/jre-11/legal/java.management/ASSEMBLY_EXCEPTION b/jre-11/legal/java.management/ASSEMBLY_EXCEPTION deleted file mode 100644 index 065b8d902..000000000 --- a/jre-11/legal/java.management/ASSEMBLY_EXCEPTION +++ /dev/null @@ -1,27 +0,0 @@ - -OPENJDK ASSEMBLY EXCEPTION - -The OpenJDK source code made available by Oracle America, Inc. (Oracle) at -openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU -General Public License version 2 -only ("GPL2"), with the following clarification and special exception. - - Linking this OpenJDK Code statically or dynamically with other code - is making a combined work based on this library. Thus, the terms - and conditions of GPL2 cover the whole combination. - - As a special exception, Oracle gives you permission to link this - OpenJDK Code with certain code licensed by Oracle as indicated at - http://openjdk.java.net/legal/exception-modules-2007-05-08.html - ("Designated Exception Modules") to produce an executable, - regardless of the license terms of the Designated Exception Modules, - and to copy and distribute the resulting executable under GPL2, - provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Oracle. - -As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code -to build an executable that includes those portions of necessary code that -Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 -with the Classpath exception). If you modify or add to the OpenJDK code, -that new GPL2 code may still be combined with Designated Exception Modules -if the new code is made subject to this exception by its copyright holder. diff --git a/jre-11/legal/java.management/LICENSE b/jre-11/legal/java.management/LICENSE deleted file mode 100644 index 8b400c7ab..000000000 --- a/jre-11/legal/java.management/LICENSE +++ /dev/null @@ -1,347 +0,0 @@ -The GNU General Public License (GPL) - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to -most of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you -can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for -a fee, you must give the recipients all the rights that you have. You must -make sure that they, too, receive or can get the source code. And you must -show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced -by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program proprietary. -To prevent this, we have made it clear that any patent must be licensed for -everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included -without limitation in the term "modification".) Each licensee is addressed as -"you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is -not restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and give any other recipients of the -Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or - in part contains or is derived from the Program or any part thereof, to be - licensed as a whole at no charge to all third parties under the terms of - this License. - - c) If the modified program normally reads commands interactively when run, - you must cause it, when started running for such interactive use in the - most ordinary way, to print or display an announcement including an - appropriate copyright notice and a notice that there is no warranty (or - else, saying that you provide a warranty) and that users may redistribute - the program under these conditions, and telling the user how to view a copy - of this License. (Exception: if the Program itself is interactive but does - not normally print such an announcement, your work based on the Program is - not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms -of this License, whose permissions for other licensees extend to the entire -whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and -2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 above - on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to - give any third party, for a charge no more than your cost of physically - performing source distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only - for noncommercial distribution and only if you received the program in - object code or executable form with such an offer, in accord with - Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code -distributed need not include anything that is normally distributed (in either -source or binary form) with the major components (compiler, kernel, and so on) -of the operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or -any work based on the Program), you indicate your acceptance of this License to -do so, and all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to -copy, distribute or modify the Program subject to these terms and conditions. -You may not impose any further restrictions on the recipients' exercise of the -rights granted herein. You are not responsible for enforcing compliance by -third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Program at all. -For example, if a patent license would not permit royalty-free redistribution -of the Program by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In -such case, this License incorporates the limitation as if written in the body -of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software Foundation. -If the Program does not specify a version number of this License, you may -choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR -INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA -BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER -OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - - Copyright (C) - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author Gnomovision comes - with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free - software, and you are welcome to redistribute it under certain conditions; - type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than 'show w' and 'show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here -is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - 'Gnomovision' (which makes passes at compilers) written by James Hacker. - - signature of Ty Coon, 1 April 1989 - - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. - - -"CLASSPATH" EXCEPTION TO THE GPL - -Certain source files distributed by Oracle America and/or its affiliates are -subject to the following clarification and special exception to the GPL, but -only where Oracle has expressly included in the particular source file's header -the words "Oracle designates this particular file as subject to the "Classpath" -exception as provided by Oracle in the LICENSE file that accompanied this code." - - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. diff --git a/jre-11/legal/java.naming/ADDITIONAL_LICENSE_INFO b/jre-11/legal/java.naming/ADDITIONAL_LICENSE_INFO deleted file mode 100644 index ff700cd09..000000000 --- a/jre-11/legal/java.naming/ADDITIONAL_LICENSE_INFO +++ /dev/null @@ -1,37 +0,0 @@ - ADDITIONAL INFORMATION ABOUT LICENSING - -Certain files distributed by Oracle America, Inc. and/or its affiliates are -subject to the following clarification and special exception to the GPLv2, -based on the GNU Project exception for its Classpath libraries, known as the -GNU Classpath Exception. - -Note that Oracle includes multiple, independent programs in this software -package. Some of those programs are provided under licenses deemed -incompatible with the GPLv2 by the Free Software Foundation and others. -For example, the package includes programs licensed under the Apache -License, Version 2.0 and may include FreeType. Such programs are licensed -to you under their original licenses. - -Oracle facilitates your further distribution of this package by adding the -Classpath Exception to the necessary parts of its GPLv2 code, which permits -you to use that code in combination with other independent modules not -licensed under the GPLv2. However, note that this would not permit you to -commingle code under an incompatible license with Oracle's GPLv2 licensed -code by, for example, cutting and pasting such code into a file also -containing Oracle's GPLv2 licensed code and then distributing the result. - -Additionally, if you were to remove the Classpath Exception from any of the -files to which it applies and distribute the result, you would likely be -required to license some or all of the other code in that distribution under -the GPLv2 as well, and since the GPLv2 is incompatible with the license terms -of some items included in the distribution by Oracle, removing the Classpath -Exception could therefore effectively compromise your ability to further -distribute the package. - -Failing to distribute notices associated with some files may also create -unexpected legal consequences. - -Proceed with caution and we recommend that you obtain the advice of a lawyer -skilled in open source matters before removing the Classpath Exception or -making modifications to this package which may subsequently be redistributed -and/or involve the use of third party software. diff --git a/jre-11/legal/java.naming/ASSEMBLY_EXCEPTION b/jre-11/legal/java.naming/ASSEMBLY_EXCEPTION deleted file mode 100644 index 065b8d902..000000000 --- a/jre-11/legal/java.naming/ASSEMBLY_EXCEPTION +++ /dev/null @@ -1,27 +0,0 @@ - -OPENJDK ASSEMBLY EXCEPTION - -The OpenJDK source code made available by Oracle America, Inc. (Oracle) at -openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU -General Public License version 2 -only ("GPL2"), with the following clarification and special exception. - - Linking this OpenJDK Code statically or dynamically with other code - is making a combined work based on this library. Thus, the terms - and conditions of GPL2 cover the whole combination. - - As a special exception, Oracle gives you permission to link this - OpenJDK Code with certain code licensed by Oracle as indicated at - http://openjdk.java.net/legal/exception-modules-2007-05-08.html - ("Designated Exception Modules") to produce an executable, - regardless of the license terms of the Designated Exception Modules, - and to copy and distribute the resulting executable under GPL2, - provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Oracle. - -As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code -to build an executable that includes those portions of necessary code that -Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 -with the Classpath exception). If you modify or add to the OpenJDK code, -that new GPL2 code may still be combined with Designated Exception Modules -if the new code is made subject to this exception by its copyright holder. diff --git a/jre-11/legal/java.naming/LICENSE b/jre-11/legal/java.naming/LICENSE deleted file mode 100644 index 8b400c7ab..000000000 --- a/jre-11/legal/java.naming/LICENSE +++ /dev/null @@ -1,347 +0,0 @@ -The GNU General Public License (GPL) - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to -most of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you -can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for -a fee, you must give the recipients all the rights that you have. You must -make sure that they, too, receive or can get the source code. And you must -show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced -by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program proprietary. -To prevent this, we have made it clear that any patent must be licensed for -everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included -without limitation in the term "modification".) Each licensee is addressed as -"you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is -not restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and give any other recipients of the -Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or - in part contains or is derived from the Program or any part thereof, to be - licensed as a whole at no charge to all third parties under the terms of - this License. - - c) If the modified program normally reads commands interactively when run, - you must cause it, when started running for such interactive use in the - most ordinary way, to print or display an announcement including an - appropriate copyright notice and a notice that there is no warranty (or - else, saying that you provide a warranty) and that users may redistribute - the program under these conditions, and telling the user how to view a copy - of this License. (Exception: if the Program itself is interactive but does - not normally print such an announcement, your work based on the Program is - not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms -of this License, whose permissions for other licensees extend to the entire -whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and -2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 above - on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to - give any third party, for a charge no more than your cost of physically - performing source distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only - for noncommercial distribution and only if you received the program in - object code or executable form with such an offer, in accord with - Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code -distributed need not include anything that is normally distributed (in either -source or binary form) with the major components (compiler, kernel, and so on) -of the operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or -any work based on the Program), you indicate your acceptance of this License to -do so, and all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to -copy, distribute or modify the Program subject to these terms and conditions. -You may not impose any further restrictions on the recipients' exercise of the -rights granted herein. You are not responsible for enforcing compliance by -third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Program at all. -For example, if a patent license would not permit royalty-free redistribution -of the Program by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In -such case, this License incorporates the limitation as if written in the body -of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software Foundation. -If the Program does not specify a version number of this License, you may -choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR -INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA -BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER -OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - - Copyright (C) - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author Gnomovision comes - with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free - software, and you are welcome to redistribute it under certain conditions; - type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than 'show w' and 'show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here -is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - 'Gnomovision' (which makes passes at compilers) written by James Hacker. - - signature of Ty Coon, 1 April 1989 - - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. - - -"CLASSPATH" EXCEPTION TO THE GPL - -Certain source files distributed by Oracle America and/or its affiliates are -subject to the following clarification and special exception to the GPL, but -only where Oracle has expressly included in the particular source file's header -the words "Oracle designates this particular file as subject to the "Classpath" -exception as provided by Oracle in the LICENSE file that accompanied this code." - - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. diff --git a/jre-11/legal/java.prefs/ADDITIONAL_LICENSE_INFO b/jre-11/legal/java.prefs/ADDITIONAL_LICENSE_INFO deleted file mode 100644 index ff700cd09..000000000 --- a/jre-11/legal/java.prefs/ADDITIONAL_LICENSE_INFO +++ /dev/null @@ -1,37 +0,0 @@ - ADDITIONAL INFORMATION ABOUT LICENSING - -Certain files distributed by Oracle America, Inc. and/or its affiliates are -subject to the following clarification and special exception to the GPLv2, -based on the GNU Project exception for its Classpath libraries, known as the -GNU Classpath Exception. - -Note that Oracle includes multiple, independent programs in this software -package. Some of those programs are provided under licenses deemed -incompatible with the GPLv2 by the Free Software Foundation and others. -For example, the package includes programs licensed under the Apache -License, Version 2.0 and may include FreeType. Such programs are licensed -to you under their original licenses. - -Oracle facilitates your further distribution of this package by adding the -Classpath Exception to the necessary parts of its GPLv2 code, which permits -you to use that code in combination with other independent modules not -licensed under the GPLv2. However, note that this would not permit you to -commingle code under an incompatible license with Oracle's GPLv2 licensed -code by, for example, cutting and pasting such code into a file also -containing Oracle's GPLv2 licensed code and then distributing the result. - -Additionally, if you were to remove the Classpath Exception from any of the -files to which it applies and distribute the result, you would likely be -required to license some or all of the other code in that distribution under -the GPLv2 as well, and since the GPLv2 is incompatible with the license terms -of some items included in the distribution by Oracle, removing the Classpath -Exception could therefore effectively compromise your ability to further -distribute the package. - -Failing to distribute notices associated with some files may also create -unexpected legal consequences. - -Proceed with caution and we recommend that you obtain the advice of a lawyer -skilled in open source matters before removing the Classpath Exception or -making modifications to this package which may subsequently be redistributed -and/or involve the use of third party software. diff --git a/jre-11/legal/java.prefs/ASSEMBLY_EXCEPTION b/jre-11/legal/java.prefs/ASSEMBLY_EXCEPTION deleted file mode 100644 index 065b8d902..000000000 --- a/jre-11/legal/java.prefs/ASSEMBLY_EXCEPTION +++ /dev/null @@ -1,27 +0,0 @@ - -OPENJDK ASSEMBLY EXCEPTION - -The OpenJDK source code made available by Oracle America, Inc. (Oracle) at -openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU -General Public License version 2 -only ("GPL2"), with the following clarification and special exception. - - Linking this OpenJDK Code statically or dynamically with other code - is making a combined work based on this library. Thus, the terms - and conditions of GPL2 cover the whole combination. - - As a special exception, Oracle gives you permission to link this - OpenJDK Code with certain code licensed by Oracle as indicated at - http://openjdk.java.net/legal/exception-modules-2007-05-08.html - ("Designated Exception Modules") to produce an executable, - regardless of the license terms of the Designated Exception Modules, - and to copy and distribute the resulting executable under GPL2, - provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Oracle. - -As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code -to build an executable that includes those portions of necessary code that -Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 -with the Classpath exception). If you modify or add to the OpenJDK code, -that new GPL2 code may still be combined with Designated Exception Modules -if the new code is made subject to this exception by its copyright holder. diff --git a/jre-11/legal/java.prefs/LICENSE b/jre-11/legal/java.prefs/LICENSE deleted file mode 100644 index 8b400c7ab..000000000 --- a/jre-11/legal/java.prefs/LICENSE +++ /dev/null @@ -1,347 +0,0 @@ -The GNU General Public License (GPL) - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to -most of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you -can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for -a fee, you must give the recipients all the rights that you have. You must -make sure that they, too, receive or can get the source code. And you must -show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced -by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program proprietary. -To prevent this, we have made it clear that any patent must be licensed for -everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included -without limitation in the term "modification".) Each licensee is addressed as -"you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is -not restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and give any other recipients of the -Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or - in part contains or is derived from the Program or any part thereof, to be - licensed as a whole at no charge to all third parties under the terms of - this License. - - c) If the modified program normally reads commands interactively when run, - you must cause it, when started running for such interactive use in the - most ordinary way, to print or display an announcement including an - appropriate copyright notice and a notice that there is no warranty (or - else, saying that you provide a warranty) and that users may redistribute - the program under these conditions, and telling the user how to view a copy - of this License. (Exception: if the Program itself is interactive but does - not normally print such an announcement, your work based on the Program is - not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms -of this License, whose permissions for other licensees extend to the entire -whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and -2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 above - on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to - give any third party, for a charge no more than your cost of physically - performing source distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only - for noncommercial distribution and only if you received the program in - object code or executable form with such an offer, in accord with - Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code -distributed need not include anything that is normally distributed (in either -source or binary form) with the major components (compiler, kernel, and so on) -of the operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or -any work based on the Program), you indicate your acceptance of this License to -do so, and all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to -copy, distribute or modify the Program subject to these terms and conditions. -You may not impose any further restrictions on the recipients' exercise of the -rights granted herein. You are not responsible for enforcing compliance by -third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Program at all. -For example, if a patent license would not permit royalty-free redistribution -of the Program by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In -such case, this License incorporates the limitation as if written in the body -of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software Foundation. -If the Program does not specify a version number of this License, you may -choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR -INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA -BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER -OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - - Copyright (C) - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author Gnomovision comes - with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free - software, and you are welcome to redistribute it under certain conditions; - type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than 'show w' and 'show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here -is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - 'Gnomovision' (which makes passes at compilers) written by James Hacker. - - signature of Ty Coon, 1 April 1989 - - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. - - -"CLASSPATH" EXCEPTION TO THE GPL - -Certain source files distributed by Oracle America and/or its affiliates are -subject to the following clarification and special exception to the GPL, but -only where Oracle has expressly included in the particular source file's header -the words "Oracle designates this particular file as subject to the "Classpath" -exception as provided by Oracle in the LICENSE file that accompanied this code." - - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. diff --git a/jre-11/legal/java.security.jgss/ADDITIONAL_LICENSE_INFO b/jre-11/legal/java.security.jgss/ADDITIONAL_LICENSE_INFO deleted file mode 100644 index ff700cd09..000000000 --- a/jre-11/legal/java.security.jgss/ADDITIONAL_LICENSE_INFO +++ /dev/null @@ -1,37 +0,0 @@ - ADDITIONAL INFORMATION ABOUT LICENSING - -Certain files distributed by Oracle America, Inc. and/or its affiliates are -subject to the following clarification and special exception to the GPLv2, -based on the GNU Project exception for its Classpath libraries, known as the -GNU Classpath Exception. - -Note that Oracle includes multiple, independent programs in this software -package. Some of those programs are provided under licenses deemed -incompatible with the GPLv2 by the Free Software Foundation and others. -For example, the package includes programs licensed under the Apache -License, Version 2.0 and may include FreeType. Such programs are licensed -to you under their original licenses. - -Oracle facilitates your further distribution of this package by adding the -Classpath Exception to the necessary parts of its GPLv2 code, which permits -you to use that code in combination with other independent modules not -licensed under the GPLv2. However, note that this would not permit you to -commingle code under an incompatible license with Oracle's GPLv2 licensed -code by, for example, cutting and pasting such code into a file also -containing Oracle's GPLv2 licensed code and then distributing the result. - -Additionally, if you were to remove the Classpath Exception from any of the -files to which it applies and distribute the result, you would likely be -required to license some or all of the other code in that distribution under -the GPLv2 as well, and since the GPLv2 is incompatible with the license terms -of some items included in the distribution by Oracle, removing the Classpath -Exception could therefore effectively compromise your ability to further -distribute the package. - -Failing to distribute notices associated with some files may also create -unexpected legal consequences. - -Proceed with caution and we recommend that you obtain the advice of a lawyer -skilled in open source matters before removing the Classpath Exception or -making modifications to this package which may subsequently be redistributed -and/or involve the use of third party software. diff --git a/jre-11/legal/java.security.jgss/ASSEMBLY_EXCEPTION b/jre-11/legal/java.security.jgss/ASSEMBLY_EXCEPTION deleted file mode 100644 index 065b8d902..000000000 --- a/jre-11/legal/java.security.jgss/ASSEMBLY_EXCEPTION +++ /dev/null @@ -1,27 +0,0 @@ - -OPENJDK ASSEMBLY EXCEPTION - -The OpenJDK source code made available by Oracle America, Inc. (Oracle) at -openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU -General Public License version 2 -only ("GPL2"), with the following clarification and special exception. - - Linking this OpenJDK Code statically or dynamically with other code - is making a combined work based on this library. Thus, the terms - and conditions of GPL2 cover the whole combination. - - As a special exception, Oracle gives you permission to link this - OpenJDK Code with certain code licensed by Oracle as indicated at - http://openjdk.java.net/legal/exception-modules-2007-05-08.html - ("Designated Exception Modules") to produce an executable, - regardless of the license terms of the Designated Exception Modules, - and to copy and distribute the resulting executable under GPL2, - provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Oracle. - -As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code -to build an executable that includes those portions of necessary code that -Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 -with the Classpath exception). If you modify or add to the OpenJDK code, -that new GPL2 code may still be combined with Designated Exception Modules -if the new code is made subject to this exception by its copyright holder. diff --git a/jre-11/legal/java.security.jgss/LICENSE b/jre-11/legal/java.security.jgss/LICENSE deleted file mode 100644 index 8b400c7ab..000000000 --- a/jre-11/legal/java.security.jgss/LICENSE +++ /dev/null @@ -1,347 +0,0 @@ -The GNU General Public License (GPL) - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to -most of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you -can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for -a fee, you must give the recipients all the rights that you have. You must -make sure that they, too, receive or can get the source code. And you must -show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced -by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program proprietary. -To prevent this, we have made it clear that any patent must be licensed for -everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included -without limitation in the term "modification".) Each licensee is addressed as -"you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is -not restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and give any other recipients of the -Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or - in part contains or is derived from the Program or any part thereof, to be - licensed as a whole at no charge to all third parties under the terms of - this License. - - c) If the modified program normally reads commands interactively when run, - you must cause it, when started running for such interactive use in the - most ordinary way, to print or display an announcement including an - appropriate copyright notice and a notice that there is no warranty (or - else, saying that you provide a warranty) and that users may redistribute - the program under these conditions, and telling the user how to view a copy - of this License. (Exception: if the Program itself is interactive but does - not normally print such an announcement, your work based on the Program is - not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms -of this License, whose permissions for other licensees extend to the entire -whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and -2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 above - on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to - give any third party, for a charge no more than your cost of physically - performing source distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only - for noncommercial distribution and only if you received the program in - object code or executable form with such an offer, in accord with - Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code -distributed need not include anything that is normally distributed (in either -source or binary form) with the major components (compiler, kernel, and so on) -of the operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or -any work based on the Program), you indicate your acceptance of this License to -do so, and all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to -copy, distribute or modify the Program subject to these terms and conditions. -You may not impose any further restrictions on the recipients' exercise of the -rights granted herein. You are not responsible for enforcing compliance by -third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Program at all. -For example, if a patent license would not permit royalty-free redistribution -of the Program by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In -such case, this License incorporates the limitation as if written in the body -of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software Foundation. -If the Program does not specify a version number of this License, you may -choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR -INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA -BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER -OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - - Copyright (C) - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author Gnomovision comes - with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free - software, and you are welcome to redistribute it under certain conditions; - type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than 'show w' and 'show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here -is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - 'Gnomovision' (which makes passes at compilers) written by James Hacker. - - signature of Ty Coon, 1 April 1989 - - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. - - -"CLASSPATH" EXCEPTION TO THE GPL - -Certain source files distributed by Oracle America and/or its affiliates are -subject to the following clarification and special exception to the GPL, but -only where Oracle has expressly included in the particular source file's header -the words "Oracle designates this particular file as subject to the "Classpath" -exception as provided by Oracle in the LICENSE file that accompanied this code." - - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. diff --git a/jre-11/legal/java.security.sasl/ADDITIONAL_LICENSE_INFO b/jre-11/legal/java.security.sasl/ADDITIONAL_LICENSE_INFO deleted file mode 100644 index ff700cd09..000000000 --- a/jre-11/legal/java.security.sasl/ADDITIONAL_LICENSE_INFO +++ /dev/null @@ -1,37 +0,0 @@ - ADDITIONAL INFORMATION ABOUT LICENSING - -Certain files distributed by Oracle America, Inc. and/or its affiliates are -subject to the following clarification and special exception to the GPLv2, -based on the GNU Project exception for its Classpath libraries, known as the -GNU Classpath Exception. - -Note that Oracle includes multiple, independent programs in this software -package. Some of those programs are provided under licenses deemed -incompatible with the GPLv2 by the Free Software Foundation and others. -For example, the package includes programs licensed under the Apache -License, Version 2.0 and may include FreeType. Such programs are licensed -to you under their original licenses. - -Oracle facilitates your further distribution of this package by adding the -Classpath Exception to the necessary parts of its GPLv2 code, which permits -you to use that code in combination with other independent modules not -licensed under the GPLv2. However, note that this would not permit you to -commingle code under an incompatible license with Oracle's GPLv2 licensed -code by, for example, cutting and pasting such code into a file also -containing Oracle's GPLv2 licensed code and then distributing the result. - -Additionally, if you were to remove the Classpath Exception from any of the -files to which it applies and distribute the result, you would likely be -required to license some or all of the other code in that distribution under -the GPLv2 as well, and since the GPLv2 is incompatible with the license terms -of some items included in the distribution by Oracle, removing the Classpath -Exception could therefore effectively compromise your ability to further -distribute the package. - -Failing to distribute notices associated with some files may also create -unexpected legal consequences. - -Proceed with caution and we recommend that you obtain the advice of a lawyer -skilled in open source matters before removing the Classpath Exception or -making modifications to this package which may subsequently be redistributed -and/or involve the use of third party software. diff --git a/jre-11/legal/java.security.sasl/ASSEMBLY_EXCEPTION b/jre-11/legal/java.security.sasl/ASSEMBLY_EXCEPTION deleted file mode 100644 index 065b8d902..000000000 --- a/jre-11/legal/java.security.sasl/ASSEMBLY_EXCEPTION +++ /dev/null @@ -1,27 +0,0 @@ - -OPENJDK ASSEMBLY EXCEPTION - -The OpenJDK source code made available by Oracle America, Inc. (Oracle) at -openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU -General Public License version 2 -only ("GPL2"), with the following clarification and special exception. - - Linking this OpenJDK Code statically or dynamically with other code - is making a combined work based on this library. Thus, the terms - and conditions of GPL2 cover the whole combination. - - As a special exception, Oracle gives you permission to link this - OpenJDK Code with certain code licensed by Oracle as indicated at - http://openjdk.java.net/legal/exception-modules-2007-05-08.html - ("Designated Exception Modules") to produce an executable, - regardless of the license terms of the Designated Exception Modules, - and to copy and distribute the resulting executable under GPL2, - provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Oracle. - -As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code -to build an executable that includes those portions of necessary code that -Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 -with the Classpath exception). If you modify or add to the OpenJDK code, -that new GPL2 code may still be combined with Designated Exception Modules -if the new code is made subject to this exception by its copyright holder. diff --git a/jre-11/legal/java.security.sasl/LICENSE b/jre-11/legal/java.security.sasl/LICENSE deleted file mode 100644 index 8b400c7ab..000000000 --- a/jre-11/legal/java.security.sasl/LICENSE +++ /dev/null @@ -1,347 +0,0 @@ -The GNU General Public License (GPL) - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to -most of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you -can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for -a fee, you must give the recipients all the rights that you have. You must -make sure that they, too, receive or can get the source code. And you must -show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced -by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program proprietary. -To prevent this, we have made it clear that any patent must be licensed for -everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included -without limitation in the term "modification".) Each licensee is addressed as -"you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is -not restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and give any other recipients of the -Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or - in part contains or is derived from the Program or any part thereof, to be - licensed as a whole at no charge to all third parties under the terms of - this License. - - c) If the modified program normally reads commands interactively when run, - you must cause it, when started running for such interactive use in the - most ordinary way, to print or display an announcement including an - appropriate copyright notice and a notice that there is no warranty (or - else, saying that you provide a warranty) and that users may redistribute - the program under these conditions, and telling the user how to view a copy - of this License. (Exception: if the Program itself is interactive but does - not normally print such an announcement, your work based on the Program is - not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms -of this License, whose permissions for other licensees extend to the entire -whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and -2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 above - on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to - give any third party, for a charge no more than your cost of physically - performing source distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only - for noncommercial distribution and only if you received the program in - object code or executable form with such an offer, in accord with - Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code -distributed need not include anything that is normally distributed (in either -source or binary form) with the major components (compiler, kernel, and so on) -of the operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or -any work based on the Program), you indicate your acceptance of this License to -do so, and all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to -copy, distribute or modify the Program subject to these terms and conditions. -You may not impose any further restrictions on the recipients' exercise of the -rights granted herein. You are not responsible for enforcing compliance by -third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Program at all. -For example, if a patent license would not permit royalty-free redistribution -of the Program by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In -such case, this License incorporates the limitation as if written in the body -of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software Foundation. -If the Program does not specify a version number of this License, you may -choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR -INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA -BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER -OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - - Copyright (C) - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author Gnomovision comes - with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free - software, and you are welcome to redistribute it under certain conditions; - type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than 'show w' and 'show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here -is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - 'Gnomovision' (which makes passes at compilers) written by James Hacker. - - signature of Ty Coon, 1 April 1989 - - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. - - -"CLASSPATH" EXCEPTION TO THE GPL - -Certain source files distributed by Oracle America and/or its affiliates are -subject to the following clarification and special exception to the GPL, but -only where Oracle has expressly included in the particular source file's header -the words "Oracle designates this particular file as subject to the "Classpath" -exception as provided by Oracle in the LICENSE file that accompanied this code." - - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. diff --git a/jre-11/legal/java.sql/ADDITIONAL_LICENSE_INFO b/jre-11/legal/java.sql/ADDITIONAL_LICENSE_INFO deleted file mode 100644 index ff700cd09..000000000 --- a/jre-11/legal/java.sql/ADDITIONAL_LICENSE_INFO +++ /dev/null @@ -1,37 +0,0 @@ - ADDITIONAL INFORMATION ABOUT LICENSING - -Certain files distributed by Oracle America, Inc. and/or its affiliates are -subject to the following clarification and special exception to the GPLv2, -based on the GNU Project exception for its Classpath libraries, known as the -GNU Classpath Exception. - -Note that Oracle includes multiple, independent programs in this software -package. Some of those programs are provided under licenses deemed -incompatible with the GPLv2 by the Free Software Foundation and others. -For example, the package includes programs licensed under the Apache -License, Version 2.0 and may include FreeType. Such programs are licensed -to you under their original licenses. - -Oracle facilitates your further distribution of this package by adding the -Classpath Exception to the necessary parts of its GPLv2 code, which permits -you to use that code in combination with other independent modules not -licensed under the GPLv2. However, note that this would not permit you to -commingle code under an incompatible license with Oracle's GPLv2 licensed -code by, for example, cutting and pasting such code into a file also -containing Oracle's GPLv2 licensed code and then distributing the result. - -Additionally, if you were to remove the Classpath Exception from any of the -files to which it applies and distribute the result, you would likely be -required to license some or all of the other code in that distribution under -the GPLv2 as well, and since the GPLv2 is incompatible with the license terms -of some items included in the distribution by Oracle, removing the Classpath -Exception could therefore effectively compromise your ability to further -distribute the package. - -Failing to distribute notices associated with some files may also create -unexpected legal consequences. - -Proceed with caution and we recommend that you obtain the advice of a lawyer -skilled in open source matters before removing the Classpath Exception or -making modifications to this package which may subsequently be redistributed -and/or involve the use of third party software. diff --git a/jre-11/legal/java.sql/ASSEMBLY_EXCEPTION b/jre-11/legal/java.sql/ASSEMBLY_EXCEPTION deleted file mode 100644 index 065b8d902..000000000 --- a/jre-11/legal/java.sql/ASSEMBLY_EXCEPTION +++ /dev/null @@ -1,27 +0,0 @@ - -OPENJDK ASSEMBLY EXCEPTION - -The OpenJDK source code made available by Oracle America, Inc. (Oracle) at -openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU -General Public License version 2 -only ("GPL2"), with the following clarification and special exception. - - Linking this OpenJDK Code statically or dynamically with other code - is making a combined work based on this library. Thus, the terms - and conditions of GPL2 cover the whole combination. - - As a special exception, Oracle gives you permission to link this - OpenJDK Code with certain code licensed by Oracle as indicated at - http://openjdk.java.net/legal/exception-modules-2007-05-08.html - ("Designated Exception Modules") to produce an executable, - regardless of the license terms of the Designated Exception Modules, - and to copy and distribute the resulting executable under GPL2, - provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Oracle. - -As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code -to build an executable that includes those portions of necessary code that -Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 -with the Classpath exception). If you modify or add to the OpenJDK code, -that new GPL2 code may still be combined with Designated Exception Modules -if the new code is made subject to this exception by its copyright holder. diff --git a/jre-11/legal/java.sql/LICENSE b/jre-11/legal/java.sql/LICENSE deleted file mode 100644 index 8b400c7ab..000000000 --- a/jre-11/legal/java.sql/LICENSE +++ /dev/null @@ -1,347 +0,0 @@ -The GNU General Public License (GPL) - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to -most of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you -can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for -a fee, you must give the recipients all the rights that you have. You must -make sure that they, too, receive or can get the source code. And you must -show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced -by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program proprietary. -To prevent this, we have made it clear that any patent must be licensed for -everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included -without limitation in the term "modification".) Each licensee is addressed as -"you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is -not restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and give any other recipients of the -Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or - in part contains or is derived from the Program or any part thereof, to be - licensed as a whole at no charge to all third parties under the terms of - this License. - - c) If the modified program normally reads commands interactively when run, - you must cause it, when started running for such interactive use in the - most ordinary way, to print or display an announcement including an - appropriate copyright notice and a notice that there is no warranty (or - else, saying that you provide a warranty) and that users may redistribute - the program under these conditions, and telling the user how to view a copy - of this License. (Exception: if the Program itself is interactive but does - not normally print such an announcement, your work based on the Program is - not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms -of this License, whose permissions for other licensees extend to the entire -whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and -2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 above - on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to - give any third party, for a charge no more than your cost of physically - performing source distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only - for noncommercial distribution and only if you received the program in - object code or executable form with such an offer, in accord with - Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code -distributed need not include anything that is normally distributed (in either -source or binary form) with the major components (compiler, kernel, and so on) -of the operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or -any work based on the Program), you indicate your acceptance of this License to -do so, and all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to -copy, distribute or modify the Program subject to these terms and conditions. -You may not impose any further restrictions on the recipients' exercise of the -rights granted herein. You are not responsible for enforcing compliance by -third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Program at all. -For example, if a patent license would not permit royalty-free redistribution -of the Program by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In -such case, this License incorporates the limitation as if written in the body -of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software Foundation. -If the Program does not specify a version number of this License, you may -choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR -INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA -BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER -OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - - Copyright (C) - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author Gnomovision comes - with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free - software, and you are welcome to redistribute it under certain conditions; - type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than 'show w' and 'show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here -is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - 'Gnomovision' (which makes passes at compilers) written by James Hacker. - - signature of Ty Coon, 1 April 1989 - - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. - - -"CLASSPATH" EXCEPTION TO THE GPL - -Certain source files distributed by Oracle America and/or its affiliates are -subject to the following clarification and special exception to the GPL, but -only where Oracle has expressly included in the particular source file's header -the words "Oracle designates this particular file as subject to the "Classpath" -exception as provided by Oracle in the LICENSE file that accompanied this code." - - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. diff --git a/jre-11/legal/java.transaction.xa/ADDITIONAL_LICENSE_INFO b/jre-11/legal/java.transaction.xa/ADDITIONAL_LICENSE_INFO deleted file mode 100644 index ff700cd09..000000000 --- a/jre-11/legal/java.transaction.xa/ADDITIONAL_LICENSE_INFO +++ /dev/null @@ -1,37 +0,0 @@ - ADDITIONAL INFORMATION ABOUT LICENSING - -Certain files distributed by Oracle America, Inc. and/or its affiliates are -subject to the following clarification and special exception to the GPLv2, -based on the GNU Project exception for its Classpath libraries, known as the -GNU Classpath Exception. - -Note that Oracle includes multiple, independent programs in this software -package. Some of those programs are provided under licenses deemed -incompatible with the GPLv2 by the Free Software Foundation and others. -For example, the package includes programs licensed under the Apache -License, Version 2.0 and may include FreeType. Such programs are licensed -to you under their original licenses. - -Oracle facilitates your further distribution of this package by adding the -Classpath Exception to the necessary parts of its GPLv2 code, which permits -you to use that code in combination with other independent modules not -licensed under the GPLv2. However, note that this would not permit you to -commingle code under an incompatible license with Oracle's GPLv2 licensed -code by, for example, cutting and pasting such code into a file also -containing Oracle's GPLv2 licensed code and then distributing the result. - -Additionally, if you were to remove the Classpath Exception from any of the -files to which it applies and distribute the result, you would likely be -required to license some or all of the other code in that distribution under -the GPLv2 as well, and since the GPLv2 is incompatible with the license terms -of some items included in the distribution by Oracle, removing the Classpath -Exception could therefore effectively compromise your ability to further -distribute the package. - -Failing to distribute notices associated with some files may also create -unexpected legal consequences. - -Proceed with caution and we recommend that you obtain the advice of a lawyer -skilled in open source matters before removing the Classpath Exception or -making modifications to this package which may subsequently be redistributed -and/or involve the use of third party software. diff --git a/jre-11/legal/java.transaction.xa/ASSEMBLY_EXCEPTION b/jre-11/legal/java.transaction.xa/ASSEMBLY_EXCEPTION deleted file mode 100644 index 065b8d902..000000000 --- a/jre-11/legal/java.transaction.xa/ASSEMBLY_EXCEPTION +++ /dev/null @@ -1,27 +0,0 @@ - -OPENJDK ASSEMBLY EXCEPTION - -The OpenJDK source code made available by Oracle America, Inc. (Oracle) at -openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU -General Public License version 2 -only ("GPL2"), with the following clarification and special exception. - - Linking this OpenJDK Code statically or dynamically with other code - is making a combined work based on this library. Thus, the terms - and conditions of GPL2 cover the whole combination. - - As a special exception, Oracle gives you permission to link this - OpenJDK Code with certain code licensed by Oracle as indicated at - http://openjdk.java.net/legal/exception-modules-2007-05-08.html - ("Designated Exception Modules") to produce an executable, - regardless of the license terms of the Designated Exception Modules, - and to copy and distribute the resulting executable under GPL2, - provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Oracle. - -As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code -to build an executable that includes those portions of necessary code that -Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 -with the Classpath exception). If you modify or add to the OpenJDK code, -that new GPL2 code may still be combined with Designated Exception Modules -if the new code is made subject to this exception by its copyright holder. diff --git a/jre-11/legal/java.transaction.xa/LICENSE b/jre-11/legal/java.transaction.xa/LICENSE deleted file mode 100644 index 8b400c7ab..000000000 --- a/jre-11/legal/java.transaction.xa/LICENSE +++ /dev/null @@ -1,347 +0,0 @@ -The GNU General Public License (GPL) - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to -most of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you -can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for -a fee, you must give the recipients all the rights that you have. You must -make sure that they, too, receive or can get the source code. And you must -show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced -by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program proprietary. -To prevent this, we have made it clear that any patent must be licensed for -everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included -without limitation in the term "modification".) Each licensee is addressed as -"you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is -not restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and give any other recipients of the -Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or - in part contains or is derived from the Program or any part thereof, to be - licensed as a whole at no charge to all third parties under the terms of - this License. - - c) If the modified program normally reads commands interactively when run, - you must cause it, when started running for such interactive use in the - most ordinary way, to print or display an announcement including an - appropriate copyright notice and a notice that there is no warranty (or - else, saying that you provide a warranty) and that users may redistribute - the program under these conditions, and telling the user how to view a copy - of this License. (Exception: if the Program itself is interactive but does - not normally print such an announcement, your work based on the Program is - not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms -of this License, whose permissions for other licensees extend to the entire -whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and -2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 above - on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to - give any third party, for a charge no more than your cost of physically - performing source distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only - for noncommercial distribution and only if you received the program in - object code or executable form with such an offer, in accord with - Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code -distributed need not include anything that is normally distributed (in either -source or binary form) with the major components (compiler, kernel, and so on) -of the operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or -any work based on the Program), you indicate your acceptance of this License to -do so, and all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to -copy, distribute or modify the Program subject to these terms and conditions. -You may not impose any further restrictions on the recipients' exercise of the -rights granted herein. You are not responsible for enforcing compliance by -third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Program at all. -For example, if a patent license would not permit royalty-free redistribution -of the Program by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In -such case, this License incorporates the limitation as if written in the body -of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software Foundation. -If the Program does not specify a version number of this License, you may -choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR -INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA -BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER -OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - - Copyright (C) - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author Gnomovision comes - with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free - software, and you are welcome to redistribute it under certain conditions; - type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than 'show w' and 'show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here -is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - 'Gnomovision' (which makes passes at compilers) written by James Hacker. - - signature of Ty Coon, 1 April 1989 - - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. - - -"CLASSPATH" EXCEPTION TO THE GPL - -Certain source files distributed by Oracle America and/or its affiliates are -subject to the following clarification and special exception to the GPL, but -only where Oracle has expressly included in the particular source file's header -the words "Oracle designates this particular file as subject to the "Classpath" -exception as provided by Oracle in the LICENSE file that accompanied this code." - - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. diff --git a/jre-11/legal/java.xml/ADDITIONAL_LICENSE_INFO b/jre-11/legal/java.xml/ADDITIONAL_LICENSE_INFO deleted file mode 100644 index ff700cd09..000000000 --- a/jre-11/legal/java.xml/ADDITIONAL_LICENSE_INFO +++ /dev/null @@ -1,37 +0,0 @@ - ADDITIONAL INFORMATION ABOUT LICENSING - -Certain files distributed by Oracle America, Inc. and/or its affiliates are -subject to the following clarification and special exception to the GPLv2, -based on the GNU Project exception for its Classpath libraries, known as the -GNU Classpath Exception. - -Note that Oracle includes multiple, independent programs in this software -package. Some of those programs are provided under licenses deemed -incompatible with the GPLv2 by the Free Software Foundation and others. -For example, the package includes programs licensed under the Apache -License, Version 2.0 and may include FreeType. Such programs are licensed -to you under their original licenses. - -Oracle facilitates your further distribution of this package by adding the -Classpath Exception to the necessary parts of its GPLv2 code, which permits -you to use that code in combination with other independent modules not -licensed under the GPLv2. However, note that this would not permit you to -commingle code under an incompatible license with Oracle's GPLv2 licensed -code by, for example, cutting and pasting such code into a file also -containing Oracle's GPLv2 licensed code and then distributing the result. - -Additionally, if you were to remove the Classpath Exception from any of the -files to which it applies and distribute the result, you would likely be -required to license some or all of the other code in that distribution under -the GPLv2 as well, and since the GPLv2 is incompatible with the license terms -of some items included in the distribution by Oracle, removing the Classpath -Exception could therefore effectively compromise your ability to further -distribute the package. - -Failing to distribute notices associated with some files may also create -unexpected legal consequences. - -Proceed with caution and we recommend that you obtain the advice of a lawyer -skilled in open source matters before removing the Classpath Exception or -making modifications to this package which may subsequently be redistributed -and/or involve the use of third party software. diff --git a/jre-11/legal/java.xml/ASSEMBLY_EXCEPTION b/jre-11/legal/java.xml/ASSEMBLY_EXCEPTION deleted file mode 100644 index 065b8d902..000000000 --- a/jre-11/legal/java.xml/ASSEMBLY_EXCEPTION +++ /dev/null @@ -1,27 +0,0 @@ - -OPENJDK ASSEMBLY EXCEPTION - -The OpenJDK source code made available by Oracle America, Inc. (Oracle) at -openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU -General Public License version 2 -only ("GPL2"), with the following clarification and special exception. - - Linking this OpenJDK Code statically or dynamically with other code - is making a combined work based on this library. Thus, the terms - and conditions of GPL2 cover the whole combination. - - As a special exception, Oracle gives you permission to link this - OpenJDK Code with certain code licensed by Oracle as indicated at - http://openjdk.java.net/legal/exception-modules-2007-05-08.html - ("Designated Exception Modules") to produce an executable, - regardless of the license terms of the Designated Exception Modules, - and to copy and distribute the resulting executable under GPL2, - provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Oracle. - -As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code -to build an executable that includes those portions of necessary code that -Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 -with the Classpath exception). If you modify or add to the OpenJDK code, -that new GPL2 code may still be combined with Designated Exception Modules -if the new code is made subject to this exception by its copyright holder. diff --git a/jre-11/legal/java.xml/LICENSE b/jre-11/legal/java.xml/LICENSE deleted file mode 100644 index 8b400c7ab..000000000 --- a/jre-11/legal/java.xml/LICENSE +++ /dev/null @@ -1,347 +0,0 @@ -The GNU General Public License (GPL) - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to -most of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you -can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for -a fee, you must give the recipients all the rights that you have. You must -make sure that they, too, receive or can get the source code. And you must -show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced -by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program proprietary. -To prevent this, we have made it clear that any patent must be licensed for -everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included -without limitation in the term "modification".) Each licensee is addressed as -"you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is -not restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and give any other recipients of the -Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or - in part contains or is derived from the Program or any part thereof, to be - licensed as a whole at no charge to all third parties under the terms of - this License. - - c) If the modified program normally reads commands interactively when run, - you must cause it, when started running for such interactive use in the - most ordinary way, to print or display an announcement including an - appropriate copyright notice and a notice that there is no warranty (or - else, saying that you provide a warranty) and that users may redistribute - the program under these conditions, and telling the user how to view a copy - of this License. (Exception: if the Program itself is interactive but does - not normally print such an announcement, your work based on the Program is - not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms -of this License, whose permissions for other licensees extend to the entire -whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and -2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 above - on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to - give any third party, for a charge no more than your cost of physically - performing source distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only - for noncommercial distribution and only if you received the program in - object code or executable form with such an offer, in accord with - Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code -distributed need not include anything that is normally distributed (in either -source or binary form) with the major components (compiler, kernel, and so on) -of the operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or -any work based on the Program), you indicate your acceptance of this License to -do so, and all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to -copy, distribute or modify the Program subject to these terms and conditions. -You may not impose any further restrictions on the recipients' exercise of the -rights granted herein. You are not responsible for enforcing compliance by -third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Program at all. -For example, if a patent license would not permit royalty-free redistribution -of the Program by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In -such case, this License incorporates the limitation as if written in the body -of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software Foundation. -If the Program does not specify a version number of this License, you may -choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR -INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA -BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER -OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - - Copyright (C) - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author Gnomovision comes - with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free - software, and you are welcome to redistribute it under certain conditions; - type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than 'show w' and 'show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here -is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - 'Gnomovision' (which makes passes at compilers) written by James Hacker. - - signature of Ty Coon, 1 April 1989 - - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. - - -"CLASSPATH" EXCEPTION TO THE GPL - -Certain source files distributed by Oracle America and/or its affiliates are -subject to the following clarification and special exception to the GPL, but -only where Oracle has expressly included in the particular source file's header -the words "Oracle designates this particular file as subject to the "Classpath" -exception as provided by Oracle in the LICENSE file that accompanied this code." - - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. diff --git a/jre-11/legal/java.xml/bcel.md b/jre-11/legal/java.xml/bcel.md deleted file mode 100644 index bb434b09d..000000000 --- a/jre-11/legal/java.xml/bcel.md +++ /dev/null @@ -1,222 +0,0 @@ -## Apache Commons Byte Code Engineering Library (BCEL) Version 6.0 - -### Apache Commons BCEL Notice -
-
-    =========================================================================
-    ==  NOTICE file corresponding to the section 4 d of                    ==
-    ==  the Apache License, Version 2.0,                                   ==
-    ==  in this case for the Apache Commons BCEL distribution.             ==
-    =========================================================================
-
-   This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
-
-
- -### Apache 2.0 License -
-
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
diff --git a/jre-11/legal/java.xml/dom.md b/jre-11/legal/java.xml/dom.md deleted file mode 100644 index b0fb1ae76..000000000 --- a/jre-11/legal/java.xml/dom.md +++ /dev/null @@ -1,62 +0,0 @@ -## DOM Level 3 Core Specification v1.0 - -### W3C License -
-
-W3C SOFTWARE NOTICE AND LICENSE
-
-http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-This work (and included software, documentation such as READMEs, or other
-related items) is being provided by the copyright holders under the following
-license. By obtaining, using and/or copying this work, you (the licensee)
-agree that you have read, understood, and will comply with the following terms
-and conditions.
-
-Permission to copy, modify, and distribute this software and its
-documentation, with or without modification, for any purpose and without fee
-or royalty is hereby granted, provided that you include the following on ALL
-copies of the software and documentation or portions thereof, including
-modifications:
-
-   1.The full text of this NOTICE in a location viewable to users of the
-   redistributed or derivative work.
-
-   2.Any pre-existing intellectual property disclaimers, notices, or terms and
-   conditions. If none exist, the W3C Software Short Notice should be included
-   (hypertext is preferred, text is permitted) within the body of any
-   redistributed or derivative code.
-
-   3.Notice of any changes or modifications to the files, including the date
-   changes were made. (We recommend you provide URIs to the location from
-   which the code is derived.)
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
-MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
-PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY
-THIRD PARTY PATENTS,COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
-OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
-DOCUMENTATION.  The name and trademarks of copyright holders may NOT be used
-in advertising or publicity pertaining to the software without specific,
-written prior permission. Title to copyright in this software and any
-associated documentation will at all times remain with copyright holders.
-
-____________________________________
-
-This formulation of W3C's notice and license became active on December 31
-2002. This version removes the copyright ownership notice such that this
-license can be used with materials other than those owned by the W3C, reflects
-that ERCIM is now a host of the W3C, includes references to this specific
-dated version of the license, and removes the ambiguous grant of "use".
-Otherwise, this version is the same as the previous version and is written so
-as to preserve the Free Software Foundation's assessment of GPL compatibility
-and OSI's certification under the Open Source Definition. Please see our
-Copyright FAQ for common questions about using materials from our site,
-including specific terms and conditions for packages like libwww, Amaya, and
-Jigsaw. Other questions about this notice can be directed to
-site-policy@w3.org.
-
-
diff --git a/jre-11/legal/java.xml/jcup.md b/jre-11/legal/java.xml/jcup.md deleted file mode 100644 index acceffdf9..000000000 --- a/jre-11/legal/java.xml/jcup.md +++ /dev/null @@ -1,24 +0,0 @@ -## CUP Parser Generator for Java v 0.10k - -### CUP Parser Generator License -
-
-Copyright 1996-1999 by Scott Hudson, Frank Flannery, C. Scott Ananian
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted, provided
-that the above copyright notice appear in all copies and that both
-the copyright notice and this permission notice and warranty disclaimer
-appear in supporting documentation, and that the names of the authors or
-their employers not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior permission.
-
-The authors and their employers disclaim all warranties with regard to
-this software, including all implied warranties of merchantability and
-fitness. In no event shall the authors or their employers be liable for
-any special, indirect or consequential damages or any damages whatsoever
-resulting from loss of use, data or profits, whether in an action of
-contract, negligence or other tortious action, arising out of or in
-connection with the use or performance of this software.
-
-
diff --git a/jre-11/legal/java.xml/xalan.md b/jre-11/legal/java.xml/xalan.md deleted file mode 100644 index 54141ef66..000000000 --- a/jre-11/legal/java.xml/xalan.md +++ /dev/null @@ -1,234 +0,0 @@ -## Apache Xalan v2.7.2 - -### Apache Xalan Notice -
-
-    ======================================================================================
-    ==  NOTICE file corresponding to the section 4d of the Apache License, Version 2.0, ==
-    ==  in this case for the Apache Xalan distribution.                                 ==
-    ======================================================================================
-
-   This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
-
-   Specifically, we only include the XSLTC portion of the source from the Xalan distribution. 
-   The Xalan project has two processors: an interpretive one (Xalan Interpretive) and a 
-   compiled one (The XSLT Compiler (XSLTC)). We *only* use the XSLTC part of Xalan; We use
-   the source from the packages that are part of the XSLTC sources.
-
-   Portions of this software was originally based on the following:
-
-     - software copyright (c) 1999-2002, Lotus Development Corporation., http://www.lotus.com.
-     - software copyright (c) 2001-2002, Sun Microsystems., http://www.sun.com.
-     - software copyright (c) 2003, IBM Corporation., http://www.ibm.com.
-     - voluntary contributions made by Ovidiu Predescu (ovidiu@cup.hp.com) on behalf of the
-       Apache Software Foundation and was originally developed at Hewlett Packard Company.
-
-
- -### Apache 2.0 License -
-
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
diff --git a/jre-11/legal/java.xml/xerces.md b/jre-11/legal/java.xml/xerces.md deleted file mode 100644 index ff0167bc8..000000000 --- a/jre-11/legal/java.xml/xerces.md +++ /dev/null @@ -1,227 +0,0 @@ -## Apache Xerces v2.11.0 - -### Apache Xerces Notice -
-    =========================================================================
-    == NOTICE file corresponding to section 4(d) of the Apache License, ==
-    == Version 2.0, in this case for the Apache Xerces Java distribution. ==
-    =========================================================================
-    
-    Apache Xerces Java
-    Copyright 1999-2010 The Apache Software Foundation
-    This product includes software developed at
-    The Apache Software Foundation (http://www.apache.org/).
-    Portions of this software were originally based on the following:
-    - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
-    - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
-    - voluntary contributions made by Paul Eng on behalf of the
-    Apache Software Foundation that were originally developed at iClick, Inc.,
-    software copyright (c) 1999.
-
- -### Apache 2.0 License -
-
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
diff --git a/jre-11/legal/jdk.management/ADDITIONAL_LICENSE_INFO b/jre-11/legal/jdk.management/ADDITIONAL_LICENSE_INFO deleted file mode 100644 index ff700cd09..000000000 --- a/jre-11/legal/jdk.management/ADDITIONAL_LICENSE_INFO +++ /dev/null @@ -1,37 +0,0 @@ - ADDITIONAL INFORMATION ABOUT LICENSING - -Certain files distributed by Oracle America, Inc. and/or its affiliates are -subject to the following clarification and special exception to the GPLv2, -based on the GNU Project exception for its Classpath libraries, known as the -GNU Classpath Exception. - -Note that Oracle includes multiple, independent programs in this software -package. Some of those programs are provided under licenses deemed -incompatible with the GPLv2 by the Free Software Foundation and others. -For example, the package includes programs licensed under the Apache -License, Version 2.0 and may include FreeType. Such programs are licensed -to you under their original licenses. - -Oracle facilitates your further distribution of this package by adding the -Classpath Exception to the necessary parts of its GPLv2 code, which permits -you to use that code in combination with other independent modules not -licensed under the GPLv2. However, note that this would not permit you to -commingle code under an incompatible license with Oracle's GPLv2 licensed -code by, for example, cutting and pasting such code into a file also -containing Oracle's GPLv2 licensed code and then distributing the result. - -Additionally, if you were to remove the Classpath Exception from any of the -files to which it applies and distribute the result, you would likely be -required to license some or all of the other code in that distribution under -the GPLv2 as well, and since the GPLv2 is incompatible with the license terms -of some items included in the distribution by Oracle, removing the Classpath -Exception could therefore effectively compromise your ability to further -distribute the package. - -Failing to distribute notices associated with some files may also create -unexpected legal consequences. - -Proceed with caution and we recommend that you obtain the advice of a lawyer -skilled in open source matters before removing the Classpath Exception or -making modifications to this package which may subsequently be redistributed -and/or involve the use of third party software. diff --git a/jre-11/legal/jdk.management/ASSEMBLY_EXCEPTION b/jre-11/legal/jdk.management/ASSEMBLY_EXCEPTION deleted file mode 100644 index 065b8d902..000000000 --- a/jre-11/legal/jdk.management/ASSEMBLY_EXCEPTION +++ /dev/null @@ -1,27 +0,0 @@ - -OPENJDK ASSEMBLY EXCEPTION - -The OpenJDK source code made available by Oracle America, Inc. (Oracle) at -openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU -General Public License version 2 -only ("GPL2"), with the following clarification and special exception. - - Linking this OpenJDK Code statically or dynamically with other code - is making a combined work based on this library. Thus, the terms - and conditions of GPL2 cover the whole combination. - - As a special exception, Oracle gives you permission to link this - OpenJDK Code with certain code licensed by Oracle as indicated at - http://openjdk.java.net/legal/exception-modules-2007-05-08.html - ("Designated Exception Modules") to produce an executable, - regardless of the license terms of the Designated Exception Modules, - and to copy and distribute the resulting executable under GPL2, - provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Oracle. - -As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code -to build an executable that includes those portions of necessary code that -Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 -with the Classpath exception). If you modify or add to the OpenJDK code, -that new GPL2 code may still be combined with Designated Exception Modules -if the new code is made subject to this exception by its copyright holder. diff --git a/jre-11/legal/jdk.management/LICENSE b/jre-11/legal/jdk.management/LICENSE deleted file mode 100644 index 8b400c7ab..000000000 --- a/jre-11/legal/jdk.management/LICENSE +++ /dev/null @@ -1,347 +0,0 @@ -The GNU General Public License (GPL) - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to -most of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you -can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for -a fee, you must give the recipients all the rights that you have. You must -make sure that they, too, receive or can get the source code. And you must -show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced -by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program proprietary. -To prevent this, we have made it clear that any patent must be licensed for -everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included -without limitation in the term "modification".) Each licensee is addressed as -"you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is -not restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and give any other recipients of the -Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or - in part contains or is derived from the Program or any part thereof, to be - licensed as a whole at no charge to all third parties under the terms of - this License. - - c) If the modified program normally reads commands interactively when run, - you must cause it, when started running for such interactive use in the - most ordinary way, to print or display an announcement including an - appropriate copyright notice and a notice that there is no warranty (or - else, saying that you provide a warranty) and that users may redistribute - the program under these conditions, and telling the user how to view a copy - of this License. (Exception: if the Program itself is interactive but does - not normally print such an announcement, your work based on the Program is - not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms -of this License, whose permissions for other licensees extend to the entire -whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and -2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 above - on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to - give any third party, for a charge no more than your cost of physically - performing source distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only - for noncommercial distribution and only if you received the program in - object code or executable form with such an offer, in accord with - Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code -distributed need not include anything that is normally distributed (in either -source or binary form) with the major components (compiler, kernel, and so on) -of the operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or -any work based on the Program), you indicate your acceptance of this License to -do so, and all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to -copy, distribute or modify the Program subject to these terms and conditions. -You may not impose any further restrictions on the recipients' exercise of the -rights granted herein. You are not responsible for enforcing compliance by -third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Program at all. -For example, if a patent license would not permit royalty-free redistribution -of the Program by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In -such case, this License incorporates the limitation as if written in the body -of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software Foundation. -If the Program does not specify a version number of this License, you may -choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR -INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA -BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER -OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - - Copyright (C) - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author Gnomovision comes - with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free - software, and you are welcome to redistribute it under certain conditions; - type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than 'show w' and 'show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here -is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - 'Gnomovision' (which makes passes at compilers) written by James Hacker. - - signature of Ty Coon, 1 April 1989 - - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. - - -"CLASSPATH" EXCEPTION TO THE GPL - -Certain source files distributed by Oracle America and/or its affiliates are -subject to the following clarification and special exception to the GPL, but -only where Oracle has expressly included in the particular source file's header -the words "Oracle designates this particular file as subject to the "Classpath" -exception as provided by Oracle in the LICENSE file that accompanied this code." - - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. diff --git a/jre-11/legal/jdk.unsupported/ADDITIONAL_LICENSE_INFO b/jre-11/legal/jdk.unsupported/ADDITIONAL_LICENSE_INFO deleted file mode 100644 index ff700cd09..000000000 --- a/jre-11/legal/jdk.unsupported/ADDITIONAL_LICENSE_INFO +++ /dev/null @@ -1,37 +0,0 @@ - ADDITIONAL INFORMATION ABOUT LICENSING - -Certain files distributed by Oracle America, Inc. and/or its affiliates are -subject to the following clarification and special exception to the GPLv2, -based on the GNU Project exception for its Classpath libraries, known as the -GNU Classpath Exception. - -Note that Oracle includes multiple, independent programs in this software -package. Some of those programs are provided under licenses deemed -incompatible with the GPLv2 by the Free Software Foundation and others. -For example, the package includes programs licensed under the Apache -License, Version 2.0 and may include FreeType. Such programs are licensed -to you under their original licenses. - -Oracle facilitates your further distribution of this package by adding the -Classpath Exception to the necessary parts of its GPLv2 code, which permits -you to use that code in combination with other independent modules not -licensed under the GPLv2. However, note that this would not permit you to -commingle code under an incompatible license with Oracle's GPLv2 licensed -code by, for example, cutting and pasting such code into a file also -containing Oracle's GPLv2 licensed code and then distributing the result. - -Additionally, if you were to remove the Classpath Exception from any of the -files to which it applies and distribute the result, you would likely be -required to license some or all of the other code in that distribution under -the GPLv2 as well, and since the GPLv2 is incompatible with the license terms -of some items included in the distribution by Oracle, removing the Classpath -Exception could therefore effectively compromise your ability to further -distribute the package. - -Failing to distribute notices associated with some files may also create -unexpected legal consequences. - -Proceed with caution and we recommend that you obtain the advice of a lawyer -skilled in open source matters before removing the Classpath Exception or -making modifications to this package which may subsequently be redistributed -and/or involve the use of third party software. diff --git a/jre-11/legal/jdk.unsupported/ASSEMBLY_EXCEPTION b/jre-11/legal/jdk.unsupported/ASSEMBLY_EXCEPTION deleted file mode 100644 index 065b8d902..000000000 --- a/jre-11/legal/jdk.unsupported/ASSEMBLY_EXCEPTION +++ /dev/null @@ -1,27 +0,0 @@ - -OPENJDK ASSEMBLY EXCEPTION - -The OpenJDK source code made available by Oracle America, Inc. (Oracle) at -openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU -General Public License version 2 -only ("GPL2"), with the following clarification and special exception. - - Linking this OpenJDK Code statically or dynamically with other code - is making a combined work based on this library. Thus, the terms - and conditions of GPL2 cover the whole combination. - - As a special exception, Oracle gives you permission to link this - OpenJDK Code with certain code licensed by Oracle as indicated at - http://openjdk.java.net/legal/exception-modules-2007-05-08.html - ("Designated Exception Modules") to produce an executable, - regardless of the license terms of the Designated Exception Modules, - and to copy and distribute the resulting executable under GPL2, - provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Oracle. - -As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code -to build an executable that includes those portions of necessary code that -Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 -with the Classpath exception). If you modify or add to the OpenJDK code, -that new GPL2 code may still be combined with Designated Exception Modules -if the new code is made subject to this exception by its copyright holder. diff --git a/jre-11/legal/jdk.unsupported/LICENSE b/jre-11/legal/jdk.unsupported/LICENSE deleted file mode 100644 index 8b400c7ab..000000000 --- a/jre-11/legal/jdk.unsupported/LICENSE +++ /dev/null @@ -1,347 +0,0 @@ -The GNU General Public License (GPL) - -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to -most of the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom to -distribute copies of free software (and charge for this service if you wish), -that you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs; and that you know you -can do these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for -a fee, you must give the recipients all the rights that you have. You must -make sure that they, too, receive or can get the source code. And you must -show them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) -offer you this license which gives you legal permission to copy, distribute -and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced -by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We -wish to avoid the danger that redistributors of a free program will -individually obtain patent licenses, in effect making the program proprietary. -To prevent this, we have made it clear that any patent must be licensed for -everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or -translated into another language. (Hereinafter, translation is included -without limitation in the term "modification".) Each licensee is addressed as -"you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is -not restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and give any other recipients of the -Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may -at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent notices stating - that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or - in part contains or is derived from the Program or any part thereof, to be - licensed as a whole at no charge to all third parties under the terms of - this License. - - c) If the modified program normally reads commands interactively when run, - you must cause it, when started running for such interactive use in the - most ordinary way, to print or display an announcement including an - appropriate copyright notice and a notice that there is no warranty (or - else, saying that you provide a warranty) and that users may redistribute - the program under these conditions, and telling the user how to view a copy - of this License. (Exception: if the Program itself is interactive but does - not normally print such an announcement, your work based on the Program is - not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Program, the distribution of the whole must be on the terms -of this License, whose permissions for other licensees extend to the entire -whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on -the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and -2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source - code, which must be distributed under the terms of Sections 1 and 2 above - on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to - give any third party, for a charge no more than your cost of physically - performing source distribution, a complete machine-readable copy of the - corresponding source code, to be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed only - for noncommercial distribution and only if you received the program in - object code or executable form with such an offer, in accord with - Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all -the source code for all modules it contains, plus any associated interface -definition files, plus the scripts used to control compilation and installation -of the executable. However, as a special exception, the source code -distributed need not include anything that is normally distributed (in either -source or binary form) with the major components (compiler, kernel, and so on) -of the operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so -long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Program (or -any work based on the Program), you indicate your acceptance of this License to -do so, and all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to -copy, distribute or modify the Program subject to these terms and conditions. -You may not impose any further restrictions on the recipients' exercise of the -rights granted herein. You are not responsible for enforcing compliance by -third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Program at all. -For example, if a patent license would not permit royalty-free redistribution -of the Program by all those who receive copies directly or indirectly through -you, then the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system, which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain -countries either by patents or by copyrighted interfaces, the original -copyright holder who places the Program under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In -such case, this License incorporates the limitation as if written in the body -of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems -or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any later -version", you have the option of following the terms and conditions either of -that version or of any later version published by the Free Software Foundation. -If the Program does not specify a version number of this License, you may -choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of -all derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE -PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR -INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA -BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER -OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively convey the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - - Copyright (C) - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it -starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author Gnomovision comes - with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free - software, and you are welcome to redistribute it under certain conditions; - type 'show c' for details. - -The hypothetical commands 'show w' and 'show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may be -called something other than 'show w' and 'show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the program, if necessary. Here -is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - 'Gnomovision' (which makes passes at compilers) written by James Hacker. - - signature of Ty Coon, 1 April 1989 - - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General Public -License instead of this License. - - -"CLASSPATH" EXCEPTION TO THE GPL - -Certain source files distributed by Oracle America and/or its affiliates are -subject to the following clarification and special exception to the GPL, but -only where Oracle has expressly included in the particular source file's header -the words "Oracle designates this particular file as subject to the "Classpath" -exception as provided by Oracle in the LICENSE file that accompanied this code." - - Linking this library statically or dynamically with other modules is making - a combined work based on this library. Thus, the terms and conditions of - the GNU General Public License cover the whole combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules, - and to copy and distribute the resulting executable under terms of your - choice, provided that you also meet, for each linked independent module, - the terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. If - you modify this library, you may extend this exception to your version of - the library, but you are not obligated to do so. If you do not wish to do - so, delete this exception statement from your version. diff --git a/jre-11/lib/classlist b/jre-11/lib/classlist deleted file mode 100644 index 970215dc6..000000000 --- a/jre-11/lib/classlist +++ /dev/null @@ -1,1164 +0,0 @@ -java/lang/Object -java/lang/String -java/io/Serializable -java/lang/Comparable -java/lang/CharSequence -java/lang/Class -java/lang/reflect/GenericDeclaration -java/lang/reflect/AnnotatedElement -java/lang/reflect/Type -java/lang/Cloneable -java/lang/ClassLoader -java/lang/System -java/lang/Throwable -java/lang/Error -java/lang/ThreadDeath -java/lang/Exception -java/lang/RuntimeException -java/lang/SecurityManager -java/security/ProtectionDomain -java/security/AccessControlContext -java/security/SecureClassLoader -java/lang/ClassNotFoundException -java/lang/ReflectiveOperationException -java/lang/NoClassDefFoundError -java/lang/LinkageError -java/lang/ClassCastException -java/lang/ArrayStoreException -java/lang/VirtualMachineError -java/lang/OutOfMemoryError -java/lang/StackOverflowError -java/lang/IllegalMonitorStateException -java/lang/ref/Reference -java/lang/ref/SoftReference -java/lang/ref/WeakReference -java/lang/ref/FinalReference -java/lang/ref/PhantomReference -java/lang/ref/Finalizer -java/lang/Thread -java/lang/Runnable -java/lang/ThreadGroup -java/lang/Thread$UncaughtExceptionHandler -java/util/Properties -java/util/Hashtable -java/util/Map -java/util/Dictionary -java/lang/Module -java/lang/reflect/AccessibleObject -java/lang/reflect/Field -java/lang/reflect/Member -java/lang/reflect/Parameter -java/lang/reflect/Method -java/lang/reflect/Executable -java/lang/reflect/Constructor -jdk/internal/reflect/MagicAccessorImpl -jdk/internal/reflect/MethodAccessorImpl -jdk/internal/reflect/MethodAccessor -jdk/internal/reflect/ConstructorAccessorImpl -jdk/internal/reflect/ConstructorAccessor -jdk/internal/reflect/DelegatingClassLoader -jdk/internal/reflect/ConstantPool -jdk/internal/reflect/UnsafeStaticFieldAccessorImpl -jdk/internal/reflect/UnsafeFieldAccessorImpl -jdk/internal/reflect/FieldAccessorImpl -jdk/internal/reflect/FieldAccessor -jdk/internal/reflect/CallerSensitive -java/lang/annotation/Annotation -java/lang/invoke/DirectMethodHandle -java/lang/invoke/MethodHandle -java/lang/invoke/VarHandle -java/lang/invoke/MemberName -java/lang/invoke/ResolvedMethodName -java/lang/invoke/MethodHandleNatives -java/lang/invoke/LambdaForm -java/lang/invoke/MethodType -java/lang/BootstrapMethodError -java/lang/invoke/CallSite -java/lang/invoke/MethodHandleNatives$CallSiteContext -java/lang/invoke/ConstantCallSite -java/lang/invoke/MutableCallSite -java/lang/invoke/VolatileCallSite -java/lang/AssertionStatusDirectives -java/lang/StringBuffer -java/lang/AbstractStringBuilder -java/lang/Appendable -java/lang/StringBuilder -jdk/internal/misc/Unsafe -jdk/internal/module/Modules -java/io/ByteArrayInputStream -java/io/InputStream -java/io/Closeable -java/lang/AutoCloseable -java/net/URL -java/util/jar/Manifest -jdk/internal/loader/ClassLoaders -jdk/internal/loader/ClassLoaders$AppClassLoader -jdk/internal/loader/BuiltinClassLoader -jdk/internal/loader/ClassLoaders$PlatformClassLoader -java/security/CodeSource -java/lang/StackTraceElement -java/nio/Buffer -java/lang/StackWalker -java/lang/StackStreamFactory$AbstractStackWalker -java/lang/StackFrameInfo -java/lang/StackWalker$StackFrame -java/lang/LiveStackFrameInfo -java/lang/LiveStackFrame -java/util/concurrent/locks/AbstractOwnableSynchronizer -java/lang/Boolean -java/lang/Character -java/lang/Float -java/lang/Number -java/lang/Double -java/lang/Byte -java/lang/Short -java/lang/Integer -java/lang/Long -java/lang/NullPointerException -java/lang/ArithmeticException -java/io/ObjectStreamField -java/lang/String$CaseInsensitiveComparator -java/util/Comparator -java/security/AccessController -java/util/Set -java/util/Collection -java/lang/Iterable -java/util/ImmutableCollections$Set12 -java/util/ImmutableCollections$AbstractImmutableSet -java/util/ImmutableCollections$AbstractImmutableCollection -java/util/AbstractCollection -java/util/Objects -jdk/internal/reflect/ReflectionFactory$GetReflectionFactoryAction -java/security/PrivilegedAction -java/security/cert/Certificate -java/util/HashSet -java/util/AbstractSet -java/util/HashMap -java/util/AbstractMap -java/util/concurrent/ConcurrentHashMap -java/util/concurrent/ConcurrentMap -java/lang/Runtime -java/util/concurrent/ConcurrentHashMap$Segment -java/util/concurrent/locks/ReentrantLock -java/util/concurrent/locks/Lock -java/util/concurrent/ConcurrentHashMap$CounterCell -java/util/concurrent/ConcurrentHashMap$Node -java/util/Map$Entry -java/util/concurrent/locks/LockSupport -java/util/concurrent/ConcurrentHashMap$ReservationNode -jdk/internal/reflect/ReflectionFactory -java/lang/ref/Reference$ReferenceHandler -jdk/internal/ref/Cleaner -java/lang/ref/ReferenceQueue -java/lang/ref/ReferenceQueue$Null -java/lang/ref/ReferenceQueue$Lock -java/lang/ref/Reference$1 -jdk/internal/misc/JavaLangRefAccess -jdk/internal/misc/SharedSecrets -java/lang/ref/Finalizer$FinalizerThread -jdk/internal/misc/VM -java/lang/StringLatin1 -java/nio/charset/Charset -sun/nio/cs/StandardCharsets -java/nio/charset/spi/CharsetProvider -java/lang/ThreadLocal -java/util/concurrent/atomic/AtomicInteger -java/util/Arrays -java/lang/Math -sun/nio/cs/StandardCharsets$Aliases -sun/util/PreHashedMap -sun/nio/cs/StandardCharsets$Cache -sun/nio/cs/UTF_8 -sun/nio/cs/Unicode -sun/nio/cs/HistoricallyNamedCharset -sun/nio/cs/ISO_8859_1 -sun/nio/cs/US_ASCII -java/nio/charset/StandardCharsets -sun/nio/cs/UTF_16BE -sun/nio/cs/UTF_16LE -sun/nio/cs/UTF_16 -java/lang/StringCoding -java/lang/StringCoding$1 -java/lang/ThreadLocal$ThreadLocalMap -java/lang/ThreadLocal$ThreadLocalMap$Entry -jdk/internal/misc/TerminatingThreadLocal -java/lang/StringCoding$Result -java/util/Properties$EntrySet -java/util/concurrent/ConcurrentHashMap$EntrySetView -java/util/concurrent/ConcurrentHashMap$CollectionView -java/util/Collections -java/util/Collections$EmptySet -java/util/Collections$EmptyList -java/util/RandomAccess -java/util/AbstractList -java/util/List -java/util/Collections$EmptyMap -java/util/Collections$SynchronizedSet -java/util/Collections$SynchronizedCollection -java/lang/reflect/Array -java/util/concurrent/ConcurrentHashMap$EntryIterator -java/util/Iterator -java/util/concurrent/ConcurrentHashMap$BaseIterator -java/util/concurrent/ConcurrentHashMap$Traverser -java/util/concurrent/ConcurrentHashMap$MapEntry -java/util/ImmutableCollections$MapN -java/util/ImmutableCollections$AbstractImmutableMap -jdk/internal/util/StaticProperty -java/lang/VersionProps -java/io/FileInputStream -java/io/FileDescriptor -java/io/FileDescriptor$1 -jdk/internal/misc/JavaIOFileDescriptorAccess -java/io/FileOutputStream -java/io/OutputStream -java/io/Flushable -java/io/BufferedInputStream -java/io/FilterInputStream -java/io/PrintStream -java/io/FilterOutputStream -java/io/BufferedOutputStream -java/io/OutputStreamWriter -java/io/Writer -sun/nio/cs/StreamEncoder -sun/security/action/GetPropertyAction -sun/nio/cs/US_ASCII$Encoder -java/nio/charset/CharsetEncoder -java/nio/charset/CodingErrorAction -sun/nio/cs/Surrogate$Parser -sun/nio/cs/Surrogate -java/nio/charset/CoderResult -java/nio/ByteBuffer -java/nio/Buffer$1 -jdk/internal/misc/JavaNioAccess -java/nio/HeapByteBuffer -java/nio/ByteOrder -java/io/BufferedWriter -java/lang/Terminator -java/lang/Terminator$1 -jdk/internal/misc/Signal$Handler -jdk/internal/misc/Signal -java/util/Hashtable$Entry -jdk/internal/misc/Signal$NativeHandler -java/lang/Integer$IntegerCache -jdk/internal/misc/OSEnvironment -java/lang/System$2 -jdk/internal/misc/JavaLangAccess -java/lang/IllegalArgumentException -java/lang/invoke/MethodHandleStatics -java/lang/CharacterData -java/lang/CharacterDataLatin1 -jdk/internal/module/ModuleBootstrap -java/lang/module/ModuleDescriptor -java/lang/module/ModuleDescriptor$1 -jdk/internal/misc/JavaLangModuleAccess -java/io/File -java/io/DefaultFileSystem -java/io/UnixFileSystem -java/io/FileSystem -java/io/ExpiringCache -java/io/ExpiringCache$1 -java/util/LinkedHashMap -jdk/internal/module/ModulePatcher -jdk/internal/module/SystemModuleFinders -java/net/URI -java/net/URI$1 -jdk/internal/misc/JavaNetUriAccess -jdk/internal/module/SystemModulesMap -jdk/internal/module/SystemModules$all -jdk/internal/module/SystemModules -jdk/internal/module/Builder -java/lang/module/ModuleDescriptor$Requires -java/util/ImmutableCollections -java/util/ImmutableCollections$SetN -java/lang/module/ModuleDescriptor$Exports -java/lang/module/ModuleDescriptor$Opens -java/lang/module/ModuleDescriptor$Provides -java/util/ImmutableCollections$List12 -java/util/ImmutableCollections$AbstractImmutableList -java/lang/module/ModuleDescriptor$Version -java/util/ArrayList -java/lang/module/ModuleDescriptor$Modifier -java/lang/Enum -java/lang/module/ModuleDescriptor$Requires$Modifier -jdk/internal/module/ModuleTarget -jdk/internal/module/ModuleHashes -jdk/internal/module/ModuleResolution -java/lang/module/ModuleReference -jdk/internal/module/SystemModuleFinders$2 -java/util/function/Supplier -jdk/internal/module/ModuleReferenceImpl -java/util/KeyValueHolder -jdk/internal/module/SystemModuleFinders$SystemModuleFinder -java/lang/module/ModuleFinder -jdk/internal/module/ModuleBootstrap$Counters -java/util/Optional -jdk/internal/loader/BootLoader -jdk/internal/module/ServicesCatalog -jdk/internal/loader/ClassLoaderValue -jdk/internal/loader/AbstractClassLoaderValue -jdk/internal/loader/ClassLoaders$BootClassLoader -jdk/internal/reflect/Reflection -java/util/HashMap$Node -java/lang/ClassLoader$ParallelLoaders -java/util/WeakHashMap -java/util/WeakHashMap$Entry -java/util/Collections$SetFromMap -java/util/WeakHashMap$KeySet -java/util/Vector -java/security/ProtectionDomain$JavaSecurityAccessImpl -jdk/internal/misc/JavaSecurityAccess -java/security/ProtectionDomain$Key -java/security/Principal -jdk/internal/loader/URLClassPath -java/net/URL$DefaultFactory -java/net/URLStreamHandlerFactory -java/net/URL$3 -jdk/internal/misc/JavaNetURLAccess -java/io/File$PathStatus -java/io/ExpiringCache$Entry -java/util/LinkedHashMap$Entry -sun/net/www/ParseUtil -sun/net/www/protocol/file/Handler -java/net/URLStreamHandler -java/lang/Class$ReflectionData -java/lang/Class$Atomic -java/lang/reflect/Modifier -java/lang/reflect/ReflectAccess -jdk/internal/reflect/LangReflectAccess -java/lang/Class$1 -jdk/internal/reflect/NativeConstructorAccessorImpl -jdk/internal/reflect/DelegatingConstructorAccessorImpl -java/util/ArrayDeque -java/util/Deque -java/util/Queue -jdk/internal/util/Preconditions -jdk/internal/loader/BuiltinClassLoader$LoadedModule -sun/net/www/protocol/jrt/Handler -java/util/ImmutableCollections$SetN$SetNIterator -java/lang/module/Configuration -java/lang/module/ResolvedModule -java/util/AbstractMap$1 -java/util/AbstractMap$1$1 -java/util/ImmutableCollections$MapN$1 -java/util/ImmutableCollections$MapN$MapNIterator -java/util/ImmutableCollections$Set12$1 -jdk/internal/module/ModuleLoaderMap -java/util/HashMap$TreeNode -jdk/internal/module/ModuleLoaderMap$Mapper -java/util/function/Function -java/lang/ModuleLayer -java/util/ImmutableCollections$ListN -java/util/ImmutableCollections$ListItr -java/util/ListIterator -java/util/ArrayList$Itr -java/util/Collections$UnmodifiableSet -java/util/Collections$UnmodifiableCollection -java/util/Collections$UnmodifiableCollection$1 -java/util/concurrent/CopyOnWriteArrayList -jdk/internal/module/ServicesCatalog$ServiceProvider -java/util/HashMap$KeySet -java/util/HashMap$KeyIterator -java/util/HashMap$HashIterator -java/lang/ModuleLayer$Controller -jdk/internal/module/IllegalAccessLogger$Mode -jdk/internal/module/IllegalAccessLogger$Builder -java/util/HashMap$Values -java/util/HashMap$ValueIterator -jdk/internal/module/ModuleBootstrap$2 -java/util/Collections$UnmodifiableMap -jdk/internal/module/IllegalAccessLogger -sun/launcher/LauncherHelper -sun/net/util/URLUtil -java/util/Locale -java/util/Locale$Cache -sun/util/locale/LocaleObjectCache -sun/util/locale/BaseLocale -sun/util/locale/BaseLocale$Cache -sun/util/locale/BaseLocale$Key -sun/util/locale/LocaleObjectCache$CacheEntry -sun/util/locale/LocaleUtils -sun/util/locale/InternalLocaleBuilder -sun/util/locale/InternalLocaleBuilder$CaseInsensitiveChar -jdk/internal/loader/URLClassPath$3 -java/security/PrivilegedExceptionAction -jdk/internal/loader/URLClassPath$JarLoader -jdk/internal/loader/URLClassPath$Loader -java/util/zip/ZipFile -java/util/zip/ZipConstants -java/util/zip/ZipFile$1 -jdk/internal/misc/JavaUtilZipFileAccess -sun/net/www/protocol/jar/Handler -jdk/internal/loader/URLClassPath$JarLoader$1 -jdk/internal/loader/FileURLMapper -java/util/jar/JarFile -java/util/jar/JavaUtilJarAccessImpl -jdk/internal/misc/JavaUtilJarAccess -java/lang/Runtime$Version -java/util/zip/ZipCoder -java/util/zip/ZipCoder$UTF8 -java/util/zip/ZipFile$CleanableResource -jdk/internal/ref/CleanerFactory -jdk/internal/ref/CleanerFactory$1 -java/util/concurrent/ThreadFactory -java/lang/ref/Cleaner -java/lang/ref/Cleaner$1 -jdk/internal/ref/CleanerImpl -jdk/internal/ref/CleanerImpl$PhantomCleanableRef -jdk/internal/ref/PhantomCleanable -java/lang/ref/Cleaner$Cleanable -jdk/internal/ref/CleanerImpl$WeakCleanableRef -jdk/internal/ref/WeakCleanable -jdk/internal/ref/CleanerImpl$SoftCleanableRef -jdk/internal/ref/SoftCleanable -jdk/internal/ref/CleanerImpl$CleanerCleanable -jdk/internal/ref/CleanerFactory$1$1 -jdk/internal/misc/InnocuousThread -jdk/internal/misc/InnocuousThread$3 -jdk/internal/misc/InnocuousThread$2 -java/util/zip/ZipFile$Source -java/util/zip/ZipFile$Source$Key -java/nio/file/FileSystems -sun/nio/fs/DefaultFileSystemProvider -sun/nio/fs/LinuxFileSystemProvider -sun/nio/fs/UnixFileSystemProvider -sun/nio/fs/AbstractFileSystemProvider -java/nio/file/spi/FileSystemProvider -java/nio/file/StandardOpenOption -java/nio/file/OpenOption -sun/nio/fs/LinuxFileSystem -sun/nio/fs/UnixFileSystem -java/nio/file/FileSystem -sun/nio/fs/UnixPath -java/nio/file/Path -java/nio/file/Watchable -sun/nio/fs/Util -sun/nio/fs/UnixNativeDispatcher -sun/nio/fs/UnixNativeDispatcher$1 -java/lang/ClassLoader$2 -java/lang/ClassLoader$NativeLibrary -java/util/ArrayDeque$DeqIterator -java/util/concurrent/ConcurrentHashMap$ValuesView -java/util/concurrent/ConcurrentHashMap$ValueIterator -java/util/Enumeration -sun/nio/fs/UnixFileAttributes -java/nio/file/attribute/PosixFileAttributes -java/nio/file/attribute/BasicFileAttributes -sun/nio/fs/UnixFileStoreAttributes -sun/nio/fs/UnixMountEntry -java/nio/CharBuffer -java/lang/Readable -java/nio/HeapCharBuffer -java/nio/file/FileSystems$DefaultFileSystemHolder -java/nio/file/FileSystems$DefaultFileSystemHolder$1 -java/net/URI$Parser -java/nio/file/LinkOption -java/nio/file/CopyOption -java/nio/file/Files -java/nio/file/attribute/DosFileAttributes -java/nio/file/attribute/BasicFileAttributeView -java/nio/file/attribute/FileAttributeView -java/nio/file/attribute/AttributeView -java/nio/file/attribute/DosFileAttributeView -java/nio/file/attribute/UserDefinedFileAttributeView -sun/nio/fs/UnixFileAttributeViews -sun/nio/fs/UnixFileAttributeViews$Basic -sun/nio/fs/AbstractBasicFileAttributeView -sun/nio/fs/DynamicFileAttributeView -sun/nio/fs/NativeBuffers -sun/nio/fs/NativeBuffers$1 -jdk/internal/misc/TerminatingThreadLocal$1 -java/util/IdentityHashMap -java/util/IdentityHashMap$KeySet -sun/nio/fs/NativeBuffer -sun/nio/fs/NativeBuffer$Deallocator -sun/nio/fs/UnixFileAttributes$UnixAsBasicFileAttributes -java/util/concurrent/TimeUnit -java/nio/file/attribute/FileTime -java/io/RandomAccessFile -java/io/DataOutput -java/io/DataInput -java/io/RandomAccessFile$2 -jdk/internal/misc/JavaIORandomAccessFileAccess -java/util/concurrent/atomic/AtomicBoolean -java/lang/invoke/MethodHandles -java/lang/invoke/MemberName$Factory -java/lang/reflect/ReflectPermission -java/security/BasicPermission -java/security/Permission -java/security/Guard -java/lang/invoke/MethodHandles$Lookup -sun/invoke/util/VerifyAccess -java/lang/NoSuchFieldException -java/lang/invoke/VarHandles -java/lang/invoke/VarHandleInts$FieldInstanceReadWrite -java/lang/invoke/VarHandleInts$FieldInstanceReadOnly -java/lang/invoke/VarHandle$1 -jdk/internal/util/Preconditions$1 -java/util/function/BiFunction -java/lang/invoke/VarHandleGuards -java/lang/invoke/VarForm -java/lang/invoke/VarHandle$AccessType -java/lang/Void -java/lang/invoke/VarHandle$AccessMode -java/lang/invoke/MethodType$ConcurrentWeakInternSet -java/lang/invoke/MethodType$ConcurrentWeakInternSet$WeakEntry -java/lang/invoke/MethodTypeForm -sun/invoke/util/Wrapper -sun/invoke/util/Wrapper$Format -java/io/FileCleanable -java/util/zip/ZipFile$Source$End -java/util/zip/ZipUtils -jdk/internal/perf/PerfCounter -jdk/internal/perf/Perf$GetPerfAction -jdk/internal/perf/Perf -jdk/internal/perf/PerfCounter$CoreCounters -sun/nio/ch/DirectBuffer -java/nio/DirectByteBuffer -java/nio/MappedByteBuffer -java/nio/Bits -java/util/concurrent/atomic/AtomicLong -java/nio/Bits$1 -jdk/internal/misc/JavaNioAccess$BufferPool -java/nio/DirectLongBufferU -java/nio/LongBuffer -jdk/internal/util/jar/JarIndex -java/util/jar/JarFile$1 -java/util/jar/JarFile$JarFileEntry -java/util/jar/JarEntry -java/util/zip/ZipEntry -java/util/zip/ZipFile$ZipFileInputStream -java/util/zip/ZipFile$ZipFileInflaterInputStream -java/util/zip/InflaterInputStream -java/util/zip/Inflater -java/util/zip/Inflater$InflaterZStreamRef -java/util/zip/ZipFile$InflaterCleanupAction -jdk/internal/loader/URLClassPath$JarLoader$2 -jdk/internal/loader/Resource -java/util/jar/Attributes -java/util/jar/Manifest$FastInputStream -java/util/jar/Attributes$Name -java/util/jar/JarVerifier -sun/security/util/Debug -java/security/CodeSigner -java/io/ByteArrayOutputStream -java/lang/Package -java/lang/NamedPackage -java/lang/Package$VersionInfo -sun/security/util/ManifestEntryVerifier -sun/nio/ByteBuffered -java/security/SecureClassLoader$CodeSourceKey -java/security/SecureClassLoader$1 -java/security/Permissions -java/security/PermissionCollection -sun/net/www/protocol/file/FileURLConnection -sun/net/www/URLConnection -java/net/URLConnection -sun/net/www/MessageHeader -java/io/FilePermission -java/io/FilePermission$1 -jdk/internal/misc/JavaIOFilePermissionAccess -sun/security/util/FilePermCompat -java/security/Permissions$1 -java/io/FilePermissionCollection -java/io/FilePermissionCollection$1 -java/security/AllPermission -java/security/UnresolvedPermission -java/lang/RuntimePermission -java/security/BasicPermissionCollection -java/security/SecureClassLoader$DebugHolder -java/time/temporal/TemporalAccessor -java/lang/PublicMethods$MethodList -java/lang/PublicMethods$Key -java/util/logging/Logger -java/util/logging/Handler -java/util/logging/Level -java/util/logging/Level$KnownLevel -java/util/logging/Logger$LoggerBundle -java/util/logging/Logger$ConfigurationData -java/util/logging/LogManager -java/util/logging/LogManager$1 -java/util/logging/LogManager$SystemLoggerContext -java/util/logging/LogManager$LoggerContext -java/util/logging/LogManager$LogNode -java/util/concurrent/locks/ReentrantLock$NonfairSync -java/util/concurrent/locks/ReentrantLock$Sync -java/util/concurrent/locks/AbstractQueuedSynchronizer -java/util/concurrent/locks/AbstractQueuedSynchronizer$Node -java/lang/invoke/VarHandleObjects$FieldInstanceReadWrite -java/lang/invoke/VarHandleObjects$FieldInstanceReadOnly -java/util/Collections$SynchronizedMap -java/util/logging/LogManager$Cleaner -java/lang/ApplicationShutdownHooks -java/lang/ApplicationShutdownHooks$1 -java/lang/Shutdown -java/lang/Shutdown$Lock -java/util/logging/LoggingPermission -java/util/logging/LogManager$LoggingProviderAccess -sun/util/logging/internal/LoggingProviderImpl$LogManagerAccess -java/security/AccessController$1 -sun/security/util/SecurityConstants -java/net/NetPermission -java/security/SecurityPermission -java/net/SocketPermission -sun/security/action/GetBooleanAction -java/security/AllPermissionCollection -sun/util/logging/internal/LoggingProviderImpl -jdk/internal/logger/DefaultLoggerFinder -java/lang/System$LoggerFinder -java/lang/invoke/VarHandle$AccessDescriptor -java/util/logging/LogManager$2 -java/util/logging/LogManager$RootLogger -java/nio/file/Paths -java/util/logging/LogManager$LoggerWeakRef -java/lang/invoke/StringConcatFactory -java/lang/invoke/LambdaForm$NamedFunction -java/lang/invoke/DirectMethodHandle$Holder -sun/invoke/util/ValueConversions -java/lang/invoke/MethodHandleImpl -java/lang/invoke/Invokers -java/lang/invoke/StringConcatFactory$Strategy -java/lang/invoke/LambdaForm$Kind -java/lang/NoSuchMethodException -java/lang/invoke/LambdaForm$BasicType -java/lang/invoke/LambdaForm$Name -java/lang/invoke/LambdaForm$Holder -java/lang/invoke/MethodHandleImpl$Intrinsic -java/lang/invoke/InvokerBytecodeGenerator -java/lang/invoke/InvokerBytecodeGenerator$2 -java/lang/StringUTF16 -jdk/internal/org/objectweb/asm/ClassWriter -jdk/internal/org/objectweb/asm/ClassVisitor -jdk/internal/org/objectweb/asm/ByteVector -jdk/internal/org/objectweb/asm/Item -sun/invoke/util/BytecodeDescriptor -jdk/internal/org/objectweb/asm/MethodWriter -jdk/internal/org/objectweb/asm/MethodVisitor -jdk/internal/org/objectweb/asm/Type -jdk/internal/org/objectweb/asm/Label -jdk/internal/org/objectweb/asm/Frame -jdk/internal/org/objectweb/asm/AnnotationWriter -jdk/internal/org/objectweb/asm/AnnotationVisitor -java/lang/invoke/InvokerBytecodeGenerator$CpPatch -sun/invoke/util/VerifyType -sun/invoke/empty/Empty -sun/reflect/misc/ReflectUtil -java/lang/invoke/MethodHandleImpl$1 -jdk/internal/misc/JavaLangInvokeAccess -java/lang/invoke/MethodHandleImpl$AsVarargsCollector -java/lang/invoke/DelegatingMethodHandle -java/lang/invoke/DelegatingMethodHandle$Holder -java/lang/invoke/SimpleMethodHandle -java/lang/invoke/BoundMethodHandle -java/lang/invoke/Invokers$Holder -java/lang/NoSuchMethodError -java/lang/IncompatibleClassChangeError -java/lang/invoke/BootstrapMethodInvoker -java/lang/invoke/StringConcatFactory$1 -java/lang/invoke/StringConcatFactory$Mode -java/lang/invoke/StringConcatFactory$Recipe -java/lang/invoke/StringConcatFactory$RecipeElement -java/lang/invoke/StringConcatFactory$MethodHandleInlineCopyStrategy -java/lang/invoke/StringConcatFactory$MethodHandleInlineCopyStrategy$1 -java/lang/invoke/StringConcatFactory$MethodHandleInlineCopyStrategy$2 -java/lang/invoke/StringConcatFactory$MethodHandleInlineCopyStrategy$3 -java/lang/StringConcatHelper -java/lang/invoke/StringConcatFactory$Stringifiers -java/lang/invoke/StringConcatFactory$Stringifiers$StringifierMost -java/lang/ClassValue -java/lang/ClassValue$Entry -java/lang/ClassValue$Identity -java/lang/ClassValue$Version -java/lang/invoke/StringConcatFactory$Stringifiers$StringifierAny -java/lang/ClassValue$ClassValueMap -java/util/Arrays$ArrayList -java/lang/invoke/BoundMethodHandle$Specializer -java/lang/invoke/ClassSpecializer -java/lang/invoke/ClassSpecializer$1 -java/lang/invoke/BoundMethodHandle$SpeciesData -java/lang/invoke/ClassSpecializer$SpeciesData -java/util/ImmutableCollections$SubList -java/lang/invoke/BoundMethodHandle$Specializer$Factory -java/lang/invoke/ClassSpecializer$Factory -java/lang/invoke/BoundMethodHandle$Species_L -java/lang/invoke/DirectMethodHandle$1 -java/lang/invoke/DirectMethodHandle$Accessor -java/util/Arrays$ArrayItr -java/lang/invoke/LambdaFormEditor -java/lang/invoke/LambdaFormEditor$Transform -java/lang/invoke/LambdaFormBuffer -jdk/internal/org/objectweb/asm/FieldWriter -jdk/internal/org/objectweb/asm/FieldVisitor -java/lang/invoke/ClassSpecializer$Factory$1Var -java/util/Collections$UnmodifiableRandomAccessList -java/util/Collections$UnmodifiableList -java/lang/Byte$ByteCache -java/lang/invoke/MethodHandles$1 -sun/invoke/util/ValueConversions$WrapperCache -java/util/logging/LogManager$VisitedLoggers -java/util/function/Predicate -java/util/logging/LogManager$LoggerContext$1 -java/util/concurrent/ConcurrentHashMap$KeySetView -java/util/Collections$3 -java/util/concurrent/ConcurrentHashMap$KeyIterator -java/util/Properties$LineReader -java/util/Hashtable$Enumerator -java/lang/invoke/LambdaMetafactory -java/lang/invoke/InnerClassLambdaMetafactory -java/lang/invoke/AbstractValidatingLambdaMetafactory -java/lang/invoke/InfoFromMemberName -java/lang/invoke/MethodHandleInfo -java/lang/invoke/InnerClassLambdaMetafactory$ForwardingMethodGenerator -java/lang/invoke/TypeConvertingMethodAdapter -java/lang/invoke/InnerClassLambdaMetafactory$1 -sun/invoke/util/Wrapper$1 -java/lang/invoke/MethodHandleImpl$IntrinsicMethodHandle -java/util/ArrayList$ArrayListSpliterator -java/util/Spliterator -java/util/stream/StreamSupport -java/util/stream/ReferencePipeline$Head -java/util/stream/ReferencePipeline -java/util/stream/Stream -java/util/stream/BaseStream -java/util/stream/AbstractPipeline -java/util/stream/PipelineHelper -java/util/stream/StreamOpFlag -java/util/stream/StreamOpFlag$Type -java/util/stream/StreamOpFlag$MaskBuilder -java/util/EnumMap -java/util/EnumMap$1 -java/lang/Class$3 -java/util/HashMap$EntrySet -java/util/HashMap$EntryIterator -sun/reflect/annotation/AnnotationParser -jdk/internal/reflect/NativeMethodAccessorImpl -jdk/internal/reflect/DelegatingMethodAccessorImpl -java/util/stream/ReferencePipeline$3 -java/util/stream/ReferencePipeline$StatelessOp -java/util/stream/StreamShape -java/util/stream/ReferencePipeline$7 -java/util/stream/FindOps -java/util/stream/FindOps$FindSink$OfRef -java/util/stream/FindOps$FindSink -java/util/stream/TerminalSink -java/util/stream/Sink -java/util/function/Consumer -java/util/stream/FindOps$FindOp -java/util/stream/TerminalOp -java/lang/invoke/DirectMethodHandle$Constructor -java/util/stream/ReferencePipeline$7$1 -java/util/stream/Sink$ChainedReference -java/util/stream/ReferencePipeline$3$1 -java/util/stream/Streams$StreamBuilderImpl -java/util/stream/Stream$Builder -java/util/stream/Streams$AbstractStreamBuilderImpl -java/util/stream/Streams -java/util/IdentityHashMap$Values -java/io/FileInputStream$1 -jdk/internal/logger/BootstrapLogger -java/lang/System$Logger -sun/util/logging/PlatformLogger$Bridge -sun/util/logging/PlatformLogger$ConfigurableBridge -jdk/internal/logger/BootstrapLogger$DetectBackend -jdk/internal/logger/BootstrapLogger$DetectBackend$1 -java/util/ServiceLoader -java/util/ServiceLoader$ModuleServicesLookupIterator -java/util/Spliterators -java/util/Spliterators$EmptySpliterator$OfRef -java/util/Spliterators$EmptySpliterator -java/util/Spliterators$EmptySpliterator$OfInt -java/util/Spliterator$OfInt -java/util/Spliterator$OfPrimitive -java/util/Spliterators$EmptySpliterator$OfLong -java/util/Spliterator$OfLong -java/util/Spliterators$EmptySpliterator$OfDouble -java/util/Spliterator$OfDouble -java/util/Spliterators$1Adapter -java/util/ServiceLoader$LazyClassPathLookupIterator -java/util/ServiceLoader$2 -java/util/ServiceLoader$3 -jdk/internal/loader/AbstractClassLoaderValue$Memoizer -java/util/Collections$EmptyIterator -jdk/internal/module/Resources -jdk/internal/loader/BuiltinClassLoader$2 -jdk/internal/loader/BuiltinClassLoader$5 -jdk/internal/module/SystemModuleFinders$SystemModuleReader -java/lang/module/ModuleReader -jdk/internal/module/SystemModuleFinders$SystemImage -jdk/internal/jimage/ImageReaderFactory -jdk/internal/jimage/ImageReaderFactory$1 -jdk/internal/jimage/ImageReader -jdk/internal/jimage/ImageReader$SharedImageReader -jdk/internal/jimage/BasicImageReader -jdk/internal/jimage/BasicImageReader$1 -jdk/internal/jimage/NativeImageBuffer -jdk/internal/jimage/NativeImageBuffer$1 -jdk/internal/jimage/ImageHeader -java/nio/DirectIntBufferU -java/nio/IntBuffer -java/nio/DirectByteBufferR -java/nio/DirectIntBufferRU -jdk/internal/jimage/ImageStringsReader -jdk/internal/jimage/ImageStrings -jdk/internal/jimage/decompressor/Decompressor -jdk/internal/jimage/ImageLocation -java/util/Collections$EmptyEnumeration -jdk/internal/loader/BuiltinClassLoader$1 -java/lang/CompoundEnumeration -jdk/internal/loader/URLClassPath$1 -java/util/concurrent/CopyOnWriteArrayList$COWIterator -java/util/ServiceLoader$1 -java/util/ServiceLoader$ProviderImpl -java/util/ServiceLoader$Provider -jdk/internal/logger/BootstrapLogger$LoggingBackend -jdk/internal/logger/BootstrapLogger$RedirectedLoggers -jdk/internal/logger/BootstrapLogger$BootstrapExecutors -java/util/logging/LogManager$4 -java/util/logging/Logger$SystemLoggerHelper -java/util/logging/Logger$SystemLoggerHelper$1 -jdk/internal/logger/DefaultLoggerFinder$1 -java/net/InetAddress -java/net/InetAddress$1 -java/net/InetAddress$2 -jdk/internal/misc/JavaNetInetAddressAccess -java/net/InetAddress$InetAddressHolder -java/util/concurrent/ConcurrentSkipListSet -java/util/NavigableSet -java/util/SortedSet -java/util/concurrent/ConcurrentSkipListMap -java/util/concurrent/ConcurrentNavigableMap -java/util/NavigableMap -java/util/SortedMap -java/util/concurrent/ConcurrentSkipListMap$Index -java/util/concurrent/atomic/LongAdder -java/util/concurrent/atomic/Striped64 -java/util/concurrent/ConcurrentSkipListMap$Node -java/net/InetAddressImplFactory -java/net/Inet6AddressImpl -java/net/InetAddressImpl -java/net/InetAddress$PlatformNameService -java/net/InetAddress$NameService -java/net/Inet4AddressImpl -java/net/Inet4Address -java/util/Spliterators$ArraySpliterator -java/util/concurrent/ConcurrentHashMap$ForwardingNode -java/util/stream/Collectors -java/util/stream/Collector$Characteristics -java/util/EnumSet -java/util/RegularEnumSet -java/util/stream/Collectors$CollectorImpl -java/util/stream/Collector -java/util/StringJoiner -java/util/function/BiConsumer -java/util/function/BinaryOperator -java/util/stream/ReduceOps -java/util/stream/ReduceOps$3 -java/util/stream/ReduceOps$ReduceOp -java/util/stream/ReduceOps$ReduceTask -java/util/stream/AbstractTask -java/util/concurrent/CountedCompleter -java/util/concurrent/ForkJoinTask -java/util/concurrent/Future -java/util/concurrent/ForkJoinTask$ExceptionNode -java/util/concurrent/ForkJoinPool -java/util/concurrent/AbstractExecutorService -java/util/concurrent/ExecutorService -java/util/concurrent/Executor -java/lang/invoke/VarHandleLongs$FieldInstanceReadWrite -java/lang/invoke/VarHandleLongs$FieldInstanceReadOnly -java/lang/invoke/VarHandleObjects$Array -java/util/concurrent/ForkJoinPool$DefaultForkJoinWorkerThreadFactory -java/util/concurrent/ForkJoinPool$ForkJoinWorkerThreadFactory -java/util/concurrent/ForkJoinPool$1 -java/util/concurrent/ForkJoinPool$WorkQueue -java/util/concurrent/ForkJoinWorkerThread -java/util/concurrent/ThreadLocalRandom -java/util/Random -java/util/concurrent/ForkJoinPool$DefaultForkJoinWorkerThreadFactory$1 -java/util/stream/ReduceOps$3ReducingSink -java/util/stream/ReduceOps$AccumulatingSink -java/util/stream/ReduceOps$Box -java/util/ArrayList$SubList -java/time/format/DateTimeFormatter -java/time/format/DateTimeFormatterBuilder -java/time/ZoneId -java/time/temporal/TemporalQuery -java/lang/Character$CharacterCache -java/time/temporal/ChronoField -java/time/temporal/TemporalField -java/time/temporal/ChronoUnit -java/time/temporal/TemporalUnit -java/time/Duration -java/time/temporal/TemporalAmount -java/math/BigInteger -java/time/temporal/ValueRange -java/time/temporal/IsoFields -java/time/temporal/IsoFields$Field -java/time/temporal/IsoFields$Field$1 -java/time/temporal/IsoFields$Field$2 -java/time/temporal/IsoFields$Field$3 -java/time/temporal/IsoFields$Field$4 -java/time/temporal/IsoFields$Unit -java/time/temporal/JulianFields -java/time/temporal/JulianFields$Field -java/time/format/DateTimeFormatterBuilder$2 -java/time/format/SignStyle -java/time/format/DateTimeFormatterBuilder$NumberPrinterParser -java/time/format/DateTimeFormatterBuilder$DateTimePrinterParser -java/time/format/DateTimeFormatterBuilder$CharLiteralPrinterParser -java/time/format/ResolverStyle -java/time/chrono/IsoChronology -java/time/chrono/AbstractChronology -java/time/chrono/Chronology -java/util/Locale$Category -java/util/Locale$1 -java/time/format/DateTimeFormatterBuilder$CompositePrinterParser -java/time/format/DecimalStyle -java/time/format/DateTimeFormatterBuilder$SettingsParser -java/time/format/DateTimeFormatterBuilder$OffsetIdPrinterParser -java/time/format/DateTimeFormatterBuilder$FractionPrinterParser -java/time/format/DateTimeFormatterBuilder$ZoneIdPrinterParser -java/time/format/DateTimeFormatterBuilder$StringLiteralPrinterParser -java/time/format/DateTimeFormatterBuilder$InstantPrinterParser -java/lang/Long$LongCache -java/time/format/TextStyle -java/util/Collections$SingletonMap -java/time/format/DateTimeTextProvider$LocaleStore -java/util/AbstractMap$SimpleImmutableEntry -java/util/Collections$SingletonSet -java/util/Collections$1 -java/util/LinkedHashMap$LinkedEntrySet -java/util/LinkedHashMap$LinkedEntryIterator -java/util/LinkedHashMap$LinkedHashIterator -java/time/format/DateTimeTextProvider -java/time/format/DateTimeTextProvider$1 -java/util/Arrays$LegacyMergeSort -java/util/TimSort -java/time/format/DateTimeFormatterBuilder$1 -java/time/format/DateTimeFormatterBuilder$TextPrinterParser -java/time/Period -java/time/chrono/ChronoPeriod -java/time/ZoneOffset -java/time/temporal/TemporalAdjuster -java/time/ZoneRegion -java/time/zone/ZoneRules -java/time/zone/ZoneOffsetTransitionRule -java/time/LocalDateTime -java/time/temporal/Temporal -java/time/chrono/ChronoLocalDateTime -java/time/LocalDate -java/time/chrono/ChronoLocalDate -java/time/LocalTime -java/time/Clock -java/time/Clock$SystemClock -java/time/Instant -java/time/format/DateTimePrintContext -java/time/temporal/TemporalQueries -java/time/temporal/TemporalQueries$1 -java/time/temporal/TemporalQueries$2 -java/time/temporal/TemporalQueries$3 -java/time/temporal/TemporalQueries$4 -java/time/temporal/TemporalQueries$5 -java/time/temporal/TemporalQueries$6 -java/time/temporal/TemporalQueries$7 -java/time/LocalDate$1 -java/time/format/DateTimeFormatterBuilder$3 -java/time/LocalTime$1 -java/math/BigDecimal -java/math/BigDecimal$1 -java/math/RoundingMode -java/text/DateFormat -java/text/Format -java/text/spi/DateFormatProvider -java/util/spi/LocaleServiceProvider -sun/util/locale/provider/LocaleProviderAdapter -sun/util/locale/provider/LocaleProviderAdapter$Type -sun/util/locale/provider/LocaleProviderAdapter$NonExistentAdapter -sun/util/locale/provider/FallbackLocaleProviderAdapter -sun/util/locale/provider/JRELocaleProviderAdapter -sun/util/locale/provider/ResourceBundleBasedAdapter -sun/util/locale/LanguageTag -sun/util/locale/provider/LocaleResources -sun/util/resources/LocaleData -java/util/ResourceBundle$Control -java/util/ResourceBundle$Control$CandidateListCache -java/util/ResourceBundle -sun/util/locale/provider/LocaleProviderAdapter$1 -sun/util/cldr/CLDRLocaleProviderAdapter -sun/util/cldr/CLDRBaseLocaleDataMetaInfo -sun/util/locale/provider/LocaleDataMetaInfo -sun/util/locale/ParseStatus -sun/util/locale/StringTokenIterator -sun/util/cldr/CLDRLocaleProviderAdapter$1 -java/lang/invoke/DirectMethodHandle$Special -sun/util/locale/provider/DateFormatProviderImpl -sun/util/locale/provider/AvailableLanguageTags -java/util/StringTokenizer -sun/util/locale/provider/CalendarDataUtility -java/text/SimpleDateFormat -java/text/DateFormat$Field -java/text/Format$Field -java/text/AttributedCharacterIterator$Attribute -java/util/Calendar -java/util/TimeZone -sun/util/calendar/ZoneInfo -sun/util/calendar/ZoneInfoFile -sun/util/calendar/ZoneInfoFile$1 -java/io/DataInputStream -sun/util/calendar/ZoneInfoFile$ZoneOffsetTransitionRule -sun/util/calendar/ZoneInfoFile$Checksum -java/util/zip/CRC32 -java/util/zip/Checksum -java/util/zip/Checksum$1 -sun/util/spi/CalendarProvider -sun/util/locale/provider/CalendarProviderImpl -java/util/Calendar$Builder -java/util/GregorianCalendar -sun/util/calendar/CalendarSystem -sun/util/calendar/Gregorian -sun/util/calendar/BaseCalendar -sun/util/calendar/AbstractCalendar -java/util/spi/CalendarDataProvider -sun/util/locale/provider/LocaleServiceProviderPool -java/text/spi/BreakIteratorProvider -java/text/spi/CollatorProvider -java/text/spi/DateFormatSymbolsProvider -java/text/spi/DecimalFormatSymbolsProvider -java/text/spi/NumberFormatProvider -java/util/spi/CurrencyNameProvider -java/util/spi/LocaleNameProvider -java/util/spi/TimeZoneNameProvider -sun/util/locale/provider/CalendarDataUtility$CalendarWeekParameterGetter -sun/util/locale/provider/LocaleServiceProviderPool$LocalizedObjectGetter -java/util/ResourceBundle$NoFallbackControl -java/util/ResourceBundle$SingleFormatControl -java/util/LinkedList -java/util/AbstractSequentialList -java/util/LinkedList$Node -sun/util/cldr/CLDRCalendarDataProviderImpl -sun/util/locale/provider/CalendarDataProviderImpl -sun/util/logging/PlatformLogger -sun/util/logging/PlatformLogger$Level -java/lang/System$Logger$Level -jdk/internal/logger/LazyLoggers -jdk/internal/logger/LazyLoggers$1 -jdk/internal/logger/LazyLoggers$LazyLoggerFactories -jdk/internal/logger/LoggerFinderLoader -sun/util/logging/internal/LoggingProviderImpl$JULWrapper -sun/util/logging/PlatformLogger$ConfigurableBridge$LoggerConfiguration -sun/util/calendar/Gregorian$Date -sun/util/calendar/BaseCalendar$Date -sun/util/calendar/CalendarDate -sun/util/calendar/CalendarUtils -java/text/DateFormatSymbols -sun/util/locale/provider/DateFormatSymbolsProviderImpl -sun/util/resources/LocaleData$1 -sun/util/resources/LocaleData$LocaleDataStrategy -sun/util/resources/Bundles$Strategy -sun/util/resources/Bundles -sun/util/resources/Bundles$1 -java/util/ResourceBundle$1 -jdk/internal/misc/JavaUtilResourceBundleAccess -java/util/ResourceBundle$2 -sun/util/resources/Bundles$CacheKey -sun/text/resources/cldr/FormatData -java/util/ListResourceBundle -java/util/ResourceBundle$ResourceBundleProviderHelper -sun/util/resources/Bundles$BundleReference -sun/util/resources/Bundles$CacheKeyReference -java/text/NumberFormat -sun/util/locale/provider/NumberFormatProviderImpl -sun/util/locale/provider/LocaleResources$ResourceReference -java/text/DecimalFormatSymbols -sun/util/locale/provider/DecimalFormatSymbolsProviderImpl -java/text/DecimalFormat -java/text/FieldPosition -java/text/DigitList -java/util/Date -java/text/DontCareFieldPosition -java/text/DontCareFieldPosition$1 -java/text/Format$FieldDelegate -java/text/NumberFormat$Field -java/util/Formatter -java/util/regex/Pattern -java/util/regex/Pattern$1 -java/util/regex/Pattern$Node -java/util/regex/Pattern$LastNode -java/util/regex/Pattern$GroupHead -java/util/regex/Pattern$BmpCharPredicate -java/util/regex/Pattern$CharPredicate -java/util/regex/Pattern$BmpCharProperty -java/util/regex/Pattern$CharProperty -java/util/regex/Pattern$GroupTail -java/util/regex/CharPredicates -java/util/regex/Pattern$BmpCharPropertyGreedy -java/util/regex/Pattern$CharPropertyGreedy -java/util/regex/Pattern$Ques -java/util/regex/Pattern$Qtype -java/util/regex/Pattern$BranchConn -java/util/regex/Pattern$Branch -java/util/regex/Pattern$BitClass -java/util/regex/Pattern$Slice -java/util/regex/Pattern$SliceNode -java/util/regex/Pattern$Begin -java/util/regex/Pattern$First -java/util/regex/Pattern$Start -java/util/regex/Pattern$TreeInfo -java/util/regex/Matcher -java/util/regex/MatchResult -java/util/regex/IntHashSet -java/util/regex/ASCII -java/util/Formatter$FormatSpecifier -java/util/Formatter$FormatString -java/util/Formatter$Flags -java/util/Formatter$Conversion -java/util/Formattable -java/util/logging/LogRecord -java/util/logging/ConsoleHandler -java/util/logging/StreamHandler -java/util/logging/SimpleFormatter -java/util/logging/Formatter -jdk/internal/logger/SurrogateLogger -jdk/internal/logger/SimpleConsoleLogger -jdk/internal/logger/SimpleConsoleLogger$Formatting -java/util/logging/ErrorManager -java/util/logging/Handler$1 -java/util/logging/StreamHandler$1 -java/util/logging/LogManager$CloseOnReset -java/time/zone/ZoneRulesProvider -java/time/zone/ZoneRulesProvider$1 -java/time/zone/TzdbZoneRulesProvider -java/time/zone/Ser -java/io/Externalizable -java/time/Month -java/time/DayOfWeek -java/time/zone/ZoneOffsetTransitionRule$TimeDefinition -java/time/zone/ZoneOffsetTransition -java/time/ZonedDateTime -java/time/chrono/ChronoZonedDateTime -java/time/temporal/TemporalAdjusters -java/time/zone/ZoneOffsetTransitionRule$1 -java/util/logging/LogRecord$CallerFinder -java/lang/StackWalker$Option -java/lang/StackStreamFactory -java/lang/StackWalker$ExtendedOption -java/lang/StackStreamFactory$StackFrameTraverser -java/lang/StackStreamFactory$WalkerState -java/lang/StackStreamFactory$1 -java/lang/StackStreamFactory$StackFrameTraverser$StackFrameBuffer -java/lang/StackStreamFactory$FrameBuffer -java/util/stream/ReferencePipeline$2 -java/util/stream/ReferencePipeline$2$1 -java/util/logging/Level$RbAccess -java/util/ResourceBundle$CacheKey -java/util/ResourceBundle$KeyElementReference -java/util/ResourceBundle$CacheKeyReference -java/util/ResourceBundle$3 -sun/util/logging/resources/logging -java/util/ResourceBundle$BundleReference -jdk/internal/module/Checks -java/util/Formatter$DateTime -java/util/Formatter$FixedString -java/time/ZonedDateTime$1 -sun/text/resources/cldr/FormatData_en -java/util/IdentityHashMap$KeyIterator -java/util/IdentityHashMap$IdentityHashMapIterator diff --git a/jre-11/lib/jexec b/jre-11/lib/jexec deleted file mode 100644 index 5f322f1a8..000000000 Binary files a/jre-11/lib/jexec and /dev/null differ diff --git a/jre-11/lib/jli/libjli.so b/jre-11/lib/jli/libjli.so deleted file mode 100644 index 82013a2a3..000000000 Binary files a/jre-11/lib/jli/libjli.so and /dev/null differ diff --git a/jre-11/lib/jrt-fs.jar b/jre-11/lib/jrt-fs.jar deleted file mode 100644 index 6d4543fb0..000000000 Binary files a/jre-11/lib/jrt-fs.jar and /dev/null differ diff --git a/jre-11/lib/jvm.cfg b/jre-11/lib/jvm.cfg deleted file mode 100644 index 97225c8fe..000000000 --- a/jre-11/lib/jvm.cfg +++ /dev/null @@ -1,2 +0,0 @@ --server KNOWN --client IGNORE diff --git a/jre-11/lib/libawt.so b/jre-11/lib/libawt.so deleted file mode 100644 index 4ad92634c..000000000 Binary files a/jre-11/lib/libawt.so and /dev/null differ diff --git a/jre-11/lib/libawt_headless.so b/jre-11/lib/libawt_headless.so deleted file mode 100644 index c21d88309..000000000 Binary files a/jre-11/lib/libawt_headless.so and /dev/null differ diff --git a/jre-11/lib/libawt_xawt.so b/jre-11/lib/libawt_xawt.so deleted file mode 100644 index 6bc420cd7..000000000 Binary files a/jre-11/lib/libawt_xawt.so and /dev/null differ diff --git a/jre-11/lib/libfontmanager.so b/jre-11/lib/libfontmanager.so deleted file mode 100644 index ad6e370ba..000000000 Binary files a/jre-11/lib/libfontmanager.so and /dev/null differ diff --git a/jre-11/lib/libinstrument.so b/jre-11/lib/libinstrument.so deleted file mode 100644 index 68bfe3ace..000000000 Binary files a/jre-11/lib/libinstrument.so and /dev/null differ diff --git a/jre-11/lib/libj2gss.so b/jre-11/lib/libj2gss.so deleted file mode 100644 index 1ad59b367..000000000 Binary files a/jre-11/lib/libj2gss.so and /dev/null differ diff --git a/jre-11/lib/libjava.so b/jre-11/lib/libjava.so deleted file mode 100644 index 5323f8cf5..000000000 Binary files a/jre-11/lib/libjava.so and /dev/null differ diff --git a/jre-11/lib/libjavajpeg.so b/jre-11/lib/libjavajpeg.so deleted file mode 100644 index cd5333ba2..000000000 Binary files a/jre-11/lib/libjavajpeg.so and /dev/null differ diff --git a/jre-11/lib/libjawt.so b/jre-11/lib/libjawt.so deleted file mode 100644 index d9f626357..000000000 Binary files a/jre-11/lib/libjawt.so and /dev/null differ diff --git a/jre-11/lib/libjimage.so b/jre-11/lib/libjimage.so deleted file mode 100644 index 63e7655ab..000000000 Binary files a/jre-11/lib/libjimage.so and /dev/null differ diff --git a/jre-11/lib/libjsig.so b/jre-11/lib/libjsig.so deleted file mode 100644 index 9f1e9dab7..000000000 Binary files a/jre-11/lib/libjsig.so and /dev/null differ diff --git a/jre-11/lib/libjsound.so b/jre-11/lib/libjsound.so deleted file mode 100644 index 45c6ff23b..000000000 Binary files a/jre-11/lib/libjsound.so and /dev/null differ diff --git a/jre-11/lib/liblcms.so b/jre-11/lib/liblcms.so deleted file mode 100644 index 2c8f25848..000000000 Binary files a/jre-11/lib/liblcms.so and /dev/null differ diff --git a/jre-11/lib/libmanagement.so b/jre-11/lib/libmanagement.so deleted file mode 100644 index 6306a82d7..000000000 Binary files a/jre-11/lib/libmanagement.so and /dev/null differ diff --git a/jre-11/lib/libmanagement_ext.so b/jre-11/lib/libmanagement_ext.so deleted file mode 100644 index 456185643..000000000 Binary files a/jre-11/lib/libmanagement_ext.so and /dev/null differ diff --git a/jre-11/lib/libmlib_image.so b/jre-11/lib/libmlib_image.so deleted file mode 100644 index 845f9b704..000000000 Binary files a/jre-11/lib/libmlib_image.so and /dev/null differ diff --git a/jre-11/lib/libnet.so b/jre-11/lib/libnet.so deleted file mode 100644 index 17b1d6c91..000000000 Binary files a/jre-11/lib/libnet.so and /dev/null differ diff --git a/jre-11/lib/libnio.so b/jre-11/lib/libnio.so deleted file mode 100644 index 34ca66e6a..000000000 Binary files a/jre-11/lib/libnio.so and /dev/null differ diff --git a/jre-11/lib/libprefs.so b/jre-11/lib/libprefs.so deleted file mode 100644 index c8816b412..000000000 Binary files a/jre-11/lib/libprefs.so and /dev/null differ diff --git a/jre-11/lib/libsplashscreen.so b/jre-11/lib/libsplashscreen.so deleted file mode 100644 index b6a572baa..000000000 Binary files a/jre-11/lib/libsplashscreen.so and /dev/null differ diff --git a/jre-11/lib/libverify.so b/jre-11/lib/libverify.so deleted file mode 100644 index 1158e7955..000000000 Binary files a/jre-11/lib/libverify.so and /dev/null differ diff --git a/jre-11/lib/libzip.so b/jre-11/lib/libzip.so deleted file mode 100644 index ad8a2886c..000000000 Binary files a/jre-11/lib/libzip.so and /dev/null differ diff --git a/jre-11/lib/modules b/jre-11/lib/modules deleted file mode 100644 index df71269b6..000000000 Binary files a/jre-11/lib/modules and /dev/null differ diff --git a/jre-11/lib/psfont.properties.ja b/jre-11/lib/psfont.properties.ja deleted file mode 100644 index d17cf40d1..000000000 --- a/jre-11/lib/psfont.properties.ja +++ /dev/null @@ -1,119 +0,0 @@ -# -# -# Copyright (c) 1996, 2000, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Japanese PostScript printer property file -# -font.num=16 -# -serif=serif -timesroman=serif -sansserif=sansserif -helvetica=sansserif -monospaced=monospaced -courier=monospaced -dialog=sansserif -dialoginput=monospaced -# -serif.latin1.plain=Times-Roman -serif.latin1.italic=Times-Italic -serif.latin1.bolditalic=Times-BoldItalic -serif.latin1.bold=Times-Bold -# -sansserif.latin1.plain=Helvetica -sansserif.latin1.italic=Helvetica-Oblique -sansserif.latin1.bolditalic=Helvetica-BoldOblique -sansserif.latin1.bold=Helvetica-Bold -# -monospaced.latin1.plain=Courier -monospaced.latin1.italic=Courier-Oblique -monospaced.latin1.bolditalic=Courier-BoldOblique -monospaced.latin1.bold=Courier-Bold -# -serif.x11jis0208.plain=Ryumin-Light-H -serif.x11jis0208.italic=Ryumin-Light-H -serif.x11jis0208.bolditalic=Ryumin-Light-H -serif.x11jis0208.bold=Ryumin-Light-H -# -sansserif.x11jis0208.plain=GothicBBB-Medium-H -sansserif.x11jis0208.italic=GothicBBB-Medium-H -sansserif.x11jis0208.bolditalic=GothicBBB-Medium-H -sansserif.x11jis0208.bold=GothicBBB-Medium-H -# -monospaced.x11jis0208.plain=GothicBBB-Medium-H -monospaced.x11jis0208.italic=GothicBBB-Medium-H -monospaced.x11jis0208.bolditalic=GothicBBB-Medium-H -monospaced.x11jis0208.bold=GothicBBB-Medium-H -# -serif.x11jis0201.plain=Ryumin-Light.Hankaku -serif.x11jis0201.italic=Ryumin-Light.Hankaku -serif.x11jis0201.bolditalic=Ryumin-Light.Hankaku -serif.x11jis0201.bold=Ryumin-Light.Hankaku -# -sansserif.x11jis0201.plain=GothicBBB-Medium.Hankaku -sansserif.x11jis0201.italic=GothicBBB-Medium.Hankaku -sansserif.x11jis0201.bolditalic=GothicBBB-Medium.Hankaku -sansserif.x11jis0201.bold=GothicBBB-Medium.Hankaku -# -monospaced.x11jis0201.plain=GothicBBB-Medium.Hankaku -monospaced.x11jis0201.italic=GothicBBB-Medium.Hankaku -monospaced.x11jis0201.bolditalic=GothicBBB-Medium.Hankaku -monospaced.x11jis0201.bold=GothicBBB-Medium.Hankaku -# -Helvetica=0 -Helvetica-Bold=1 -Helvetica-Oblique=2 -Helvetica-BoldOblique=3 -Times-Roman=4 -Times-Bold=5 -Times-Italic=6 -Times-BoldItalic=7 -Courier=8 -Courier-Bold=9 -Courier-Oblique=10 -Courier-BoldOblique=11 -GothicBBB-Medium-H=12 -Ryumin-Light-H=13 -GothicBBB-Medium.Hankaku=14 -Ryumin-Light.Hankaku=15 -# -font.0=Helvetica ISOF -font.1=Helvetica-Bold ISOF -font.2=Helvetica-Oblique ISOF -font.3=Helvetica-BoldOblique ISOF -font.4=Times-Roman ISOF -font.5=Times-Bold ISOF -font.6=Times-Italic ISOF -font.7=Times-BoldItalic ISOF -font.8=Courier ISOF -font.9=Courier-Bold ISOF -font.10=Courier-Oblique ISOF -font.11=Courier-BoldOblique ISOF -font.12=GothicBBB-Medium-H findfont -font.13=Ryumin-Light-H findfont -font.14=GothicBBB-Medium.Hankaku findfont -font.15=Ryumin-Light.Hankaku findfont -# diff --git a/jre-11/lib/psfontj2d.properties b/jre-11/lib/psfontj2d.properties deleted file mode 100644 index 5eb2c4b8b..000000000 --- a/jre-11/lib/psfontj2d.properties +++ /dev/null @@ -1,323 +0,0 @@ -# -# -# Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. - -# -# PostScript printer property file for Java 2D printing. -# -# WARNING: This is an internal implementation file, not a public file. -# Any customisation or reliance on the existence of this file and its -# contents or syntax is discouraged and unsupported. -# It may be incompatibly changed or removed without any notice. -# -# -font.num=35 -# -# Legacy logical font family names and logical font aliases should all -# map to the primary logical font names. -# -serif=serif -times=serif -timesroman=serif -sansserif=sansserif -helvetica=sansserif -dialog=sansserif -dialoginput=monospaced -monospaced=monospaced -courier=monospaced -# -# Next, physical fonts which can be safely mapped to standard postscript fonts -# These keys generally map to a value which is the same as the key, so -# the key/value is just a way to say the font has a mapping. -# Sometimes however we map more than one screen font to the same PS font. -# -avantgarde=avantgarde_book -avantgarde_book=avantgarde_book -avantgarde_demi=avantgarde_demi -avantgarde_book_oblique=avantgarde_book_oblique -avantgarde_demi_oblique=avantgarde_demi_oblique -# -itcavantgarde=avantgarde_book -itcavantgarde=avantgarde_book -itcavantgarde_demi=avantgarde_demi -itcavantgarde_oblique=avantgarde_book_oblique -itcavantgarde_demi_oblique=avantgarde_demi_oblique -# -bookman=bookman_light -bookman_light=bookman_light -bookman_demi=bookman_demi -bookman_light_italic=bookman_light_italic -bookman_demi_italic=bookman_demi_italic -# -# Exclude "helvetica" on its own as that's a legacy name for a logical font -helvetica_bold=helvetica_bold -helvetica_oblique=helvetica_oblique -helvetica_bold_oblique=helvetica_bold_oblique -# -itcbookman_light=bookman_light -itcbookman_demi=bookman_demi -itcbookman_light_italic=bookman_light_italic -itcbookman_demi_italic=bookman_demi_italic -# -# Exclude "courier" on its own as that's a legacy name for a logical font -courier_bold=courier_bold -courier_oblique=courier_oblique -courier_bold_oblique=courier_bold_oblique -# -courier_new=courier -courier_new_bold=courier_bold -# -monotype_century_schoolbook=newcenturyschoolbook -monotype_century_schoolbook_bold=newcenturyschoolbook_bold -monotype_century_schoolbook_italic=newcenturyschoolbook_italic -monotype_century_schoolbook_bold_italic=newcenturyschoolbook_bold_italic -# -newcenturyschoolbook=newcenturyschoolbook -newcenturyschoolbook_bold=newcenturyschoolbook_bold -newcenturyschoolbook_italic=newcenturyschoolbook_italic -newcenturyschoolbook_bold_italic=newcenturyschoolbook_bold_italic -# -palatino=palatino -palatino_bold=palatino_bold -palatino_italic=palatino_italic -palatino_bold_italic=palatino_bold_italic -# -# Exclude "times" on its own as that's a legacy name for a logical font -times_bold=times_roman_bold -times_italic=times_roman_italic -times_bold_italic=times_roman_bold_italic -# -times_roman=times_roman -times_roman_bold=times_roman_bold -times_roman_italic=times_roman_italic -times_roman_bold_italic=times_roman_bold_italic -# -times_new_roman=times_roman -times_new_roman_bold=times_roman_bold -times_new_roman_italic=times_roman_italic -times_new_roman_bold_italic=times_roman_bold_italic -# -zapfchancery_italic=zapfchancery_italic -itczapfchancery_italic=zapfchancery_italic -# -# Next the mapping of the font name + charset + style to Postscript font name -# for the logical fonts. -# -serif.latin1.plain=Times-Roman -serif.latin1.bold=Times-Bold -serif.latin1.italic=Times-Italic -serif.latin1.bolditalic=Times-BoldItalic -serif.symbol.plain=Symbol -serif.dingbats.plain=ZapfDingbats -serif.symbol.bold=Symbol -serif.dingbats.bold=ZapfDingbats -serif.symbol.italic=Symbol -serif.dingbats.italic=ZapfDingbats -serif.symbol.bolditalic=Symbol -serif.dingbats.bolditalic=ZapfDingbats -# -sansserif.latin1.plain=Helvetica -sansserif.latin1.bold=Helvetica-Bold -sansserif.latin1.italic=Helvetica-Oblique -sansserif.latin1.bolditalic=Helvetica-BoldOblique -sansserif.symbol.plain=Symbol -sansserif.dingbats.plain=ZapfDingbats -sansserif.symbol.bold=Symbol -sansserif.dingbats.bold=ZapfDingbats -sansserif.symbol.italic=Symbol -sansserif.dingbats.italic=ZapfDingbats -sansserif.symbol.bolditalic=Symbol -sansserif.dingbats.bolditalic=ZapfDingbats -# -monospaced.latin1.plain=Courier -monospaced.latin1.bold=Courier-Bold -monospaced.latin1.italic=Courier-Oblique -monospaced.latin1.bolditalic=Courier-BoldOblique -monospaced.symbol.plain=Symbol -monospaced.dingbats.plain=ZapfDingbats -monospaced.symbol.bold=Symbol -monospaced.dingbats.bold=ZapfDingbats -monospaced.symbol.italic=Symbol -monospaced.dingbats.italic=ZapfDingbats -monospaced.symbol.bolditalic=Symbol -monospaced.dingbats.bolditalic=ZapfDingbats -# -# Next the mapping of the font name + charset + style to Postscript font name -# for the physical fonts. Since these always report style as plain, the -# style key is always plain. So we map using the face name to the correct -# style for the postscript font. This is possible since the face names can -# be replied upon to be different for each style. -# However an application may try to create a Font applying a style to an -# physical name. We want to map to the correct Postscript font there too -# if possible but we do not map cases where the application tries to -# augment a style (eg ask for a bold version of a bold font) -# Defer to the 2D package to attempt create an artificially styled version -# -avantgarde_book.latin1.plain=AvantGarde-Book -avantgarde_demi.latin1.plain=AvantGarde-Demi -avantgarde_book_oblique.latin1.plain=AvantGarde-BookOblique -avantgarde_demi_oblique.latin1.plain=AvantGarde-DemiOblique -# -avantgarde_book.latin1.bold=AvantGarde-Demi -avantgarde_book.latin1.italic=AvantGarde-BookOblique -avantgarde_book.latin1.bolditalic=AvantGarde-DemiOblique -avantgarde_demi.latin1.italic=AvantGarde-DemiOblique -avantgarde_book_oblique.latin1.bold=AvantGarde-DemiOblique -# -bookman_light.latin1.plain=Bookman-Light -bookman_demi.latin1.plain=Bookman-Demi -bookman_light_italic.latin1.plain=Bookman-LightItalic -bookman_demi_italic.latin1.plain=Bookman-DemiItalic -# -bookman_light.latin1.bold=Bookman-Demi -bookman_light.latin1.italic=Bookman-LightItalic -bookman_light.latin1.bolditalic=Bookman-DemiItalic -bookman_light_bold.latin1.italic=Bookman-DemiItalic -bookman_light_italic.latin1.bold=Bookman-DemiItalic -# -courier.latin1.plain=Courier -courier_bold.latin1.plain=Courier-Bold -courier_oblique.latin1.plain=Courier-Oblique -courier_bold_oblique.latin1.plain=Courier-BoldOblique -courier.latin1.bold=Courier-Bold -courier.latin1.italic=Courier-Oblique -courier.latin1.bolditalic=Courier-BoldOblique -courier_bold.latin1.italic=Courier-BoldOblique -courier_italic.latin1.bold=Courier-BoldOblique -# -helvetica_bold.latin1.plain=Helvetica-Bold -helvetica_oblique.latin1.plain=Helvetica-Oblique -helvetica_bold_oblique.latin1.plain=Helvetica-BoldOblique -helvetica.latin1.bold=Helvetica-Bold -helvetica.latin1.italic=Helvetica-Oblique -helvetica.latin1.bolditalic=Helvetica-BoldOblique -helvetica_bold.latin1.italic=Helvetica-BoldOblique -helvetica_italic.latin1.bold=Helvetica-BoldOblique -# -newcenturyschoolbook.latin1.plain=NewCenturySchlbk-Roman -newcenturyschoolbook_bold.latin1.plain=NewCenturySchlbk-Bold -newcenturyschoolbook_italic.latin1.plain=NewCenturySchlbk-Italic -newcenturyschoolbook_bold_italic.latin1.plain=NewCenturySchlbk-BoldItalic -newcenturyschoolbook.latin1.bold=NewCenturySchlbk-Bold -newcenturyschoolbook.latin1.italic=NewCenturySchlbk-Italic -newcenturyschoolbook.latin1.bolditalic=NewCenturySchlbk-BoldItalic -newcenturyschoolbook_bold.latin1.italic=NewCenturySchlbk-BoldItalic -newcenturyschoolbook_italic.latin1.bold=NewCenturySchlbk-BoldItalic -# -palatino.latin1.plain=Palatino-Roman -palatino_bold.latin1.plain=Palatino-Bold -palatino_italic.latin1.plain=Palatino-Italic -palatino_bold_italic.latin1.plain=Palatino-BoldItalic -palatino.latin1.bold=Palatino-Bold -palatino.latin1.italic=Palatino-Italic -palatino.latin1.bolditalic=Palatino-BoldItalic -palatino_bold.latin1.italic=Palatino-BoldItalic -palatino_italic.latin1.bold=Palatino-BoldItalic -# -times_roman.latin1.plain=Times-Roman -times_roman_bold.latin1.plain=Times-Bold -times_roman_italic.latin1.plain=Times-Italic -times_roman_bold_italic.latin1.plain=Times-BoldItalic -times_roman.latin1.bold=Times-Bold -times_roman.latin1.italic=Times-Italic -times_roman.latin1.bolditalic=Times-BoldItalic -times_roman_bold.latin1.italic=Times-BoldItalic -times_roman_italic.latin1.bold=Times-BoldItalic -# -zapfchancery_italic.latin1.plain=ZapfChancery-MediumItalic -# -# Finally the mappings of PS font names to indexes. -# -AvantGarde-Book=0 -AvantGarde-BookOblique=1 -AvantGarde-Demi=2 -AvantGarde-DemiOblique=3 -Bookman-Demi=4 -Bookman-DemiItalic=5 -Bookman-Light=6 -Bookman-LightItalic=7 -Courier=8 -Courier-Bold=9 -Courier-BoldOblique=10 -Courier-Oblique=11 -Helvetica=12 -Helvetica-Bold=13 -Helvetica-BoldOblique=14 -Helvetica-Narrow=15 -Helvetica-Narrow-Bold=16 -Helvetica-Narrow-BoldOblique=17 -Helvetica-Narrow-Oblique=18 -Helvetica-Oblique=19 -NewCenturySchlbk-Bold=20 -NewCenturySchlbk-BoldItalic=21 -NewCenturySchlbk-Italic=22 -NewCenturySchlbk-Roman=23 -Palatino-Bold=24 -Palatino-BoldItalic=25 -Palatino-Italic=26 -Palatino-Roman=27 -Symbol=28 -Times-Bold=29 -Times-BoldItalic=30 -Times-Italic=31 -Times-Roman=32 -ZapfDingbats=33 -ZapfChancery-MediumItalic=34 -# -font.0=AvantGarde-Book ISOF -font.1=AvantGarde-BookOblique ISOF -font.2=AvantGarde-Demi ISOF -font.3=AvantGarde-DemiOblique ISOF -font.4=Bookman-Demi ISOF -font.5=Bookman-DemiItalic ISOF -font.6=Bookman-Light ISOF -font.7=Bookman-LightItalic ISOF -font.8=Courier ISOF -font.9=Courier-Bold ISOF -font.10=Courier-BoldOblique ISOF -font.11=Courier-Oblique ISOF -font.12=Helvetica ISOF -font.13=Helvetica-Bold ISOF -font.14=Helvetica-BoldOblique ISOF -font.15=Helvetica-Narrow ISOF -font.16=Helvetica-Narrow-Bold ISOF -font.17=Helvetica-Narrow-BoldOblique ISOF -font.18=Helvetica-Narrow-Oblique ISOF -font.19=Helvetica-Oblique ISOF -font.20=NewCenturySchlbk-Bold ISOF -font.21=NewCenturySchlbk-BoldItalic ISOF -font.22=NewCenturySchlbk-Italic ISOF -font.23=NewCenturySchlbk-Roman ISOF -font.24=Palatino-Bold ISOF -font.25=Palatino-BoldItalic ISOF -font.26=Palatino-Italic ISOF -font.27=Palatino-Roman ISOF -font.28=Symbol findfont -font.29=Times-Bold ISOF -font.30=Times-BoldItalic ISOF -font.31=Times-Italic ISOF -font.32=Times-Roman ISOF -font.33=ZapfDingbats findfont -font.34=ZapfChancery-MediumItalic ISOF -# diff --git a/jre-11/lib/security/blacklisted.certs b/jre-11/lib/security/blacklisted.certs deleted file mode 100644 index e192c1aaa..000000000 --- a/jre-11/lib/security/blacklisted.certs +++ /dev/null @@ -1,20 +0,0 @@ -Algorithm=SHA-256 -14E6D2764A4B06701C6CBC376A253775F79C782FBCB6C0EE6F99DE4BA1024ADD -31C8FD37DB9B56E708B03D1F01848B068C6DA66F36FB5D82C008C6040FA3E133 -3946901F46B0071E90D78279E82FABABCA177231A704BE72C5B0E8918566EA66 -450F1B421BB05C8609854884559C323319619E8B06B001EA2DCBB74A23AA3BE2 -4CBBF8256BC9888A8007B2F386940A2E394378B0D903CBB3863C5A6394B889CE -4FEE0163686ECBD65DB968E7494F55D84B25486D438E9DE558D629D28CD4D176 -5E83124D68D24E8E177E306DF643D5EA99C5A94D6FC34B072F7544A1CABB7C7B -76A45A496031E4DD2D7ED23E8F6FF97DBDEA980BAAC8B0BA94D7EDB551348645 -8A1BD21661C60015065212CC98B1ABB50DFD14C872A208E66BAE890F25C448AF -9ED8F9B0E8E42A1656B8E1DD18F42BA42DC06FE52686173BA2FC70E756F207DC -A686FEE577C88AB664D0787ECDFFF035F4806F3DE418DC9E4D516324FFF02083 -B8686723E415534BC0DBD16326F9486F85B0B0799BF6639334E61DAAE67F36CD -D24566BF315F4E597D6E381C87119FB4198F5E9E2607F5F4AB362EF7E2E7672F -D3A936E1A7775A45217C8296A1F22AC5631DCDEC45594099E78EEEBBEDCBA967 -DF21016B00FC54F9FE3BC8B039911BB216E9162FAD2FD14D990AB96E951B49BE -EC30C9C3065A06BB07DC5B1C6B497F370C1CA65C0F30C08E042BA6BCECC78F2C -F5B6F88F75D391A4B1EB336F9E201239FB6B1377DB8CFA7B84736216E5AFFFD7 -FC02FD48DB92D4DCE6F11679D38354CF750CFC7F584A520EB90BDE80E241F2BD -FDEDB5BDFCB67411513A61AEE5CB5B5D7C52AF06028EFC996CC1B05B1D6CEA2B diff --git a/jre-11/lib/security/cacerts b/jre-11/lib/security/cacerts deleted file mode 100644 index 0981dbcd2..000000000 Binary files a/jre-11/lib/security/cacerts and /dev/null differ diff --git a/jre-11/lib/security/default.policy b/jre-11/lib/security/default.policy deleted file mode 100644 index b0ffc990b..000000000 --- a/jre-11/lib/security/default.policy +++ /dev/null @@ -1,211 +0,0 @@ -// -// Permissions required by modules stored in a run-time image and loaded -// by the platform class loader. -// -// NOTE that this file is not intended to be modified. If additional -// permissions need to be granted to the modules in this file, it is -// recommended that they be configured in a separate policy file or -// ${java.home}/conf/security/java.policy. -// - - -grant codeBase "jrt:/java.compiler" { - permission java.security.AllPermission; -}; - - -grant codeBase "jrt:/java.net.http" { - permission java.lang.RuntimePermission "accessClassInPackage.sun.net"; - permission java.lang.RuntimePermission "accessClassInPackage.sun.net.util"; - permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www"; - permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc"; - permission java.net.SocketPermission "*","connect,resolve"; - permission java.net.URLPermission "http:*","*:*"; - permission java.net.URLPermission "https:*","*:*"; - permission java.net.URLPermission "ws:*","*:*"; - permission java.net.URLPermission "wss:*","*:*"; - permission java.net.URLPermission "socket:*","CONNECT"; // proxy - // For request/response body processors, fromFile, asFile - permission java.io.FilePermission "<>","read,write,delete"; - permission java.util.PropertyPermission "*","read"; - permission java.net.NetPermission "getProxySelector"; -}; - -grant codeBase "jrt:/java.scripting" { - permission java.security.AllPermission; -}; - -grant codeBase "jrt:/java.security.jgss" { - permission java.security.AllPermission; -}; - -grant codeBase "jrt:/java.smartcardio" { - permission javax.smartcardio.CardPermission "*", "*"; - permission java.lang.RuntimePermission "loadLibrary.j2pcsc"; - permission java.lang.RuntimePermission - "accessClassInPackage.sun.security.jca"; - permission java.lang.RuntimePermission - "accessClassInPackage.sun.security.util"; - permission java.util.PropertyPermission - "javax.smartcardio.TerminalFactory.DefaultType", "read"; - permission java.util.PropertyPermission "os.name", "read"; - permission java.util.PropertyPermission "os.arch", "read"; - permission java.util.PropertyPermission "sun.arch.data.model", "read"; - permission java.util.PropertyPermission - "sun.security.smartcardio.library", "read"; - permission java.util.PropertyPermission - "sun.security.smartcardio.t0GetResponse", "read"; - permission java.util.PropertyPermission - "sun.security.smartcardio.t1GetResponse", "read"; - permission java.util.PropertyPermission - "sun.security.smartcardio.t1StripLe", "read"; - // needed for looking up native PC/SC library - permission java.io.FilePermission "<>","read"; - permission java.security.SecurityPermission "putProviderProperty.SunPCSC"; - permission java.security.SecurityPermission - "clearProviderProperties.SunPCSC"; - permission java.security.SecurityPermission - "removeProviderProperty.SunPCSC"; -}; - -grant codeBase "jrt:/java.sql" { - permission java.security.AllPermission; -}; - -grant codeBase "jrt:/java.sql.rowset" { - permission java.security.AllPermission; -}; - - -grant codeBase "jrt:/java.xml.crypto" { - permission java.lang.RuntimePermission - "accessClassInPackage.sun.security.util"; - permission java.util.PropertyPermission "*", "read"; - permission java.security.SecurityPermission "putProviderProperty.XMLDSig"; - permission java.security.SecurityPermission - "clearProviderProperties.XMLDSig"; - permission java.security.SecurityPermission - "removeProviderProperty.XMLDSig"; - permission java.security.SecurityPermission - "com.sun.org.apache.xml.internal.security.register"; - permission java.security.SecurityPermission - "getProperty.jdk.xml.dsig.secureValidationPolicy"; - permission java.lang.RuntimePermission - "accessClassInPackage.com.sun.org.apache.xml.internal.*"; - permission java.lang.RuntimePermission - "accessClassInPackage.com.sun.org.apache.xpath.internal"; - permission java.lang.RuntimePermission - "accessClassInPackage.com.sun.org.apache.xpath.internal.*"; -}; - - -grant codeBase "jrt:/jdk.accessibility" { - permission java.lang.RuntimePermission "accessClassInPackage.sun.awt"; -}; - -grant codeBase "jrt:/jdk.charsets" { - permission java.util.PropertyPermission "os.name", "read"; - permission java.util.PropertyPermission "sun.nio.cs.map", "read"; - permission java.lang.RuntimePermission "charsetProvider"; - permission java.lang.RuntimePermission - "accessClassInPackage.jdk.internal.misc"; - permission java.lang.RuntimePermission "accessClassInPackage.sun.nio.cs"; -}; - -grant codeBase "jrt:/jdk.crypto.ec" { - permission java.lang.RuntimePermission - "accessClassInPackage.sun.security.*"; - permission java.lang.RuntimePermission "loadLibrary.sunec"; - permission java.security.SecurityPermission "putProviderProperty.SunEC"; - permission java.security.SecurityPermission "clearProviderProperties.SunEC"; - permission java.security.SecurityPermission "removeProviderProperty.SunEC"; -}; - -grant codeBase "jrt:/jdk.crypto.cryptoki" { - permission java.lang.RuntimePermission - "accessClassInPackage.sun.security.*"; - permission java.lang.RuntimePermission "accessClassInPackage.sun.nio.ch"; - permission java.lang.RuntimePermission "loadLibrary.j2pkcs11"; - permission java.util.PropertyPermission "sun.security.pkcs11.allowSingleThreadedModules", "read"; - permission java.util.PropertyPermission "os.name", "read"; - permission java.util.PropertyPermission "os.arch", "read"; - permission java.util.PropertyPermission "jdk.crypto.KeyAgreement.legacyKDF", "read"; - permission java.security.SecurityPermission "putProviderProperty.*"; - permission java.security.SecurityPermission "clearProviderProperties.*"; - permission java.security.SecurityPermission "removeProviderProperty.*"; - permission java.security.SecurityPermission - "getProperty.auth.login.defaultCallbackHandler"; - permission java.security.SecurityPermission "authProvider.*"; - // Needed for reading PKCS11 config file and NSS library check - permission java.io.FilePermission "<>", "read"; -}; - -grant codeBase "jrt:/jdk.desktop" { - permission java.lang.RuntimePermission "accessClassInPackage.com.sun.awt"; -}; - -grant codeBase "jrt:/jdk.dynalink" { - permission java.security.AllPermission; -}; - -grant codeBase "jrt:/jdk.httpserver" { - permission java.security.AllPermission; -}; - -grant codeBase "jrt:/jdk.internal.le" { - permission java.security.AllPermission; -}; - -grant codeBase "jrt:/jdk.internal.vm.compiler" { - permission java.security.AllPermission; -}; - -grant codeBase "jrt:/jdk.internal.vm.compiler.management" { - permission java.lang.RuntimePermission "accessClassInPackage.org.graalvm.compiler.hotspot"; - permission java.lang.RuntimePermission "accessClassInPackage.jdk.vm.ci.runtime"; - permission java.lang.RuntimePermission "accessClassInPackage.sun.management.spi"; - permission java.lang.RuntimePermission "sun.management.spi.PlatformMBeanProvider.subclass"; -}; - -grant codeBase "jrt:/jdk.jsobject" { - permission java.security.AllPermission; -}; - -grant codeBase "jrt:/jdk.localedata" { - permission java.lang.RuntimePermission "accessClassInPackage.sun.text.*"; - permission java.lang.RuntimePermission "accessClassInPackage.sun.util.*"; -}; - -grant codeBase "jrt:/jdk.naming.dns" { - permission java.security.AllPermission; -}; - -grant codeBase "jrt:/jdk.scripting.nashorn" { - permission java.security.AllPermission; -}; - -grant codeBase "jrt:/jdk.scripting.nashorn.shell" { - permission java.security.AllPermission; -}; - -grant codeBase "jrt:/jdk.security.auth" { - permission java.security.AllPermission; -}; - -grant codeBase "jrt:/jdk.security.jgss" { - permission java.security.AllPermission; -}; - -grant codeBase "jrt:/jdk.zipfs" { - permission java.io.FilePermission "<>", "read,write,delete"; - permission java.lang.RuntimePermission "fileSystemProvider"; - permission java.util.PropertyPermission "os.name", "read"; -}; - -// permissions needed by applications using java.desktop module -grant { - permission java.lang.RuntimePermission "accessClassInPackage.com.sun.beans"; - permission java.lang.RuntimePermission "accessClassInPackage.com.sun.beans.*"; - permission java.lang.RuntimePermission "accessClassInPackage.com.sun.java.swing.plaf.*"; - permission java.lang.RuntimePermission "accessClassInPackage.com.apple.*"; -}; diff --git a/jre-11/lib/security/public_suffix_list.dat b/jre-11/lib/security/public_suffix_list.dat deleted file mode 100644 index 9b0f023df..000000000 Binary files a/jre-11/lib/security/public_suffix_list.dat and /dev/null differ diff --git a/jre-11/lib/server/Xusage.txt b/jre-11/lib/server/Xusage.txt deleted file mode 100644 index 8940af8fd..000000000 --- a/jre-11/lib/server/Xusage.txt +++ /dev/null @@ -1,22 +0,0 @@ - -Xmixed mixed mode execution (default) - -Xint interpreted mode execution only - -Xbootclasspath: - set search path for bootstrap classes and resources - -Xbootclasspath/a: - append to end of bootstrap class path - -Xbootclasspath/p: - prepend in front of bootstrap class path - -Xnoclassgc disable class garbage collection - -Xlog: control JVM logging, use -Xlog:help for details - -Xbatch disable background compilation - -Xms set initial Java heap size - -Xmx set maximum Java heap size - -Xss set java thread stack size - -Xfuture enable strictest checks, anticipating future default - -Xrs reduce use of OS signals by Java/VM (see documentation) - -Xcheck:jni perform additional checks for JNI functions - -Xshare:off do not attempt to use shared class data - -Xshare:auto use shared class data if possible (default) - -Xshare:on require using shared class data, otherwise fail. - -The -X options are non-standard and subject to change without notice. diff --git a/jre-11/lib/server/libjsig.so b/jre-11/lib/server/libjsig.so deleted file mode 100644 index 9f1e9dab7..000000000 Binary files a/jre-11/lib/server/libjsig.so and /dev/null differ diff --git a/jre-11/lib/server/libjvm.so b/jre-11/lib/server/libjvm.so deleted file mode 100644 index f0f8ad830..000000000 Binary files a/jre-11/lib/server/libjvm.so and /dev/null differ diff --git a/jre-11/lib/tzdb.dat b/jre-11/lib/tzdb.dat deleted file mode 100644 index c1174d6af..000000000 Binary files a/jre-11/lib/tzdb.dat and /dev/null differ diff --git a/jre-11/release b/jre-11/release deleted file mode 100644 index 52a9e8538..000000000 --- a/jre-11/release +++ /dev/null @@ -1,2 +0,0 @@ -JAVA_VERSION="11" -MODULES="java.base java.datatransfer java.xml java.prefs java.desktop java.instrument java.logging java.management java.security.sasl java.naming java.security.jgss java.transaction.xa java.sql jdk.management jdk.unsupported" diff --git a/libs/huaweicloud-java-sdk-sis-1.3.2.jar b/libs/huaweicloud-java-sdk-sis-1.3.2.jar new file mode 100644 index 000000000..6dbc4e8c1 Binary files /dev/null and b/libs/huaweicloud-java-sdk-sis-1.3.2.jar differ diff --git a/libs/java-sdk-core-3.0.12.jar b/libs/java-sdk-core-3.0.12.jar new file mode 100644 index 000000000..eb9916e24 Binary files /dev/null and b/libs/java-sdk-core-3.0.12.jar differ diff --git a/mvnw b/mvnw index a16b5431b..61a449885 100644 --- a/mvnw +++ b/mvnw @@ -161,7 +161,7 @@ fi CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher -# traverses directory structure from process work directory to filesystem root +# traverses directory structure from mean work directory to filesystem root # first directory with .mvn subdirectory is considered project base directory find_maven_basedir() { diff --git a/pom.xml b/pom.xml index 0e2488f30..0c1022f8b 100644 --- a/pom.xml +++ b/pom.xml @@ -59,18 +59,6 @@ spring-boot-starter-aop - - - io.springfox - springfox-swagger2 - 3.0.0 - - - io.springfox - springfox-swagger-ui - 3.0.0 - - io.netty netty-all @@ -81,6 +69,12 @@ 1.1.1 + + + com.github.oshi + oshi-core-java11 + 5.7.5 + mysql mysql-connector-java @@ -108,33 +102,75 @@ 0.2.1 - - - - - + + com.huawei.sis + huaweicloud-java-sdk-sis + 1.3.2 + system + ${project.basedir}/libs/huaweicloud-java-sdk-sis-1.3.2.jar + + + + com.huawei.apigateway + java-sdk-core + 3.0.12 + system + ${project.basedir}/libs/java-sdk-core-3.0.12.jar + + + + com.squareup.okhttp3 + okhttp + 3.14.2 + + + + joda-time + joda-time + 2.10.3 + - - - - - - - - - - - - - - org.springframework.boot spring-boot-maven-plugin + + true + + + + + com.github.shalousun + smart-doc-maven-plugin + 2.1.9 + + + ./src/main/resources/smart-doc.json + + + + + + + + + + + + + + + + + + + html + + + diff --git a/sql/20201123.sql b/sql/20201123.sql deleted file mode 100644 index 69bf368f1..000000000 --- a/sql/20201123.sql +++ /dev/null @@ -1,17 +0,0 @@ -alter table map_data - add version varchar(8) default 0.1 not null comment '版本号'; - -drop table map_version; - -alter table map_data - add time timestamp default now() not null comment '发布时间'; - -alter table map_data - add user_id bigint null comment '发布者的id'; - -alter table map_info - add version varchar(8) default 0.1 not null comment '该地图正在使用的地图数据的版本'; - - - - diff --git a/sql/20201201.sql b/sql/20201201.sql deleted file mode 100644 index 75f040182..000000000 --- a/sql/20201201.sql +++ /dev/null @@ -1,3 +0,0 @@ -alter table company - add managers varchar(32) null comment '公司管理者'; - diff --git a/sql/20201203.sql b/sql/20201203.sql deleted file mode 100644 index 891170a97..000000000 --- a/sql/20201203.sql +++ /dev/null @@ -1,7 +0,0 @@ -ALTER TABLE `training` - ADD INDEX `map_id` (`map_id`); - -alter table company drop column managers; - -alter table sys_user drop foreign key FK_sys_user_company; - diff --git a/sql/20201204.sql b/sql/20201204.sql deleted file mode 100644 index 5628bd80a..000000000 --- a/sql/20201204.sql +++ /dev/null @@ -1,72 +0,0 @@ -CREATE TABLE `run_plan_routing` ( - `id` BIGINT(20) NOT NULL AUTO_INCREMENT, - `map_id` BIGINT(20) NOT NULL COMMENT '地图ID', - `user_id` BIGINT(20) NOT NULL, - `name` VARCHAR(64) NOT NULL COMMENT '名称' COLLATE 'utf8_general_ci', - `code` VARCHAR(32) NOT NULL COMMENT '编号' COLLATE 'utf8_general_ci', - `type` VARCHAR(32) NOT NULL COMMENT '交路类型', - `start_station_code` VARCHAR(32) NOT NULL COMMENT '起始车站' COLLATE 'utf8_general_ci', - `start_section_code` VARCHAR(32) NOT NULL COMMENT '起始站台' COLLATE 'utf8_general_ci', - `end_station_code` VARCHAR(32) NOT NULL COMMENT '终点车站' COLLATE 'utf8_general_ci', - `end_section_code` VARCHAR(32) NOT NULL COMMENT '终点站台' COLLATE 'utf8_general_ci', - `right` TINYINT(1) NULL DEFAULT '0' COMMENT '左右行方向', - `destination_code` VARCHAR(45) NULL DEFAULT NULL COMMENT '目的地码' COLLATE 'utf8_general_ci', - `remarks` VARCHAR(512) NULL DEFAULT NULL COMMENT '描述' COLLATE 'utf8_general_ci', - `section_data` LONGTEXT NOT NULL COMMENT '区段数据' COLLATE 'utf8_general_ci', - PRIMARY KEY (`id`), - INDEX `map_id_user_id` (`map_id`, `user_id`) -) -COMMENT='运行图用户交路' -COLLATE='utf8_general_ci' -ENGINE=InnoDB -; -CREATE TABLE `run_plan_runlevel` ( - `id` BIGINT(20) NOT NULL AUTO_INCREMENT, - `map_id` BIGINT(20) NOT NULL COMMENT '地图id', - `user_id` BIGINT(20) NOT NULL COMMENT '用户id', - `start_station_code` VARCHAR(32) NOT NULL COMMENT '起始车站' COLLATE 'utf8_general_ci', - `start_section_code` VARCHAR(32) NOT NULL COMMENT '起始站台' COLLATE 'utf8_general_ci', - `end_station_code` VARCHAR(32) NOT NULL COMMENT '终点车站' COLLATE 'utf8_general_ci', - `end_section_code` VARCHAR(32) NOT NULL COMMENT '终点站台' COLLATE 'utf8_general_ci', - `right` TINYINT(1) NOT NULL COMMENT '方向', - `distance` FLOAT NOT NULL COMMENT '距离（米）', - `level1` INT(11) NOT NULL COMMENT '等级一（s）', - `level2` INT(11) NOT NULL COMMENT '等级二（s）', - `level3` INT(11) NOT NULL COMMENT '等级三（s）', - `level4` INT(11) NOT NULL COMMENT '等级四（s）', - `level5` INT(11) NOT NULL COMMENT '等级五（s）', - PRIMARY KEY (`id`), - INDEX `map_id_user_id` (`map_id`, `user_id`) -) -COMMENT='运行图用户站间运行等级' -COLLATE='utf8_general_ci' -ENGINE=InnoDB -; -CREATE TABLE `run_plan_parktime` ( - `id` BIGINT(20) NOT NULL AUTO_INCREMENT, - `map_id` BIGINT(20) NOT NULL COMMENT '所属地图id', - `user_id` BIGINT(20) NOT NULL COMMENT '用户id', - `station_code` VARCHAR(32) NOT NULL COMMENT '车站code' COLLATE 'utf8_general_ci', - `section_code` VARCHAR(32) NOT NULL COMMENT '区段code' COLLATE 'utf8_general_ci', - `parking_time` INT(11) NOT NULL DEFAULT '30' COMMENT '停站时间s', - PRIMARY KEY (`id`), - INDEX `map_id_user_id` (`map_id`, `user_id`) -) -COMMENT='运行图用户车站停站时间' -COLLATE='utf8_general_ci' -ENGINE=InnoDB -; -CREATE TABLE `run_plan_user_config` ( - `id` BIGINT(20) NOT NULL AUTO_INCREMENT, - `map_id` BIGINT(20) NOT NULL COMMENT '所属地图id', - `user_id` BIGINT(20) NOT NULL COMMENT '用户id', - `config` LONGTEXT NOT NULL COMMENT '折返车站code' COLLATE 'utf8_general_ci', - PRIMARY KEY (`id`), - INDEX `map_id_user_id` (`map_id`, `user_id`) -) -COMMENT='运行图用户配置数据' -COLLATE='utf8_general_ci' -ENGINE=InnoDB -; - - diff --git a/sql/20201208.sql b/sql/20201208.sql deleted file mode 100644 index 7afd45450..000000000 --- a/sql/20201208.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table user_simulation_stats modify role varchar(64) null comment '用户角色'; - diff --git a/sql/20201216-dukang.sql b/sql/20201216-dukang.sql deleted file mode 100644 index bfef2a69a..000000000 --- a/sql/20201216-dukang.sql +++ /dev/null @@ -1,11 +0,0 @@ -ALTER TABLE `map_passenger_flow` - ADD COLUMN `name` VARCHAR(50) NOT NULL DEFAULT '默认' COMMENT '客流数据描述名称' AFTER `map_id`, -ADD COLUMN `initial` TINYINT(1) NOT NULL DEFAULT 1 COMMENT '初始默认数据' AFTER `trip_pf`; -ALTER TABLE `draft_ibp` - ALTER `station_code` DROP DEFAULT; -ALTER TABLE `draft_ibp` - CHANGE COLUMN `station_code` `station_code` VARCHAR(32) NULL COMMENT '车站编号' COLLATE 'utf8_general_ci' AFTER `map_id`; -ALTER TABLE `ibp` - ALTER `station_code` DROP DEFAULT; -ALTER TABLE `ibp` -CHANGE COLUMN `station_code` `station_code` VARCHAR(32) NULL COMMENT '车站编号' COLLATE 'utf8_general_ci' AFTER `map_id`; diff --git a/sql/20201229-zhangsai.sql b/sql/20201229-zhangsai.sql deleted file mode 100644 index e3c8c5f89..000000000 --- a/sql/20201229-zhangsai.sql +++ /dev/null @@ -1,9 +0,0 @@ -alter table iscs drop key line_code_station_code_total_system_system_interface; - -alter table iscs drop column line_code; - -alter table iscs drop column station_code; - -alter table iscs - add map_id bigint not null after id; - diff --git a/sql/20210108-dukang.sql b/sql/20210108-dukang.sql deleted file mode 100644 index 6c6bfd83c..000000000 --- a/sql/20210108-dukang.sql +++ /dev/null @@ -1,102 +0,0 @@ - -ALTER TABLE `sys_user` - DROP COLUMN `company_id`; - -CREATE TABLE `company_department` ( - `id` INT(11) NOT NULL AUTO_INCREMENT, - `name` VARCHAR(32) NOT NULL COMMENT '部门名称' COLLATE 'utf8_general_ci', - `company_id` INT(11) NOT NULL COMMENT '单位id', - `parent_id` INT(11) NULL DEFAULT NULL COMMENT '父级id', - PRIMARY KEY (`id`), - INDEX `FK_company_department_company` (`company_id`), - INDEX `FK_company_department_company_department` (`parent_id`), - CONSTRAINT `FK_company_department_company` FOREIGN KEY (`company_id`) REFERENCES `company` (`id`) ON DELETE CASCADE, - CONSTRAINT `FK_company_department_company_department` FOREIGN KEY (`parent_id`) REFERENCES `company_department` (`id`) ON DELETE SET NULL -) -COMMENT='单位部门信息' -COLLATE='utf8_general_ci' -ENGINE=InnoDB -; -CREATE TABLE `company_position` ( - `id` INT(11) NOT NULL AUTO_INCREMENT, - `name` VARCHAR(32) NOT NULL COMMENT '职位名称' COLLATE 'utf8_general_ci', - `company_id` INT(11) NOT NULL COMMENT '单位id', - PRIMARY KEY (`id`), - INDEX `FK_company_position_company` (`company_id`), - CONSTRAINT `FK_company_position_company` FOREIGN KEY (`company_id`) REFERENCES `company` (`id`) ON DELETE CASCADE -) -COMMENT='单位职位信息' -COLLATE='utf8_general_ci' -ENGINE=InnoDB -; -CREATE TABLE `company_user` ( - `company_id` INT(11) NOT NULL COMMENT '公司id', - `user_id` BIGINT(20) NOT NULL COMMENT '用户id', - `admin` TINYINT(1) NOT NULL DEFAULT '0' COMMENT '公司管理员', - UNIQUE INDEX `user_id` (`user_id`), - INDEX `FK_company_user_company` (`company_id`), - CONSTRAINT `FK_company_user_company` FOREIGN KEY (`company_id`) REFERENCES `company` (`id`) ON DELETE CASCADE, - CONSTRAINT `FK_company_user_sys_user` FOREIGN KEY (`user_id`) REFERENCES `sys_user` (`id`) ON DELETE CASCADE -) -COMMENT='单位用户关系' -COLLATE='utf8_general_ci' -ENGINE=InnoDB -; -CREATE TABLE `department_user` ( - `id` BIGINT(20) NOT NULL AUTO_INCREMENT, - `user_id` BIGINT(20) NOT NULL COMMENT '用户id', - `department_id` INT(11) NOT NULL COMMENT '部门id', - `position_id` INT(11) NULL DEFAULT NULL COMMENT '职位id', - `manager` TINYINT(1) NOT NULL DEFAULT '0' COMMENT '部门管理员', - `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - PRIMARY KEY (`id`), - INDEX `FK_department_user_company_position` (`position_id`), - INDEX `FK_department_user_sys_user` (`user_id`), - INDEX `FK_department_user_company_department` (`department_id`), - CONSTRAINT `FK_department_user_company_department` FOREIGN KEY (`department_id`) REFERENCES `company_department` (`id`) ON DELETE CASCADE, - CONSTRAINT `FK_department_user_company_position` FOREIGN KEY (`position_id`) REFERENCES `company_position` (`id`) ON DELETE SET NULL, - CONSTRAINT `FK_department_user_sys_user` FOREIGN KEY (`user_id`) REFERENCES `sys_user` (`id`) ON DELETE CASCADE -) -COMMENT='用户、部门关联表' -COLLATE='utf8_general_ci' -ENGINE=InnoDB -; -CREATE TABLE `department_lesson` ( - `lesson_id` BIGINT(20) NOT NULL COMMENT '课程id', - `department_id` INT(11) NOT NULL COMMENT '班级id', - INDEX `lesson_id` (`lesson_id`), - INDEX `department_lesson_ibfk_1` (`department_id`), - CONSTRAINT `department_lesson_ibfk_1` FOREIGN KEY (`department_id`) REFERENCES `company_department` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE, - CONSTRAINT `department_lesson_ibfk_2` FOREIGN KEY (`lesson_id`) REFERENCES `ls_lesson` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE -) -COMMENT='班级课程表' -COLLATE='utf8_general_ci' -ENGINE=InnoDB -; -CREATE TABLE `department_exam` ( - `exam_id` BIGINT(20) NOT NULL, - `department_id` INT(11) NOT NULL, - INDEX `exam_id` (`exam_id`), - INDEX `department_exam_ibfk_2` (`department_id`), - CONSTRAINT `department_exam_ibfk_1` FOREIGN KEY (`exam_id`) REFERENCES `exam_definition` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE, - CONSTRAINT `department_exam_ibfk_2` FOREIGN KEY (`department_id`) REFERENCES `company_department` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE -) -COMMENT='学生的试卷和班级关系' -COLLATE='utf8_general_ci' -ENGINE=InnoDB -; - - - -DROP TABLE `user_company_rel`; - -ALTER TABLE `company` - ADD COLUMN `project_code` VARCHAR(64) NULL DEFAULT NULL COMMENT '关联项目' AFTER `phone`; - - - - - - - diff --git a/sql/20210112-dukang.sql b/sql/20210112-dukang.sql deleted file mode 100644 index af9efca74..000000000 --- a/sql/20210112-dukang.sql +++ /dev/null @@ -1,567 +0,0 @@ --- 创建贵装备单位 -INSERT INTO `joylink`.`company` (`id`,`name`, `address`, `create_time`, `project_code`) VALUES ('6','贵州装备', '贵州', '2021-01-11 17:08:06', 'GZB'); - - --- 创建贵装备班级 -INSERT INTO `company_department` (`id`, `name`, `company_id`) VALUES (14, '19城轨2班', 6); -INSERT INTO `company_department` (`id`, `name`, `company_id`) VALUES (9, '城轨1班', 6); -INSERT INTO `company_department` (`id`, `name`, `company_id`) VALUES (16, '19城轨机电2班', 6); -INSERT INTO `company_department` (`id`, `name`, `company_id`) VALUES (17, '19城轨机电1班', 6); -INSERT INTO `company_department` (`id`, `name`, `company_id`) VALUES (12, '18城市轨道交通机电技术2班', 6); -INSERT INTO `company_department` (`id`, `name`, `company_id`) VALUES (11, '18城市轨道交通机电技术1班', 6); -INSERT INTO `company_department` (`id`, `name`, `company_id`) VALUES (13, '18城市轨道交通机电技术3班', 6); - --- 创建单位成员 -INSERT INTO `company_user` (`company_id`, `user_id`, `admin`) VALUES (6, 620, 1); -INSERT INTO `company_user` (`company_id`, `user_id`, `admin`) VALUES (6, 628, 1); -INSERT INTO `company_user` (`company_id`, `user_id`, `admin`) VALUES (6, 630, 1); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 842); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 843); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 844); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 884); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 885); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 886); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 887); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 888); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 889); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 890); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 891); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 892); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 893); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 894); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 895); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 896); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 897); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 898); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 899); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 900); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 901); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 902); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 903); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 904); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 905); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 906); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 907); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 908); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 909); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 910); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 911); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 912); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 913); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 914); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 915); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 916); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 917); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 918); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 919); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 920); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 921); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 922); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 923); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 924); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 925); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 926); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 927); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 928); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 929); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 930); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 931); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 932); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 933); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 934); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 935); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 936); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 937); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 938); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 939); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 940); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 941); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 942); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 943); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 944); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 945); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 946); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 947); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 948); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 949); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 950); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 951); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 952); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 953); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 954); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 955); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 956); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 957); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 958); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 959); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 960); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 961); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 962); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 963); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 964); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 965); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 966); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 967); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 968); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 969); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 970); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 971); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 972); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 973); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 974); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 975); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 976); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 977); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 978); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 979); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 980); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 981); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 982); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 983); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 984); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 985); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 986); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 987); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 988); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 989); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 990); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 991); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 992); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 993); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 994); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 995); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 996); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 997); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 998); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 999); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1000); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1001); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1002); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1003); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1004); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1005); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1006); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1007); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1008); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1009); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1010); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1011); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1012); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1013); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1014); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1015); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1016); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 1017); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2654); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2655); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2656); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2658); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2659); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2697); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2698); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2699); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2700); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2701); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2702); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2703); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2704); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2705); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2706); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2707); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2708); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2709); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2710); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2711); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2712); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2713); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2714); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2715); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2716); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2717); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2718); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2719); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2720); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2721); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2722); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2723); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2724); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2725); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2726); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2727); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2728); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2729); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2730); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2731); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2732); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2733); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2734); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2735); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2736); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2737); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2738); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2739); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2740); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2741); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2742); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2743); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2744); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2745); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2746); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2747); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 2748); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3026); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3027); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3028); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3029); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3030); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3031); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3032); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3033); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3034); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3035); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3036); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3037); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3038); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3039); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3040); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3041); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3042); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3043); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3044); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3045); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3046); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3047); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3048); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3049); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3050); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3051); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3052); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3053); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3054); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3055); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3056); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3057); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3058); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3059); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3060); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3061); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3062); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3063); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3064); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3065); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3066); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3067); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3068); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3069); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3070); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3071); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3072); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3073); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3074); -INSERT INTO `company_user` (`company_id`, `user_id`) VALUES (6, 3075); - --- 创建部门成员关系 -INSERT INTO `department_user` (`department_id`, `user_id`, `manager`) VALUES (9, 620, 1); -INSERT INTO `department_user` (`department_id`, `user_id`, `manager`) VALUES (14, 620, 1); -INSERT INTO `department_user` (`department_id`, `user_id`, `manager`) VALUES (16, 620, 1); -INSERT INTO `department_user` (`department_id`, `user_id`, `manager`) VALUES (17, 628, 1); -INSERT INTO `department_user` (`department_id`, `user_id`, `manager`) VALUES (11, 630, 1); -INSERT INTO `department_user` (`department_id`, `user_id`, `manager`) VALUES (12, 630, 1); -INSERT INTO `department_user` (`department_id`, `user_id`, `manager`) VALUES (13, 630, 1); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (9, 842); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (9, 843); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (9, 844); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 884); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 885); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 886); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 887); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 888); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 889); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 890); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 891); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 892); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 893); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 894); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 895); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 896); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 897); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 898); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 899); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 900); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 901); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 902); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 903); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 904); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 905); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 906); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 907); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 908); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 909); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 910); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 911); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 912); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 913); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 914); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 915); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 916); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 917); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 918); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 919); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 920); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 921); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 922); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 923); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 924); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 925); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 926); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (11, 927); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 928); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 929); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 930); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 931); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 932); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 933); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 934); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 935); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 936); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 937); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 938); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 939); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 940); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 941); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 942); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 943); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 944); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 945); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 946); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 947); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 948); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 949); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 950); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 951); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 952); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 953); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 954); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 955); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 956); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 957); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 958); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 959); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 960); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 961); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 962); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 963); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 964); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 965); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 966); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 967); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 968); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (12, 969); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 970); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 971); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 972); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 973); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 974); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 975); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 976); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 977); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 978); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 979); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 980); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 981); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 982); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 983); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 984); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 985); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 986); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 987); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 988); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 989); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 990); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 991); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 992); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 993); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 994); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 995); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 996); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 997); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 998); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 999); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1000); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1001); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1002); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1003); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1004); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1005); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1006); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1007); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1008); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1009); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1010); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1011); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1012); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1013); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1014); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1015); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1016); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (13, 1017); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (14, 2654); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (14, 2655); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (14, 2656); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (14, 2658); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (14, 2659); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2697); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2698); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2699); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2700); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2701); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2702); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2703); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2704); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2705); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2706); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2707); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2708); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2709); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2710); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2711); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2712); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2713); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2714); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2715); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2716); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2717); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2718); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2719); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2720); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2721); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2722); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2723); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2724); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2725); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2726); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2727); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2728); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2729); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2730); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2731); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2732); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2733); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2734); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2735); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2736); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2737); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2738); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2739); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2740); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2741); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2742); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2743); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2744); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2745); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2746); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2747); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (16, 2748); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3026); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3027); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3028); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3029); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3030); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3031); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3032); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3033); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3034); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3035); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3036); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3037); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3038); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3039); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3040); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3041); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3042); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3043); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3044); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3045); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3046); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3047); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3048); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3049); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3050); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3051); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3052); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3053); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3054); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3055); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3056); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3057); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3058); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3059); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3060); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3061); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3062); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3063); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3064); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3065); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3066); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3067); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3068); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3069); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3070); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3071); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3072); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3073); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3074); -INSERT INTO `department_user` (`department_id`, `user_id`) VALUES (17, 3075); - --- 部门课程关系 -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (47, 11); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (48, 11); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (47, 12); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (48, 12); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (47, 13); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (48, 13); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (107, 14); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (109, 14); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (110, 14); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (111, 14); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (117, 14); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (115, 16); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (116, 16); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (118, 16); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (123, 16); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (126, 16); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (127, 16); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (119, 17); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (122, 17); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (128, 17); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (129, 17); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (130, 17); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (131, 17); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (132, 17); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (133, 17); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (134, 17); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (135, 17); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (136, 17); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (137, 17); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (138, 17); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (139, 17); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (140, 17); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (141, 17); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (143, 17); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (144, 17); -INSERT INTO `department_lesson` (`lesson_id`, `department_id`) VALUES (145, 17); - - --- 部门考试关系 -INSERT INTO `department_exam` (`exam_id`, `department_id`) VALUES (172, 16); -INSERT INTO `department_exam` (`exam_id`, `department_id`) VALUES (173, 16); -INSERT INTO `department_exam` (`exam_id`, `department_id`) VALUES (174, 16); -INSERT INTO `department_exam` (`exam_id`, `department_id`) VALUES (177, 16); -INSERT INTO `department_exam` (`exam_id`, `department_id`) VALUES (178, 16); -INSERT INTO `department_exam` (`exam_id`, `department_id`) VALUES (179, 17); -INSERT INTO `department_exam` (`exam_id`, `department_id`) VALUES (180, 17); -INSERT INTO `department_exam` (`exam_id`, `department_id`) VALUES (181, 17); -INSERT INTO `department_exam` (`exam_id`, `department_id`) VALUES (182, 17); -INSERT INTO `department_exam` (`exam_id`, `department_id`) VALUES (183, 17); -INSERT INTO `department_exam` (`exam_id`, `department_id`) VALUES (186, 17); -INSERT INTO `department_exam` (`exam_id`, `department_id`) VALUES (187, 17); diff --git a/sql/20210113-shengxuqiang.sql b/sql/20210113-shengxuqiang.sql deleted file mode 100644 index 762782bd0..000000000 --- a/sql/20210113-shengxuqiang.sql +++ /dev/null @@ -1,4 +0,0 @@ -ALTER TABLE `draft_map_route_flank_protection` -DROP COLUMN `station_code`, -DROP COLUMN `number`; - diff --git a/sql/20210128-zhangsai.sql b/sql/20210128-zhangsai.sql deleted file mode 100644 index 4bc96647d..000000000 --- a/sql/20210128-zhangsai.sql +++ /dev/null @@ -1,3 +0,0 @@ -alter table sale_order - add transaction_id varchar(32) null comment '支付平台订单号'; - diff --git a/sql/20210303-zhangsai.sql b/sql/20210303-zhangsai.sql deleted file mode 100644 index af7422c41..000000000 --- a/sql/20210303-zhangsai.sql +++ /dev/null @@ -1,9 +0,0 @@ -alter table learn_comment - add user_name varchar(32) null comment '给成都工业临时加的'; - -alter table learn_message - add user_name varchar(32) null comment '给成都工业临时加的'; - -alter table learn_message modify creator_id bigint null comment '留言者'; - -alter table learn_comment modify creator_id bigint null comment '创建者'; diff --git a/sql/20210312-zhangsai.sql b/sql/20210312-zhangsai.sql deleted file mode 100644 index 389eab16a..000000000 --- a/sql/20210312-zhangsai.sql +++ /dev/null @@ -1,43 +0,0 @@ --- auto-generated definition -create table cgy_record -( - id int not null - primary key, - browse_count int null comment '浏览次数', - download_count int null comment '百度网盘链接打开次数' -) - comment '成都工业项目使用记录'; - --- 课程表删city_code - alter table ls_lesson drop column city_code; - --- 组织表添加字段 -alter table org - add creator_id bigint not null comment '创建者'; - -alter table org - add create_time datetime default current_timestamp not null comment '创建时间'; - - alter table org - add update_id bigint null comment '更新者'; - -alter table org - add update_time datetime null comment '更新时间'; - --- 添加组织评价规则表 -CREATE TABLE `org_scoring_rule` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT, - `org_id` int(11) NOT NULL COMMENT '组织（班级）id', - `school_year` varchar(16) NOT NULL COMMENT '学年', - `term` int(1) NOT NULL COMMENT '学期', - `usual_scoring_rule` text COMMENT '平时分评分规则', - `final_scoring_rule` text COMMENT '期末分评分规则', - `creator_id` bigint(20) NOT NULL COMMENT '创建人id', - `create_time` datetime NOT NULL COMMENT '创建时间', - `update_id` bigint(20) DEFAULT NULL COMMENT '更新者id', - `update_time` datetime DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COMMENT='组织评分规则'; - - - diff --git a/sql/20210315-sheng-project-server.sql b/sql/20210315-sheng-project-server.sql deleted file mode 100644 index 776d20a26..000000000 --- a/sql/20210315-sheng-project-server.sql +++ /dev/null @@ -1,12 +0,0 @@ -DROP TABLE IF EXISTS `project_server`; -CREATE TABLE `project_server` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT, - `project` varchar(32) NOT NULL COMMENT '项目编码', - `domain_name` varchar(255) NOT NULL COMMENT '域名', - `create_user_id` bigint(20) NOT NULL, - `create_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP, - `update_user_id` bigint(20) DEFAULT NULL, - `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - UNIQUE KEY `project_server_project_1` (`project`) -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COMMENT='项目服务器域名表'; \ No newline at end of file diff --git a/sql/20210322-zhangsai.sql b/sql/20210322-zhangsai.sql deleted file mode 100644 index 9fd19e1db..000000000 --- a/sql/20210322-zhangsai.sql +++ /dev/null @@ -1,15 +0,0 @@ --- 评价规则表添加字段 -alter table org_scoring_rule - add `name` varchar(64) not null comment '名称' after id; - --- 创建表 -create table org_scoring_rule_rel -( - org_id int not null, - rule_id bigint not null -) -comment '班级与评价规则关联表'; - --- 组织表添加字段 -alter table org - add status varchar(1) not null comment '状态'; diff --git a/sql/20210324-zhangsai.sql b/sql/20210324-zhangsai.sql deleted file mode 100644 index 9e4cd0fe6..000000000 --- a/sql/20210324-zhangsai.sql +++ /dev/null @@ -1,59 +0,0 @@ -alter table org_lesson - add creator_id bigint not null comment '创建人id', - add create_time datetime default current_timestamp not null comment '创建时间'; - --- 删除外键 -alter table org drop foreign key FK_company_department_company_department1; - -alter table org_lesson drop foreign key org_lesson_ibfk_1; - -alter table org_lesson drop foreign key org_lesson_ibfk_2; - -alter table org_user drop foreign key FK_department_user_company_department1; - -alter table org_user drop foreign key FK_department_user_sys_use1r; - -alter table org_exam drop foreign key org_exam_ibfk_1; - -alter table org_exam drop foreign key org_exam_ibfk_2; - --- 修改id数据类型 -alter table org modify id bigint auto_increment; - -alter table org modify parent_id bigint null comment '父级id'; - -alter table org modify root_id bigint null comment '单位id'; - -alter table race_question_progress modify company_id bigint null; - -alter table race_result modify company_id bigint null comment '公司id'; - -alter table race_question modify company_id bigint null comment '公司题库'; - -alter table race_questions_rules modify company_id bigint null; - -alter table org_scoring_rule_rel modify org_id bigint not null; - -alter table org_lesson modify org_id bigint not null comment '班级id'; - -alter table org_scoring_rule modify org_id bigint not null comment '该规则属于哪个顶级组织'; - -alter table org_user modify org_id bigint not null comment '部门id'; - --- 添加字段 -alter table org_scoring_rule_rel - add rule_org_id bigint not null comment '规则关联的顶级组织id', - add rule_school_year varchar(16) not null comment '规则所属学年', - add rule_term int(1) not null comment '规则所属学期', - add rule_creator_id bigint not null comment '创建者id'; - - - - - - - - - - - diff --git a/sql/20210326-zhangsai.sql b/sql/20210326-zhangsai.sql deleted file mode 100644 index cff57bbca..000000000 --- a/sql/20210326-zhangsai.sql +++ /dev/null @@ -1,26 +0,0 @@ -alter table exam_definition modify lesson_id bigint null comment '所属课程ID', - add map_id bigint not null comment '地图id' after id; - --- 更新exam_definition的map_id字段 -UPDATE exam_definition SET map_id =( SELECT map_id FROM ls_lesson WHERE exam_definition.lesson_id = ls_lesson.id); --- 更新exam_definition的type字段 -UPDATE exam_definition SET type =( SELECT prd_type FROM ls_lesson WHERE exam_definition.lesson_id = ls_lesson.id); - -alter table org_exam - modify org_id bigint not null, - add creator_id bigint not null, - add create_time datetime not null; - -ALTER TABLE `org_exam` -ADD COLUMN `id` bigint(20) NOT NULL AUTO_INCREMENT FIRST , -ADD PRIMARY KEY (`id`); - --- org_lesson表添加主键 -ALTER TABLE `org_lesson` -ADD COLUMN `id` bigint(20) NOT NULL AUTO_INCREMENT FIRST , -ADD PRIMARY KEY (`id`); - - - - - diff --git a/sql/20210401-zhangsai.sql b/sql/20210401-zhangsai.sql deleted file mode 100644 index 239f8015d..000000000 --- a/sql/20210401-zhangsai.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table sys_user - add org_id bigint null comment '所属组织id' after account; diff --git a/sql/20210512-yuan.sql b/sql/20210512-yuan.sql new file mode 100644 index 000000000..7b57dbc66 --- /dev/null +++ b/sql/20210512-yuan.sql @@ -0,0 +1,19 @@ + +CREATE TABLE `docu_document_draft` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `title` varchar(50) NOT NULL COMMENT '标题', + `content` longtext NOT NULL COMMENT '内容', + `create_user_id` bigint NOT NULL COMMENT '创建用户', + `create_time` datetime NOT NULL COMMENT '创建时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `docu_document` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `title` varchar(50) NOT NULL COMMENT '标题', + `content` longtext NOT NULL COMMENT '内容', + `publish_user_id` bigint NOT NULL COMMENT '发布用户', + `publish_time` datetime NOT NULL COMMENT '发布时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + diff --git a/sql/20210517-zhangsai.sql b/sql/20210517-zhangsai.sql new file mode 100644 index 000000000..7c674d5a4 --- /dev/null +++ b/sql/20210517-zhangsai.sql @@ -0,0 +1,20 @@ +CREATE TABLE `file` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `file_name` varchar(255) NOT NULL, + `file_path` varchar(255) NOT NULL, + `file_type` varchar(255) NOT NULL, + `create_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP, + `creator` bigint(20) NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; + +CREATE TABLE `file_binding` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `file_id` bigint(20) NOT NULL, + `map_id` bigint(20) NOT NULL, + `device_types` varchar(255) DEFAULT NULL, + `device_ids` varchar(10000) DEFAULT NULL, + `creator` bigint(20) NOT NULL, + `create_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8; diff --git a/sql/20210519-zhangsai.sql b/sql/20210519-zhangsai.sql new file mode 100644 index 000000000..293568296 --- /dev/null +++ b/sql/20210519-zhangsai.sql @@ -0,0 +1,5 @@ +ALTER TABLE `permission_distribute` +ADD COLUMN `creator_id` bigint NULL AFTER `from_user_permission_id`; + +alter table user_permission + add create_time datetime default current_timestamp not null; diff --git a/sql/20210520-sheng.sql b/sql/20210520-sheng.sql new file mode 100644 index 000000000..912071354 --- /dev/null +++ b/sql/20210520-sheng.sql @@ -0,0 +1,3 @@ +ALTER TABLE `draft_map_parking_time` +CHANGE COLUMN `section_parking_time` `section_code` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '区段code' AFTER `station_code`, +ADD COLUMN `parking_time` int NOT NULL COMMENT '停站时间' AFTER `section_code`; diff --git a/sql/20210601-thesai.sql b/sql/20210601-thesai.sql new file mode 100644 index 000000000..9633df543 --- /dev/null +++ b/sql/20210601-thesai.sql @@ -0,0 +1,3 @@ +ALTER TABLE `run_plan_load` +ADD COLUMN `load_rule` varchar(32) NULL DEFAULT 'EVERY_DAY' AFTER `load_time`; + diff --git a/sql/20210607-sheng.sql b/sql/20210607-sheng.sql new file mode 100644 index 000000000..39bfbd84f --- /dev/null +++ b/sql/20210607-sheng.sql @@ -0,0 +1,19 @@ +ALTER TABLE `sys_user` RENAME `sys_account`; + +ALTER TABLE `sys_user_login` RENAME `sys_account_login`; + +ALTER TABLE `sys_account` +ADD COLUMN `type` varchar(2) NOT NULL DEFAULT 1 COMMENT '账号类型：1-个人账户；2-企业账户' AFTER `account`; + +ALTER TABLE `sys_account` +DROP COLUMN `offline`; + +ALTER TABLE `sys_account` +MODIFY COLUMN `account` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '账户' AFTER `id`; + +ALTER TABLE `sys_account` +MODIFY COLUMN `type` varchar(2) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '1' COMMENT '账号类型：1-个人账户；2-企业账户；3-企业账户下子账户' AFTER `account`; + +ALTER TABLE `sys_account` +ADD COLUMN `parent_account` varchar(32) NULL COMMENT '父企业账户account,当为企业子账户时不能为空' AFTER `account`; + diff --git a/sql/20210607-thesai.sql b/sql/20210607-thesai.sql new file mode 100644 index 000000000..b2a0f6544 --- /dev/null +++ b/sql/20210607-thesai.sql @@ -0,0 +1,3 @@ +ALTER TABLE `user_simulation_stats` +ADD COLUMN `end_time` datetime NOT NULL DEFAULT '1970-01-01 01:01:01' ON UPDATE CURRENT_TIMESTAMP AFTER `fake`; + diff --git a/sql/20210616-thesai.sql b/sql/20210616-thesai.sql new file mode 100644 index 000000000..e2011f283 --- /dev/null +++ b/sql/20210616-thesai.sql @@ -0,0 +1,3 @@ +ALTER TABLE `map_data` +ADD COLUMN `note` varchar(255) NULL COMMENT '备注' AFTER `version`; + diff --git a/sql/20210621-sheng.sql b/sql/20210621-sheng.sql new file mode 100644 index 000000000..e0b81098b --- /dev/null +++ b/sql/20210621-sheng.sql @@ -0,0 +1,35 @@ +SET FOREIGN_KEY_CHECKS=0; + +-- ---------------------------- +-- Table structure for model_2d_draft +-- ---------------------------- +DROP TABLE IF EXISTS `model_2d_draft`; +CREATE TABLE `model_2d_draft` ( + `id` bigint(20) NOT NULL, + `code` varchar(32) NOT NULL COMMENT '编号', + `name` varchar(32) NOT NULL COMMENT '模型名称', + `json_data` mediumtext COMMENT '模型数据', + `create_user_id` bigint(20) NOT NULL, + `create_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP, + `update_user_id` bigint(20) DEFAULT NULL, + `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- ---------------------------- +-- Table structure for model_2d +-- ---------------------------- +DROP TABLE IF EXISTS `model_2d`; +CREATE TABLE `model_2d` ( + `id` bigint(20) NOT NULL, + `code` varchar(32) NOT NULL COMMENT '编号（唯一）', + `name` varchar(32) NOT NULL COMMENT '模型名称', + `json_data` mediumtext NOT NULL COMMENT '模型数据', + `version` int(11) NOT NULL COMMENT '版本', + `state` varchar(2) NOT NULL COMMENT '状态', + `create_user_id` bigint(20) NOT NULL, + `create_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP, + `update_user_id` bigint(20) DEFAULT NULL, + `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; \ No newline at end of file diff --git a/sql/20210623-sheng-userdata.sql b/sql/20210623-sheng-userdata.sql new file mode 100644 index 000000000..68805b1be --- /dev/null +++ b/sql/20210623-sheng-userdata.sql @@ -0,0 +1,21 @@ +ALTER TABLE `user_simulation_stats` +DROP COLUMN `map_prd_id`, +MODIFY COLUMN `role` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户角色' AFTER `prd_type`, +MODIFY COLUMN `end_time` datetime NOT NULL DEFAULT now() ON UPDATE CURRENT_TIMESTAMP COMMENT '结束时间' AFTER `role`, +MODIFY COLUMN `duration` int(11) NOT NULL COMMENT '有效时长' AFTER `end_time`, +ADD COLUMN `start_time` datetime NOT NULL DEFAULT now() ON UPDATE CURRENT_TIMESTAMP COMMENT '开始时间' AFTER `role`; + +SET FOREIGN_KEY_CHECKS=0; + +-- ---------------------------- +-- Table structure for sys_third_account_config +-- ---------------------------- +DROP TABLE IF EXISTS `sys_third_account_config`; +CREATE TABLE `sys_third_account_config` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `account` varchar(32) NOT NULL COMMENT '第三方账户账号', + `interface_config` text COMMENT '接口信息配置', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; diff --git a/sql/20210720-sheng.sql b/sql/20210720-sheng.sql new file mode 100644 index 000000000..9455a10a1 --- /dev/null +++ b/sql/20210720-sheng.sql @@ -0,0 +1,14 @@ +SET FOREIGN_KEY_CHECKS=0; + +-- ---------------------------- +-- Table structure for circuitry_draft +-- ---------------------------- +DROP TABLE IF EXISTS `circuitry_draft`; +CREATE TABLE `circuitry_draft` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `name` varchar(32) NOT NULL COMMENT '名称', + `draw_data` mediumtext COMMENT '绘图数据', + `create_user_id` bigint(20) NOT NULL, + `create_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8; diff --git a/sql/20210805-thesai.sql b/sql/20210805-thesai.sql new file mode 100644 index 000000000..ca70ea3be --- /dev/null +++ b/sql/20210805-thesai.sql @@ -0,0 +1,10 @@ +CREATE TABLE `draft_map_route_overrun` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `map_id` bigint(20) NOT NULL, + `code` varchar(255) NOT NULL, + `section_code` varchar(255) NOT NULL, + `ci_switch` varchar(255) DEFAULT NULL, + `switch_code` varchar(255) NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8; + diff --git a/sql/20211222-thesai.sql b/sql/20211222-thesai.sql new file mode 100644 index 000000000..f22c9c553 --- /dev/null +++ b/sql/20211222-thesai.sql @@ -0,0 +1,2 @@ +alter table exam_definition + add abnormal tinyint(1) default 0 not null comment '数据异常'; \ No newline at end of file diff --git a/sql/20211224-thesai.sql b/sql/20211224-thesai.sql new file mode 100644 index 000000000..6ab61a9aa --- /dev/null +++ b/sql/20211224-thesai.sql @@ -0,0 +1,7 @@ +alter table exam_definition + add `system` bit default 0 not null comment '系统生成'; +-- 数据处理 +UPDATE exam_definition +SET `system` = 1 +WHERE + remarks LIKE '%默认试卷' \ No newline at end of file diff --git a/sql/20211228-thesai.sql b/sql/20211228-thesai.sql new file mode 100644 index 000000000..e613c2a71 --- /dev/null +++ b/sql/20211228-thesai.sql @@ -0,0 +1,3 @@ +alter table project_server + add resources_domain_name varchar(255) null comment '资源域名' after domain_name; + diff --git a/sql/20220117-thesai.sql b/sql/20220117-thesai.sql new file mode 100644 index 000000000..c42d3ea86 --- /dev/null +++ b/sql/20220117-thesai.sql @@ -0,0 +1,51 @@ +-- auto-generated definition +create table audio_resources +( + id bigint auto_increment, + name varchar(128) null comment '名称', + `desc` varchar(256) null comment '描述', + url varchar(256) not null comment '资源地址', + create_time datetime not null comment '创建时间', + update_time datetime null comment '更新时间', + constraint audio_resources_id_uindex + unique (id) +) + comment '音频资源'; + +alter table audio_resources + add primary key (id); + +-- auto-generated definition +create table iscs_device +( + id bigint auto_increment, + map_id bigint not null comment '地图id', + code varchar(64) not null comment '编号', + `system` varchar(32) null comment '所属系统', + station varchar(32) null comment '所属车站', + position varchar(32) null comment '具体位置', + type varchar(32) not null comment '设备类型', + constraint iscs_device_id_uindex + unique (id) +) + comment 'ISCS设备'; + +alter table iscs_device + add primary key (id); + +-- auto-generated definition +create table iscs_system_resources +( + id bigint auto_increment, + map_id bigint not null comment '地图id', + `system` varchar(32) not null comment '系统', + type varchar(32) null comment '类型', + resource_ids varchar(1024) null comment '资源id集合', + constraint iscs_system_resources_id_uindex + unique (id) +) + comment 'ISCS系统资源'; + +alter table iscs_system_resources + add primary key (id); + diff --git a/sql/20220526-wei.sql b/sql/20220526-wei.sql new file mode 100644 index 000000000..72686218f --- /dev/null +++ b/sql/20220526-wei.sql @@ -0,0 +1,12 @@ +-- 20220523 +alter table `draft_map_station_direction_label` +ADD COLUMN `run_model` varchar(255) NULL comment '所属模式（自动闭塞A、半自动闭塞S）' AFTER `signal_code`, +ADD COLUMN `run_status` varchar(255) NULL comment '默认的接发状态,R接、D发、NO空' AFTER `run_model`, +ADD COLUMN `relative_code` varchar(255) NULL comment '相对方向编码' AFTER `run_status`; + + +-- 20220526 +alter table `draft_map_station_direction_label` +drop COLUMN `relative_code`, +ADD COLUMN `relative_station_code` varchar(255) NULL comment '相对的车站编码' AFTER `run_status`, +ADD COLUMN `relative_label_enum` varchar(255) NULL comment '相对的方向口' AFTER `relative_station_code`; \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/configuration/TaskExecutorConfiguration.java b/src/main/java/club/joylink/rtss/configuration/TaskExecutorConfiguration.java index bf71f6fbb..8c1575ac5 100644 --- a/src/main/java/club/joylink/rtss/configuration/TaskExecutorConfiguration.java +++ b/src/main/java/club/joylink/rtss/configuration/TaskExecutorConfiguration.java @@ -6,7 +6,6 @@ import org.springframework.core.env.Environment; import org.springframework.core.task.TaskExecutor; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; -import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import java.util.concurrent.ThreadPoolExecutor; @@ -22,8 +21,24 @@ public class TaskExecutorConfiguration { public TaskExecutor nsExecutor(Environment env) { ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor(); taskExecutor.setThreadNamePrefix("ns-executor-"); - taskExecutor.setCorePoolSize(4); - taskExecutor.setMaxPoolSize(4); + taskExecutor.setCorePoolSize(2); + taskExecutor.setMaxPoolSize(2); + taskExecutor.setQueueCapacity(100); + taskExecutor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy()); + taskExecutor.initialize(); + return taskExecutor; + } + + /*** + * 第三方账户数据同步执行线程池 + * @return + */ + @Bean("thirdAccountDataSyncExecutor") + public TaskExecutor thirdAccountDataSyncExecutor(Environment env) { + ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor(); + taskExecutor.setThreadNamePrefix("third-account-sync-executor-"); + taskExecutor.setCorePoolSize(2); + taskExecutor.setMaxPoolSize(2); taskExecutor.setQueueCapacity(100); taskExecutor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy()); taskExecutor.initialize(); @@ -38,8 +53,8 @@ public class TaskExecutorConfiguration { public TaskExecutor realDeviceExecutor(Environment env) { ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor(); taskExecutor.setThreadNamePrefix("real-device-executor-"); - taskExecutor.setCorePoolSize(4); - taskExecutor.setMaxPoolSize(4); + taskExecutor.setCorePoolSize(2); + taskExecutor.setMaxPoolSize(2); taskExecutor.setQueueCapacity(100); taskExecutor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy()); taskExecutor.initialize(); diff --git a/src/main/java/club/joylink/rtss/configuration/WebConfig.java b/src/main/java/club/joylink/rtss/configuration/WebConfig.java index b98cf7eb2..75884ddc4 100644 --- a/src/main/java/club/joylink/rtss/configuration/WebConfig.java +++ b/src/main/java/club/joylink/rtss/configuration/WebConfig.java @@ -28,9 +28,7 @@ public class WebConfig implements WebMvcConfigurer { licenseWhiteList.add("/api/licensing/**"); registry.addInterceptor(licenseInterceptor).excludePathPatterns(licenseWhiteList); List whiteList = new ArrayList<>(); - whiteList.add("/swagger-ui.html"); - whiteList.add("/swagger-resources/**"); - whiteList.add("/webjars/springfox-swagger-ui/**"); + whiteList.add("/doc/**"); whiteList.add("/api/login/**"); whiteList.add("/api/wxpat/**"); whiteList.add("/api/sms/**"); @@ -60,6 +58,8 @@ public class WebConfig implements WebMvcConfigurer { whiteList.add("/api/cgy/**"); //项目域名查询 whiteList.add("/api/projectServer/project/{project}"); + whiteList.add("/test/simulation/**"); + whiteList.add("/api/test/**"); registry.addInterceptor(authenticateInterceptor).excludePathPatterns(whiteList); } diff --git a/src/main/java/club/joylink/rtss/configuration/configProp/ModbusTcpConfig.java b/src/main/java/club/joylink/rtss/configuration/configProp/ModbusTcpConfig.java new file mode 100644 index 000000000..cb82e7fda --- /dev/null +++ b/src/main/java/club/joylink/rtss/configuration/configProp/ModbusTcpConfig.java @@ -0,0 +1,14 @@ +package club.joylink.rtss.configuration.configProp; + +import lombok.Getter; +import lombok.Setter; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Component +@ConfigurationProperties(prefix="modbus-tcp") +@Getter +@Setter +public class ModbusTcpConfig { + private int port; +} diff --git a/src/main/java/club/joylink/rtss/configuration/configProp/UDPConfig.java b/src/main/java/club/joylink/rtss/configuration/configProp/UDPConfig.java new file mode 100644 index 000000000..50e00d61a --- /dev/null +++ b/src/main/java/club/joylink/rtss/configuration/configProp/UDPConfig.java @@ -0,0 +1,16 @@ +package club.joylink.rtss.configuration.configProp; + +import lombok.Getter; +import lombok.Setter; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Component +@ConfigurationProperties(prefix="udp") +@Getter +@Setter +public class UDPConfig { + private int serverPort; + + private int clientPort; +} diff --git a/src/main/java/club/joylink/rtss/configuration/configProp/WeChatConfig.java b/src/main/java/club/joylink/rtss/configuration/configProp/WeChatConfig.java index d7d8e8e09..9bf5b909b 100644 --- a/src/main/java/club/joylink/rtss/configuration/configProp/WeChatConfig.java +++ b/src/main/java/club/joylink/rtss/configuration/configProp/WeChatConfig.java @@ -25,6 +25,14 @@ public class WeChatConfig { private String spAppSecret; + private String spApp2Id; + + private String spApp2Secret; + + private String spApp3Id; + + private String spApp3Secret; + /** 微信模块基础url */ private String wxModuleUrl; @@ -41,8 +49,8 @@ public class WeChatConfig { return String.format(wmBaseUrl, "login", state); } - public String getWmBindUrl(Long userId) { - return String.format(wmBaseUrl, "bind", userId); + public String getWmBindUrl(String state) { + return String.format(wmBaseUrl, "bind", state); } public String getPermissionDistributeUrl(String state) { @@ -92,6 +100,22 @@ public class WeChatConfig { .append("&grant_type=authorization_code").toString(); } + public String getMiniApp2Code2SessionUrl(String wmCode) { + return new StringBuilder(this.domainUri) + .append("/sns/jscode2session?appid=").append(spApp2Id) + .append("&secret=").append(this.spApp2Secret) + .append("&js_code=").append(wmCode) + .append("&grant_type=authorization_code").toString(); + } + + public String getMiniApp3Code2SessionUrl(String wmCode) { + return new StringBuilder(this.domainUri) + .append("/sns/jscode2session?appid=").append(spApp3Id) + .append("&secret=").append(this.spApp3Secret) + .append("&js_code=").append(wmCode) + .append("&grant_type=authorization_code").toString(); + } + public String getWxModuleBatchGetUserInfoUrl() { return this.wxModuleUrl + "/api/user/batchget"; } @@ -108,4 +132,8 @@ public class WeChatConfig { public String getMsgSecCheckUrl() { return this.wxModuleUrl + "/api/wm/msgSecCheck"; } + + public String getOrgBindCode(String state) { + return String.format(wmBaseUrl, "company", state); + } } diff --git a/src/main/java/club/joylink/rtss/constants/BusinessConsts.java b/src/main/java/club/joylink/rtss/constants/BusinessConsts.java index 35854ac53..acbfec5e8 100644 --- a/src/main/java/club/joylink/rtss/constants/BusinessConsts.java +++ b/src/main/java/club/joylink/rtss/constants/BusinessConsts.java @@ -800,4 +800,21 @@ public interface BusinessConsts { enum MapGroupType{ DATA,RUNPLAN; } + + enum RunPlanLoadRule{ + EVERY_DAY, + WITHIN_A_WEEK, + WEEKEND, + } + + enum Regulation{ + /** 时刻表调度 */ + TIME_TABLE_REGULATION, + /** 行车间隔调度 - 前调 */ + HEADWAY_REGULATION_FRONT, + /** 行车间隔调度 - 前调 + 后调 */ + HEADWAY_REGULATION_FRONT_AND_BACK, + /** 关闭自动调度 */ + REGULATION_OFF, + } } diff --git a/src/main/java/club/joylink/rtss/constants/DirectionLabelEnum.java b/src/main/java/club/joylink/rtss/constants/DirectionLabelEnum.java new file mode 100644 index 000000000..6ed3ccfee --- /dev/null +++ b/src/main/java/club/joylink/rtss/constants/DirectionLabelEnum.java @@ -0,0 +1,20 @@ +package club.joylink.rtss.constants; + +/** + * 方向标签枚举 + */ +public enum DirectionLabelEnum { + X, + XF, + XD, + XN, + XW, + XWN, + S, + SF, + SD, + SDN, + SH, + SHN, + NO; +} diff --git a/src/main/java/club/joylink/rtss/constants/IscsSystem.java b/src/main/java/club/joylink/rtss/constants/IscsSystem.java new file mode 100644 index 000000000..001eeee3d --- /dev/null +++ b/src/main/java/club/joylink/rtss/constants/IscsSystem.java @@ -0,0 +1,6 @@ +package club.joylink.rtss.constants; + +public enum IscsSystem { + PA, + PIS, +} diff --git a/src/main/java/club/joylink/rtss/constants/MapPrdTypeEnum.java b/src/main/java/club/joylink/rtss/constants/MapPrdTypeEnum.java index f4503c99f..89be3f646 100644 --- a/src/main/java/club/joylink/rtss/constants/MapPrdTypeEnum.java +++ b/src/main/java/club/joylink/rtss/constants/MapPrdTypeEnum.java @@ -11,7 +11,9 @@ public enum MapPrdTypeEnum { SCHEDULING("05", "派班工作站"), ISCS("06", "ISCS工作站"), BIG_SCREEN("07", "大屏工作站"), - RUN_PLAN_MAKE("08", "运行图编制工作站") + RUN_PLAN_MAKE("08", "运行图编制工作站"), + DEPOT_IL("09", "车辆段联锁工作站"), + CTC("10", "CTC工作站") ; private String code; diff --git a/src/main/java/club/joylink/rtss/constants/Project.java b/src/main/java/club/joylink/rtss/constants/Project.java index a03cbda4b..16fbeae1d 100644 --- a/src/main/java/club/joylink/rtss/constants/Project.java +++ b/src/main/java/club/joylink/rtss/constants/Project.java @@ -6,6 +6,8 @@ package club.joylink.rtss.constants; public enum Project { /** 自己项目 */ DEFAULT, + /** 无logo */ + NOLOGO, /** 西铁院项目 */ XTY, /** 南铁院项目 */ @@ -28,6 +30,26 @@ public enum Project { BJD, /** 成都工业职业技术学院 */ CGY, + /** 微机联锁 */ + WJLS, + /** 郑州共赢 */ + ZZWW, + /** 郑州共赢测试 */ + ZZWWTEST, + /** 中航锐创（第三方教学合作,第三方登录） */ + RICHOR, + /** 中航锐创（义乌现场）（实训室，连设备，设备登录） */ + RICHOR_JOINT, + /** 上饶沙盘 */ + SR_SANDBOX, + /** 江西工贸 */ + JXGM, + /** 扬工院 */ + RICHOR_YGY, + /** 苏安院 */ + SAY, + /** 测试 */ + TEST, ; public static boolean isDefault(Project project) { @@ -35,6 +57,6 @@ public enum Project { } public static boolean isLoginWithCreateSimulation(Project project) { - return Project.DRTS.equals(project) || Project.BJD.equals(project); + return Project.DRTS.equals(project) || Project.BJD.equals(project) || Project.WJLS.equals(project); } } diff --git a/src/main/java/club/joylink/rtss/constants/ProjectDeviceType.java b/src/main/java/club/joylink/rtss/constants/ProjectDeviceType.java index 116dcd5eb..f23ac2f96 100644 --- a/src/main/java/club/joylink/rtss/constants/ProjectDeviceType.java +++ b/src/main/java/club/joylink/rtss/constants/ProjectDeviceType.java @@ -12,6 +12,8 @@ import java.util.List; public enum ProjectDeviceType { /* -----------plc device start---------- */ + /** 区段 */ + SECTION, /** 道岔 */ SWITCH, /** 信号机 */ @@ -26,6 +28,14 @@ public enum ProjectDeviceType { IBP, /** PLC网关 */ PLC_GATEWAY, + /** 单元控制器 */ + DCU, + /** UDP下位机 */ + UDP_LOW, + /** UDP客户端 */ + UDP_CLIENT, + /** 列车 */ + TRAIN, /* -----------plc device end---------- */ /* -----------client device start---------- */ @@ -55,6 +65,8 @@ public enum ProjectDeviceType { CCTV, /** 虚拟电子沙盘 */ SANDBOX, + /** 派班工作站 */ + SCHEDULING, /* -----------client device end---------- */ ; @@ -64,7 +76,12 @@ public enum ProjectDeviceType { PSD, PSL, IBP, + SECTION, SWITCH, - SIGNAL); + SIGNAL, + DCU, + UDP_LOW, + UDP_CLIENT, + TRAIN); } } diff --git a/src/main/java/club/joylink/rtss/constants/ServicePath.java b/src/main/java/club/joylink/rtss/constants/ServicePath.java new file mode 100644 index 000000000..b43c31d74 --- /dev/null +++ b/src/main/java/club/joylink/rtss/constants/ServicePath.java @@ -0,0 +1,5 @@ +package club.joylink.rtss.constants; + +public interface ServicePath { + String MAIN = "https://joylink.club/jlcloud"; +} diff --git a/src/main/java/club/joylink/rtss/constants/StatusEnum.java b/src/main/java/club/joylink/rtss/constants/StatusEnum.java index 18ff7980a..5b2453c91 100644 --- a/src/main/java/club/joylink/rtss/constants/StatusEnum.java +++ b/src/main/java/club/joylink/rtss/constants/StatusEnum.java @@ -1,5 +1,6 @@ package club.joylink.rtss.constants; +import club.joylink.rtss.exception.BusinessExceptionAssertEnum; import lombok.Getter; @Getter @@ -15,4 +16,14 @@ public enum StatusEnum { this.code = code; this.msg = msg; } + + public static StatusEnum getByCode(String code) { + for (StatusEnum value : StatusEnum.values()) { + if (value.getCode().equals(code)) { + return value; + } + } + throw BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL + .exception(String.format("不存在code为[%s]的StatusEnum", code)); + } } diff --git a/src/main/java/club/joylink/rtss/constants/SystemEnv.java b/src/main/java/club/joylink/rtss/constants/SystemEnv.java index bf93f8b58..0c3546279 100644 --- a/src/main/java/club/joylink/rtss/constants/SystemEnv.java +++ b/src/main/java/club/joylink/rtss/constants/SystemEnv.java @@ -46,6 +46,19 @@ public enum SystemEnv { return false; } + public static boolean isTestEnv(String name) { + SystemEnv[] envs = SystemEnv.values(); + for (SystemEnv env : envs) { + if(Objects.equals(env.getName(), name)) { + if(Test.equals(env)) { + return true; + } + break; + } + } + return false; + } + public static boolean isDevEnv(String name) { SystemEnv[] envs = SystemEnv.values(); for (SystemEnv env : envs) { diff --git a/src/main/java/club/joylink/rtss/constants/TencentSMSTemplate.java b/src/main/java/club/joylink/rtss/constants/TencentSMSTemplate.java index fe4ad2667..a590c668a 100644 --- a/src/main/java/club/joylink/rtss/constants/TencentSMSTemplate.java +++ b/src/main/java/club/joylink/rtss/constants/TencentSMSTemplate.java @@ -12,6 +12,8 @@ public enum TencentSMSTemplate { VerificationCode_International("JiuLian", 453984, 2), OrderNotice("玖琏科技", 260120, 4), SystemNotice("玖琏科技", 0000, 3), + + ZzjAlertNotice("玖琏科技", 1206126, 2), ; private String sign; diff --git a/src/main/java/club/joylink/rtss/controller/FileController.java b/src/main/java/club/joylink/rtss/controller/FileController.java new file mode 100644 index 000000000..079ea9554 --- /dev/null +++ b/src/main/java/club/joylink/rtss/controller/FileController.java @@ -0,0 +1,80 @@ +package club.joylink.rtss.controller; + +import club.joylink.rtss.services.file.IFileManagerService; +import club.joylink.rtss.vo.AccountVO; +import club.joylink.rtss.vo.client.file.FileBindingVO; +import club.joylink.rtss.vo.client.file.FileQueryVO; +import club.joylink.rtss.vo.client.file.FileVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 文件管理 + */ +@RestController +@RequestMapping("/api/file") +public class FileController { + + @Autowired + private IFileManagerService iFileManagerService; + + /** 创建一条文件基础信息 */ + @PostMapping("/basic") + public void createBasic(@RequestBody @Validated(FileVO.CreateBasicInfoCheck.class) FileVO fileVO, @RequestAttribute AccountVO user) { + iFileManagerService.createBasic(fileVO, user); + } + + /** 复制一条文件基础信息 */ + @PostMapping("/basic/copy/{id}") + public void copyBasic(@PathVariable Long id, @RequestAttribute AccountVO user) { + iFileManagerService.copyBasic(id, user); + + } + + /** 一条文件信息绑定地图、设备 */ + @PostMapping("/binding") + public void binding(@RequestBody @Validated FileBindingVO fileBindingVO, @RequestAttribute AccountVO user) { + iFileManagerService.binding(fileBindingVO, user); + } + + /** 修改一条文件基础信息 */ + @PutMapping("/basic") + public void update(@RequestBody @Validated(FileVO.CreateBasicInfoCheck.class) FileVO fileVO, @RequestAttribute AccountVO user) { + iFileManagerService.updateBasic(fileVO, user); + } + + /** 查询文件信息 */ + @GetMapping() + public List query(@Validated FileQueryVO queryVO) { + return iFileManagerService.queryVO(queryVO); + } + + /** 删除一条文件信息 */ + @DeleteMapping("/{id}") + public void delete(@PathVariable Long id) { + iFileManagerService.delete(id); + } + + /** 查询文件绑定信息 */ + @GetMapping("/binding/{fileId}/{mapId}") + public FileBindingVO queryFileBindingInfo(@PathVariable long fileId, @PathVariable long mapId) { + return iFileManagerService.queryFileBindingInfo(fileId, mapId); + } + + @GetMapping("/binding/{fileId}") + public List queryFileBindingInfo(@PathVariable long fileId) { + return iFileManagerService.queryFileBindingInfo(fileId); + } + + /** + * 删除文件绑定信息 + * @param bindingId + */ + @DeleteMapping("/binding/{bindingId}") + public void deleteBindingInfo(@PathVariable long bindingId) { + iFileManagerService.deleteBindingInfo(bindingId); + } +} diff --git a/src/main/java/club/joylink/rtss/controller/LearnController.java b/src/main/java/club/joylink/rtss/controller/LearnController.java index 1cd923717..88fedb3d4 100644 --- a/src/main/java/club/joylink/rtss/controller/LearnController.java +++ b/src/main/java/club/joylink/rtss/controller/LearnController.java @@ -2,7 +2,7 @@ package club.joylink.rtss.controller; import club.joylink.rtss.constants.Project; import club.joylink.rtss.services.ILearnService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.PageQueryVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.learn.*; @@ -11,16 +11,15 @@ import club.joylink.rtss.vo.client.post.LearnMessagePagedQueryVO; import club.joylink.rtss.vo.client.post.LearnMessageVO; import club.joylink.rtss.vo.client.post.LearnPostPagedQueryVO; import club.joylink.rtss.vo.client.validGroup.LearnCommentCreateCheck; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; -@Api(tags = { "学习吧接口" }) +/** + *学习吧接口 + */ @RestController @RequestMapping(path = "/api/learn") public class LearnController { @@ -28,96 +27,126 @@ public class LearnController { @Autowired private ILearnService iLearnService; - @ApiOperation(value = "分页查询留言板列表") + /** + *分页查询留言板列表 + */ @GetMapping(path = "/post") public PageVO queryPagedPost(LearnPostPagedQueryVO queryVO) { return iLearnService.queryPagedPost(queryVO); } - @ApiOperation("查询项目留言板") + /** + *查询项目留言板 + */ @GetMapping("/{project}/post") public LearnPostVO queryPost(@PathVariable Project project) { return iLearnService.queryPost(project); } - @ApiOperation(value = "新建帖子") + /** + *新建帖子 + */ @PostMapping(path = "/post") - public Long createPost(@RequestBody @Validated LearnPostCreateVO createVO, @ApiIgnore @RequestAttribute UserVO user) { + public Long createPost(@RequestBody @Validated LearnPostCreateVO createVO, @RequestAttribute AccountVO user) { return iLearnService.createPost(createVO, user); } - @ApiOperation("编辑留言板基础信息") + /** + *编辑留言板基础信息 + */ @PutMapping("/{postId}") public void updatePost(@PathVariable Long postId, @RequestBody @Validated LearnPostUpdateVO updateVO, - @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { iLearnService.updatePost(postId, updateVO, user); } - @ApiOperation(value = "获取帖子信息") + /** + *获取帖子信息 + */ @GetMapping(path = "/{postId}") public LearnPostVO getPostInfo(@PathVariable Long postId) { return iLearnService.getPostInfo(postId); } - @ApiOperation(value = "赞贴") + /** + *赞贴 + */ @PostMapping(path = "/post/{postId}/like") - public void likePost(@PathVariable Long postId, @ApiIgnore @RequestAttribute UserVO user) { + public void likePost(@PathVariable Long postId, @RequestAttribute AccountVO user) { iLearnService.likePost(postId, user); } - @ApiOperation(value = "踩贴") + /** + *踩贴 + */ @PostMapping(path = "/post/{postId}/unlike") - public void unlikePost(@PathVariable Long postId, @ApiIgnore @RequestAttribute UserVO user) { + public void unlikePost(@PathVariable Long postId, @RequestAttribute AccountVO user) { iLearnService.unlikePost(postId, user); } - @ApiOperation(value = "置顶-管理员操作") + /** + *置顶-管理员操作 + */ @PutMapping(path = "/{postId}/top") - public void top(@PathVariable Long postId, @ApiIgnore @RequestAttribute UserVO user) { + public void top(@PathVariable Long postId, @RequestAttribute AccountVO user) { iLearnService.top(postId, user); } - @ApiOperation(value = "删除帖子-管理员操作") + /** + *删除帖子-管理员操作 + */ @DeleteMapping(path = "/{postId}") - public void deletePost(@PathVariable Long postId, @ApiIgnore @RequestAttribute UserVO user) { + public void deletePost(@PathVariable Long postId, @RequestAttribute AccountVO user) { iLearnService.deletePost(postId, user); } //--------------------------------- 留言 --------------------------------- - @ApiOperation("留言") + /** + *留言 + */ @PostMapping("/message/create") - public long createMessage(@RequestBody @Validated LearnMessageCreateVO messageCreateVO, @RequestAttribute UserVO user) { + public long createMessage(@RequestBody @Validated LearnMessageCreateVO messageCreateVO, @RequestAttribute AccountVO user) { return iLearnService.createMessage(messageCreateVO, user); } - @ApiOperation("成工院留言") + /** + *成工院留言 + */ @PostMapping("/cgy/message/create") public long cgyCreateMessage(@RequestBody @Validated LearnMessageCreateVO messageCreateVO) { return iLearnService.cgyCreateMessage(messageCreateVO); } - @ApiOperation("分页查询留言") + /** + *分页查询留言 + */ @GetMapping("/{postId}/message/pagedQuery/postId") public PageVO pagedQueryMessageByPostId(@PathVariable Long postId, LearnMessagePagedQueryVO queryVO) { return iLearnService.pagedQueryMessageByPostId(postId, queryVO); } - @ApiOperation("根据项目分页查询留言") + /** + *根据项目分页查询留言 + */ @GetMapping("/{project}/message/pagedQuery/project") public PageVO pagedQueryMessageByProject(@PathVariable Project project, LearnMessagePagedQueryVO queryVO) { return iLearnService.pagedQueryMessageByProject(project, queryVO); } - @ApiOperation("删除留言（管理员）") + /** + *删除留言（管理员） + */ @DeleteMapping("/{messageId}/deleteMessage/admin") - public void adminDeleteMessage(@PathVariable Long messageId, @RequestAttribute UserVO user) { + public void adminDeleteMessage(@PathVariable Long messageId, @RequestAttribute AccountVO user) { iLearnService.adminDeleteMessage(messageId, user); } - @ApiOperation("删除留言（用户删自己的）") + /** + *删除留言（用户删自己的） + */ @DeleteMapping("/{messageId}/deleteMessage/user") - public void userDeleteMessage(@PathVariable Long messageId, @RequestAttribute UserVO user) { + public void userDeleteMessage(@PathVariable Long messageId, @RequestAttribute AccountVO user) { iLearnService.userDeleteMessage(messageId, user); } @@ -135,85 +164,111 @@ public class LearnController { //----------------------------------------- 评论 ----------------------------------------- - @ApiOperation(value = "分页查询留言评论列表") + /** + *分页查询留言评论列表 + */ @GetMapping(path = "/{messageId}/comment") public PageVO queryPagedComment(@PathVariable Long messageId, PageQueryVO queryVO) { return iLearnService.pagedQueryComment(messageId, queryVO); } - @ApiOperation(value = "查询留言回复列表") + /** + *查询留言回复列表 + */ @GetMapping(path = "/{messageId}/list") public List queryCommentList(@PathVariable Long messageId) { return iLearnService.queryCommentList(messageId); } - @ApiOperation(value = "评论") + /** + *评论 + */ @PostMapping(path = "/{messageId}/comment") public void comment(@PathVariable Long messageId, @RequestBody @Validated(value = LearnCommentCreateCheck.class) LearnCreateVO commentCreateVO, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { iLearnService.addComment(messageId, commentCreateVO, user); } - @ApiOperation(value = "成工院评论") + /** + *成工院评论 + */ @PostMapping(path = "/cgy/{messageId}/comment") public void cygComment(@PathVariable Long messageId, - @RequestBody @Validated(value = LearnCommentCreateCheck.class) LearnCreateVO commentCreateVO) { + @RequestBody @Validated(value = LearnCommentCreateCheck.class) LearnCreateVO commentCreateVO) { iLearnService.cgyAddComment(messageId, commentCreateVO); } - @ApiOperation(value = "回复") + /** + *回复 + */ @PostMapping(path = "/{messageId}/{commentId}/comment") public void comment(@PathVariable Long messageId, @PathVariable Long commentId, @RequestBody @Validated(value = LearnCommentCreateCheck.class) LearnCreateVO postCreateVO, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { iLearnService.addComment(messageId, commentId, postCreateVO, user); } - @ApiOperation(value = "赞回复") + /** + *赞回复 + */ @PostMapping(path = "/comment/{commentId}/like") - public void likeComment(@PathVariable Long commentId, @ApiIgnore @RequestAttribute UserVO user) { + public void likeComment(@PathVariable Long commentId, @RequestAttribute AccountVO user) { iLearnService.likeComment(commentId, user); } - @ApiOperation(value = "踩回复") + /** + *踩回复 + */ @PostMapping(path = "/comment/{commentId}/unlike") - public void unlikeComment(@PathVariable Long commentId, @ApiIgnore @RequestAttribute UserVO user) { + public void unlikeComment(@PathVariable Long commentId, @RequestAttribute AccountVO user) { iLearnService.unlikeComment(commentId, user); } - @ApiOperation(value = "取消置顶-管理员操作") + /** + *取消置顶-管理员操作 + */ @PutMapping(path = "/{postId}/unTop") - public void unTop(@PathVariable Long postId, @ApiIgnore @RequestAttribute UserVO user) { + public void unTop(@PathVariable Long postId, @RequestAttribute AccountVO user) { iLearnService.unTop(postId, user); } - @ApiOperation(value = "删除评论-管理员操作") + /** + *删除评论-管理员操作 + */ @DeleteMapping(path = "/{commentId}/deleteComment/admin") - public void adminDeleteComment(@PathVariable Long commentId, @ApiIgnore @RequestAttribute UserVO user) { + public void adminDeleteComment(@PathVariable Long commentId, @RequestAttribute AccountVO user) { iLearnService.adminDeleteComment(commentId, user); } - @ApiOperation(value = "删除评论-用户操作") + /** + *删除评论-用户操作 + */ @DeleteMapping(path = "/{commentId}/deleteComment/user") - public void userDeleteComment(@PathVariable Long commentId, @ApiIgnore @RequestAttribute UserVO user) { + public void userDeleteComment(@PathVariable Long commentId, @RequestAttribute AccountVO user) { iLearnService.userDeleteComment(commentId, user); } //----------------------------------------- 改数据 ----------------------------------------- - @ApiOperation(value = "管理员修改留言数据") + /** + *管理员修改留言数据 + */ @PutMapping(path = "/admin/update/message") public void adminUpdateMessage(LearnMessageUpdateVO messageUpdateVO) { iLearnService.adminUpdateMessage(messageUpdateVO); } - @ApiOperation(value = "管理员修改评论数据") + /** + *管理员修改评论数据 + */ @PutMapping(path = "/admin/update/comment") public void adminUpdateComment(LearnCommentUpdateVO commentUpdateVO) { iLearnService.adminUpdateComment(commentUpdateVO); } - @ApiOperation(value = "成工院留言时间打散") + /** + *成工院留言时间打散 + */ @PutMapping(path = "/cgy/updateMessageTime") public void cgyUpdateMessageTime() { iLearnService.cgyUpdateMessageTime(); diff --git a/src/main/java/club/joylink/rtss/controller/LoginController.java b/src/main/java/club/joylink/rtss/controller/LoginController.java index 032b827d8..7b82106f5 100644 --- a/src/main/java/club/joylink/rtss/controller/LoginController.java +++ b/src/main/java/club/joylink/rtss/controller/LoginController.java @@ -1,12 +1,15 @@ package club.joylink.rtss.controller; import club.joylink.rtss.constants.Project; +import club.joylink.rtss.exception.BaseException; +import club.joylink.rtss.exception.BusinessExceptionAssertEnum; import club.joylink.rtss.services.auth.IAuthenticateService; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.LoginUserInfoVO; -import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.LoginStatusVO; import club.joylink.rtss.vo.client.LoginUserVO; -import io.swagger.annotations.ApiOperation; +import club.joylink.rtss.vo.client.validGroup.LoginInfoCheck; +import club.joylink.rtss.vo.client.validGroup.ThirdLoginInfoCheck; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -20,27 +23,45 @@ public class LoginController { @Autowired private IAuthenticateService iAuthenticateService; - @ApiOperation(value = "获取微信小程序登陆二维码") - @GetMapping(path = "/wmurl") - public LoginStatusVO getWmLoginUrl(@NotBlank String clientId, @NotBlank String secret, - Project project, @RequestParam(required = false) String deviceCode) { - return this.iAuthenticateService.getWmLoginUrl(clientId, secret, project, deviceCode); + @PostMapping(path = "/third") + public String thirdPartyLogin(@RequestBody @Validated(ThirdLoginInfoCheck.class) LoginUserVO loginInfo) { + return this.iAuthenticateService.thirdPartyLogin(loginInfo); } - @ApiOperation(value = "用户微信小程序扫登陆二维码") + /** + * 获取微信小程序登陆二维码 + */ + @GetMapping(path = "/wmurl") + public LoginStatusVO getWmLoginUrl(@NotBlank String clientId, @NotBlank String secret, + String project, @RequestParam(required = false) String deviceCode) { + try { + Project pro = Project.valueOf(project); + return this.iAuthenticateService.getWmLoginUrl(clientId, secret, pro, deviceCode); + } catch (BaseException e) { + throw e; + } catch (Exception e) { + throw BusinessExceptionAssertEnum.SYSTEM_EXCEPTION.exception("获取登录二维码失败"); + } + } + + /** + * 用户微信小程序扫登陆二维码 + */ @GetMapping(path = "/scan/wmLoginUrl") - public UserVO scanWmLoginQrCode(String code, String state) { + public AccountVO scanWmLoginQrCode(String code, String state) { return this.iAuthenticateService.scanWmLoginQrCode(code, state); } - @ApiOperation(value = "微信小程序确认登陆接口") + /** + * 微信小程序确认登陆接口 + */ @PostMapping(path = "/wm") public void wmConfirmLogin(String code, String state) { this.iAuthenticateService.wmConfirmClientLogin(code, state); } @PostMapping() - public String loginWithPwd(@RequestBody @Validated LoginUserVO loginUser) { + public String loginWithPwd(@RequestBody @Validated(LoginInfoCheck.class) LoginUserVO loginUser) { return iAuthenticateService.loginWithPwd(loginUser); } @@ -49,29 +70,31 @@ public class LoginController { this.iAuthenticateService.preLogout(token); } - @GetMapping(path="/logout") + @GetMapping(path = "/logout") public void logout(String token) { this.iAuthenticateService.logout(token); } - @GetMapping(path="/checkStatus") + @GetMapping(path = "/checkStatus") public LoginStatusVO checkStatus(@NotBlank String sessionId) { return iAuthenticateService.checkStatus(sessionId); } /** * 获取用户信息 - 通过token + * * @param token * @return */ @GetMapping(path = "/getUserInfo") - public UserVO getUserInfo(String token) { + public AccountVO getUserInfo(String token) { LoginUserInfoVO loginUserInfoVO = this.iAuthenticateService.getLoginUserInfoByToken(token); - return loginUserInfoVO.getUserVO(); + return loginUserInfoVO.getAccountVO(); } /** * 获取用户登录信息（包含登录的项目/客户端等） + * * @param token * @return */ @@ -80,13 +103,39 @@ public class LoginController { return this.iAuthenticateService.getLoginUserInfoByToken(token); } - @ApiOperation(value = "微信小程序code换取token") + /** + * <玖琏科技>微信小程序code换取token + */ @GetMapping(path = "/wm/token") public String getTokenByWmCode(String code) { return this.iAuthenticateService.getTokenByWmCode(code); } - @ApiOperation(value = "token是否过期") + /** + * 到那儿了小程序code换token + * + * @param code + * @return + */ + @GetMapping(path = "/wm2/token") + public String getTokenByWmCode2(String code) { + return this.iAuthenticateService.getTokenByWmCode2(code); + } + + /** + * 郑州共赢小程序code换token + * + * @param code + * @return + */ + @GetMapping(path = "/wm/zzww/token") + public String getTokenByWmCode3(String code) { + return this.iAuthenticateService.getTokenByWmCode3(code); + } + + /** + * token是否过期 + */ @GetMapping(path = "/{token}/isExpired") public boolean isTokenExpired(@PathVariable String token) { return this.iAuthenticateService.isTokenExpired(token); diff --git a/src/main/java/club/joylink/rtss/controller/Map3dModelController.java b/src/main/java/club/joylink/rtss/controller/Map3dModelController.java index 669c2b2ac..78ac5e587 100644 --- a/src/main/java/club/joylink/rtss/controller/Map3dModelController.java +++ b/src/main/java/club/joylink/rtss/controller/Map3dModelController.java @@ -1,12 +1,10 @@ package club.joylink.rtss.controller; import club.joylink.rtss.services.IMap3dModelService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.map.Map3dModelCreateVO; import club.joylink.rtss.vo.client.map.Map3dModelUpdateVO; import club.joylink.rtss.vo.client.map.Map3dModelVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -14,7 +12,9 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(tags= {"地图3d模型数据管理接口"}) +/** + *地图3d模型数据管理接口 + */ @RestController @RequestMapping("/api/map3dModel") @Slf4j @@ -23,12 +23,17 @@ public class Map3dModelController { @Autowired private IMap3dModelService iMap3dModelService; - @ApiOperation(value = "获取所有有效地图3d模型数据") + /** + *获取所有有效地图3d模型数据 + */ @GetMapping(path = "/all") public List findAllModels() { return this.iMap3dModelService.findAllModels(); } + /** + *按类型查询有效的数据 + */ @GetMapping("") public List query(String resourceType) { return this.iMap3dModelService.query(resourceType); @@ -39,13 +44,17 @@ public class Map3dModelController { this.iMap3dModelService.update(updateVO); } - @ApiOperation(value = "创建地图3d模型数据") + /** + *创建地图3d模型数据 + */ @PostMapping("") - public void create(@RequestBody @Validated Map3dModelCreateVO createVO, @RequestAttribute UserVO user) { + public void create(@RequestBody @Validated Map3dModelCreateVO createVO, @RequestAttribute AccountVO user) { iMap3dModelService.create(createVO, user); } - @ApiOperation(value = "删除地图3d模型数据") + /** + *删除地图3d模型数据 + */ @DeleteMapping("/{id}/delete") public void delete(@PathVariable Long id) { iMap3dModelService.delete(id); diff --git a/src/main/java/club/joylink/rtss/controller/MapDataHandleController.java b/src/main/java/club/joylink/rtss/controller/MapDataHandleController.java new file mode 100644 index 000000000..edf332143 --- /dev/null +++ b/src/main/java/club/joylink/rtss/controller/MapDataHandleController.java @@ -0,0 +1,38 @@ +package club.joylink.rtss.controller; + +import club.joylink.rtss.services.draftData.DraftMapDataHandleService; +import club.joylink.rtss.services.publishData.PublishMapDataHandler; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 地图数据处理 + */ +@Slf4j +@RestController +@RequestMapping("/api/mapData/handle") +public class MapDataHandleController { + + @Autowired + private DraftMapDataHandleService draftMapDataHandleService; + @Autowired + private PublishMapDataHandler publishMapDataHandler; + + @PutMapping("") + public void dataHandle() { + this.publishMapDataHandler.dataHandle(); + } + + @PutMapping("/xian3") + public void overlapSetHandle() { + this.publishMapDataHandler.xian3Handle(); + } + + @PutMapping("/signalSd") + public void signalShowDirection() { + this.publishMapDataHandler.signalShowDirection(); + } +} diff --git a/src/main/java/club/joylink/rtss/controller/OperateController.java b/src/main/java/club/joylink/rtss/controller/OperateController.java index e59d4001f..5a8748e93 100644 --- a/src/main/java/club/joylink/rtss/controller/OperateController.java +++ b/src/main/java/club/joylink/rtss/controller/OperateController.java @@ -11,8 +11,6 @@ import club.joylink.rtss.vo.client.training.definition.OperateStepVO; import club.joylink.rtss.vo.client.validGroup.OperateBatchCreateCheck; import club.joylink.rtss.vo.client.validGroup.OperateSignleCreateCheck; import club.joylink.rtss.vo.client.validGroup.ValidList; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -20,7 +18,9 @@ import org.springframework.web.bind.annotation.*; import javax.validation.constraints.NotBlank; import java.util.List; -@Api(tags = { "操作管理接口" }) +/** + *操作管理接口 + */ @RestController @RequestMapping(path = "/api/operate") public class OperateController { @@ -32,75 +32,99 @@ public class OperateController { this.iOperateService = iOperateService; } - @ApiOperation(value = "创建操作定义") + /** + *创建操作定义 + */ @PostMapping(path = "") public void create(@RequestBody @Validated(value = {OperateSignleCreateCheck.class}) OperateDefinitionVO definitionVO) { this.iOperateService.create(definitionVO); } - @ApiOperation(value = "分页查询操作定义") + /** + *分页查询操作定义 + */ @GetMapping(path = "") public PageVO queryPagedOperateDefinition(OperateDefinitionQueryVO queryVO) { return this.iOperateService.queryPagedOperateDefinition(queryVO); } - @ApiOperation(value = "修改操作定义") + /** + *修改操作定义 + */ @PutMapping(path = "/{id}") public void updateDefinition(@PathVariable Long id, @RequestBody @Validated(value = {OperateSignleCreateCheck.class}) OperateDefinitionVO definitionVO) { this.iOperateService.update(id, definitionVO); } - @ApiOperation(value = "删除操作定义") + /** + *删除操作定义 + */ @DeleteMapping(path = "/{id}") public void deleteDefinition(@PathVariable Long id) { this.iOperateService.delete(id); } - @ApiOperation(value = "创建操作步骤") + /** + *创建操作步骤 + */ @PostMapping(path = "/{definitionId}/step") public void createStep(@PathVariable Long definitionId, @RequestBody @Validated(value = {OperateSignleCreateCheck.class}) OperateStepVO stepVO) { this.iOperateService.createStep(definitionId, stepVO); } - @ApiOperation(value = "分页查询操作步骤") + /** + *分页查询操作步骤 + */ @GetMapping(path = "/{definitionId}/step") public PageVO queryPagedOperateStep(@PathVariable Long definitionId, PageQueryVO queryVO) { return this.iOperateService.queryPagedOperateStep(definitionId, queryVO); } - @ApiOperation(value = "修改操作步骤") + /** + *修改操作步骤 + */ @PutMapping(path = "/step/{id}") public void updateStep(@PathVariable Long id, @RequestBody @Validated(value = {OperateSignleCreateCheck.class}) OperateStepVO stepVO) { this.iOperateService.updateStep(id, stepVO); } - @ApiOperation(value = "删除操作步骤") + /** + *删除操作步骤 + */ @DeleteMapping(path = "/step/{id}") public void deleteStep(@PathVariable Long id) { this.iOperateService.deleteStep(id); } - @ApiOperation(value = "获取实训类型下的操作类型") + /** + *获取实训类型下的操作类型 + */ @GetMapping(path = "/type") public List queryOperateType(Long mapId, String productType) { return this.iOperateService.queryOperateTypes(mapId, productType); } - @ApiOperation(value = "生成操作") + /** + *生成操作 + */ @PostMapping(path = "/{mapId}/generate") public void generate(@PathVariable Long mapId, @RequestBody @Validated(value = {OperateBatchCreateCheck.class}) ValidList definitionVOList) { this.iOperateService.generate(mapId, definitionVOList); } - @ApiOperation(value = "另存为") + /** + *另存为 + */ @PostMapping(path = "/{mapId}/saveAs/{other}") public void saveAs(@PathVariable @NotBlank Long mapId, @PathVariable @NotBlank Long other) { this.iOperateService.saveAs(mapId, other); } - @ApiOperation(value = "查询占位数据列表") + /** + *查询占位数据列表 + */ @GetMapping(path = "/placeholder") public List queryPlaceholder(String trainingType) { return this.iOperateService.queryPlaceholder(trainingType); diff --git a/src/main/java/club/joylink/rtss/controller/OrgController.java b/src/main/java/club/joylink/rtss/controller/OrgController.java index 76f354433..c17c013e4 100644 --- a/src/main/java/club/joylink/rtss/controller/OrgController.java +++ b/src/main/java/club/joylink/rtss/controller/OrgController.java @@ -1,39 +1,24 @@ package club.joylink.rtss.controller; -import club.joylink.rtss.constants.BusinessConsts; import club.joylink.rtss.constants.RoleEnum; import club.joylink.rtss.controller.advice.AuthenticateInterceptor; import club.joylink.rtss.controller.advice.Role; -import club.joylink.rtss.dao.OrgDAO; -import club.joylink.rtss.dao.OrgUserDAO; -import club.joylink.rtss.dao.SysUserDAO; -import club.joylink.rtss.entity.Org; -import club.joylink.rtss.entity.OrgUser; -import club.joylink.rtss.entity.OrgUserExample; -import club.joylink.rtss.entity.SysUser; -import club.joylink.rtss.exception.BusinessExceptionAssertEnum; -import club.joylink.rtss.services.ISysUserService; import club.joylink.rtss.services.org.*; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.LoginUserInfoVO; -import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.LessonVO; import club.joylink.rtss.vo.client.Node; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.org.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; -import javax.validation.constraints.NotBlank; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; +import java.util.List; -@Api(tags = {"组织成员管理接口"}) +/** + *组织成员管理接口 + */ @RestController @RequestMapping("/api/company") public class OrgController { @@ -53,286 +38,319 @@ public class OrgController { @Autowired private IOrgExamService iOrgExamService; - @Autowired - private ISysUserService iSysUserService; - - @Autowired - private SysUserDAO sysUserDAO; - - @Autowired - private OrgUserDAO orgUserDAO; - - @Autowired - private OrgDAO orgDAO; - - @ApiOperation(value = "创建顶级组织") + /** + *创建顶级组织 + */ @PostMapping - public CompanyVO create(@RequestBody @Validated CompanyVO company, @RequestAttribute(AuthenticateInterceptor.LOGIN_USER_KEY) UserVO user) { + public CompanyVO create(@RequestBody @Validated CompanyVO company, @RequestAttribute(AuthenticateInterceptor.LOGIN_USER_KEY) AccountVO user) { return iOrgService.createTopOrg(company, user); } - @ApiOperation(value = "获取公司列表") + /** + *获取公司列表 + */ @GetMapping public List queryAll() { return iOrgService.queryAllTopOrg(); } - @ApiOperation(value = "分页获取公司列表") + /** + *分页获取公司列表 + */ @GetMapping("paging") public PageVO pagingQueryAll(OrgQueryVO queryVO) { return iOrgService.pagedQueryAllTopOrg(queryVO); } - @ApiOperation(value = "查询公司信息") + /** + *查询公司信息 + */ @GetMapping("{id}") public CompanyVO get(@PathVariable Long id) { return iOrgService.get(id); } - @ApiOperation(value = "更新公司信息") + /** + *更新公司信息 + */ @PutMapping("{id}") - public CompanyVO updateCompany(@PathVariable Long id, @RequestBody @Validated CompanyVO company, @RequestAttribute UserVO user) { + public CompanyVO updateCompany(@PathVariable Long id, @RequestBody @Validated CompanyVO company, @RequestAttribute AccountVO user) { return iOrgService.updateOrg(id, company, user); } - @ApiOperation(value = "微信小程用户绑定为单位管理员") + /** + *微信小程用户绑定为单位管理员 + */ @PutMapping(path = "/bind/company") public CompanyVO userScanCodeBindCompany(Long userId, Long companyId) { return iOrgUserService.userScanCodeBindCompanyManager(userId, companyId); } - @ApiOperation(value = "添加部门信息") + /** + *添加部门信息 + */ @PostMapping(path = "/dept") public DepartmentVO createDepart(@RequestBody @Validated DepartmentVO departmentVO) { return iOrgUserService.createDepart(departmentVO); } - @ApiOperation(value = "获取单位所有部门") + /** + *获取单位所有部门 + */ @GetMapping(path = "{companyId}/dept") public List queryCompanyDepart(@PathVariable Long companyId) { return iOrgUserService.getCompanyAllDepart(companyId); } - @ApiOperation(value = "获取部门及其子树") + /** + *获取部门及其子树 + */ @GetMapping(path = "{companyId}/dept/{deptId}/tree") public DepartmentVO queryDepartTree(@PathVariable Long deptId, @PathVariable Long companyId) { return iOrgUserService.getDepartTree(companyId, deptId); } - @ApiOperation(value = "获取部门及其子部门") + /** + *获取部门及其子部门 + */ @GetMapping(path = "{companyId}/dept/{deptId}") public List queryDepart(@PathVariable Long deptId, @PathVariable Long companyId) { return iOrgUserService.getDepartAndChild(companyId, deptId); } - @ApiOperation(value = "删除部门信息") + /** + *删除部门信息 + */ @DeleteMapping("/dept/{deptId}") public void deleteDepart(@PathVariable Long deptId) { iOrgService.deleteNonTopOrg(deptId); } - @ApiOperation(value = "查询部门信息") + /** + *查询部门信息 + */ @GetMapping("/dept/{deptId}") public DepartmentVO getDepart(@PathVariable Long deptId) { return iOrgUserService.getDepartById(deptId); } - @ApiOperation(value = "更新部门信息") + /** + *更新部门信息 + */ @PutMapping("/dept/{id}") public void updateDepartInfo(@PathVariable Long id, @RequestBody @Validated DepartmentVO departmentVO) { iOrgUserService.updateDepartInfo(id, departmentVO); } - @ApiOperation(value = "添加单位成员关系信息") + /** + *添加单位成员关系信息 + */ @PostMapping("refUserInfo") - public void addCompanyUserInfo(@RequestAttribute @ApiIgnore UserVO user, @RequestBody UserDepartRelVO userDepartRelVO) { + public void addCompanyUserInfo(@RequestAttribute AccountVO user, @RequestBody UserDepartRelVO userDepartRelVO) { iOrgUserService.addDepartUserInfo(user, userDepartRelVO); } - @ApiOperation(value = "更新单位成员关系信息") + /** + *更新单位成员关系信息 + */ @PutMapping("refUserInfo") - public void updateCompanyUserInfo(@RequestAttribute @ApiIgnore UserVO user, @RequestBody UserDepartRelVO userDepartRelVO) { + public void updateCompanyUserInfo(@RequestAttribute AccountVO user, @RequestBody UserDepartRelVO userDepartRelVO) { iOrgUserService.updateDepartUserInfo(user, userDepartRelVO); } - @ApiOperation(value = "取消单位的部门成员关系") + /** + *取消单位的部门成员关系 + */ @DeleteMapping("departUserInfo") - public void deleteCompanyUserInfo(@RequestAttribute @ApiIgnore UserVO user, @RequestBody @Validated UserDepartRelVO userDepartRelVO) { + public void deleteCompanyUserInfo(@RequestAttribute AccountVO user, @RequestBody @Validated UserDepartRelVO userDepartRelVO) { iOrgUserService.deleteDepartUserInfo(user, userDepartRelVO); } - @ApiOperation(value = "分页获取班级学生信息") + /** + *分页获取班级学生信息 + */ @GetMapping("/dept/{clsId}/departUserInfo") - public PageVO getCompanyUserInfo(@RequestAttribute @ApiIgnore UserVO user, @PathVariable Integer clsId, CompanyUserQueryVO companyUserQueryVO) { + public PageVO getCompanyUserInfo(@RequestAttribute AccountVO user, @PathVariable Integer clsId, CompanyUserQueryVO companyUserQueryVO) { return iOrgUserService.getCompanyDepartUserInfoList(user, clsId, companyUserQueryVO); } - @ApiOperation(value = "导入单位成员信息") + /** + *导入单位成员信息 + */ @PostMapping("{clsId}/departUserInfo/import") - public void importCompanyUserInfo(@RequestAttribute @ApiIgnore UserVO user, @PathVariable Long clsId, @RequestBody List importOrgUsers) { + public void importCompanyUserInfo(@RequestAttribute AccountVO user, @PathVariable Long clsId, @RequestBody List importOrgUsers) { iOrgUserService.importCompanyUserInfo(user, clsId, importOrgUsers); } - @ApiOperation(value = "获取单位用户的部门信息") + /** + *获取单位用户的部门信息 + */ @GetMapping("{companyId}/userDeparts") - public List getUserCompanyDeparts(@RequestAttribute @ApiIgnore UserVO user, @PathVariable Integer companyId) { + public List getUserCompanyDeparts(@RequestAttribute AccountVO user, @PathVariable Integer companyId) { return iOrgUserService.getUserCompanyDeparts(user, companyId); } - @ApiOperation("查询自己给该组织（班级）排的课") + /** + *查询自己给该组织（班级）排的课 + */ @GetMapping("/orgLesson/{orgId}/list") - public List queryOrgLessonICreated(@PathVariable Long orgId, @RequestAttribute UserVO user) { + public List queryOrgLessonICreated(@PathVariable Long orgId, @RequestAttribute AccountVO user) { return iOrgLessonService.queryOrgLessonICreated(orgId, user); } - @ApiOperation("修改班级-课程关系") + /** + *修改班级-课程关系 + */ @PutMapping("/orgLesson/{clsId}/update") public void updateOrgLesson(@PathVariable Long clsId, @RequestBody List lessonIds, @RequestAttribute LoginUserInfoVO loginInfo) { iOrgLessonService.updateOrgLesson(clsId, lessonIds, loginInfo); } - @ApiOperation("给班级添加学生") + /** + *给班级添加学生 + */ @PostMapping("/orgUser/{clsId}/addStudent") - public void addStudent(@PathVariable Long clsId, @RequestBody ImportOrgUserVO importVO, @RequestAttribute UserVO user) { + public void addStudent(@PathVariable Long clsId, @RequestBody ImportOrgUserVO importVO, @RequestAttribute AccountVO user) { iOrgUserService.addStudent(clsId, importVO, user); } - @ApiOperation("创建班级") + /** + *创建班级 + */ @PostMapping("/org/cls/create") public void createCls(@RequestBody NonTopOrgCreateVO createVO, @RequestAttribute LoginUserInfoVO loginInfo) { iOrgService.createCls(createVO, loginInfo); } - @ApiOperation("分页查询当前登录项目所属组织下的班级") + /** + *分页查询当前登录项目所属组织下的班级 + */ @GetMapping("/paged/cls") public PageVO pagedQuerySelfCls(OrgQueryVO queryVO, @RequestAttribute LoginUserInfoVO loginInfo) { return iOrgService.pagedQueryCls(queryVO, loginInfo); } - @ApiOperation("查询当前登录项目所属组织下的班级") + /** + *查询当前登录项目所属组织下的班级 + */ @GetMapping("/list/cls") public List queryCls(OrgQueryVO queryVO, @RequestAttribute LoginUserInfoVO loginInfo) { return iOrgService.queryCls(queryVO, loginInfo); } - @ApiOperation("创建评价规则") + /** + *创建评价规则 + */ @PostMapping("/orgScoringRule") public void createScoringRule(@RequestBody OrgScoringRuleVO orgScoringRuleVO, @RequestAttribute LoginUserInfoVO loginInfo) { iOrgScoringRuleService.createScoringRule(orgScoringRuleVO, loginInfo); } - @ApiOperation("更新评价规则") + /** + *更新评价规则 + */ @PutMapping("/orgScoringRule") - public void UpdateScoringRule(@RequestBody OrgScoringRuleVO orgScoringRuleVO, @RequestAttribute UserVO user) { + public void UpdateScoringRule(@RequestBody OrgScoringRuleVO orgScoringRuleVO, @RequestAttribute AccountVO user) { iOrgScoringRuleService.updateScoringRule(orgScoringRuleVO, user); } - @ApiOperation("查询自己创建的评价规则基础信息") + /** + *查询自己创建的评价规则基础信息 + */ @GetMapping("/orgScoringRule/basicInfo/self/paged") - public PageVO queryOrgScoringRuleBasicInfo(OrgScoringRuleQueryVO queryVO, @RequestAttribute UserVO user) { + public PageVO queryOrgScoringRuleBasicInfo(OrgScoringRuleQueryVO queryVO, @RequestAttribute AccountVO user) { return iOrgScoringRuleService.queryBasicInfo(queryVO, user); } - @ApiOperation("查询自己创建的指定评价规则详细信息") + /** + *查询自己创建的指定评价规则详细信息 + */ @GetMapping("/orgScoringRule/details/self/{orgId}/{schoolYear}/{term}") public OrgScoringRuleVO queryOrgScoringRuleDetails(@PathVariable Long orgId, @PathVariable String schoolYear, @PathVariable Integer term, @RequestAttribute LoginUserInfoVO loginInfo) { return iOrgScoringRuleService.queryOrgScoringRuleDetails(orgId, schoolYear, term, loginInfo); } - @ApiOperation("查询指定评价规则详细信息") + /** + *查询指定评价规则详细信息 + */ @GetMapping("/orgScoringRule/details/self/{ruleId}") public OrgScoringRuleVO queryOrgScoringRuleDetails(@PathVariable Long ruleId) { return iOrgScoringRuleService.getOrgScoringRuleDetails(ruleId); } - @ApiOperation("获取评价规则的评分结果") + /** + *获取评价规则的评分结果 + */ @GetMapping("/orgScoringRule/score/{orgId}/{schoolYear}/{term}") public List score(@PathVariable Long orgId, @PathVariable String schoolYear, @PathVariable Integer term, @RequestAttribute LoginUserInfoVO loginInfo) { return iOrgScoringRuleService.score(orgId, schoolYear, term, loginInfo); } - @ApiOperation("删除评分规则") + /** + *删除评分规则 + */ @DeleteMapping("/orgScoringRule/details/self/{ruleId}") - public void deleteScoringRule(@PathVariable Long ruleId, @RequestAttribute UserVO user) { + public void deleteScoringRule(@PathVariable Long ruleId, @RequestAttribute AccountVO user) { iOrgScoringRuleService.deleteRuleOfSelf(ruleId, user.getId()); } - @ApiOperation("查询规则能够应用到的组织") + /** + *查询规则能够应用到的组织 + */ @GetMapping("/orgScoringRule/{ruleId}/canApplyTo") - public List queryRuleCanApplyTo(@PathVariable Long ruleId, @RequestAttribute UserVO user) { + public List queryRuleCanApplyTo(@PathVariable Long ruleId, @RequestAttribute AccountVO user) { return iOrgScoringRuleService.queryRuleCanApplyTo(ruleId, user); } - @ApiOperation("将评价规则应用到") + /** + *将评价规则应用到 + */ @PostMapping("/orgScoringRule/{ruleId}/apply") public void applyOrgScoringRule(@PathVariable Long ruleId, @RequestBody List orgIds) { iOrgScoringRuleService.applyOrgScoringRule(ruleId, orgIds); } - @ApiOperation("给班级安排考试") + /** + *给班级安排考试 + */ @PostMapping("/orgExam/{clsId}") - public void createOrgExam(@PathVariable Long clsId, @RequestBody List examIds, @RequestAttribute UserVO user) { + public void createOrgExam(@PathVariable Long clsId, @RequestBody List examIds, @RequestAttribute AccountVO user) { iOrgExamService.create(clsId, examIds, user); } - @ApiOperation("查询班级安排的考试id") + /** + *查询班级安排的考试id + */ @GetMapping("/orgExam/{clsId}/list") - public List queryOrgExam(@PathVariable Long clsId, @RequestAttribute UserVO user) { + public List queryOrgExam(@PathVariable Long clsId, @RequestAttribute AccountVO user) { return iOrgExamService.queryOrgExam(clsId, user); } + /** + *管理员查看组织树 + */ @Role(RoleEnum.Admin) - @ApiOperation("管理员查看组织树") @GetMapping("/orgTree/{orgId}") - public Node adminQueryOrgTree(@PathVariable Long orgId, @RequestAttribute UserVO user) { + public Node adminQueryOrgTree(@PathVariable Long orgId, @RequestAttribute AccountVO user) { return iOrgService.adminQueryOrgTree(orgId); } - @Transactional - @ApiOperation("数据处理接口，用后即删") - @PutMapping("/data/data") - public void data() { - OrgUserExample orgUserExample = new OrgUserExample(); - orgUserExample.createCriteria().andRoleEqualTo(BusinessConsts.OrgRole.Student.name()); - List ous = orgUserDAO.selectByExample(orgUserExample); - Set orgIdSet = new HashSet<>(); - Map> userId_orgIdSet_map = new HashMap<>(); - ous.forEach(ou -> { - orgIdSet.add(ou.getOrgId()); - Set userOrgIdSet = userId_orgIdSet_map.computeIfAbsent(ou.getUserId(), k -> new HashSet<>()); - userOrgIdSet.add(ou.getOrgId()); - }); - List orgList = iOrgService.findEntities(new ArrayList<>(orgIdSet), null); - Map orgId_rootId_map = orgList.stream().collect(Collectors.toMap(Org::getId, Org::getRootId)); - Map topOrgMap = iOrgService.findEntities(new ArrayList<>(orgId_rootId_map.values()), null) - .stream().collect(Collectors.toMap(Org::getId, Function.identity())); - List users = iSysUserService.findEntities(new ArrayList<>(userId_orgIdSet_map.keySet()), null); - Set nonRootOrgIds = new HashSet<>(); - users.forEach(user -> { - Set userOrgIdSet = userId_orgIdSet_map.get(user.getId()); - String orgCode = null; - Long rootId = null; - for (Long orgId : userOrgIdSet) { - rootId = orgId_rootId_map.get(orgId); - if (rootId == null) { - nonRootOrgIds.add(rootId); - } else { - Org org = topOrgMap.get(rootId); - if (orgCode == null) { - orgCode = org.getCode(); - } else { - BusinessExceptionAssertEnum.DATA_ERROR.assertEquals(orgCode, org.getCode(), userOrgIdSet.toString()); - } - } - } - BusinessExceptionAssertEnum.DATA_ERROR.assertNotNull(orgCode, user.getId() + "无所属顶级组织"); - user.setAccount(user.getAccount().substring(0, user.getAccount().indexOf(orgCode))); - user.setOrgId(rootId); - sysUserDAO.updateByPrimaryKey(user); - }); - System.out.println(nonRootOrgIds.toString()); + /** + *获取学生实训使用时长 + */ + @GetMapping("/usage/students") + public List statisticUsage(@Validated UsageQueryVO queryVO) { + return iOrgUserService.statisticUsage(queryVO); + } + + /** + * 获取绑定组织二维码 + */ + @GetMapping("/{orgId}/qrCode") + public String getBindQrCode(@PathVariable Long orgId, @RequestAttribute LoginUserInfoVO loginInfo) { + return iOrgService.getBindQrCode(orgId, loginInfo.getProject()); } } diff --git a/src/main/java/club/joylink/rtss/controller/OrganizationController.java b/src/main/java/club/joylink/rtss/controller/OrganizationController.java index 4e181d65f..b32b51b94 100644 --- a/src/main/java/club/joylink/rtss/controller/OrganizationController.java +++ b/src/main/java/club/joylink/rtss/controller/OrganizationController.java @@ -1,22 +1,16 @@ package club.joylink.rtss.controller; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - import club.joylink.rtss.services.IOrganizationService; import club.joylink.rtss.vo.client.OrganizationVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import java.util.List; -@Api(tags = {"组织/企业管理接口"}) +/** + * 组织/企业管理接口 + */ @RestController @RequestMapping("/api/organization") public class OrganizationController { @@ -24,14 +18,21 @@ public class OrganizationController { @Autowired private IOrganizationService iOrganizationService; - @ApiOperation(value = "获取组织/企业数据") + /** + * 获取组织/企业数据 + * @return + */ @GetMapping(path = "") public List queryOrganization() { List list = this.iOrganizationService.queryOrganization(); return list; } - @ApiOperation(value = "添加组织/企业") + /** + * 添加组织/企业 + * @param organization + * @return + */ @PostMapping(path = "") public OrganizationVO create(@RequestBody @Validated OrganizationVO organization) { OrganizationVO org = this.iOrganizationService.create(organization); diff --git a/src/main/java/club/joylink/rtss/controller/PassengerFlowParamController.java b/src/main/java/club/joylink/rtss/controller/PassengerFlowParamController.java index e51e4dc07..5b9adf24d 100644 --- a/src/main/java/club/joylink/rtss/controller/PassengerFlowParamController.java +++ b/src/main/java/club/joylink/rtss/controller/PassengerFlowParamController.java @@ -2,7 +2,7 @@ package club.joylink.rtss.controller; import club.joylink.rtss.controller.advice.AuthenticateInterceptor; import club.joylink.rtss.services.pfp.PfpService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.pfp.PfpVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,8 +21,8 @@ public class PassengerFlowParamController { @GetMapping(path = "/list") public List queryList(@RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) - UserVO userVO) { - List list = this.pfpService.queryEntityList(userVO); + AccountVO accountVO) { + List list = this.pfpService.queryEntityList(accountVO); return list; } @@ -35,8 +35,8 @@ public class PassengerFlowParamController { @PostMapping(path = "") public String create(@RequestBody PfpVO param, @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) - UserVO userVO) { - String id = this.pfpService.create(param, userVO); + AccountVO accountVO) { + String id = this.pfpService.create(param, accountVO); return id; } diff --git a/src/main/java/club/joylink/rtss/controller/ProjectServerController.java b/src/main/java/club/joylink/rtss/controller/ProjectServerController.java index dd172583d..87e1a9e8a 100644 --- a/src/main/java/club/joylink/rtss/controller/ProjectServerController.java +++ b/src/main/java/club/joylink/rtss/controller/ProjectServerController.java @@ -4,8 +4,10 @@ import club.joylink.rtss.constants.Project; import club.joylink.rtss.constants.RoleEnum; import club.joylink.rtss.controller.advice.AuthenticateInterceptor; import club.joylink.rtss.controller.advice.Role; +import club.joylink.rtss.exception.BaseException; +import club.joylink.rtss.exception.BusinessExceptionAssertEnum; import club.joylink.rtss.services.project.ServerService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.project.ProjectServerQueryVO; import club.joylink.rtss.vo.project.ProjectServerVO; @@ -13,6 +15,9 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +/** + * 项目域名管理接口 + */ @Slf4j @RestController @RequestMapping("/api/projectServer") @@ -22,8 +27,14 @@ public class ProjectServerController { private ServerService serverService; @GetMapping("/project/{project}") - public ProjectServerVO getByProject(@PathVariable Project project) { - return this.serverService.getByProject(project); + public ProjectServerVO getByProject(@PathVariable String project) { + try { + return this.serverService.getByProject(Project.valueOf(project)); + } catch (BaseException e) { + throw e; + } catch (Exception e) { + throw BusinessExceptionAssertEnum.SYSTEM_EXCEPTION.exception(e); + } } @Role(RoleEnum.SuperAdmin) @@ -35,16 +46,22 @@ public class ProjectServerController { @Role(RoleEnum.SuperAdmin) @PostMapping("") public String create(@RequestBody ProjectServerVO vo, - @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) UserVO userVO) { - return this.serverService.create(vo, userVO); + @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) AccountVO accountVO) { + return this.serverService.create(vo, accountVO); } @Role(RoleEnum.SuperAdmin) @PutMapping("/{id}") public void update(@PathVariable Long id, @RequestBody ProjectServerVO vo, - @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) UserVO userVO) { - this.serverService.update(id, vo, userVO); + @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) AccountVO accountVO) { + this.serverService.update(id, vo, accountVO); + } + + @Role(RoleEnum.SuperAdmin) + @DeleteMapping("/{id}") + public void delete(@PathVariable Long id) { + this.serverService.delete(id); } } diff --git a/src/main/java/club/joylink/rtss/controller/ReleaseReviewController.java b/src/main/java/club/joylink/rtss/controller/ReleaseReviewController.java index 3dbc66ab6..9df227e84 100644 --- a/src/main/java/club/joylink/rtss/controller/ReleaseReviewController.java +++ b/src/main/java/club/joylink/rtss/controller/ReleaseReviewController.java @@ -2,23 +2,22 @@ package club.joylink.rtss.controller; import club.joylink.rtss.controller.advice.AuthenticateInterceptor; import club.joylink.rtss.services.IReleaseReviewService; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.LoginUserInfoVO; -import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.*; import club.joylink.rtss.vo.client.runplan.RunPlanQueryVO; import club.joylink.rtss.vo.client.runplan.RunPlanVO; import club.joylink.rtss.vo.client.script.ScriptQueryVO; import club.joylink.rtss.vo.client.script.ScriptVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; -@Api(tags = { "发布审核接口" }) +/** + *发布审核接口 + */ @RestController @RequestMapping("/api/review") public class ReleaseReviewController { @@ -26,89 +25,117 @@ public class ReleaseReviewController { @Autowired private IReleaseReviewService iReleaseReviewService; - @ApiOperation(value = "分页获取待审核的草稿课程") + /** + *分页获取待审核的草稿课程 + */ @GetMapping(path = "/query/lesson") public PageVO queryPendingReviewLesson(ReleaseReviewQueryVO queryVO){ return iReleaseReviewService.queryPendingReviewLesson(queryVO); } - @ApiOperation(value = "发布课程") + /** + *发布课程 + */ @PostMapping(path="/{id}/publishLesson") public void publishLesson(@PathVariable Long id, @RequestBody @Validated LessonPublishVO publishVO) { iReleaseReviewService.publishLesson(id, publishVO); } - @ApiOperation(value = "课程申请驳回") + /** + *课程申请驳回 + */ @PostMapping(path = "/lesson/{id}") public void rejectLesson(@PathVariable Long id, @RequestBody ReleaseReviewQueryVO queryVO){ iReleaseReviewService.rejectLesson(id,queryVO.getExplanation()); } - @ApiOperation(value = "用户申请发布课程或者撤销课程申请") + /** + *用户申请发布课程或者撤销课程申请 + */ @GetMapping(path = "/lesson/releaseOrCancel/{id}/{status}") public void applicationForReleaseOrCancelLesson(@PathVariable Long id,@PathVariable String status){ iReleaseReviewService.applicationForReleaseOrCancelLesson(id,status); } - @ApiOperation(value = "预览课程") + /** + *预览课程 + */ @GetMapping(path = "/previewLesson/{id}") public List previewLesson(@PathVariable Long id){ return iReleaseReviewService.previewLesson(id); } //---------------------------------------- - @ApiOperation(value = "分页获取待审核的草稿剧本") + /** + *分页获取待审核的草稿剧本 + */ @GetMapping(path = "/query/script") public PageVO queryPendingReviewScript(ScriptQueryVO queryVO){ return iReleaseReviewService.queryPendingReviewScript(queryVO); } - @ApiOperation(value = "发布剧本") + /** + *发布剧本 + */ @PostMapping(path="/{id}/publishScript") - public void publishScript(@PathVariable Long id, @ApiIgnore @RequestAttribute UserVO user){ + public void publishScript(@PathVariable Long id, @RequestAttribute AccountVO user){ iReleaseReviewService.publishScript(id, user); } - @ApiOperation(value = "剧本申请驳回") + /** + *剧本申请驳回 + */ @PostMapping(path = "/script/{id}") public void rejectScript(@PathVariable Long id, @RequestBody @Validated ReleaseReviewVO releaseReviewVO){ iReleaseReviewService.rejectScript(id, releaseReviewVO); } //------------------------------------ - @ApiOperation(value = "分页获取待审核的草稿运行图") + /** + *分页获取待审核的草稿运行图 + */ @GetMapping(path = "/query/runPlan") public PageVO queryPendingReviewRunPlan(RunPlanQueryVO queryVO){ return iReleaseReviewService.queryPendingReviewRunPlan(queryVO); } - @ApiOperation(value = "发布运行图") + /** + *发布运行图 + */ @PostMapping(path = "/{planId}/publishRunPlan") - public List publishRunPlan(@PathVariable Long planId, @ApiIgnore @RequestAttribute UserVO user){ + public List publishRunPlan(@PathVariable Long planId, @RequestAttribute AccountVO user){ return iReleaseReviewService.publishRunPlan(planId, user); } - @ApiOperation(value = "直接发布运行图") + /** + *直接发布运行图 + */ @PostMapping(path = "/{planId}/directPublishRunPlan") - public List directPublishRunPlan(@PathVariable Long planId, String runPlanName, @ApiIgnore @RequestAttribute UserVO user){ + public List directPublishRunPlan(@PathVariable Long planId, String runPlanName, @RequestAttribute AccountVO user){ return iReleaseReviewService.directPublishRunPlan(planId, runPlanName, user); } - @ApiOperation(value = "运行图申请驳回") + /** + *运行图申请驳回 + */ @PostMapping(path = "/runPlan/{id}") public void rejectRunPlan(@PathVariable Long id,@RequestBody ReleaseReviewQueryVO queryVO){ iReleaseReviewService.rejectRunPlan(id,queryVO.getExplanation()); } - @ApiOperation(value = "用户申请发布运行图或者撤销运行图申请") + /** + *用户申请发布运行图或者撤销运行图申请 + */ @GetMapping(path = "/runPlan/releaseOrCancel/{id}/{status}") public void applicationForReleaseOrCancelRunPlan(@PathVariable Long id, @PathVariable String status){ iReleaseReviewService.applicationForReleaseOrCancelRunPlan(id,status); } - @ApiOperation(value = "预览运行图") + /** + *预览运行图 + */ @GetMapping(path = "/previewRunPlan/{planId}") - public String reviewRunPlan(@PathVariable Long planId,@ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) + public String reviewRunPlan(@PathVariable Long planId, @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO loginUserInfoVO){ return iReleaseReviewService.previewRunPlan(planId,loginUserInfoVO); } diff --git a/src/main/java/club/joylink/rtss/controller/RunPlanToolsController.java b/src/main/java/club/joylink/rtss/controller/RunPlanToolsController.java index eaabf6634..50bd9043d 100644 --- a/src/main/java/club/joylink/rtss/controller/RunPlanToolsController.java +++ b/src/main/java/club/joylink/rtss/controller/RunPlanToolsController.java @@ -1,30 +1,16 @@ package club.joylink.rtss.controller; import club.joylink.rtss.services.rpTools.RunPlanToolsService; -import club.joylink.rtss.vo.client.rpTools.AreaVO; -import club.joylink.rtss.vo.client.rpTools.MapStationVO; -import club.joylink.rtss.vo.client.rpTools.MapVO; -import club.joylink.rtss.vo.client.rpTools.RunPlanConfigVO; -import club.joylink.rtss.vo.client.rpTools.RunPlanDataVO; -import club.joylink.rtss.vo.client.rpTools.RunPlanGroupVO; -import club.joylink.rtss.vo.client.rpTools.TripAddVO; -import club.joylink.rtss.vo.client.rpTools.TripChangeVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import club.joylink.rtss.vo.client.rpTools.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(tags = "运行图工具接口") +/** + *运行图工具接口 + */ @RestController @RequestMapping(path = "/api/rpTools") public class RunPlanToolsController { @@ -32,139 +18,185 @@ public class RunPlanToolsController { @Autowired private RunPlanToolsService runPlanToolsService; - @ApiOperation(value = "查询线路列表") + /** + *查询线路列表 + */ @GetMapping(path = "/map") public List listMap() { return runPlanToolsService.listMap(); } - @ApiOperation(value = "查询线路车站列表") + /** + *查询线路车站列表 + */ @GetMapping(path = "/{mapId}/station") public List listMapStation(@PathVariable Long mapId) { return runPlanToolsService.listMapStation(mapId); } - @ApiOperation(value = "更新线路车站") + /** + *更新线路车站 + */ @PutMapping(path = "/station/{stationId}") public void updateStation(@PathVariable Long stationId, @RequestBody MapStationVO stationVO) { runPlanToolsService.updateStation(stationId, stationVO); } - @ApiOperation(value = "查询运行图列表") + /** + *查询运行图列表 + */ @GetMapping(path = "") public List listRunPlan() { return runPlanToolsService.listRunPlan(); } - @ApiOperation(value = "创建新运行图") + /** + *创建新运行图 + */ @PostMapping(path = "") public Long create(@RequestBody @Validated RunPlanGroupVO groupVO) { return runPlanToolsService.create(groupVO); } - @ApiOperation(value = "获取运行图数据") + /** + *获取运行图数据 + */ @GetMapping(path = "/{planId}") public RunPlanDataVO getRunPlanECharts(@PathVariable Long planId) { return runPlanToolsService.getRunPlanECharts(planId); } - @ApiOperation(value = "获取运行图配置") + /** + *获取运行图配置 + */ @GetMapping(path = "/{planId}/config") public RunPlanConfigVO getRunPlanConfig(@PathVariable Long planId) { return runPlanToolsService.getRunPlanConfig(planId); } - @ApiOperation(value = "修改运行图配置") + /** + *修改运行图配置 + */ @PutMapping(path = "/{planId}/config") public void setRunPlanConfig(@PathVariable Long planId, @RequestBody RunPlanConfigVO configVO) { runPlanToolsService.setRunPlanConfig(planId, configVO); } - @ApiOperation(value = "编辑运行图") + /** + *编辑运行图 + */ @PutMapping(path = "/{planId}/edit") public Boolean editPlan(@PathVariable Long planId) { return runPlanToolsService.editPlan(planId); } - @ApiOperation(value = "结束编辑") + /** + *结束编辑 + */ @PutMapping(path = "/{planId}/endEdit") public void endEdit(@PathVariable Long planId) { runPlanToolsService.endEdit(planId); } - @ApiOperation(value = "添加车次") + /** + *添加车次 + */ @PostMapping(path = "/{planId}/trip") public void addTrip(@PathVariable Long planId, @RequestBody @Validated TripAddVO tripAddVO) { runPlanToolsService.addTrip(planId, tripAddVO); } - @ApiOperation(value = "修改站间运行时间") + /** + *修改站间运行时间 + */ @PutMapping(path = "/{planId}/{tripNo}/running") public void changeArrivalTime(@PathVariable Long planId, @PathVariable Integer tripNo, @RequestBody @Validated TripChangeVO tripChangeVO) { runPlanToolsService.changeRunningTime(planId, tripNo, tripChangeVO); } - @ApiOperation(value = "修改停站时间") + /** + *修改停站时间 + */ @PutMapping(path = "/{planId}/{tripNo}/stop") public void changeDepartureTime(@PathVariable Long planId, @PathVariable Integer tripNo, @RequestBody @Validated TripChangeVO tripChangeVO) { runPlanToolsService.changeStopTime(planId, tripNo, tripChangeVO); } - @ApiOperation(value = "平移服务") + /** + *平移服务 + */ @PutMapping(path = "/{planId}/{serviceNo}/service") public void changeServiceTime(@PathVariable Long planId, @PathVariable Integer serviceNo, @RequestBody TripChangeVO tripChangeVO) { runPlanToolsService.changeServiceTime(planId, serviceNo, tripChangeVO); } - @ApiOperation(value = "修改折返时间") + /** + *修改折返时间 + */ @PutMapping(path = "/{planId}/{tripNo}/turnBack") public void changeTurnBackTime(@PathVariable Long planId, @PathVariable Integer tripNo, @RequestBody TripChangeVO tripChangeVO) { runPlanToolsService.changeTurnBackTime(planId, tripNo, tripChangeVO); } - @ApiOperation(value = "删除车次") + /** + *删除车次 + */ @DeleteMapping(path = "/{planId}/{tripNo}/trip") public void deleteTrip(@PathVariable Long planId, @PathVariable Integer tripNo) { runPlanToolsService.deleteTrip(planId, tripNo); } - @ApiOperation(value = "删除服务") + /** + *删除服务 + */ @DeleteMapping(path = "/{planId}/{serviceNo}/service") public void deleteService(@PathVariable Long planId, @PathVariable Integer serviceNo) { runPlanToolsService.deleteService(planId, serviceNo); } - @ApiOperation(value = "添加施工区域") + /** + *添加施工区域 + */ @PostMapping(path = "/{planId}/area") public void addArea(@PathVariable Long planId, @RequestBody @Validated AreaVO areaVO) { runPlanToolsService.addArea(planId, areaVO); } - @ApiOperation(value = "修改区域") + /** + *修改区域 + */ @PutMapping(path = "/{planId}/{areaNo}/area") public void changeArea(@PathVariable Long planId, @PathVariable Integer areaNo, @RequestBody @Validated AreaVO areaVO) { runPlanToolsService.changeArea(planId, areaNo, areaVO); } - @ApiOperation(value = "修改区域文字") + /** + *修改区域文字 + */ @PutMapping(path = "/{planId}/{areaNo}/text") public void changeAreaText(@PathVariable Long planId, @PathVariable Integer areaNo, @RequestBody AreaVO areaVO) { runPlanToolsService.changeAreaText(planId, areaNo, areaVO); } - @ApiOperation(value = "删除区域") + /** + *删除区域 + */ @DeleteMapping(path = "/{planId}/{areaNo}/area") public void deleteArea(@PathVariable Long planId, @PathVariable Integer areaNo) { runPlanToolsService.deleteArea(planId, areaNo); } - @ApiOperation(value = "清除数据") + /** + *清除数据 + */ @PutMapping(path = "/{planId}/clear") public void clear(@PathVariable Long planId) { runPlanToolsService.clear(planId); } - @ApiOperation(value = "删除运行图") + /** + *删除运行图 + */ @DeleteMapping(path = "/{groupId}") public void delete(@PathVariable Long groupId) { runPlanToolsService.delete(groupId); diff --git a/src/main/java/club/joylink/rtss/controller/SmsController.java b/src/main/java/club/joylink/rtss/controller/SmsController.java new file mode 100644 index 000000000..98de64c0e --- /dev/null +++ b/src/main/java/club/joylink/rtss/controller/SmsController.java @@ -0,0 +1,67 @@ +package club.joylink.rtss.controller; + +import club.joylink.rtss.exception.BusinessExceptionAssertEnum; +import club.joylink.rtss.services.ISmsService; +import club.joylink.rtss.util.JsonUtils; +import club.joylink.rtss.vo.SmsResponse; +import club.joylink.rtss.vo.sms.SmsSendRecordVo; +import club.joylink.rtss.vo.sms.ZzjAlertSmsParamVo; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * 短信接口 + */ +@Slf4j +@RestController +@RequestMapping("/api/sms") +public class SmsController { + private static final Map SendMap = new ConcurrentHashMap<>(); + @Autowired + private ISmsService iSmsService; + + @PostMapping("/zzjAlert") + public synchronized SmsSendRecordVo sendZzjAlert(@RequestBody ZzjAlertSmsParamVo paramVo) { + BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL + .assertTrue(paramVo.isValidRequest(), "invalided request"); + String key = paramVo.buildKey(); + SmsSendRecordVo recordVo = SendMap.get(key); + if (recordVo == null) { + recordVo = new SmsSendRecordVo(key); + SendMap.put(key, recordVo); + } + if (!recordVo.needSend()) { + log.info("告警短信：{} 不发送", key); + return recordVo; + } + try { + log.info("发送告警短信：{}", key); + long ts = System.currentTimeMillis(); + List params = new ArrayList<>(); + params.add(paramVo.getDeviceName()); + params.add(paramVo.getDescription()); + SmsResponse resp = this.iSmsService.sendZzjAlertNotice(paramVo.getMobile(), + paramVo.getNationCode(), params, ts); + log.info("腾讯短信发送结果：{}", JsonUtils.writeValueAsString(resp)); + if (resp.getResult() == 0 || resp.getResult() == 1023 || resp.getResult() == 1025 || resp.getResult() == 1026) { + recordVo.sendSuccess(); + } else { + recordVo.sendFailed(); + } + } catch (Exception e) { + recordVo.sendFailed(); + } + return recordVo; + } + + +} diff --git a/src/main/java/club/joylink/rtss/controller/SysNoticeController.java b/src/main/java/club/joylink/rtss/controller/SysNoticeController.java index 83e110d2c..4f4fe6da1 100644 --- a/src/main/java/club/joylink/rtss/controller/SysNoticeController.java +++ b/src/main/java/club/joylink/rtss/controller/SysNoticeController.java @@ -3,21 +3,20 @@ package club.joylink.rtss.controller; import club.joylink.rtss.constants.RoleEnum; import club.joylink.rtss.controller.advice.Role; import club.joylink.rtss.services.notice.ISystemNoticeService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.notice.SysNoticePageQueryVO; import club.joylink.rtss.vo.client.notice.SystemNoticeVO; import club.joylink.rtss.vo.client.notice.UserSysnoticeUnreadVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; -@Api(tags = {"系统通知接口"}) +/** + *系统通知接口 + */ @RestController @RequestMapping(path = "api/v1/sysNotice") public class SysNoticeController { @@ -25,37 +24,47 @@ public class SysNoticeController { @Autowired private ISystemNoticeService systemNoticeService; - @ApiOperation(value = "通知") + /** + *通知 + */ @PostMapping @Role(RoleEnum.SuperAdmin) - public void notice(@ApiIgnore @RequestAttribute UserVO user, String noticeType, @RequestBody @Validated SystemNoticeVO sysNotice) { + public void notice(@RequestAttribute AccountVO user, String noticeType, @RequestBody @Validated SystemNoticeVO sysNotice) { sysNotice.setCreator(user.getId()); systemNoticeService.notice(sysNotice, noticeType); } - @ApiOperation(value = "分页查询通知") + /** + *分页查询通知 + */ @GetMapping(path = "/paging") public PageVO pagingQuery(SysNoticePageQueryVO pageQueryVO) { return systemNoticeService.pagingQuerySysNotice(pageQueryVO); } - @ApiOperation(value = "删除通知") + /** + *删除通知 + */ @DeleteMapping @Role(RoleEnum.SuperAdmin) public void deleteSysNotice(@RequestBody List sysNoticeIds) { systemNoticeService.deleteSysNotice(sysNoticeIds); } - @ApiOperation(value = "用户查询未读通知") + /** + *用户查询未读通知 + */ @GetMapping(path = "/unread") - public UserSysnoticeUnreadVO loadCompetitionPaper(@ApiIgnore @RequestAttribute UserVO user) { + public UserSysnoticeUnreadVO loadCompetitionPaper(@RequestAttribute AccountVO user) { return systemNoticeService.getUserRelUnreadNotice(user); } - @ApiOperation(value = "用户设置已读未读") + /** + *用户设置已读未读 + */ @PutMapping(path = "/read") - public void getCompetitionPaper(@ApiIgnore @RequestAttribute UserVO user, @RequestBody List sysNoticeIds, @RequestParam(defaultValue = "true",required = false) boolean read) { + public void getCompetitionPaper(@RequestAttribute AccountVO user, @RequestBody List sysNoticeIds, @RequestParam(defaultValue = "true",required = false) boolean read) { systemNoticeService.setUserSysNoticeReadStatus(user, sysNoticeIds, read); } diff --git a/src/main/java/club/joylink/rtss/controller/VoiceCommandController.java b/src/main/java/club/joylink/rtss/controller/VoiceCommandController.java index 07de0ff7a..74753cf9c 100644 --- a/src/main/java/club/joylink/rtss/controller/VoiceCommandController.java +++ b/src/main/java/club/joylink/rtss/controller/VoiceCommandController.java @@ -1,9 +1,7 @@ package club.joylink.rtss.controller; -import club.joylink.rtss.simulation.cbtc.command.VoiceCommandBO; import club.joylink.rtss.services.IVoiceCommandService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import club.joylink.rtss.simulation.cbtc.command.VoiceCommandBO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -12,20 +10,28 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; -@Api(tags = "语音指令接口") +/** + * 语音指令接口 + */ @RestController @RequestMapping("/api/voiceCommand") public class VoiceCommandController { @Autowired private IVoiceCommandService iVoiceCommandService; - @ApiOperation("添加语音指令") + /** + * 添加语音指令 + * @param command + */ @PostMapping("") public void create(VoiceCommandBO command) { iVoiceCommandService.create(command); } - @ApiOperation("查询所有语音指令") + /** + * 查询所有语音指令 + * @return + */ @GetMapping("") public List getAll() { return iVoiceCommandService.getAll(); diff --git a/src/main/java/club/joylink/rtss/controller/advice/AuthenticateInterceptor.java b/src/main/java/club/joylink/rtss/controller/advice/AuthenticateInterceptor.java index 5a8807425..0a3ddd6b8 100644 --- a/src/main/java/club/joylink/rtss/controller/advice/AuthenticateInterceptor.java +++ b/src/main/java/club/joylink/rtss/controller/advice/AuthenticateInterceptor.java @@ -12,7 +12,6 @@ import org.springframework.web.servlet.HandlerInterceptor; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Objects; /** * 权限验证拦截器 @@ -33,21 +32,16 @@ public class AuthenticateInterceptor implements HandlerInterceptor { @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { -// String host = request.getHeader("Host"); -// String forwardedHost = request.getHeader("X-Forwarded-Host"); -// String forwardedFor = request.getHeader("X-Forwarded-For"); -// log.debug(String.format("host:[%s], forwardedHost:[%s], forwardedFor:[%s]", host, forwardedHost, forwardedFor)); - String realIp = request.getHeader("X-Real-IP"); - log.debug(String.format("request[Method: '%s', RealIp: [%s], RemoteAddr: '%s', RequestURI: '%s']", - request.getMethod(), realIp, request.getRemoteAddr(), request.getRequestURI())); // 登陆权限验证 if(RequestMethod.OPTIONS.name().equals(request.getMethod())) return true; + log.debug(String.format("request[%s %s from:%s]", + request.getMethod(), request.getRequestURI(), request.getRemoteAddr())); String token = request.getHeader("X-Token"); BusinessExceptionAssertEnum.NOT_LOGIN.assertTrue(StringUtils.hasText(token)); LoginUserInfoVO loginUserInfoVO = null; // token获取登陆用户 loginUserInfoVO = this.loginSessionManager.getLoginInfoByToken(token); - request.setAttribute(LOGIN_USER_KEY, loginUserInfoVO.getUserVO()); + request.setAttribute(LOGIN_USER_KEY, loginUserInfoVO.getAccountVO()); request.setAttribute(LOGIN_INFO_KEY, loginUserInfoVO); return true; } diff --git a/src/main/java/club/joylink/rtss/controller/advice/RoleAspect.java b/src/main/java/club/joylink/rtss/controller/advice/RoleAspect.java index f7ee36c72..ae58653c3 100644 --- a/src/main/java/club/joylink/rtss/controller/advice/RoleAspect.java +++ b/src/main/java/club/joylink/rtss/controller/advice/RoleAspect.java @@ -3,7 +3,7 @@ package club.joylink.rtss.controller.advice; import club.joylink.rtss.constants.BusinessConsts; import club.joylink.rtss.constants.RoleEnum; import club.joylink.rtss.exception.BusinessExceptionAssertEnum; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; @@ -26,9 +26,9 @@ public class RoleAspect { public void doBefore(JoinPoint joinPoint) { ServletRequestAttributes sra = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); assert sra != null; - UserVO userVO = (UserVO) sra.getRequest().getAttribute(BusinessConsts.LOGIN_USER_KEY); + AccountVO accountVO = (AccountVO) sra.getRequest().getAttribute(BusinessConsts.LOGIN_USER_KEY); // 没有登录时 - if (Objects.isNull(userVO)) { + if (Objects.isNull(accountVO)) { return; } MethodSignature signature = (MethodSignature) joinPoint.getSignature(); @@ -38,7 +38,7 @@ public class RoleAspect { // 判断用户角色和注解角色是否有交集 boolean hasRole = false; for (String role : roles) { - for (String userRole : userVO.getRoles()) { + for (String userRole : accountVO.getRoles()) { if (role.equals(userRole)) { hasRole = true; break; diff --git a/src/main/java/club/joylink/rtss/controller/audio/AudioResourcesController.java b/src/main/java/club/joylink/rtss/controller/audio/AudioResourcesController.java new file mode 100644 index 000000000..6155c0f5d --- /dev/null +++ b/src/main/java/club/joylink/rtss/controller/audio/AudioResourcesController.java @@ -0,0 +1,78 @@ +package club.joylink.rtss.controller.audio; + +import club.joylink.rtss.services.audio.AudioResourcesService; +import club.joylink.rtss.vo.client.PageVO; +import club.joylink.rtss.vo.client.audio.AudioResourcesQueryVO; +import club.joylink.rtss.vo.client.audio.AudioResourcesVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 音频资源管理 + */ +@RestController +@RequestMapping("/api/audioResources") +public class AudioResourcesController { + @Autowired + private AudioResourcesService audioResourcesService; + + /** + * 创建 + */ + @PostMapping() + public void create(@RequestBody @Validated AudioResourcesVO vo) { + audioResourcesService.create(vo); + } + + /** + * 查询所有 + */ + @GetMapping("/list") + public List getList() { + return audioResourcesService.getList(); + } + + /** + * 查询一个 + */ + @GetMapping("/{id}") + public AudioResourcesVO getById(@PathVariable Long id) { + return audioResourcesService.getById(id); + } + + /** + * 批量查询 + */ + @GetMapping("/list/ids") + public List getList(@RequestBody List ids) { + return audioResourcesService.getList(ids); + } + + /** + * 分页查询 + */ + @GetMapping("/paged") + public PageVO pagedQuery(AudioResourcesQueryVO queryVO) { + return audioResourcesService.pagedQuery(queryVO); + } + + /** + * 删除 + */ + @DeleteMapping("/{id}") + public void delete(@PathVariable Long id) { + audioResourcesService.delete(id); + } + + /** + * 更新 + */ + @PutMapping("/{id}") + public void update(@PathVariable Long id, @RequestBody AudioResourcesVO vo) { + audioResourcesService.update(id, vo); + } + +} diff --git a/src/main/java/club/joylink/rtss/controller/cache/CacheController.java b/src/main/java/club/joylink/rtss/controller/cache/CacheController.java index 4798f8d97..27a328a46 100644 --- a/src/main/java/club/joylink/rtss/controller/cache/CacheController.java +++ b/src/main/java/club/joylink/rtss/controller/cache/CacheController.java @@ -1,7 +1,7 @@ package club.joylink.rtss.controller.cache; import club.joylink.rtss.services.cache.ICacheService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.PageQueryVO; import club.joylink.rtss.vo.client.PageVO; import lombok.AllArgsConstructor; @@ -9,7 +9,6 @@ import lombok.Getter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; import java.util.stream.Collectors; @@ -28,7 +27,7 @@ public class CacheController { } @GetMapping(path = "/heartBeat") - public boolean heartBeat(@ApiIgnore @RequestAttribute UserVO user) { + public boolean heartBeat(@RequestAttribute AccountVO user) { return true; } diff --git a/src/main/java/club/joylink/rtss/controller/circuitry/CircuitryDraftController.java b/src/main/java/club/joylink/rtss/controller/circuitry/CircuitryDraftController.java new file mode 100644 index 000000000..06977eef6 --- /dev/null +++ b/src/main/java/club/joylink/rtss/controller/circuitry/CircuitryDraftController.java @@ -0,0 +1,86 @@ +package club.joylink.rtss.controller.circuitry; + +import club.joylink.rtss.services.circuitry.CircuitryDraftService; +import club.joylink.rtss.vo.AccountVO; +import club.joylink.rtss.vo.circuitry.CircuitryQueryVO; +import club.joylink.rtss.vo.circuitry.CircuitryVO; +import club.joylink.rtss.vo.client.PageVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 电路草稿 + */ +@RestController +@RequestMapping("/api/circuitryDraft") +public class CircuitryDraftController { + + @Autowired + private CircuitryDraftService circuitryDraftService; + + /** + * 查询用户所有电路数据 + * @param queryVO + * @param user + * @return + */ + @GetMapping("/list/users") + public List queryOfUser(CircuitryQueryVO queryVO, @RequestAttribute AccountVO user) { + return this.circuitryDraftService.queryListOfUser(queryVO, user); + } + + /** + * 分页查询用户电路数据 + * @param queryVO + * @param user + * @return + */ + @GetMapping("/page/users") + public PageVO pagingQueryOfUser(CircuitryQueryVO queryVO, @RequestAttribute AccountVO user) { + return this.circuitryDraftService.pagingQueryOfUser(queryVO, user); + } + + /** + * 根据id获取数据 + * @param id + * @return + */ + @GetMapping("/{id}") + public CircuitryVO getById(@PathVariable Long id) { + return this.circuitryDraftService.getVOById(id); + } + + /** + * 创建草稿 + * @param circuitryVO + * @param user + * @return + */ + @PostMapping("") + public String create(@RequestBody CircuitryVO circuitryVO, + @RequestAttribute AccountVO user) { + return this.circuitryDraftService.create(circuitryVO, user); + } + + /** + * 更新草稿数据 + * @param id + * @param circuitryVO + */ + @PutMapping("/{id}/data") + public void updateDrawData(@PathVariable Long id, @RequestBody CircuitryVO circuitryVO) { + this.circuitryDraftService.updateDrawData(id, circuitryVO); + } + + /** + * 删除草稿 + * @param id + */ + @DeleteMapping("/{id}") + public void delete(@PathVariable Long id) { + this.circuitryDraftService.delete(id); + } + +} diff --git a/src/main/java/club/joylink/rtss/controller/competition/CompetitionPracticalController.java b/src/main/java/club/joylink/rtss/controller/competition/CompetitionPracticalController.java index 944cca986..bd471caae 100644 --- a/src/main/java/club/joylink/rtss/controller/competition/CompetitionPracticalController.java +++ b/src/main/java/club/joylink/rtss/controller/competition/CompetitionPracticalController.java @@ -1,34 +1,30 @@ package club.joylink.rtss.controller.competition; +import club.joylink.rtss.constants.RoleEnum; import club.joylink.rtss.controller.advice.AuthenticateInterceptor; +import club.joylink.rtss.controller.advice.Role; import club.joylink.rtss.entity.CompetitionWithBLOBs; import club.joylink.rtss.services.completition.ICompetitionPracticalService; import club.joylink.rtss.simulation.cbtc.script.ScriptBO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.LoginUserInfoVO; -import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.PageVO; -import club.joylink.rtss.vo.client.competition.CompetitionPagedQueryVO; -import club.joylink.rtss.vo.client.competition.CompetitionResult; -import club.joylink.rtss.vo.client.competition.CompetitionVO; -import club.joylink.rtss.vo.client.competition.OperationStatisticVO; +import club.joylink.rtss.vo.client.competition.*; import club.joylink.rtss.vo.client.pay.WxPayUnifiedOrderResultVO; import club.joylink.rtss.vo.client.userPermission.UserPermissionVO; import club.joylink.rtss.vo.client.validGroup.competition.CompetitionUpdateCheck; import club.joylink.rtss.vo.view.OperationStatisticAnswerView; import com.fasterxml.jackson.annotation.JsonView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; +import org.springframework.web.multipart.MultipartFile; import java.util.List; /** * 竞赛实操内容管理 */ -@Api(tags = {"竞赛实操内容管理"}) @RestController @RequestMapping(path = "/api/v1/competitionPractical") public class CompetitionPracticalController { @@ -36,128 +32,217 @@ public class CompetitionPracticalController { @Autowired private ICompetitionPracticalService iCompetitionPracticalService; - @ApiOperation("分页查询竞赛场景信息") + /** + *分页查询竞赛场景信息 + */ @GetMapping("") public PageVO pagedQueryCompetition(CompetitionPagedQueryVO queryVO) { return iCompetitionPracticalService.pagedQueryCompetition(queryVO); } - @ApiOperation("查询竞赛场景信息列表") + /** + *查询竞赛场景信息列表 + */ @GetMapping("/list") public List getCompetitionList() { return iCompetitionPracticalService.getCompetitionList(); } - @ApiOperation("新增竞赛场景") + /** + *新增竞赛场景 + */ @PostMapping("") public void createCompetition(@RequestBody @Validated CompetitionVO competitionVO) { iCompetitionPracticalService.createCompetition(competitionVO); } - @ApiOperation("更新竞赛场景基础信息") + /** + *更新竞赛场景基础信息 + */ @PutMapping("") public void updateCompetition(@RequestBody @Validated(CompetitionUpdateCheck.class) CompetitionVO competitionVO) { iCompetitionPracticalService.updateCompetition(competitionVO); } - @ApiOperation("删除竞赛场景") + /** + *删除竞赛场景 + */ @DeleteMapping("/{id}") public void deleteCompetition(@PathVariable Long id) { iCompetitionPracticalService.deleteCompetition(id); } - @ApiOperation("获取场景详细信息") + /** + *获取场景详细信息 + */ @GetMapping("/detail/{id}") public CompetitionVO getDetail(@PathVariable Long id) { return iCompetitionPracticalService.getDetail(id); } - @ApiOperation("保存数据") + /** + *保存数据 + */ @PostMapping("/detail") public void saveDetail(@RequestBody @Validated(value = CompetitionUpdateCheck.class) CompetitionVO competitionVO) { iCompetitionPracticalService.saveDetail(competitionVO); } - @ApiOperation("导出") + /** + *导出 + */ @GetMapping("/{id}/export") public CompetitionWithBLOBs export(@PathVariable Long id) { return iCompetitionPracticalService.export(id); } - @ApiOperation("导入") + /** + *导入 + */ @PostMapping("/{scriptId}/import") public void importFromJson(@PathVariable Long scriptId, String name, @RequestBody CompetitionWithBLOBs competition) { iCompetitionPracticalService.importFromJson(scriptId, name, competition); } - @ApiOperation("查询权限") + /** + *查询权限 + */ @GetMapping("/query/permissions") - public UserPermissionVO queryPermissions(Long mapId, @RequestAttribute UserVO user) { + public UserPermissionVO queryPermissions(Long mapId, @RequestAttribute AccountVO user) { return iCompetitionPracticalService.queryPermissions(mapId, user); } - @ApiOperation("购买权限") + /** + *购买权限 + */ @PostMapping("/purchasePermission") - public WxPayUnifiedOrderResultVO purchasePermission(Long mapId, Integer monthAmount, @RequestAttribute UserVO user) { + public WxPayUnifiedOrderResultVO purchasePermission(Long mapId, Integer monthAmount, @RequestAttribute AccountVO user) { return iCompetitionPracticalService.purchasePermission(mapId, monthAmount, user); } + @Role(RoleEnum.SuperAdmin) +/** + *查询有场景录音数据的用户 + */ + @GetMapping("/voice/record/users/{competitionId}") + public List queryVoiceRecordUsers(@PathVariable Long competitionId) { + return iCompetitionPracticalService.queryVoiceRecordUsers(competitionId); + } + + /** + *查询语音录制 + */ + @GetMapping("/voice/record/query/{userId}/{competitionId}") + public List queryVoiceRecords(@PathVariable Long userId, @PathVariable Long competitionId) { + return iCompetitionPracticalService.queryVoiceRecords(userId, competitionId); + } + + /** + *新增语音录制 + */ + @PostMapping("/voice/record/{competitionId}/{cmdEvaRuleId}/{actionId}") + public CompetitionVoiceRecordVO voiceRecord(@PathVariable Long competitionId, @PathVariable Long cmdEvaRuleId, @PathVariable String actionId, MultipartFile file, @RequestAttribute AccountVO user) { + return iCompetitionPracticalService.voiceRecord(competitionId, cmdEvaRuleId, actionId, file, user); + } + + /** + *更新语音录制 + */ + @PutMapping("/voice/record/{recordId}") + public CompetitionVoiceRecordVO updateVoiceRecord(@PathVariable Long recordId, MultipartFile file, @RequestAttribute AccountVO user) { + return iCompetitionPracticalService.updateVoiceRecord(recordId, file, user); + } + + /** + *语音录制校验 + */ + @PostMapping("/voice/record/check/{recordId}") + public VoiceErrorVO voiceRecordCheck(@PathVariable Long recordId, @RequestBody CommandPublishStatisticVO commandPublishStatisticVO) { + return iCompetitionPracticalService.voiceRecordCheck(recordId, commandPublishStatisticVO); + } + + /** + *语音录制校验（整个场景） + */ + @GetMapping("/voice/record/check/{competitionId}/{userId}") + public List voiceRecordCheck(@PathVariable Long competitionId, @PathVariable Long userId) { + return iCompetitionPracticalService.voiceRecordCheck(competitionId, userId); + } + /* ------------------------- 竞赛运行相关 ------------------------- */ - @ApiOperation("加载竞赛场景") + /** + *加载竞赛场景 + */ @PutMapping("/load/{group}/{id}") public void loadCompetition(@PathVariable String group, @PathVariable Long id, - @ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO userInfo) { + @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO userInfo) { iCompetitionPracticalService.loadCompetition(group, id, userInfo); } - @ApiOperation("小程序加载竞赛场景") + /** + *小程序加载竞赛场景 + */ @PutMapping("/load/{id}") public String createSimulationAndLoadCompetition(@PathVariable Long id, - @ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO userInfo) { + @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO userInfo) { return iCompetitionPracticalService.createSimulationAndLoadCompetition(id, userInfo); } - @ApiOperation("开始竞赛实操") + /** + *开始竞赛实操 + */ @PutMapping("/start/{group}") public void start(@PathVariable String group, String memberId, ScriptBO.Mode mode, - @ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO userInfo) { + @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO userInfo) { iCompetitionPracticalService.start(group, memberId, mode, userInfo); } - @ApiOperation("获取运营统计数据") + /** + *获取运营统计数据 + */ @GetMapping("/detail/os/{group}") @JsonView(OperationStatisticAnswerView.class) public OperationStatisticVO getOperationStatistic(@PathVariable String group) { return iCompetitionPracticalService.getOperationStatistic(group); } - @ApiOperation("提交运营统计答案") + /** + *提交运营统计答案 + */ @PutMapping("/detail/os/{group}") public void submit(@PathVariable String group, @RequestBody OperationStatisticVO operationStatisticVO) { iCompetitionPracticalService.submit(group, operationStatisticVO); } - @ApiOperation("结束竞赛实操") + /** + *结束竞赛实操 + */ @PutMapping("/finish/{group}") - public CompetitionResult finish(@PathVariable String group, @RequestBody OperationStatisticVO operationStatisticVO, @RequestAttribute UserVO user) { + public CompetitionResult finish(@PathVariable String group, @RequestBody OperationStatisticVO operationStatisticVO, @RequestAttribute AccountVO user) { return iCompetitionPracticalService.finish(group, operationStatisticVO, user); } - @ApiOperation("退出场景") + /** + *退出场景 + */ @PutMapping("/exit/{group}") - public void exit(@PathVariable String group, @RequestAttribute UserVO user) { + public void exit(@PathVariable String group, @RequestAttribute AccountVO user) { iCompetitionPracticalService.exit(group, user); } - @ApiOperation("完成操作类动作（小程序专用）") + /** + *完成操作类动作（小程序专用） + */ @PutMapping("/{group}/finish/operation/{actionId}") - public void finishAction(@PathVariable String group, @PathVariable String actionId, @RequestAttribute UserVO user) { + public void finishAction(@PathVariable String group, @PathVariable String actionId, @RequestAttribute AccountVO user) { iCompetitionPracticalService.finishOperationAction(group, actionId, user); } - @ApiOperation("语音播放完毕") + /** + *语音播放完毕 + */ @PutMapping("/{group}/audio/over/{conversationMessageId}") - public void audioOver(@PathVariable String group, @PathVariable String conversationMessageId, @RequestAttribute UserVO user) { + public void audioOver(@PathVariable String group, @PathVariable String conversationMessageId, @RequestAttribute AccountVO user) { iCompetitionPracticalService.audioOver(group, conversationMessageId, user); } } diff --git a/src/main/java/club/joylink/rtss/controller/competition/CompetitionUserLikesController.java b/src/main/java/club/joylink/rtss/controller/competition/CompetitionUserLikesController.java index d196c96da..7c750ff9b 100644 --- a/src/main/java/club/joylink/rtss/controller/competition/CompetitionUserLikesController.java +++ b/src/main/java/club/joylink/rtss/controller/competition/CompetitionUserLikesController.java @@ -2,18 +2,16 @@ package club.joylink.rtss.controller.competition; import club.joylink.rtss.services.completition.CompetitionUserLikeManager; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.competition.CompetitionUserLikesVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import javax.validation.constraints.PositiveOrZero; - -@Api(tags = "竞赛用户点赞") +/** + * 竞赛用户点赞 + */ @RestController @RequestMapping(path = "/api/v1/likes") public class CompetitionUserLikesController { @@ -21,15 +19,25 @@ public class CompetitionUserLikesController { @Autowired private CompetitionUserLikeManager likeManager; - @ApiOperation(value = "获取各用户点赞数和已点赞用户") + /** + * 获取各用户点赞数和已点赞用户 + * @param projectCode + * @param user + * @return + */ @GetMapping(path = "/project/{projectCode}") - public CompetitionUserLikesVO getUserLikes(@PathVariable String projectCode, @ApiIgnore @RequestAttribute UserVO user) { + public CompetitionUserLikesVO getUserLikes(@PathVariable String projectCode, @RequestAttribute AccountVO user) { return likeManager.getUserLikes(user.getId(), projectCode); } - @ApiOperation(value = "点赞") + /** + * 点赞 + * @param user + * @param projectCode + * @param like + */ @PostMapping(path = "/project/{projectCode}") - public void like(@ApiIgnore @RequestAttribute UserVO user, @PathVariable String projectCode, @PositiveOrZero @RequestParam Long like) { + public void like(@RequestAttribute AccountVO user, @PathVariable String projectCode, @PositiveOrZero @RequestParam Long like) { likeManager.like(projectCode, user.getId(), like); } diff --git a/src/main/java/club/joylink/rtss/controller/competition/RaceQuestionsRuleController.java b/src/main/java/club/joylink/rtss/controller/competition/RaceQuestionsRuleController.java index 5bc3693f0..e4d0a9b4e 100644 --- a/src/main/java/club/joylink/rtss/controller/competition/RaceQuestionsRuleController.java +++ b/src/main/java/club/joylink/rtss/controller/competition/RaceQuestionsRuleController.java @@ -6,16 +6,15 @@ import club.joylink.rtss.vo.LoginUserInfoVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.competition.TheoryQuestionRuleQueryVO; import club.joylink.rtss.vo.client.competition.TheoryQuestionsRuleVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; -@Api(tags = {"出题规则"}) +/** + *出题规则 + */ @RestController @RequestMapping("/api/questionsRule") public class RaceQuestionsRuleController { @@ -23,43 +22,55 @@ public class RaceQuestionsRuleController { @Autowired private IRaceQuestionsRuleService iRaceQuestionsRuleService; - @ApiOperation(value = "添加规则") + /** + *添加规则 + */ @PostMapping public TheoryQuestionsRuleVO create(@RequestBody @Validated TheoryQuestionsRuleVO ruleVO, - @ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO loginUserInfoVO) { + @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO loginUserInfoVO) { ruleVO.setProjectCode(loginUserInfoVO.getProject().name()); TheoryQuestionsRuleVO vo = this.iRaceQuestionsRuleService.create(ruleVO); return vo; } - @ApiOperation(value = "获取规则列表") + /** + *获取规则列表 + */ @GetMapping public List queryAll() { List list = this.iRaceQuestionsRuleService.queryRules(); return list; } - @ApiOperation(value = "分页获取规则列表") + /** + *分页获取规则列表 + */ @GetMapping("paging") - public PageVO pagingQueryRules(TheoryQuestionRuleQueryVO queryVO,@ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO loginInfo) { + public PageVO pagingQueryRules(TheoryQuestionRuleQueryVO queryVO, @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO loginInfo) { queryVO.setProjectCode(loginInfo.getProject().name()); PageVO list = this.iRaceQuestionsRuleService.pagingQueryRules(queryVO); return list; } - @ApiOperation(value = "删除规则") + /** + *删除规则 + */ @DeleteMapping("{id}") public void delete(@PathVariable Integer id) { this.iRaceQuestionsRuleService.deleteById(id); } - @ApiOperation(value = "查询规则内容") + /** + *查询规则内容 + */ @GetMapping("{id}") public TheoryQuestionsRuleVO get(@PathVariable Integer id) { return this.iRaceQuestionsRuleService.getById(id); } - @ApiOperation(value = "更改规则内容") + /** + *更改规则内容 + */ @PutMapping("{id}") public TheoryQuestionsRuleVO get(@PathVariable Integer id, @RequestBody @Validated TheoryQuestionsRuleVO ruleVO) { return this.iRaceQuestionsRuleService.update(id, ruleVO); diff --git a/src/main/java/club/joylink/rtss/controller/competition/RaceTheoryController.java b/src/main/java/club/joylink/rtss/controller/competition/RaceTheoryController.java index 3dc74d3ac..941a07868 100644 --- a/src/main/java/club/joylink/rtss/controller/competition/RaceTheoryController.java +++ b/src/main/java/club/joylink/rtss/controller/competition/RaceTheoryController.java @@ -3,21 +3,17 @@ package club.joylink.rtss.controller.competition; import club.joylink.rtss.constants.RoleEnum; import club.joylink.rtss.controller.advice.Role; import club.joylink.rtss.services.completition.IRaceTheoryService; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.LoginUserInfoVO; -import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.competition.ProjectTheoryAnswerVO; import club.joylink.rtss.vo.client.question.QuestionVO; import club.joylink.rtss.vo.client.race.RaceResultDetailVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; /**竞赛理论试题管理*/ -@Api(tags = {"竞赛理论试题管理"}) @RestController @RequestMapping(path = "api/v1/competitionTheory") public class RaceTheoryController { @@ -27,24 +23,17 @@ public class RaceTheoryController { //------------------------------------ 项目理论题部分---------------------------------------- /**获取项目理论题*/ - @ApiOperation(value = "获取项目理论题") @GetMapping(path = "/project/{projectCode}") - public List getProjectTheory(String mode, @PathVariable String projectCode, @RequestAttribute LoginUserInfoVO loginInfo, @ApiIgnore @RequestAttribute UserVO user) { + public List getProjectTheory(String mode, @PathVariable String projectCode, @RequestAttribute LoginUserInfoVO loginInfo, @RequestAttribute AccountVO user) { return iRaceTheoryService.getProjectTheory(mode, projectCode, user.getCompanyId(), user); } /**根据练习或者考试提交理论题、计算分数*/ - @ApiOperation(value = "提交试卷") @PostMapping(path = "/project/{projectCode}/submit") - public List submitProjectTheory(@PathVariable String projectCode, @RequestBody ProjectTheoryAnswerVO theoryAnswers, @RequestAttribute LoginUserInfoVO loginInfo,@ApiIgnore @RequestAttribute UserVO user) { + public List submitProjectTheory(@PathVariable String projectCode, @RequestBody ProjectTheoryAnswerVO theoryAnswers, @RequestAttribute LoginUserInfoVO loginInfo, @RequestAttribute AccountVO user) { return iRaceTheoryService.submitProjectTheory(user, projectCode, user.getCompanyId(), theoryAnswers); } - /**获取作答详情*/ - /**评分*/ - /**获取成绩*/ - /**清除理论考试结果*/ - @ApiOperation(value = "清除理论考试结果") @DeleteMapping(path = "/project/{projectCode}") @Role(RoleEnum.SuperAdmin) public void submitProjectTheory(@PathVariable String projectCode, @RequestParam(required = false) Long companyId) { @@ -54,7 +43,6 @@ public class RaceTheoryController { /** * 评分员获取考生理论考试结果详情 */ - @ApiOperation(value = "评分员获取考生理论考试结果详情") @GetMapping(path = "/project/{projectCode}/result/detail") public List getTheoryAnswerDetails(@PathVariable String projectCode, @RequestParam(required = false) Long companyId, Long id) { return iRaceTheoryService.getTheoryResultDetails(projectCode, companyId, id); diff --git a/src/main/java/club/joylink/rtss/controller/competition/UserAnswerStatsController.java b/src/main/java/club/joylink/rtss/controller/competition/UserAnswerStatsController.java index 8e2635f0d..b13865fce 100644 --- a/src/main/java/club/joylink/rtss/controller/competition/UserAnswerStatsController.java +++ b/src/main/java/club/joylink/rtss/controller/competition/UserAnswerStatsController.java @@ -2,18 +2,16 @@ package club.joylink.rtss.controller.competition; import club.joylink.rtss.services.completition.IRaceQuestionMocksStatsService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.competition.UserQuestionStatsVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; - -@Api(tags = "项目题库用户答题统计") +/** + * 项目题库用户答题统计 + */ @RestController @RequestMapping(path = "/api/question/mocksStatistics") public class UserAnswerStatsController { @@ -21,13 +19,23 @@ public class UserAnswerStatsController { @Autowired private IRaceQuestionMocksStatsService statsService; - @ApiOperation(value = "查询某用户小程序测试历史成绩") + /** + * 查询某用户小程序测试历史成绩 + * @param userId + * @param projectCode + * @param user + * @return + */ @GetMapping(path = "/project/{projectCode}") - public List getQuestionProgress(Long userId,@PathVariable String projectCode, @ApiIgnore @RequestAttribute UserVO user) { + public List getQuestionProgress(Long userId,@PathVariable String projectCode, @RequestAttribute AccountVO user) { return statsService.getHistoryScores(userId,user, projectCode); } - @ApiOperation(value = "查询历史成绩排名") + /** + * 查询历史成绩排名 + * @param projectCode + * @return + */ @GetMapping(path = "ranking/project/{projectCode}") public List getQuestionProgress(@PathVariable String projectCode) { return statsService.getHistoryScoresRanking( projectCode); diff --git a/src/main/java/club/joylink/rtss/controller/competition/UserQuestionProgressController.java b/src/main/java/club/joylink/rtss/controller/competition/UserQuestionProgressController.java index 1c1b61cc0..bcac96cf6 100644 --- a/src/main/java/club/joylink/rtss/controller/competition/UserQuestionProgressController.java +++ b/src/main/java/club/joylink/rtss/controller/competition/UserQuestionProgressController.java @@ -2,18 +2,16 @@ package club.joylink.rtss.controller.competition; import club.joylink.rtss.services.completition.IUserQuestionProgressService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.competition.RaceQuestionProgressVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import javax.validation.constraints.PositiveOrZero; - -@Api(tags = "项目题库用户答题进度接口") +/** + * 项目题库用户答题进度接口 + */ @RestController @RequestMapping(path = "/api/questionProgress") public class UserQuestionProgressController { @@ -21,29 +19,37 @@ public class UserQuestionProgressController { @Autowired private IUserQuestionProgressService progressService; - @ApiOperation(value = "获取用户答题进展") + /** + * 获取用户答题进展 + * @param projectCode + * @param user + * @return + */ @GetMapping(path = "/project/{projectCode}") - public RaceQuestionProgressVO getQuestionProgress(@PathVariable String projectCode, @ApiIgnore @RequestAttribute UserVO user) { + public RaceQuestionProgressVO getQuestionProgress(@PathVariable String projectCode, @RequestAttribute AccountVO user) { return progressService.getQuestionProgress(user.getId(), projectCode, user.getCompanyId()); } - @ApiOperation(value = "更新答题进度") + /** + * 更新答题进度 + * @param user + * @param projectCode + * @param index + */ @PostMapping(path = "/project/{projectCode}") - public void addQuestionProgress(@ApiIgnore @RequestAttribute UserVO user, @PathVariable String projectCode, @PositiveOrZero @RequestParam Long index) { + public void addQuestionProgress(@RequestAttribute AccountVO user, @PathVariable String projectCode, @PositiveOrZero @RequestParam Long index) { progressService.addQuestionProgress(user.getId(), projectCode, user.getCompanyId(),index); } /**添加错题*/ - @ApiOperation(value = "添加错题") @PostMapping(path = "incorrect/project/{projectCode}") - public void addIncorrectQuestion(@ApiIgnore @RequestAttribute UserVO user, @PathVariable String projectCode, @PositiveOrZero @RequestParam Long id) { + public void addIncorrectQuestion(@RequestAttribute AccountVO user, @PathVariable String projectCode, @PositiveOrZero @RequestParam Long id) { progressService.addIncorrectQuestion(user.getId(), projectCode, user.getCompanyId(),id); } /**删除错题*/ - @ApiOperation(value = "删除错题") @DeleteMapping(path = "incorrect/project/{projectCode}") - public void deleteIncorrectQuestion(@ApiIgnore @RequestAttribute UserVO user, @PathVariable String projectCode, @PositiveOrZero @RequestParam Long id) { + public void deleteIncorrectQuestion(@RequestAttribute AccountVO user, @PathVariable String projectCode, @PositiveOrZero @RequestParam Long id) { progressService.deleteIncorrectQuestion(user.getId(), projectCode,user.getCompanyId(), id); } diff --git a/src/main/java/club/joylink/rtss/controller/competition/question/QuestionBankController.java b/src/main/java/club/joylink/rtss/controller/competition/question/QuestionBankController.java index 884858791..74dbc93b5 100644 --- a/src/main/java/club/joylink/rtss/controller/competition/question/QuestionBankController.java +++ b/src/main/java/club/joylink/rtss/controller/competition/question/QuestionBankController.java @@ -3,24 +3,23 @@ package club.joylink.rtss.controller.competition.question; import club.joylink.rtss.constants.Project; import club.joylink.rtss.services.completition.question.IQuestionBankService; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.LoginUserInfoVO; -import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.competition.TheoryQuestionCountVO; import club.joylink.rtss.vo.client.question.QuestionOptionVO; import club.joylink.rtss.vo.client.question.QuestionQueryVO; import club.joylink.rtss.vo.client.question.QuestionVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; -@Api(tags = "题库管理接口") +/** + *题库管理接口 + */ @RestController @RequestMapping(path = "/api/questionBank") public class QuestionBankController { @@ -28,69 +27,89 @@ public class QuestionBankController { @Autowired private IQuestionBankService iQuestionBankService; - @ApiOperation(value = "分页查询题目") + /** + *分页查询题目 + */ @GetMapping(path = "/questions/paging") public PageVO pagingQueryQuestions(@RequestAttribute LoginUserInfoVO loginInfo, QuestionQueryVO queryVO) { queryVO.setProjectCode(loginInfo.getProject().name()); return iQuestionBankService.pagingQueryQuestions(queryVO); } - @ApiOperation(value = "查询题目列表") + /** + *查询题目列表 + */ @GetMapping(path = "/questions") public List queryQuestions(@RequestAttribute LoginUserInfoVO loginInfo,QuestionQueryVO queryVO) { queryVO.setProjectCode(loginInfo.getProject().name()); return iQuestionBankService.queryQuestions(queryVO); } - @ApiOperation(value = "获取题目信息") + /** + *获取题目信息 + */ @GetMapping(path = "/questions/{questionId}") public QuestionVO getQuestion(@PathVariable Long questionId) { return iQuestionBankService.getQuestion(questionId); } - @ApiOperation(value = "添加题目") + /** + *添加题目 + */ @PostMapping(path = "/questions") public void addQuestion(@Validated @RequestBody QuestionVO questionVO,@RequestAttribute LoginUserInfoVO loginInfo, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { questionVO.setProjectCode(loginInfo.getProject().name()); iQuestionBankService.addQuestion(questionVO, user); } - @ApiOperation(value = "导入项目或单位试题库") + /** + *导入项目或单位试题库 + */ @PostMapping(path = "/questions/import") - public void importProjectQuestion(@Validated @RequestBody List questions,@RequestAttribute LoginUserInfoVO loginInfo, - @ApiIgnore @RequestAttribute UserVO user, @RequestParam(required = false, name = "id") Long companyId) { + public void importProjectQuestion(@Validated @RequestBody List questions, @RequestAttribute LoginUserInfoVO loginInfo, + @RequestAttribute AccountVO user, @RequestParam(required = false, name = "id") Long companyId) { iQuestionBankService.importProjectQuestion(questions, loginInfo.getProject().name(), companyId,user); } - @ApiOperation(value = "更新题目") + /** + *更新题目 + */ @PutMapping(path = "/questions/{questionId}") public void updateQuestion(@PathVariable Long questionId, @RequestAttribute LoginUserInfoVO loginInfo,@RequestBody QuestionVO questionVO) { questionVO.setProjectCode(loginInfo.getProject().name()); iQuestionBankService.updateQuestion(questionId, questionVO); } - @ApiOperation(value = "删除题目") + /** + *删除题目 + */ @DeleteMapping(path = "/questions/{questionId}") public void deleteQuestion(@PathVariable Long questionId) { iQuestionBankService.deleteQuestion(questionId); } - @ApiOperation(value = "根据题目查询选项") + /** + *根据题目查询选项 + */ @GetMapping(path = "/questions/{questionId}/options") public List getOptionsByQuestionId(@PathVariable Long questionId) { return iQuestionBankService.getOptionsByQuestionId(questionId); } - @ApiOperation(value = "根据题型获取题目数量") + /** + *根据题型获取题目数量 + */ @GetMapping(path = "/number") public Integer getNumberUnderKnowledgeAndType(@RequestAttribute LoginUserInfoVO loginInfo, String type, Long companyId) { return iQuestionBankService.getNumberWithType(type, loginInfo.getProject().name(), companyId); } - @ApiOperation(value = "获取题型数量") + /** + *获取题型数量 + */ @GetMapping(path = "/type/number") public List getNumberUnderKnowledgeAndType(@RequestAttribute LoginUserInfoVO loginInfo, @RequestParam(required = false) Long companyId) { diff --git a/src/main/java/club/joylink/rtss/controller/doc/DocumentController.java b/src/main/java/club/joylink/rtss/controller/doc/DocumentController.java new file mode 100644 index 000000000..d3a4a9656 --- /dev/null +++ b/src/main/java/club/joylink/rtss/controller/doc/DocumentController.java @@ -0,0 +1,38 @@ +package club.joylink.rtss.controller.doc; + +import club.joylink.rtss.services.doc.DocumentService; +import club.joylink.rtss.vo.doc.DocumentVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping(path = "/api/doc") +public class DocumentController { + + @Autowired + private DocumentService documentService; + + /** + * 查询文档列表 + * @return + */ + @GetMapping(path = "") + public List listDocuments() { + return documentService.listDocuments(); + } + + /** + * 获取文档详情 + * @param id + * @return + */ + @GetMapping(path = "/{id}") + public DocumentVO getDetail(@PathVariable Long id) { + return documentService.getDetail(id); + } +} diff --git a/src/main/java/club/joylink/rtss/controller/doc/DocumentDraftController.java b/src/main/java/club/joylink/rtss/controller/doc/DocumentDraftController.java new file mode 100644 index 000000000..ffa7628c1 --- /dev/null +++ b/src/main/java/club/joylink/rtss/controller/doc/DocumentDraftController.java @@ -0,0 +1,74 @@ +package club.joylink.rtss.controller.doc; + +import club.joylink.rtss.services.doc.DocumentDraftService; +import club.joylink.rtss.vo.AccountVO; +import club.joylink.rtss.vo.doc.DocumentVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping(path = "/api/doc/draft") +public class DocumentDraftController { + + @Autowired + private DocumentDraftService documentDraftService; + + /** + *查询草稿文档列表 + */ + @GetMapping(path = "") + public List listMyDocuments(@RequestAttribute AccountVO user) { + return documentDraftService.listMyDocuments(user); + } + + /** + *创建新的草稿文档 + */ + @PostMapping(path = "") + public void create(@RequestBody @Validated DocumentVO documentVO, @RequestAttribute AccountVO user) { + documentDraftService.create(documentVO, user); + } + + /** + *更新标题 + */ + @PutMapping(path = "/{id}") + public void updateTitle(@PathVariable Long id, @RequestBody @Validated DocumentVO documentVO) { + documentDraftService.updateTitle(id, documentVO); + } + + /** + *获取文档详情 + */ + @GetMapping(path = "/{id}") + public DocumentVO getDetail(@PathVariable Long id) { + return documentDraftService.getDetail(id); + } + + /** + *保存数据 + */ + @PutMapping(path = "/{id}/data") + public void save(@PathVariable Long id, @RequestBody DocumentVO documentVO) { + documentDraftService.save(id, documentVO.getContent()); + } + + /** + *发布文档 + */ + @PutMapping(path = "/{id}/publish") + public void publish(@PathVariable Long id, @RequestAttribute AccountVO user) { + documentDraftService.publish(id, user); + } + + /** + *删除文档 + */ + @DeleteMapping(path = "/{id}") + public void delete(@PathVariable Long id) { + documentDraftService.delete(id); + } +} diff --git a/src/main/java/club/joylink/rtss/controller/draft/DictionaryController.java b/src/main/java/club/joylink/rtss/controller/draft/DictionaryController.java index a19c0ad61..200245242 100644 --- a/src/main/java/club/joylink/rtss/controller/draft/DictionaryController.java +++ b/src/main/java/club/joylink/rtss/controller/draft/DictionaryController.java @@ -1,26 +1,16 @@ package club.joylink.rtss.controller.draft; -import java.util.List; - +import club.joylink.rtss.services.ISysDictionaryService; import club.joylink.rtss.vo.client.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import club.joylink.rtss.services.ISysDictionaryService; +import java.util.List; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; - -@Api(value="数据字典controller", tags= {"数据字典管理接口"}) +/** + * 数据字典管理接口 + */ @RestController @RequestMapping("/api/dictionary") public class DictionaryController { @@ -32,82 +22,108 @@ public class DictionaryController { this.iSysDictionaryService = iSysDictionaryService; } - @ApiOperation(value="字典目录分页查询") + /** + *字典目录分页查询 + */ @GetMapping(path="/list") public PageVO queryDic(DictionaryQueryVO queryVO) { return this.iSysDictionaryService.queryPage(queryVO); } - @ApiOperation(value="创建字典目录") + /** + *创建字典目录 + */ @PostMapping(path="/create") public void createDic(@RequestBody @Validated DictionaryVO dicVo) { this.iSysDictionaryService.createDic(dicVo); } - @ApiOperation(value="校验字典目录编码是否已经存在") + /** + *校验字典目录编码是否已经存在 + */ @GetMapping(path="/checkExistByCode") public boolean checkExistByCode(String code) { return this.iSysDictionaryService.checkByCode(code); } - @ApiOperation(value="根据id获取对象") + /** + *根据id获取对象 + */ @GetMapping(path="/{id}") public DictionaryVO getData(@PathVariable Long id) { return this.iSysDictionaryService.queryData(id); } - @ApiOperation(value="更新字典目录信息") + /** + *更新字典目录信息 + */ @PutMapping(path="/update/{id}") public void updateDic(@PathVariable Long id, @RequestBody @Validated DictionaryVO dicVo) { this.iSysDictionaryService.updateDic(id, dicVo); } - @ApiOperation(value="删除字典目录") + /** + *删除字典目录 + */ @DeleteMapping(path="/delete/{id}") public void deleteDic(@PathVariable Long id) { this.iSysDictionaryService.deleteDic(id); } - @ApiOperation(value="查询字典目录对应明细数据列表") + /** + *查询字典目录对应明细数据列表 + */ @GetMapping(path="/{id}/detail/list") public PageVO queryDicDetail(@PathVariable(name="id") Long dicId, DictionaryDetailQueryVO queryVO) { return this.iSysDictionaryService.queryDetailPage(dicId, queryVO); } - @ApiOperation(value="创建字典明细") + /** + *创建字典明细 + */ @PostMapping(path="/{id}/detail/create") public void createDicDetail(@PathVariable(name="id") Long dicId, @RequestBody @Validated DictionaryDetailVO detailVo) { detailVo.setDicId(dicId); this.iSysDictionaryService.createDicDetail(detailVo); } - @ApiOperation(value="校验字典明细编码是否存在") + /** + *校验字典明细编码是否存在 + */ @GetMapping(path="/{id}/detail/checkExistByCode") - public boolean checkDetailExistByCode(@PathVariable(name="id") @ApiParam(name="id", value="字典目录id") Long dicId, + public boolean checkDetailExistByCode(@PathVariable(name="id") Long dicId, String code) { return this.iSysDictionaryService.checkDetailByCode(dicId, code); } - @ApiOperation(value="根据id获取对象") + /** + *根据id获取对象 + */ @GetMapping(path="/{id}/detail/{detailId}") public DictionaryDetailVO getDetailData(@PathVariable(name="id") Long dicId, @PathVariable(name="detailId") Long id) { return this.iSysDictionaryService.getDetailData(dicId, id); } - @ApiOperation(value="更新字典明细信息") + /** + *更新字典明细信息 + */ @PutMapping(path="/{id}/detail/update/{detailId}") public void updateDicDetail(@PathVariable(name="id") Long dicId, @PathVariable(name="detailId") Long id, @RequestBody @Validated DictionaryDetailVO detailVo) { detailVo.setDicId(dicId); this.iSysDictionaryService.updateDicDetail(id, detailVo); } - @ApiOperation(value="删除字典明细") + /** + *删除字典明细 + */ @DeleteMapping(path="/{id}/detail/delete/{detailId}") public void deleteDicDetail(@PathVariable(name="id") Long dicId, @PathVariable(name="detailId") Long id) { this.iSysDictionaryService.deleteDicDetail(id); } - @ApiOperation(value="根据字典code获取字典明细列表") + /** + *根据字典code获取字典明细列表 + */ @GetMapping(path="/getDetailListByCode") public List getDicDetailListByCode(String code) { return this.iSysDictionaryService.getDicDetailListByDicCode(code); diff --git a/src/main/java/club/joylink/rtss/controller/draft/Draft3DLessonController.java b/src/main/java/club/joylink/rtss/controller/draft/Draft3DLessonController.java index 2a8d196fd..d3fe12ecc 100644 --- a/src/main/java/club/joylink/rtss/controller/draft/Draft3DLessonController.java +++ b/src/main/java/club/joylink/rtss/controller/draft/Draft3DLessonController.java @@ -2,7 +2,7 @@ package club.joylink.rtss.controller.draft; import club.joylink.rtss.controller.advice.AuthenticateInterceptor; import club.joylink.rtss.services.draftData.Draft3DLessonService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.draft.Lesson3DQueryVO; import club.joylink.rtss.vo.draft.Lesson3DVO; @@ -35,8 +35,8 @@ public class Draft3DLessonController { @PostMapping(path = "") public String create(@RequestBody @Validated Lesson3DVO param, @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) - UserVO userVO) { - String id = this.draft3DLessonService.create(param, userVO); + AccountVO accountVO) { + String id = this.draft3DLessonService.create(param, accountVO); return id; } diff --git a/src/main/java/club/joylink/rtss/controller/draft/DraftIbpController.java b/src/main/java/club/joylink/rtss/controller/draft/DraftIbpController.java index b724315d1..cccf4440d 100644 --- a/src/main/java/club/joylink/rtss/controller/draft/DraftIbpController.java +++ b/src/main/java/club/joylink/rtss/controller/draft/DraftIbpController.java @@ -1,20 +1,19 @@ package club.joylink.rtss.controller.draft; import club.joylink.rtss.services.draftData.DraftIbpService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.ibp.IbpCopyVO; import club.joylink.rtss.vo.client.ibp.IbpCreateVO; import club.joylink.rtss.vo.client.ibp.IbpQueryVO; import club.joylink.rtss.vo.client.ibp.IbpVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; -@Api(value="草稿IBP盘接口") +/** + *草稿IBP盘接口 + */ @RestController @RequestMapping("/api/draftIbp") public class DraftIbpController { @@ -22,54 +21,70 @@ public class DraftIbpController { @Autowired private DraftIbpService draftIbpService; - @ApiOperation(value = "查询用户草稿IBP盘绘制数据列表") + /** + *查询用户草稿IBP盘绘制数据列表 + */ @GetMapping("/list/user") - public PageVO queryUserDraftIbpList(IbpQueryVO queryVO, @ApiIgnore @RequestAttribute UserVO user) { + public PageVO queryUserDraftIbpList(IbpQueryVO queryVO, @RequestAttribute AccountVO user) { return this.draftIbpService.queryUserDraftIbpList(queryVO, user); } - @ApiOperation(value = "创建草稿IBP盘") + /** + *创建草稿IBP盘 + */ @PostMapping("") public IbpVO createDraftIbp(@RequestBody @Validated IbpCreateVO ibpCreateVO, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { return this.draftIbpService.create(ibpCreateVO, user); } - @ApiOperation(value = "根据id查询IBP数据") + /** + *根据id查询IBP数据 + */ @GetMapping("/{id}") public IbpVO getIbp(@PathVariable Long id) { return this.draftIbpService.getById(id); } - @ApiOperation(value = "更新草稿IBP盘基本信息") + /** + *更新草稿IBP盘基本信息 + */ @PutMapping("/{id}/basic") public IbpVO updateDraftIbpBasicInfo(@PathVariable Long id, - @RequestBody @Validated IbpCreateVO ibpCreateVO, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestBody @Validated IbpCreateVO ibpCreateVO, + @RequestAttribute AccountVO user) { return this.draftIbpService.updateBasicInfo(id, ibpCreateVO, user); } - @ApiOperation(value = "更新草稿IBP盘绘图数据") + /** + *更新草稿IBP盘绘图数据 + */ @PutMapping("/{id}/data") public void updateDraftIbpDrawData(@PathVariable Long id, @RequestBody String drawData) { this.draftIbpService.updateDrawData(id, drawData); } - @ApiOperation(value = "发布IBP盘数据") + /** + *发布IBP盘数据 + */ @PostMapping("/{id}/publish") - public void publish(@PathVariable Long id, @ApiIgnore @RequestAttribute UserVO user) { + public void publish(@PathVariable Long id, @RequestAttribute AccountVO user) { this.draftIbpService.publish(id, user); } - @ApiOperation(value = "根据id删除草稿IBP盘数据") + /** + *根据id删除草稿IBP盘数据 + */ @DeleteMapping("/{id}/delete") public void delete(@PathVariable Long id) { this.draftIbpService.delete(id); } - @ApiOperation("复制已有的IBP数据关联新的地图和车站") + /** + *复制已有的IBP数据关联新的地图和车站 + */ @PostMapping("/copy") - public void copy(@Validated @RequestBody IbpCopyVO copyVO, @RequestAttribute UserVO user) { + public void copy(@Validated @RequestBody IbpCopyVO copyVO, @RequestAttribute AccountVO user) { this.draftIbpService.copyFromPublished(copyVO, user); } diff --git a/src/main/java/club/joylink/rtss/controller/draft/DraftMapController.java b/src/main/java/club/joylink/rtss/controller/draft/DraftMapController.java index 2672bb353..3eb4ec0a9 100644 --- a/src/main/java/club/joylink/rtss/controller/draft/DraftMapController.java +++ b/src/main/java/club/joylink/rtss/controller/draft/DraftMapController.java @@ -1,30 +1,34 @@ package club.joylink.rtss.controller.draft; -import club.joylink.rtss.vo.client.map.newmap.MapDestinationCodeDefinitionVO; import club.joylink.rtss.services.IDraftMapService; import club.joylink.rtss.services.draftData.DraftMapCiDataGenerator; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.PageQueryVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.TreeNode; import club.joylink.rtss.vo.client.map.*; -import club.joylink.rtss.vo.client.map.newmap.*; import club.joylink.rtss.vo.client.validGroup.DraftMapCreateCheck; import club.joylink.rtss.vo.client.validGroup.DraftMapCreateFromCheck; import club.joylink.rtss.vo.client.validGroup.DraftMapPublishCheck; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import club.joylink.rtss.vo.map.*; +import club.joylink.rtss.vo.map.logic.*; +import club.joylink.rtss.vo.map.query.MapAutoReentryQueryVO; +import club.joylink.rtss.vo.map.query.MapDestinationCodeDefinitionQueryVO; +import club.joylink.rtss.vo.map.query.MapParkTimeQueryVO; +import club.joylink.rtss.vo.map.query.MapRoutingDataQueryVO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; +import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.Objects; -@Api(tags = {"地图草稿数据管理接口"}) +/** + *地图草稿数据管理接口 + */ @RestController @RequestMapping("/api/mapBuild") @Slf4j @@ -38,134 +42,187 @@ public class DraftMapController { /*-------------- 地图，绘图相关操作 ------------------*/ - @ApiOperation(value = "获取地图草稿数据列表") + /** + *获取地图草稿数据列表 + */ @GetMapping(path = "/list") - public List list(@ApiIgnore @RequestAttribute UserVO user) { + public List list(@RequestAttribute AccountVO user) { return iDraftMapService.list(user); } - @ApiOperation(value = "根据草稿地图id查询数据") + /** + *根据草稿地图id查询数据 + */ @GetMapping(path = "/findById/{draftMapId}") public DraftMapVO findById(@PathVariable Long draftMapId) { return iDraftMapService.findById(draftMapId); } - @ApiOperation(value = "获取皮肤地图草稿树") + /** + *获取皮肤地图草稿树 + */ @GetMapping(path = "/tree") - public List tree(@ApiIgnore @RequestAttribute UserVO user) { + public List tree(@RequestAttribute AccountVO user) { return iDraftMapService.tree(user); } - @ApiOperation(value = "新建地图草稿") + /** + *新建地图草稿 + */ @PostMapping(path = "/create") public String create(@RequestBody @Validated(value = DraftMapCreateCheck.class) DraftMapVO draftMapVo, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { return iDraftMapService.create(draftMapVo, user); } - @ApiOperation(value = "修改地图草稿信息") + /** + *修改地图草稿信息 + */ @PutMapping(path = "/{id}") public void update(@PathVariable Long id, @RequestBody @Validated(value = DraftMapCreateCheck.class) DraftMapVO draftMapVo, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { iDraftMapService.update(id, draftMapVo, user); } - @ApiOperation(value = "地图草稿另存为") + /** + *地图草稿另存为 + */ @PostMapping(path = "/{id}/saveAs") public String saveAs(@PathVariable Long id, @RequestBody DraftMapVO vo) { return iDraftMapService.saveAs(id, vo.getName()); } - @ApiOperation(value = "查询地图及对应数据") + /** + *查询地图及对应数据 + */ @GetMapping(path = "/{id}/mapDataDetail") public MapGraphDataNewVO getMapShapeData(@PathVariable Long id) { return iDraftMapService.getMapShapeData(id); } + @PutMapping(path="/{id}/checkConfig") + public void updateCheckConfig(@PathVariable Long id, @RequestBody MapCheckConfig checkConfig) { + this.iDraftMapService.updateCheckConfig(id, checkConfig); + } + /** - * 保存地图元素信息 + *保存地图草稿对象数据 */ - @ApiOperation(value = "保存地图草稿对象数据") @PostMapping(path = "/{id}/saveElements") public void saveMapElsDetail(@PathVariable Long id, @RequestBody String shapeData) { iDraftMapService.saveMapElsDetail(id, shapeData); } - @ApiOperation(value = "清除原联锁数据，生成新的联锁数据并保存") + /** + *清除原联锁数据，生成新的联锁数据并保存 + */ @PostMapping(path = "/{id}/ci/generateAndSave") public CiGenerateResultVO generateAndSaveCiData(@PathVariable Long id) { return this.draftMapCiDataGenerator.generate(id); } - @ApiOperation(value = "草稿地图导出") + /** + * 生成车辆段联锁数据 + */ + @PostMapping(path = "/{id}/ci/generateAndSaveDepot") + public int generateAndSaveDepot(@PathVariable Long id, String stationCode) { + return this.draftMapCiDataGenerator.generateDepot(id, stationCode); + } + + /** + *草稿地图导出 + */ @GetMapping(path = "/{id}/export") public MapVO export(@PathVariable Long id) { return this.iDraftMapService.export(id); } - @ApiOperation(value = "地图数据导入") + /** + *地图数据导入 + */ @PostMapping(path = "/import") - public void importFrom(@RequestBody MapVO mapVO, @ApiIgnore @RequestAttribute UserVO user) { + public void importFrom(@RequestBody MapVO mapVO, @RequestAttribute AccountVO user) { iDraftMapService.importFrom(mapVO, user); } - @ApiOperation(value = "从发布的地图新建地图草稿") + /** + *从发布的地图新建地图草稿 + */ @PostMapping(path = "/createFrom") public void createFrom(@RequestBody @Validated(value = DraftMapCreateFromCheck.class) DraftMapVO draftMapVO, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { iDraftMapService.createFrom(draftMapVO.getId(), draftMapVO.getName(), user); } /** - * 删除地图草稿 + *删除地图草稿 */ - @ApiOperation(value = "删除地图草稿") @DeleteMapping(path = "/delete/{id}") - public void deleteMap(@PathVariable Long id, @RequestAttribute UserVO user) { + public void deleteMap(@PathVariable Long id, @RequestAttribute AccountVO user) { iDraftMapService.deleteMap(id, user); } - @ApiOperation(value = "数据校验") + @DeleteMapping(path = "/delete/all") + public void clearAllMap(@RequestAttribute AccountVO user) { + this.iDraftMapService.deleteAllUserDraftMap(user); + } + + /** + *数据校验 + */ @GetMapping(path = "/{id}/checkData") public List checkData(@PathVariable Long id) { return iDraftMapService.checkData(iDraftMapService.getMapData(id)); } - @ApiOperation(value = "发布") + /** + *发布 + */ @PostMapping(path = "/{id}/publish") public List publish(@PathVariable Long id, @RequestBody @Validated(value = DraftMapPublishCheck.class) DraftMapVO draftMapVO, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { MapDataVO mapData = iDraftMapService.getMapData(id); - List list = iDraftMapService.checkData(mapData); - if (Objects.nonNull(list) && list.isEmpty()) { + List list = new ArrayList<>(); + if (mapData.getCheckConfig() == null || mapData.getCheckConfig().isCheck()) { + list = iDraftMapService.checkData(mapData); + } + if (CollectionUtils.isEmpty(list)) { iDraftMapService.publish(id, draftMapVO, user, mapData); } return list; } - @ApiOperation(value = "发布地图3D数据") + /** + *发布地图3D数据 + */ @PostMapping(path = "/{id}/publish/3d") public void publish3DData(@PathVariable Long id, @RequestBody @Validated(value = DraftMapPublishCheck.class) DraftMapVO draftMapVO, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { this.iDraftMapService.publish3DData(id, draftMapVO, user); } /*-------------- 联动道岔 ------------------*/ - @ApiOperation(value = "创建联动道岔关系") + /** + *创建联动道岔关系 + */ @PostMapping(path = "/switchCoupled") public void createSwitchCoupled(@RequestBody MapSwitchCoupledVO vo) { iDraftMapService.createSwitchCoupled(vo); } - @ApiOperation(value = "查询地图的联动道岔关系列表") + /** + *查询地图的联动道岔关系列表 + */ @GetMapping(path = "/{mapId}/switchCoupled") public PageVO selectSwitchCoupled(@PathVariable Long mapId, MapSwitchCoupledQueryVO queryVO) { return iDraftMapService.selectSwitchCoupled(mapId, queryVO); } - @ApiOperation(value = "删除联动道岔关系") + /** + *删除联动道岔关系 + */ @DeleteMapping(path = "/switchCoupled/{coupleId}") public void delSwitchCoupledById(@PathVariable Long coupleId) { iDraftMapService.delSwitchCoupled(coupleId); @@ -173,33 +230,41 @@ public class DraftMapController { /*-------------- 信号机接近区段 ------------------*/ - @ApiOperation(value = "创建信号机接近区段") + /** + *创建信号机接近区段 + */ @PostMapping(path = "/approachSection") public void createApproachSection(@RequestBody @Validated MapSignalApproachSectionVO approachSectionVO) { this.iDraftMapService.createApproachSection(approachSectionVO); } +// +// @ApiOperation(value = "分页查询信号机接近区段列表") +// @GetMapping(path = "/{mapId}/approachSection/paging") +// public PageVO queryPagedApproachSection( +// @PathVariable Long mapId, +// MapApproachSectionQueryVO queryVO) { +// return this.iDraftMapService.queryPagedApproachSection(mapId, queryVO); +// } - @ApiOperation(value = "分页查询信号机接近区段列表") - @GetMapping(path = "/{mapId}/approachSection/paging") - public PageVO queryPagedApproachSection( - @PathVariable Long mapId, - MapApproachSectionQueryVO queryVO) { - return this.iDraftMapService.queryPagedApproachSection(mapId, queryVO); - } - - @ApiOperation(value = "根据id查询信号机接近区段") + /** + *根据id查询信号机接近区段 + */ @GetMapping(path = "/approachSection/{id}") public MapSignalApproachSectionVO getApproachSectionById(@PathVariable Long id) { return this.iDraftMapService.getApproachSectionById(id); } - @ApiOperation(value = "更新信号机接近区段") + /** + *更新信号机接近区段 + */ @PutMapping(path = "/approachSection/{id}") public void updateApproachSection(@PathVariable Long id, @RequestBody @Validated MapSignalApproachSectionVO approachSectionVO) { this.iDraftMapService.updateApproachSection(id, approachSectionVO); } - @ApiOperation(value = "删除信号机接近区段") + /** + *删除信号机接近区段 + */ @DeleteMapping(path = "/approachSection/{id}") public void deleteApproachSection(@PathVariable Long id) { this.iDraftMapService.deleteApproachSection(id); @@ -207,31 +272,41 @@ public class DraftMapController { /*-------------- 自动信号 ------------------*/ - @ApiOperation(value = "创建自动信号") + /** + *创建自动信号 + */ @PostMapping(path = "/autoSignal") public void createAutoSignal(@RequestBody @Validated MapAutoSignalVO autoSignalVO) { iDraftMapService.createAutoSignal(autoSignalVO); } - @ApiOperation(value = "分页获取自动信号") + /** + *分页获取自动信号 + */ @GetMapping(path = "/{mapId}/autoSignal") public PageVO queryPagedAutoSignal(@PathVariable Long mapId, MapAutoSignalQueryVO queryVO) { return iDraftMapService.queryPagedAutoSignal(mapId, queryVO); } - @ApiOperation(value = "获取自动信号") + /** + *获取自动信号 + */ @GetMapping(path = "/autoSignal/{autoSignalId}") public MapAutoSignalVO getAutoSignal(@PathVariable Long autoSignalId) { return iDraftMapService.getAutoSignal(autoSignalId); } - @ApiOperation(value = "更新自动信号") + /** + *更新自动信号 + */ @PutMapping(path = "/autoSignal/{autoSignalId}") public void updateAutoSignal(@PathVariable Long autoSignalId, @RequestBody @Validated MapAutoSignalVO autoSignalVO) { iDraftMapService.updateAutoSignal(autoSignalId, autoSignalVO); } - @ApiOperation(value = "删除自动信号") + /** + *删除自动信号 + */ @DeleteMapping(path = "/autoSignal/{autoSignalId}") public void deleteAutoSignal(@PathVariable Long autoSignalId) { iDraftMapService.deleteAutoSignal(autoSignalId); @@ -239,31 +314,41 @@ public class DraftMapController { /*!!!!!!!!!!!!!!!!!!!!!!! 新 自动信号 !!!!!!!!!!!!!!!!!!!!!!!!!!*/ - @ApiOperation(value = "新创建自动信号") + /** + *新创建自动信号 + */ @PostMapping(path = "/autoSignalNew") public void createAutoSignal(@RequestBody @Validated MapAutoSignalNewVO autoSignalVO) { iDraftMapService.createAutoSignal(autoSignalVO); } - @ApiOperation(value = "新分页获取自动信号") + /** + *新分页获取自动信号 + */ @GetMapping(path = "/{mapId}/autoSignalNew") public PageVO queryPagedAutoSignalNew(@PathVariable Long mapId, MapAutoSignalQueryVO queryVO) { return iDraftMapService.queryPagedAutoSignalNew(mapId, queryVO); } - @ApiOperation(value = "新获取自动信号") + /** + *新获取自动信号 + */ @GetMapping(path = "/autoSignalNew/{autoSignalId}") public MapAutoSignalNewVO getAutoSignalNew(@PathVariable Long autoSignalId) { return iDraftMapService.getAutoSignalNew(autoSignalId); } - @ApiOperation(value = "新更新自动信号") + /** + *新更新自动信号 + */ @PutMapping(path = "/autoSignalNew/{autoSignalId}") public void updateAutoSignal(@PathVariable Long autoSignalId, @RequestBody @Validated MapAutoSignalNewVO autoSignalVO) { iDraftMapService.updateAutoSignal(autoSignalId, autoSignalVO); } - @ApiOperation(value = "新删除自动信号") + /** + *新删除自动信号 + */ @DeleteMapping(path = "/autoSignalNew/{autoSignalId}") public void deleteAutoSignalNew(@PathVariable Long autoSignalId) { iDraftMapService.deleteAutoSignal(autoSignalId); @@ -271,31 +356,41 @@ public class DraftMapController { /*-------------- 进路 ------------------*/ - @ApiOperation(value = "创建进路") + /** + *创建进路 + */ @PostMapping(path = "/route") public void createRoute(@RequestBody @Validated MapRouteVO routeVO) { iDraftMapService.createRoute(routeVO); } - @ApiOperation(value = "查询进路列表") + /** + *查询进路列表 + */ @GetMapping(path = "/{mapId}/route") public PageVO queryPagedRoute(@PathVariable Long mapId, MapRouteQueryVO queryVO) { return iDraftMapService.queryPagedRoute(mapId, queryVO); } - @ApiOperation(value = "查询进路数据明细") + /** + *查询进路数据明细 + */ @GetMapping(path = "/route/{routeId}") public MapRouteVO getRouteDetail(@PathVariable Long routeId) { return iDraftMapService.getRouteDetail(routeId); } - @ApiOperation(value = "更新进路数据") + /** + *更新进路数据 + */ @PutMapping(path = "/route/{routeId}") public void updateRoute(@PathVariable Long routeId, @RequestBody @Validated MapRouteVO routeVO) { iDraftMapService.updateRoute(routeId, routeVO); } - @ApiOperation(value = "删除进路") + /** + *删除进路 + */ @DeleteMapping(path = "/route/{routeId}") public void deleteRoute(@PathVariable Long routeId) { iDraftMapService.deleteRoute(routeId); @@ -303,79 +398,93 @@ public class DraftMapController { /*-------------- 新 进路 ------------------*/ - @ApiOperation(value = "新创建进路") + /** + *新创建进路 + */ @PostMapping(path = "/routeNew") public void createRoute(@RequestBody @Validated MapRouteNewVO routeVO) { iDraftMapService.createRoute(routeVO); } - @ApiOperation(value = "新查询进路列表") + /** + *新查询进路列表 + */ @GetMapping(path = "/{mapId}/routeNew") public PageVO queryPagedRouteNew(@PathVariable Long mapId, MapRouteQueryVO queryVO) { return iDraftMapService.queryPagedRouteNew(mapId, queryVO); } - @ApiOperation(value = "新查询进路数据明细") + /** + *新查询进路数据明细 + */ @GetMapping(path = "/routeNew/{routeId}") public MapRouteNewVO getRouteDetailNew(@PathVariable Long routeId) { return iDraftMapService.getRouteDetailNew(routeId); } - @ApiOperation(value = "新更新进路数据") + /** + *新更新进路数据 + */ @PutMapping(path = "/routeNew/{routeId}") public void updateRoute(@PathVariable Long routeId, @RequestBody @Validated MapRouteNewVO routeVO) { iDraftMapService.updateRoute(routeId, routeVO); } - @ApiOperation(value = "新删除进路") + /** + *新删除进路 + */ @DeleteMapping(path = "/routeNew/{routeId}") public void deleteRouteNew(@PathVariable Long routeId) { iDraftMapService.deleteRoute(routeId); } /*-------------- 延续保护 ------------------*/ - - @ApiOperation(value = "创建延续保护") - @PostMapping(path = "/overlap") - public void createOverlap(@RequestBody @Validated MapOverlapVO mapOverlapVO) { - this.iDraftMapService.createOverlap(mapOverlapVO); - } - - @ApiOperation(value = "分页查询延续保护列表") - @GetMapping(path = "/{mapId}/overlap/paging") - public PageVO queryPagedOverlap( - @PathVariable Long mapId, - MapOverlapQueryVO queryVO) { - return this.iDraftMapService.queryPagedOverlap(mapId, queryVO); - } - - @ApiOperation(value = "根据id查询延续保护") - @GetMapping(path = "/overlap/{id}") - public MapOverlapVO getOverlapById(@PathVariable Long id) { - return this.iDraftMapService.getOverlapById(id); - } - - @ApiOperation(value = "更新延续保护") - @PutMapping(path = "/overlap/{id}") - public void updateOverlap(@PathVariable Long id, @RequestBody @Validated MapOverlapVO mapOverlapVO) { - this.iDraftMapService.updateOverlap(id, mapOverlapVO); - } - - @ApiOperation(value = "删除延续保护") - @DeleteMapping(path = "/overlap/{id}") - public void deleteOverlap(@PathVariable Long id) { - this.iDraftMapService.deleteOverlap(id); - } +// +// @ApiOperation(value = "创建延续保护") +// @PostMapping(path = "/overlap") +// public void createOverlap(@RequestBody @Validated MapOverlapVO mapOverlapVO) { +// this.iDraftMapService.createOverlap(mapOverlapVO); +// } +// +// @ApiOperation(value = "分页查询延续保护列表") +// @GetMapping(path = "/{mapId}/overlap/paging") +// public PageVO queryPagedOverlap( +// @PathVariable Long mapId, +// MapOverlapQueryVO queryVO) { +// return this.iDraftMapService.queryPagedOverlap(mapId, queryVO); +// } +// +// @ApiOperation(value = "根据id查询延续保护") +// @GetMapping(path = "/overlap/{id}") +// public MapOverlapVO getOverlapById(@PathVariable Long id) { +// return this.iDraftMapService.getOverlapById(id); +// } +// +// @ApiOperation(value = "更新延续保护") +// @PutMapping(path = "/overlap/{id}") +// public void updateOverlap(@PathVariable Long id, @RequestBody @Validated MapOverlapVO mapOverlapVO) { +// this.iDraftMapService.updateOverlap(id, mapOverlapVO); +// } +// +// @ApiOperation(value = "删除延续保护") +// @DeleteMapping(path = "/overlap/{id}") +// public void deleteOverlap(@PathVariable Long id) { +// this.iDraftMapService.deleteOverlap(id); +// } /*-------------- 自动折返 ------------------*/ - @ApiOperation(value = "创建自动折返") + /** + *创建自动折返 + */ @PostMapping(path = "/autoReentry") public void createAutoReentry(@RequestBody @Validated MapAutoReentryVO mapAutoReentryVO) { this.iDraftMapService.createAutoReentry(mapAutoReentryVO); } - @ApiOperation(value = "分页查询自动折返列表") + /** + *分页查询自动折返列表 + */ @GetMapping(path = "/{mapId}/autoReentry/paging") public PageVO queryPagedAutoReentry( @PathVariable Long mapId, @@ -383,26 +492,34 @@ public class DraftMapController { return this.iDraftMapService.queryPagedAutoReentry(mapId, queryVO); } - @ApiOperation(value = "查询根据折返轨分组的自动折返列表") + /** + *查询根据折返轨分组的自动折返列表 + */ @GetMapping(path = "/{mapId}/autoReentry/group/reentryTrack") public Map> queryAutoReentrysGroupByReentryTrack( @PathVariable Long mapId) { return this.iDraftMapService.queryAutoReentrysGroupByReentryTrack(mapId); } - @ApiOperation(value = "根据id查询自动折返") + /** + *根据id查询自动折返 + */ @GetMapping(path = "/autoReentry/{id}") public MapAutoReentryVO getAutoReentryById(@PathVariable Long id) { return this.iDraftMapService.getAutoReentryById(id); } - @ApiOperation(value = "更新自动折返") + /** + *更新自动折返 + */ @PutMapping(path = "/autoReentry/{id}") public void updateAutoReentry(@PathVariable Long id, @RequestBody @Validated MapAutoReentryVO mapAutoReentryVO) { this.iDraftMapService.updateAutoReentry(id, mapAutoReentryVO); } - @ApiOperation(value = "删除自动折返") + /** + *删除自动折返 + */ @DeleteMapping(path = "/autoReentry/{id}") public void deleteAutoReentry(@PathVariable Long id) { this.iDraftMapService.deleteAutoReentry(id); @@ -410,31 +527,41 @@ public class DraftMapController { /*-------------- 路径单元 ------------------*/ - @ApiOperation(value = "获取路径单元列表") + /** + *获取路径单元列表 + */ @GetMapping(path = "/{mapId}/routeUnit") public PageVO getRouteUnitList(@PathVariable Long mapId, MapRouteUnitQueryVO queryVO) { return iDraftMapService.getRouteUnitList(mapId, queryVO); } - @ApiOperation(value = "创建路径单元") + /** + *创建路径单元 + */ @PostMapping(path = "/routeUnit") public void createRouteUnit(@RequestBody @Validated MapRouteUnitVO mapRouteUnitVO) { iDraftMapService.createRouteUnit(mapRouteUnitVO); } - @ApiOperation(value = "获取路径单元") + /** + *获取路径单元 + */ @GetMapping(path = "/routeUnit/{routeUnitId}") public MapRouteUnitVO getRouteUnit(@PathVariable Long routeUnitId) { return iDraftMapService.getRouteUnit(routeUnitId); } - @ApiOperation(value = "更新路径单元") + /** + *更新路径单元 + */ @PutMapping(path = "/routeUnit/{routeUnitId}") public void updateRouteUnit(@PathVariable Long routeUnitId, @RequestBody @Validated MapRouteUnitVO mapRouteUnitVO) { iDraftMapService.updateRouteUnit(routeUnitId, mapRouteUnitVO); } - @ApiOperation(value = "删除路径单元") + /** + *删除路径单元 + */ @DeleteMapping(path = "/routeUnit/{routeUnitId}") public void deleteRouteUnit(@PathVariable Long routeUnitId) { iDraftMapService.deleteRouteUnit(routeUnitId); @@ -442,31 +569,41 @@ public class DraftMapController { /*-------------- 交路 ------------------*/ - @ApiOperation(value = "创建交路") + /** + *创建交路 + */ @PostMapping(path = "/routing") public void createRouting(@RequestBody @Validated MapRoutingVO routingVO) { iDraftMapService.createRouting(routingVO); } - @ApiOperation(value = "分页获取交路") + /** + *分页获取交路 + */ @GetMapping(path = "/{mapId}/routing") public PageVO queryPagedRouting(@PathVariable Long mapId, PageQueryVO queryVO) { return iDraftMapService.queryPagedRouting(mapId, queryVO); } - @ApiOperation(value = "获取交路") + /** + *获取交路 + */ @GetMapping(path = "/routing/{routingId}") public MapRoutingVO getRouting(@PathVariable Long routingId) { return iDraftMapService.getRouting(routingId); } - @ApiOperation(value = "更新交路") + /** + *更新交路 + */ @PutMapping(path = "/routing/{routingId}") public void updateRouting(@PathVariable Long routingId, @RequestBody @Validated MapRoutingVO routingVO) { iDraftMapService.updateRouting(routingId, routingVO); } - @ApiOperation(value = "删除交路") + /** + *删除交路 + */ @DeleteMapping(path = "/routing/{routingId}") public void deleteRouting(@PathVariable Long routingId) { iDraftMapService.deleteRouting(routingId); @@ -474,37 +611,49 @@ public class DraftMapController { /*-------------- 新 交路 ------------------*/ - @ApiOperation(value = "新创建交路，可同时创建回路") + /** + *新创建交路，可同时创建回路 + */ @PostMapping(path = "/routingData") public void createRoutingData(@RequestBody @Validated MapRoutingDataVO routingVO) { iDraftMapService.createRoutingData(routingVO); } - @ApiOperation(value = "新生成交路区段数据") + /** + *新生成交路区段数据 + */ @PutMapping(path = "/routingData/generate") public MapRoutingDataVO generateRoutingData(@RequestBody @Validated MapRoutingDataVO routingVO) { return iDraftMapService.generateRoutingData(routingVO); } - @ApiOperation(value = "新分页获取交路") + /** + *新分页获取交路 + */ @GetMapping(path = "/{mapId}/routingData") public PageVO queryPagedRoutingData(@PathVariable Long mapId, MapRoutingDataQueryVO queryVO) { return iDraftMapService.queryPagedRoutingData(mapId, queryVO); } - @ApiOperation(value = "新获取交路详情") + /** + *新获取交路详情 + */ @GetMapping(path = "/routingData/{routingId}") public MapRoutingDataVO getRoutingData(@PathVariable Long routingId) { return iDraftMapService.getRoutingData(routingId); } - @ApiOperation(value = "新更新交路") + /** + *新更新交路 + */ @PutMapping(path = "/routingData/{routingId}") public void updateRoutingData(@PathVariable Long routingId, @RequestBody @Validated MapRoutingDataVO routingVO) { iDraftMapService.updateRoutingData(routingId, routingVO); } - @ApiOperation(value = "新删除交路") + /** + *新删除交路 + */ @DeleteMapping(path = "/routingData/{routingId}") public void deleteRoutingData(@PathVariable Long routingId) { iDraftMapService.deleteRouting(routingId); @@ -512,31 +661,41 @@ public class DraftMapController { /*-------------- 新 车站区段停站时间 ------------------*/ - @ApiOperation(value = "新创建车站区段停站时间") + /** + *新创建车站区段停站时间 + */ @PostMapping(path = "/stationParkTime") public void createStationParkTime(@RequestBody @Validated MapStationParkingTimeVO parkingTimeVO) { iDraftMapService.createStationParkTime(parkingTimeVO); } - @ApiOperation(value = "新分页车站区段停站时间") + /** + *新分页车站区段停站时间 + */ @GetMapping(path = "/{mapId}/stationParkTime") public PageVO queryPagedStationParkTime(@PathVariable Long mapId, MapParkTimeQueryVO queryVO) { return iDraftMapService.queryPagedStationParkTime(mapId, queryVO); } - @ApiOperation(value = "新获取车站区段停站时间") + /** + *新获取车站区段停站时间 + */ @GetMapping(path = "/stationParkTime/{id}") public MapStationParkingTimeVO getStationParkTime(@PathVariable Long id) { return iDraftMapService.getStationParkTime(id); } - @ApiOperation(value = "新更新车站区段停站时间") + /** + *新更新车站区段停站时间 + */ @PutMapping(path = "/stationParkTime/{id}") public void updateStationParkTime(@PathVariable Long id, @RequestBody @Validated MapStationParkingTimeVO parkingTimeVO) { iDraftMapService.updateStationParkTime(id, parkingTimeVO); } - @ApiOperation(value = "新删除车站区段停站时间") + /** + *新删除车站区段停站时间 + */ @DeleteMapping(path = "/stationParkTime/{id}") public void deleteStationParkTime(@PathVariable Long id) { iDraftMapService.deleteStationParkTime(id); @@ -544,19 +703,25 @@ public class DraftMapController { /*-------------- 3d ------------------*/ - @ApiOperation(value = "创建地图3d数据") + /** + *创建地图3d数据 + */ @PostMapping(path = "/3dMapData") - public Map3dDataVO create3dMapData(@RequestBody @Validated Map3dDataVO mapData3D, @RequestAttribute UserVO user) { + public Map3dDataVO create3dMapData(@RequestBody @Validated Map3dDataVO mapData3D, @RequestAttribute AccountVO user) { return iDraftMapService.create3dMapData(mapData3D, user); } - @ApiOperation(value = "通过地图id获取地图3d数据") + /** + *通过地图id获取地图3d数据 + */ @GetMapping(path = "/3dMapData/{mapId}") public Map3dDataVO get3dMapDataByMapId(@PathVariable Long mapId) { return iDraftMapService.find3dMapDataByMapId(mapId); } - @ApiOperation(value = "更新保存地图3d数据") + /** + *更新保存地图3d数据 + */ @PutMapping(path = "/3dMapData/{map3dId}") public void update3dMapData(@PathVariable Long map3dId, @RequestBody @Validated Map3dDataVO mapData3D) { iDraftMapService.update3dMapData(map3dId, mapData3D); @@ -564,33 +729,49 @@ public class DraftMapController { /*-------------- 目的地码 ------------------*/ - @ApiOperation(value = "保存目的地码") + /** + *保存目的地码 + */ @PostMapping("/{mapId}/destinationCodeDefinition") public void saveOperationDefinitions(@PathVariable Long mapId, @RequestBody @Validated MapDestinationCodeDefinitionVO operationDefinitionVO) { iDraftMapService.saveOperationDefinitions(mapId, operationDefinitionVO); } - @ApiOperation(value = "根据地图id和code获取目的地码") + /** + *根据地图id和code获取目的地码 + */ @GetMapping("/{mapId}/{code}/destinationCodeDefinition") public MapDestinationCodeDefinitionVO getOperationDefinitions(@PathVariable Long mapId, @PathVariable String code) { return iDraftMapService.getOperationDefinitions(mapId, code); } - @ApiOperation("分页获取目的地码") + /** + *分页获取目的地码 + */ @GetMapping("/{mapId}/destinationCodeDefinition") public PageVO queryPagedOperationDefinitions(@PathVariable Long mapId, MapDestinationCodeDefinitionQueryVO queryVO) { return iDraftMapService.pagedQueryOperationDefinitions(mapId, queryVO); } - @ApiOperation("更新目的地码") + /** + *更新目的地码 + */ @PutMapping("/{mapId}/destinationCodeDefinition") public void updateOperationDefinition(@PathVariable Long mapId, @RequestBody MapDestinationCodeDefinitionVO definitionVO) { iDraftMapService.updateOperationDefinition(mapId, definitionVO); } - @ApiOperation("删除目的地码") + /** + *删除目的地码 + */ @DeleteMapping("/{mapId}/{code}/destinationCodeDefinition") public void deleteOperationDefinition(@PathVariable Long mapId, @PathVariable String code){ iDraftMapService.deleteOperationDefinition(mapId, code); } + + //临时接口 + @PostMapping("/handle/ctc/{id}") + public void handle(@PathVariable Long id) { + iDraftMapService.handle(id); + } } diff --git a/src/main/java/club/joylink/rtss/controller/draft/DraftMapController2.java b/src/main/java/club/joylink/rtss/controller/draft/DraftMapController2.java new file mode 100644 index 000000000..d33fbd8b0 --- /dev/null +++ b/src/main/java/club/joylink/rtss/controller/draft/DraftMapController2.java @@ -0,0 +1,14 @@ +package club.joylink.rtss.controller.draft; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 新版草稿地图接口（使用缓存，数据不分散到多个表） + */ +@RestController +@RequestMapping("/api/draftMap") +@Slf4j +public class DraftMapController2 { +} diff --git a/src/main/java/club/joylink/rtss/controller/draft/DraftMapDataHandleController.java b/src/main/java/club/joylink/rtss/controller/draft/DraftMapDataHandleController.java index b4e247be1..a88b99aea 100644 --- a/src/main/java/club/joylink/rtss/controller/draft/DraftMapDataHandleController.java +++ b/src/main/java/club/joylink/rtss/controller/draft/DraftMapDataHandleController.java @@ -1,7 +1,6 @@ package club.joylink.rtss.controller.draft; import club.joylink.rtss.services.draftData.DraftMapDataHandleService; -import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; @@ -9,8 +8,10 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +/** + * 草稿地图数据处理接口 + */ @Slf4j -@Api(tags = {"草稿地图数据处理接口"}) @RestController @RequestMapping("/api/draftMap/handle") public class DraftMapDataHandleController { @@ -37,4 +38,24 @@ public class DraftMapDataHandleController { public void calculateSectionLen(@PathVariable Long mapId) { this.draftMapDataHandleService.calculateSectionLen(mapId); } + + @PutMapping("/{mapId}/routeConflict") + public void handleRouteConflictRelation(@PathVariable Long mapId) { + this.draftMapDataHandleService.handleRouteConflictRelation(mapId); + } + + @PutMapping("/{mapId}/doublePath") + public void handleDoublePathRoute(@PathVariable Long mapId) { + this.draftMapDataHandleService.handleDoublePathRoute(mapId); + } + + @PutMapping("/{mapId}/signalApproach") + public void handleSignalApproach(@PathVariable Long mapId) { + this.draftMapDataHandleService.handleSignalApproach(mapId); + } + + @PutMapping("/{mapId}/signalModel") + public void handleSignalModel(@PathVariable Long mapId) { + this.draftMapDataHandleService.handleSignalModel(mapId); + } } diff --git a/src/main/java/club/joylink/rtss/controller/draft/DraftMapFlankProtectionController.java b/src/main/java/club/joylink/rtss/controller/draft/DraftMapFlankProtectionController.java index 479c18fc3..a8756e703 100644 --- a/src/main/java/club/joylink/rtss/controller/draft/DraftMapFlankProtectionController.java +++ b/src/main/java/club/joylink/rtss/controller/draft/DraftMapFlankProtectionController.java @@ -2,20 +2,16 @@ package club.joylink.rtss.controller.draft; import club.joylink.rtss.services.draftData.DraftMapFlankProtectionService; import club.joylink.rtss.vo.client.PageVO; -import club.joylink.rtss.vo.client.map.newmap.MapRouteFlankProtectionNewVO; -import club.joylink.rtss.vo.client.map.newmap.MapRouteFlankProtectionQueryVO; -import club.joylink.rtss.vo.client.map.newmap.validate.RunLevelCreateCheck; -import club.joylink.rtss.vo.client.map.newmap.validate.RunLevelUpdateCheck; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import club.joylink.rtss.vo.map.logic.MapRouteFlankProtectionNewVO; +import club.joylink.rtss.vo.map.query.MapRouteFlankProtectionQueryVO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.List; - -@Api(tags = {"草稿地图侧防管理接口"}) +/** + *草稿地图侧防管理接口 + */ @RestController @RequestMapping("/api/draftMap/flankProtection") @Slf4j @@ -24,32 +20,42 @@ public class DraftMapFlankProtectionController { @Autowired private DraftMapFlankProtectionService draftMapFlankProtectionService; - @ApiOperation(value = "新建进路侧防") + /** + *新建进路侧防 + */ @PostMapping(path = "") public void create(@RequestBody @Validated MapRouteFlankProtectionNewVO flankProtectionNewVO) { this.draftMapFlankProtectionService.create(flankProtectionNewVO); } - @ApiOperation(value = "查询进路侧防列表") + /** + *查询进路侧防列表 + */ @GetMapping(path = "/{mapId}/paging") public PageVO pagingQueryFlankProtection(@PathVariable Long mapId, MapRouteFlankProtectionQueryVO queryVO) { return this.draftMapFlankProtectionService.pagingQueryFlankProtections(mapId, queryVO); } - @ApiOperation(value = "查询进路侧防明细") + /** + *查询进路侧防明细 + */ @GetMapping(path = "/{id}") public MapRouteFlankProtectionNewVO getRouteDetailNew(@PathVariable Long id) { return this.draftMapFlankProtectionService.getById(id); } - @ApiOperation(value = "更新进路侧防数据") + /** + *更新进路侧防数据 + */ @PutMapping(path = "/{id}") public void update(@PathVariable Long id, @RequestBody @Validated MapRouteFlankProtectionNewVO flankProtectionNewVO) { this.draftMapFlankProtectionService.update(id, flankProtectionNewVO); } - @ApiOperation(value = "删除进路侧防") + /** + *删除进路侧防 + */ @DeleteMapping(path = "/{id}") public void delete(@PathVariable Long id) { this.draftMapFlankProtectionService.delete(id); diff --git a/src/main/java/club/joylink/rtss/controller/draft/DraftMapFlsController.java b/src/main/java/club/joylink/rtss/controller/draft/DraftMapFlsController.java new file mode 100644 index 000000000..eceaf22b5 --- /dev/null +++ b/src/main/java/club/joylink/rtss/controller/draft/DraftMapFlsController.java @@ -0,0 +1,40 @@ +package club.joylink.rtss.controller.draft; + +import club.joylink.rtss.services.draftData.DraftMapFlsService; +import club.joylink.rtss.vo.client.PageVO; +import club.joylink.rtss.vo.map.logic.MapRouteFlankProtectionNewVO; +import club.joylink.rtss.vo.map.query.MapRouteFlankProtectionQueryVO; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/api/draftMap/{id}/fls") +@Slf4j +public class DraftMapFlsController { + + @Autowired + private DraftMapFlsService draftMapFlsService; + + @GetMapping("/paging") + public PageVO pagingQuery(@PathVariable Long id, MapRouteFlankProtectionQueryVO queryVO) { + return this.draftMapFlsService.pagingQuery(id, queryVO); + } + + @GetMapping("/all") + public List queryAll(@PathVariable Long id) { + return this.draftMapFlsService.queryAll(id); + } + + @PutMapping("/{code}") + public void update(@PathVariable Long id, @PathVariable String code, @RequestBody MapRouteFlankProtectionNewVO vo) { + this.draftMapFlsService.update(id, code, vo); + } + + @DeleteMapping("/{code}") + public void delete(@PathVariable Long id, @PathVariable String code) { + this.draftMapFlsService.delete(id, code); + } +} diff --git a/src/main/java/club/joylink/rtss/controller/draft/DraftMapOverlapController.java b/src/main/java/club/joylink/rtss/controller/draft/DraftMapOverlapController.java new file mode 100644 index 000000000..892660004 --- /dev/null +++ b/src/main/java/club/joylink/rtss/controller/draft/DraftMapOverlapController.java @@ -0,0 +1,49 @@ +package club.joylink.rtss.controller.draft; + +import club.joylink.rtss.services.draftData.DraftMapOverlapService; +import club.joylink.rtss.vo.client.PageVO; +import club.joylink.rtss.vo.map.logic.MapOverlapVO; +import club.joylink.rtss.vo.map.query.MapOverlapQueryVO; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 草稿地图延续保护接口 + */ +@RestController +@RequestMapping("/api/draftMap/{id}/overlap") +@Slf4j +public class DraftMapOverlapController { + + @Autowired + private DraftMapOverlapService draftMapOverlapService; + + @GetMapping("/paging") + public PageVO pagingQuery(@PathVariable Long id, MapOverlapQueryVO queryVO) { + return this.draftMapOverlapService.pagingQuery(id, queryVO); + } + + @GetMapping("/all") + public List queryAll(@PathVariable Long id) { + return this.draftMapOverlapService.queryAll(id); + } + + @PostMapping("") + public void create(@PathVariable Long id, @RequestBody MapOverlapVO vo) { + this.draftMapOverlapService.create(id, vo); + } + + @PutMapping("/{code}") + public void update(@PathVariable Long id, @PathVariable String code, @RequestBody MapOverlapVO vo) { + this.draftMapOverlapService.update(id, code, vo); + } + + @DeleteMapping("/{code}") + public void delete(@PathVariable Long id, @PathVariable String code) { + this.draftMapOverlapService.delete(id, code); + } + +} diff --git a/src/main/java/club/joylink/rtss/controller/draft/DraftMapOverrunController.java b/src/main/java/club/joylink/rtss/controller/draft/DraftMapOverrunController.java new file mode 100644 index 000000000..48bc8f3be --- /dev/null +++ b/src/main/java/club/joylink/rtss/controller/draft/DraftMapOverrunController.java @@ -0,0 +1,45 @@ +package club.joylink.rtss.controller.draft; + +import club.joylink.rtss.services.draftData.DraftMapOverrunService; +import club.joylink.rtss.vo.client.PageVO; +import club.joylink.rtss.vo.client.map.MapRouteOverrunQueryVO; +import club.joylink.rtss.vo.map.logic.MapRouteOverrunVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 草稿地图超限区段接口 + */ +@RestController +@RequestMapping("/api/draftMap/{id}/overrun") +public class DraftMapOverrunController { + @Autowired + private DraftMapOverrunService draftMapOverrunService; + + @GetMapping("/paging") + public PageVO pagingQuery(@PathVariable Long id, MapRouteOverrunQueryVO queryVO) { + return draftMapOverrunService.pagingQuery(id, queryVO); + } + + @GetMapping("/all") + public List queryAll(@PathVariable Long id) { + return this.draftMapOverrunService.queryAll(id); + } + + @PostMapping("") + public void createOverrun(@PathVariable Long id, @RequestBody MapRouteOverrunVO overrunVO) { + draftMapOverrunService.createOverrun(id, overrunVO); + } + + @DeleteMapping("/{code}") + public void delete(@PathVariable Long id, @PathVariable String code) { + draftMapOverrunService.delete(id, code); + } + + @PutMapping("/{code}") + public void update(@PathVariable Long id, @PathVariable String code, @RequestBody MapRouteOverrunVO vo) { + draftMapOverrunService.update(id, code, vo); + } +} diff --git a/src/main/java/club/joylink/rtss/controller/draft/DraftMapParkTimeController.java b/src/main/java/club/joylink/rtss/controller/draft/DraftMapParkTimeController.java new file mode 100644 index 000000000..2b520d23f --- /dev/null +++ b/src/main/java/club/joylink/rtss/controller/draft/DraftMapParkTimeController.java @@ -0,0 +1,37 @@ +package club.joylink.rtss.controller.draft; + +import club.joylink.rtss.services.draftData.ParkTimeService; +import club.joylink.rtss.vo.map.logic.MapStationParkingTimeVO; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 草稿地图停站时间接口 + */ +@RestController +@RequestMapping("/api/draftMap/{mapId}/parkTime") +@Slf4j +public class DraftMapParkTimeController { + + @Autowired + private ParkTimeService parkTimeService; + + @PostMapping("/generate") + public List generate(@PathVariable Long mapId) { + return this.parkTimeService.generate(mapId); + } + + @GetMapping("/all") + public List queryAll(@PathVariable Long mapId) { + return this.parkTimeService.queryAll(mapId); + } + + @PutMapping("/{id}") + public void update(@PathVariable Long mapId, @PathVariable Long id, @RequestBody MapStationParkingTimeVO parkingTimeVO) { + this.parkTimeService.update(mapId, id, parkingTimeVO); + } + +} diff --git a/src/main/java/club/joylink/rtss/controller/draft/DraftMapRouteController.java b/src/main/java/club/joylink/rtss/controller/draft/DraftMapRouteController.java new file mode 100644 index 000000000..064d38fd1 --- /dev/null +++ b/src/main/java/club/joylink/rtss/controller/draft/DraftMapRouteController.java @@ -0,0 +1,68 @@ +package club.joylink.rtss.controller.draft; + +import club.joylink.rtss.services.draftData.DraftMapRouteService; +import club.joylink.rtss.vo.client.PageVO; +import club.joylink.rtss.vo.client.map.MapRouteQueryVO; +import club.joylink.rtss.vo.map.logic.MapRouteNewVO; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 草稿地图进路接口 + */ +@RestController +@RequestMapping("/api/draftMap/{id}/route") +@Slf4j +public class DraftMapRouteController { + + @Autowired + private DraftMapRouteService draftMapRouteService; + + @PostMapping("/railway") + public MapRouteNewVO createRailwayRoute(@PathVariable Long id, @RequestBody MapRouteNewVO routeNewVO) { + return this.draftMapRouteService.createRailwayRoute(id, routeNewVO); + } + + @PostMapping("/railway/generate") + public List generateRailwayRoute(@PathVariable Long id) { + return this.draftMapRouteService.generateRailwayRoute(id); + } + + @GetMapping("/paging") + public PageVO pagingQuery(@PathVariable Long id, MapRouteQueryVO queryVO) { + return this.draftMapRouteService.pagingQuery(id, queryVO); + } + + @GetMapping("/all") + public List queryAllRoutes(@PathVariable Long id) { + return this.draftMapRouteService.queryAllRoutes(id); + } + + @PutMapping("/{code}") + public void update(@PathVariable Long id, @PathVariable String code, @RequestBody MapRouteNewVO routeNewVO) { + this.draftMapRouteService.update(id, code, routeNewVO); + } + + @DeleteMapping("/{code}") + public void delete(@PathVariable Long id, @PathVariable String code) { + this.draftMapRouteService.deleteRoute(id, code); + } + + @PutMapping("/handle/standHoldList/delete") + public void deleteStandHoldList(@PathVariable Long id) { + this.draftMapRouteService.deleteStandHoldList(id); + } + + @PutMapping("/handle/setOverlapInCtc/false") + public void setSetOverlapInCtcFalse(@PathVariable Long id) { + this.draftMapRouteService.setSetOverlapInCtcFalse(id); + } + + @PostMapping("") + public void createRoute(@PathVariable Long id, @RequestBody MapRouteNewVO routeNewVO) { + this.draftMapRouteService.createRoute(id, routeNewVO); + } +} diff --git a/src/main/java/club/joylink/rtss/controller/draft/DraftMapRunLevelController.java b/src/main/java/club/joylink/rtss/controller/draft/DraftMapRunLevelController.java new file mode 100644 index 000000000..d16eaf832 --- /dev/null +++ b/src/main/java/club/joylink/rtss/controller/draft/DraftMapRunLevelController.java @@ -0,0 +1,37 @@ +package club.joylink.rtss.controller.draft; + +import club.joylink.rtss.services.draftData.RunLevelService; +import club.joylink.rtss.vo.map.logic.MapStationRunLevelVO; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 草稿地图运行等级接口 + */ +@RestController +@RequestMapping("/api/draftMap/{mapId}/runLevel") +@Slf4j +public class DraftMapRunLevelController { + + @Autowired + private RunLevelService runLevelService; + + @PostMapping("/generate") + public List generate(@PathVariable Long mapId) { + return this.runLevelService.generate(mapId); + } + + @GetMapping("/all") + public List queryAll(@PathVariable Long mapId) { + return this.runLevelService.queryAll(mapId); + } + + @PutMapping("/{id}") + public void update(@PathVariable Long mapId, @PathVariable Long id, @RequestBody MapStationRunLevelVO runLevelVO) { + this.runLevelService.update(mapId, id, runLevelVO); + } + +} diff --git a/src/main/java/club/joylink/rtss/controller/draft/DraftMapSignalApproachSectionController.java b/src/main/java/club/joylink/rtss/controller/draft/DraftMapSignalApproachSectionController.java new file mode 100644 index 000000000..a7a689f6b --- /dev/null +++ b/src/main/java/club/joylink/rtss/controller/draft/DraftMapSignalApproachSectionController.java @@ -0,0 +1,50 @@ +package club.joylink.rtss.controller.draft; + +import club.joylink.rtss.services.draftData.DraftMapSignalApproachSectionService; +import club.joylink.rtss.services.draftData.SignalApproachSectionGenerator; +import club.joylink.rtss.vo.client.PageVO; +import club.joylink.rtss.vo.map.logic.MapSignalApproachSectionVO; +import club.joylink.rtss.vo.map.query.MapSASQueryVO; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 草稿地图信号机接近区段接口 + */ +@RestController +@RequestMapping("/api/draftMap/{id}/signalApproachSection") +@Slf4j +public class DraftMapSignalApproachSectionController { + + @Autowired + private DraftMapSignalApproachSectionService draftMapSignalApproachSectionService; + + @PostMapping("/generate") + public List generate(@PathVariable Long id, @RequestBody SignalApproachSectionGenerator.Config config) { + return this.draftMapSignalApproachSectionService.generate(id, config); + } + + @GetMapping("/paging") + public PageVO pagingQuery(@PathVariable Long id, MapSASQueryVO queryVO) { + return this.draftMapSignalApproachSectionService.pagingQuery(id, queryVO); + } + + @GetMapping("/all") + public List queryAll(@PathVariable Long id) { + return this.draftMapSignalApproachSectionService.queryAll(id); + } + + @PutMapping("/{signalCode}") + public void update(@PathVariable Long id, @PathVariable String signalCode, @RequestBody MapSignalApproachSectionVO vo) { + this.draftMapSignalApproachSectionService.update(id, signalCode, vo); + } + + @PutMapping("/handle/delete/logic") + public void deleteAll(@PathVariable Long id) { + this.draftMapSignalApproachSectionService.deleteLogic(id); + } + +} diff --git a/src/main/java/club/joylink/rtss/controller/draft/DraftMapStationDirectionController.java b/src/main/java/club/joylink/rtss/controller/draft/DraftMapStationDirectionController.java new file mode 100644 index 000000000..0480e0863 --- /dev/null +++ b/src/main/java/club/joylink/rtss/controller/draft/DraftMapStationDirectionController.java @@ -0,0 +1,67 @@ +package club.joylink.rtss.controller.draft; + +import club.joylink.rtss.entity.DraftMapStationDirection; +import club.joylink.rtss.services.draftData.IDraftMapStationDirectionService; +import club.joylink.rtss.vo.client.PageQueryVO; +import club.joylink.rtss.vo.client.PageVO; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * 草稿地图车站方向接口 + */ +@RestController +@RequestMapping("/api/station/direction") +@Slf4j +public class DraftMapStationDirectionController { + @Autowired + private IDraftMapStationDirectionService draftMapStationDirectionLabelService; + + /** + * 查询地图下车站 方向的逻辑数据列表 + * + * @param mapId 地图ID + * @param code Code + * @param labelEnum 方向类型 + * @return 数据列表 + */ + @GetMapping(path = "/list/{mapId}") + public PageVO stationLabelList(@PathVariable Long mapId, String code + , String labelEnum, PageQueryVO queryVO) { + return draftMapStationDirectionLabelService.stationLabelList(mapId, code, labelEnum, queryVO); + } + + /** + * 根据ID查询地图下车站 方向的逻辑数据 + * + * @param id 关系Id + * @return 关系实体 + */ + @GetMapping(path = "/{id}") + public DraftMapStationDirection queryStationLabel(@PathVariable Long id) { + return draftMapStationDirectionLabelService.queryStationLabel(id); + } + + /** + * 保存关联关系信息 + * + * @param mapId 地图信息 + * @param vo 关联关系 + * @return 处理结果 + */ + @PostMapping(path = "/save/{mapId}") + public String saveStationLabel(@PathVariable Long mapId, @RequestBody DraftMapStationDirection vo) { + return draftMapStationDirectionLabelService.saveStationLabel(mapId, vo); + } + + /** + * 删除车站 方向的逻辑数据 + * + * @param id 主键 + */ + @DeleteMapping(path = "/delete/{id}") + public void deleteStationLabel(@PathVariable Long id) { + draftMapStationDirectionLabelService.deleteStationLabel(id); + } +} diff --git a/src/main/java/club/joylink/rtss/controller/draft/DraftMapStationRunLevelController.java b/src/main/java/club/joylink/rtss/controller/draft/DraftMapStationRunLevelController.java index fa373ae2b..50e11b14f 100644 --- a/src/main/java/club/joylink/rtss/controller/draft/DraftMapStationRunLevelController.java +++ b/src/main/java/club/joylink/rtss/controller/draft/DraftMapStationRunLevelController.java @@ -2,18 +2,18 @@ package club.joylink.rtss.controller.draft; import club.joylink.rtss.services.draftData.DraftMapRunLevelService; import club.joylink.rtss.vo.client.PageVO; -import club.joylink.rtss.vo.client.map.newmap.MapRunLevelQueryVO; -import club.joylink.rtss.vo.client.map.newmap.MapStationRunLevelVO; -import club.joylink.rtss.vo.client.map.newmap.validate.RunLevelCreateCheck; -import club.joylink.rtss.vo.client.map.newmap.validate.RunLevelUpdateCheck; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import club.joylink.rtss.vo.map.logic.MapStationRunLevelVO; +import club.joylink.rtss.vo.map.query.MapRunLevelQueryVO; +import club.joylink.rtss.vo.map.validate.RunLevelCreateCheck; +import club.joylink.rtss.vo.map.validate.RunLevelUpdateCheck; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -@Api(tags = {"草稿地图运行等级管理接口"}) +/** + *草稿地图运行等级管理接口 + */ @RestController @RequestMapping("/api/draftMap/runLevel") @Slf4j @@ -22,49 +22,65 @@ public class DraftMapStationRunLevelController { @Autowired private DraftMapRunLevelService draftMapRunLevelService; - @ApiOperation(value = "根据地图交路区段生成站间运行等级") + /** + *根据地图交路区段生成站间运行等级 + */ @PostMapping(path = "/generate/routing/{routingId}") public void generate(@PathVariable Long routingId) { this.draftMapRunLevelService.generate(routingId); } - @ApiOperation(value = "根据地图交路一键生成生成所有站间运行等级") + /** + *根据地图交路一键生成生成所有站间运行等级 + */ @PostMapping(path = "/generate/routing") public void autoGenerate(Long mapId) { this.draftMapRunLevelService.autoGenerate(mapId); } - @ApiOperation(value = "根据地图起始-终点车站站台区段生成站间运行等级") + /** + *根据地图起始-终点车站站台区段生成站间运行等级 + */ @PostMapping(path = "/generate") public MapStationRunLevelVO generate(@RequestBody @Validated MapStationRunLevelVO runLevelVO) { return this.draftMapRunLevelService.generate(runLevelVO); } - @ApiOperation(value = "新建站间运行等级") + /** + *新建站间运行等级 + */ @PostMapping(path = "") public void createRoute(@RequestBody @Validated(RunLevelCreateCheck.class) MapStationRunLevelVO runLevelVO) { this.draftMapRunLevelService.create(runLevelVO); } - @ApiOperation(value = "查询站间运行等级列表") + /** + *查询站间运行等级列表 + */ @GetMapping(path = "/{mapId}/listAll") public PageVO queryPagedRouteNew(@PathVariable Long mapId, MapRunLevelQueryVO queryVO) { return this.draftMapRunLevelService.queryAllRunLevels(mapId, queryVO); } - @ApiOperation(value = "查询站间运行等级明细") + /** + *查询站间运行等级明细 + */ @GetMapping(path = "/{id}") public MapStationRunLevelVO getRouteDetailNew(@PathVariable Long id) { return this.draftMapRunLevelService.getById(id); } - @ApiOperation(value = "更新站间运行等级数据") + /** + *更新站间运行等级数据 + */ @PutMapping(path = "/{id}") public void updateRoute(@PathVariable Long id, @RequestBody @Validated(RunLevelUpdateCheck.class) MapStationRunLevelVO runLevelVO) { this.draftMapRunLevelService.update(id, runLevelVO); } - @ApiOperation(value = "删除站间运行等级") + /** + *删除站间运行等级 + */ @DeleteMapping(path = "/{id}") public void deleteRouteNew(@PathVariable Long id) { this.draftMapRunLevelService.delete(id); diff --git a/src/main/java/club/joylink/rtss/controller/draft/LessonDraftController.java b/src/main/java/club/joylink/rtss/controller/draft/LessonDraftController.java index 0128321e6..6998579c8 100644 --- a/src/main/java/club/joylink/rtss/controller/draft/LessonDraftController.java +++ b/src/main/java/club/joylink/rtss/controller/draft/LessonDraftController.java @@ -2,21 +2,20 @@ package club.joylink.rtss.controller.draft; import club.joylink.rtss.controller.advice.AuthenticateInterceptor; import club.joylink.rtss.services.ILessonDraftService; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.LoginUserInfoVO; -import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.*; import club.joylink.rtss.vo.client.validGroup.DraftLessonCreateCheck; import club.joylink.rtss.vo.client.validGroup.DraftLessonCreateFromCheck; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; -@Api(tags = { "课程草稿数据管理接口" }) +/** + *课程草稿数据管理接口 + */ @RestController @RequestMapping("/api/lessonDraft") public class LessonDraftController { @@ -24,87 +23,115 @@ public class LessonDraftController { @Autowired private ILessonDraftService iLessonDraftService; - @ApiOperation(value = "分页查询个人课程草稿") + /** + *分页查询个人课程草稿 + */ @GetMapping(path = "/{mapId}/list") - public PageVO getLessonTree(@PathVariable Long mapId, PageQueryVO queryVO, @ApiIgnore @RequestAttribute UserVO user) { + public PageVO getLessonTree(@PathVariable Long mapId, PageQueryVO queryVO, @RequestAttribute AccountVO user) { return this.iLessonDraftService.queryPagedDraftLesson(mapId, queryVO, user); } - @ApiOperation(value = "分页查询个人当前项目下课程草稿") + /** + *分页查询个人当前项目下课程草稿 + */ @GetMapping(path = "/paged/self") public PageVO pagedQueryPersonalLesson(LessonQueryVO pageQueryVO, @RequestAttribute(AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO loginInfo) { return this.iLessonDraftService.pagedQueryPersonalLesson(pageQueryVO, loginInfo); } - @ApiOperation(value = "获取课程树") + /** + *获取课程树 + */ @GetMapping(path = "/{lessonId}/tree") - public List getLessonTree(@PathVariable Long lessonId, @ApiIgnore @RequestAttribute UserVO user) { + public List getLessonTree(@PathVariable Long lessonId, @RequestAttribute AccountVO user) { return this.iLessonDraftService.getLessonTree(lessonId, user); } - @ApiOperation(value = "获取课程基本信息") + /** + *获取课程基本信息 + */ @GetMapping(path="/{id}") public LessonVO getLesson(@PathVariable Long id) { return this.iLessonDraftService.getLesson(id); } - @ApiOperation(value = "创建课程信息") + /** + *创建课程信息 + */ @PostMapping(path = "") - public void createLesson(@RequestBody @Validated(value = DraftLessonCreateCheck.class) LessonVO lessonVo, @RequestAttribute UserVO user) { + public void createLesson(@RequestBody @Validated(value = DraftLessonCreateCheck.class) LessonVO lessonVo, @RequestAttribute AccountVO user) { this.iLessonDraftService.createLesson(lessonVo, user); } - @ApiOperation(value = "从发布课程创建") + /** + *从发布课程创建 + */ @PostMapping(path = "/createForm") - public void createFrom(@RequestBody @Validated(value = DraftLessonCreateFromCheck.class) LessonVO lessonVo, @RequestAttribute UserVO user) { + public void createFrom(@RequestBody @Validated(value = DraftLessonCreateFromCheck.class) LessonVO lessonVo, @RequestAttribute AccountVO user) { this.iLessonDraftService.createFrom(lessonVo, user); } - @ApiOperation(value = "更新课程信息") + /** + *更新课程信息 + */ @PutMapping(path = "/{id}") - public void updateLesson(@PathVariable Long id, @RequestBody LessonVO lessonVo, @RequestAttribute UserVO user) { + public void updateLesson(@PathVariable Long id, @RequestBody LessonVO lessonVo, @RequestAttribute AccountVO user) { this.iLessonDraftService.updateLesson(id, lessonVo, user); } - @ApiOperation(value = "删除课程") + /** + *删除课程 + */ @DeleteMapping(path="/{id}") public void deleteLesson(@PathVariable Long id) { this.iLessonDraftService.deleteLesson(id); } - @ApiOperation(value = "发布课程") + /** + *发布课程 + */ @PostMapping(path="/{id}/publish") public void publishLesson(@PathVariable Long id, @RequestBody @Validated LessonPublishVO publishVO) { this.iLessonDraftService.publishLesson(id, publishVO); } - @ApiOperation(value = "获取课程章节信息") + /** + *获取课程章节信息 + */ @GetMapping(path="/chapter/{id}") public LessonChapterVO getChapter(@PathVariable Long id) { return this.iLessonDraftService.getChapter(id); } - @ApiOperation(value = "创建课程章节") + /** + *创建课程章节 + */ @PostMapping(path="/{id}/chapter") public void createChapter(@PathVariable Long id, @RequestBody @Validated LessonChapterVO chapterVo) { chapterVo.setLessonId(id); this.iLessonDraftService.createChapter(chapterVo); } - @ApiOperation(value = "更新课程章节信息") + /** + *更新课程章节信息 + */ @PutMapping(path="/chapter/{id}") public void updateChapter(@PathVariable Long id, @RequestBody @Validated LessonChapterVO chapterVo) { this.iLessonDraftService.updateChapter(id, chapterVo); } - @ApiOperation(value = "删除课程章节") + /** + *删除课程章节 + */ @DeleteMapping(path="/chapter/{id}") public void updateChapter(@PathVariable Long id) { this.iLessonDraftService.deleteChapter(id); } - @ApiOperation(value = "拖拽排序") + /** + *拖拽排序 + */ @PutMapping(path="/dragSort") public void dragSort(@RequestBody DragSortReqVO sortReq) { this.iLessonDraftService.dragSort(sortReq); diff --git a/src/main/java/club/joylink/rtss/controller/draft/Model2dDraftController.java b/src/main/java/club/joylink/rtss/controller/draft/Model2dDraftController.java new file mode 100644 index 000000000..fb4bc6c3b --- /dev/null +++ b/src/main/java/club/joylink/rtss/controller/draft/Model2dDraftController.java @@ -0,0 +1,91 @@ +package club.joylink.rtss.controller.draft; + +import club.joylink.rtss.services.model2d.Model2dDraftService; +import club.joylink.rtss.vo.AccountVO; +import club.joylink.rtss.vo.client.PageVO; +import club.joylink.rtss.vo.model2d.Model2dCreateCheck; +import club.joylink.rtss.vo.model2d.Model2dQueryVO; +import club.joylink.rtss.vo.model2d.Model2dVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +/** + * 2d模型草稿接口 + */ +@RestController +@RequestMapping("/draft/model2d") +public class Model2dDraftController { + + @Autowired + private Model2dDraftService model2dDraftService; + + /** + * 新建用户草稿2d模型 + * @param model2dVO + * @return + */ + @PostMapping("/") + public String create(@RequestBody @Validated(Model2dCreateCheck.class) Model2dVO model2dVO, @RequestAttribute AccountVO user) { + return model2dDraftService.create(model2dVO, user); + } + + /** + * 分页查询用户2d模型草稿 + * @param queryVO + * @return + */ + @GetMapping("/paging") + public PageVO pageQuery(Model2dQueryVO queryVO, @RequestAttribute AccountVO user) { + return this.model2dDraftService.pageQuery(queryVO, user); + } + + /** + * 根据id查询2d模型草稿数据 + * @param id + * @return + */ + @GetMapping("/{id}") + public Model2dVO get(@PathVariable Long id) { + return this.model2dDraftService.get(id); + } + + /** + * 更新2d模型基本信息 + * @param id + * @param model2dVO + */ + @PutMapping("/{id}/basic") + public void updateBasicInfo(@PathVariable Long id, @RequestBody Model2dVO model2dVO, @RequestAttribute AccountVO user) { + this.model2dDraftService.updateBasicInfo(id, model2dVO, user); + } + + /** + * 更新2d模型数据 + * @param id + * @param model2dVO + */ + @PutMapping("/{id}/data") + public void updateData(@PathVariable Long id, @RequestBody Model2dVO model2dVO, @RequestAttribute AccountVO user) { + this.model2dDraftService.updateData(id, model2dVO, user); + } + + /** + * 发布模型 + * @param id + */ + @PostMapping("/{id}/publish") + public void publish(@PathVariable Long id, @RequestAttribute AccountVO user) { + this.model2dDraftService.publish(id, user); + } + + /** + * 删除用户草稿2d模型 + * @param id + */ + @DeleteMapping("/{id}") + public void delete(@PathVariable Long id) { + this.model2dDraftService.delete(id); + } + +} diff --git a/src/main/java/club/joylink/rtss/controller/iscs/IscsController.java b/src/main/java/club/joylink/rtss/controller/iscs/IscsController.java index 9cd5bdc3d..ae5432d08 100644 --- a/src/main/java/club/joylink/rtss/controller/iscs/IscsController.java +++ b/src/main/java/club/joylink/rtss/controller/iscs/IscsController.java @@ -1,20 +1,19 @@ package club.joylink.rtss.controller.iscs; import club.joylink.rtss.services.IIscsService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.iscs.IscsCopyVO; import club.joylink.rtss.vo.client.iscs.IscsQueryVO; import club.joylink.rtss.vo.client.iscs.IscsVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; -@Api(tags = {"iscs数据"}) +/** + *iscs数据 + */ @RestController @RequestMapping("/api/v1/iscs") @Slf4j @@ -23,7 +22,9 @@ public class IscsController { @Autowired private IIscsService iscsService; - @ApiOperation("分页查询iscs数据") + /** + *分页查询iscs数据 + */ @GetMapping("/pagedQuery") public PageVO pagedQuery(IscsQueryVO queryVO) { return iscsService.pagedQuery(queryVO); @@ -32,31 +33,41 @@ public class IscsController { /** * 保存地图元素信息 */ - @ApiOperation(value = "保存iscs数据") + /** + *保存iscs数据 + */ @PostMapping(path = "saveElements") - public void saveIscsData(@RequestBody IscsVO iscsVO ,@ApiIgnore @RequestAttribute UserVO user) { + public void saveIscsData(@RequestBody IscsVO iscsVO , @RequestAttribute AccountVO user) { iscsService.saveIscsData(iscsVO); } - @ApiOperation(value = "根据条件获取iscs数据") + /** + *根据条件获取iscs数据 + */ @GetMapping - public IscsVO getIscsDataBy(@Validated IscsVO iscsVO, @ApiIgnore @RequestAttribute UserVO user) { + public IscsVO getIscsDataBy(@Validated IscsVO iscsVO, @RequestAttribute AccountVO user) { return this.iscsService.getIscsDataBy(iscsVO); } - @ApiOperation("删除iscs数据") + /** + *删除iscs数据 + */ @DeleteMapping("/{id}") public void delete(@PathVariable Integer id) { iscsService.delete(id); } - @ApiOperation("地图是否有iscs数据") + /** + *地图是否有iscs数据 + */ @GetMapping("hasData") public boolean isExisted(Long mapId) { return iscsService.isExistedWithMapId(mapId); } - @ApiOperation("复制iscs数据") + /** + *复制iscs数据 + */ @PostMapping("/copy") public void copy(@RequestBody @Validated IscsCopyVO copyVO) { iscsService.copy(copyVO); diff --git a/src/main/java/club/joylink/rtss/controller/iscs/IscsDeviceController.java b/src/main/java/club/joylink/rtss/controller/iscs/IscsDeviceController.java new file mode 100644 index 000000000..c007da79b --- /dev/null +++ b/src/main/java/club/joylink/rtss/controller/iscs/IscsDeviceController.java @@ -0,0 +1,84 @@ +package club.joylink.rtss.controller.iscs; + +import club.joylink.rtss.services.iscs.IscsDeviceService; +import club.joylink.rtss.vo.client.PageVO; +import club.joylink.rtss.vo.client.iscs.device.IscsDeviceQueryVO; +import club.joylink.rtss.vo.client.iscs.device.IscsDeviceVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * ISCS设备管理 + */ +@RestController +@RequestMapping("/api/iscsDevice") +public class IscsDeviceController { + @Autowired + private IscsDeviceService iscsDeviceService; + + /** + * 创建 + */ + @PostMapping() + public void create(@RequestBody IscsDeviceVO vo) { + iscsDeviceService.create(vo); + } + + /** + * 批量创建 + */ + @PostMapping("/create/batch") + public void batchCreate(@RequestBody List vos) { + iscsDeviceService.batchCreate(vos); + } + + /** + * 获取所有 + */ + @GetMapping("/all") + public List getAll() { + return iscsDeviceService.getAll(); + } + + /** + * 获取一条 + */ + @GetMapping("/{id}") + public IscsDeviceVO getById(@PathVariable Long id) { + return iscsDeviceService.getById(id); + } + + /** + * 根据mapId获取list + */ + @GetMapping("/list/mapId/{mapId}") + public List getListByMapId(@PathVariable Long mapId) { + return iscsDeviceService.getListByMapId(mapId); + } + + /** + * 条件查询 + */ + @GetMapping("/list/criteria") + public List criteriaQuery(IscsDeviceQueryVO queryVO) { + return iscsDeviceService.criteriaQuery(queryVO); + } + + /** + * 分页查询 + */ + @GetMapping("/paged") + public PageVO pagedQuery(IscsDeviceQueryVO queryVO) { + return iscsDeviceService.pagedQuery(queryVO); + } + + /** + * 删除 + */ + @DeleteMapping("/{id}") + public void delete(@PathVariable Long id) { + iscsDeviceService.delete(id); + } +} diff --git a/src/main/java/club/joylink/rtss/controller/iscs/IscsSystemResourcesController.java b/src/main/java/club/joylink/rtss/controller/iscs/IscsSystemResourcesController.java new file mode 100644 index 000000000..a8056c895 --- /dev/null +++ b/src/main/java/club/joylink/rtss/controller/iscs/IscsSystemResourcesController.java @@ -0,0 +1,84 @@ +package club.joylink.rtss.controller.iscs; + +import club.joylink.rtss.services.iscs.IscsSystemResourcesService; +import club.joylink.rtss.vo.client.PageVO; +import club.joylink.rtss.vo.client.iscs.systemRes.IscsSystemResourcesQueryVO; +import club.joylink.rtss.vo.client.iscs.systemRes.IscsSystemResourcesVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * ISCS系统资源管理 + */ +@RestController +@RequestMapping("/api/systemRes") +public class IscsSystemResourcesController { + @Autowired + private IscsSystemResourcesService iscsSystemResourcesService; + + /** + * 创建 + */ + @PostMapping() + public void create(@RequestBody IscsSystemResourcesVO vo) { + iscsSystemResourcesService.create(vo); + } + + /** + * 批量创建 + */ + @PostMapping("/create/batch") + public void create(@RequestBody List vos) { + iscsSystemResourcesService.batchCreate(vos); + } + + /** + * 获取所有 + */ + @GetMapping("/all") + public List getAll() { + return iscsSystemResourcesService.getAll(); + } + + /** + * 获取一条 + */ + @GetMapping("/{id}") + public IscsSystemResourcesVO getById(@PathVariable Long id) { + return iscsSystemResourcesService.getById(id); + } + + /** + * 连同资源获取一条 + */ + @GetMapping("/{id}/resources") + public IscsSystemResourcesVO getByIdWithResources(@PathVariable Long id) { + return iscsSystemResourcesService.getByIdWithResources(id); + } + + /** + * 条件查询 + */ + @GetMapping("/list/criteria") + public List criteriaQuery(IscsSystemResourcesQueryVO queryVO) { + return iscsSystemResourcesService.criteriaQuery(queryVO); + } + + /** + * 分页查询 + */ + @GetMapping("/paged") + public PageVO pagedQuery(IscsSystemResourcesQueryVO queryVO) { + return iscsSystemResourcesService.pagedQuery(queryVO); + } + + /** + * 删除 + */ + @DeleteMapping("/{id}") + public void delete(@PathVariable Long id) { + iscsSystemResourcesService.delete(id); + } +} diff --git a/src/main/java/club/joylink/rtss/controller/license/LicenseController.java b/src/main/java/club/joylink/rtss/controller/license/LicenseController.java index 92d75d7c0..ed883030e 100644 --- a/src/main/java/club/joylink/rtss/controller/license/LicenseController.java +++ b/src/main/java/club/joylink/rtss/controller/license/LicenseController.java @@ -6,15 +6,15 @@ import club.joylink.rtss.vo.license.LicenseCreateCheck; import club.joylink.rtss.vo.license.LicenseQueryVO; import club.joylink.rtss.vo.license.LicenseVO; import club.joylink.rtss.vo.license.LicenseValidateCheck; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.Objects; -@Api(tags = {"许可证服务接口"}) +/** + *许可证服务接口 + */ @RestController @RequestMapping(path = "/api/license") public class LicenseController { @@ -22,37 +22,49 @@ public class LicenseController { @Autowired private LicenseService licenseService; - @ApiOperation("创建新的license") + /** + *创建新的license + */ @PostMapping("") public void createLicense(@RequestBody @Validated(LicenseCreateCheck.class) LicenseVO licenseVO) { this.licenseService.createLicense(licenseVO); } - @ApiOperation("分页查询license数据列表") + /** + *分页查询license数据列表 + */ @GetMapping("/pagingQuery") public PageVO pagedQuery(LicenseQueryVO queryVO) { return this.licenseService.pagedQuery(queryVO); } - @ApiOperation("设置失效（不可用）") + /** + *设置失效（不可用） + */ @PutMapping("/{id}/invalidating") public void invalidating(@PathVariable Long id) { this.licenseService.invalidating(id); } - @ApiOperation("本地部署第一次使用连接互联网访问joylink服务验证license") + /** + *本地部署第一次使用连接互联网访问joylink服务验证license + */ @PostMapping("/validate") public boolean validateLicense(@RequestBody @Validated(LicenseValidateCheck.class) LicenseVO licenseVO) { return this.licenseService.validateLicense(licenseVO.getLicense()); } - @ApiOperation("连接互联网验证license成功后将license证书保存到本地部署服务器") + /** + *连接互联网验证license成功后将license证书保存到本地部署服务器 + */ @PostMapping("/local") public void saveLocalLicense(@RequestBody @Validated(LicenseValidateCheck.class) LicenseVO licenseVO) { this.licenseService.saveLocalLicense(licenseVO.getLicense()); } - @ApiOperation("获取本地已经保存的license") + /** + *获取本地已经保存的license + */ @GetMapping("/local") public String getLocalLicense() { LicenseVO license = this.licenseService.getLicense(); diff --git a/src/main/java/club/joylink/rtss/controller/model2d/Model2dController.java b/src/main/java/club/joylink/rtss/controller/model2d/Model2dController.java new file mode 100644 index 000000000..df4ed41ec --- /dev/null +++ b/src/main/java/club/joylink/rtss/controller/model2d/Model2dController.java @@ -0,0 +1,92 @@ +package club.joylink.rtss.controller.model2d; + +import club.joylink.rtss.services.model2d.Model2dService; +import club.joylink.rtss.vo.AccountVO; +import club.joylink.rtss.vo.client.PageVO; +import club.joylink.rtss.vo.model2d.Model2dQueryVO; +import club.joylink.rtss.vo.model2d.Model2dVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 2d模型数据管理接口 + */ +@RestController +@RequestMapping("/api/model2d") +public class Model2dController { + + @Autowired + private Model2dService model2dService; + + /** + * 分页查询模型数据 + * @param queryVO + * @return + */ + @GetMapping("/paging") + public PageVO pageQueryInfo(Model2dQueryVO queryVO) { + return model2dService.pageQueryInfo(queryVO); + } + + /** + * 查询2d模型数据列表 + * @param queryVO + * @return + */ + @GetMapping("/list") + public List queryDataList(Model2dQueryVO queryVO) { + return model2dService.queryDataList(queryVO); + } + + /** + * 更新2d模型基础信息 + * @param id 模型id + * @param model2dVO + * @param user + */ + @PutMapping("/{id}/basic") + public void updateBasicInfo(@PathVariable Long id, @RequestBody Model2dVO model2dVO, @RequestAttribute AccountVO user) { + this.model2dService.updateBasicInfo(id, model2dVO, user); + } + + /** + * 更新状态 + */ + @PutMapping("/{id}/state/{state}") + public void updateState(@PathVariable Long id, @PathVariable String state, @RequestAttribute AccountVO user) { + this.model2dService.updateState(id, state, user); + } + + /** + * 查询某个模型所有历史版本数据 + * @param code + * @return + */ + @GetMapping("/{code}/versions") + public List queryAllVersion(@PathVariable String code) { + return this.model2dService.queryAllVersionOf(code); + } + + /** + * 分页查询某个模型历史版本数据 + * @param code + * @return + */ + @GetMapping("/{code}/versions/paging") + public PageVO pageQueryVersion(@PathVariable String code, Model2dQueryVO queryVO) { + return model2dService.pageQueryVersion(code, queryVO); + } + + + /** + * 回滚版本 + * @param code + * @param version + */ + @PutMapping("/{code}/version/{version}") + public void rollbackVersion(@PathVariable String code, @PathVariable Integer version) { + this.model2dService.rollbackVersion(code, version); + } +} diff --git a/src/main/java/club/joylink/rtss/controller/om/PushMessageController.java b/src/main/java/club/joylink/rtss/controller/om/PushMessageController.java index 748a5da5a..4a473951e 100644 --- a/src/main/java/club/joylink/rtss/controller/om/PushMessageController.java +++ b/src/main/java/club/joylink/rtss/controller/om/PushMessageController.java @@ -5,9 +5,6 @@ import club.joylink.rtss.vo.client.WebSocketMessageType; import club.joylink.rtss.vo.client.factory.SocketMessageFactory; import club.joylink.rtss.vo.client.pushMessage.CommonMessageVO; import club.joylink.rtss.websocket.StompMessageService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -20,7 +17,9 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -@Api(value = "推送消息管理controller", tags = "推送消息管理接口") +/** + * 推送消息管理接口 + */ @Slf4j @RestController @RequestMapping("/api/pushMessage") @@ -32,9 +31,12 @@ public class PushMessageController { @Autowired private LoginSessionManager loginSessionManager; - @ApiOperation(value = "触发消息推送", httpMethod = "POST") + /** + * 触发消息推送 + * @param commonMessageVO + */ @RequestMapping(method = RequestMethod.POST) - public void pushMessage(@ApiParam(name = "传入对象", type = "json", value = "传入json格式", required = true) @Valid @RequestBody CommonMessageVO commonMessageVO) { + public void pushMessage(@Valid @RequestBody CommonMessageVO commonMessageVO) { log.info("****触发消息推送********"); List userIdList = this.loginSessionManager.getAllLoginUserIds(); Set allSubscribers = userIdList.stream().map(id -> String.valueOf(id)).collect(Collectors.toSet()); diff --git a/src/main/java/club/joylink/rtss/controller/passenger/PassengerController.java b/src/main/java/club/joylink/rtss/controller/passenger/PassengerController.java index b17242980..7882c350a 100644 --- a/src/main/java/club/joylink/rtss/controller/passenger/PassengerController.java +++ b/src/main/java/club/joylink/rtss/controller/passenger/PassengerController.java @@ -2,15 +2,16 @@ package club.joylink.rtss.controller.passenger; import club.joylink.rtss.controller.advice.AuthenticateInterceptor; import club.joylink.rtss.simulation.cbtc.passenger.PassengerFlowSimulateService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.passenger.PassengerFlowMessage2TD; -import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -@Api("客流量") +/** + * 客流 + */ @RestController @RequestMapping("/api/passenger") public class PassengerController { @@ -25,13 +26,13 @@ public class PassengerController { @PutMapping("/{group}/view") public boolean openOrChangeView(@PathVariable String group, String code, - @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) UserVO userVO) { - return passengerFlowSimulateService.openOrChangeView(group, code, userVO); + @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) AccountVO accountVO) { + return passengerFlowSimulateService.openOrChangeView(group, code, accountVO); } @DeleteMapping("/{group}/view") public void closeView(@PathVariable String group, String code, - @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) UserVO userVO) { - passengerFlowSimulateService.closeView(group, code, userVO); + @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) AccountVO accountVO) { + passengerFlowSimulateService.closeView(group, code, accountVO); } } diff --git a/src/main/java/club/joylink/rtss/controller/permission/GoodsController.java b/src/main/java/club/joylink/rtss/controller/permission/GoodsController.java index 916dce315..bbd63a2d9 100644 --- a/src/main/java/club/joylink/rtss/controller/permission/GoodsController.java +++ b/src/main/java/club/joylink/rtss/controller/permission/GoodsController.java @@ -1,7 +1,7 @@ package club.joylink.rtss.controller.permission; import club.joylink.rtss.services.IGoodsService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.GoodsTryVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.goods.GoodsQueryVO; @@ -9,15 +9,15 @@ import club.joylink.rtss.vo.client.goods.GoodsUpdateVO; import club.joylink.rtss.vo.client.goods.GoodsVO; import club.joylink.rtss.vo.client.permission.PermissionQueryVO; import club.joylink.rtss.vo.client.permission.PermissionSelectVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; -@Api(tags = {"商品管理接口"}) +/** + *商品管理接口 + */ @RestController @RequestMapping(path = "/api/goods") public class GoodsController { @@ -25,85 +25,81 @@ public class GoodsController { @Autowired private IGoodsService iGoodsService; - @ApiOperation(value = "分页查询商品") + /** + *分页查询商品 + */ @GetMapping(path = "") public PageVO queryPagedGoods(GoodsQueryVO queryVO) { return iGoodsService.queryPagedGoods(queryVO); } - @ApiOperation(value = "查询指定权限的商品") + /** + *查询指定权限的商品 + */ @GetMapping(path = "/detail") public PageVO queryPagedGoodsByPermission(PermissionQueryVO queryVO) { return iGoodsService.queryPagedGoodsByPermission(queryVO); } - @ApiOperation(value = "查询商品详情") + /** + *查询商品详情 + */ @GetMapping(path = "/{id}") public GoodsVO selectById(@PathVariable long id) { return iGoodsService.queryById(id); } - @ApiOperation(value = "获取有效商品列表") + /** + *获取有效商品列表 + */ @GetMapping(path = "/list") public List selectValidGoodsList() { return iGoodsService.selectValidGoodsList(); } -// @ApiOperation(value = "创建商品") -// @PostMapping(path = "") -// public GoodsVO createGoods(@RequestBody @Validated(value = {CreateGoodsCheck.class}) GoodsCreateVO createVO, @ApiIgnore @RequestAttribute UserVO user) { -// return iGoodsService.createGoods(createVO, user); -// } -// -// @ApiOperation(value = "批量创建商品") -// @PostMapping(path = "/create/list") -// public List createManyGoods(@RequestBody @Validated(value = {CreateGoodsCheck.class}) List createVOList, @ApiIgnore @RequestAttribute UserVO user) { -// return iGoodsService.createManyGoods(createVOList, user); -// } -// -// @ApiOperation(value = "通过关联权限创建权限包商品") -// @PostMapping(path = "/create/package") -// public GoodsVO createGoodsByRelPermissions(@RequestBody @Validated(value = {CreateGoodsByPermissionPackageCheck.class}) GoodsCreateVO createVO, @ApiIgnore @RequestAttribute UserVO user) { -// return iGoodsService.createGoodsByRelPermissions(createVO, user); -// } - - @ApiOperation(value = "更新商品") + /** + *更新商品 + */ @PutMapping(path = "/{id}") - public void updateGoods(@PathVariable Long id, @RequestBody GoodsUpdateVO updateVO, @RequestAttribute UserVO user) { + public void updateGoods(@PathVariable Long id, @RequestBody GoodsUpdateVO updateVO, @RequestAttribute AccountVO user) { iGoodsService.updateGoods(id, updateVO, user); } -// @ApiOperation(value = "删除商品") -// @DeleteMapping(path = "/{id}") -// public void deleteGoods(@PathVariable long id) { -// iGoodsService.deleteGoods(id); -// } - - @ApiOperation(value = "更新试用时间") + /** + *更新试用时间 + */ @PutMapping(path = "/{id}/tryUse") - public void tryUse(@PathVariable Long id, @RequestBody Map map, @RequestAttribute UserVO user) { + public void tryUse(@PathVariable Long id, @RequestBody Map map, @RequestAttribute AccountVO user) { this.iGoodsService.tryUse(id, map, user); } - @ApiOperation(value = "获取试用时长") + /** + *获取试用时长 + */ @GetMapping(path = "/tryUse") - public GoodsTryVO getTryUseTime(PermissionSelectVO permissionSelectVO, @RequestAttribute UserVO user) { + public GoodsTryVO getTryUseTime(PermissionSelectVO permissionSelectVO, @RequestAttribute AccountVO user) { return this.iGoodsService.getTryUseTime(permissionSelectVO, user); } - @ApiOperation(value = "切换商品是否可用") + /** + *切换商品是否可用 + */ @PutMapping(path = "/{id}/status") public void toggleGoodsStatus(@PathVariable long id) { iGoodsService.toggleGoodsStatus(id); } - @ApiOperation(value = "根据权限id查询商品") + /** + *根据权限id查询商品 + */ @GetMapping(path = "/permissionId") public GoodsVO selectGoodsByPermissionId(Long permissionId) { return iGoodsService.queryGoodsByPermissionId(permissionId); } - @ApiOperation(value = "根据权限ids查询权限包商品") + /** + *根据权限ids查询权限包商品 + */ @GetMapping(path = "/permissionIds") public GoodsVO findGoodsByPermissionIds(Long[] ids) { return iGoodsService.findGoodsByRelPermissionIds(ids); diff --git a/src/main/java/club/joylink/rtss/controller/permission/OrderController.java b/src/main/java/club/joylink/rtss/controller/permission/OrderController.java index 8c7598a1c..19773b94e 100644 --- a/src/main/java/club/joylink/rtss/controller/permission/OrderController.java +++ b/src/main/java/club/joylink/rtss/controller/permission/OrderController.java @@ -1,47 +1,54 @@ package club.joylink.rtss.controller.permission; import club.joylink.rtss.services.IOrderService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.order.OrderCreateVO; import club.joylink.rtss.vo.client.order.OrderDetailVO; import club.joylink.rtss.vo.client.order.OrderVO; import club.joylink.rtss.vo.client.permission.OrderQueryVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; -@Api(tags = { "订单管理接口" }) +/** + *订单管理接口 + */ @RestController @RequestMapping("/api/order") public class OrderController { @Autowired private IOrderService iOrderService; - @ApiOperation(value = "分页获取订单") + /** + *分页获取订单 + */ @GetMapping(path = "") public PageVO queryPagedOrders(OrderQueryVO queryVO) { return this.iOrderService.queryPagedOrders(queryVO); } - @ApiOperation(value = "分页获取订单(销售员)") + /** + *分页获取订单(销售员) + */ @GetMapping(path = "/seller") - public PageVO queryPagedOrders(OrderQueryVO queryVO, @RequestAttribute @ApiIgnore UserVO user) { + public PageVO queryPagedOrders(OrderQueryVO queryVO, @RequestAttribute AccountVO user) { return this.iOrderService.queryPagedOrders(queryVO, user); } - @ApiOperation(value = "创建订单") + /** + *创建订单 + */ @PostMapping(path="") - public String createOrder(@RequestBody @Validated OrderCreateVO createVO, @RequestAttribute @ApiIgnore UserVO user) { + public String createOrder(@RequestBody @Validated OrderCreateVO createVO, @RequestAttribute AccountVO user) { return this.iOrderService.createOrder(createVO, user); } - @ApiOperation(value = "获取订单详情") + /** + *获取订单详情 + */ @GetMapping(path = "/{id}") public List getOrderDetail(@PathVariable Long id) { return this.iOrderService.getOrderDetail(id); @@ -55,21 +62,27 @@ public class OrderController { // return this.iOrderService.pay(id, payType, null); // } - @ApiOperation(value = "订单提交") + /** + *订单提交 + */ @PostMapping(path = "/submit") - public OrderCreateVO submit(@RequestBody OrderCreateVO orderCreateVO, @RequestAttribute UserVO user) { + public OrderCreateVO submit(@RequestBody OrderCreateVO orderCreateVO, @RequestAttribute AccountVO user) { return this.iOrderService.submit(orderCreateVO, user); } - @ApiOperation(value = "计算订单总价") + /** + *计算订单总价 + */ @GetMapping(path = "/price") public Float computeTotal(Long goodsId, Integer goodsAmount, Integer monthAmount) { return this.iOrderService.compute(goodsId, goodsAmount, monthAmount); } - @ApiOperation(value = "订单取消支付") + /** + *订单取消支付 + */ @PutMapping(path = "/{id}/cancelPay") - public void cancelPay(@PathVariable Long id, @RequestAttribute UserVO user) { + public void cancelPay(@PathVariable Long id, @RequestAttribute AccountVO user) { this.iOrderService.cancelPay(id, user); } diff --git a/src/main/java/club/joylink/rtss/controller/permission/PermissionController.java b/src/main/java/club/joylink/rtss/controller/permission/PermissionController.java index 57dd9b02d..ac1f36ed5 100644 --- a/src/main/java/club/joylink/rtss/controller/permission/PermissionController.java +++ b/src/main/java/club/joylink/rtss/controller/permission/PermissionController.java @@ -1,18 +1,17 @@ package club.joylink.rtss.controller.permission; import club.joylink.rtss.services.IPermissionService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.permission.PermissionQueryVO; import club.joylink.rtss.vo.client.permission.PermissionUpdateVO; import club.joylink.rtss.vo.client.permission.PermissionVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; -@Api(tags = {"权限管理接口"}) +/** + *权限管理接口 + */ @RestController @RequestMapping("/api/permission") public class PermissionController { @@ -20,19 +19,25 @@ public class PermissionController { @Autowired private IPermissionService iPermissionService; - @ApiOperation(value = "分页获取权限数据") + /** + *分页获取权限数据 + */ @GetMapping(path = "") public PageVO queryPagedPermission(PermissionQueryVO queryVO) { return iPermissionService.queryPagedPermission(queryVO); } - @ApiOperation(value = "查询权限详情") + /** + *查询权限详情 + */ @GetMapping(path = "/{id}") public PermissionVO getDetailWithSub(@PathVariable Long id) { return iPermissionService.getById(id); } - @ApiOperation(value = "查询包权限详情") + /** + *查询包权限详情 + */ @GetMapping(path = "/{id}/package") public PageVO getPackageDetail(@PathVariable Long id, PermissionQueryVO queryVO) { return iPermissionService.getPackageDetail(id, queryVO); @@ -44,22 +49,28 @@ public class PermissionController { // return iPermissionService.create(createVO, user); // } - @ApiOperation(value = "更新权限") + /** + *更新权限 + */ @PutMapping(path = "/{id}") public void updatePermission(@PathVariable Long id, @RequestBody PermissionUpdateVO updateVO, - @RequestAttribute @ApiIgnore UserVO user) { + @RequestAttribute AccountVO user) { iPermissionService.updatePermission(id, updateVO, user); } - @ApiOperation(value = "一键生成权限") + /** + *一键生成权限 + */ @PostMapping(path = "/{mapId}/generate") - public void generatePermission(@PathVariable Long mapId, @RequestAttribute @ApiIgnore UserVO user) { + public void generatePermission(@PathVariable Long mapId, @RequestAttribute AccountVO user) { iPermissionService.generatePermission(mapId, user); } - @ApiOperation(value = "真·一键生成权限") + /** + *真·一键生成权限 + */ @PostMapping(path = "/realGenerate") - public void realGenerate(@RequestAttribute @ApiIgnore UserVO user) { + public void realGenerate(@RequestAttribute AccountVO user) { iPermissionService.realGenerate(user); } } diff --git a/src/main/java/club/joylink/rtss/controller/permission/PermissionDistributeController.java b/src/main/java/club/joylink/rtss/controller/permission/PermissionDistributeController.java index 53b11aa3e..13983e1e6 100644 --- a/src/main/java/club/joylink/rtss/controller/permission/PermissionDistributeController.java +++ b/src/main/java/club/joylink/rtss/controller/permission/PermissionDistributeController.java @@ -2,25 +2,26 @@ package club.joylink.rtss.controller.permission; import club.joylink.rtss.constants.Project; import club.joylink.rtss.constants.RoleEnum; +import club.joylink.rtss.controller.advice.AuthenticateInterceptor; import club.joylink.rtss.controller.advice.Role; import club.joylink.rtss.services.IPermissionDistributeService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; +import club.joylink.rtss.vo.LoginUserInfoVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.order.OrderCreateVO; import club.joylink.rtss.vo.client.permissionDistribute.DistributeVO; import club.joylink.rtss.vo.client.permissionDistribute.PermissionDistributeQueryVO; import club.joylink.rtss.vo.client.userPermission.UserPermissionDistributeVO; import club.joylink.rtss.vo.client.userPermission.UserPermissionVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; -@Api(tags = {"权限分发管理接口"}) +/** + *权限分发管理接口 + */ @RestController @RequestMapping("/api/distribute") public class PermissionDistributeController { @@ -28,73 +29,109 @@ public class PermissionDistributeController { @Autowired private IPermissionDistributeService permissionDistributeService; - @ApiOperation(value = "分页查询权限分发数据") + /** + *分页查询权限分发数据 + */ @GetMapping(path = "") public PageVO queryPagedDistribute(PermissionDistributeQueryVO queryVO) { return this.permissionDistributeService.queryPagedDistribute(queryVO); } - @ApiOperation(value = "生成打包分发二维码") + /** + *生成打包分发二维码 + */ @GetMapping(path = "/package/qrCode") - public String generateQrCode(Long id) { - return this.permissionDistributeService.generateQrCode(id); + public String generateQrCode(Long id, @RequestAttribute(value = AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO loginInfo) { + return this.permissionDistributeService.generateQrCode(id, loginInfo.getProject()); } - @ApiOperation(value = "权限分发立即失效") + /** + *权限分发立即失效 + */ @GetMapping(path = "/{id}/invalid") public void immediateInvalid(@PathVariable Long id) { permissionDistributeService.immediateInvalid(id); } - @ApiOperation(value = "从订单分发权限，获取权限分发二维码") + /** + *从订单分发权限，获取权限分发二维码 + */ @GetMapping(path = "/{orderCode}/distribute") - public String givePermission(@PathVariable String orderCode, @RequestAttribute @ApiIgnore UserVO user) { - return permissionDistributeService.distributeFromOrder(orderCode, user); + public String givePermission(@PathVariable String orderCode, @RequestAttribute LoginUserInfoVO loginInfo) { + return permissionDistributeService.distributeFromOrder(orderCode, loginInfo.getAccountVO(), loginInfo.getProject()); } - @ApiOperation(value = "权限获取") + /** + *权限获取 + */ @GetMapping(path = "/getPermission") - public void getPermission(Long state, @RequestAttribute @ApiIgnore UserVO user) { + public void getPermission(Long state, @RequestAttribute AccountVO user) { this.permissionDistributeService.getUserPermission(state, user); } - @ApiOperation(value = "快速生成权限分发") - @PostMapping(path = "/createQuickly") - public String createQuickly(@RequestBody OrderCreateVO orderCreateVO, @RequestAttribute @ApiIgnore UserVO user) { - return permissionDistributeService.createQuickly(orderCreateVO, user); + /** + * 将权限分发包分发给指定账户 + * @param id + * @param accountId + * @param user + */ + @PostMapping(path = "/{id}/distribute/{accountId}") + public void distributeToAccount(@PathVariable Long id, @PathVariable Long accountId, + @RequestAttribute AccountVO user) { + this.permissionDistributeService.distributeToAccount(id, accountId, user); } - @ApiOperation(value = "微信小程序扫码获取权限") + /** + *快速生成权限分发 + */ + @PostMapping(path = "/createQuickly") + public String createQuickly(@RequestBody OrderCreateVO orderCreateVO, @RequestAttribute LoginUserInfoVO loginInfo) { + return permissionDistributeService.createQuickly(orderCreateVO, loginInfo.getAccountVO(), loginInfo.getProject()); + } + + /** + *微信小程序扫码获取权限 + */ @GetMapping(path = "/permission") public List wmGetPermission(String code, Long id) { return this.permissionDistributeService.wmGetPermission(code, id); } - @ApiOperation(value = "用户权限转增分发打包生成权限") + /** + *用户权限转增分发打包生成权限 + */ @PostMapping(path = "/packageUserPermission") - public String packageUserPermission(@RequestBody @Validated UserPermissionDistributeVO userPermissionAndAmountVO, @RequestAttribute @ApiIgnore UserVO user) { - return permissionDistributeService.distributeFromUserPermission(userPermissionAndAmountVO, user); + public String packageUserPermission(@RequestBody @Validated UserPermissionDistributeVO userPermissionAndAmountVO, @RequestAttribute LoginUserInfoVO loginInfo) { + return permissionDistributeService.distributeFromUserPermission(userPermissionAndAmountVO, loginInfo); } - @ApiOperation(value = "查询个人权限分发列表") + /** + *查询个人权限分发列表 + */ @GetMapping(path = "/personal") - public List queryPersonalDistributeList(@RequestAttribute @ApiIgnore UserVO user) { + public List queryPersonalDistributeList(@RequestAttribute AccountVO user) { return permissionDistributeService.queryPersonalDistributeList(user); } - @ApiOperation(value = "查询权限分发领取用户列表") + /** + *查询权限分发领取用户列表 + */ @GetMapping(path = "/{id}/users") - public List queryDistributeGetUsers(@PathVariable Long id, @RequestAttribute @ApiIgnore UserVO user) { + public List queryDistributeGetUsers(@PathVariable Long id, @RequestAttribute AccountVO user) { return permissionDistributeService.queryDistributeGetUsers(id, user); } - @ApiOperation(value = "回收权限分发到用户权限中") + /** + *回收权限分发到用户权限中 + */ @PutMapping(path = "/{id}/restore") public void restore(@PathVariable Long id) { - this.permissionDistributeService.restoreDistributeToUserPermission(id); + this.permissionDistributeService.return2UserPermission(id); } - @ApiOperation(value = "查询权限分发包详情") + /** + *查询权限分发包详情 + */ @GetMapping(path = "/package/{id}/detail") public PageVO queryPackageDetail(@PathVariable Long id, PermissionDistributeQueryVO queryVO) { @@ -102,10 +139,21 @@ public class PermissionDistributeController { } @Role({RoleEnum.SuperAdmin, RoleEnum.Admin}) - @ApiOperation("创建项目下所有地图权限的权限分发") +/** + *创建项目下所有地图权限的权限分发 + */ @PostMapping("/{project}/allMap/distribute") - public String createAllMapDistribute(@PathVariable Project project, Integer num, @RequestAttribute UserVO user) { - return permissionDistributeService.createAllMapDistribute(project, num, user); + public String createAllMapDistribute(@PathVariable Project project, Integer num, @RequestAttribute LoginUserInfoVO loginInfo) { + return permissionDistributeService.createAllMapDistribute(project, num, loginInfo); + } + + @Role(RoleEnum.SuperAdmin) +/** + *收回从该权限分发获取的用户权限 + */ + @PutMapping("/{id}/back") + public void takeBack(@PathVariable Long id) { + permissionDistributeService.takeBack(id); } } diff --git a/src/main/java/club/joylink/rtss/controller/project/DeviceController.java b/src/main/java/club/joylink/rtss/controller/project/DeviceController.java index 61a906bfa..425cd653f 100644 --- a/src/main/java/club/joylink/rtss/controller/project/DeviceController.java +++ b/src/main/java/club/joylink/rtss/controller/project/DeviceController.java @@ -3,20 +3,19 @@ package club.joylink.rtss.controller.project; import club.joylink.rtss.constants.ProjectDeviceType; import club.joylink.rtss.controller.advice.AuthenticateInterceptor; import club.joylink.rtss.services.project.DeviceService; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.LoginUserInfoVO; -import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.project.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; -@Api(tags = {"项目设备管理接口(新)"}) +/** + *项目设备管理接口(新) + */ @RestController @RequestMapping(path = "/api/device") public class DeviceController { @@ -24,142 +23,194 @@ public class DeviceController { @Autowired private DeviceService deviceService; - @ApiOperation(value = "分页查询项目设备") + /** + *分页查询项目设备 + */ @GetMapping("/paging") public PageVO pagingQuery(ProjectDevicePageQueryVO queryVO, - @ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) + @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO userLoginInfo) { return this.deviceService.pagingQuery(queryVO, userLoginInfo); } - @ApiOperation(value = "项目设备编号是否已经存在") + /** + *项目设备编号是否已经存在 + */ @GetMapping("/exist/{code}") public boolean isDeviceCodeExist(@PathVariable String code, - @ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) + @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO userLoginInfo) { return this.deviceService.isDeviceCodeExist(userLoginInfo.getProject(), code); } - @ApiOperation(value = "新建项目设备") + /** + *新建项目设备 + */ @PostMapping("") public String create(@RequestBody @Validated ProjectDeviceVO deviceVO, - @ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) + @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO userLoginInfo) { return this.deviceService.create(deviceVO, userLoginInfo); } - @ApiOperation(value = "获取设备详情（包含配置信息）") + /** + *获取设备详情（包含配置信息） + */ @GetMapping("/{id}") public ProjectDeviceVO getDeviceDetailInfoById(@PathVariable Long id) { return this.deviceService.getDeviceDetailInfoById(id); } - @ApiOperation(value = "添加/修改道岔设备网关映射配置") + /** + *添加/修改道岔设备网关映射配置 + */ @PutMapping("/{id}/config/plcgateway") public void updatePlcGatewayConfig(@PathVariable Long id, @RequestBody @Validated PlcGatewayConfigVO configVO) { this.deviceService.updatePlcGatewayConfig(id, configVO); } - @ApiOperation(value = "添加/修改道岔设备网关映射配置") + /** + *添加/修改道岔设备网关映射配置 + */ @PutMapping("/{id}/config/switch") public void updateSwitchConfig(@PathVariable Long id, @RequestBody @Validated SwitchConfigVO configVO) { this.deviceService.updateSwitchConfig(id, configVO); } - @ApiOperation(value = "添加/修改信号机设备网关映射配置") + /** + *添加/修改信号机设备网关映射配置 + */ @PutMapping("/{id}/config/signal") public void updateSignalConfig(@PathVariable Long id, @RequestBody @Validated SignalConfigVO configVO) { this.deviceService.updateSignalConfig(id, configVO); } - @ApiOperation(value = "添加/修改屏蔽门设备网关映射配置") + /** + *添加/修改屏蔽门设备网关映射配置 + */ @PutMapping("/{id}/config/psc") public void updatePscConfig(@PathVariable Long id, @RequestBody @Validated PscConfigVO configVO) { this.deviceService.updatePscConfig(id, configVO); } - @ApiOperation(value = "添加/修改屏蔽门设备网关映射配置") + /** + *添加/修改屏蔽门设备网关映射配置 + */ @PutMapping("/{id}/config/psd") public void updatePsdConfig(@PathVariable Long id, @RequestBody @Validated PsdConfigVO configVO) { this.deviceService.updatePsdConfig(id, configVO); } - @ApiOperation(value = "添加/修改屏蔽门设备网关映射配置") + /** + *添加/修改屏蔽门设备网关映射配置 + */ @PutMapping("/{id}/config/psl") public void updatePslConfig(@PathVariable Long id, @RequestBody @Validated PslConfigVO configVO) { this.deviceService.updatePslConfig(id, configVO); } - @ApiOperation(value = "添加/修改屏蔽门设备网关映射配置") + /** + *添加/修改屏蔽门设备网关映射配置 + */ @PutMapping("/{id}/config/ibp") public void updateIbpConfig(@PathVariable Long id, @RequestBody @Validated IbpConfigVO configVO) { this.deviceService.updateIbpConfig(id, configVO); } - @ApiOperation(value = "添加/修改虚拟IBP盘配置") + /** + *添加/修改虚拟IBP盘配置 + */ @PutMapping("/{id}/config/vribp") public void updateVrIbpConfig(@PathVariable Long id, @RequestBody @Validated VrIbpConfigVO configVO) { this.deviceService.updateVrIbpConfig(id, configVO); } - @ApiOperation(value = "添加/修改现地工作站配置") + /** + *添加/修改现地工作站配置 + */ @PutMapping("/{id}/config/lw") public void updateLwConfig(@PathVariable Long id, @RequestBody @Validated LwConfigVO configVO) { this.deviceService.updateLwConfig(id, configVO); } - @ApiOperation(value = "添加/修改大屏工作站配置") + /** + *添加/修改大屏工作站配置 + */ @PutMapping("/{id}/config/lsw") public void updateLswConfig(@PathVariable Long id, @RequestBody @Validated LswConfigVO configVO) { this.deviceService.updateLswConfig(id, configVO); } - @ApiOperation(value = "添加/修改CCTV工作站配置") + /** + *添加/修改CCTV工作站配置 + */ @PutMapping("/{id}/config/cctv") public void updateCctvConfig(@PathVariable Long id, @RequestBody @Validated RelationLoginConfigVO configVO) { this.deviceService.updateCctvConfig(id, configVO); } - @ApiOperation(value = "添加/修改电子沙盘工作站配置") + /** + *添加/修改电子沙盘工作站配置 + */ @PutMapping("/{id}/config/sandbox") public void updateSandboxConfig(@PathVariable Long id, @RequestBody @Validated RelationLoginConfigVO configVO) { this.deviceService.updateSandboxConfig(id, configVO); } - @ApiOperation(value = "添加/修改虚拟屏蔽门工作站配置") + /** + *添加/修改虚拟屏蔽门工作站配置 + */ @PutMapping("/{id}/config/vrpsd") public void updateVrpsdConfig(@PathVariable Long id, @RequestBody @Validated VrpsdConfigVO configVO) { this.deviceService.updateVrpsdConfig(id, configVO); } - @ApiOperation(value = "添加/修改现地综合监控工作站配置") + /** + *添加/修改现地综合监控工作站配置 + */ @PutMapping("/{id}/config/iscslw") public void updateIscsLwConfig(@PathVariable Long id, @RequestBody @Validated RelationLoginConfigVO configVO) { this.deviceService.updateIscsLwConfig(id, configVO); } - @ApiOperation(value = "添加/修改中心综合监控工作站配置") + /** + *添加/修改中心综合监控工作站配置 + */ @PutMapping("/{id}/config/iscscw") public void updateIscsCwConfig(@PathVariable Long id, @RequestBody @Validated RelationLoginConfigVO configVO) { this.deviceService.updateIscsCwConfig(id, configVO); } - @ApiOperation(value = "添加/修改联锁工作站配置") + /** + *添加/修改联锁工作站配置 + */ @PutMapping("/{id}/config/ilw") public void updateIlwConfig(@PathVariable Long id, @RequestBody @Validated RelationLoginConfigVO configVO) { this.deviceService.updateIlwConfig(id, configVO); } - @ApiOperation(value = "删除设备") + /** + * 修改配置，以json的形式 + */ + @PutMapping("/config/updateConfig") + public void updateConfig(@RequestBody ProjectDeviceVO projectDeviceVO) { + this.deviceService.updateConfig(projectDeviceVO); + } + + /** + *删除设备 + */ @DeleteMapping("/{id}") public void delete(@PathVariable Long id) { this.deviceService.delete(id); } - @ApiOperation(value = "查询某个类型的所有设备") + /** + *查询某个类型的所有设备 + */ @GetMapping("/{type}/all") public List queryByType(@PathVariable ProjectDeviceType type, - @ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) + @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO userLoginInfo) { return this.deviceService.queryByType(type, userLoginInfo.getProject()); } @@ -171,20 +222,32 @@ public class DeviceController { // return this.iProjectDeviceService.queryByProjectCode(projectCode, group); // } @PostMapping("/xty/addOrUpdate") - public void addOrUpdateXtyDeviceConfig(@ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) - UserVO userVO) { - this.deviceService.addOrUpdateXtyDeviceConfig(userVO); + public void addOrUpdateXtyDeviceConfig(@RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) + AccountVO accountVO) { + this.deviceService.addOrUpdateXtyDeviceConfig(accountVO); } @PostMapping("/gzb/addOrUpdate") - public void addOrUpdateGzbDeviceConfig(@ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) - UserVO userVO) { - this.deviceService.addOrUpdateGzbDeviceConfig(userVO); + public void addOrUpdateGzbDeviceConfig(@RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) + AccountVO accountVO) { + this.deviceService.addOrUpdateGzbDeviceConfig(accountVO); } @PostMapping("/sdy/addOrUpdate") - public void addOrUpdateSdyDeviceConfig(@ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) - UserVO userVO) { - this.deviceService.addOrUpdateSdyDeviceConfig(userVO); + public void addOrUpdateSdyDeviceConfig(@RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) + AccountVO accountVO) { + this.deviceService.addOrUpdateSdyDeviceConfig(accountVO); + } + + @PostMapping("/zjd/addOrUpdate") + public void addOrUpdateZjdDeviceConfig(@RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) + AccountVO accountVO) { + this.deviceService.addOrUpdateRichorDeviceConfig(accountVO); + } + + @PostMapping("/sr/addOrUpdate/{mapId}") + public void addOrUpdateSrDeviceConfig(@RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) + AccountVO accountVO, @PathVariable Long mapId) { + this.deviceService.addOrUpdateSrDeviceConfig(accountVO, mapId); } } diff --git a/src/main/java/club/joylink/rtss/controller/publish/CommandController.java b/src/main/java/club/joylink/rtss/controller/publish/CommandController.java index 6fbc0f0ef..430b51db6 100644 --- a/src/main/java/club/joylink/rtss/controller/publish/CommandController.java +++ b/src/main/java/club/joylink/rtss/controller/publish/CommandController.java @@ -5,8 +5,6 @@ import club.joylink.rtss.vo.client.CommandCopyVO; import club.joylink.rtss.vo.client.CommandDefinitionQueryVO; import club.joylink.rtss.vo.client.CommandDefinitionVO; import club.joylink.rtss.vo.client.PageVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -15,7 +13,9 @@ import javax.validation.Valid; import javax.validation.constraints.NotBlank; import java.util.List; -@Api(tags = {"指令管理接口"}) +/** + *指令管理接口 + */ @RestController @RequestMapping(path = "/api/cmd") public class CommandController { @@ -23,46 +23,60 @@ public class CommandController { @Autowired private ICommandService iCommandService; - @ApiOperation(value = "创建指令") + /** + *创建指令 + */ @RequestMapping(method = RequestMethod.POST) public void createCommand(@Valid @RequestBody CommandDefinitionVO commandDefinitionVO) { iCommandService.addDefinition(commandDefinitionVO); } - @ApiOperation(value = "修改指令") + /** + *修改指令 + */ @RequestMapping(method = RequestMethod.PUT) public void updateCommand(@Valid @RequestBody CommandDefinitionVO commandDefinitionVO) { iCommandService.updateDefinition(commandDefinitionVO); } - @ApiOperation(value = "code按条件分页查询指令，可根据线路过滤结果") + /** + *code按条件分页查询指令，可根据线路过滤结果 + */ @RequestMapping(method = RequestMethod.GET) public PageVO selectCommands(String lineCode, CommandDefinitionQueryVO commandDefinitionQueryVO) { return iCommandService.queryPagedDefinitions(lineCode, commandDefinitionQueryVO); } - @ApiOperation(value = "根据线路查询指令，可根据仿真角色过滤") + /** + *根据线路查询指令，可根据仿真角色过滤 + */ @RequestMapping(path="line/{lineCode}",method = RequestMethod.GET) public List selectCommands(@NotBlank @PathVariable String lineCode,String prdType,String simulationRole) { return iCommandService.queryDefinitions(lineCode,prdType, simulationRole); } - @ApiOperation(value = "根据指令id查询信息") + /** + *根据指令id查询信息 + */ @RequestMapping(path = "{id}",method = RequestMethod.GET) public CommandDefinitionVO selectCommandById(@PathVariable Long id) { return iCommandService.queryDefinitionById(id); } - @ApiOperation(value = "根据id删除指令") + /** + *根据id删除指令 + */ @RequestMapping(path = "{id}", method = RequestMethod.DELETE) public void deleteCommand(@PathVariable Long id) { iCommandService.deleteDefinition(id); } - @ApiOperation("复制指令") + /** + *复制指令 + */ @PostMapping("/copy") public void copy(@RequestBody @Validated CommandCopyVO copyVO) { iCommandService.copy(copyVO); diff --git a/src/main/java/club/joylink/rtss/controller/publish/ExamController.java b/src/main/java/club/joylink/rtss/controller/publish/ExamController.java index e086f5ac1..fe66e42b7 100644 --- a/src/main/java/club/joylink/rtss/controller/publish/ExamController.java +++ b/src/main/java/club/joylink/rtss/controller/publish/ExamController.java @@ -2,36 +2,38 @@ package club.joylink.rtss.controller.publish; import club.joylink.rtss.constants.BusinessConsts; import club.joylink.rtss.services.IExamService; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.LoginUserInfoVO; -import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.ExamDefinitionQueryVO; import club.joylink.rtss.vo.client.ExamDefinitionVO; -import club.joylink.rtss.vo.client.ExamsLessonVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.validGroup.ExamDefinitionRulesCheck; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; -@Api(tags = {"考试定义接口"}) +/** + *考试定义接口 + */ @RestController @RequestMapping("api/exam") public class ExamController { @Autowired private IExamService iExamService; - @ApiOperation(value = "创建考试") + /** + *创建考试 + */ @PostMapping(path = "") - public void create(@RequestBody @Validated ExamDefinitionVO examDefinitionVO, @RequestAttribute @ApiIgnore UserVO user) { + public void create(@RequestBody @Validated ExamDefinitionVO examDefinitionVO, @RequestAttribute AccountVO user) { iExamService.create(examDefinitionVO, user); } - @ApiOperation(value = "检查分数是否合理") + /** + *检查分数是否合理 + */ @GetMapping(path = "/checkScore") public boolean checkScore(@Validated(value = ExamDefinitionRulesCheck.class) ExamDefinitionVO examDefinitionVO) { return iExamService.checkScore(examDefinitionVO); @@ -44,7 +46,9 @@ public class ExamController { // return iExamService.queryTrainingTypes(lessonId); // } - @ApiOperation(value = "查询试题信息及规则信息") + /** + *查询试题信息及规则信息 + */ @GetMapping(path = "/{id}") public ExamDefinitionVO queryExamInfo(@PathVariable Long id) { return iExamService.queryExamInfo(id); @@ -56,15 +60,19 @@ public class ExamController { // return iExamService.queryExamList(lessonId, user); // } - @ApiOperation(value = "查询试题列表信息") + /** + *查询试题列表信息 + */ @GetMapping(path = "/list") public PageVO queryExamInfoList(ExamDefinitionQueryVO queryVO) { return iExamService.queryExamInfoList(queryVO); } - @ApiOperation(value = "删除试题") + /** + *删除试题 + */ @DeleteMapping(path = "/{id}") - public void deleteExam(@PathVariable Long id, @ApiIgnore @RequestAttribute UserVO user) { + public void deleteExam(@PathVariable Long id, @RequestAttribute AccountVO user) { iExamService.deleteExam(id, user); } @@ -74,45 +82,83 @@ public class ExamController { // return iExamService.queryTrainingNum(lessonId, trainingType, operateType); // } - @ApiOperation(value = "试题上线") + /** + *试题上线 + */ @PutMapping(value = "/{id}/onLine") - public void onLine(@PathVariable Long id, @RequestAttribute @ApiIgnore UserVO user) { + public void onLine(@PathVariable Long id, @RequestAttribute AccountVO user) { this.iExamService.onLine(id, user); } - @ApiOperation(value = "试题下线") + /** + *试题下线 + */ @PutMapping(value = "/{id}/offLine") - public void offLine(@PathVariable Long id, @RequestAttribute @ApiIgnore UserVO user) { + public void offLine(@PathVariable Long id, @RequestAttribute AccountVO user) { this.iExamService.offLine(id, user); } - @ApiOperation(value = "更新试题") + /** + *更新试题 + */ @PutMapping(path = "/{id}") public void update(@PathVariable Long id, @RequestBody ExamDefinitionVO examDefinitionVO) { this.iExamService.update(id, examDefinitionVO); } - @ApiOperation(value = "分页查询当前登录项目下的试卷") + /** + *分页查询当前登录项目下的试卷 + */ @GetMapping("/paged/loginProject") public PageVO pagedQueryByLoginProject(ExamDefinitionQueryVO queryVO, @RequestAttribute LoginUserInfoVO loginInfo) { return this.iExamService.pagedQueryByLoginProject(queryVO, loginInfo); } - @ApiOperation(value = "不分页查询当前登录项目下的试卷") + /** + *不分页查询当前登录项目下的试卷 + */ @GetMapping("/list/loginProject") public List listQueryExamByLoginProject(ExamDefinitionQueryVO queryVO, @RequestAttribute LoginUserInfoVO loginInfo) { return this.iExamService.listQueryExamByLoginProject(queryVO, loginInfo); } - @ApiOperation(value = "不分页查询组织下自己创建的试卷") + /** + *不分页查询组织下自己创建的试卷 + */ @GetMapping("/list/org/self") public List listQueryOrgExamOfSelf(Long clsId, @RequestAttribute LoginUserInfoVO loginInfo) { return this.iExamService.listQueryOrgExamICreated(clsId, loginInfo); } - @ApiOperation("查询试卷") + /** + *查询试卷 + */ @GetMapping("/list/{mapId}") public List listQuery(@PathVariable Long mapId, String prdType) { return iExamService.queryBasicInfo(mapId, prdType, BusinessConsts.STATUS_USE); } + + /** + * 更新考试规则 + */ + @PutMapping("/update/rules") + public void updateRules(@RequestBody ExamDefinitionVO examDefinitionVO) { + iExamService.updateRules(examDefinitionVO); + } + + /** + * 检查并更新【规则数据异常】状态 + */ + @PutMapping("/checkAndUpdateAbnormal/{mapId}") + public void check4SetAbnormalAndRegenerateSystemRules(@PathVariable long mapId) { + iExamService.checkAndUpdateAbnormal(mapId); + } + + /** + * 重新生成考试规则 + */ + @PutMapping("/regenerateRules/{mapId}") + public void regenerateRules(@PathVariable long mapId) { + iExamService.regenerateRules(mapId); + } } diff --git a/src/main/java/club/joylink/rtss/controller/publish/IbpController.java b/src/main/java/club/joylink/rtss/controller/publish/IbpController.java index 3c0d22ca4..2d2f4e940 100644 --- a/src/main/java/club/joylink/rtss/controller/publish/IbpController.java +++ b/src/main/java/club/joylink/rtss/controller/publish/IbpController.java @@ -4,13 +4,13 @@ import club.joylink.rtss.services.publishData.IbpService; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.ibp.IbpQueryVO; import club.joylink.rtss.vo.client.ibp.IbpVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -@Api(value="发布IBP盘数据接口") +/** + *发布IBP盘数据接口 + */ @RestController @RequestMapping("/api/ibp") public class IbpController { @@ -18,25 +18,33 @@ public class IbpController { @Autowired private IbpService ibpService; - @ApiOperation(value = "分页查询发布的IBP数据基本信息") + /** + *分页查询发布的IBP数据基本信息 + */ @GetMapping("") public PageVO pagingQueryIbpList(IbpQueryVO queryVO) { return this.ibpService.pagingQueryIbpList(queryVO); } - @ApiOperation(value = "根据id查询IBP数据") + /** + *根据id查询IBP数据 + */ @GetMapping("/{id}") public IbpVO getIbp(@PathVariable Long id) { return this.ibpService.getById(id); } - @ApiOperation(value = "根据线路编码和车站编码查询IBP数据") + /** + *根据线路编码和车站编码查询IBP数据 + */ @GetMapping("/query") public IbpVO getBy(@Validated IbpQueryVO queryVO) { return this.ibpService.getBy(queryVO); } - @ApiOperation("删除已发布的ibp数据") + /** + *删除已发布的ibp数据 + */ @DeleteMapping("/{id}") public void delete(@PathVariable Long id) { ibpService.delete(id); diff --git a/src/main/java/club/joylink/rtss/controller/publish/Lesson3dController.java b/src/main/java/club/joylink/rtss/controller/publish/Lesson3dController.java index da3ad4bee..b89c7d25c 100644 --- a/src/main/java/club/joylink/rtss/controller/publish/Lesson3dController.java +++ b/src/main/java/club/joylink/rtss/controller/publish/Lesson3dController.java @@ -5,9 +5,9 @@ import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.draft.Lesson3DQueryVO; import club.joylink.rtss.vo.draft.Lesson3DVO; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.List; @RestController @RequestMapping("/api/lesson3d") @@ -21,4 +21,33 @@ public class Lesson3dController { return this.lesson3DService.pagingQuery(queryVO); } + @GetMapping("/list") + public List queryListBy(Lesson3DQueryVO queryVO) { + return this.lesson3DService.queryBy(queryVO); + } + + @GetMapping(path = "/{id}") + public Lesson3DVO getById(@PathVariable Long id) { + Lesson3DVO param = this.lesson3DService.getById(id); + return param; + } + + /** + * 上线 + * @param id + */ + @PutMapping("/{id}/online") + public void online(@PathVariable Long id) { + this.lesson3DService.online(id); + } + + /** + * 下线 + * @param id + */ + @PutMapping("/{id}/offline") + public void offline(@PathVariable Long id) { + this.lesson3DService.offline(id); + } + } diff --git a/src/main/java/club/joylink/rtss/controller/publish/LessonController.java b/src/main/java/club/joylink/rtss/controller/publish/LessonController.java index 6ea09c4fa..213ea6c55 100644 --- a/src/main/java/club/joylink/rtss/controller/publish/LessonController.java +++ b/src/main/java/club/joylink/rtss/controller/publish/LessonController.java @@ -5,24 +5,22 @@ import club.joylink.rtss.controller.advice.AuthenticateInterceptor; import club.joylink.rtss.controller.advice.Role; import club.joylink.rtss.services.ILessonService; import club.joylink.rtss.services.org.IOrgUserService; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.LoginUserInfoVO; -import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.LessonQueryVO; import club.joylink.rtss.vo.client.LessonTreeVO; import club.joylink.rtss.vo.client.LessonVO; import club.joylink.rtss.vo.client.PageVO; -import club.joylink.rtss.vo.client.org.DepartmentVO; import club.joylink.rtss.vo.client.validGroup.LessonUpdateNameAndRemarksCheck; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; -@Api(tags = { "课程数据管理接口" }) +/** + *课程数据管理接口 + */ @RestController @RequestMapping("/api/lesson") public class LessonController { @@ -38,100 +36,130 @@ public class LessonController { this.iLessonService = iLessonService; } - @ApiOperation(value = "获取课程实训树") + /** + *获取课程实训树 + */ @GetMapping(path = "/{id}/tree") - public LessonTreeVO getLessonTrainingTree(@PathVariable Long id, @RequestAttribute UserVO user) { + public LessonTreeVO getLessonTrainingTree(@PathVariable Long id, @RequestAttribute AccountVO user) { return this.iLessonService.getLessonTree(id, user); } - @ApiOperation(value = "获取课程详情") + /** + *获取课程详情 + */ @GetMapping(path="/{id}") - public LessonVO getLessonDetail(@PathVariable Long id, @RequestAttribute UserVO user) { + public LessonVO getLessonDetail(@PathVariable Long id, @RequestAttribute AccountVO user) { return this.iLessonService.getLessonDetail(id, user); } - @ApiOperation(value = "根据条件获取课程列表") + /** + *根据条件获取课程列表 + */ @GetMapping(path = "") public List queryLessons(LessonQueryVO lessonQueryVO) { return this.iLessonService.queryValidLessons(lessonQueryVO); } - @ApiOperation(value = "根据部门获取关联课程列表") + /** + *根据部门获取关联课程列表 + */ @GetMapping(path = "/depart/{departId}") public List queryLessons(@PathVariable Long departId) { return this.iOrgUserService.getLessonsByDepart(departId); } - @ApiOperation(value = "获取课程列表") + /** + *获取课程列表 + */ @GetMapping(path = "/listOfMap") public List queryLessonsOfMap(Long mapId) { return this.iLessonService.queryValidLessonsOfMap(mapId); } - @ApiOperation(value = "分页获取已发布的课程") + /** + *分页获取已发布的课程 + */ @GetMapping(path = "/publishedLesson") public PageVO selectPagedPublishedLesson(LessonQueryVO queryVO) { return iLessonService.selectPagedPublishedLesson(queryVO); } @Role(RoleEnum.SuperAdmin) - @ApiOperation(value = "删除已发布的课程") +/** + *删除已发布的课程 + */ @DeleteMapping(path = "/publishedLesson/{lessonId}") - public void deletePublishedLesson(@PathVariable Long lessonId, @RequestAttribute UserVO user) { + public void deletePublishedLesson(@PathVariable Long lessonId, @RequestAttribute AccountVO user) { iLessonService.deletePublishedLesson(lessonId, user); } @Role(RoleEnum.LessonCreater) - @ApiOperation(value = "用户删除教学实训删除自己发布的课程") +/** + *用户删除教学实训删除自己发布的课程 + */ @DeleteMapping(path = "/usedLesson/{lessonId}") - public void deleteUsedLesson(@PathVariable Long lessonId, @RequestAttribute UserVO user) { + public void deleteUsedLesson(@PathVariable Long lessonId, @RequestAttribute AccountVO user) { iLessonService.deleteUsedLesson(lessonId, user); } - @ApiOperation(value = "发布课程上线") + /** + *发布课程上线 + */ @PutMapping(path = "/{id}/onLine") @Role({RoleEnum.Admin,RoleEnum.SuperAdmin}) - public void onLine(@PathVariable Long id, @RequestAttribute UserVO user) { + public void onLine(@PathVariable Long id, @RequestAttribute AccountVO user) { this.iLessonService.onLine(id, user); } - @ApiOperation(value = "发布课程下线") + /** + *发布课程下线 + */ @PutMapping(path = "/{id}/offLine") @Role({RoleEnum.Admin,RoleEnum.SuperAdmin}) - public void offLine(@PathVariable Long id, @RequestAttribute UserVO user) { + public void offLine(@PathVariable Long id, @RequestAttribute AccountVO user) { this.iLessonService.offLine(id, user); } - @ApiOperation(value = "更新课程名称和简介") + /** + *更新课程名称和简介 + */ @PutMapping(path = "/{id}/nameAndRemarks") @Role({RoleEnum.Admin,RoleEnum.SuperAdmin}) public void updateNameAndRemarks(@PathVariable Long id, @RequestBody @Validated(LessonUpdateNameAndRemarksCheck.class) LessonVO lessonVO, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { this.iLessonService.updateNameAndRemarks(id, lessonVO.getName(), lessonVO.getRemarks(), user); } - @ApiOperation(value = "生成默认课程和考试功能") + /** + *生成默认课程和考试功能 + */ @PostMapping(path = "/generating") - public void generateLessonAndExam(@ApiIgnore @RequestAttribute UserVO user, @RequestBody List mapIds) { + public void generateLessonAndExam(@RequestAttribute AccountVO user, @RequestBody List mapIds) { iLessonService.generateLessonAndExam(mapIds, user); } - @ApiOperation(value = "分页查询用户当前登录的项目下的课程") + /** + *分页查询用户当前登录的项目下的课程 + */ @GetMapping(path = "/paged/byLoginProject") public PageVO pagedQueryByLoginProject(LessonQueryVO queryVO, @RequestAttribute(AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO loginInfo) { return iLessonService.pagedQueryByLoginProject(queryVO, loginInfo); } - @ApiOperation(value = "查询用户当前登录的项目下的课程") + /** + *查询用户当前登录的项目下的课程 + */ @GetMapping(path = "/list/byLoginProject") public List queryByLoginProject(LessonQueryVO queryVO, @RequestAttribute(AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO loginInfo) { return iLessonService.queryByLoginProject(queryVO, loginInfo); } - @ApiOperation(value = "查询自己给指定班级创建的课程") + /** + *查询自己给指定班级创建的课程 + */ @GetMapping(path = "/list/org/self") public List queryOrgLessonOfSelf(Long clsId, @RequestAttribute LoginUserInfoVO loginInfo) { return iLessonService.queryOrgLessonOfSelf(clsId, loginInfo); diff --git a/src/main/java/club/joylink/rtss/controller/publish/MapController.java b/src/main/java/club/joylink/rtss/controller/publish/MapController.java index 954a8f1e3..7fd24aad0 100644 --- a/src/main/java/club/joylink/rtss/controller/publish/MapController.java +++ b/src/main/java/club/joylink/rtss/controller/publish/MapController.java @@ -6,25 +6,29 @@ import club.joylink.rtss.controller.advice.Role; import club.joylink.rtss.services.IMapService; import club.joylink.rtss.services.IReleaseService; import club.joylink.rtss.services.local.LocalDataService; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.LoginUserInfoVO; -import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.*; import club.joylink.rtss.vo.client.local.LocalDataVO; -import club.joylink.rtss.vo.client.map.*; -import club.joylink.rtss.vo.client.map.newmap.*; +import club.joylink.rtss.vo.client.map.MapCopyOption; +import club.joylink.rtss.vo.client.map.MapInfoUpdateVO; import club.joylink.rtss.vo.client.validGroup.MapInfoSortCheck; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import club.joylink.rtss.vo.map.*; +import club.joylink.rtss.vo.map.graph.MapPSDVO; +import club.joylink.rtss.vo.map.graph.MapSectionNewVO; +import club.joylink.rtss.vo.map.graph.MapStationNewVO; +import club.joylink.rtss.vo.map.graph.MapStationStandNewVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.List; -@Api(tags = {"发布地图管理接口"}) +/** + *发布地图管理接口 + */ @RestController @RequestMapping("/api/map") public class MapController { @@ -38,32 +42,42 @@ public class MapController { @Autowired private IReleaseService iReleaseService; - @ApiOperation(value = "查询有地图的城市相关字典详情") + /** + *查询有地图的城市相关字典详情 + */ @GetMapping(path = "/city") public List queryCityHasMap(String dicCode) { return iMapService.queryCityHasMap(dicCode); } - @ApiOperation(value = "查询有地图的城市列表") + /** + *查询有地图的城市列表 + */ @GetMapping(path = "/exist") public boolean checkNameExist(@NotBlank String name) { return iMapService.checkNameExist(name); } - @ApiOperation(value = "根据地图id查询地图版本") + /** + *根据地图id查询地图当前使用版本 + */ @GetMapping(path = "/{id}/version") public String getMapVersionById(@PathVariable Long id) { - return this.iMapService.findMapVersion(id); + return this.iMapService.getMapDetail(id).getVersion(); } - @ApiOperation(value = "根据地图id查询地图明细") + /** + *根据地图id查询地图明细 + */ @GetMapping(path = "/{id}/details") public MapVO getMapDetailsById(@PathVariable Long id) { MapVO mapVO = this.iMapService.getMapDetail(id); return mapVO; } - @ApiOperation("根据地图id查询绘图数据") + /** + *根据地图id查询绘图数据 + */ @GetMapping("/{id}/graphData") public MapGraphDataNewVO getGraphData(@PathVariable Long id) { MapVO mapVO = this.iMapService.getMapDetail(id); @@ -71,233 +85,315 @@ public class MapController { } - @ApiOperation(value = "根据地图id查询地图数据") + /** + *根据地图id查询地图数据 + */ @GetMapping(path = "/{id}/mapData") public MapVO getMapDataById(@PathVariable Long id) { MapVO mapVO = this.iMapService.getMapDetail(id); return mapVO; } - @ApiOperation(value = "根据地图id查询3D数据") + /** + *根据地图id查询3D数据 + */ @GetMapping(path = "/{id}/3dMapData") public Map3dDataVO getMap3DDataById(@PathVariable Long id) { return iMapService.findMap3dDataByMapId(id); } - @ApiOperation(value = "获取有屏蔽门的站台列表") + /** + *获取有屏蔽门的站台列表 + */ @GetMapping(path = "/{id}/stand/hasDoor") public List getHasScreenDoorStand(@PathVariable @NotNull Long id) { return this.iMapService.getHasScreenDoorStand(id); } - @ApiOperation(value = "查询列表") + /** + *查询列表 + */ @GetMapping(path = "/list") public List list(MapVO mapVO) { return this.iMapService.list(mapVO); } - @ApiOperation(value = "查询所有地图名称") + /** + *查询所有地图名称 + */ @GetMapping("/list/all/name") public List queryAllMapName() { return iMapService.queryAllMapName(); } - @ApiOperation(value = "查询用户所属项目所有上线的地图信息列表") + /** + *查询用户所属项目所有上线的地图信息列表 + */ @GetMapping("/online/all") - public List list(@ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) - LoginUserInfoVO loginUserInfoVO) { + public List list(@RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) + LoginUserInfoVO loginUserInfoVO) { return this.iMapService.queryOnlineMapInfoListOfProject(loginUserInfoVO.getProject()); } - @ApiOperation(value = "查询上架地图列表") + /** + *查询上架地图列表 + */ @GetMapping(path = "/listOnline") public List listOnline() { return this.iMapService.listOnline(); } - @ApiOperation(value = "根据定制项目编号查询地图列表") + /** + *根据定制项目编号查询地图列表 + */ @GetMapping(path = "/project/{projectCode}/list") public List listByProjectCode(@PathVariable String projectCode) { return this.iMapService.listByProjectCode(projectCode); } - @ApiOperation(value = "查询基于指定真实线路的发布地图列表") + /** + *查询基于指定真实线路的发布地图列表 + */ @GetMapping(path = "/{lineCode}/list") public List getMapListBySkin(@PathVariable String lineCode) { return this.iMapService.getMapListByLineCode(lineCode); } - @ApiOperation(value = "分页查询地图数据") + /** + *分页查询地图数据 + */ @GetMapping(path = "") public PageVO queryPagedMaps(MapQueryVO queryVO) { return this.iMapService.queryPagedMaps(queryVO); } - @ApiOperation(value = "分页查询地图版本数据") + /** + *分页查询地图版本数据 + */ @GetMapping(path = "/{id}/versions") public PageVO queryPagedMapVersions(@PathVariable Long id, PageQueryVO queryVO) { return iMapService.queryPagedMapVersions(id, queryVO); } @Role(RoleEnum.SuperAdmin) - @ApiOperation(value = "删除地图数据") +/** + *删除地图数据 + */ @DeleteMapping(path = "/{id}") - public void delete(@PathVariable Long id, @RequestAttribute UserVO user) { + public void delete(@PathVariable Long id, @RequestAttribute AccountVO user) { this.iMapService.deleteMap(id, user); } - @ApiOperation(value = "根据地图id获取地图信息") + /** + *根据地图id获取地图信息 + */ @GetMapping(path = "/{id}") public MapVO get(@PathVariable Long id) { return this.iMapService.getMapInfoById(id); } - @ApiOperation(value = "发布地图数据导出") + /** + *发布地图数据导出 + */ @GetMapping(value = "/{id}/export") public MapVO exportTo(@PathVariable Long id) { return iMapService.export(id); } - @ApiOperation(value = "发布地图上线") + /** + *发布地图上线 + */ @PutMapping(value = "/{id}/onLine") @Role({RoleEnum.SuperAdmin,RoleEnum.Admin}) - public void onLine(@PathVariable Long id, @RequestAttribute UserVO user) { + public void onLine(@PathVariable Long id, @RequestAttribute AccountVO user) { this.iMapService.onLine(id, user); } - @ApiOperation(value = "发布地图下线") + /** + *发布地图下线 + */ @PutMapping(value = "/{id}/offLine") - public void offLine(@PathVariable Long id, @RequestAttribute UserVO user) { + public void offLine(@PathVariable Long id, @RequestAttribute AccountVO user) { this.iMapService.offLine(id, user); } - @ApiOperation(value = "修改发布地图名称") + /** + *修改发布地图名称 + */ @PutMapping(path = "/{id}/updateName") - public void updateName(@PathVariable Long id, @RequestBody MapVO mapVO, @ApiIgnore @RequestAttribute UserVO user) { + public void updateName(@PathVariable Long id, @RequestBody MapVO mapVO, @RequestAttribute AccountVO user) { this.iMapService.updateName(id, mapVO.getName(), user); } - @ApiOperation(value = "修改发布地图所属城市") + /** + *修改发布地图所属城市 + */ @PutMapping(path = "/{id}/city") - public void updateBelongCity(@PathVariable Long id, @RequestBody MapVO mapVO, @ApiIgnore @RequestAttribute UserVO user) { + public void updateBelongCity(@PathVariable Long id, @RequestBody MapVO mapVO, @RequestAttribute AccountVO user) { this.iMapService.updateBelongCity(id, mapVO.getCityCode(), user); } @Role({RoleEnum.Admin, RoleEnum.SuperAdmin}) - @ApiOperation(value = "修改地图基本信息") +/** + *修改地图基本信息 + */ @PutMapping(path = "/{id}/info") public void updateBasicInfo(@PathVariable Long id, @RequestBody MapInfoUpdateVO updateVO, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { this.iMapService.updateBasicInfo(id, updateVO, user); } - @ApiOperation(value = "设置发布地图所属项目") + /** + *设置发布地图所属项目 + */ @PutMapping(path = "/{id}/project") - public void updateBelongProject(@PathVariable Long id, @RequestBody MapVO mapVO, @ApiIgnore @RequestAttribute UserVO user) { + public void updateBelongProject(@PathVariable Long id, @RequestBody MapVO mapVO, @RequestAttribute AccountVO user) { this.iMapService.updateBelongProject(id, mapVO.isProject(), mapVO.getProjectCode(), user); } - @ApiOperation(value = "复制地图线路数据（必选，地图数据(包括地图/运行图)；可选，包括课程/考试/剧本等）") + /** + *复制地图线路数据（必选，地图数据(包括地图/运行图)；可选，包括课程/考试/剧本等） + */ @PostMapping(path = "/copy/{id}") - public void copyMapData(@PathVariable Long id, @RequestBody MapCopyOption copyOption, @ApiIgnore @RequestAttribute UserVO user) { + public void copyMapData(@PathVariable Long id, @RequestBody MapCopyOption copyOption, @RequestAttribute AccountVO user) { this.iMapService.copyMapData(id, copyOption, user); } - @ApiOperation(value = "校验地图名称是否已经存在（是否重复）") + /** + *校验地图名称是否已经存在（是否重复） + */ @GetMapping(path = "/nameExist") public boolean checkMapNameExist(@RequestParam String name) { return this.iMapService.isMapNameExist(name); } - @ApiOperation(value = "检测地图仿真数据是否存在错误") + /** + *校验所有地图数据 + */ + @GetMapping("/all/simulationCheck") + public List doSimulationCheckAll(@RequestAttribute LoginUserInfoVO loginInfo) { + return this.iMapService.doSimulationCheckAll(loginInfo); + } + + /** + *检测地图仿真数据是否存在错误 + */ @GetMapping(path = "/{id}/simulationCheck") - public List doSimulationCheck(@PathVariable Long id, @ApiIgnore @RequestAttribute UserVO user) { + public List doSimulationCheck(@PathVariable Long id, @RequestAttribute AccountVO user) { return this.iMapService.doSimulationCheck(id, user); } - @ApiOperation(value = "更新地图序号") + /** + *更新地图序号 + */ @PutMapping(path = "/sort") public void updateOrderNumber(@Validated(value = MapInfoSortCheck.class) @RequestBody List updateVOS) { iMapService.updateOrderNumber(updateVOS); } @Role(RoleEnum.SuperAdmin) - @ApiOperation(value = "导出本地需要地图相关数据（本地部署地图数据）") +/** + *导出本地需要地图相关数据（本地部署地图数据） + */ @PostMapping(path = "/local/export") - public LocalDataVO exportLocalMapData(@RequestBody List mapIdList, @ApiIgnore @RequestAttribute UserVO user) { + public LocalDataVO exportLocalMapData(@RequestBody List mapIdList, @RequestAttribute AccountVO user) { return this.localDataService.exportLocalMapData(mapIdList, user); } @Role(RoleEnum.SuperAdmin) - @ApiOperation(value = "导入本地需要地图相关数据（本地部署地图数据）") +/** + *导入本地需要地图相关数据（本地部署地图数据） + */ @PostMapping(path = "/local/import") - public void importLocalMapData(@RequestBody LocalDataVO localDataVO, @ApiIgnore @RequestAttribute UserVO user) { + public void importLocalMapData(@RequestBody LocalDataVO localDataVO, @RequestAttribute AccountVO user) { this.localDataService.importLocalMapData(localDataVO, user); } - @ApiOperation(value = "获取地图下所有需要值班员的车站") + /** + *获取地图下所有需要值班员的车站 + */ @GetMapping(path = "/{id}/station/needSupervisor") public List getNeedSupervisorStations(@PathVariable Long id) { return iMapService.getNeedSupervisorStations(id); } - @ApiOperation(value = "获取地图车站下所有有屏蔽门的站台") + /** + *获取地图车站下所有有屏蔽门的站台 + */ @GetMapping("/{id}/station/{stationCode}/standWithPsd") public List getStationHasPsdStands(@PathVariable Long id, @PathVariable String stationCode) { return this.iMapService.getStationHasPsdStands(id, stationCode); } - @ApiOperation("获取地图车站下的区段") + /** + *获取地图车站下的区段 + */ @GetMapping("/{id}/station/{stationCode}/sections") public List querySectionsUnderTheStation(@PathVariable Long id, @PathVariable String stationCode){ return this.iMapService.querySectionsUnderTheStation(id, stationCode); } - @ApiOperation("获取集中站下所有区段") + /** + *获取集中站下所有区段 + */ @GetMapping("/{id}/deviceStation/{stationCode}/sections") public List querySectionBelongTheDeviceStation(@PathVariable Long id, @PathVariable String stationCode) { return this.iMapService.querySectionBelongTheDeviceStation(id, stationCode); } - @ApiOperation(value = "获取地图站台关联的屏蔽门") + /** + *获取地图站台关联的屏蔽门 + */ @GetMapping("/{id}/stand/{standCode}/psd") public List getStandPsds(@PathVariable Long id, @PathVariable String standCode) { return this.iMapService.getStandPsds(id, standCode); } - @ApiOperation("导出地图相关数据") + /** + *导出地图相关数据 + */ @GetMapping("/{id}/export/new") public ReleaseVO export(@PathVariable Long id, @Validated ReleaseConfigVO configs) { return iReleaseService.exportAsJson(id, configs); } - @ApiOperation("导入地图相关数据") + /** + *导入地图相关数据 + */ @PutMapping("/{id}/import/new") - public void importFromJson(@PathVariable Long id, @RequestBody ReleaseVO json, @RequestAttribute UserVO user) { + public void importFromJson(@PathVariable Long id, @RequestBody ReleaseVO json, @RequestAttribute AccountVO user) { iReleaseService.importFromJson(id, json, user); } - @ApiOperation("一键生成发布地图相关功能：目前生成权限及子系统") + /** + *一键生成发布地图相关功能：目前生成权限及子系统 + */ @PostMapping("/{id}/function/generate") - public void generate(@PathVariable Long id, @ApiIgnore @RequestAttribute UserVO user) { + public void generate(@PathVariable Long id, @RequestAttribute AccountVO user) { this.iMapService.generateMapFunction(id, user); } - @ApiOperation("查询地图数据现有版本") + /** + *查询地图数据现有版本 + */ @GetMapping("/{id}/dataVersions") public List getMapDataVersion(@PathVariable Long id) { return iMapService.getMapDataVersion(id); } - @ApiOperation("查询所有地图下的所有车站") + /** + *查询所有地图下的所有车站 + */ @GetMapping("/allStations") public List getAllStations() { return iMapService.getAllStations(); } - @ApiOperation("查询地图下所有区段") + /** + *查询地图下所有区段 + */ @GetMapping("/{id}/sections") public List querySectionsUnderMap(@PathVariable Long id) { return iMapService.querySectionsUnderMap(id); diff --git a/src/main/java/club/joylink/rtss/controller/publish/MapGroupController.java b/src/main/java/club/joylink/rtss/controller/publish/MapGroupController.java index 156ca0522..695ec2abb 100644 --- a/src/main/java/club/joylink/rtss/controller/publish/MapGroupController.java +++ b/src/main/java/club/joylink/rtss/controller/publish/MapGroupController.java @@ -1,20 +1,18 @@ package club.joylink.rtss.controller.publish; import club.joylink.rtss.services.IMapGroupService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.ReleaseVO; import club.joylink.rtss.vo.client.map.MapGroupQueryVO; import club.joylink.rtss.vo.client.map.MapGroupVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.List; - -@Api(tags = {"地图数据组管理"}) +/** + *地图数据组管理 + */ @RestController @RequestMapping("/api/mapGroup") public class MapGroupController { @@ -22,41 +20,53 @@ public class MapGroupController { @Autowired private IMapGroupService iMapGroupService; - @ApiOperation(value = "添加地图数据组") + /** + *添加地图数据组 + */ @PostMapping(path = "") public void createMapGroup(@RequestBody @Validated MapGroupVO mapGroupVO) { this.iMapGroupService.create(mapGroupVO); } - @ApiOperation(value = "修改地图数据组") + /** + *修改地图数据组 + */ @PutMapping(path = "{groupId}") public void updateMapGroup(@PathVariable Long groupId, @RequestBody @Validated MapGroupVO mapGroupVO) { this.iMapGroupService.update(groupId, mapGroupVO); } - @ApiOperation(value = "地图数据组关联地图") + /** + *地图数据组关联地图 + */ @PutMapping(path = "{groupId}/ref/map/{mapId}") public void refMap2Group(@PathVariable Long groupId, @PathVariable Long mapId) { this.iMapGroupService.relMap2Group(groupId, mapId); } - @ApiOperation(value = "删除地图数据组") + /** + *删除地图数据组 + */ @DeleteMapping(path = "{groupId}") public void deleteMapGroup(@PathVariable Long groupId) { this.iMapGroupService.delete(groupId); } - @ApiOperation(value = "分页获取所有地图数据组") + /** + *分页获取所有地图数据组 + */ @GetMapping(path = "page") public PageVO getPageMapGroups(MapGroupQueryVO queryVO) { return this.iMapGroupService.getPage(queryVO); } - @ApiOperation("同步导入地图相关数据") - @PutMapping("/syc/import") - public void importFromJson(@RequestBody ReleaseVO json, @RequestAttribute UserVO user) { - iMapGroupService.syncImportMapData(json, user); + /** + *同步导入地图相关数据 + */ + @PutMapping("{id}/syc/import") + public void importFromJson(@RequestBody ReleaseVO json, @RequestAttribute AccountVO user, @PathVariable Long id) { + iMapGroupService.syncImportMapData(id,json, user); } } diff --git a/src/main/java/club/joylink/rtss/controller/publish/MapSystemController.java b/src/main/java/club/joylink/rtss/controller/publish/MapSystemController.java index fed2c4b42..dde467d93 100644 --- a/src/main/java/club/joylink/rtss/controller/publish/MapSystemController.java +++ b/src/main/java/club/joylink/rtss/controller/publish/MapSystemController.java @@ -2,22 +2,22 @@ package club.joylink.rtss.controller.publish; import club.joylink.rtss.controller.advice.AuthenticateInterceptor; import club.joylink.rtss.services.IMapSystemService; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.LoginUserInfoVO; -import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.TreeNode; import club.joylink.rtss.vo.client.sub.MapSystemDetailVO; import club.joylink.rtss.vo.client.sub.MapSystemQueryVO; import club.joylink.rtss.vo.client.sub.MapSystemVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(tags = {"地图系统接口"}) +/** + *地图系统接口 + */ @RestController @RequestMapping("/api/mapSystem") public class MapSystemController { @@ -25,58 +25,81 @@ public class MapSystemController { @Autowired private IMapSystemService iMapSystemService; - @ApiOperation(value = "生成地图系统") + /** + *生成地图系统 + */ @PostMapping("/generate/{mapId}") public void generateSystem(@PathVariable Long mapId) { iMapSystemService.generateSystem(mapId); } - @ApiOperation(value = "分页查询地图系统") + @PostMapping("/generate/{mapId}/{prdType}") + public void generateSignalSystem(@PathVariable Long mapId, @PathVariable String prdType) { + iMapSystemService.generateSystem(mapId, prdType); + } + + /** + *分页查询地图系统 + */ @GetMapping("") public PageVO generateSystem(MapSystemQueryVO queryVO) { return iMapSystemService.queryPagedMapSystem(queryVO); } - @ApiOperation(value = "创建地图系统") + /** + *创建地图系统 + */ @PostMapping("") public void createMapSystem(@RequestBody @Validated MapSystemVO mapSystemVO) { iMapSystemService.createMapSystem(mapSystemVO); } - @ApiOperation(value = "更新地图系统") + /** + *更新地图系统 + */ @PutMapping("/{id}") public void createMapSystem(@PathVariable Long id, @RequestBody MapSystemVO mapSystemVO) { iMapSystemService.updateMapSystem(id, mapSystemVO); } - @ApiOperation(value = "根据城市code查询地图系统数据") + /** + *根据城市code查询地图系统数据 + */ @GetMapping("/city/{cityCode}") public List queryByCityCode(@PathVariable String cityCode) { return iMapSystemService.queryByCityCode(cityCode); } - @ApiOperation(value = "根据定制项目编号查询地图系统数据") + /** + *根据定制项目编号查询地图系统数据 + */ @GetMapping("/project") public List queryByProjectCode(@RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) - LoginUserInfoVO loginUserInfoVO) { + LoginUserInfoVO loginUserInfoVO) { return iMapSystemService.queryByProjectCode(loginUserInfoVO.getProject()); } - @ApiOperation(value = "查询子系统信息") + /** + *查询子系统信息 + */ @GetMapping("/{id}") public MapSystemVO getMapSystemDetail(@PathVariable Long id) { return iMapSystemService.getMapSystem(id); } - @ApiOperation(value = "查询子系统详情") + /** + *查询子系统详情 + */ @GetMapping("/{id}/detail") public MapSystemDetailVO getMapSystemDetail(@PathVariable Long id, @RequestAttribute LoginUserInfoVO loginInfo) { return iMapSystemService.getMapSystemDetail(id, loginInfo); } - @ApiOperation(value = "删除地图系统") + /** + *删除地图系统 + */ @DeleteMapping("/{id}") - public void delete(@PathVariable Long id, @RequestAttribute UserVO user) { + public void delete(@PathVariable Long id, @RequestAttribute AccountVO user) { iMapSystemService.delete(id, user); } } diff --git a/src/main/java/club/joylink/rtss/controller/publish/PassengerFlowDataController.java b/src/main/java/club/joylink/rtss/controller/publish/PassengerFlowDataController.java index 053582baa..012ff535c 100644 --- a/src/main/java/club/joylink/rtss/controller/publish/PassengerFlowDataController.java +++ b/src/main/java/club/joylink/rtss/controller/publish/PassengerFlowDataController.java @@ -1,17 +1,16 @@ package club.joylink.rtss.controller.publish; import club.joylink.rtss.services.publishData.MapPassengerFlowDataService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.passenger.MapPassengerFlowVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; -@Api(tags = {"客流数据管理接口"}) +/** + * 客流数据管理接口 + */ @RestController @RequestMapping("/map/{mapId}/passengerFlowData") public class PassengerFlowDataController { @@ -19,21 +18,35 @@ public class PassengerFlowDataController { @Autowired private MapPassengerFlowDataService mapPassengerFlowDataService; - @ApiOperation(value = "站台客流数据导入") + /** + * 站台客流数据导入 + * @param mapId + * @param data + * @param user + */ @PostMapping("/stand") public void importStandData(@PathVariable Long mapId, @RequestBody String data, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { this.mapPassengerFlowDataService.importStandData(mapId, data); } - @ApiOperation(value = "车次客流数据导入") + /** + * 车次客流数据导入 + * @param mapId + * @param data + * @param user + */ @PostMapping("/trip") public void importTripData(@PathVariable Long mapId, @RequestBody String data, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { this.mapPassengerFlowDataService.importTripData(mapId, data); } - @ApiOperation(value = "获取客流数据基础信息") + /** + * 获取客流数据基础信息 + * @param mapId + * @return + */ @GetMapping public List getPassengerFlowBaseData(@PathVariable Long mapId) { return this.mapPassengerFlowDataService.queryAllPassengerFlowBaseDataOfMap(mapId); diff --git a/src/main/java/club/joylink/rtss/controller/publish/RealLineController.java b/src/main/java/club/joylink/rtss/controller/publish/RealLineController.java index 9f301956c..03725bf91 100644 --- a/src/main/java/club/joylink/rtss/controller/publish/RealLineController.java +++ b/src/main/java/club/joylink/rtss/controller/publish/RealLineController.java @@ -1,22 +1,21 @@ package club.joylink.rtss.controller.publish; import club.joylink.rtss.services.IRealLineService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.PageVO; -import club.joylink.rtss.vo.client.map.RealLineConfigVO; import club.joylink.rtss.vo.client.map.RealLineListVO; -import club.joylink.rtss.vo.client.map.RealLineQueryVO; -import club.joylink.rtss.vo.client.map.RealLineVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import club.joylink.rtss.vo.map.RealLineConfigVO; +import club.joylink.rtss.vo.map.RealLineVO; +import club.joylink.rtss.vo.map.query.RealLineQueryVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; -@Api(tags = {"真实线路管理接口"}) +/** + *真实线路管理接口 + */ @RestController @RequestMapping(path = "/api/realLine") public class RealLineController { @@ -24,63 +23,83 @@ public class RealLineController { @Autowired private IRealLineService iRealLineService; - @ApiOperation(value = "添加真实线路") + /** + *添加真实线路 + */ @PostMapping(path = "") - public void create(@RequestBody @Validated RealLineVO skinVO, @RequestAttribute @ApiIgnore UserVO user) { + public void create(@RequestBody @Validated RealLineVO skinVO, @RequestAttribute AccountVO user) { this.iRealLineService.create(skinVO, user); } - @ApiOperation(value = "获取真实线路列表") + /** + *获取真实线路列表 + */ @GetMapping(path = "/list") public List queryList(RealLineQueryVO queryVO) { return this.iRealLineService.queryList(queryVO); } - @ApiOperation(value = "分页查询真实线路") + /** + *分页查询真实线路 + */ @GetMapping(path = "") public PageVO queryPagedSkin(RealLineQueryVO queryVO) { return this.iRealLineService.queryPagedSkin(queryVO); } - @ApiOperation(value = "根据id查询真实线路") + /** + *根据id查询真实线路 + */ @GetMapping(path = "/{id}") public RealLineVO get(@PathVariable Long id) { return this.iRealLineService.get(id); } - @ApiOperation(value = "修改真实线路") + /** + *修改真实线路 + */ @PutMapping(path = "/{id}") public void get(@PathVariable Long id, @RequestBody @Validated RealLineVO skinVO, - @RequestAttribute @ApiIgnore UserVO user) { + @RequestAttribute AccountVO user) { this.iRealLineService.update(id, skinVO, user); } - @ApiOperation(value = "删除真实线路") + /** + *删除真实线路 + */ @DeleteMapping(path = "/{id}") public void delete(@PathVariable Long id) { this.iRealLineService.delete(id); } - @ApiOperation(value = "检查code是否存在") + /** + *检查code是否存在 + */ @GetMapping(path = "/{code}/exist") public boolean checkCodeExist(@PathVariable String code) { return this.iRealLineService.checkCodeExist(code); } - @ApiOperation(value = "根据code修改真实线路") + /** + *根据code修改真实线路 + */ @PutMapping(path = "/{code}/update") public void get(@PathVariable String code, @RequestBody RealLineVO skinVO, - @RequestAttribute @ApiIgnore UserVO user) { + @RequestAttribute AccountVO user) { this.iRealLineService.updateByCode(code, skinVO, user); } - @ApiOperation(value = "保存线路配置") + /** + *保存线路配置 + */ @PostMapping(path = "/config/{id}") public void saveLineConfig(@PathVariable Long id, @RequestBody @Validated RealLineConfigVO config) { this.iRealLineService.saveLineConfig(id, config); } - @ApiOperation(value = "根据id查询线路配置") + /** + *根据id查询线路配置 + */ @GetMapping(path = "/config/{id}") public RealLineConfigVO getLineConfigById(@PathVariable Long id) { return this.iRealLineService.getLineConfigById(id); diff --git a/src/main/java/club/joylink/rtss/controller/publish/RunPlanDailyController.java b/src/main/java/club/joylink/rtss/controller/publish/RunPlanDailyController.java index 26c891ab9..13ae7ce17 100644 --- a/src/main/java/club/joylink/rtss/controller/publish/RunPlanDailyController.java +++ b/src/main/java/club/joylink/rtss/controller/publish/RunPlanDailyController.java @@ -4,20 +4,19 @@ import club.joylink.rtss.constants.RoleEnum; import club.joylink.rtss.controller.advice.Role; import club.joylink.rtss.services.IDailyRunPlanService; import club.joylink.rtss.services.ILoadPlanService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.runplan.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import javax.validation.constraints.NotNull; import java.util.List; -@Api(tags = {"每日运行计划接口"}) +/** + *每日运行计划接口 + */ @RestController @RequestMapping("/api/runPlan/daily") public class RunPlanDailyController { @@ -28,53 +27,69 @@ public class RunPlanDailyController { @Autowired private ILoadPlanService iLoadPlanService; - @ApiOperation(value = "分页获取每日加载运行图") + /** + *分页获取每日加载运行图 + */ @GetMapping(path = "") public PageVO queryPagedRunPlan(RunPlanQueryVO queryVO) { return this.iDailyRunPlanService.queryPagedRunPlan(queryVO); } - @ApiOperation(value = "删除每日加载运行图") + /** + *删除每日加载运行图 + */ @DeleteMapping(path = "/{planId}") @Role(RoleEnum.SuperAdmin) - public void deleteTemplatePlan(@PathVariable Long planId, @RequestAttribute UserVO user) { + public void deleteTemplatePlan(@PathVariable Long planId, @RequestAttribute AccountVO user) { this.iDailyRunPlanService.deletePlan(user, planId); } - @ApiOperation(value = "用户创建加载计划") + /** + *用户创建加载计划 + */ @PostMapping(path = "/runPlanLoad") public void createRunPlanLoad(@RequestBody @Validated RunPlanLoadVO runPlanLoadVO, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { this.iLoadPlanService.createLoadPlan(runPlanLoadVO, user); } - @ApiOperation(value = "分页查询加载计划") + /** + *分页查询加载计划 + */ @GetMapping(path = "/runPlanLoad") public PageVO queryPagedRunPlanLoad(RunPlanLoadQueryVO queryVO) { return this.iLoadPlanService.queryPagedLoadPlan(queryVO); } - @ApiOperation(value = "删除加载计划") + /** + *删除加载计划 + */ @DeleteMapping(path = "/runPlanLoad/{id}") - public void deleteRunPlanLoad(@PathVariable Long id, @ApiIgnore @RequestAttribute UserVO user) { + public void deleteRunPlanLoad(@PathVariable Long id, @RequestAttribute AccountVO user) { this.iLoadPlanService.deleteLoadPlan(id, user); } - @ApiOperation(value = "管理员创建通用加载计划") + /** + *管理员创建通用加载计划 + */ @PostMapping(path = "/runPlanLoad/common") public void createCommonRunPlanLoad(@RequestBody RunPlanLoadVO runPlanLoadVO, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { this.iLoadPlanService.createCommonLoadPlan(runPlanLoadVO, user); } - @ApiOperation(value = "从加载计划创建每日计划") + /** + *从加载计划创建每日计划 + */ @PostMapping(path = "/runPlanLoad/{id}/generate") public void createDailyPlanFromLoadPlan(@PathVariable @NotNull Long id, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { this.iLoadPlanService.createDailyPlanFromLoadPlan(id, user); } - @ApiOperation(value = "查询运行图的数据绘制运行图") + /** + *查询运行图的数据绘制运行图 + */ @GetMapping(path = "/{planId}") public RunPlanEChartsDataVO selectDiagramData(@PathVariable Long planId) { return this.iDailyRunPlanService.selectDiagramData(planId); diff --git a/src/main/java/club/joylink/rtss/controller/publish/RunPlanTemplateController.java b/src/main/java/club/joylink/rtss/controller/publish/RunPlanTemplateController.java index 4c6eb1eb1..d36a13440 100644 --- a/src/main/java/club/joylink/rtss/controller/publish/RunPlanTemplateController.java +++ b/src/main/java/club/joylink/rtss/controller/publish/RunPlanTemplateController.java @@ -3,22 +3,23 @@ package club.joylink.rtss.controller.publish; import club.joylink.rtss.constants.RoleEnum; import club.joylink.rtss.controller.advice.Role; import club.joylink.rtss.services.IRunPlanTemplateService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.runplan.RunPlanEChartsDataVO; import club.joylink.rtss.vo.client.runplan.RunPlanQueryVO; +import club.joylink.rtss.vo.client.runplan.RunPlanTemplateUpdateVO; import club.joylink.rtss.vo.client.runplan.RunPlanVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.List; -@Api(tags = {"运行计划模板接口"}) +/** + *运行计划模板接口 + */ @RestController @RequestMapping("/api/runPlan/template") public class RunPlanTemplateController { @@ -26,58 +27,82 @@ public class RunPlanTemplateController { @Autowired private IRunPlanTemplateService iRunPlanTemplateService; - @ApiOperation(value = "分页获取运行图模板") + /** + *分页获取运行图模板 + */ @GetMapping(path = "") public PageVO queryPagedRunPlan(RunPlanQueryVO queryVO) { return this.iRunPlanTemplateService.queryPagedRunPlan(queryVO); } - @ApiOperation(value = "查询所有模板运行图") + /** + *查询所有模板运行图 + */ @GetMapping(path = "/all") public List queryAll() { return this.iRunPlanTemplateService.queryAll(); } - @ApiOperation(value = "查询地图下的模板运行图") + /** + *查询地图下的模板运行图 + */ @GetMapping(path = "/{mapId}/list") public List queryPlanOfMap(@PathVariable Long mapId) { return this.iRunPlanTemplateService.queryPlanListByMapId(mapId); } - @ApiOperation(value = "模板运行图是否被其他数据使用") + /** + *模板运行图是否被其他数据使用 + */ @GetMapping(path = "/{planId}/exist") public boolean isUsed(@PathVariable Long planId) { return this.iRunPlanTemplateService.isUsed(planId); } - @ApiOperation(value = "删除运行图模板") + /** + *删除运行图模板 + */ @DeleteMapping(path = "/{planId}") @Role({RoleEnum.SuperAdmin,RoleEnum.Admin}) - public void deleteTemplatePlan(@PathVariable Long planId, @ApiIgnore @RequestAttribute UserVO user) { + public void deleteTemplatePlan(@PathVariable Long planId, @RequestAttribute AccountVO user) { this.iRunPlanTemplateService.deletePlan(planId, user); } - @ApiOperation(value = "复制运行图模板") + /** + *复制运行图模板 + */ @PostMapping(path = "/{id}/copyAs/{mapId}") public void copyAs(@PathVariable @NotNull Long id, - @PathVariable @NotBlank Long mapId, - String name, - @ApiIgnore @RequestAttribute UserVO user) { + @PathVariable @NotBlank Long mapId, + String name, + @RequestAttribute AccountVO user) { this.iRunPlanTemplateService.copyAs(id, mapId, name, user); } - @ApiOperation(value = "使用此模板生成当日运行图") + /** + *使用此模板生成当日运行图 + */ @PostMapping(path = "/generate/{planId}") @Role({RoleEnum.SuperAdmin,RoleEnum.Admin}) public void generateDailyRunPlan(@PathVariable Long planId, @RequestParam Long mapId, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { this.iRunPlanTemplateService.generateDailyRunPlan(planId, mapId, user); } - @ApiOperation(value = "查询运行图的数据绘制运行图") + /** + *查询运行图的数据绘制运行图 + */ @GetMapping(path = "/{planId}") public RunPlanEChartsDataVO selectDiagramData(@PathVariable Long planId) { return iRunPlanTemplateService.selectDiagramData(planId); } + + /** + *修改模板运行图信息 + */ + @PutMapping("/update") + public void update(@RequestBody @Validated RunPlanTemplateUpdateVO updateVO) { + iRunPlanTemplateService.update(updateVO); + } } diff --git a/src/main/java/club/joylink/rtss/controller/runplan/RunPlanDraftController.java b/src/main/java/club/joylink/rtss/controller/runplan/RunPlanDraftController.java index 433dddafa..5e595d2b6 100644 --- a/src/main/java/club/joylink/rtss/controller/runplan/RunPlanDraftController.java +++ b/src/main/java/club/joylink/rtss/controller/runplan/RunPlanDraftController.java @@ -5,29 +5,26 @@ import club.joylink.rtss.controller.advice.AuthenticateInterceptor; import club.joylink.rtss.controller.advice.Role; import club.joylink.rtss.services.IRunPlanDraftService; import club.joylink.rtss.services.runplan.IRunPlanRoutingService; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.LoginUserInfoVO; -import club.joylink.rtss.vo.UserVO; -import club.joylink.rtss.vo.client.map.newmap.MapStationParkingTimeVO; -import club.joylink.rtss.vo.client.map.newmap.MapStationRunLevelVO; import club.joylink.rtss.vo.client.runplan.*; import club.joylink.rtss.vo.client.runplan.user.RunPlanRoutingSection; import club.joylink.rtss.vo.client.runplan.user.RunPlanRoutingVO; import club.joylink.rtss.vo.client.validGroup.RunPlanCreateCheck; import club.joylink.rtss.vo.client.validGroup.RunPlanNameCheck; import club.joylink.rtss.vo.client.validGroup.ValidList; -import club.joylink.rtss.vo.runplan.RunPlanInput; +import club.joylink.rtss.vo.map.logic.MapStationRunLevelVO; import club.joylink.rtss.vo.runplan.RunPlanInputData; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; -@Api(tags = {"运行计划草稿接口"}) +/** + *运行计划草稿接口 + */ @RestController @RequestMapping("/api/runPlan/draft") public class RunPlanDraftController { @@ -38,54 +35,70 @@ public class RunPlanDraftController { @Autowired private IRunPlanRoutingService iRunPlanRoutingService; - @ApiOperation(value = "创建运行图草稿") + /** + *创建运行图草稿 + */ @PostMapping(path = "") public String create(@RequestBody @Validated(value = RunPlanCreateCheck.class) RunPlanVO runPlanVO, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { return iRunPlanDraftService.create(runPlanVO, user); } - @ApiOperation(value = "修改运行图名称") + /** + *修改运行图名称 + */ @PutMapping(path = "/{id}") public void updateName(@PathVariable Long id, @RequestBody @Validated(value = RunPlanNameCheck.class) RunPlanVO runPlanVO, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { iRunPlanDraftService.updateName(id, runPlanVO.getName(), user); } - @ApiOperation(value = "从模板运行图创建") + /** + *从模板运行图创建 + */ @PostMapping(path = "/createFrom/{templateId}") public String createFrom(@PathVariable Long templateId, @RequestBody @Validated(value = RunPlanNameCheck.class) RunPlanVO runPlanVO, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { return iRunPlanDraftService.createFrom(templateId, runPlanVO.getName(), user); } - @ApiOperation(value = "根据mapId查询运行图纵坐标车站节点") + /** + *根据mapId查询运行图纵坐标车站节点 + */ @GetMapping(path = "/station/{mapId}") public List selectOrdinateByMapId(@PathVariable Long mapId) { return iRunPlanDraftService.selectOrdinateByMapId(mapId); } - @ApiOperation(value = "查询运行图的数据绘制运行图") + /** + *查询运行图的数据绘制运行图 + */ @GetMapping(path = "/{planId}") public RunPlanEChartsDataVO selectDiagramData(@PathVariable Long planId) { return iRunPlanDraftService.selectDiagramData(planId); } - @ApiOperation(value = "删除运行图") + /** + *删除运行图 + */ @DeleteMapping(path = "/{planId}") - public void deleteDiagramDraftData(@PathVariable Long planId, @RequestAttribute UserVO user) { + public void deleteDiagramDraftData(@PathVariable Long planId, @RequestAttribute AccountVO user) { iRunPlanDraftService.deleteDiagramDraftData(planId, user); } - @ApiOperation(value = "删除运行图数据") + /** + *删除运行图数据 + */ @DeleteMapping(path = "/{planId}/data") - public void deleteDraftData(@PathVariable Long planId, @RequestAttribute UserVO user) { + public void deleteDraftData(@PathVariable Long planId, @RequestAttribute AccountVO user) { iRunPlanDraftService.deleteDraftData(planId, user); } - @ApiOperation(value = "运行图草稿发布") + /** + *运行图草稿发布 + */ @PostMapping(path = "/{planId}/publish") - public List publish(@PathVariable Long planId, @RequestAttribute UserVO user) { + public List publish(@PathVariable Long planId, @RequestAttribute AccountVO user) { List checkedList = this.dataCheck(planId,user); if(CollectionUtils.isEmpty(checkedList)) { iRunPlanDraftService.publish(planId, user); @@ -93,185 +106,229 @@ public class RunPlanDraftController { return checkedList; } - @ApiOperation(value = "导入真实运行图") + /** + *导入真实运行图 + */ @PostMapping(path = "/{mapId}/prdPlan") public void importPrdPlan(@PathVariable Long mapId, @RequestBody @Validated ValidList runPlanImportList, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { this.iRunPlanDraftService.importRunPlan(mapId, runPlanImportList, user); } - @ApiOperation(value = "查询地图下个人运行图列表") + /** + *查询地图下个人运行图列表 + */ @GetMapping(path = "/{mapId}/list") - public List queryListByMapId(@PathVariable Long mapId, @RequestAttribute UserVO user) { + public List queryListByMapId(@PathVariable Long mapId, @RequestAttribute AccountVO user) { return this.iRunPlanDraftService.queryListByMapId(mapId, user); } - @ApiOperation(value = "获取站间运行时间") + /** + *获取站间运行时间 + */ @GetMapping(path = "/{mapId}/stationRunning") - public List getStationRunningDate(@PathVariable Long mapId, @ApiIgnore @RequestAttribute UserVO user) { + public List getStationRunningDate(@PathVariable Long mapId, @RequestAttribute AccountVO user) { return this.iRunPlanDraftService.getStationRunningDate(mapId, user); } - @ApiOperation(value = "设置站间运行时间") + /** + *设置站间运行时间 + */ @PutMapping(path = "/{mapId}/stationRunning") public void setStationRunningTime(@PathVariable Long mapId, @RequestBody List runPlanLevelVOList, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { this.iRunPlanDraftService.setStationRunningTime(mapId, runPlanLevelVOList, user); } - @ApiOperation(value = "获取地图原始站间运行等级") + /** + *获取地图原始站间运行等级 + */ @GetMapping(path = "/{mapId}/stationRunLevel") public List getStationRunningLevels(@PathVariable Long mapId) { return this.iRunPlanDraftService.getStationRunLevel(mapId); } - @ApiOperation(value = "获取地图原始车站停站时间") - @GetMapping(path = "/{mapId}/stationParkingTime") - public List getStationParkingTimes(@PathVariable Long mapId) { - return this.iRunPlanDraftService.getStationParkingTimeList(mapId); - } - - @ApiOperation(value = "查询运行图服务号是否存在") + /** + *查询运行图服务号是否存在 + */ @GetMapping(path = "/{planId}/{serviceNumber}/service") public boolean ifServerExists(@PathVariable Long planId, @PathVariable String serviceNumber) { return this.iRunPlanDraftService.ifServerExists(planId, serviceNumber); } - @ApiOperation(value = "查询地图默认交路列表") + /** + *查询地图默认交路列表 + */ @GetMapping(path = "/{planId}/routingList") public List getRoutingList(@PathVariable Long planId) { return this.iRunPlanDraftService.getRoutingList(planId); } - @ApiOperation(value = "根据车次号查询交路") + /** + *根据车次号查询交路 + */ @GetMapping(path = "/{planId}/routing") public Object queryRoutingBySDTNumber(@PathVariable Long planId, String SDTNumber) { return this.iRunPlanDraftService.queryRoutingBySDTNumber(planId, SDTNumber); } - @ApiOperation(value = "根据车次号查询用户交路") + /** + *根据车次号查询用户交路 + */ @GetMapping(path = "/{planId}/userRouting") - public RunPlanRoutingVO queryRoutingBySDTNumber(@PathVariable Long planId, String SDTNumber, @ApiIgnore @RequestAttribute UserVO user) { + public RunPlanRoutingVO queryRoutingBySDTNumber(@PathVariable Long planId, String SDTNumber, @RequestAttribute AccountVO user) { return this.iRunPlanRoutingService.queryUserRoutingBySDTNumber(user.getId(), planId, SDTNumber); } - @ApiOperation(value = "根据交路查询交路区段列表") + /** + *根据交路查询交路区段列表 + */ @GetMapping(path = "/{planId}/{routingCode}/routingSectionList") public List getRoutingSectionList(@PathVariable Long planId, @PathVariable String routingCode) { return this.iRunPlanDraftService.getRoutingSectionList(planId, routingCode); } - @ApiOperation(value = "根据用户交路查询交路区段列表") + /** + *根据用户交路查询交路区段列表 + */ @GetMapping(path = "/{routingCode}/routingSectionList") - public List getRoutingSectionList( @PathVariable Long routingCode, @ApiIgnore @RequestAttribute UserVO user) { + public List getRoutingSectionList( @PathVariable Long routingCode, @RequestAttribute AccountVO user) { return this.iRunPlanRoutingService.getRoutingSectionDataBy(user.getId() , routingCode); } - @ApiOperation(value = "增加计划") + /** + *增加计划 + */ @PostMapping(path = "/{planId}/service") public void addRunPlanService(@PathVariable Long planId, - @RequestBody @Validated RunPlanServiceConfigVO serviceConfig, - @ApiIgnore @RequestAttribute UserVO user) { - this.iRunPlanDraftService.addRunPlanService(planId, serviceConfig, user); + @RequestBody @Validated RunPlanServiceConfigVO serviceConfig, + @RequestAttribute AccountVO user) { + this.iRunPlanDraftService.addRunPlanService(planId, serviceConfig, user); } - @ApiOperation(value = "生成计划") + /** + *生成计划 + */ @PostMapping(path = "/{planId}/service/generate") - public void generateRunPlanService(@RequestBody @Validated RunPlanInputData inputData, @PathVariable Long planId,@ApiIgnore @RequestAttribute UserVO user) { - iRunPlanDraftService.generateRunPlanService(user.getId(),planId,inputData); + public void generateRunPlanService(@RequestBody @Validated RunPlanInputData inputData, @PathVariable Long planId, @RequestAttribute AccountVO user) { + iRunPlanDraftService.generateRunPlanService(user.getId(),planId,inputData); } - @ApiOperation(value = "修改计划") + /** + *修改计划 + */ @PutMapping(path = "/{planId}/service/{serviceNumber}") public void updateRunPlanService(@PathVariable Long planId, @PathVariable String serviceNumber, - @RequestBody @Validated RunPlanServiceConfigVO serviceConfig, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestBody @Validated RunPlanServiceConfigVO serviceConfig, + @RequestAttribute AccountVO user) { this.iRunPlanDraftService.updateRunPlanService(planId, serviceNumber, serviceConfig, user); } - @ApiOperation(value = "删除计划") + /** + *删除计划 + */ @DeleteMapping(path = "/{planId}/service/{serviceNumber}") public void deleteRunPlanService(@PathVariable Long planId, - @PathVariable String serviceNumber, - @ApiIgnore @RequestAttribute UserVO user) { + @PathVariable String serviceNumber, + @RequestAttribute AccountVO user) { this.iRunPlanDraftService.deleteRunPlanService(planId, serviceNumber, user); } - @ApiOperation(value = "复制计划") + /** + *复制计划 + */ @PostMapping(path = "/{planId}/service/{serviceNumber}") public void copyRunPlanService(@PathVariable Long planId, - @PathVariable String serviceNumber, + @PathVariable String serviceNumber, @RequestBody RunPlanServiceConfigVO serviceConfig, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { this.iRunPlanDraftService.copyRunPlanService(planId, serviceNumber, serviceConfig, user); } - @ApiOperation(value = "平移计划") + /** + *平移计划 + */ @PutMapping(path = "/{planId}/service/{serviceNumber}/move") public void moveRunPlanService(@PathVariable Long planId, @PathVariable String serviceNumber, @RequestBody RunPlanServiceConfigVO serviceConfig, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { this.iRunPlanDraftService.moveRunPlanService(planId, serviceNumber, serviceConfig, user); } - @ApiOperation(value = "修改计划号") + /** + *修改计划号 + */ @PutMapping(path = "/{planId}/service/{serviceNumber}/serviceNumber") public void updateRunPlanService(@PathVariable Long planId, @PathVariable String serviceNumber, String newServiceNumber) { this.iRunPlanDraftService.updateRunPlanServiceNumber(planId, serviceNumber, newServiceNumber); } - @ApiOperation(value = "增加任务") + /** + *增加任务 + */ @PostMapping(path = "/{planId}/{serviceNumber}/trip") public void addRunPlanTrip(@PathVariable Long planId, @PathVariable String serviceNumber, @RequestBody @Validated RunPlanTripConfigVO tripConfig, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { this.iRunPlanDraftService.addRunPlanTrip(planId, serviceNumber, tripConfig, user); } - @ApiOperation(value = "修改任务") + /** + *修改任务 + */ @PutMapping(path = "/{planId}/trip/{SDTNumber}") public void updateRunPlanTrip(@PathVariable Long planId, @PathVariable String SDTNumber, @RequestBody @Validated RunPlanTripConfigVO tripConfig) { this.iRunPlanDraftService.updateRunPlanTrip(planId, SDTNumber, tripConfig); } - @ApiOperation(value = "修改任务车次号") + /** + *修改任务车次号 + */ @PutMapping(path = "/{planId}/trip/{SDTNumber}/tripNumber") public void updateRunPlanTripNumber(@PathVariable Long planId, @PathVariable String SDTNumber,String tripNumber) { this.iRunPlanDraftService.updateRunPlanTripNumber(planId, SDTNumber, tripNumber); } - @ApiOperation(value = "删除任务") + /** + *删除任务 + */ @DeleteMapping(path = "/{planId}/trip/{SDTNumber}") public void deleteRunPlanTrip(@PathVariable Long planId, @PathVariable String SDTNumber, boolean deleteBefore, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { this.iRunPlanDraftService.deleteRunPlanTrip(planId, SDTNumber, deleteBefore, user); } //TODO - @ApiOperation(value = "有效性检查") + /** + *有效性检查 + */ @GetMapping (path = "/{planId}/check") - public List dataCheck(@PathVariable Long planId,@ApiIgnore @RequestAttribute UserVO user) { + public List dataCheck(@PathVariable Long planId, @RequestAttribute AccountVO user) { return this.iRunPlanDraftService.dataCheck(planId,user.getId()); } //Temp use @Role(RoleEnum.SuperAdmin) - @ApiOperation(value = "手动删除折返轨时刻数据") +/** + *手动删除折返轨时刻数据 + */ @PutMapping(path = "/{planId}/removeTBTrackTripTime") public void removeTBTrackTripTime(@PathVariable Long planId) { - this.iRunPlanDraftService.removeTBTrackTripTime(planId); + this.iRunPlanDraftService.removeTBTrackTripTime(planId); } - @ApiOperation(value = "运行图仿真测试") + /** + *运行图仿真测试 + */ @GetMapping (path = "/{planId}/simulation") - public String simulationCheck(@PathVariable Long planId, @ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) + public String simulationCheck(@PathVariable Long planId, @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO loginUserInfoVO) { - List checkedList = this.dataCheck(planId,loginUserInfoVO.getUserVO()); + List checkedList = this.dataCheck(planId,loginUserInfoVO.getAccountVO()); if(CollectionUtils.isEmpty(checkedList)) { return this.iRunPlanDraftService.simulationCheck(planId, loginUserInfoVO); } diff --git a/src/main/java/club/joylink/rtss/controller/runplan/RunPlanUserDataController.java b/src/main/java/club/joylink/rtss/controller/runplan/RunPlanUserDataController.java index 278d1280d..5de7a70eb 100644 --- a/src/main/java/club/joylink/rtss/controller/runplan/RunPlanUserDataController.java +++ b/src/main/java/club/joylink/rtss/controller/runplan/RunPlanUserDataController.java @@ -4,19 +4,18 @@ import club.joylink.rtss.services.runplan.IRunPlanParktimeService; import club.joylink.rtss.services.runplan.IRunPlanRoutingService; import club.joylink.rtss.services.runplan.IRunPlanRunlevelService; import club.joylink.rtss.services.runplan.IRunPlanUserConfigService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.runplan.user.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Map; -@Api(tags = {"运行计划用户数据接口"}) +/** + *运行计划用户数据接口 + */ @RestController @RequestMapping("/api/runPlan/userData") public class RunPlanUserDataController { @@ -33,95 +32,133 @@ public class RunPlanUserDataController { @Autowired private IRunPlanUserConfigService iRunPlanUserConfigService; - @ApiOperation(value = "用户创建交路") + /** + *用户创建交路 + */ @PostMapping(path = "/routing") - public void createUserRouting(@RequestBody @Validated RunPlanRoutingVO routingVO, @RequestAttribute UserVO user) { + public void createUserRouting(@RequestBody @Validated RunPlanRoutingVO routingVO, @RequestAttribute AccountVO user) { routingVO.setUserId(user.getId()); - iRunPlanRoutingService.createUserRouting(routingVO); + iRunPlanRoutingService.createUserRouting(routingVO); } - @ApiOperation(value = "生成通用交路区段数据") + /** + *生成通用交路区段数据 + */ @PostMapping(path = "/routing/path/generate") public RunPlanRoutingVO generateUserRoutingPath(@RequestBody @Validated RunPlanRoutingVO routingVO) { return iRunPlanRoutingService.generateUserRoutingData(routingVO); } - @ApiOperation(value = "分页获取用户交路") + /** + *分页获取用户交路 + */ @GetMapping(path = "/{mapId}/routing/page") - public PageVO queryPagedUserRouting(@PathVariable Long mapId, RunPlanRoutingQueryVO queryVO, @RequestAttribute UserVO user) { + public PageVO queryPagedUserRouting(@PathVariable Long mapId, RunPlanRoutingQueryVO queryVO, @RequestAttribute AccountVO user) { return iRunPlanRoutingService.queryPagedUserRouting(user.getId(), mapId, queryVO); } - @ApiOperation(value = "用户同步默认交路相关数据:运行等级/停站时间/折返时间") + /** + *用户同步默认交路相关数据:运行等级/停站时间/折返时间 + */ @PutMapping(path = "/{mapId}/defaultRouting/sync") - public void pullDefaultRouting(@PathVariable Long mapId,@RequestAttribute UserVO user) { - iRunPlanRoutingService.syncDefaultRoutingRefData(user.getId(), mapId); + public void pullDefaultRouting(@PathVariable Long mapId,@RequestAttribute AccountVO user) { + iRunPlanRoutingService.syncDefaultRoutingRefData(user.getId(), mapId); } - @ApiOperation(value = "获取用户交路数据") + /** + *获取用户交路数据 + */ @GetMapping(path = "/{mapId}/routing") - public List queryUserRoutings(@PathVariable Long mapId, @RequestAttribute UserVO user) { + public List queryUserRoutings(@PathVariable Long mapId, @RequestAttribute AccountVO user) { return iRunPlanRoutingService.getUserRoutingBy(user.getId(), mapId); } - @ApiOperation(value = "获取用户交路详情") + /** + * 查询用户交路数据 + */ + @GetMapping("/{mapId}/routing/select") + public List queryRoutings(@PathVariable Long mapId, RunPlanRoutingQueryVO queryVO, @RequestAttribute AccountVO user) { + return iRunPlanRoutingService.queryRoutes(mapId, queryVO, user); + } + + /** + *获取用户交路详情 + */ @GetMapping(path = "/routing/{routingId}") public RunPlanRoutingVO getUserRouting(@PathVariable Long routingId) { return iRunPlanRoutingService.getUserRouting(routingId); } - @ApiOperation(value = "更新用户交路") + /** + *更新用户交路 + */ @PutMapping(path = "/routing/{routingId}") - public void updateUserRouting(@PathVariable Long routingId, @RequestBody @Validated RunPlanRoutingVO routingVO,@RequestAttribute UserVO user) { + public void updateUserRouting(@PathVariable Long routingId, @RequestBody @Validated RunPlanRoutingVO routingVO,@RequestAttribute AccountVO user) { routingVO.setUserId(user.getId()); iRunPlanRoutingService.updateUserRouting(routingId, routingVO); } - @ApiOperation(value = "删除用户交路") + /** + *删除用户交路 + */ @DeleteMapping(path = "/routing/{routingId}") public void deleteUserRouting(@PathVariable Long routingId) { iRunPlanRoutingService.deleteUserRouting(routingId); } - @ApiOperation(value = "分页获取用户站间运行等级") + /** + *分页获取用户站间运行等级 + */ @GetMapping(path = "/{mapId}/runlevel/page") - public PageVO queryPagedUserRunlevel(@PathVariable Long mapId, RunPlanRunLevelQueryVO queryVO, @RequestAttribute UserVO user) { + public PageVO queryPagedUserRunlevel(@PathVariable Long mapId, RunPlanRunLevelQueryVO queryVO, @RequestAttribute AccountVO user) { return iRunPlanRunlevelService.queryUserRunLevels(user.getId(), mapId, queryVO); } - @ApiOperation(value = "更新用户站间运行等级") + /** + *更新用户站间运行等级 + */ @PutMapping(path = "/{mapId}/runlevel") - public void updateUserRunlevel(@PathVariable Long mapId, @RequestBody @Validated List list, @RequestAttribute UserVO user) { + public void updateUserRunlevel(@PathVariable Long mapId, @RequestBody @Validated List list, @RequestAttribute AccountVO user) { iRunPlanRunlevelService.updateRefLevels(user.getId(), mapId, list); } - @ApiOperation(value = "用于区段数据变化时更新站间距离且重新计算运行等级数据") + /** + *用于区段数据变化时更新站间距离且重新计算运行等级数据 + */ @PutMapping(path = "/{mapId}/runlevelDistance") - public List updateRunlevelDistance(@PathVariable Long mapId, @RequestAttribute UserVO user) { + public List updateRunlevelDistance(@PathVariable Long mapId, @RequestAttribute AccountVO user) { return iRunPlanRunlevelService.updateRunlevelDistance(user.getId(), mapId); } - @ApiOperation(value = "分页获取用户轨道停车时间") + /** + *分页获取用户轨道停车时间 + */ @GetMapping(path = "/{mapId}/parktime/page") - public PageVO queryPagedUserParktime(@PathVariable Long mapId, RunPlanParktimeQueryVO queryVO, @RequestAttribute UserVO user) { + public PageVO queryPagedUserParktime(@PathVariable Long mapId, RunPlanParktimeQueryVO queryVO, @RequestAttribute AccountVO user) { return iRunPlanParktimeService.queryUserParktimes(user.getId(), mapId, queryVO); } - @ApiOperation(value = "更新用户轨道停车时间") + /** + *更新用户轨道停车时间 + */ @PutMapping(path = "/{mapId}/parktime") - public void updateUserParktime(@PathVariable Long mapId, @RequestBody @Validated List list, @RequestAttribute UserVO user) { + public void updateUserParktime(@PathVariable Long mapId, @RequestBody @Validated List list, @RequestAttribute AccountVO user) { iRunPlanParktimeService.updateRefUserParktime(user.getId(), mapId, list); } - @ApiOperation(value = "保存用户配置") + /** + *保存用户配置 + */ @PostMapping(path = "/{mapId}/config") - public void createUserConfig(@PathVariable Long mapId, @RequestBody @Validated RunPlanUserConfigVO.Config config, @RequestAttribute UserVO user) { + public void createUserConfig(@PathVariable Long mapId, @RequestBody @Validated RunPlanUserConfigVO.Config config, @RequestAttribute AccountVO user) { iRunPlanUserConfigService.saveConfig(user.getId(), mapId, config); } - @ApiOperation(value = "获取用户配置") + /** + *获取用户配置 + */ @GetMapping(path = "/{mapId}/config") - public RunPlanUserConfigVO getUserConfig(@PathVariable Long mapId, @RequestAttribute UserVO user) { + public RunPlanUserConfigVO getUserConfig(@PathVariable Long mapId, @RequestAttribute AccountVO user) { return iRunPlanUserConfigService.getConfig(user.getId(), mapId); } diff --git a/src/main/java/club/joylink/rtss/controller/script/ScriptController.java b/src/main/java/club/joylink/rtss/controller/script/ScriptController.java index 0e41ee544..945a99db2 100644 --- a/src/main/java/club/joylink/rtss/controller/script/ScriptController.java +++ b/src/main/java/club/joylink/rtss/controller/script/ScriptController.java @@ -2,10 +2,8 @@ package club.joylink.rtss.controller.script; import club.joylink.rtss.services.script.IScriptService; import club.joylink.rtss.vo.client.PageVO; -import club.joylink.rtss.vo.client.script.ScriptVO; import club.joylink.rtss.vo.client.script.ScriptQueryVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import club.joylink.rtss.vo.client.script.ScriptVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -14,20 +12,30 @@ import org.springframework.web.bind.annotation.RestController; import javax.validation.constraints.NotNull; -@Api(tags = "新版剧本接口") +/** + * 新版剧本接口 + */ @RestController @RequestMapping("/api/script/v1") public class ScriptController { @Autowired private IScriptService iScriptService; - @ApiOperation(value = "分页查询上线的剧本") + /** + * 分页查询上线的剧本 + * @param scriptQueryVO + * @return + */ @GetMapping(path = "/paging/online") public PageVO pagingQueryOnlineScript(ScriptQueryVO scriptQueryVO) { return iScriptService.pagingQueryOnlineScript(scriptQueryVO); } - @ApiOperation(value = "通过id查询剧本详细信息") + /** + * 通过id查询剧本详细信息 + * @param id + * @return + */ @GetMapping(path = "/{id}/detail") public ScriptVO getDetailInfoById(@PathVariable @NotNull Long id) { return iScriptService.getDetailForClientById(id); diff --git a/src/main/java/club/joylink/rtss/controller/script/ScriptDraftController.java b/src/main/java/club/joylink/rtss/controller/script/ScriptDraftController.java index 96d8acda9..52d4e157a 100644 --- a/src/main/java/club/joylink/rtss/controller/script/ScriptDraftController.java +++ b/src/main/java/club/joylink/rtss/controller/script/ScriptDraftController.java @@ -1,21 +1,20 @@ package club.joylink.rtss.controller.script; -import club.joylink.rtss.vo.client.script.ScriptUpdateVO; import club.joylink.rtss.entity.ScriptDraftWithBLOBs; import club.joylink.rtss.services.IScriptDraftService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.PageQueryVO; import club.joylink.rtss.vo.client.PageVO; +import club.joylink.rtss.vo.client.script.ScriptUpdateVO; import club.joylink.rtss.vo.client.script.ScriptVO; import club.joylink.rtss.vo.client.validGroup.ScriptCreateCheck; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; -@Api(tags = { "草稿剧本接口" }) +/** + *草稿剧本接口 + */ @RestController @RequestMapping(path = "/api/script/draft") public class ScriptDraftController { @@ -23,60 +22,78 @@ public class ScriptDraftController { @Autowired private IScriptDraftService iScriptDraftService; - @ApiOperation(value = "分页查询地图下个人的剧本列表") + /** + *分页查询地图下个人的剧本列表 + */ @GetMapping(path = "/{mapId}/list") public PageVO listByMapIdOfUser(@PathVariable Long mapId, PageQueryVO queryVO, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { return iScriptDraftService.queryPagedScript(mapId, user, queryVO); } - @ApiOperation(value = "创建剧本") + /** + *创建剧本 + */ @PostMapping(path = "") public String createScript(@RequestBody @Validated(value = ScriptCreateCheck.class) ScriptVO scriptVO, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { return iScriptDraftService.createScript(scriptVO, user); } - @ApiOperation(value = "通过id查询剧本基础信息") + /** + *通过id查询剧本基础信息 + */ @GetMapping(path = "/{id}") public ScriptVO getBasicInfoById(@PathVariable Long id) { return iScriptDraftService.getBasicInfo(id); } - @ApiOperation(value = "修改剧本基本信息") + /** + *修改剧本基本信息 + */ @PutMapping(path = "/{id}") public void updateScriptBasicInfo(@PathVariable Long id, @RequestBody @Validated ScriptUpdateVO updateVO, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { iScriptDraftService.updateScriptInfo(id, updateVO, user); } - @ApiOperation(value = "根据id删除剧本") + /** + *根据id删除剧本 + */ @DeleteMapping(path = "/{id}") - public void deleteScriptById(@PathVariable Long id, @ApiIgnore @RequestAttribute UserVO user) { + public void deleteScriptById(@PathVariable Long id, @RequestAttribute AccountVO user) { iScriptDraftService.deleteScript(id, user); } - @ApiOperation(value = "剧本发布") + /** + *剧本发布 + */ @PutMapping(path = "/{id}/publish") - public void publish(@PathVariable Long id, @RequestBody String name, @RequestAttribute UserVO user){ + public void publish(@PathVariable Long id, @RequestBody String name, @RequestAttribute AccountVO user){ iScriptDraftService.publish(id, name, user); } - @ApiOperation(value = "剧本撤销发布") + /** + *剧本撤销发布 + */ @PutMapping(path = "/{id}/retract") - public void retract(@PathVariable Long id, @RequestAttribute UserVO user){ + public void retract(@PathVariable Long id, @RequestAttribute AccountVO user){ iScriptDraftService.retract(id, user); } - @ApiOperation("导出剧本数据") + /** + *导出剧本数据 + */ @GetMapping("/{id}/export") public ScriptDraftWithBLOBs export(@PathVariable Long id) { return iScriptDraftService.export(id); } - @ApiOperation("导入剧本数据") + /** + *导入剧本数据 + */ @PostMapping("/{mapId}/import") - public void importFromJson(@PathVariable Long mapId, String name, @RequestBody ScriptDraftWithBLOBs scriptDraft, @RequestAttribute UserVO user) { + public void importFromJson(@PathVariable Long mapId, String name, @RequestBody ScriptDraftWithBLOBs scriptDraft, @RequestAttribute AccountVO user) { iScriptDraftService.importFromJson(mapId, name, scriptDraft, user); } } diff --git a/src/main/java/club/joylink/rtss/controller/simulation/DrivingOperationController.java b/src/main/java/club/joylink/rtss/controller/simulation/DrivingOperationController.java index 355a97d20..cf7f7aef2 100644 --- a/src/main/java/club/joylink/rtss/controller/simulation/DrivingOperationController.java +++ b/src/main/java/club/joylink/rtss/controller/simulation/DrivingOperationController.java @@ -2,21 +2,18 @@ package club.joylink.rtss.controller.simulation; import club.joylink.rtss.simulation.cbtc.GroupSimulationService; import club.joylink.rtss.simulation.cbtc.Simulation; -import club.joylink.rtss.simulation.cbtc.constant.ControlGear; -import club.joylink.rtss.simulation.cbtc.constant.DriveMode; import club.joylink.rtss.simulation.cbtc.data.vo.VirtualRealityTrainVO; import club.joylink.rtss.simulation.cbtc.driving.DrivingService; -import club.joylink.rtss.vo.UserVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import club.joylink.rtss.vo.AccountVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import javax.validation.constraints.NotBlank; import java.util.List; -@Api(tags = { "驾驶操作接口" }) +/** + * 三维驾驶操作接口 + */ @RestController @RequestMapping("/simulation/driving") public class DrivingOperationController { @@ -27,17 +24,26 @@ public class DrivingOperationController { @Autowired private DrivingService drivingService; - @ApiOperation(value = "获取在运行的列车列表") + /** + * 获取在正线运行的列车列表 + * @param group + * @return + */ @GetMapping(path = "/{group}/trainList") public List getSimulationUsedTrainList(@PathVariable @NotBlank String group) { Simulation simulation = this.groupSimulationService.getSimulationByGroup(group); return this.drivingService.getOnlineTrainList(simulation); } - @ApiOperation(value = "绑定一辆列车") + /** + * 绑定一辆列车 + * @param group + * @param groupNumber + * @param user + */ @PostMapping("/{group}/bindTrain/{groupNumber}") public void bindTrain(@PathVariable String group, @PathVariable String groupNumber, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { Simulation simulation = this.groupSimulationService.getSimulationByGroup(group); this.drivingService.bindTrain(simulation, user.getId(), groupNumber); } diff --git a/src/main/java/club/joylink/rtss/controller/simulation/JointSimulationController.java b/src/main/java/club/joylink/rtss/controller/simulation/JointSimulationController.java index 358f27e97..6ca07d9ff 100644 --- a/src/main/java/club/joylink/rtss/controller/simulation/JointSimulationController.java +++ b/src/main/java/club/joylink/rtss/controller/simulation/JointSimulationController.java @@ -3,21 +3,20 @@ package club.joylink.rtss.controller.simulation; import club.joylink.rtss.controller.advice.AuthenticateInterceptor; import club.joylink.rtss.simulation.cbtc.GroupSimulationService; import club.joylink.rtss.simulation.cbtc.data.vo.SimulationVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.LoginUserInfoVO; -import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.simulationv1.MemberAddParamVO; import club.joylink.rtss.vo.client.simulationv1.PlayRoleConfigVO; import club.joylink.rtss.vo.client.simulationv1.SimulationMemberVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; -@Api(tags = "联合多人仿真接口") +/** + *联合多人仿真接口 + */ @RestController @RequestMapping("/api/jointSimulation") public class JointSimulationController { @@ -25,44 +24,56 @@ public class JointSimulationController { @Autowired private GroupSimulationService groupSimulationService; - @ApiOperation("生成综合仿真分享二维码") + /** + *生成综合仿真分享二维码 + */ @GetMapping("/{group}/qrCode") - public String generateQrCode(@PathVariable String group) { - return this.groupSimulationService.generateQrCode(group); + public String generateQrCode(@PathVariable String group, @RequestAttribute(value = AuthenticateInterceptor.LOGIN_INFO_KEY)LoginUserInfoVO loginInfo) { + return this.groupSimulationService.generateQrCode(group, loginInfo); } - @ApiOperation("获取权限成为仿真用户") + /** + *获取权限成为仿真用户 + */ @PostMapping("/{group}/permission") public SimulationVO getPermission(@PathVariable String group, - @ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) - UserVO user) { + @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) + AccountVO user) { return this.groupSimulationService.getPermission(group, user); } - @ApiOperation("将指定用户踢出仿真") + /** + *将指定用户踢出仿真 + */ @DeleteMapping("/{group}/kickOut") public void kickOut(@PathVariable String group, Long userId, - @ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) - UserVO user) { + @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) + AccountVO user) { this.groupSimulationService.kickOut(group, userId, user); } - @ApiOperation("获取用户所在的综合演练仿真") + /** + *获取用户所在的综合演练仿真 + */ @GetMapping("/list/containUser") - public List queryJointSimulationByUser(@ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) - LoginUserInfoVO loginUserInfoVO) { + public List queryJointSimulationByUser(@RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) + LoginUserInfoVO loginUserInfoVO) { return this.groupSimulationService.queryJointSimulationByUser(loginUserInfoVO); } - @ApiOperation("分配用户(取消)扮演角色") + /** + *分配用户(取消)扮演角色 + */ @PutMapping("/{group}/assignRoles") public void assignRoles(@PathVariable String group, @RequestBody @Validated List configVOList) { this.groupSimulationService.assignRoles(group, configVOList); } - @ApiOperation("添加新仿真角色成员") + /** + *添加新仿真角色成员 + */ @PostMapping("/{group}/member") public SimulationMemberVO addMember(@PathVariable String group, @RequestBody @Validated MemberAddParamVO param) { diff --git a/src/main/java/club/joylink/rtss/controller/simulation/SchedulingSimulationController.java b/src/main/java/club/joylink/rtss/controller/simulation/SchedulingSimulationController.java index 5fe535e21..7619e80c3 100644 --- a/src/main/java/club/joylink/rtss/controller/simulation/SchedulingSimulationController.java +++ b/src/main/java/club/joylink/rtss/controller/simulation/SchedulingSimulationController.java @@ -2,24 +2,23 @@ package club.joylink.rtss.controller.simulation; import club.joylink.rtss.controller.advice.AuthenticateInterceptor; import club.joylink.rtss.services.simulation.SchedulingService; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.LoginUserInfoVO; -import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.schedulingNew.SchedulingCheckResultNewVO; import club.joylink.rtss.vo.client.schedulingNew.SchedulingPlanDetailVO; import club.joylink.rtss.vo.client.schedulingNew.SchedulingPlanNewVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import javax.validation.constraints.NotBlank; import java.time.LocalDate; import java.util.List; -@Api(tags = { "新派班工作站仿真接口" }) +/** + *新派班工作站仿真接口 + */ @RestController @RequestMapping(path = "/api/v1/scheduling") public class SchedulingSimulationController { @@ -27,25 +26,32 @@ public class SchedulingSimulationController { @Autowired private SchedulingService schedulingService; + /** + * 获取当前派班计划 + */ @GetMapping(path = "/{group}/current") public SchedulingPlanNewVO getCurrentSchedulingPlan(@PathVariable String group) { return this.schedulingService.queryCurrentSchedulingPlan(group); } - @ApiOperation(value = "查询某天的派班计划") + /** + *查询某天的派班计划 + */ @GetMapping(path = "/{group}/day") public SchedulingPlanNewVO findSchedulingPlanOfDay(@PathVariable @NotBlank String group, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate day, - @ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) + @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO loginUserInfoVO) { return this.schedulingService.queryAndLoadSchedulingPlanOfDay(group, day, loginUserInfoVO); } - @ApiOperation(value = "生成某天的基础派班计划") + /** + *生成某天的基础派班计划 + */ @PostMapping(path = "/{group}/generate") public SchedulingPlanNewVO generateBaseSchedulingPlanOfDay(@PathVariable @NotBlank String group, - @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate day, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate day, + @RequestAttribute AccountVO user) { return this.schedulingService.generateSchedulingPlanOfDay(group, day, user); } @@ -56,24 +62,30 @@ public class SchedulingSimulationController { // return this.schedulingService.applyAndCheckConflict(group, editVOList); // } - @ApiOperation(value = "保存派班计划数据") + /** + *保存派班计划数据 + */ @PostMapping(path = "/{group}/save") public SchedulingCheckResultNewVO saveSchedulingPlan(@PathVariable @NotBlank String group, @Validated @RequestBody List editVOList, - @ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) - LoginUserInfoVO loginUserInfoVO) { + @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) + LoginUserInfoVO loginUserInfoVO) { return this.schedulingService.save(group, editVOList, loginUserInfoVO); } - @ApiOperation(value = "生成地图通用派班计划") + /** + *生成地图通用派班计划 + */ @PostMapping(path = "/generate/common") - public void generateMapCommonSchedulingPlan(Long mapId, @ApiIgnore @RequestAttribute UserVO user) { + public void generateMapCommonSchedulingPlan(Long mapId, @RequestAttribute AccountVO user) { this.schedulingService.generateCommonSchedulingPlan(mapId, user); } - @ApiOperation(value = "所有地图生成通用派班计划", hidden = true) + /** + *所有地图生成通用派班计划 + */ @PostMapping(path = "/generate/common/all") - public void generateAllMapCommonSchedulingPlan(@ApiIgnore @RequestAttribute UserVO user) { + public void generateAllMapCommonSchedulingPlan(@RequestAttribute AccountVO user) { this.schedulingService.generateAllMapCommonSchedulingPlan(user); } diff --git a/src/main/java/club/joylink/rtss/controller/simulation/ScriptSimulationController.java b/src/main/java/club/joylink/rtss/controller/simulation/ScriptSimulationController.java index 4be41190a..34d512130 100644 --- a/src/main/java/club/joylink/rtss/controller/simulation/ScriptSimulationController.java +++ b/src/main/java/club/joylink/rtss/controller/simulation/ScriptSimulationController.java @@ -1,28 +1,27 @@ package club.joylink.rtss.controller.simulation; -import club.joylink.rtss.simulation.cbtc.script.ScriptActionBO; -import club.joylink.rtss.simulation.cbtc.script.ScriptBO; import club.joylink.rtss.controller.advice.AuthenticateInterceptor; import club.joylink.rtss.services.script.IScriptSimulationService; +import club.joylink.rtss.simulation.cbtc.script.ScriptActionBO; +import club.joylink.rtss.simulation.cbtc.script.ScriptBO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.LoginUserInfoVO; -import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.script.MapLocationVO; import club.joylink.rtss.vo.client.script.ScriptActionUpdateVO; import club.joylink.rtss.vo.client.script.ScriptActionVO; import club.joylink.rtss.vo.client.script.ScriptVO; import club.joylink.rtss.vo.client.simulationv1.SimulationMemberVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.List; -@Api(tags = {"剧本仿真接口"}) +/** + *剧本仿真接口 + */ @RestController @RequestMapping("/api/scriptSimulation") public class ScriptSimulationController { @@ -30,39 +29,51 @@ public class ScriptSimulationController { @Autowired private IScriptSimulationService iScriptSimulationService; - @ApiOperation(value = "开始剧本编制仿真") + /** + *开始剧本编制仿真 + */ @GetMapping("/{scriptId}/scriptWrite") public String scriptWriteSimulation(@PathVariable @NotNull Long scriptId, - @ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) + @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO userLoginInfo) { return this.iScriptSimulationService.scriptWriteSimulation(scriptId, userLoginInfo); } - @ApiOperation(value = "获取仿真所有出演成员") + /** + *获取仿真所有出演成员 + */ @GetMapping("/{group}/allPlayer") public List getAllPlayer(@PathVariable String group) { return iScriptSimulationService.getAllPlayer(group); } - @ApiOperation("获取剧本所有选取过的成员") + /** + *获取剧本所有选取过的成员 + */ @GetMapping("/{group}/allSelectedMembers") public List getAllSelectedMembers(@PathVariable String group) { return iScriptSimulationService.getAllSelectedMembers(group); } - @ApiOperation(value = "获取剧本所有动作") + /** + *获取剧本所有动作 + */ @GetMapping("/{group}/allAction") public List getAllAction(@PathVariable @NotBlank String group) { return iScriptSimulationService.getAllAction(group); } - @ApiOperation("修改剧本会话动作") + /** + *修改剧本会话动作 + */ @PutMapping("/{group}/action/update") public void updateAction(@PathVariable @NotBlank String group, @RequestBody @NotNull @Validated ScriptActionUpdateVO updateVO) { iScriptSimulationService.updateAction(group, updateVO); } - @ApiOperation("删除剧本会话动作") + /** + *删除剧本会话动作 + */ @DeleteMapping("/{group}/{actionId}/delete") public void deleteAction(@PathVariable String group, @PathVariable String actionId) { iScriptSimulationService.deleteAction(group, actionId); @@ -74,101 +85,133 @@ public class ScriptSimulationController { // return iScriptSimulationService.getCondition(group, actionId); // } - @ApiOperation("更新触发条件") + /** + *更新触发条件 + */ @PutMapping("/{group}/{actionId}/updateCondition") public void updateCondition(@PathVariable String group, @PathVariable String actionId, @RequestBody ScriptActionBO.Condition condition) { iScriptSimulationService.updateCondition(group, actionId, condition); } - @ApiOperation(value = "更新位置") + /** + *更新位置 + */ @PutMapping("/{group}/mapLocation") public void updateMapLocation(@PathVariable String group, @RequestBody MapLocationVO locationVO) { iScriptSimulationService.updateMapLocation(group, locationVO); } - @ApiOperation(value = "保存背景") + /** + *保存背景 + */ @PutMapping("/{group}/saveScenes") public void saveScenes(@PathVariable @NotBlank String group) { iScriptSimulationService.saveBgScenes(group); } - @ApiOperation("开始替换背景") + /** + *开始替换背景 + */ @PutMapping("/{group}/replace/start") public void replaceStart(@PathVariable String group) { iScriptSimulationService.replaceStart(group); } - @ApiOperation("替换背景") + /** + *替换背景 + */ @PutMapping("/{group}/replace/confirm") public void replaceBgScenes(@PathVariable String group) { iScriptSimulationService.replaceBgScenes(group); } - @ApiOperation("背景替换取消") + /** + *背景替换取消 + */ @PutMapping("/{group}/replace/cancel") public void replaceEnd(@PathVariable String group) { iScriptSimulationService.replaceEnd(group); } - @ApiOperation(value = "重置剧本") + /** + *重置剧本 + */ @PutMapping("/{group}/reset") - public void reset(@PathVariable @NotBlank String group, @ApiIgnore @RequestAttribute UserVO user) { + public void reset(@PathVariable @NotBlank String group, @RequestAttribute AccountVO user) { iScriptSimulationService.reset(group, user); } - @ApiOperation(value = "保存数据") + /** + *保存数据 + */ @PutMapping("/{group}/saveData") public void saveData(@PathVariable String group) { iScriptSimulationService.saveData(group); } - @ApiOperation("切换扮演的出演成员") + /** + *切换扮演的出演成员 + */ @PutMapping("/{group}/{memberId}/switch") - public void switchPlayer(@PathVariable String group, @PathVariable String memberId, @ApiIgnore @RequestAttribute UserVO user) { + public void switchPlayer(@PathVariable String group, @PathVariable String memberId, @RequestAttribute AccountVO user) { iScriptSimulationService.switchPlayer(group, memberId, user); } //----------- 剧本运行相关 ----------- - @ApiOperation("加载已发布的剧本到仿真中") + /** + *加载已发布的剧本到仿真中 + */ @PutMapping("/{group}/load/script/{scriptId}") public void loadScript(@PathVariable String group, @PathVariable Long scriptId) { iScriptSimulationService.loadScript(group, scriptId); } - @ApiOperation(value = "预览剧本") + /** + *预览剧本 + */ @GetMapping("/{scriptId}/preview") - public String preview(@PathVariable Long scriptId, @ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO loginUserInfoVO) { + public String preview(@PathVariable Long scriptId, @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO loginUserInfoVO) { return iScriptSimulationService.preview(scriptId, loginUserInfoVO); } - @ApiOperation("选择角色并开始剧本演出") + /** + *选择角色并开始剧本演出 + */ @PutMapping("/{group}/chooseMemberAndStart") - public void chooseMemberAndStartScript(@PathVariable String group, String memberId, ScriptBO.Mode mode, @RequestAttribute UserVO user) { + public void chooseMemberAndStartScript(@PathVariable String group, String memberId, ScriptBO.Mode mode, @RequestAttribute AccountVO user) { iScriptSimulationService.chooseMemberAndStartScript(group, memberId, mode, user); } - @ApiOperation("结束剧本演出") + /** + *结束剧本演出 + */ @GetMapping("/{group}/finish") public Integer finishScript(@PathVariable String group) { return iScriptSimulationService.finishScript(group); } - @ApiOperation(value = "获取仿真中加载的剧本详情") + /** + *获取仿真中加载的剧本详情 + */ @GetMapping("/{group}/scriptDetail") public ScriptVO getScriptDetail(@PathVariable String group) { return iScriptSimulationService.getScriptDetail(group); } - @ApiOperation("重新预览剧本") + /** + *重新预览剧本 + */ @PutMapping("/{group}/rePreview") - public void rePreview(@PathVariable String group, @RequestAttribute UserVO user) { + public void rePreview(@PathVariable String group, @RequestAttribute AccountVO user) { iScriptSimulationService.rePreview(group, user); } - @ApiOperation("托管驾驶") + /** + *托管驾驶 + */ @PutMapping("/{group}/trust") - public void trust(@PathVariable String group, @ApiIgnore @RequestAttribute UserVO user) { + public void trust(@PathVariable String group, @RequestAttribute AccountVO user) { iScriptSimulationService.trust(group, user); } } diff --git a/src/main/java/club/joylink/rtss/controller/simulation/SimulationConversationController.java b/src/main/java/club/joylink/rtss/controller/simulation/SimulationConversationController.java index b398c4032..2214a52e1 100644 --- a/src/main/java/club/joylink/rtss/controller/simulation/SimulationConversationController.java +++ b/src/main/java/club/joylink/rtss/controller/simulation/SimulationConversationController.java @@ -1,21 +1,20 @@ package club.joylink.rtss.controller.simulation; +import club.joylink.rtss.controller.advice.AuthenticateInterceptor; import club.joylink.rtss.simulation.cbtc.conversation.CommunicationObject; import club.joylink.rtss.simulation.cbtc.conversation.ConversationManagerService; import club.joylink.rtss.simulation.cbtc.conversation.ConversationText; import club.joylink.rtss.simulation.cbtc.data.vo.ConversationVO; -import club.joylink.rtss.controller.advice.AuthenticateInterceptor; -import club.joylink.rtss.vo.UserVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import club.joylink.rtss.vo.AccountVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; -@Api("仿真会话接口") +/** + *仿真会话接口 + */ @RestController @RequestMapping("/api/simulation/{group}/conversation") public class SimulationConversationController { @@ -23,14 +22,18 @@ public class SimulationConversationController { @Autowired private ConversationManagerService conversationManagerService; - @ApiOperation("根据会话id获取仿真会话") + /** + *根据会话id获取仿真会话 + */ @GetMapping("/{id}") public ConversationVO getConversation(@PathVariable String group, @PathVariable String id) { return this.conversationManagerService.getConversationById(group, id); } - @ApiOperation("获取所有会话") + /** + *获取所有会话 + */ @GetMapping("/listAll") public List getAllConversations(@PathVariable String group) { return this.conversationManagerService.getAllConversations(group); @@ -45,45 +48,55 @@ public class SimulationConversationController { // return this.conversationManagerService.createConversation(group, userVO, memberIdList); // } - @ApiOperation("发起会话") + /** + *发起会话 + */ @PostMapping("") public ConversationVO startConversation(@PathVariable String group, - @ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) UserVO userVO, + @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) AccountVO accountVO, CommunicationObject object, @RequestBody List memberIds) { - return this.conversationManagerService.createConversation(group, userVO, object, memberIds); + return this.conversationManagerService.createConversation(group, accountVO, object, memberIds); } - @ApiOperation("成员接受仿真会话邀请") + /** + *成员接受仿真会话邀请 + */ @PostMapping("/{id}/connect") public ConversationVO acceptConversationInvite(@PathVariable String group, @PathVariable String id, - @ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) - UserVO userVO) { - return this.conversationManagerService.connect2Conversation(group, userVO, id); + @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) + AccountVO accountVO) { + return this.conversationManagerService.connect2Conversation(group, accountVO, id); } - @ApiOperation("结束会话") + /** + *结束会话 + */ @PutMapping("/{id}/over") public void overConversation(@PathVariable String group, @PathVariable String id, - @ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) - UserVO userVO) { - this.conversationManagerService.exitConversation(group, id, userVO); + @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) + AccountVO accountVO) { + this.conversationManagerService.exitConversation(group, id, accountVO); } - @ApiOperation("发送会话消息（语音输入）") + /** + *发送会话消息（语音输入） + */ @PostMapping("/{id}/chat") public void chat(@PathVariable String group, @PathVariable String id, MultipartFile file, - @ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) - UserVO userVO) { - this.conversationManagerService.chat(group, id, userVO, file); + @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) + AccountVO accountVO) { + this.conversationManagerService.chat(group, id, accountVO, file); } - @ApiOperation("发送会话消息（文字输入）") + /** + *发送会话消息（文字输入） + */ @PostMapping("/{id}/chat/text") - public void textChat(@PathVariable String group, @PathVariable String id, @RequestBody ConversationText text, @RequestAttribute UserVO user) { + public void textChat(@PathVariable String group, @PathVariable String id, @RequestBody ConversationText text, @RequestAttribute AccountVO user) { this.conversationManagerService.textChat(group, id, text, user); } diff --git a/src/main/java/club/joylink/rtss/controller/simulation/SimulationManageController.java b/src/main/java/club/joylink/rtss/controller/simulation/SimulationManageController.java index fba2182a8..5711aa6eb 100644 --- a/src/main/java/club/joylink/rtss/controller/simulation/SimulationManageController.java +++ b/src/main/java/club/joylink/rtss/controller/simulation/SimulationManageController.java @@ -1,17 +1,18 @@ package club.joylink.rtss.controller.simulation; -import club.joylink.rtss.simulation.cbtc.data.vo.SimulationVO; +import club.joylink.rtss.constants.RoleEnum; +import club.joylink.rtss.controller.advice.Role; import club.joylink.rtss.services.simulation.SimulationManageService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.simulation.cbtc.data.vo.SimulationVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.simulationv1.ExistSimulationQueryVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; -@Api(tags = { "仿真管理接口" }) +/** + * 仿真管理接口 + */ @RestController @RequestMapping("/manage/simulation") public class SimulationManageController { @@ -19,22 +20,43 @@ public class SimulationManageController { @Autowired private SimulationManageService simulationManageService; - @ApiOperation(value = "分页查询存在的仿真数据") + /** + * 分页查询存在的仿真数据 + * @param queryVO + * @return + */ @GetMapping("/exists") public PageVO pagingQueryExistSimulations(ExistSimulationQueryVO queryVO) { return this.simulationManageService.pagingQueryExistSimulations(queryVO); } - @ApiOperation(value = "根据仿真group获取仿真基础信息") + /** + * 根据仿真group获取仿真基础信息 + * @param group + * @return + */ @GetMapping("/{group}") public SimulationVO getSimulationBasicInfo(@PathVariable String group) { return this.simulationManageService.getSimulationBasicInfo(group); } - @ApiOperation(value = "销毁仿真") + /** + * 销毁仿真 + * @param group + * @param user + */ @DeleteMapping("/{group}") - public void destroySimulation(@PathVariable String group, @ApiIgnore @RequestAttribute UserVO user) { + public void destroySimulation(@PathVariable String group, @RequestAttribute AccountVO user) { this.simulationManageService.destroySimulation(group, user); } + /** + * 压力测试（非业务接口） + */ + @Role(RoleEnum.SuperAdmin) + @PostMapping("/stressTest/{mapId}") + public int stressTest(@PathVariable Long mapId, @RequestAttribute AccountVO user) { + return this.simulationManageService.stressTest(mapId); + } + } diff --git a/src/main/java/club/joylink/rtss/controller/simulation/SimulationRealDeviceController.java b/src/main/java/club/joylink/rtss/controller/simulation/SimulationRealDeviceController.java index f40018210..15782142f 100644 --- a/src/main/java/club/joylink/rtss/controller/simulation/SimulationRealDeviceController.java +++ b/src/main/java/club/joylink/rtss/controller/simulation/SimulationRealDeviceController.java @@ -2,23 +2,14 @@ package club.joylink.rtss.controller.simulation; import club.joylink.rtss.simulation.cbtc.GroupSimulationService; import club.joylink.rtss.simulation.cbtc.data.vo.RealDeviceVO; -import club.joylink.rtss.simulation.cbtc.data.vo.SimulationVO; -import club.joylink.rtss.controller.advice.AuthenticateInterceptor; -import club.joylink.rtss.vo.LoginUserInfoVO; -import club.joylink.rtss.vo.client.simulationv1.MemberAddParamVO; -import club.joylink.rtss.vo.client.simulationv1.PlayRoleConfigVO; -import club.joylink.rtss.vo.client.simulationv1.SimulationMemberVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; -@Api(tags = "仿真真实设备接口") +/** + * 仿真真实设备接口 + */ @RestController @RequestMapping("/api/simulation/{group}/realDevice") public class SimulationRealDeviceController { @@ -26,24 +17,37 @@ public class SimulationRealDeviceController { @Autowired private GroupSimulationService groupSimulationService; - @ApiOperation("获取仿真全部真实设备") + /** + * 获取仿真全部真实设备 + * @param group + * @return + */ @GetMapping("/list") public List getAllRealDevices(@PathVariable String group) { return this.groupSimulationService.getRealDeviceList(group); } - @ApiOperation("连接仿真设备和真实设备") + /** + * 连接仿真设备和真实设备 + * @param group + * @param id + * @param sdCode + */ @PostMapping("/{id}/connect/{sdCode}") public void connect(@PathVariable String group, - @ApiParam("项目设备id") @PathVariable Long id, - @ApiParam("仿真设备编码") @PathVariable String sdCode) { + @PathVariable Long id, + @PathVariable String sdCode) { this.groupSimulationService.connectDevice(group, sdCode, id); } - @ApiOperation("断开仿真设备和真实设备的连接") + /** + * 断开仿真设备和真实设备的连接 + * @param group + * @param id 项目设备id + */ @PutMapping("/{id}/disconnect") public void disconnect(@PathVariable String group, - @ApiParam("项目设备id") @PathVariable Long id) { + @PathVariable Long id) { this.groupSimulationService.disconnectDevice(group, id); } diff --git a/src/main/java/club/joylink/rtss/controller/simulation/SimulationV1Controller.java b/src/main/java/club/joylink/rtss/controller/simulation/SimulationV1Controller.java index 3d20f84d3..1a8ccedba 100644 --- a/src/main/java/club/joylink/rtss/controller/simulation/SimulationV1Controller.java +++ b/src/main/java/club/joylink/rtss/controller/simulation/SimulationV1Controller.java @@ -3,6 +3,7 @@ package club.joylink.rtss.controller.simulation; import club.joylink.rtss.controller.advice.AuthenticateInterceptor; import club.joylink.rtss.exception.BusinessExceptionAssertEnum; import club.joylink.rtss.services.IVirtualRealityIbpService; +import club.joylink.rtss.services.psl.IVirtualRealityPslService; import club.joylink.rtss.services.simulation.SimulationSupportService; import club.joylink.rtss.simulation.cbtc.ATS.data.AtsAlarm; import club.joylink.rtss.simulation.cbtc.ATS.data.SimulationLog; @@ -12,29 +13,29 @@ import club.joylink.rtss.simulation.cbtc.command.CommandInitiateVO; import club.joylink.rtss.simulation.cbtc.communication.vo.fault.DeviceFaultInfo; import club.joylink.rtss.simulation.cbtc.data.status.IbpStatus; import club.joylink.rtss.simulation.cbtc.data.vo.SimulationVO; -import club.joylink.rtss.simulation.cbtc.data.vr.VirtualRealityIbp; +import club.joylink.rtss.simulation.cbtc.data.vr.VirtualRealityPsl; import club.joylink.rtss.simulation.cbtc.member.SimulationMember; import club.joylink.rtss.simulation.cbtc.script.ScriptBO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.LoginUserInfoVO; -import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.fault.FaultRuleVO; +import club.joylink.rtss.vo.client.iscs.systemRes.IscsSystemResourcesQueryVO; +import club.joylink.rtss.vo.client.iscs.systemRes.IscsSystemResourcesVO; import club.joylink.rtss.vo.client.map.DestinationCodeVO; -import club.joylink.rtss.vo.client.map.MapVO; -import club.joylink.rtss.vo.client.map.newmap.MapStationNewVO; +import club.joylink.rtss.vo.client.psl.PslStatus; import club.joylink.rtss.vo.client.runplan.PlanTripNumberVO; import club.joylink.rtss.vo.client.runplan.RunPlanEChartsDataVO; import club.joylink.rtss.vo.client.simulationv1.RunAsPlanParam; import club.joylink.rtss.vo.client.simulationv1.SimulationLogPagedQueryVO; import club.joylink.rtss.vo.client.simulationv1.SimulationMemberVO; import club.joylink.rtss.vo.client.simulationv1.SimulationUserVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import club.joylink.rtss.vo.map.MapVO; +import club.joylink.rtss.vo.map.graph.MapStationNewVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -45,7 +46,9 @@ import java.util.Map; import java.util.Objects; import java.util.Set; -@Api(tags = {"新仿真接口"}) +/** + *新仿真接口 + */ @RestController @RequestMapping("/simulation") public class SimulationV1Controller { @@ -59,121 +62,160 @@ public class SimulationV1Controller { @Autowired private SimulationSupportService simulationSupportService; - @ApiOperation(value = "根据产品类型创建仿真") + @Autowired + private IVirtualRealityPslService iVirtualRealityPslService; + + /** + *根据产品类型创建仿真 + */ @GetMapping("") public String simulation(Long mapId, String prdType, - @ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) + @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO loginUserInfoVO) { String simulation = this.groupSimulationService.simulation(mapId, prdType, loginUserInfoVO); return simulation; } - @ApiOperation(value = "创建实训仿真") + /** + *创建实训仿真 + */ @GetMapping(path = "/training/{trainingId}") public String trainingSimulation(@PathVariable Long trainingId, - @ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) + @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO loginUserInfoVO) { return this.groupSimulationService.trainingSimulation(trainingId, loginUserInfoVO); } - @ApiOperation(value = "创建考试仿真") + /** + *创建考试仿真 + */ @GetMapping(path = "/exam/{examId}") public String examSimulate(@PathVariable Long examId, - @ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) + @RequestAttribute(name = AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO loginUserInfoVO) { return this.groupSimulationService.examSimulation(examId, loginUserInfoVO); } - @ApiOperation(value = "获取客户端已经进入仿真的用户仿真所在group") + /** + *获取客户端已经进入仿真的用户仿真所在group + */ @GetMapping(path = "/running") - public List getRunningSimulationBySubscribeUser(@ApiIgnore @RequestAttribute UserVO user) { + public List getRunningSimulationBySubscribeUser(@RequestAttribute AccountVO user) { return this.groupSimulationService.getUserRunningSimulationGroups(user); } - @ApiOperation(value = "根据仿真group获取仿真基础信息") + /** + *根据仿真group获取仿真基础信息 + */ @GetMapping("/{group}") public SimulationVO getSimulationBasicInfo(@PathVariable String group) { return this.groupSimulationService.getSimulationBasicInfo(group); } - @ApiOperation(value = "获取用户在仿真中的用户信息") + /** + *获取用户在仿真中的用户信息 + */ @GetMapping("/{group}/simulationUser") public SimulationUserVO getSimulationUserInfo(@PathVariable String group, - @ApiIgnore @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) - UserVO userVO) { - return this.groupSimulationService.getSimulationUserInfo(group, userVO); + @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY) + AccountVO accountVO) { + return this.groupSimulationService.getSimulationUserInfo(group, accountVO); } - @ApiOperation("获取所有仿真用户") + /** + *获取所有仿真用户 + */ @GetMapping("/{group}/simulationUsers") public List queryAllSimulationUsers(@PathVariable String group) { return this.groupSimulationService.queryAllSimulationUsers(group); } - @ApiOperation(value = "根据仿真group获取仿真地图数据") + /** + *根据仿真group获取仿真地图数据 + */ @GetMapping("/{group}/mapData") public MapVO getSimulationMapData(@PathVariable String group) { return this.groupSimulationService.getSimulationMapData(group); } - @ApiOperation(value = "根据group获取排序的车站列表（包含车辆段/停车场）") + /** + *根据group获取排序的车站列表（包含车辆段/停车场） + */ @GetMapping("/{group}/stationWithDepot") public List getSortedStationListWithDepot(@PathVariable String group) { return this.groupSimulationService.getSortedStationListWithDepot(group); } - @ApiOperation(value = "加载指定运行计划到仿真中") + /** + *加载指定运行计划到仿真中 + */ @PutMapping("/{group}/load/runPlan/{templateId}") public void loadRunPlan(@PathVariable String group, @PathVariable Long templateId) { this.groupSimulationService.loadRunPlan(group, templateId); } - @ApiOperation(value = "根据仿真group获取仿真运行图") + /** + *根据仿真group获取仿真运行图 + */ @GetMapping("/{group}/runPlan") public RunPlanEChartsDataVO getSimulationRunPlan(@PathVariable String group) { return this.groupSimulationService.getSimulationRunPlan(group); } - @ApiOperation(value = "获取仿真运行图车次号列表") + /** + *获取仿真运行图车次号列表 + */ @GetMapping("/{group}/tripNumbers") public List getSimulationRunPlanTripNumbers(@PathVariable String group) { return this.groupSimulationService.getSimulationRunPlanTripNumbers(group); } - @ApiOperation(value = "根据车次号获取服务号") + /** + *根据车次号获取服务号 + */ @GetMapping("/{group}/serviceNumber") public List getServiceNumberByTripNumber(@PathVariable String group, String tripNumber) { return this.groupSimulationService.getServiceNumberByTripNumber(group, tripNumber); } - @ApiOperation(value = "根据车次号获取计划车次信息") + /** + *根据车次号获取计划车次信息 + */ @GetMapping("/{group}/planTripInfo") public PlanTripNumberVO getPlanTripByTripNumber(@PathVariable String group, String tripNumber) { return this.groupSimulationService.getPlanTripByTripNumber(group, tripNumber); } - @ApiOperation(value = "根据服务号和车次号获取计划车次信息") + /** + *根据服务号和车次号获取计划车次信息 + */ @GetMapping("/{group}/planTripInfoBySt") public PlanTripNumberVO planTripInfoBySt(@PathVariable String group, String serviceNumber, String tripNumber) { return this.groupSimulationService.planTripInfoByServiceAndTripNumber(group, serviceNumber, tripNumber); } - @ApiOperation(value = "仿真操作") + /** + *仿真操作 + */ @PostMapping("/{group}/operate/{type}") public Object operate(@PathVariable @NotBlank String group, @PathVariable @NotNull String type, - @RequestBody Map param, @ApiIgnore @RequestAttribute UserVO user) { + @RequestBody Map param, @RequestAttribute AccountVO user) { return this.groupSimulationService.operate(group, type, param, user); } - @ApiOperation("仿真指令") + /** + *仿真指令 + */ @PostMapping("/{group}/command") - public void command(@PathVariable String group, @RequestBody @Validated CommandInitiateVO initiateVO, @ApiIgnore @RequestAttribute UserVO user) { + public void command(@PathVariable String group, @RequestBody @Validated CommandInitiateVO initiateVO, @RequestAttribute AccountVO user) { Simulation simulation = this.groupSimulationService.getSimulationByGroup(group); - SimulationMember member = simulation.getMemberByUserId(user.getId()); + SimulationMember member = simulation.getSimulationMemberByUserId(user.getId()); this.groupSimulationService.command(simulation, initiateVO, member); } - @ApiOperation(value = "根据计划时间获取此时间点可以加载的最大列车数量") + /** + *根据计划时间获取此时间点可以加载的最大列车数量 + */ @GetMapping("/{group}/loadTrainNumber") public int getLoadTrainNumber(@PathVariable String group, @DateTimeFormat(pattern = "HH:mm:ss") LocalTime time) { @@ -181,66 +223,86 @@ public class SimulationV1Controller { return this.groupSimulationService.getGivenTimeCouldLoadedTrainNumber(group, time); } - @ApiOperation(value = "按计划行车") + /** + *按计划行车 + */ @PostMapping("/{group}/ranAsPlan") public void runAsPlan(@PathVariable String group, @RequestBody @Validated RunAsPlanParam param) { this.groupSimulationService.runAsPlan(group, param); } - @ApiOperation(value = "退出计划") + /** + *退出计划 + */ @PostMapping("/{group}/planOver") public void planOver(@PathVariable String group) { this.groupSimulationService.planOver(group); } - @ApiOperation(value = "清除仿真") + /** + *清除仿真 + */ @DeleteMapping("/{group}/clear") - public void clearSimulation(@PathVariable String group, @ApiIgnore @RequestAttribute UserVO user) { + public void clearSimulation(@PathVariable String group, @RequestAttribute AccountVO user) { this.groupSimulationService.clearSimulation(group, user); } - @ApiOperation(value = "加载剧本并扮演成员（已发布的剧本）") + /** + *加载剧本并扮演成员（已发布的剧本） + */ @PutMapping(path = "/{group}/script/{scriptId}") public void loadScriptAndPlayMember(@PathVariable String group, @PathVariable Long scriptId, String memberId, ScriptBO.Mode mode, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { this.groupSimulationService.loadScriptAndPlayMember(group, scriptId, memberId, mode, user); } - @ApiOperation(value = "退出剧本") + /** + *退出剧本 + */ @PutMapping(path = "/{group}/exitScript") - public void exitScript(@PathVariable @NotBlank String group, @ApiIgnore @RequestAttribute UserVO user) { + public void exitScript(@PathVariable @NotBlank String group, @RequestAttribute AccountVO user) { this.groupSimulationService.exitScript(group, user); } - @ApiOperation(value = "获取所有仿真成员列表") + /** + *获取所有仿真成员列表 + */ @GetMapping(path = "/{group}/members") public List getSimulationMembers(@PathVariable @NotBlank String group) { return this.groupSimulationService.getSimulationMembers(group); } - @ApiOperation(value = "仿真暂停") + /** + *仿真暂停 + */ @PutMapping(path = "/{group}/pause") public void pause(@PathVariable String group) { groupSimulationService.pauseSimulation(group); } - @ApiOperation(value = "仿真恢复运行") + /** + *仿真恢复运行 + */ @PutMapping(path = "/{group}/resume") public void resume(@PathVariable String group) { groupSimulationService.resumeSimulation(group); } - @ApiOperation(value = "获取仿真设备故障列表") + /** + *获取仿真设备故障列表 + */ @GetMapping(path = "/{group}/deviceFaultInfos") public List getSimulationDeviceFaultInfoList( @PathVariable @NotBlank String group) { return this.groupSimulationService.getSimulationDeviceFaultInfoList(group); } - @ApiOperation(value = "取消自动故障") + /** + *取消自动故障 + */ @PutMapping(path = "/{group}/faultMode/{id}") public void setFaultMode(@PathVariable @NotBlank String group, @PathVariable(required = false) Integer id) { if (Objects.isNull(id)) { @@ -250,37 +312,57 @@ public class SimulationV1Controller { this.groupSimulationService.cancelAutoFault(group, id); } - @ApiOperation(value = "设置自动故障") + /** + *设置自动故障 + */ @PostMapping(path = "/{group}/faultMode") public Integer setFaultMode(@PathVariable @NotBlank String group, @RequestBody FaultRuleVO ruleVO) { return this.groupSimulationService.setFaultMode(group, ruleVO); } - @ApiOperation(value = "查询已设置所有的自动触发故障") + /** + *查询已设置所有的自动触发故障 + */ @GetMapping(path = "/{group}/faultMode/faultRule") public Set getNotTriggerAutoFault(@PathVariable @NotBlank String group) { return this.groupSimulationService.getTriggerAutoFaults(group); } - @ApiOperation(value = "查询所有目的地码") + /** + *查询所有目的地码 + */ @GetMapping("/{group}/destinationCode/list") public List getAllDestinationCode(@PathVariable String group) { return this.groupSimulationService.getAllDestinationCode(group); } - @ApiOperation("获取IBP盘状态") + /** + *获取IBP盘状态 + */ @GetMapping("/{group}/{stationCode}/ibp/status") public IbpStatus getIbpStatus(@PathVariable String group, @PathVariable String stationCode) { return iVirtualRealityIBPService.getIbpStatus(group, stationCode); } - @ApiOperation("按下IBP盘按钮") - @PutMapping("/{group}/ibp/{button}") - public void pressIbpButton(@PathVariable String group, String stationCode, @PathVariable VirtualRealityIbp.ButtonType button, String buttonCode) { - iVirtualRealityIBPService.pressTheButton(group, stationCode, button, buttonCode); + /** + *按下IBP盘按钮 + */ + @PutMapping("/{group}/ibp/press/{stationCode}/{buttonCode}") + public void pressIbpButton(@PathVariable String group, @PathVariable String stationCode, @PathVariable String buttonCode) { + iVirtualRealityIBPService.pressTheButton(group, stationCode, buttonCode); } - @ApiOperation("查询报警列表") + /** + *松开IBP盘按钮 + */ + @PutMapping("/{group}/ibp/release/{stationCode}/{buttonCode}") + public void releaseIbpButton(@PathVariable String group, @PathVariable String stationCode, @PathVariable String buttonCode) { + iVirtualRealityIBPService.releaseIbpButton(group, stationCode, buttonCode); + } + + /** + *查询报警列表 + */ @GetMapping(path = "/{group}/alarm") public List listAlarm(@PathVariable String group, String level, @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime startTime, @@ -288,40 +370,79 @@ public class SimulationV1Controller { return groupSimulationService.listAlarm(group, level, startTime, endTime); } - @ApiOperation("仿真报警确认") + /** + *仿真报警确认 + */ @PutMapping(path = "/{group}/alarm/confirm") - public void AlarmConfirm(@PathVariable String group, @RequestBody List codes, @ApiIgnore @RequestAttribute UserVO user) { + public void AlarmConfirm(@PathVariable String group, @RequestBody List codes, @RequestAttribute AccountVO user) { groupSimulationService.alarmConfirm(group, codes, user); } - @ApiOperation("仿真客流数据切换") + /** + *仿真客流数据切换 + */ @PutMapping(path = "/{group}/passengerFlow/{passengerFlowId}") public void AlarmConfirm(@PathVariable String group, @PathVariable Long passengerFlowId) { groupSimulationService.changePassengerFlow(group, passengerFlowId); } - @ApiOperation("获取仿真日志") + /** + *获取仿真日志 + */ @GetMapping("/{group}/log") public PageVO getLog(@PathVariable String group, SimulationLogPagedQueryVO queryVO) { return groupSimulationService.getLog(group, queryVO); } /* ----------------------- 泰雷兹操作辅助接口 ----------------------- */ - @ApiOperation("查询进路路径") + /** + *查询进路路径 + */ @GetMapping("/{group}/querySectionPaths") public List> querySectionPaths(@PathVariable String group, String groupNumber, String standCode, String signalCode) { return simulationSupportService.queryRoutePaths(group, groupNumber, standCode, signalCode); } - @ApiOperation("查询列车或运行线经过的站台") + /** + *查询列车或运行线经过的站台 + */ @GetMapping("/{group}/queryStands/trainOrDestination") public List queryStandsThatTrainGoingThrough(@PathVariable String group, String groupNumber, String destinationCode) { return simulationSupportService.queryStandsThatTrainGoingThrough(group, groupNumber, destinationCode); } - @ApiOperation("查询为该列车已建立的进路") + /** + *查询为该列车已建立的进路 + */ @GetMapping("/{group}/queryEstablishedRoutes/{groupNumber}") public List queryEstablishedRoutes(@PathVariable String group, @PathVariable String groupNumber) { return simulationSupportService.queryEstablishedRoutes(group, groupNumber); } + + /* ----------------------- PSL盘接口 ----------------------- */ + /** + *获取PSL盘状态 + */ + @GetMapping("/{group}/{standCode}/psl/status") + public PslStatus getPslStatus(@PathVariable String group, @PathVariable String standCode) { + return iVirtualRealityPslService.getStatus(group, standCode); + } + + /** + *按下PSL盘按钮 + */ + @PutMapping("/{group}/{standCode}/psl/{button}") + public void pressPslButton(@PathVariable String group, @PathVariable String standCode, @PathVariable VirtualRealityPsl.Button button) { + iVirtualRealityPslService.pressTheButton(group, standCode, button); + } + + /* ----------------------- ISCS接口 ----------------------- */ + + /** + * 条件查询仿真中的ISCS系统资源 + */ + @GetMapping("/{group}/iscs/systemResources") + public List getAllIscsSystemResources(@PathVariable String group, IscsSystemResourcesQueryVO queryVO) { + return groupSimulationService.getAllIscsSystemResources(group, queryVO); + } } diff --git a/src/main/java/club/joylink/rtss/controller/simulation/rt/RtSimulationController.java b/src/main/java/club/joylink/rtss/controller/simulation/rt/RtSimulationController.java new file mode 100644 index 000000000..ddc465f21 --- /dev/null +++ b/src/main/java/club/joylink/rtss/controller/simulation/rt/RtSimulationController.java @@ -0,0 +1,52 @@ +package club.joylink.rtss.controller.simulation.rt; + +import club.joylink.rtss.constants.MapPrdTypeEnum; +import club.joylink.rtss.simulation.rt.RtSimulationService; +import club.joylink.rtss.simulation.rt.vo.RtSimulationInfoVO; +import club.joylink.rtss.vo.LoginUserInfoVO; +import club.joylink.rtss.vo.map.MapVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/rtSimulation") +public class RtSimulationController { + @Autowired + private RtSimulationService rtSimulationService; + + @PostMapping + public String create(Long mapId, String prdType, @RequestAttribute LoginUserInfoVO loginInfo) { + MapPrdTypeEnum prdTypeEnum = MapPrdTypeEnum.getMapPrdTypeEnumByCode(prdType); + return rtSimulationService.create(loginInfo.getAccountVO(), mapId, prdTypeEnum).getId(); + } + + /** + * 根据仿真group获取仿真基础信息 + * @param id + * @return + */ + @GetMapping("/{id}") + public RtSimulationInfoVO getSimulationBasicInfo(@PathVariable String id) { + return rtSimulationService.getBasicInfo(id); + } + + /** + * 根据仿真group获取仿真地图数据 + * @param id + * @return + */ + @GetMapping("/{id}/mapData") + public MapVO getSimulationMapData(@PathVariable String id) { + return rtSimulationService.getMapData(id); + } + + /** + * 退出计划 + * @param id + */ + @PostMapping("/{id}/planOver") + public void planOver(@PathVariable String id) { + this.rtSimulationService.init(id); + } + +} diff --git a/src/main/java/club/joylink/rtss/controller/statistics/StatisticsController.java b/src/main/java/club/joylink/rtss/controller/statistics/StatisticsController.java index 26e8ff456..95076b3d5 100644 --- a/src/main/java/club/joylink/rtss/controller/statistics/StatisticsController.java +++ b/src/main/java/club/joylink/rtss/controller/statistics/StatisticsController.java @@ -5,8 +5,6 @@ import club.joylink.rtss.vo.statistics.DailyLiveQuantityVO; import club.joylink.rtss.vo.statistics.DailyLiveStatisticsQueryVO; import club.joylink.rtss.vo.statistics.DailyLiveUserQuantityQueryVO; import club.joylink.rtss.vo.statistics.UserQuantityQueryVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -14,7 +12,9 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; -@Api(tags = {"信息统计接口"}) +/** + *信息统计接口 + */ @RestController @RequestMapping(path = "/api/statistics") public class StatisticsController { @@ -22,25 +22,33 @@ public class StatisticsController { @Autowired private StatisticsService statisticsService; - @ApiOperation("获取注册用户总数量") + /** + *获取注册用户总数量 + */ @GetMapping("/userQuantity") public Long getUserQuantity(UserQuantityQueryVO queryVO) { return this.statisticsService.getUserQuantity(queryVO); } - @ApiOperation("获取指定日期日活用户数量") + /** + *获取指定日期日活用户数量 + */ @GetMapping("/dailyLiveUserQuantity") public Long getDailyLiveUserQuantity(DailyLiveUserQuantityQueryVO queryVO) { return this.statisticsService.getDailyLiveUserQuantity(queryVO); } - @ApiOperation("获取日用户总数统计列表") + /** + *获取日用户总数统计列表 + */ @GetMapping("/dailyRegisterStatistics") public List getDailyUserQuantityStatistics(DailyLiveStatisticsQueryVO queryVO) { return this.statisticsService.getDailyUserQuantityStatistics(queryVO); } - @ApiOperation("获取日活用户统计列表") + /** + *获取日活用户统计列表 + */ @GetMapping("/dailyLiveStatistics") public List getDailyLiveStatistics(DailyLiveStatisticsQueryVO queryVO) { return this.statisticsService.getDailyLiveStatistics(queryVO); diff --git a/src/main/java/club/joylink/rtss/controller/test/ModbusTestController.java b/src/main/java/club/joylink/rtss/controller/test/ModbusTestController.java index 3d5719708..bc0297215 100644 --- a/src/main/java/club/joylink/rtss/controller/test/ModbusTestController.java +++ b/src/main/java/club/joylink/rtss/controller/test/ModbusTestController.java @@ -1,20 +1,16 @@ package club.joylink.rtss.controller.test; +import club.joylink.rtss.controller.advice.Role; import club.joylink.rtss.simulation.cbtc.device.real.modbustcp.ModbusTcpTestService; import club.joylink.rtss.simulation.cbtc.device.real.modbustcp.PlcGatewayConnectManager; -import club.joylink.rtss.controller.advice.AuthenticateInterceptor; -import club.joylink.rtss.controller.advice.Role; -import club.joylink.rtss.vo.UserVO; +import io.netty.channel.Channel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import springfox.documentation.annotations.ApiIgnore; import static club.joylink.rtss.constants.RoleEnum.SuperAdmin; -@ApiIgnore @RestController @RequestMapping("/api/test/modbus") public class ModbusTestController { @@ -27,18 +23,26 @@ public class ModbusTestController { /** * 测试modbustcp写网关（使用功能码05：写单线圈） - * @param code - * @param addr - * @param val - * @param userVO - * @return */ @Role(SuperAdmin) @PostMapping("/writeCoil") public void modbusWriteSingleCoil(String code, - int addr, boolean val, - @RequestAttribute(name = AuthenticateInterceptor.LOGIN_USER_KEY)UserVO userVO) { + int addr, boolean val) { this.modbusTcpTestService.writeSingleCoil(this.plcGatewayConnectManager.getChannel(code), addr, val); } + @Role(SuperAdmin) + @PostMapping("/writeCoil/test") + public void modbusWriteSignalCoilTest() throws InterruptedException { + int start = 216; + Channel channel = this.plcGatewayConnectManager.getChannel("Test"); + this.modbusTcpTestService.writeSingleCoil(channel, start, true); + Thread.sleep(1000); + for (int i = start + 1; i < start + 24; i++) { + this.modbusTcpTestService.writeSingleCoil(channel, i, true); + this.modbusTcpTestService.writeSingleCoil(channel, i - 1, false); + Thread.sleep(1000); + } + this.modbusTcpTestService.writeSingleCoil(channel, start + 23, false); + } } diff --git a/src/main/java/club/joylink/rtss/controller/test/TestController.java b/src/main/java/club/joylink/rtss/controller/test/TestController.java new file mode 100644 index 000000000..882f78999 --- /dev/null +++ b/src/main/java/club/joylink/rtss/controller/test/TestController.java @@ -0,0 +1,22 @@ +package club.joylink.rtss.controller.test; + +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/test") +public class TestController { + + @PostMapping("/thirdsync/usr") + public void thirdSyncSimulationRecord(@RequestBody String json) { + System.out.println(json); + } + + @PostMapping("/thirdsync/uer") + public void thirdSyncExamRecord(@RequestBody String json) { + System.out.println(json); + } + +} diff --git a/src/main/java/club/joylink/rtss/controller/training/TrainingV1Controller.java b/src/main/java/club/joylink/rtss/controller/training/TrainingV1Controller.java index f76da4e34..240b3b8ac 100644 --- a/src/main/java/club/joylink/rtss/controller/training/TrainingV1Controller.java +++ b/src/main/java/club/joylink/rtss/controller/training/TrainingV1Controller.java @@ -1,11 +1,12 @@ package club.joylink.rtss.controller.training; import club.joylink.rtss.constants.RoleEnum; +import club.joylink.rtss.controller.advice.AuthenticateInterceptor; import club.joylink.rtss.controller.advice.Role; import club.joylink.rtss.services.training.GenerateTask; import club.joylink.rtss.services.training.ITrainingV1Service; import club.joylink.rtss.services.training.data.GenerateConfig; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.UserTrainingListVO; import club.joylink.rtss.vo.client.UserTrainingQueryVO; @@ -17,18 +18,17 @@ import club.joylink.rtss.vo.client.training.TrainingStepVO; import club.joylink.rtss.vo.client.validGroup.DraftTrainingCreateCheck; import club.joylink.rtss.vo.client.validGroup.DraftTrainingStepCheck; import club.joylink.rtss.vo.client.validGroup.GenerateConfigDeleteCheck; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import javax.validation.constraints.NotBlank; import java.util.Map; import java.util.Set; -@Api(tags = { "实训数据管理接口" }) +/** + *实训数据管理接口 + */ @RestController @RequestMapping("/api/v1/training") public class TrainingV1Controller { @@ -43,68 +43,83 @@ public class TrainingV1Controller { this.generateTask = generateTask; } - @ApiOperation(value = "创建实训基本信息") + /** + *创建实训基本信息 + */ @PostMapping(path = "") public String createTraining( @RequestBody @Validated(value = { DraftTrainingCreateCheck.class }) TrainingNewVO trainingVo, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { return this.iTrainingService.createTraining(trainingVo, user); } - @ApiOperation(value = "获取实训基本信息") + /** + *获取实训基本信息 + */ @GetMapping(path="/{id}") public TrainingNewVO getTraining(@PathVariable Long id) { return this.iTrainingService.getTrainingById(id); } - @ApiOperation(value = "更新实训基本信息") + /** + *更新实训基本信息 + */ @PutMapping(path = "/{id}") public void updateTraining(@PathVariable Long id, @RequestBody @Validated(value = { DraftTrainingCreateCheck.class }) TrainingNewVO trainingVo, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { this.iTrainingService.updateTraining(id, trainingVo, user); } - @ApiOperation(value = "获取实训明细") + /** + *获取实训明细 + */ @GetMapping(path = "/{id}/detail") public TrainingNewVO getTrainingDetail(@PathVariable Long id, String group) { return this.iTrainingService.getTrainingDetail(id, group); } - @ApiOperation(value = "保存实训明细") + /** + *保存实训明细 + */ @PostMapping(path = "/{id}/detailSave") public void saveTrainingDetail(@PathVariable Long id, String group) { this.iTrainingService.saveTrainingDetail(id, group); } - @ApiOperation(value = "保存实训步骤") + /** + *保存实训步骤 + */ @PostMapping(path = "/{id}/stepsSave") public void saveTrainingSteps(@PathVariable Long id, String group, @RequestBody @Validated(value = { DraftTrainingStepCheck.class }) TrainingNewVO trainingVo) { this.iTrainingService.saveTrainingSteps(id, group, trainingVo); } - @ApiOperation(value="实训开始") + /** + *实训开始 + */ @GetMapping(path="/{id}/start") - public void trainingStart(@PathVariable Long id, String group, String mode) { - this.iTrainingService.trainingStart(id, group, mode); + public void trainingStart(@PathVariable Long id, String group, String mode, + @RequestAttribute(AuthenticateInterceptor.LOGIN_USER_KEY) AccountVO user) { + this.iTrainingService.trainingStart(id, group, mode, user); } /** - * 实训操作下一步 - * @param step 步骤 + *实训操作下一步 */ - @ApiOperation(value="实训操作下一步") @PostMapping(path="/{id}/nextStep") public void nextStep(@PathVariable Long id, String group, @RequestBody TrainingStepVO step) { this.iTrainingService.nextStep(id, group, step); } - @ApiOperation(value="实训结束") + /** + *实训结束 + */ @GetMapping(path="/{lessonId}/{id}/end") public TrainingResultVO trainingEnd(@PathVariable Long lessonId, @PathVariable Long id, String group, @NotBlank String mode, @NotBlank String usedTime, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { return this.iTrainingService.trainingEnd(lessonId, id, group, mode, usedTime, user); } @@ -120,7 +135,9 @@ public class TrainingV1Controller { // iTrainingService.delTraining(trainingId, user); // } - @ApiOperation(value = "分页查询实训") + /** + *分页查询实训 + */ @GetMapping(path = "/pagedQuery") public PageVO pagedListGenerateTraining(TrainingQueryVO queryVO) { return this.iTrainingService.pagedQueryTrainings(queryVO); @@ -132,7 +149,9 @@ public class TrainingV1Controller { // this.generateTask.execute(config); // } - @ApiOperation(value = "一键生成地图实训，生成中返回true") + /** + *一键生成地图实训，生成中返回true + */ @PostMapping(path = "/generate/{mapId}") public boolean generateTrainings(@PathVariable Long mapId,boolean noCheck) { Set runningMapIds = this.generateTask.getRunningmapIds(); @@ -150,54 +169,71 @@ public class TrainingV1Controller { } - @ApiOperation(value = "删除自动生成实训") + /** + *删除自动生成实训 + */ @DeleteMapping(path = "/generate") public void deleteGenerateTraining(@Validated(GenerateConfigDeleteCheck.class) GenerateConfig config) { this.generateTask.delete(config); } - @ApiOperation(value = "按操作类型批量更新自动生成实训的用时/说明") + /** + *按操作类型批量更新自动生成实训的用时/说明 + */ @PutMapping(path = "/batchUpdateGenerate") public void batchUpdateGenerateTraining(@RequestBody GenerateConfig config) { this.generateTask.batchUpdateGenerateTraining(config); } - @ApiOperation(value = "分页查询用户实训数据") + /** + *分页查询用户实训数据 + */ @GetMapping(path = "/list") public PageVO queryPagedUserTraining(UserTrainingQueryVO queryVO) { return this.iTrainingService.queryPagedUserTraining(queryVO); } - @ApiOperation(value = "添加用户实训数据") + /** + *添加用户实训数据 + */ @PostMapping(path = "/userTraining") public void updateUserTraining(@RequestBody @Validated UserTrainingVO userTrainingVO, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { this.iTrainingService.addUserTraining(userTrainingVO, user); } - @ApiOperation(value = "更新用户实训数据") + /** + *更新用户实训数据 + */ @PutMapping(path = "/userTraining/{id}") @Role({RoleEnum.SuperAdmin,RoleEnum.Admin}) public void updateUserTraining(@PathVariable Long id, @RequestBody UserTrainingVO userTrainingVO, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { this.iTrainingService.updateUserTraining(id, userTrainingVO, user); } - @ApiOperation(value = "删除用户实训数据") + /** + *删除用户实训数据 + */ @DeleteMapping(path = "/userTraining/{id}") @Role({RoleEnum.SuperAdmin,RoleEnum.Admin}) - public void deleteUserTraining(@PathVariable Long id, @ApiIgnore @RequestAttribute UserVO user) { + public void deleteUserTraining(@PathVariable Long id, @RequestAttribute AccountVO user) { this.iTrainingService.deleteUserTraining(id, user); } - @ApiOperation("加载实训到仿真中") + /** + *加载实训到仿真中 + */ @PutMapping("/{group}/{id}/loadTraining") - public TrainingNewVO loadTraining(@PathVariable String group, @PathVariable Long id) { - return iTrainingService.loadTraining(group, id); + public TrainingNewVO loadTraining(@PathVariable String group, @PathVariable Long id, + @RequestAttribute(AuthenticateInterceptor.LOGIN_USER_KEY) AccountVO user) { + return iTrainingService.loadTraining(group, id, user); } - @ApiOperation("查询实训、操作类型及数量") + /** + *查询实训、操作类型及数量 + */ @GetMapping("/trainingTypeAndQuantity") public Map> queryTrainingTypeAndQuantity(Long mapId, String prdType) { return iTrainingService.queryTrainingTypeAndQuantity(mapId, prdType); diff --git a/src/main/java/club/joylink/rtss/controller/user/LoginUserController.java b/src/main/java/club/joylink/rtss/controller/user/LoginUserController.java new file mode 100644 index 000000000..443b7ebf3 --- /dev/null +++ b/src/main/java/club/joylink/rtss/controller/user/LoginUserController.java @@ -0,0 +1,68 @@ +package club.joylink.rtss.controller.user; + +import club.joylink.rtss.constants.RoleEnum; +import club.joylink.rtss.controller.advice.Role; +import club.joylink.rtss.services.LoginSessionManager; +import club.joylink.rtss.vo.AccountVO; +import club.joylink.rtss.vo.LoginUserInfoVO; +import club.joylink.rtss.vo.UserQueryVO; +import club.joylink.rtss.vo.client.PageVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.stream.Collectors; + +@RestController +@RequestMapping("/api/loginUser") +public class LoginUserController { + + @Autowired + private LoginSessionManager loginSessionManager; + + @Role({RoleEnum.Admin, RoleEnum.SuperAdmin}) + @GetMapping("/paging") + public PageVO pagingQuery(UserQueryVO queryVO) { + List allLoginUserInfos = this.loginSessionManager.getAllLoginUserInfos(); + List filterList = allLoginUserInfos.stream() + .filter(loginUserInfoVO -> { + AccountVO accountVO = loginUserInfoVO.getAccountVO(); + boolean filter = true; + if (queryVO.getId() != null) { + filter = filter && queryVO.getId().equals(accountVO.getId()); + } + if (StringUtils.hasText(queryVO.getNickname())) { + filter = filter && accountVO.getNickname().contains(queryVO.getNickname()); + } + if (StringUtils.hasText(queryVO.getMobile())) { + filter = filter && accountVO.getMobile() != null ? accountVO.getMobile().contains(queryVO.getMobile()) : false; + } + if (StringUtils.hasText(queryVO.getEmail())) { + filter = filter && accountVO.getEmail() != null ? accountVO.getEmail().contains(queryVO.getEmail()) : false; + } + if (StringUtils.hasText(queryVO.getType())) { + filter = filter && queryVO.getType().equals(accountVO.getType()); + } + if (StringUtils.hasText(queryVO.getName())) { + filter = filter && accountVO.getName() != null ? accountVO.getName().contains(queryVO.getName()) : false; + } + if (queryVO.getCompanyId() != null) { + filter = filter && queryVO.getCompanyId().equals(accountVO.getOrgId()); + } + return filter; + }).collect(Collectors.toList()); + int total = filterList.size(); + if (queryVO.getOffset() > total) { + queryVO.setPageNum(1); + } + List resultList = filterList.stream() + .skip(queryVO.getOffset()) + .limit(queryVO.getPageSize()) + .collect(Collectors.toList()); + return new PageVO<>(queryVO.getPageNum(), queryVO.getPageSize(), total, resultList); + } + +} diff --git a/src/main/java/club/joylink/rtss/controller/user/ThirdAccountConfigController.java b/src/main/java/club/joylink/rtss/controller/user/ThirdAccountConfigController.java new file mode 100644 index 000000000..4bc6ea20b --- /dev/null +++ b/src/main/java/club/joylink/rtss/controller/user/ThirdAccountConfigController.java @@ -0,0 +1,22 @@ +package club.joylink.rtss.controller.user; + +import club.joylink.rtss.services.thridAccount.ThirdAccountConfigService; +import club.joylink.rtss.vo.AccountVO; +import club.joylink.rtss.vo.thirdAccount.ThirdAccountConfigVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/api/thirdAccountConfig") +public class ThirdAccountConfigController { + + @Autowired + private ThirdAccountConfigService thirdAccountConfigService; + + @PostMapping("") + public void saveOrUpdate(@RequestBody @Validated ThirdAccountConfigVO configVO, @RequestAttribute AccountVO user) { + this.thirdAccountConfigService.saveOrUpdateConfig(configVO); + } + +} diff --git a/src/main/java/club/joylink/rtss/controller/user/UserController.java b/src/main/java/club/joylink/rtss/controller/user/UserController.java index 29d55079e..459bdbe98 100644 --- a/src/main/java/club/joylink/rtss/controller/user/UserController.java +++ b/src/main/java/club/joylink/rtss/controller/user/UserController.java @@ -5,24 +5,26 @@ import club.joylink.rtss.controller.advice.Role; import club.joylink.rtss.services.ISysUserService; import club.joylink.rtss.services.local.UserGenerateService; import club.joylink.rtss.services.student.IDepartUserStatisticService; +import club.joylink.rtss.vo.AccountVO; +import club.joylink.rtss.vo.LoginUserInfoVO; import club.joylink.rtss.vo.UserQueryVO; -import club.joylink.rtss.vo.UserVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.student.ExportStudentInfo; import club.joylink.rtss.vo.client.student.StudentInfoExportParam; import club.joylink.rtss.vo.client.user.WeChatBindStatusVO; +import club.joylink.rtss.vo.user.AccountCreateVO; +import club.joylink.rtss.vo.user.CreateAccountCheck; import club.joylink.rtss.vo.user.UserGenerateConfigVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import javax.validation.constraints.NotBlank; import java.util.List; -@Api(tags = { "用户配置接口" }) +/** + * 用户配置接口 + */ @RestController @RequestMapping("/api/user") public class UserController { @@ -36,75 +38,118 @@ public class UserController { @Autowired private IDepartUserStatisticService iDepartUserStatisticService; + /** + *生成线下环境用户 + */ @Role({RoleEnum.SuperAdmin}) - @ApiOperation(value = "生成线下环境用户") @PostMapping(path = "/generate/offline") public void generateOfflineUsers(@RequestBody @Validated UserGenerateConfigVO generateConfigVO, - @RequestAttribute @ApiIgnore UserVO user) { + @RequestAttribute AccountVO user) { this.userGenerateService.generateOfflineUser(generateConfigVO, user); } + @Role({RoleEnum.SuperAdmin, RoleEnum.Admin}) + @PostMapping(path = "") + public void createAccount(@RequestBody @Validated(CreateAccountCheck.class) AccountCreateVO accountCreateVO, + @RequestAttribute AccountVO user) { + this.iSysUserService.createAccount(accountCreateVO, user); + } + + /** + *分页获取用户数据 + */ @Role({RoleEnum.Admin, RoleEnum.SuperAdmin}) - @ApiOperation(value = "分页获取用户数据") @GetMapping(path = "") - public PageVO queryPagedUser(UserQueryVO queryVO) { + public PageVO queryPagedUser(UserQueryVO queryVO) { return this.iSysUserService.queryPagedUser(queryVO); } + /** + *修改用户角色 + */ @Role(RoleEnum.SuperAdmin) - @ApiOperation(value = "修改用户角色") @PutMapping(path = "/{id}/role") - public void updateUserRole(@PathVariable Long id, @RequestBody UserVO userVO, @RequestAttribute @ApiIgnore UserVO user) { - this.iSysUserService.updateUserRole(id, user.getId(), userVO); + public void updateUserRole(@PathVariable Long id, @RequestBody AccountVO accountVO, @RequestAttribute AccountVO user) { + this.iSysUserService.updateUserRole(id, user.getId(), accountVO); } + /** + *超管修改用户信息 + */ @Role(RoleEnum.SuperAdmin) - @ApiOperation("超管修改用户信息") @PutMapping("/superAdmin/update/userInfo") - public void superAdminUpdateUserInfo(@RequestBody UserVO updateUser, @RequestAttribute @ApiIgnore UserVO user) { + public void superAdminUpdateUserInfo(@RequestBody AccountVO updateUser, @RequestAttribute AccountVO user) { iSysUserService.superAdminUpdateUserInfo(updateUser, user); } + @Role(RoleEnum.SuperAdmin) + @DeleteMapping("/{id}") + public void delete(@PathVariable Long id) { + this.iSysUserService.logicDelete(id); + } - @ApiOperation(value = "修改用户密码") + /** + * 修改用户密码 + */ @PutMapping(path = "/{id}/password") - public void updateUserPassword(@PathVariable Long id, @RequestBody UserVO userVO, @RequestAttribute @ApiIgnore UserVO user) { - this.iSysUserService.updateUserPassword(id, userVO.getPassword()); + public void updateUserPassword(@PathVariable Long id, @RequestBody AccountVO accountVO, @RequestAttribute AccountVO user) { + this.iSysUserService.updateUserPassword(id, accountVO.getPassword()); } - @ApiOperation(value = "获取微信小程序绑定二维码") + /** + * 获取微信小程序绑定二维码 + */ @GetMapping(path = "/bind/wm/url") - public WeChatBindStatusVO getWeChatBindUrl(@RequestAttribute @ApiIgnore UserVO user) { - return this.iSysUserService.getWeChatBindUrl(user); + public WeChatBindStatusVO getWeChatBindUrl(@RequestAttribute LoginUserInfoVO loginInfo) { + return this.iSysUserService.getWeChatBindUrl(loginInfo); } - @ApiOperation(value = "用户绑定微信小程序") + /** + * 用户绑定微信小程序 + */ @PutMapping(path = "/bind/wm") public void userBindWm(String code, Long userId) { this.iSysUserService.userBindWm(code, userId); } - @ApiOperation(value = "获取用户总数量") + /** + * 获取用户总数量 + */ @GetMapping(path = "/amount") public int getUserAmount() { return iSysUserService.getUserAmount(); } - @ApiOperation(value = "分页获取用户数据（模糊查询）") + /** + * 分页获取用户数据（模糊查询） + */ @GetMapping(path = "/fuzzy") - public List fuzzyQueryPagedUser(@NotBlank(message = "参数不能为空") String fuzzyParam) { + public List fuzzyQueryPagedUser(@NotBlank(message = "参数不能为空") String fuzzyParam) { return this.iSysUserService.fuzzyQueryPagedUser(fuzzyParam); } - @ApiOperation(value="导出部门学生信息及成绩接口") - @PutMapping(path="/scores") - public List getStudentSores( @Validated @RequestBody StudentInfoExportParam infoExportParam){ + /** + * 导出部门学生信息及成绩接口 + */ + @PutMapping(path = "/scores") + public List getStudentSores(@Validated @RequestBody StudentInfoExportParam infoExportParam) { return this.iDepartUserStatisticService.studentInfoStatistics(infoExportParam); } - @ApiOperation("查询销售人员") + /** + * 查询销售人员 + */ @GetMapping("/seller") - public List querySellers(){ + public List querySellers() { return iSysUserService.querySellers(); } + + /** + *查询管理和超管 + */ + @Role({RoleEnum.Admin, RoleEnum.SuperAdmin}) + @GetMapping("/adminAndSuperAdmin") + public List queryAdminsAndSuperAdmins() { + return iSysUserService.queryAdminsAndSuperAdmins(); + } } diff --git a/src/main/java/club/joylink/rtss/controller/user/UserExamController.java b/src/main/java/club/joylink/rtss/controller/user/UserExamController.java index 053f16f80..8d1b90a00 100644 --- a/src/main/java/club/joylink/rtss/controller/user/UserExamController.java +++ b/src/main/java/club/joylink/rtss/controller/user/UserExamController.java @@ -3,16 +3,18 @@ package club.joylink.rtss.controller.user; import club.joylink.rtss.constants.RoleEnum; import club.joylink.rtss.controller.advice.Role; import club.joylink.rtss.services.IUserExamService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import club.joylink.rtss.vo.client.userExam.WholeOrgUserExamResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; -@Api(tags = { "用户考试接口" }) +import java.util.List; + +/** + * 用户考试接口 + */ @RestController @RequestMapping("/api/userExam") public class UserExamController { @@ -20,60 +22,94 @@ public class UserExamController { @Autowired private IUserExamService iUserExamService; - @ApiOperation(value = "生成用户考试实例") + /** + * 生成用户考试实例 + */ @GetMapping(path = "/{examId}/generate") - public UserExamVO generateExamInstance(@PathVariable long examId, @ApiIgnore @RequestAttribute UserVO user) { + public UserExamVO generateExamInstance(@PathVariable long examId, @RequestAttribute AccountVO user) { return this.iUserExamService.generateExamInstance(examId, user); } - @ApiOperation(value = "获取用户考试实例") + /** + * 获取用户考试实例 + */ @GetMapping(path = "/{id}") - public UserExamVO getExamInstance(@PathVariable long id, @ApiIgnore @RequestAttribute UserVO user) { + public UserExamVO getExamInstance(@PathVariable long id, @RequestAttribute AccountVO user) { return this.iUserExamService.getExamInstance(id, user); } - @ApiOperation(value = "完成考试题目") + /** + * 完成考试题目 + */ @PutMapping(path = "/finish") public void finish(@RequestBody @Validated UserExamQuestionsVO userExamQuestionsVO, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { this.iUserExamService.finish(userExamQuestionsVO, user); } - @ApiOperation(value = "提交考试") + /** + * 提交考试 + */ @PutMapping(path = "/{id}/submit") - public UserExamVO submit(@PathVariable long id, @ApiIgnore @RequestAttribute UserVO user) { + public UserExamVO submit(@PathVariable long id, @RequestAttribute AccountVO user) { return this.iUserExamService.submit(id, user); } - @ApiOperation(value = "放弃考试") + /** + * 放弃考试 + */ @PutMapping(path = "/{id}/abandon") - public void abandon(@PathVariable long id, @ApiIgnore @RequestAttribute UserVO user) { + public void abandon(@PathVariable long id, @RequestAttribute AccountVO user) { this.iUserExamService.abandon(id, user); } - @ApiOperation(value = "分页查询用户考试数据") + /** + * 分页查询用户考试数据 + */ @GetMapping(path = "/list") public PageVO queryPagedUserExam(UserExamQueryVO queryVO) { return this.iUserExamService.queryPagedUserExam(queryVO); } - @ApiOperation(value = "修改用户考试数据") + /** + * 修改用户考试数据 + */ @PutMapping(path = "/{id}") @Role({RoleEnum.SuperAdmin, RoleEnum.Admin}) - public void updateUserExam(@PathVariable Long id, @RequestBody UserExamVO userExamVO, @ApiIgnore @RequestAttribute UserVO user) { + public void updateUserExam(@PathVariable Long id, @RequestBody UserExamVO userExamVO, @RequestAttribute AccountVO user) { this.iUserExamService.updateUserExam(id, userExamVO, user); } - @ApiOperation(value = "删除用户考试数据") + /** + * 删除用户考试数据 + */ @DeleteMapping(path = "/{id}") @Role({RoleEnum.SuperAdmin, RoleEnum.Admin}) - public void queryPagedUserExam(@PathVariable Long id, @ApiIgnore @RequestAttribute UserVO user) { + public void queryPagedUserExam(@PathVariable Long id, @RequestAttribute AccountVO user) { this.iUserExamService.deleteUserExam(id, user); } - @ApiOperation("查询组织成员的考试成绩") + /** + * 查询组织成员的考试成绩 + */ @GetMapping("/paged/orgUser/{orgId}/{examId}") public PageVO pagedQueryOrgUserExamResult(@PathVariable Long orgId, @PathVariable Long examId, PageQueryVO queryVO) { return this.iUserExamService.pagedQueryOrgUserExamResult(orgId, examId, queryVO); } + + /** + * 查询个人考试成绩曲线 + */ + @GetMapping("/curve/{userId}") + public List getPersonalUserExamResults(@PathVariable Long userId) { + return iUserExamService.getPersonalUserExamResults(userId); + } + + /** + * 查询组织学生单次考试成绩曲线 + */ + @GetMapping("/curve/{orgId}/{examId}") + public WholeOrgUserExamResult getCurve(@PathVariable Long orgId, @PathVariable Long examId) { + return iUserExamService.getCurve(orgId, examId); + } } diff --git a/src/main/java/club/joylink/rtss/controller/user/UserInfoController.java b/src/main/java/club/joylink/rtss/controller/user/UserInfoController.java index 93a8a7ac2..f104cd0ca 100644 --- a/src/main/java/club/joylink/rtss/controller/user/UserInfoController.java +++ b/src/main/java/club/joylink/rtss/controller/user/UserInfoController.java @@ -1,22 +1,22 @@ package club.joylink.rtss.controller.user; import club.joylink.rtss.services.ISysUserService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.user.MobileInfoVO; import club.joylink.rtss.vo.client.user.UpdateEmailVO; import club.joylink.rtss.vo.client.user.UpdateMobileVO; import club.joylink.rtss.vo.client.user.UpdatePasswordVO; -import club.joylink.rtss.vo.user.UserInfoVO; +import club.joylink.rtss.vo.user.AccountCreateVO; import club.joylink.rtss.vo.user.UserRegisterCheck; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(tags = { "用户信息接口" }) +/** + *用户信息接口 + */ @RestController @RequestMapping("/api/userinfo") public class UserInfoController { @@ -25,84 +25,110 @@ public class UserInfoController { private ISysUserService iSysUserService; @PostMapping("/register") - public void register(@RequestBody @Validated(value = UserRegisterCheck.class) UserInfoVO userInfoVO) { - this.iSysUserService.register(userInfoVO); + public void register(@RequestBody @Validated(value = UserRegisterCheck.class) AccountCreateVO accountCreateVO) { + this.iSysUserService.register(accountCreateVO); } - @ApiOperation(value = "根据姓名或电话号查询用户") + /** + *根据姓名或电话号查询用户 + */ @GetMapping(path="/nameOrMobile") - public List queryUserByNameOrMobile(String query) { - List list = this.iSysUserService.queryUserByNameOrMobile(query); + public List queryUserByNameOrMobile(String query) { + List list = this.iSysUserService.queryUserByNameOrMobile(query); return list; } - @ApiOperation(value = "根据用户id获取用户信息") + /** + *根据用户id获取用户信息 + */ @GetMapping(path = "/{id}") - public UserVO getUserBaseInfoById(@PathVariable Long id) { + public AccountVO getUserBaseInfoById(@PathVariable Long id) { return this.iSysUserService.getUserBaseInfoById(id); } - @ApiOperation(value = "修改用户信息") + /** + *修改用户信息 + */ @PutMapping(path = "/{id}") - public void modify(@PathVariable Long id, @RequestBody UserVO userInfo, String vdcode) { + public void modify(@PathVariable Long id, @RequestBody AccountVO userInfo, String vdcode) { this.iSysUserService.modify(id, userInfo, vdcode); } - @ApiOperation(value = "微信关注事件") + /** + *微信关注事件 + */ @GetMapping(path = "/wxsubscribe") public void wxSubscribe(@RequestParam String wxId) { iSysUserService.wxSubscribeEventHandle(wxId); } - @ApiOperation(value = "批量修改用户的openId为unionId") + /** + *批量修改用户的openId为unionId + */ @PutMapping(path = "/batchchange/unionid") public void batchChangeOpenId2UnionId() { this.iSysUserService.batchChangeOpenId2UnionId(); } - @ApiOperation(value = "更新用户真实姓名") + /** + *更新用户真实姓名 + */ @PutMapping(path = "/{id}/name") public void updateName(@PathVariable Long id, String name) { this.iSysUserService.updateUserName(id, name); } - @ApiOperation(value = "更新用户昵称") + /** + *更新用户昵称 + */ @PutMapping(path = "/{id}/nickname") public void updateNickname(@PathVariable Long id, String nickname) { this.iSysUserService.updateNickname(id, nickname); } - @ApiOperation(value = "用户上传头像") + /** + *用户上传头像 + */ @PostMapping(path = "/{id}/avatar") - public void uploadAvatar(@PathVariable Long id, @RequestBody UserVO userVO) { - this.iSysUserService.updateAvatar(id, userVO.getAvatarPath()); + public void uploadAvatar(@PathVariable Long id, @RequestBody AccountVO accountVO) { + this.iSysUserService.updateAvatar(id, accountVO.getAvatarPath()); } - @ApiOperation(value = "发送手机验证码") + /** + *发送手机验证码 + */ @PostMapping(path = "/mobile/code") public String sendMobileValidCode(@RequestBody MobileInfoVO mobileInfoVO) { return this.iSysUserService.sendMobileValidCode(mobileInfoVO); } - @ApiOperation(value = "发送邮箱验证码") + /** + *发送邮箱验证码 + */ @PostMapping(path = "/email/code") public String sendEmailValidCode(String email) { return this.iSysUserService.sendEmailValidCode(email); } - @ApiOperation(value = "更新用户手机号") + /** + *更新用户手机号 + */ @PutMapping(path = "/{id}/mobile") public void updateMobile(@PathVariable Long id, @RequestBody @Validated UpdateMobileVO updateMobileVO) { this.iSysUserService.updateMobile(id, updateMobileVO); } - @ApiOperation(value = "更新用户邮箱") + /** + *更新用户邮箱 + */ @PutMapping(path = "/{id}/email") public void updateEmail(@PathVariable Long id, @RequestBody @Validated UpdateEmailVO updateEmailVO) { this.iSysUserService.updateEmail(id, updateEmailVO); } - @ApiOperation(value = "更新用户登陆密码") + /** + *更新用户登陆密码 + */ @PutMapping(path = "/{id}/password") public void updatePassword(@PathVariable Long id, @RequestBody @Validated UpdatePasswordVO updatePasswordVO) { this.iSysUserService.updatePassword(id, updatePasswordVO); diff --git a/src/main/java/club/joylink/rtss/controller/user/UserPermissionController.java b/src/main/java/club/joylink/rtss/controller/user/UserPermissionController.java index cfd04c4f6..cbcefa7fd 100644 --- a/src/main/java/club/joylink/rtss/controller/user/UserPermissionController.java +++ b/src/main/java/club/joylink/rtss/controller/user/UserPermissionController.java @@ -1,20 +1,24 @@ package club.joylink.rtss.controller.user; +import club.joylink.rtss.constants.RoleEnum; +import club.joylink.rtss.controller.advice.Role; import club.joylink.rtss.services.IUserPermissionService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; +import club.joylink.rtss.vo.LoginUserInfoVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.permission.DistributeSelectVO; import club.joylink.rtss.vo.client.permission.PermissionQueryVO; +import club.joylink.rtss.vo.client.permission.UserPermissionQueryVO; import club.joylink.rtss.vo.client.userPermission.UserPermissionVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; -@Api(tags = { "用户权限管理" }) +/** + *用户权限管理 + */ @RestController @RequestMapping("/api/userPermission") public class UserPermissionController { @@ -22,64 +26,107 @@ public class UserPermissionController { @Autowired private IUserPermissionService iUserPermissionService; - @ApiOperation(value = "分页获取用户权限数据") + /** + *分页获取用户权限数据 + */ @GetMapping(path="") - public PageVO queryPagedPermission(PermissionQueryVO queryVO,@RequestAttribute @ApiIgnore UserVO user) { + public PageVO queryPagedPermission(PermissionQueryVO queryVO,@RequestAttribute AccountVO user) { return this.iUserPermissionService.queryPagedPermission(queryVO); } - @ApiOperation(value = "设置用户权限状态") + /** + *设置用户权限状态 + */ @PutMapping(path = "/{id}/status") public void invalid(@PathVariable Long id) { this.iUserPermissionService.setInvalid(id); } - @ApiOperation(value = "获取用户可以分发的权限") + /** + *获取用户可以分发的权限 + */ @GetMapping(path="/getAvailableUserPermission") - public List findAvailablePermission(DistributeSelectVO distributeSelectVO, @RequestAttribute @ApiIgnore UserVO user) { + public List findAvailablePermission(DistributeSelectVO distributeSelectVO, @RequestAttribute AccountVO user) { return this.iUserPermissionService.queryUserPermissionVOListThatCanDistribute(distributeSelectVO,user); } - @ApiOperation(value = "分页获取个人权限数据") + /** + *分页获取个人权限数据 + */ @GetMapping(path = "/my") - public PageVO queryMyPermission(PermissionQueryVO queryVO, @RequestAttribute @ApiIgnore UserVO user) { + public PageVO queryMyPermission(PermissionQueryVO queryVO, @RequestAttribute AccountVO user) { return this.iUserPermissionService.queryMyPermission(user, queryVO); } - @ApiOperation(value = "设置用户权限所有者") + /** + *设置用户权限所有者 + */ @PutMapping(path = "/{id}/owner") - public void setPermissionOwner(@PathVariable Long id, @RequestBody UserVO owner, @RequestAttribute @ApiIgnore UserVO user) { + public void setPermissionOwner(@PathVariable Long id, @RequestBody AccountVO owner, @RequestAttribute AccountVO user) { this.iUserPermissionService.setPermissionOwner(id, owner, user); } - @ApiOperation(value = "用户数据统计") + /** + *用户数据统计 + */ @GetMapping(path = "/statistic") public PageVO userPermissionStatistic(PermissionQueryVO queryVO) { return iUserPermissionService.userPermissionStatistic(queryVO); } - @ApiOperation(value = "用户权限转增归属") - @GetMapping(path = "/gotUserList") - public PageVO distributeTo(PermissionQueryVO queryVO) { - return iUserPermissionService.distributeTo(queryVO); - } +// @ApiOperation(value = "用户权限转增归属") +// @GetMapping(path = "/gotUserList") +// public PageVO distributeTo(PermissionQueryVO queryVO) { +// return iUserPermissionService.distributeTo(queryVO); +// } - @ApiOperation(value = "回收用户权限到权限分发中") - @PutMapping(path = "/{id}/back") - public void restorePermissionToDistribute(@PathVariable Long id) { - iUserPermissionService.restorePermissionToDistribute(id); - } - - @ApiOperation(value = "") @GetMapping(path = "/personal") - public List queryPersonalUserPermission(@RequestAttribute @ApiIgnore UserVO user) { + public List queryPersonalUserPermission(@RequestAttribute AccountVO user) { return iUserPermissionService.queryPersonalUserPermission(user); } - @ApiOperation("根据地图一键领取权限") + /** + *根据地图一键领取权限 + */ @PostMapping("/{mapId}/getPermissions") - public void getPermissions4Map(@PathVariable Long mapId, Integer count ,@RequestAttribute @ApiIgnore UserVO user) { - iUserPermissionService.getPermissions4Map(mapId, count, user); + public void getPermissions4Map(@PathVariable Long mapId, Integer count ,@RequestAttribute LoginUserInfoVO loginInfo) { + iUserPermissionService.getPermissions4Map(mapId, count, loginInfo.getAccountVO(), loginInfo.getProject()); + } + + /** + *将用户权限退回到权限分发中 + */ + @Role({RoleEnum.Admin, RoleEnum.SuperAdmin}) + @PutMapping(path = "/{id}/back") + public void return2Distribute(@PathVariable Long id) { + iUserPermissionService.return2Distribute(id); + } + + /** + *将用户权限（专用）退回到用户权限中 + */ + @Role({RoleEnum.Admin, RoleEnum.SuperAdmin}) + @PutMapping("/{id}/back/up") + public void return2UserPermission(@PathVariable Long id) { + iUserPermissionService.return2UserPermission(id); + } + + /** + *查询从该用户权限流向的用户权限 + */ + @Role({RoleEnum.Admin, RoleEnum.SuperAdmin}) + @GetMapping("/ups/fromThisUP") + public PageVO queryUPsFromThisUP(@Validated UserPermissionQueryVO queryVO) { + return iUserPermissionService.queryUPsFromThisUP(queryVO); + } + + /** + *收回从该用户权限流出的所有权限（权限分发及用户权限） + */ + @Role({RoleEnum.Admin, RoleEnum.SuperAdmin}) + @PutMapping("/{id}/takeBack/all") + public void takeBackAll(@PathVariable long id) { + iUserPermissionService.takeBack(id); } } diff --git a/src/main/java/club/joylink/rtss/controller/user/UserUsageStatsController.java b/src/main/java/club/joylink/rtss/controller/user/UserUsageStatsController.java index 51922b740..f4c85a063 100644 --- a/src/main/java/club/joylink/rtss/controller/user/UserUsageStatsController.java +++ b/src/main/java/club/joylink/rtss/controller/user/UserUsageStatsController.java @@ -4,18 +4,17 @@ import club.joylink.rtss.constants.RoleEnum; import club.joylink.rtss.controller.advice.Role; import club.joylink.rtss.services.IUserUsageStatsService; import club.joylink.rtss.services.user.IUserSimulationStatService; -import club.joylink.rtss.vo.UserVO; +import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.client.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; -@Api(tags = { "用户使用数据统计接口" }) +/** + *用户使用数据统计接口 + */ @RestController @RequestMapping(path = "/api/stats") public class UserUsageStatsController { @@ -26,105 +25,137 @@ public class UserUsageStatsController { @Autowired private IUserSimulationStatService iUserSimulationStatService; - @ApiOperation(value = "课程列表") + /** + *课程列表 + */ @GetMapping(path = "/lesson/list") - public List queryLessonList(@RequestAttribute UserVO user) { + public List queryLessonList(@RequestAttribute AccountVO user) { return this.iUserUsageStatsService.queryLessonList(user); } - @ApiOperation(value = "课程统计排名") + /** + *课程统计排名 + */ @GetMapping(path = "/lesson/{lessonId}/rank") - public List lessonRank(@PathVariable Long lessonId, @RequestAttribute UserVO user) { + public List lessonRank(@PathVariable Long lessonId, @RequestAttribute AccountVO user) { return this.iUserUsageStatsService.lessonRank(lessonId, user); } - @ApiOperation(value = "个人课程实训数据统计") + /** + *个人课程实训数据统计 + */ @GetMapping(path = "/lesson/{lessonId}/stats") - public List lessonPersonalStats(@PathVariable Long lessonId, @RequestAttribute UserVO user) { + public List lessonPersonalStats(@PathVariable Long lessonId, @RequestAttribute AccountVO user) { return this.iUserUsageStatsService.personalLessonStats(lessonId, user); } - @ApiOperation(value = "查询参与考试的课程列表") + /** + *查询参与考试的课程列表 + */ @GetMapping(path = "/exam/lessonList") - public List queryExamLessonList(@ApiIgnore @RequestAttribute UserVO user) { + public List queryExamLessonList(@RequestAttribute AccountVO user) { return this.iUserUsageStatsService.queryExamLessonList(user); } - @ApiOperation(value = "查询参与考试的试题列表") + /** + *查询参与考试的试题列表 + */ @GetMapping(path = "/exam/{lessonId}/list") - public List queryExamList(@PathVariable Long lessonId, @ApiIgnore @RequestAttribute UserVO user) { + public List queryExamList(@PathVariable Long lessonId, @RequestAttribute AccountVO user) { return this.iUserUsageStatsService.queryExamList(lessonId, user); } - @ApiOperation(value = "考试排名") + /** + *考试排名 + */ @GetMapping(path = "/exam/{examId}/rank") - public List examRank(@PathVariable long examId, @ApiIgnore @RequestAttribute UserVO user) { + public List examRank(@PathVariable long examId, @RequestAttribute AccountVO user) { return this.iUserUsageStatsService.examRank(examId, user); } - @ApiOperation(value = "个人考试数据统计") + /** + *个人考试数据统计 + */ @GetMapping(path = "/exam/{examId}/stats") - public List examPersonalStats(@PathVariable long examId, @ApiIgnore @RequestAttribute UserVO user) { + public List examPersonalStats(@PathVariable long examId, @RequestAttribute AccountVO user) { return this.iUserUsageStatsService.examPersonalStats(examId, user); } - @ApiOperation(value = "查询参与仿真的地图列表") + /** + *查询参与仿真的地图列表 + */ @GetMapping(path = "/simulation/mapList") - public List querySimulationMapList(@ApiIgnore @RequestAttribute UserVO user) { + public List querySimulationMapList(@RequestAttribute AccountVO user) { return iUserSimulationStatService.querySimulationMapList(user); } - @ApiOperation(value = "查询参与仿真的产品列表") + /** + *查询参与仿真的产品列表 + */ @GetMapping(path = "/simulation/{mapId}/prdList") - public List querySimulationPrdList(@PathVariable Long mapId, @ApiIgnore @RequestAttribute UserVO user) { + public List querySimulationPrdList(@PathVariable Long mapId, @RequestAttribute AccountVO user) { return iUserSimulationStatService.querySimulationPrdList(mapId, user); } - @ApiOperation(value = "仿真时长排名") + /** + *仿真时长排名 + */ @GetMapping(path = "/simulation/{mapId}/{prdType}/rank") - public List simulationRank(@PathVariable Long mapId, @PathVariable String prdType, @ApiIgnore @RequestAttribute UserVO user) { + public List simulationRank(@PathVariable Long mapId, @PathVariable String prdType, @RequestAttribute AccountVO user) { return iUserSimulationStatService.simulationRank(mapId, prdType, user); } - @ApiOperation(value = "个人仿真数据统计") + /** + *个人仿真数据统计 + */ @GetMapping(path = "/simulation/{mapId}/stats") - public List simulationPersonalStats(@PathVariable Long mapId, @ApiIgnore @RequestAttribute UserVO user) { + public List simulationPersonalStats(@PathVariable Long mapId, @RequestAttribute AccountVO user) { return iUserSimulationStatService.simulationPersonalStats(mapId, user); } - @ApiOperation(value = "统计各系统总时长") + /** + *统计各系统总时长 + */ @GetMapping(path = "/total") public List totalSimulationDuration(boolean filter) { return iUserUsageStatsService.totalDuration(filter); } - @ApiOperation("分页查询用户仿真数据") + /** + *分页查询用户仿真数据 + */ @GetMapping("/simulation") public PageVO queryPagedStats(UserSimulationStatsQueryVO queryVO) { return iUserSimulationStatService.queryPagedStats(queryVO); } + /** + *添加用户仿真数据 + */ @Role(value = {RoleEnum.SuperAdmin, RoleEnum.Admin}) - @ApiOperation(value = "添加用户仿真数据") @PostMapping(path = "/simulation") public void addUserSimulationStats(@RequestBody @Validated UserSimulationStatsVO statsVO, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { iUserSimulationStatService.addUserSimulationStats(statsVO, user); } + /** + *更新用户仿真数据 + */ @Role(value = {RoleEnum.SuperAdmin, RoleEnum.Admin}) - @ApiOperation(value = "更新用户仿真数据") @PutMapping(path = "/{statsId}") public void updateUserSimulationStats(@PathVariable Long statsId, @RequestBody UserSimulationStatsVO statsVO, - @ApiIgnore @RequestAttribute UserVO user) { + @RequestAttribute AccountVO user) { iUserSimulationStatService.updateUserSimulationStats(statsId, statsVO, user); } + /** + *删除用户仿真数据 + */ @Role(value = {RoleEnum.SuperAdmin, RoleEnum.Admin}) - @ApiOperation(value = "删除用户仿真数据") @DeleteMapping(path = "/{statsId}") - public void deleteUserSimulationStats(@PathVariable Long statsId, @ApiIgnore @RequestAttribute UserVO user) { + public void deleteUserSimulationStats(@PathVariable Long statsId, @RequestAttribute AccountVO user) { iUserSimulationStatService.deleteUserSimulationStats(statsId, user); } diff --git a/src/main/java/club/joylink/rtss/controller/voice/VoiceController.java b/src/main/java/club/joylink/rtss/controller/voice/VoiceController.java index 7b73e32e2..d46f9fb6d 100644 --- a/src/main/java/club/joylink/rtss/controller/voice/VoiceController.java +++ b/src/main/java/club/joylink/rtss/controller/voice/VoiceController.java @@ -1,30 +1,45 @@ package club.joylink.rtss.controller.voice; -import club.joylink.rtss.services.IVoiceService; +import club.joylink.rtss.services.voice.IVoiceTrainingService; +import club.joylink.rtss.vo.client.PageQueryVO; +import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.VoiceRecognitionResult; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import club.joylink.rtss.vo.client.competition.VoiceErrorVO; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -@Api("语音AI接口") +/** + * 语音AI接口 + */ @RestController @RequestMapping("/api/voice") public class VoiceController { -// -// @Autowired -// @Qualifier("HuaWeiVoiceService") -// private IVoiceService iVoiceService; -// -// @ApiOperation("语音识别") -// @PostMapping("recognition") -// public VoiceRecognitionResult voiceRecognition(MultipartFile file) { -// return this.iVoiceService.voiceRecognition(file, ""); -// } + @Autowired + private IVoiceTrainingService iVoiceTrainingService; + + /** + * 语音识别 + * @param file + * @return + */ + @PostMapping("recognition") + public VoiceRecognitionResult voiceRecognition(MultipartFile file) { + return iVoiceTrainingService.voiceRecognition(file); + } + + /** + * 查询语音识别错误集 + * @param queryVO + * @return + */ + @GetMapping("/errorSet/paged") + public PageVO pagedQueryErrorSet(PageQueryVO queryVO) { + return iVoiceTrainingService.pagedQueryErrorSet(queryVO); + } } diff --git a/src/main/java/club/joylink/rtss/controller/wechat/WeChatMpAbilityController.java b/src/main/java/club/joylink/rtss/controller/wechat/WeChatMpAbilityController.java index 21ff20290..f3ef94523 100644 --- a/src/main/java/club/joylink/rtss/controller/wechat/WeChatMpAbilityController.java +++ b/src/main/java/club/joylink/rtss/controller/wechat/WeChatMpAbilityController.java @@ -2,15 +2,15 @@ package club.joylink.rtss.controller.wechat; import club.joylink.rtss.wechat.MiniProgramService; import club.joylink.rtss.wechat.vo.WxError; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; -@Api(tags = {"微信小程序功能接口"}) +/** + * 微信小程序功能接口 + */ @RestController @RequestMapping(path = "/api/wechat/mp") public class WeChatMpAbilityController { @@ -18,13 +18,22 @@ public class WeChatMpAbilityController { @Autowired private MiniProgramService miniProgramService; - @ApiOperation(value = "检查一段文本是否含有违法违规内容") + /** + * 检查一段文本是否含有违法违规内容 + * @param content + * @return + */ @PostMapping(path = "/msgSecCheck") private WxError msgSecCheck(@RequestBody String content) { return this.miniProgramService.msgSecCheck(content); } - @ApiOperation(value = "检查图片是否含有违法违规内容") + /** + * 检查图片是否含有违法违规内容 + * @param file + * @return + * @throws IOException + */ @PostMapping(path = "/imgSecCheck") private WxError imgSecCheck(@RequestPart MultipartFile file) throws IOException { return this.miniProgramService.imgSecCheck(file); diff --git a/src/main/java/club/joylink/rtss/dao/AudioResourcesDAO.java b/src/main/java/club/joylink/rtss/dao/AudioResourcesDAO.java new file mode 100644 index 000000000..50c189be9 --- /dev/null +++ b/src/main/java/club/joylink/rtss/dao/AudioResourcesDAO.java @@ -0,0 +1,12 @@ +package club.joylink.rtss.dao; + +import club.joylink.rtss.entity.AudioResources; +import club.joylink.rtss.entity.AudioResourcesExample; +import org.springframework.stereotype.Repository; + +/** + * AudioResourcesDAO继承基类 + */ +@Repository +public interface AudioResourcesDAO extends MyBatisBaseDao { +} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/dao/CircuitryDraftDAO.java b/src/main/java/club/joylink/rtss/dao/CircuitryDraftDAO.java new file mode 100644 index 000000000..1d4b62c66 --- /dev/null +++ b/src/main/java/club/joylink/rtss/dao/CircuitryDraftDAO.java @@ -0,0 +1,40 @@ +package club.joylink.rtss.dao; + +import club.joylink.rtss.entity.CircuitryDraft; +import club.joylink.rtss.entity.CircuitryDraftExample; +import java.util.List; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +@Mapper +@Repository +public interface CircuitryDraftDAO { + long countByExample(CircuitryDraftExample example); + + int deleteByExample(CircuitryDraftExample example); + + int deleteByPrimaryKey(Long id); + + int insert(CircuitryDraft record); + + int insertSelective(CircuitryDraft record); + + List selectByExampleWithBLOBs(CircuitryDraftExample example); + + List selectByExample(CircuitryDraftExample example); + + CircuitryDraft selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") CircuitryDraft record, @Param("example") CircuitryDraftExample example); + + int updateByExampleWithBLOBs(@Param("record") CircuitryDraft record, @Param("example") CircuitryDraftExample example); + + int updateByExample(@Param("record") CircuitryDraft record, @Param("example") CircuitryDraftExample example); + + int updateByPrimaryKeySelective(CircuitryDraft record); + + int updateByPrimaryKeyWithBLOBs(CircuitryDraft record); + + int updateByPrimaryKey(CircuitryDraft record); +} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/dao/CompetitionErrorSetDAO.java b/src/main/java/club/joylink/rtss/dao/CompetitionErrorSetDAO.java new file mode 100644 index 000000000..082bdc9cf --- /dev/null +++ b/src/main/java/club/joylink/rtss/dao/CompetitionErrorSetDAO.java @@ -0,0 +1,12 @@ +package club.joylink.rtss.dao; + +import club.joylink.rtss.entity.CompetitionErrorSet; +import club.joylink.rtss.entity.CompetitionErrorSetExample; +import org.springframework.stereotype.Repository; + +/** + * CompetitionErrorSetDAO继承基类 + */ +@Repository +public interface CompetitionErrorSetDAO extends MyBatisBaseDao { +} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/dao/CompetitionVoiceRecordDAO.java b/src/main/java/club/joylink/rtss/dao/CompetitionVoiceRecordDAO.java new file mode 100644 index 000000000..5c2ee9861 --- /dev/null +++ b/src/main/java/club/joylink/rtss/dao/CompetitionVoiceRecordDAO.java @@ -0,0 +1,12 @@ +package club.joylink.rtss.dao; + +import club.joylink.rtss.entity.CompetitionVoiceRecord; +import club.joylink.rtss.entity.CompetitionVoiceRecordExample; +import org.springframework.stereotype.Repository; + +/** + * CompetitionVoiceRecordDAO继承基类 + */ +@Repository +public interface CompetitionVoiceRecordDAO extends MyBatisBaseDao { +} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/dao/DocuDocumentDAO.java b/src/main/java/club/joylink/rtss/dao/DocuDocumentDAO.java new file mode 100644 index 000000000..5096c7e19 --- /dev/null +++ b/src/main/java/club/joylink/rtss/dao/DocuDocumentDAO.java @@ -0,0 +1,14 @@ +package club.joylink.rtss.dao; + +import club.joylink.rtss.entity.DocuDocument; +import club.joylink.rtss.entity.DocuDocumentExample; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +/** + * DocuDocumentDAO继承基类 + */ +@Mapper +@Repository +public interface DocuDocumentDAO extends MyBatisBaseDao { +} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/dao/DocuDocumentDraftDAO.java b/src/main/java/club/joylink/rtss/dao/DocuDocumentDraftDAO.java new file mode 100644 index 000000000..90ba16d97 --- /dev/null +++ b/src/main/java/club/joylink/rtss/dao/DocuDocumentDraftDAO.java @@ -0,0 +1,14 @@ +package club.joylink.rtss.dao; + +import club.joylink.rtss.entity.DocuDocumentDraft; +import club.joylink.rtss.entity.DocuDocumentDraftExample; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +/** + * DocuDocumentDraftDAO继承基类 + */ +@Mapper +@Repository +public interface DocuDocumentDraftDAO extends MyBatisBaseDao { +} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/dao/DraftMapDAO.java b/src/main/java/club/joylink/rtss/dao/DraftMapDAO.java index 1cff39c45..c51740f12 100644 --- a/src/main/java/club/joylink/rtss/dao/DraftMapDAO.java +++ b/src/main/java/club/joylink/rtss/dao/DraftMapDAO.java @@ -3,10 +3,13 @@ package club.joylink.rtss.dao; import club.joylink.rtss.entity.DraftMap; import club.joylink.rtss.entity.DraftMapExample; import club.joylink.rtss.entity.DraftMapWithBLOBs; -import java.util.List; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + +@Mapper @Repository public interface DraftMapDAO { long countByExample(DraftMapExample example); diff --git a/src/main/java/club/joylink/rtss/dao/DraftMapParkingTimeDAO.java b/src/main/java/club/joylink/rtss/dao/DraftMapParkingTimeDAO.java index 98f8f0bde..aa39bf4db 100644 --- a/src/main/java/club/joylink/rtss/dao/DraftMapParkingTimeDAO.java +++ b/src/main/java/club/joylink/rtss/dao/DraftMapParkingTimeDAO.java @@ -3,39 +3,12 @@ package club.joylink.rtss.dao; import club.joylink.rtss.entity.DraftMapParkingTime; import club.joylink.rtss.entity.DraftMapParkingTimeExample; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import java.util.List; - +/** + * DraftMapParkingTimeDAO继承基类 + */ @Mapper @Repository -public interface DraftMapParkingTimeDAO { - long countByExample(DraftMapParkingTimeExample example); - - int deleteByExample(DraftMapParkingTimeExample example); - - int deleteByPrimaryKey(Long id); - - int insert(DraftMapParkingTime record); - - int insertSelective(DraftMapParkingTime record); - - List selectByExampleWithBLOBs(DraftMapParkingTimeExample example); - - List selectByExample(DraftMapParkingTimeExample example); - - DraftMapParkingTime selectByPrimaryKey(Long id); - - int updateByExampleSelective(@Param("record") DraftMapParkingTime record, @Param("example") DraftMapParkingTimeExample example); - - int updateByExampleWithBLOBs(@Param("record") DraftMapParkingTime record, @Param("example") DraftMapParkingTimeExample example); - - int updateByExample(@Param("record") DraftMapParkingTime record, @Param("example") DraftMapParkingTimeExample example); - - int updateByPrimaryKeySelective(DraftMapParkingTime record); - - int updateByPrimaryKeyWithBLOBs(DraftMapParkingTime record); - - int updateByPrimaryKey(DraftMapParkingTime record); +public interface DraftMapParkingTimeDAO extends MyBatisBaseDao { } \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/dao/DraftMapRouteOverrunDAO.java b/src/main/java/club/joylink/rtss/dao/DraftMapRouteOverrunDAO.java new file mode 100644 index 000000000..c0ce117b9 --- /dev/null +++ b/src/main/java/club/joylink/rtss/dao/DraftMapRouteOverrunDAO.java @@ -0,0 +1,12 @@ +package club.joylink.rtss.dao; + +import club.joylink.rtss.entity.DraftMapRouteOverrun; +import club.joylink.rtss.entity.DraftMapRouteOverrunExample; +import org.springframework.stereotype.Repository; + +/** + * DraftMapRouteOverrunDAO继承基类 + */ +@Repository +public interface DraftMapRouteOverrunDAO extends MyBatisBaseDao { +} diff --git a/src/main/java/club/joylink/rtss/dao/DraftMapStationDirectionDAO.java b/src/main/java/club/joylink/rtss/dao/DraftMapStationDirectionDAO.java new file mode 100644 index 000000000..8a2ed3db4 --- /dev/null +++ b/src/main/java/club/joylink/rtss/dao/DraftMapStationDirectionDAO.java @@ -0,0 +1,23 @@ +package club.joylink.rtss.dao; + +import club.joylink.rtss.entity.DraftMapStationDirection; +import club.joylink.rtss.entity.DraftMapStationDirectionExample; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * AssistButtonDAO继承基类 + */ +@Repository +public interface DraftMapStationDirectionDAO extends MyBatisBaseDao { + + /** + * 多数据保存 + * + * @param record + * @return + */ + int insertList(@Param("list") List records); +} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/dao/ExamDefinitionDAO.java b/src/main/java/club/joylink/rtss/dao/ExamDefinitionDAO.java index fb4008a80..5e22b6cb3 100644 --- a/src/main/java/club/joylink/rtss/dao/ExamDefinitionDAO.java +++ b/src/main/java/club/joylink/rtss/dao/ExamDefinitionDAO.java @@ -28,7 +28,7 @@ public interface ExamDefinitionDAO extends MyBatisBaseDao " + " (#{entity.id,jdbcType=BIGINT}, #{entity.lessonId,jdbcType=BIGINT}, #{entity.name,jdbcType=VARCHAR}," + @@ -36,7 +36,8 @@ public interface ExamDefinitionDAO extends MyBatisBaseDao" + "") int batchInsertWithId(@Param("list") List definitionList); diff --git a/src/main/java/club/joylink/rtss/dao/FileBindingDAO.java b/src/main/java/club/joylink/rtss/dao/FileBindingDAO.java new file mode 100644 index 000000000..4782ce5b8 --- /dev/null +++ b/src/main/java/club/joylink/rtss/dao/FileBindingDAO.java @@ -0,0 +1,12 @@ +package club.joylink.rtss.dao; + +import club.joylink.rtss.entity.FileBinding; +import club.joylink.rtss.entity.FileBindingExample; +import org.springframework.stereotype.Repository; + +/** + * FileBindingDAO继承基类 + */ +@Repository +public interface FileBindingDAO extends MyBatisBaseDao { +} diff --git a/src/main/java/club/joylink/rtss/dao/FileDAO.java b/src/main/java/club/joylink/rtss/dao/FileDAO.java new file mode 100644 index 000000000..fbb53e612 --- /dev/null +++ b/src/main/java/club/joylink/rtss/dao/FileDAO.java @@ -0,0 +1,12 @@ +package club.joylink.rtss.dao; + +import club.joylink.rtss.entity.File; +import club.joylink.rtss.entity.FileExample; +import org.springframework.stereotype.Repository; + +/** + * FileDAO继承基类 + */ +@Repository +public interface FileDAO extends MyBatisBaseDao { +} diff --git a/src/main/java/club/joylink/rtss/dao/IscsDeviceDAO.java b/src/main/java/club/joylink/rtss/dao/IscsDeviceDAO.java new file mode 100644 index 000000000..029d60bc4 --- /dev/null +++ b/src/main/java/club/joylink/rtss/dao/IscsDeviceDAO.java @@ -0,0 +1,12 @@ +package club.joylink.rtss.dao; + +import club.joylink.rtss.entity.IscsDevice; +import club.joylink.rtss.entity.IscsDeviceExample; +import org.springframework.stereotype.Repository; + +/** + * IscsDeviceDAO继承基类 + */ +@Repository +public interface IscsDeviceDAO extends MyBatisBaseDao { +} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/dao/IscsSystemResourcesDAO.java b/src/main/java/club/joylink/rtss/dao/IscsSystemResourcesDAO.java new file mode 100644 index 000000000..59ffb2f0c --- /dev/null +++ b/src/main/java/club/joylink/rtss/dao/IscsSystemResourcesDAO.java @@ -0,0 +1,12 @@ +package club.joylink.rtss.dao; + +import club.joylink.rtss.entity.IscsSystemResources; +import club.joylink.rtss.entity.IscsSystemResourcesExample; +import org.springframework.stereotype.Repository; + +/** + * IscsSystemResourcesDAO继承基类 + */ +@Repository +public interface IscsSystemResourcesDAO extends MyBatisBaseDao { +} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/dao/LearnMessageDAO.java b/src/main/java/club/joylink/rtss/dao/LearnMessageDAO.java index 9b20db6f1..182609a60 100644 --- a/src/main/java/club/joylink/rtss/dao/LearnMessageDAO.java +++ b/src/main/java/club/joylink/rtss/dao/LearnMessageDAO.java @@ -26,12 +26,12 @@ public interface LearnMessageDAO extends MyBatisBaseDao " + " (#{entity.id,jdbcType=BIGINT}, #{entity.mapId,jdbcType=BIGINT}," + " #{entity.graphData,jdbcType=LONGVARCHAR}, #{entity.logicData,jdbcType=LONGVARCHAR}," + - " #{entity.version, jdbcType=VARCHAR}, #{entity.time, jdbcType=TIMESTAMP}, #{entity.userId, jdbcType=BIGINT})"+ + " #{entity.initPosConfig,jdbcType=LONGVARCHAR}, #{entity.checkConfig,jdbcType=LONGVARCHAR}," + + " #{entity.ciGenerateConfig,jdbcType=LONGVARCHAR}, #{entity.bigScreenConfig,jdbcType=LONGVARCHAR}" + + " #{entity.version, jdbcType=VARCHAR}, , #{entity.note, jdbcType=VARCHAR}, #{entity.time, jdbcType=TIMESTAMP}, #{entity.userId, jdbcType=BIGINT})"+ " " + "") int batchInsertWithId(@Param("list") List mapDataList); diff --git a/src/main/java/club/joylink/rtss/dao/MapSystemDAO.java b/src/main/java/club/joylink/rtss/dao/MapSystemDAO.java index 2727cc169..0f8958ec8 100644 --- a/src/main/java/club/joylink/rtss/dao/MapSystemDAO.java +++ b/src/main/java/club/joylink/rtss/dao/MapSystemDAO.java @@ -38,8 +38,8 @@ public interface MapSystemDAO extends MyBatisBaseDao " + " (#{entity.id,jdbcType=BIGINT}, #{entity.name,jdbcType=VARCHAR}, #{entity.type,jdbcType=VARCHAR}," + " #{entity.mapId,jdbcType=BIGINT}, #{entity.prdType,jdbcType=VARCHAR}," + - " #{entity.customized,jdbcType=VARCHAR}, #{entity.status,jdbcType=VARCHAR})"+ + " #{entity.customized,jdbcType=VARCHAR}, #{entity.status,jdbcType=VARCHAR}, #{entity.newApi,jdbcType=TINYINT})"+ " " + "") int batchInsertWithId(@Param("list") List mapSystemList); -} \ No newline at end of file +} diff --git a/src/main/java/club/joylink/rtss/dao/Model2dDAO.java b/src/main/java/club/joylink/rtss/dao/Model2dDAO.java new file mode 100644 index 000000000..bcfa2bcfb --- /dev/null +++ b/src/main/java/club/joylink/rtss/dao/Model2dDAO.java @@ -0,0 +1,41 @@ +package club.joylink.rtss.dao; + +import club.joylink.rtss.entity.Model2d; +import club.joylink.rtss.entity.Model2dExample; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Mapper +@Repository +public interface Model2dDAO { + long countByExample(Model2dExample example); + + int deleteByExample(Model2dExample example); + + int deleteByPrimaryKey(Long id); + + int insert(Model2d record); + + int insertSelective(Model2d record); + + List selectByExampleWithBLOBs(Model2dExample example); + + List selectByExample(Model2dExample example); + + Model2d selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") Model2d record, @Param("example") Model2dExample example); + + int updateByExampleWithBLOBs(@Param("record") Model2d record, @Param("example") Model2dExample example); + + int updateByExample(@Param("record") Model2d record, @Param("example") Model2dExample example); + + int updateByPrimaryKeySelective(Model2d record); + + int updateByPrimaryKeyWithBLOBs(Model2d record); + + int updateByPrimaryKey(Model2d record); +} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/dao/Model2dDraftDAO.java b/src/main/java/club/joylink/rtss/dao/Model2dDraftDAO.java new file mode 100644 index 000000000..17e8ba45d --- /dev/null +++ b/src/main/java/club/joylink/rtss/dao/Model2dDraftDAO.java @@ -0,0 +1,41 @@ +package club.joylink.rtss.dao; + +import club.joylink.rtss.entity.Model2dDraft; +import club.joylink.rtss.entity.Model2dDraftExample; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Mapper +@Repository +public interface Model2dDraftDAO { + long countByExample(Model2dDraftExample example); + + int deleteByExample(Model2dDraftExample example); + + int deleteByPrimaryKey(Long id); + + int insert(Model2dDraft record); + + int insertSelective(Model2dDraft record); + + List selectByExampleWithBLOBs(Model2dDraftExample example); + + List selectByExample(Model2dDraftExample example); + + Model2dDraft selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") Model2dDraft record, @Param("example") Model2dDraftExample example); + + int updateByExampleWithBLOBs(@Param("record") Model2dDraft record, @Param("example") Model2dDraftExample example); + + int updateByExample(@Param("record") Model2dDraft record, @Param("example") Model2dDraftExample example); + + int updateByPrimaryKeySelective(Model2dDraft record); + + int updateByPrimaryKeyWithBLOBs(Model2dDraft record); + + int updateByPrimaryKey(Model2dDraft record); +} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/dao/ProjectServerDAO.java b/src/main/java/club/joylink/rtss/dao/ProjectServerDAO.java index b80d623b5..1f1e7b7c9 100644 --- a/src/main/java/club/joylink/rtss/dao/ProjectServerDAO.java +++ b/src/main/java/club/joylink/rtss/dao/ProjectServerDAO.java @@ -2,13 +2,11 @@ package club.joylink.rtss.dao; import club.joylink.rtss.entity.ProjectServer; import club.joylink.rtss.entity.ProjectServerExample; -import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; /** * ProjectServerDAO继承基类 */ -@Mapper @Repository public interface ProjectServerDAO extends MyBatisBaseDao { } \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/dao/RaceQuestionMocksStatsDAO.java b/src/main/java/club/joylink/rtss/dao/RaceQuestionMocksStatsDAO.java index ea66eef8e..7dca498af 100644 --- a/src/main/java/club/joylink/rtss/dao/RaceQuestionMocksStatsDAO.java +++ b/src/main/java/club/joylink/rtss/dao/RaceQuestionMocksStatsDAO.java @@ -22,7 +22,7 @@ public interface RaceQuestionMocksStatsDAO extends MyBatisBaseDao") diff --git a/src/main/java/club/joylink/rtss/dao/RunPlanLoadDAO.java b/src/main/java/club/joylink/rtss/dao/RunPlanLoadDAO.java index 35bb48837..bf9854a00 100644 --- a/src/main/java/club/joylink/rtss/dao/RunPlanLoadDAO.java +++ b/src/main/java/club/joylink/rtss/dao/RunPlanLoadDAO.java @@ -15,13 +15,13 @@ import java.util.List; public interface RunPlanLoadDAO extends MyBatisBaseDao { @Insert(value = "") int batchInsertWithId(@Param("list") List runPlanLoadList); -} \ No newline at end of file +} diff --git a/src/main/java/club/joylink/rtss/dao/SysAccountDAO.java b/src/main/java/club/joylink/rtss/dao/SysAccountDAO.java new file mode 100644 index 000000000..65a284b25 --- /dev/null +++ b/src/main/java/club/joylink/rtss/dao/SysAccountDAO.java @@ -0,0 +1,32 @@ +package club.joylink.rtss.dao; + +import club.joylink.rtss.entity.SysAccount; +import club.joylink.rtss.entity.SysAccountExample; +import club.joylink.rtss.vo.AccountVO; +import club.joylink.rtss.vo.UserQueryVO; +import club.joylink.rtss.vo.statistics.DailyLiveQuantityVO; +import org.apache.ibatis.annotations.*; +import org.springframework.stereotype.Repository; + +import java.time.LocalDate; +import java.util.List; + +/** + * SysAccountDAO继承基类 + */ +@Mapper +@Repository +public interface SysAccountDAO extends MyBatisBaseDao { + + @Select("") + List statisticsDailyRegister(@Param("beginDate") LocalDate beginDate, @Param("endDate") LocalDate endDate); + + List queryUsersWithCompany(UserQueryVO queryVO); + AccountVO queryUserWithCompany(@Param("userId") Long userId); +} diff --git a/src/main/java/club/joylink/rtss/dao/SysUserLoginDAO.java b/src/main/java/club/joylink/rtss/dao/SysAccountLoginDAO.java similarity index 70% rename from src/main/java/club/joylink/rtss/dao/SysUserLoginDAO.java rename to src/main/java/club/joylink/rtss/dao/SysAccountLoginDAO.java index d87721662..44300b6b0 100644 --- a/src/main/java/club/joylink/rtss/dao/SysUserLoginDAO.java +++ b/src/main/java/club/joylink/rtss/dao/SysAccountLoginDAO.java @@ -1,8 +1,9 @@ package club.joylink.rtss.dao; -import club.joylink.rtss.entity.SysUserLogin; -import club.joylink.rtss.entity.SysUserLoginExample; +import club.joylink.rtss.entity.SysAccountLogin; +import club.joylink.rtss.entity.SysAccountLoginExample; import club.joylink.rtss.vo.statistics.DailyLiveQuantityVO; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; @@ -11,15 +12,17 @@ import java.time.LocalDate; import java.util.List; /** - * SysUserLoginDAO继承基类 + * SysAccountLoginDAO继承基类 */ +@Mapper @Repository -public interface SysUserLoginDAO extends MyBatisBaseDao { +public interface SysAccountLoginDAO extends MyBatisBaseDao { + /**查询用户通过当前客户端*在此日期范围内登陆的天数*/ @Select("") long countDailyLiveUsers(@Param("day") LocalDate day); @Select("") - int batchInsert(@Param("list") List userList); - - @Select("") - List statisticsDailyRegister(@Param("beginDate") LocalDate beginDate, @Param("endDate") LocalDate endDate); - - List queryUsersWithCompany(UserQueryVO queryVO); - UserVO queryUserWithCompany(@Param("userId") Long userId); -} diff --git a/src/main/java/club/joylink/rtss/dao/SysUserMapper.java b/src/main/java/club/joylink/rtss/dao/SysUserMapper.java deleted file mode 100644 index dd5a85843..000000000 --- a/src/main/java/club/joylink/rtss/dao/SysUserMapper.java +++ /dev/null @@ -1,33 +0,0 @@ -package club.joylink.rtss.dao; - -import club.joylink.rtss.entity.SysUser; -import club.joylink.rtss.entity.SysUserExample; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface SysUserMapper { - long countByExample(SysUserExample example); - - int deleteByExample(SysUserExample example); - - int deleteByPrimaryKey(Long id); - - int insert(SysUser record); - - int insertSelective(SysUser record); - - List selectByExample(SysUserExample example); - - SysUser selectByPrimaryKey(Long id); - - int updateByExampleSelective(@Param("record") SysUser record, @Param("example") SysUserExample example); - - int updateByExample(@Param("record") SysUser record, @Param("example") SysUserExample example); - - int updateByPrimaryKeySelective(SysUser record); - - int updateByPrimaryKey(SysUser record); -} \ No newline at end of file diff --git a/src/main/java/club/joylink/rtss/dao/TrainingDAO.java b/src/main/java/club/joylink/rtss/dao/TrainingDAO.java index a290df295..5380b2417 100644 --- a/src/main/java/club/joylink/rtss/dao/TrainingDAO.java +++ b/src/main/java/club/joylink/rtss/dao/TrainingDAO.java @@ -59,7 +59,7 @@ public interface TrainingDAO extends MyBatisBaseDao and ls.name like CONCAT('%',#{lessonName},'%') " + " and training.name like CONCAT('%',#{trainingName},'%') " + @@ -145,4 +145,4 @@ public interface TrainingDAO extends MyBatisBaseDao and ue.exam_name like CONCAT('%',#{examName},'%') " + " and user.name like CONCAT('%',#{userName},'%') " + @@ -92,7 +92,7 @@ public interface UserExamMapper { "MAX(exam.score) as score, " + "user.nickname AS userNickname " + "FROM user_exam exam " + - "LEFT JOIN sys_user user ON user.id = exam.user_id " + + "LEFT JOIN sys_account user ON user.id = exam.user_id " + "WHERE exam.exam_id = #{examId} " + "AND result != 01 " + "GROUP BY exam.user_id, user.nickname " + diff --git a/src/main/java/club/joylink/rtss/dao/UserPermissionDAO.java b/src/main/java/club/joylink/rtss/dao/UserPermissionDAO.java index 5969fa595..37f2d87ab 100644 --- a/src/main/java/club/joylink/rtss/dao/UserPermissionDAO.java +++ b/src/main/java/club/joylink/rtss/dao/UserPermissionDAO.java @@ -33,10 +33,11 @@ public interface UserPermissionDAO extends MyBatisBaseDao" + " " + @@ -79,7 +81,7 @@ public interface UserSimulationStatsDAO extends MyBatisBaseDao" + + "SELECT" + + " sum(duration) AS simulationDuration," + + " user_id as userId" + + " FROM" + + " user_simulation_stats" + + " WHERE" + + " map_id = #{mapId}" + + " " + + " and end_time >= #{startTime}" + + " " + + " " + + " and end_time <= #{endTime}" + + " " + + " AND user_id IN" + + " " + + " #{userId}" + + " " + + " GROUP BY user_id;" + + "") + List queryUsage(long mapId, List userIds, LocalDateTime startTime, LocalDateTime endTime); +} diff --git a/src/main/java/club/joylink/rtss/dao/UserTrainingStatsMapper.java b/src/main/java/club/joylink/rtss/dao/UserTrainingStatsMapper.java index d981e4e4d..9ad83d38d 100644 --- a/src/main/java/club/joylink/rtss/dao/UserTrainingStatsMapper.java +++ b/src/main/java/club/joylink/rtss/dao/UserTrainingStatsMapper.java @@ -53,7 +53,7 @@ public interface UserTrainingStatsMapper { "u.nickname AS userNickname, " + "ut.user_id AS userId " + "FROM user_training_stats ut " + - "LEFT JOIN sys_user u ON u.id = ut.user_id " + + "LEFT JOIN sys_account u ON u.id = ut.user_id " + "WHERE ut.lesson_id = #{lessonId} " + "GROUP BY ut.lesson_id, u.nickname, ut.user_id " + "ORDER BY duration DESC, count DESC" + @@ -66,7 +66,7 @@ public interface UserTrainingStatsMapper { "u.name AS username, " + "ut.user_id AS userId " + "FROM user_training_stats ut " + - "LEFT JOIN sys_user u ON u.id = ut.user_id " + + "LEFT JOIN sys_account u ON u.id = ut.user_id " + "WHERE u.id = #{userId} AND ut.finish_time >= #{startTime} AND ut.finish_time <= #{endTime} " + "AND ut.lesson_id IN" + "" + @@ -75,6 +75,31 @@ public interface UserTrainingStatsMapper { "") UserRankStatsVO selectRank(LocalDateTime startTime, LocalDateTime endTime, List lessonIds, Long userId); + @Select("") + List selectUsage(LocalDateTime startTime, LocalDateTime endTime, List lessonIds, List userIds); + @Select("