时空连接本地修改

common/common_utils/src/main/java/com/founder/commonutils/util/JDBCUtil.java

@@ -4,9 +4,12 @@ import java.sql.*;
 
 public class JDBCUtil {
     private static final String DRIVER = "com.mysql.cj.jdbc.Driver";//驱动类类名
-    private static final String DBURL = "jdbc:mysql://47.92.48.137:3900/skyp?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai";//连接URL,javaweb为数据库名
+/*    private static final String DBURL = "jdbc:mysql://47.92.48.137:3900/skyp?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai";//连接URL,javaweb为数据库名
     private static final String DBUSER = "root";//数据库用户
-    private static final String DBPASSWORD = "gkptCcYy123";//数据库密码
+    private static final String DBPASSWORD = "gkptCcYy123";//数据库密码*/
+    private static final String DBURL = "jdbc:mysql://localhost:3306/skyp?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai";//连接URL,javaweb为数据库名
+    private static final String DBUSER = "root";//数据库用户
+    private static final String DBPASSWORD = "123456";//数据库密码
 
     public static Connection getConnection() {
 

common/common_utils/src/main/java/com/founder/commonutils/util/JasyptEncryptorUtils.java

@@ -48,7 +48,7 @@ public class JasyptEncryptorUtils {
      * 测试
      */
     public static void main(String args[]) throws Exception {
-        String test1 = "430000000000000000";
+        String test1 = "123456";
         encode(test1);
         decode(encode(test1));
     }

common/service_base/src/main/resources/bootstrap.properties

@@ -9,10 +9,15 @@ logging.level.root=INFO
 #mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 
 #mysql\uFFFD\uFFFD\uFFFD\u077F\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
+#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+#spring.datasource.url=jdbc:mysql://47.92.48.137:3900/skyp?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+#spring.datasource.username=root
+#spring.datasource.password=gkptCcYy123
+
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://47.92.48.137:3900/skyp?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-spring.datasource.username=root
-spring.datasource.password=gkptCcYy123
+spring.datasource.xzxtdb.url=jdbc:mysql://127.0.0.1:3306/skyp?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+spring.datasource.xzxtdb.username=root
+spring.datasource.xzxtdb.password=123456
 
 #oracle\uFFFD\uFFFD\uFFFD\u077F\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 #spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver

service/monitoring/pom.xml

@@ -52,7 +52,7 @@
             报错：java.lang.IllegalStateException: Calling [asyncError()] is not valid for a request with Async state [MUST_DISPATCH]
             解决：移除tomcat，换成jetty
         -->
-<!--        <dependency>
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
             <exclusions>
@@ -65,19 +65,19 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jetty</artifactId>
-        </dependency>-->
-        <!--去除内嵌tomcat-->
+        </dependency>
+<!--        &lt;!&ndash;去除内嵌tomcat&ndash;&gt;
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-tomcat</artifactId>
             <scope>provided</scope>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.apache.tomcat.embed/tomcat-embed-websocket -->
-        <!--websocket依赖包-->
+        &lt;!&ndash; https://mvnrepository.com/artifact/org.apache.tomcat.embed/tomcat-embed-websocket &ndash;&gt;
+        &lt;!&ndash;websocket依赖包&ndash;&gt;
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-websocket</artifactId>
-        </dependency>
+        </dependency>-->
     </dependencies>
 
     <build>

service/pom.xml

@@ -11,6 +11,7 @@
     <packaging>pom</packaging>
     <modules>
         <module>publicapi</module>
+        <module>monitoring</module>
     </modules>
     <artifactId>service</artifactId>
     <dependencies>

service/publicapi/src/main/java/com/founder/publicapi/controller/SuggestionService/CommentController.java

@@ -111,6 +111,9 @@ public class CommentController {
         wrapper.eq("blog_id",commentEntity.getBlogId());
         wrapper.eq("is_delete","0");
         List<CommentEntity> list = commentMapper.selectList(wrapper);
+        if (list.size()==0){
+            return new MapRestResult(200,"没有评论信息",null);
+        }
 
 //        对评论时间进行排序
         list = list.stream().sorted(Comparator.comparing(CommentEntity::getCreateTime).reversed()).collect(Collectors.toList());

service/publicapi/src/main/java/com/founder/publicapi/controller/SuggestionService/PaperController.java

@@ -258,11 +258,16 @@ public class PaperController {
     public MapRestResult articleDetails(@RequestBody PaperEntity paperEntity) {
 
         PaperEntity paperEntity1 = paperMapper.selectById(paperEntity.getId());
+        if (paperEntity1!=null){
             SysUser sysUser = jbxxBysfz(paperEntity1.getUserName());
             paperEntity1.setName(sysUser.getTrueName());
             paperEntity1.setPolicemanId(sysUser.getPolicemanid());
 
             return new MapRestResult(200,"ok",paperEntity1);
+        }else {
+            return new MapRestResult(200,"文章不存在",paperEntity1);
+        }
+
     }
 
 

service/publicapi/src/main/resources/bootstrap-dev.properties

@@ -10,16 +10,22 @@ logging.level.root=INFO
 
 #mysql?????????
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.xzxtdb.url=ENC(Y1dXm7lJCGbPffW6Pbg/Uid1UK2Z1Tu2TNdp9AgqT/iXb4hNRriak+glPXYD6BnO4fQwN9Sj/zguByboO4FagHEQRN0tE57RI6rJEUeTt2JHb1rc2BG1wE9QPK96E5o9K/1TSAjnD/Rr2eAxy11tFLL2fQP35EOX)
-spring.datasource.xzxtdb.username=ENC(e7qsvm7EnrdHG04YnaTMsw==)
-spring.datasource.xzxtdb.password=ENC(XPnOn0zoWMgOG8gIws+Bh7JITC3mMqSn)
+spring.datasource.xzxtdb.url=ENC(T0NmBjW9iRM92xTRkj5iTWDkIMeqdHcsi2nsP6Ro6bYDNwGVDGDCqtpZrxg9SYL3RlpDyIvbS5R2uXxn702du4YNbolcvEbEWL+QCeJN7mwldnIHfF1xr7e/2TuD1QnlMg/Hhi9xBGymzDb0T2wdoT954YtUwhIa8eJQ5E6QAGk=)
+spring.datasource.xzxtdb.username=ENC(x4Dk5STviTUvoo3r+p7cFQ==)
+spring.datasource.xzxtdb.password=ENC(tVUXCj15Zc7cT5Jpz5LRKg==)
+#spring.datasource.xzxtdb.url=ENC(Y1dXm7lJCGbPffW6Pbg/Uid1UK2Z1Tu2TNdp9AgqT/iXb4hNRriak+glPXYD6BnO4fQwN9Sj/zguByboO4FagHEQRN0tE57RI6rJEUeTt2JHb1rc2BG1wE9QPK96E5o9K/1TSAjnD/Rr2eAxy11tFLL2fQP35EOX)
+#spring.datasource.xzxtdb.username=ENC(e7qsvm7EnrdHG04YnaTMsw==)
+#spring.datasource.xzxtdb.password=ENC(XPnOn0zoWMgOG8gIws+Bh7JITC3mMqSn)
 spring.datasource.xzxtdb.type=com.alibaba.druid.pool.DruidDataSource
 
 #oracle?????????(?????)
 spring.datasource.qgdb.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.qgdb.url=ENC(Y1dXm7lJCGbPffW6Pbg/Uid1UK2Z1Tu2TNdp9AgqT/iXb4hNRriak+glPXYD6BnO4fQwN9Sj/zguByboO4FagHEQRN0tE57RI6rJEUeTt2JHb1rc2BG1wE9QPK96E5o9K/1TSAjnD/Rr2eAxy11tFLL2fQP35EOX)
-spring.datasource.qgdb.username=ENC(e7qsvm7EnrdHG04YnaTMsw==)
-spring.datasource.qgdb.password=ENC(XPnOn0zoWMgOG8gIws+Bh7JITC3mMqSn)
+spring.datasource.qgdb.url=ENC(T0NmBjW9iRM92xTRkj5iTWDkIMeqdHcsi2nsP6Ro6bYDNwGVDGDCqtpZrxg9SYL3RlpDyIvbS5R2uXxn702du4YNbolcvEbEWL+QCeJN7mwldnIHfF1xr7e/2TuD1QnlMg/Hhi9xBGymzDb0T2wdoT954YtUwhIa8eJQ5E6QAGk=)
+spring.datasource.qgdb.username=ENC(x4Dk5STviTUvoo3r+p7cFQ==)
+spring.datasource.qgdb.password=ENC(tVUXCj15Zc7cT5Jpz5LRKg==)
+#spring.datasource.qgdb.url=ENC(Y1dXm7lJCGbPffW6Pbg/Uid1UK2Z1Tu2TNdp9AgqT/iXb4hNRriak+glPXYD6BnO4fQwN9Sj/zguByboO4FagHEQRN0tE57RI6rJEUeTt2JHb1rc2BG1wE9QPK96E5o9K/1TSAjnD/Rr2eAxy11tFLL2fQP35EOX)
+#spring.datasource.qgdb.username=ENC(e7qsvm7EnrdHG04YnaTMsw==)
+#spring.datasource.qgdb.password=ENC(XPnOn0zoWMgOG8gIws+Bh7JITC3mMqSn)
 spring.datasource.qgdb.type=com.alibaba.druid.pool.DruidDataSource
 
 #redis
@@ -80,19 +86,24 @@ info.author=founder
 info.version=1.0.0
 info.adderss=http://47.92.48.137:1004/#/login
 
-spring.boot.admin.client.instance.prefer-ip=true
+#spring.boot.admin.client.instance.prefer-ip=true
 #\u542F\u7528\u7AEF\u70B9\uFF0C\u9ED8\u8BA4\u60C5\u51B5\u4E0B\uFF0C\u9664shutdown\u4EE5\u5916\u7684\u6240\u6709\u7AEF\u70B9\u5747\u5DF2\u542F\u7528
 management.endpoint.shutdown.enabled=true
 #\u663E\u793Adb\u3001redis\u3001rabbti\u8FDE\u63A5\u60C5\u51B5\u7B49
 management.endpoint.health.show-details=always
+#\u5065\u5EB7\u72B6\u6001\u7981\u7528\u6307\u6807
+management.health.redis.enabled=false
+management.health.mail.enabled=false
 #\u516C\u5F00\u6240\u6709\u7AEF\u70B9web\u63A5\u53E3
 management.endpoints.web.exposure.include=*
 #\u670D\u52A1\u7AEFadmin-server\u5730\u5740\uFF0C\u4EE5\u53CA\u767B\u5F55\u8D26\u53F7\u3001\u5BC6\u7801
-spring.boot.admin.client.url=http://47.92.48.137:10010
+spring.boot.admin.client.url=http://localhost:10010
 spring.boot.admin.client.username=admin
 spring.boot.admin.client.password=admin
+#spring.boot.admin.monitor.default-timeout=30000
+
 
 ##\u53EF\u5728\u7EBF\u67E5\u770B\u65E5\u5FD7\uFF0C \u65E5\u5FD7\u5B9E\u65F6\u67E5\u770B\u662Fclient\u63D0\u4F9B\u4E00\u4E2A\u8BFB\u53D6\u672C\u5730\u6587\u4EF6\u7684\u63A5\u53E3\uFF0C\u7136\u540Eadmin\u5B9A\u65F6\u8C03\u7528\u663E\u793A\uFF0C\u8FBE\u5230\u5B9E\u65F6\u5C55\u793A\u7684\u6548\u679C\u3002
-management.endpoint.logfile.enabled=true
+#management.endpoint.logfile.enabled=true
 #\u751F\u6210\u65E5\u5FD7\u7684\u8DEF\u5F84\u8DDF\u66B4\u9732\u7ED9\u670D\u52A1\u7AEF\u7684\u8DEF\u5F84\u8981\u4E00\u81F4---\u9875\u9762\u65E5\u5FD7\u6587\u4EF6\u5199\u672C\u5730\u751F\u6210\u65E5\u5FD7\u6587\u4EF6\u7684\u8DEF\u5F84
-management.endpoint.logfile.external-file= /data2/skglpt/publicapi1003.log
+#management.endpoint.logfile.external-file= /data2/skglpt/publicapi1003.log
\ No newline at end of file