调整文件夹名

epdc-cloud-property/doc/kettle/kettle.properties

@@ -0,0 +1,63 @@
+######################----yushan_screen----################################
+
+####======================== dev
+# db-source-yushan
+db.mysql.epdc.source.ys.host=47.104.224.45
+db.mysql.epdc.source.ys.port=3308
+db.mysql.epdc.source.ys.username=epdcyushan
+db.mysql.epdc.source.ys.password=Encrypted 2be98afc86ac29e8da512f6238dc2f98c
+
+# db-target-yushan
+db.mysql.epdc.target.ys.host=47.104.224.45
+db.mysql.epdc.target.ys.port=3308
+db.mysql.epdc.target.ys.username=epdcyushan
+db.mysql.epdc.target.ys.password=Encrypted 2be98afc86ac29e8da512f6238dc2f98c
+
+# databases-yushan-source
+db.mysql.source.schema.ys.admin=yushan_esua_epdc_admin
+db.mysql.source.schema.ys.custom=yushan_esua_epdc_custom
+db.mysql.source.schema.ys.points=yushan_esua_epdc_points
+db.mysql.source.schema.ys.mutuality=yushan_esua_epdc_mutuality
+db.mysql.source.schema.ys.events=yushan_esua_epdc_events
+db.mysql.source.schema.ys.group=yushan_esua_epdc_group
+db.mysql.source.schema.ys.news=yushan_esua_epdc_news
+db.mysql.source.schema.ys.user=yushan_esua_epdc_user
+db.mysql.source.schema.ys.api=yushan_esua_epdc_api
+db.mysql.source.schema.ys.property=yushan_esua_epdc_property
+
+# databases-yushan-target
+db.mysql.target.schema.yushandb=yushan_esua_epdc_screen
+
+
+
+
+####======================== prod
+# # db-source-yushan
+# db.mysql.epdc.source.ys.host=rm-m5ew61hl12e70oaw8.mysql.rds.aliyuncs.com
+# db.mysql.epdc.source.ys.port=3306
+# db.mysql.epdc.source.ys.username=epdcyushan
+# db.mysql.epdc.source.ys.password=Encrypted 656c696cd5fddfac09e7ab91b811af7e8cc2fd8a
+
+# # db-target-yushan
+# db.mysql.epdc.target.ys.host=rm-m5ew61hl12e70oaw8.mysql.rds.aliyuncs.com
+# db.mysql.epdc.target.ys.port=3306
+# db.mysql.epdc.target.ys.username=screen
+# db.mysql.epdc.target.ys.password=Encrypted 51ddeacaad04e78b91b811af7e8cc2fd8a
+
+# # databases-yushan-source
+# db.mysql.source.schema.ys.admin=esua_epdc_admin
+# db.mysql.source.schema.ys.custom=esua_epdc_custom
+# db.mysql.source.schema.ys.points=esua_epdc_points
+# db.mysql.source.schema.ys.mutuality=esua_epdc_mutuality
+# db.mysql.source.schema.ys.events=esua_epdc_events
+# db.mysql.source.schema.ys.group=esua_epdc_group
+# db.mysql.source.schema.ys.news=esua_epdc_news
+# db.mysql.source.schema.ys.user=esua_epdc_user
+# db.mysql.source.schema.ys.api=esua_epdc_api
+# db.mysql.source.schema.ys.property=esua_epdc_property
+
+# # databases-yushan-target
+# db.mysql.target.schema.yushandb=esua_epdc_screen
+
+######################----yushan_screen  end----################################
+

epdc-cloud-property/pom.xml

@@ -274,8 +274,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://rm-m5ew61hl12e70oaw8.mysql.rds.aliyuncs.com:3306/esua_epdc_property?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.username>epdcyushan</spring.datasource.druid.username>
-                <spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
+                <spring.datasource.druid.password>elinkepdc@Yushan2020</spring.datasource.druid.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>172.16.1.243:8848</nacos.server-addr>

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/project/service/impl/PropertyServiceImpl.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.dto.project.PropertyDTO;
 import com.elink.esua.epdc.dto.project.result.PropertyDictListResultDTO;