elis %!s(int64=2) %!d(string=hai) anos
pai
achega
c380554667

+ 10 - 95
nngkxxdp/pom.xml

@@ -218,110 +218,25 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <mainClass>com.example.nngkxxdp.NngkxxdpApplication</mainClass>
-                    <fork>true</fork>
-                    <addResources>true</addResources>
-                    <outputDirectory>${project.build.directory}/jar</outputDirectory>
-                </configuration>
             </plugin>
-<!--            <plugin>-->
-<!--                <groupId>org.jetbrains.kotlin</groupId>-->
-<!--                <artifactId>kotlin-maven-plugin</artifactId>-->
-<!--                <version>${kotlin.version}</version>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <id>compile</id>-->
-<!--                        <phase>compile</phase>-->
-<!--                        <goals>-->
-<!--                            <goal>compile</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                    <execution>-->
-<!--                        <id>test-compile</id>-->
-<!--                        <phase>test-compile</phase>-->
-<!--                        <goals>-->
-<!--                            <goal>test-compile</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <!-- 不打包资源文件(配置文件和依赖包分开) -->
-                    <excludes>
-                        <exclude>*.yml</exclude>
-                        <exclude>*.properties</exclude>
-                        <exclude>mybatis/**</exclude>
-                        <exclude>static/**</exclude>
-                    </excludes>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                            <!-- MANIFEST.MF 中 Class-Path 加入前缀 -->
-                            <classpathPrefix>lib/</classpathPrefix>
-                            <!-- jar包不包含唯一版本标识 -->
-                            <useUniqueVersions>false</useUniqueVersions>
-                            <!--指定入口类 -->
-                            <mainClass>com.example.nngkxxdp.NngkxxdpApplication</mainClass>
-                        </manifest>
-                        <manifestEntries>
-                            <!--MANIFEST.MF 中 Class-Path 加入资源文件目录 -->
-                            <Class-Path>./config/</Class-Path>
-                        </manifestEntries>
-                    </archive>
-                    <outputDirectory>${project.build.directory}</outputDirectory>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${kotlin.version}</version>
                 <executions>
-                    <execution> <!-- 复制配置文件 -->
-                        <id>copy-resources</id>
-                        <phase>package</phase>
+                    <execution>
+                        <id>compile</id>
+                        <phase>compile</phase>
                         <goals>
-                            <goal>copy-resources</goal>
+                            <goal>compile</goal>
                         </goals>
-                        <configuration>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/resources</directory>
-                                    <includes>
-                                        <include>*.yml</include>
-                                        <include>*.properties</include>
-                                        <include>mybatis/**</include>
-                                        <include>static/**</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                            <outputDirectory>${project.build.directory}/config</outputDirectory>
-                        </configuration>
                     </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.1.1</version>
-                <executions>
                     <execution>
-                        <id>copy-dependencies</id>
-                        <phase>package</phase>
+                        <id>test-compile</id>
+                        <phase>test-compile</phase>
                         <goals>
-                            <goal>copy-dependencies</goal>
+                            <goal>test-compile</goal>
                         </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/lib/</outputDirectory>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

+ 351 - 0
nngkxxdp/pom.xml.bak2

@@ -0,0 +1,351 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.1.15.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+    <groupId>com.example.nngkxxdp</groupId>
+    <artifactId>nngkxxdp</artifactId>
+    <version>0.0.1</version>
+    <name>nngkxxdp</name>
+    <description>Demo project for Spring Boot</description>
+
+
+    <properties>
+        <java.version>1.8</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8
+        </project.reporting.outputEncoding>
+        <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
+
+        <mybatis-spring-boot-starter>1.3.2</mybatis-spring-boot-starter>
+        <cn-hutool.version>5.5.2</cn-hutool.version>
+        <alibaba-fastjson.version>1.2.47</alibaba-fastjson.version>
+        <kotlin.version>1.0.0</kotlin.version>
+        <easyexcel.version>3.0.5</easyexcel.version>
+        <poi.version>3.17</poi.version>
+    </properties>
+
+    <dependencies>
+        <!-- idea 自动刷新静态文件 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-freemarker</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.auth0</groupId>
+            <artifactId>java-jwt</artifactId>
+            <version>3.8.2</version>
+        </dependency>
+        <!-- Spring Boot Mybatis 依赖 -->
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>${mybatis-spring-boot-starter}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>${cn-hutool.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>${alibaba-fastjson.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+        </dependency>
+
+        <!-- poi相关 -->
+        <!-- https://mvnrepository.com/artifact/org.apache.poi/poi -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>${poi.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>${poi.version}</version>
+        </dependency>
+
+        <!--财政局缴费接口 -->
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.apache.shiro/shiro-core -->
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-core</artifactId>
+            <version>1.4.2</version>
+        </dependency>
+
+        <!-- shiro-spring -->
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-spring</artifactId>
+            <version>1.4.2</version>
+        </dependency>
+
+        <!-- 自定义切面日志相关 -->
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjtools</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/ws.schild/jave-core -->
+        <dependency>
+            <groupId>ws.schild</groupId>
+            <artifactId>jave-core</artifactId>
+            <version>2.7.3</version>
+        </dependency>
+        <dependency>
+            <groupId>ws.schild</groupId>
+            <artifactId>jave-nativebin-linux64</artifactId>
+            <version>2.7.3</version>
+        </dependency>
+        <dependency>
+            <groupId>ws.schild</groupId>
+            <artifactId>jave-nativebin-win64</artifactId>
+            <version>2.7.3</version>
+        </dependency>
+        <dependency>
+            <groupId>ws.schild</groupId>
+            <artifactId>jave-nativebin-win32</artifactId>
+            <version>2.7.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.12</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.elasticsearch</groupId>
+            <artifactId>elasticsearch</artifactId>
+        </dependency>
+
+        <!-- Java High Level REST Client -->
+        <dependency>
+            <groupId>org.elasticsearch.client</groupId>
+            <artifactId>elasticsearch-rest-high-level-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+            <version>3.3.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>1.12.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib</artifactId>
+            <version>${kotlin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test</artifactId>
+            <version>${kotlin.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+            <version>${easyexcel.version}</version>
+        </dependency>
+
+    </dependencies>
+
+
+    <build>
+        <finalName>nngkxxdp</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <mainClass>com.example.nngkxxdp.NngkxxdpApplication</mainClass>
+                    <fork>true</fork>
+                    <addResources>true</addResources>
+                    <outputDirectory>${project.build.directory}/jar</outputDirectory>
+                </configuration>
+            </plugin>
+<!--            <plugin>-->
+<!--                <groupId>org.jetbrains.kotlin</groupId>-->
+<!--                <artifactId>kotlin-maven-plugin</artifactId>-->
+<!--                <version>${kotlin.version}</version>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <id>compile</id>-->
+<!--                        <phase>compile</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>compile</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                    <execution>-->
+<!--                        <id>test-compile</id>-->
+<!--                        <phase>test-compile</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>test-compile</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--            </plugin>-->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <!-- 不打包资源文件(配置文件和依赖包分开) -->
+                    <excludes>
+                        <exclude>*.yml</exclude>
+                        <exclude>*.properties</exclude>
+                        <exclude>mybatis/**</exclude>
+                        <exclude>static/**</exclude>
+                    </excludes>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <!-- MANIFEST.MF 中 Class-Path 加入前缀 -->
+                            <classpathPrefix>lib/</classpathPrefix>
+                            <!-- jar包不包含唯一版本标识 -->
+                            <useUniqueVersions>false</useUniqueVersions>
+                            <!--指定入口类 -->
+                            <mainClass>com.example.nngkxxdp.NngkxxdpApplication</mainClass>
+                        </manifest>
+                        <manifestEntries>
+                            <!--MANIFEST.MF 中 Class-Path 加入资源文件目录 -->
+                            <Class-Path>./config/</Class-Path>
+                        </manifestEntries>
+                    </archive>
+                    <outputDirectory>${project.build.directory}</outputDirectory>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution> <!-- 复制配置文件 -->
+                        <id>copy-resources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <includes>
+                                        <include>*.yml</include>
+                                        <include>*.properties</include>
+                                        <include>mybatis/**</include>
+                                        <include>static/**</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                            <outputDirectory>${project.build.directory}/config</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.1.1</version>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib/</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>testCompile</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>testCompile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <packaging>jar</packaging>
+</project>

+ 2 - 2
nngkxxdp/src/main/resources/static/constans.js

@@ -1,7 +1,7 @@
 // var PATH = "https://data.cqna.gov.cn";
-// var PATH = "https://www.cqna.gov.cn/data";
+var PATH = "https://www.cqna.gov.cn/data";
 // var PATH = "http://localhost:7777";
-var PATH = "";
+// var PATH = "";
 /** GET 网络请求
  * @param {Object} uri
  * @param {Object} async

+ 4 - 81
nngkxxdp/src/main/resources/static/zdjc/xq_model.html

@@ -48,32 +48,13 @@
 			<div class="main-contanier">
 				<div class="title" style="cursor: pointer;"
 					onclick="window.location.href='sy.html'">南岸区政策问答库</div>
-<!--				<div style="position: relative; margin-bottom: 20px;">-->
-<!--					<div class="search-area">-->
-<!--						<div class="all">全部</div>-->
-<!--						<div class="searchinput">-->
-<!--							<div class="layui-form">-->
-<!--								<div class="layui-input-block">-->
-<!--									<input type="text" id="search-input" name="title"-->
-<!--										lay-verify="title" autocomplete="off" placeholder="请输入检索内容"-->
-<!--										class="layui-input" style=" height: 60px;font-size: 50px;line-height: 120px;">-->
-<!--								</div>-->
-<!--							</div>-->
-<!--						</div>-->
-
-<!--						<div class="ss-icon">-->
-<!--							<img alt="搜索" src="./img/ss2.png">-->
-<!--						</div>-->
-<!--					</div>-->
-
-<!--					<div class="tangchu"></div>-->
-<!--				</div>-->
+
 
 
 				<div class="xq-contanier">
 					<div class="wz-box">
 						<button class="layui-btn layui-btn-primary" type="button"
-							onclick="window.history.go(-1);"
+							onclick="window.location.href ='symobile.html';"
 							style="background: #F2F2F2;  border: none; width: 250px;height: 130px; font-size: 60px">返回</button>
 						<hr style="border-color: #F2F2F2; color: #F2F2F2;">
 						<h4 id="d-title" style="margin-top: 30px; margin-bottom: 20px;"></h4>
@@ -84,62 +65,7 @@
 							</div>
 						</div>
 
-<!--						<div style="display: flex;justify-content: space-around; width: 100%; margin-top: 30px;">-->
-<!--							<div style="width: 48%; " class="info">-->
-<!--								<div class="policy" style="width: 100%;">-->
-<!--									<div class="policy-nav">-->
-<!--										<div class="nav1" data-id="1" style="cursor: pointer;">决策目录</div>-->
-<!--										<div class="nav2" data-id="2" style="cursor: pointer;">决策事项</div>-->
-<!--									</div>-->
-<!--									<div class="info-img" style="width: 100%;">-->
-<!--										<div class="nndiv1 ">-->
-<!--											<a href="./decision.html" style="z-index: 2;"></a> <img style="width: 98%;" src="./img/info-nav.png" alt="" />-->
-<!--											<div class="info-title">-->
-<!--												<p>2021年度</p>-->
-<!--												<p>南岸区人民政府重大行政决策事项清单</p>-->
-<!--											</div>-->
-<!--										</div>-->
-<!--										<div class="nndiv2 layui-hide" style="width: 98%;">-->
-<!--											<ul id="xqList">-->
-<!--												&lt;!&ndash; <li>-->
-<!--												<div class="ly-div-xx">-->
-<!--													<span style="font-size: 16px; font-weight: 550;">.制定专项计划</span>-->
-<!--													<span style="color: #c5c5c5;">区教委</span>-->
-<!--												</div>-->
-<!--												</li>-->
-<!--												<li>-->
-<!--												<div style="border-bottom: 1px solid #F2F2F2;display: flex;justify-content: space-between;padding: 10px 0;">-->
-<!--													<span style="font-size: 16px; font-weight: 550;">.制定专项计划</span>-->
-<!--													<span style="color: #c5c5c5;">区教委</span>-->
-<!--												</div>-->
-<!--												</li> &ndash;&gt;-->
-<!--											</ul>-->
-<!--										</div>-->
-<!--									</div>-->
-<!--								</div>-->
-<!--							</div>-->
-<!--							<div style="width: 48%;">-->
-<!--								<div class="gzh-info">-->
-<!--					<div class="policy-nav1">-->
-<!--						<div class="nav1">公众号信息</div>-->
-<!--					</div>-->
-<!--					<ul class="gzh-list">-->
-<!--							&lt;!&ndash; <li>-->
-<!--								<span class="num1">1</span>-->
-<!--								<span class="num-text">南岸区司法局微信公众号全新上线 </span>-->
-<!--							</li>-->
-<!--							<li>-->
-<!--								<span class="num2">2</span>-->
-<!--								<span class="num-text">在南岸城市服务中,医疗服务实现了南岸区四家主要医院的 在线挂号与预约,市民根据自身需求通过微信  ...</d>-->
-<!--							</li>-->
-<!--							<li>-->
-<!--								<span class="num3">3</span>-->
-<!--								<span class="num-text">城市服务还整合了多项便民服务,曾有网友将找不到停车 位、停车费太贵和停完车后找不到停的位置列  ...</d>-->
-<!--							</li> &ndash;&gt;-->
-<!--						</ul>-->
-<!--				</div>-->
-<!--							</div>-->
-<!--						</div>-->
+
 					</div>
 				</div>
 
@@ -148,10 +74,7 @@
 			<div class="content_three"></div>
 		</div>
 	</div>
-<!--<div class="doubt" id="ques">-->
-<!--		<img src="./img/doubt.png" style="width: 100px"/>-->
-<!--		<div class="doubt-text">没有合适答案 我要提问</div>-->
-<!--	</div>-->
+
 	<div class="footer"></div>
 	<div style="width: 100%;overflow: hidden;height: 474px;">
 		<iframe style="bottom: 0;height: 474px;"