Merge branch 'feature-refactor' of ssh://10.10.100.21/source/platform-bi-server into feature-refactor

bi-server/src/main/java/com/usoftchina/bi/server/dao/common/UASMapper.java

@@ -29,6 +29,7 @@ public interface UASMapper {
             + "#{em_id,mode=IN,jdbcType=VARCHAR},"
             + "#{em_code,mode=IN,jdbcType=VARCHAR},"
             + "#{em_name,mode=IN,jdbcType=VARCHAR},"
+            + "#{sob_name,mode=IN,jdbcType=VARCHAR},"
             + "#{res,mode=OUT,jdbcType=VARCHAR})" })
     @Options(statementType=StatementType.CALLABLE)
     String sp_refreshdata(RefreshData refreshData);

bi-server/src/main/java/com/usoftchina/bi/server/model/po/RefreshData.java

@@ -8,8 +8,17 @@ public class RefreshData {
     private String em_name;
     private String em_code;
     private String em_id;
+    private String sob_name;
     private String res = "";
 
+    public String getSob_name() {
+        return sob_name;
+    }
+
+    public void setSob_name(String sob_name) {
+        this.sob_name = sob_name;
+    }
+
     public String getSob() {
         return sob;
     }

bi-server/src/main/resources/application-dev.properties

@@ -6,4 +6,6 @@ spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
 #Êý¾Ý¿âÁ¬½ÓµØÖ·
 spring.datasource.url=jdbc:oracle:thin:@10.1.81.2:1521:orcl
 spring.datasource.username=UAS_DEV
-spring.datasource.password=select!#%*(
+spring.datasource.password=select!#%*(
+server.port=8012
+server.servlet.context-path=/BI-DEV

bi-server/src/main/resources/application.properties

@@ -79,4 +79,4 @@ server.servlet.context-path=/BI
 #server.session.timeout=10
 server.tomcat.uri-encoding=UTF-8
 #debug=true
-logging.level.com.usoftchina.bi.server=debug
+#logging.level.com.usoftchina.bi.server=debug