lbqms.git - Gitblit

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-08-13 088bc98a43d4b1fa382ed089210d3458a95f3a87

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-ui/package.json

已修改10个文件

	pom.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-admin/pom.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-admin/src/main/resources/application.yml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-common/pom.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-framework/pom.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-generator/pom.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-quartz/pom.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/pom.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-ui/package.json	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-ui/src/utils/jsencrypt.js	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 pom.xml

@@ -6,14 +6,14 @@
    

    <groupId>com.ruoyi</groupId>

    <artifactId>ruoyi</artifactId>

    <version>3.0.0</version>

    <version>3.1.0</version>



    <name>ruoyi</name>

    <url>http://www.ruoyi.vip</url>

    <description>若依管理系统</description>

    

    <properties>

        <ruoyi.version>3.0.0</ruoyi.version>

        <ruoyi.version>3.1.0</ruoyi.version>

        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

        <java.version>1.8</java.version>


 ruoyi-admin/pom.xml

@@ -5,7 +5,7 @@
    <parent>

        <artifactId>ruoyi</artifactId>

        <groupId>com.ruoyi</groupId>

        <version>3.0.0</version>

        <version>3.1.0</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>

    <packaging>jar</packaging>

@@ -95,7 +95,7 @@
            <plugin>   

                <groupId>org.apache.maven.plugins</groupId>   

                <artifactId>maven-war-plugin</artifactId>   

                <version>3.0.0</version>   
                <version>3.1.0</version>   
                <configuration>

                    <failOnMissingWebXml>false</failOnMissingWebXml>

                    <warName>${project.artifactId}</warName>


 ruoyi-admin/src/main/resources/application.yml

@@ -3,7 +3,7 @@
  # 名称
  name: RuoYi
  # 版本
  version: 3.0.0
  version: 3.1.0
  # 版权年份
  copyrightYear: 2019
  # 实例演示开关

 ruoyi-common/pom.xml

@@ -5,7 +5,7 @@
    <parent>

        <artifactId>ruoyi</artifactId>

        <groupId>com.ruoyi</groupId>

        <version>3.0.0</version>

        <version>3.1.0</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>




 ruoyi-framework/pom.xml

@@ -5,7 +5,7 @@
    <parent>

        <artifactId>ruoyi</artifactId>

        <groupId>com.ruoyi</groupId>

        <version>3.0.0</version>

        <version>3.1.0</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>




 ruoyi-generator/pom.xml

@@ -5,7 +5,7 @@
    <parent>

        <artifactId>ruoyi</artifactId>

        <groupId>com.ruoyi</groupId>

        <version>3.0.0</version>

        <version>3.1.0</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>




 ruoyi-quartz/pom.xml

@@ -5,7 +5,7 @@
    <parent>

        <artifactId>ruoyi</artifactId>

        <groupId>com.ruoyi</groupId>

        <version>3.0.0</version>

        <version>3.1.0</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>




 ruoyi-system/pom.xml

@@ -5,7 +5,7 @@
    <parent>

        <artifactId>ruoyi</artifactId>

        <groupId>com.ruoyi</groupId>

        <version>3.0.0</version>

        <version>3.1.0</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>




 ruoyi-ui/package.json

@@ -1,6 +1,6 @@
{
  "name": "ruoyi",
  "version": "3.0.0",
  "version": "3.1.0",
  "description": "若依管理系统",
  "author": "若依",
  "license": "MIT",

 ruoyi-ui/src/utils/jsencrypt.js

@@ -2,29 +2,29 @@

// 密钥对生成 http://web.chacuo.net/netrsakeypair

const publicKey = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANL378k3RiZHWx5AfJqdH9xRNBmD9wGD\n' +
  '2iRe41HdTNF8RUhNnHit5NpMNtGL0NPTSSpPjjI1kJfVorRvaQerUgkCAwEAAQ=='
const publicKey = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdH\n' +
  'nzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ=='

const privateKey = 'MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8\n' +
  'mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9p\n' +
  'B6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue\n' +
  '/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZ\n' +
  'UBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6\n' +
  'vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha\n' +
  '4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3\n' +
  'tTbklZkD2A=='
const privateKey = 'MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY\n' +
  '7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKN\n' +
  'PuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gA\n' +
  'kM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWow\n' +
  'cSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99Ecv\n' +
  'DQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthh\n' +
  'YhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3\n' +
  'UP8iWi1Qw0Y='

// 加密
export function encrypt(txt) {
  const encryptor = new JSEncrypt()
  encryptor.setPublicKey(publicKey) // 设置公钥
  return encryptor.encrypt(txt) // 对需要加密的数据进行加密
  return encryptor.encrypt(txt) // 对数据进行加密
}

// 解密
export function decrypt(txt) {
  const encryptor = new JSEncrypt()
  encryptor.setPrivateKey(privateKey)
  return encryptor.decrypt(txt)
  encryptor.setPrivateKey(privateKey) // 设置私钥
  return encryptor.decrypt(txt) // 对数据进行解密
}

			@@ -6,14 +6,14 @@

			<groupId>com.ruoyi</groupId>
			<artifactId>ruoyi</artifactId>
			<version>3.0.0</version>
			<version>3.1.0</version>

			<name>ruoyi</name>
			<url>http://www.ruoyi.vip</url>
			<description>若依管理系统</description>

			<properties>
			<ruoyi.version>3.0.0</ruoyi.version>
			<ruoyi.version>3.1.0</ruoyi.version>
			<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
			<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
			<java.version>1.8</java.version>

			@@ -5,7 +5,7 @@
			<parent>
			<artifactId>ruoyi</artifactId>
			<groupId>com.ruoyi</groupId>
			<version>3.0.0</version>
			<version>3.1.0</version>
			</parent>
			<modelVersion>4.0.0</modelVersion>
			<packaging>jar</packaging>
			@@ -95,7 +95,7 @@
			<plugin>
			<groupId>org.apache.maven.plugins</groupId>
			<artifactId>maven-war-plugin</artifactId>
			<version>3.0.0</version>
			<version>3.1.0</version>
			<configuration>
			<failOnMissingWebXml>false</failOnMissingWebXml>
			<warName>${project.artifactId}</warName>

			@@ -3,7 +3,7 @@
			# 名称
			name: RuoYi
			# 版本
			version: 3.0.0
			version: 3.1.0
			# 版权年份
			copyrightYear: 2019
			# 实例演示开关

			@@ -1,6 +1,6 @@
			{
			"name": "ruoyi",
			"version": "3.0.0",
			"version": "3.1.0",
			"description": "若依管理系统",
			"author": "若依",
			"license": "MIT",

			@@ -2,29 +2,29 @@

			// 密钥对生成 http://web.chacuo.net/netrsakeypair

			const publicKey = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANL378k3RiZHWx5AfJqdH9xRNBmD9wGD\n' +
			'2iRe41HdTNF8RUhNnHit5NpMNtGL0NPTSSpPjjI1kJfVorRvaQerUgkCAwEAAQ=='
			const publicKey = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdH\n' +
			'nzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ=='

			const privateKey = 'MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8\n' +
			'mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9p\n' +
			'B6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue\n' +
			'/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZ\n' +
			'UBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6\n' +
			'vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha\n' +
			'4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3\n' +
			'tTbklZkD2A=='
			const privateKey = 'MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY\n' +
			'7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKN\n' +
			'PuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gA\n' +
			'kM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWow\n' +
			'cSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99Ecv\n' +
			'DQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthh\n' +
			'YhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3\n' +
			'UP8iWi1Qw0Y='

			// 加密
			export function encrypt(txt) {
			const encryptor = new JSEncrypt()
			encryptor.setPublicKey(publicKey) // 设置公钥
			return encryptor.encrypt(txt) // 对需要加密的数据进行加密
			return encryptor.encrypt(txt) // 对数据进行加密
			}

			// 解密
			export function decrypt(txt) {
			const encryptor = new JSEncrypt()
			encryptor.setPrivateKey(privateKey)
			return encryptor.decrypt(txt)
			encryptor.setPrivateKey(privateKey) // 设置私钥
			return encryptor.decrypt(txt) // 对数据进行解密
			}