From fcb0fe6eb560162312dcac141470b234639e694c Mon Sep 17 00:00:00 2001
From: root <zxsoft>
Date: Mon, 15 Nov 2021 22:12:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/dataease/Application.java | 2 +-
 backend/src/main/resources/application.properties  | 4 ++--
 backend/src/main/resources/generatorConfig.xml     | 2 +-
 backend/src/main/resources/logback.xml             | 2 +-
 conf/smartbi.properties                            | 4 ++--
 frontend/.npmrc                                    | 8 ++++++++
 frontend/pom.xml                                   | 3 ++-
 7 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 frontend/.npmrc

diff --git a/backend/src/main/java/io/dataease/Application.java b/backend/src/main/java/io/dataease/Application.java
index 216e335..d68685d 100644
--- a/backend/src/main/java/io/dataease/Application.java
+++ b/backend/src/main/java/io/dataease/Application.java
@@ -15,7 +15,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 })
 @ServletComponentScan
 @EnableScheduling
-@PropertySource(value = {"file:/opt/smartbi/conf/smartbi.properties"}, encoding = "UTF-8", ignoreResourceNotFound = true)
+@PropertySource(value = {"file:conf/smartbi.properties"}, encoding = "UTF-8", ignoreResourceNotFound = true)
 public class Application {
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 9b4d413..8b27c36 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -1,6 +1,6 @@
 spring.application.name=dataease
 
-server.port=19527
+server.port=8081
 
 # Hikari
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
@@ -60,7 +60,7 @@ quartz.scheduler-name=deServerJob
 spring.servlet.multipart.max-file-size=500MB
 spring.servlet.multipart.max-request-size=500MB
 # actuator
-management.server.port=19528
+management.server.port=8083
 management.endpoints.web.exposure.include=*
 #spring.freemarker.checkTemplateLocation=false
 #RSA非对称加密参数：私钥
diff --git a/backend/src/main/resources/generatorConfig.xml b/backend/src/main/resources/generatorConfig.xml
index 7f60e45..151a2db 100644
--- a/backend/src/main/resources/generatorConfig.xml
+++ b/backend/src/main/resources/generatorConfig.xml
@@ -3,7 +3,7 @@
         "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd" >
 <generatorConfiguration>
     <!--配置数据库连接的位置-->
-    <properties url="file:///opt/smartbi/conf/smartbi.properties"/>
+    <properties url="file://conf/smartbi.properties"/>
     <!-- 设置mysql驱动路径 -->
     <!--<classPathEntry location="/Users/liuruibin/.m2/repository/mysql/mysql-connector-java/5.1.34/mysql-connector-java-5.1.34.jar"/>-->
     <!-- 此处指定生成针对MyBatis3的DAO -->
diff --git a/backend/src/main/resources/logback.xml b/backend/src/main/resources/logback.xml
index 1eef538..aa6ef3e 100644
--- a/backend/src/main/resources/logback.xml
+++ b/backend/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="true">
 	<property resource="application.properties"/>
-	<property file="/opt/smartbi/conf/smartbi.properties"/>
+	<property file="conf/smartbi.properties"/>
 	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder>
 			<pattern>%d %5p %40.40c:%4L - %m%n</pattern>
diff --git a/conf/smartbi.properties b/conf/smartbi.properties
index 784dc70..75ccced 100644
--- a/conf/smartbi.properties
+++ b/conf/smartbi.properties
@@ -1,7 +1,7 @@
 # 数据库配置
-spring.datasource.url=jdbc:mysql://localhost:3306/smartbi?autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false
+spring.datasource.url=jdbc:mysql://49.235.142.162:3306/smartbi?autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false
 spring.datasource.username=root
-spring.datasource.password=123456
+spring.datasource.password=qinziyepao666!
 
 carte.host=kettle
 carte.port=18080
diff --git a/frontend/.npmrc b/frontend/.npmrc
new file mode 100644
index 0000000..d665814
--- /dev/null
+++ b/frontend/.npmrc
@@ -0,0 +1,8 @@
+home=https://npm.taobao.org
+registry=https://registry.npm.taobao.org/
+sass_binary_site="https://npm.taobao.org/mirrors/node-sass/"
+phantomjs_cdnurl="http://cnpmjs.org/downloads"
+electron_mirror="https://npm.taobao.org/mirrors/electron/"
+sqlite3_binary_host_mirror="https://foxgis.oss-cn-shanghai.aliyuncs.com/"
+profiler_binary_host_mirror="https://npm.taobao.org/mirrors/node-inspector/"
+chromedriver_cdnurl="https://cdn.npm.taobao.org/dist/chromedriver"
diff --git a/frontend/pom.xml b/frontend/pom.xml
index 604c6b2..730ee5a 100644
--- a/frontend/pom.xml
+++ b/frontend/pom.xml
@@ -44,7 +44,8 @@
             </goals>
             <!-- Optional configuration which provides for running any npm command -->
             <configuration>
-              <arguments>install --force</arguments>
+              <npmRegistryURL>https://registry.npm.taobao.org</npmRegistryURL>
+              <arguments>install --force --verbose</arguments>
             </configuration>
           </execution>