免密登录

pine-admin/src/main/java/com/pine/admin/modules/business/controller/OrderController.java

@@ -29,13 +29,14 @@ import javax.servlet.http.HttpServletResponse;
  * @email 771190883@qq.com
  * @date 2019-10-11 15:44:20
  */
-@Api(value = "订单表接口", tags = {"订单表接口" })
+@Api(value = "订单表接口", tags = {"订单表接口"})
 @RestController
 @RequestMapping("business/Order")
 public class OrderController extends BaseController {
 
     @Autowired
     private OrderService orderService;
+
     /**
      * <p>根据Id。</p>
      */
@@ -43,9 +44,10 @@ public class OrderController extends BaseController {
     @RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
     public Result getOrderEntity(@PathVariable("id") String id) {
 
-            Order data = orderService.getById(id);
+        Order data = orderService.getById(id);
         return Result.success(true, data);
     }
+
     /**
      * <p>分页查询。</p>
      */
@@ -62,22 +64,22 @@ public class OrderController extends BaseController {
         return Result.success(true, result);
     }
 
-        /**
+    /**
      * <p>excel。</p>
      */
     @ApiOperation(value = "分页获取订单表数据", notes = "根据条件获取")
     @RequestMapping(value = "/excel", method = RequestMethod.GET)
-    public void excel( HttpServletResponse response) {
+    public void excel(HttpServletResponse response) {
 
         List<Order> allList = orderService.getAllList(null);
-        allList.stream().forEach(o ->{
+        allList.stream().forEach(o -> {
             orderService.FullOrderInfo(o);
             o.setShopName(o.getOrderSkus().get(0).getSkuName());
         });
         try {
-            List<Object> exchangeCodes = new ArrayList<>();
-            if (!exchangeCodes.isEmpty()) {
-                String excelName = "商城全部订单" ;
+
+            if (!allList.isEmpty()) {
+                String excelName = "商城全部订单";
                 LinkedHashMap<String, String> fieldMap = new LinkedHashMap<String, String>();
                 fieldMap.put("orderCode", "订单号");
                 fieldMap.put("billNo", "银联单号");
@@ -91,7 +93,7 @@ public class OrderController extends BaseController {
                 fieldMap.put("status", "订单状态");
                 fieldMap.put("originalPrice", "实付金额");
                 fieldMap.put("source", "来源");
-                ExcelPoiUtil.export(excelName, exchangeCodes, fieldMap, response);
+                ExcelPoiUtil.export(excelName, allList, fieldMap, response);
             }
         } catch (Exception e) {
 

pine-admin/src/main/java/com/pine/admin/modules/business/entity/Order.java

@@ -408,6 +408,14 @@ public class Order implements Serializable {
      * 商品名称
      */
     private String shopName;
+    /**
+     * 商拼编号
+     */
+    private String skuNo;
+    /**
+     * 商品规格
+     */
+    private String skuSpecs;
     /**
      * billNo 银联单号
      */

pine-admin/src/main/java/com/pine/admin/modules/system/service/impl/SysServiceImpl.java

@@ -50,6 +50,7 @@ public class SysServiceImpl implements SysService {
          * 认证过程： 根据用户身份(账号)查询数据库，如果查询不到则用户不存在
          * 对输入的密码和数据库密码进行比对，如果一致则认证通过
          */
+
         // 根据用户账号查询数据库
         SysUser sysUser = new SysUser();
 
@@ -57,7 +58,6 @@ public class SysServiceImpl implements SysService {
 
         sysUser = sysUserMapper.querySysUser(sysUser);
 
-
         // 数据库密码（MD5加密后的密码）
         String password_db = sysUser.getPassword();
 
@@ -110,14 +110,15 @@ public class SysServiceImpl implements SysService {
         //获取登录信息
         Object o = redisService.get(redisKey);
 
-
         if (ObjectUtils.isEmpty(o)) {
             throw new ApiException("用户未登录");
         }
 
         String dealerInfo = String.valueOf(o);
+
         //删除密钥
         redisService.remove(redisKey);
+
         ShiroUserInfo userInfo = JSONObject.parseObject(dealerInfo, ShiroUserInfo.class);
 
         if (!userInfo.getAccount().equals(responseString)) {
@@ -127,16 +128,13 @@ public class SysServiceImpl implements SysService {
         if (StringUtils.isEmpty(userInfo.getDealerID())) {
             throw new ApiException("用户信息丢失");
         }
+
         if (StringUtils.isEmpty(userInfo.getName())) {
             throw new ApiException("用户信息丢失");
         }
+
         userInfo.getCreateTime();
-//        Date nowDate = new Date();
-//        Date effectiveTime = DateTimeTool.dateTimeSubtractMinutes(nowDate, 30);
-//        boolean effectiveDate = DateTimeTool.isEffectiveDate(userInfo.getCreateTime(), effectiveTime, nowDate);
-//        if (effectiveDate == false) {
-//            throw new ApiException("秘钥已失效");
-//        }
+
         return dealerInfo;
     }
 

pine-admin/src/main/resources/sigar.so/.sigar_shellrc

@@ -1,48 +0,0 @@
-#this file is loaded by the sigar shell.
-#commands in this file are run just as they would be if they
-#were typed in by hand in the shell prompt.
-
-#find weblogic nodes (-1 means last index in the array)
-alias ps-wls ps State.Name.eq=java,Args.-1.eq=weblogic.Server
-
-#find websphere 4.x nodes
-alias ps-was4 ps State.Name.eq=java,Args.*.eq=com.ibm.ejs.sm.server.ManagedServer
-
-#find websphere admin server
-alias ps-was4adm ps State.Name.eq=java,Args.*.eq=com.ibm.ejs.sm.server.AdminServer
-
-#find websphere 5.x nodes
-alias ps-was5 ps State.Name.eq=java,Args.*.eq=com.ibm.ws.runtime.WsServer
-
-#find websphere 4.x and 5.x nodes
-alias ps-was ps State.Name.eq=java,Args.*.eq=com.ibm.ws.bootstrap.WSLauncher
-
-#find jboss (use .sw=java to match 'java' or 'javaw')
-alias ps-jboss ps State.Name.sw=java,Args.*.eq=org.jboss.Main
-
-#find tomcat
-alias ps-tomcat ps State.Name.eq=java,Args.*.eq=org.apache.catalina.startup.Bootstrap
-
-#find apache parent processes
-#($1 is the return value of the first query in the string)
-#'Pne' => 'P' flags means parent of matched process
-#to filter out httpd child processes
-alias ps-apache ps State.Name.re=https?d.*|[Aa]pache2?$,State.Name.Pne=$1
-
-#find ant processes (ant hangs on me sometimes)
-#(* matches any value in the array)
-alias ps-ant ps State.Name.eq=java,Args.*.eq=org.apache.tools.ant.Main
-
-#HQ agents
-alias ps-hqagent ps State.Name.sw=java,Args.-1.eq=org.hyperic.hq.agent.server.AgentDaemon
-
-#find all java procs except the shell itself
-#($$ is the current process id)
-alias ps-java ps State.Name.eq=java,Pid.Pid.ne=$$
-alias java ps-java
-
-#find all processes owned by the current user
-alias ps-me ps CredName.User.eq=$user.name
-
-#VMware Server or GSX VMs
-alias ps-vmx ps State.Name.eq=vmware-vmx,Args.1.eq=-C

pine-generator/src/main/resources/application.yml

@@ -13,7 +13,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://47.100.127.59:3306/lecshop_v2?useUnicode=true&characterEncoding=utf8&useSSL=false
+    url: jdbc:mysql://139.224.193.83:3306/lecshop_v2?useUnicode=true&characterEncoding=utf8&useSSL=false
     username: root
     password: pl,okmijn
   jackson:

pom.xml

@@ -43,24 +43,12 @@
 
         <dependencies>
 
-            <dependency>
-                <groupId>de.codecentric</groupId>
-                <artifactId>spring-boot-admin-starter-client</artifactId>
-                <version>1.5.4</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.json</groupId>
                 <artifactId>json</artifactId>
                 <version>20180130</version>
             </dependency>
 
-            <dependency>
-                <groupId>postgresql</groupId>
-                <artifactId>postgresql</artifactId>
-                <version>9.1-901-1.jdbc4</version>
-            </dependency>
-
 
             <dependency>
                 <groupId>com.aliyun.oss</groupId>