代码提交

zt-admin/src/main/java/com/wuzhen/web/controller/busi/ActiveInfoController.java

@@ -48,16 +48,12 @@ public class ActiveInfoController extends BaseController
     @Value("${wuzhen.lp}")
     private String lp ;
 
-    static String ipaddr ;
+    @Value("${spring.profiles.active}")
+    private String active ;
+
+
+
 
-    static {
-        try {
-            InetAddress addr = InetAddress.getLocalHost();
-            ipaddr = addr.getHostAddress();
-        } catch (UnknownHostException e) {
-            e.printStackTrace();
-        }
-    }
 
 
 
@@ -137,13 +133,13 @@ public class ActiveInfoController extends BaseController
                 HashMap map = new HashMap();
                 map.put("id",i);
                 map.put("filename",fileNamesArray[i]);
-                map.put("filepath","http://"+ipaddr+":18000/profile/upload/lp/"+fileNamesArray[i]);
+                map.put("filepath","http://"+this.getAdress()+":18000/profile/upload/lp/"+fileNamesArray[i]);
                 list.add(map);
             }
         }
         String json = JSONObject.toJSONString(list);
         activeInfo.setListLpNames(json);
-        activeInfo.setListLsNames("http://"+ipaddr+":18000/profile/upload/ls/"+activeInfo.getLsFilesName());
+        activeInfo.setListLsNames("http://"+this.getAdress()+":18000/profile/upload/ls/"+activeInfo.getLsFilesName());
         mmap.put("active", activeInfo);
         return prefix + "/edit";
     }
@@ -158,7 +154,7 @@ public class ActiveInfoController extends BaseController
     {
         ActiveInfo activeInfo = activeInfoService.selectActiveById(id);
 
-        activeInfo.setListFpNames("http://"+ipaddr+":18000/profile/upload/fp/"+activeInfo.getFpFilesName());
+        activeInfo.setListFpNames("http://"+this.getAdress()+":18000/profile/upload/fp/"+activeInfo.getFpFilesName());
         mmap.put("active", activeInfo);
         return prefix + "/first";
     }
@@ -246,4 +242,14 @@ public class ActiveInfoController extends BaseController
 
 
 
+    private String getAdress(){
+        String ipaddr ="";
+        if (active.equals("druid")){
+            ipaddr = "localhost";
+        }else if(active.equals("prd")){
+            ipaddr="47.94.96.229";
+        }
+      return ipaddr;
+    }
+
 }

zt-admin/src/main/resources/application-prd.yml

@@ -0,0 +1,57 @@
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://47.94.96.229:3306/zt_admin?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: zt_admin
+                password: root
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url: 
+                username: 
+                password: 
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter: 
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: admin
+                login-password: admin
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true

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

@@ -61,7 +61,7 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   profiles: 
-    active: druid
+    active: prd
   # 文件上传
   servlet:
      multipart: